Browse Source

【看板客户端】【设置table组件铺满容器】

zhuth 8 years ago
parent
commit
c214740b86

+ 3 - 2
kanban-client/app/component/Tabel.jsx

@@ -131,7 +131,7 @@ class TableModel extends React.Component {
 			let col = cols[i];
 			let renderFunction = typeof (col.render) == 'string' ? renders[col.render] :
 				(typeof (col.render) == 'function' ? col.render :
-					this.props.render || function (_v, _r, _i) { return { children: _v, props: {} } });
+				renders[this.props.render] || function (_v, _r, _i) { return { children: _v, props: {} } });
 			col.render = renderFunction;
 		}
 		return cols;
@@ -298,6 +298,7 @@ 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 = titleEle.parentNode.offsetHeight;
@@ -319,7 +320,7 @@ 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;

+ 15 - 1
kanban-client/assets/Table/index.css

@@ -1,9 +1,9 @@
 .rc-table {
   height: 100%;
-  background-color: #333333;
   color: white;
 }
 .rc-table-main {
+  height: 100%;
   width: 100%;
   border-collapse: collapse;
   text-align: center;
@@ -20,3 +20,17 @@
   font-weight: bold;
   font-size: large;
 }
+.rc-table-content {
+  height: 100%;
+  width: 100%;
+}
+.rc-table-body {
+  height: 100%;
+}
+.rc-table table {
+  border-collapse: collapse;
+}
+.rc-table th,
+.rc-table td {
+  border: 1px solid white;
+}

+ 17 - 2
kanban-client/assets/Table/index.less

@@ -2,11 +2,11 @@
 
 .@{prefixCls} {
     height: 100%;
-    background-color: #333333;
     color: white;
 }
 
 .@{prefixCls}-main {
+    height: 100%;
     width: 100%;
     border-collapse: collapse;
     text-align: center;
@@ -25,4 +25,19 @@
     text-align: center;
     font-weight: bold;
     font-size: large;
-}
+}
+.@{prefixCls}-content {
+    height: 100%;
+    width: 100%;
+}
+.@{prefixCls}-body {
+    height: 100%;
+}
+.@{prefixCls} {
+    table {
+        border-collapse: collapse;
+    }
+    th, td {
+        border: 1px solid white;
+    }
+  }