【看板客户端】【表格调整】

kanban-client/app/component/Tabel.jsx

@@ -215,7 +215,7 @@ class TableModel extends React.Component {
 
 				let titleEle = document.getElementsByClassName("rc-table-title")[0];
 				let headerEle = document.getElementsByClassName("rc-table-thead")[0];
-				let screenHeight = window.innerHeight;
+				let screenHeight = titleEle.parentNode.offsetHeight;
 				// body高度
 				let bodyHeight = screenHeight - titleEle.offsetHeight - headerEle.offsetHeight;
 				let st = $el.scrollTop();// 距离顶部高度
@@ -298,10 +298,9 @@ class TableModel extends React.Component {
 
 	// 滚动展示时自适应屏幕大小
 	adaptiveScreenSize() {
-		return;
 		let titleEle = document.getElementsByClassName("rc-table-title")[0];
 		let headerEle = document.getElementsByClassName("rc-table-thead")[0];
-		let screenHeight = window.innerHeight;
+		let screenHeight = titleEle.parentNode.offsetHeight;
 		let bodyHeight = document.getElementsByClassName("rc-table-body")[0].offsetHeight;
 		if (this.state.data.length > 0) {
 			bodyHeight = screenHeight - (titleEle ? titleEle.offsetHeight : 0) - headerEle.offsetHeight;
@@ -312,6 +311,7 @@ class TableModel extends React.Component {
 		let bodyEle = document.getElementsByClassName("rc-table-body")[0];
 		if (this.props.scroll) {
 			bodyEle.style.height = `${bodyHeight}px`;
+			bodyEle.style.marginTop = "17px";
 		} else {
 			bodyEle.style.height = `${bodyHeight + 40}px`;
 		}
@@ -319,15 +319,16 @@ class TableModel extends React.Component {
 
 	// 调整行高
 	adaptiveRowSize() {
-		return;
+		// return;
 		let headerEle = document.getElementsByClassName("rc-table-thead")[0];
 		let titleEle = document.getElementsByClassName("rc-table-title")[0];
-		let screenHeight = window.innerHeight;
+		// let screenHeight = window.innerHeight;
+		let screenHeight = titleEle.parentNode.offsetHeight;
 		let bodyHeight = screenHeight - (titleEle ? titleEle.offsetHeight : 0) - headerEle.offsetHeight;
 		let count = this.state.data.length;
 		if (count == 0) { return; }
 		let tds = document.getElementsByTagName('td');
-		if (this.props.scroll) {
+		if (this.props.scroll && this.props.fetch) {
 			if (count < ((bodyHeight / tds[0].offsetHeight) + 2) && count > this.props.fetch.params.pageSize) {
 				for (let i = 0; i < tds.length; i++) {
 					tds[i].style.height = `${bodyHeight / (count - 2) + 0.1}px`;
@@ -422,7 +423,7 @@ class TableModel extends React.Component {
 
 	render() {
 		return (
-			<div>
+			<div style={{height: '100%', overflow: 'hidden'}}>
 				<Table
 					prefixCls={this.props.prefixCls || 'rc-table'}
 					className={this.props.className}

kanban-client/app/component/factory.js

@@ -62,7 +62,7 @@ class Factory extends React.Component {
 
     componentDidMount() {
         let { refresh } = this.props;
-        if (refresh) {
+        if (refresh.interval) {
             setInterval(function () {
                 let length = this.models.length;
                 this.midIndex = this.midIndex == length - 1 ? 0 : this.midIndex + 1;

kanban-client/app/data/RefreshData.json

@@ -1,4 +1,6 @@
 {
-    "model": [{"mid": "config1"}, "config2"],
-    "refresh": false
+    "model": [{"mid": "config2"}, "config2"],
+    "refresh": {
+        "interval": 0
+    }
 }

kanban-client/assets/Table/index.less

@@ -1,6 +1,7 @@
 @prefixCls: rc-table;
 
 .@{prefixCls} {
+    height: 100%;
     color: white;
 }