解决自动获取title高度失效的问题

kanban-client/app/assets/MessageBox/msgbox.css

@@ -20,18 +20,3 @@
   text-align: left;
   padding: 20px;
 }
-.rc-msgbox {
-  opacity: 1;
-  animation-name: fadeout;
-  animation-duration: 3s;
-  animation-fill-mode: forwards ;
-  animation-delay: 5s;
-}
-@keyframes fadeout {
-  0% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}

kanban-client/app/assets/MessageBox/msgbox.less

@@ -21,21 +21,4 @@
 .@{prefixCls}-content {
     text-align: left;
     padding: 20px;
-}
-.@{prefixCls} {
-    opacity:1;
-    animation-name: fadeout;
-    animation-duration: 3s;  
-    animation-fill-mode: forwards ;
-    animation-delay:5s; 
-}
- 
-@keyframes fadeout {
-    0% {
-        opacity: 1
-    }
- 
-    100% {
-        opacity: 0
-    }
 }

kanban-client/app/component/Table.jsx

@@ -91,8 +91,8 @@ class TableModel extends React.Component {
 		let thead = node.getElementsByClassName('rc-table-thead')[0];
 		this.cHeight = node.offsetHeight - title.offsetHeight;
 		let trHeight = (this.cHeight) / (this.rowCount + 1);
-		// let trFontSize = pageSize ? `${fontSize/.6 > trHeight ? trHeight * .6 : fontSize}px` : `${trHeight * .6}px`;
-		let trFontSize = `${fontSize}px`;
+		let trFontSize = pageSize ? `${fontSize/.6 > trHeight ? trHeight * .6 : fontSize}px` : `${trHeight * .6}px`;
+		// let trFontSize = `${fontSize}px`;
 		thead.style.fontSize = trFontSize;
 		thead.getElementsByTagName('th')[0].style.height = `${trHeight}px` ;
 		let count = this.state.data.length;

kanban-client/app/component/converter.js

@@ -402,7 +402,7 @@ function getLayout(layout) {
 
 function parseStyleStr(str) {
     if (!str) {
-        return undefined;
+        return {};
     }
     if (typeof str == 'object') {
         return str;

kanban-client/app/component/factory.dev.js

@@ -45,6 +45,7 @@ class Factory extends React.Component {
             me.setState({
                 error: null,
                 model: converter(modelconfig),
+                // titleHeight: 73
             });
         }).catch(function (ex) {
             me.setState({
@@ -61,6 +62,12 @@ class Factory extends React.Component {
         return titleHeight;
     }
 
+    setTitleHeight(height) {
+        this.setState({
+            titleHeight: height
+        });
+    }
+
     setRefresh() {
         let { instance } = this.state;
         if (!instance) { return; }
@@ -105,7 +112,6 @@ class Factory extends React.Component {
     }
 
     componentDidUpdate() {
-        
     }
 
     componentWillMount() {
@@ -162,7 +168,7 @@ class Factory extends React.Component {
         }
         return (
             <div ref='body'>
-                <Title static={this.props.static} {...titleConfig} />
+                <Title static={this.props.static} setTitleHeight={this.setTitleHeight.bind(this)} {...titleConfig} />
                 <Container static={this.props.static} items={content.items} rowHeight={(window.innerHeight - titleHeight) / 10} />
             </div>
         );

kanban-client/app/component/factory.js

@@ -55,6 +55,12 @@ class Factory extends React.Component {
         return titleHeight;
     }
 
+    setTitleHeight(height) {
+        this.setState({
+            titleHeight: height
+        });
+    }
+
     setRefresh() {
         let { instance } = this.state;
         if (!instance) { return; }
@@ -149,7 +155,7 @@ class Factory extends React.Component {
         }
         return (
             <div>
-                <Title static={this.props.static} {...titleConfig} />
+                <Title static={this.props.static} setTitleHeight={this.setTitleHeight.bind(this)} {...titleConfig} />
                 <Container static={this.props.static} items={content.items} rowHeight={(window.innerHeight - titleHeight) / 10} />
             </div>
         );

kanban-client/app/constants/url.json

@@ -1,3 +1,3 @@
 {
-    "path": "panelInstance/parseData"
+    "path": "panelInstance/parseData/"
 }

kanban-client/app/data/cc.json

@@ -1,41 +1,39 @@
 {
     "instance": {
         "enabledKanbanCodes": [
-            "5E2EE434A1E",
-            "5E31084F223"
+            "5DE01DE4D16",
+            "5DE0806E512"
         ],
         "display": "AutoSwitch",
-        "switchFrequency": 30,
+        "switchFrequency": 10,
         "refreshFrequency": 5,
         "parameters": [
             {
-                "code": "5E3289D9E2B",
-                "createTime": 1508485926302,
+                "code": "5E326742F2A",
+                "createTime": 1508485784623,
                 "inputMode": "DropDownBox",
-                "lastModified": 1508554096085,
-                "name": "新参数",
+                "lastModified": 1508919901414,
+                "name": "线别",
                 "optionalValues": [
-                    "1",
-                    "2",
-                    "3"
+                    "SMT"
                 ],
-                "panelCode": "5DE18FCEF14",
+                "panelCode": "5DE01C8DF14",
                 "type": "String",
-                "value": "1",
-                "version": 2
+                "value": "SMT",
+                "version": 5
             },
             {
-                "code": "5F116284611",
-                "createTime": 1508719597630,
+                "code": "5FD06CEC511",
+                "createTime": 1508919918275,
                 "inputMode": "DropDownBox",
-                "lastModified": 1508719597630,
-                "name": "线别",
+                "lastModified": 1508919918275,
+                "name": "新参数",
                 "optionalValues": [
-                    "SMT"
+                    "a"
                 ],
-                "panelCode": "5DE18FCEF14",
+                "panelCode": "5DE01C8DF14",
                 "type": "String",
-                "value": "SMT",
+                "value": "a",
                 "version": 1
             }
         ]
@@ -48,8 +46,8 @@
                         "layout": {
                             "w": 40,
                             "x": 0,
-                            "h": 50,
-                            "y": 50
+                            "h": 57,
+                            "y": 0
                         },
                         "type": "form",
                         "config": {
@@ -81,6 +79,7 @@
                                 },
                                 {
                                     "field": {
+                                        "style": "color:red;",
                                         "text": "IPQC"
                                     },
                                     "value": {
@@ -136,36 +135,51 @@
                         "layout": {
                             "w": 40,
                             "x": 0,
-                            "h": 50,
-                            "y": 0
+                            "h": 43,
+                            "y": 57
                         },
                         "type": "table",
                         "config": {
-                            "title": "function() { return { text: ''+ new Date().format('hh:mm:ss'), style: { float: 'left' } } }",
-                            "data": 
-                            [{"前五大不良": "漏印"}, {"前五大不良": "错位"}, {"前五大不良": "漏焊"}, {"前五大不良": "翘件"}, {"前五大不良": "碰焊"}],
+                            "data": [
+                                {
+                                    "前五大不良": "漏件"
+                                },
+                                {
+                                    "前五大不良": "错位"
+                                },
+                                {
+                                    "前五大不良": "立碑"
+                                },
+                                {
+                                    "前五大不良": "翘件"
+                                },
+                                {
+                                    "前五大不良": "漏印"
+                                }
+                            ],
                             "columns": [
                                 {
-                                    "width": 100,
+                                    "dataIndex": "前五大不良",
+                                    "width": 180,
                                     "sort": 0,
-                                    "title": "前五大不良",
-                                    "dataIndex": "前五大不良"
+                                    "title": "前五大不良"
                                 },
                                 {
+                                    "dataIndex": "数量",
                                     "width": 100,
                                     "sort": 0,
-                                    "title": "数量",
-                                    "dataIndex": "数量"
+                                    "title": "数量"
                                 },
                                 {
+                                    "dataIndex": "原因",
                                     "width": 100,
                                     "sort": 0,
-                                    "title": "原因",
-                                    "dataIndex": "原因" 
+                                    "title": "原因"
                                 }
                             ],
                             "pagesize": 0,
-                            "interval": 2
+                            "interval": 3,
+                            "title": "function() { return { text: ''+ new Date().format('hh:mm:ss'), style: { float: 'left' } } }"
                         }
                     },
                     {
@@ -184,7 +198,7 @@
                                 },
                                 {
                                     "时段": "8~9",
-                                    "投入数": 142
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "8~9",
@@ -200,7 +214,7 @@
                                 },
                                 {
                                     "时段": "8~9",
-                                    "投入数": 7
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "8~9",
@@ -208,7 +222,7 @@
                                 },
                                 {
                                     "时段": "8~9",
-                                    "投入数": 0
+                                    "投入数": 71
                                 },
                                 {
                                     "时段": "8~9",
@@ -224,27 +238,175 @@
                                 },
                                 {
                                     "时段": "8~9",
-                                    "投入数": 0
+                                    "投入数": 31
                                 },
                                 {
                                     "时段": "8~9",
                                     "投入数": 0
                                 },
                                 {
-                                    "时段": "上午",
+                                    "时段": "9~10",
                                     "投入数": 0
                                 },
                                 {
-                                    "时段": "上午",
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 1
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 46
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 107
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "9~10",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 5
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 110
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 127
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "10~11",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 86
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 65
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 1
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "11~12",
                                     "投入数": 0
                                 },
                                 {
                                     "时段": "上午",
-                                    "投入数": 1067
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "上午",
-                                    "投入数": 793
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "上午",
@@ -256,7 +418,7 @@
                                 },
                                 {
                                     "时段": "上午",
-                                    "投入数": 2026
+                                    "投入数": 1452
                                 },
                                 {
                                     "时段": "上午",
@@ -264,7 +426,7 @@
                                 },
                                 {
                                     "时段": "上午",
-                                    "投入数": 0
+                                    "投入数": 1089
                                 },
                                 {
                                     "时段": "上午",
@@ -272,7 +434,11 @@
                                 },
                                 {
                                     "时段": "上午",
-                                    "投入数": 17
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "上午",
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "上午",
@@ -280,58 +446,403 @@
                                 },
                                 {
                                     "时段": "上午",
-                                    "投入数": 1654
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "上午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 1
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 92
+                                },
+                                {
+                                    "时段": "12~13",
+                                    "投入数": 129
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "12~13",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "12~13",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "12~13",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "12~13",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "12~13",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 0
                                 },
                                 {
-                                    "时段": "下午"
+                                    "时段": "13~14",
+                                    "投入数": 74
+                                },
+                                {
+                                    "时段": "13~14",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "13~14",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "13~14",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "13~14",
+                                    "投入数": 98
+                                },
+                                {
+                                    "时段": "13~14",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 5
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 98
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 14
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "14~15",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 74
+                                },
+                                {
+                                    "时段": "15~16",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 75
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "16~17",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 16
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "17~18",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 453
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 217
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 6
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "下午",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "当天",
-                                    "投入数": 2026
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "当天",
-                                    "投入数": 1067
+                                    "投入数": 13
                                 },
                                 {
                                     "时段": "当天",
-                                    "投入数": 793
+                                    "投入数": 1542
                                 },
                                 {
                                     "时段": "当天",
@@ -339,7 +850,19 @@
                                 },
                                 {
                                     "时段": "当天",
-                                    "投入数": 17
+                                    "投入数": 1669
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
+                                },
+                                {
+                                    "时段": "当天",
+                                    "投入数": 0
                                 },
                                 {
                                     "时段": "当天",
@@ -391,7 +914,8 @@
                                 }
                             ],
                             "pagesize": 0,
-                            "interval": 3
+                            "interval": 7,
+                            "title": "function() { return { text: ''+ new Date().format('hh:mm:ss'), style: { float: 'left' } } }"
                         }
                     }
                 ]

kanban-client/app/main.dev.js

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import Factory from './component/factory.dev.js';
 import DateFormatter from './utils/DateTimeUtils.js';
 
-var code = '5FBDD501D27';
+var code = '601F25F0F23';
 
 ReactDOM.render(
     <Factory code={[code]} />,

kanban-client/app/src/Title/Title.jsx

@@ -24,6 +24,8 @@ export default class Title extends React.Component {
   }
 
   componentDidMount() {
+    let height = this.getTitleHeight();
+    this.props.setTitleHeight(height);
   }
 
   componentWillReceiveProps(nextProps) {
@@ -37,6 +39,10 @@ export default class Title extends React.Component {
     return title;
   }
 
+  getTitleHeight() {
+    return this.refs.title.offsetHeight;
+  }
+
   render() {
     const props = this.props;
     const {prefixCls, fontSize} = props;
@@ -45,7 +51,7 @@ export default class Title extends React.Component {
 
     let title = this.getTitle();
     return (
-      <div className={className} style={{fontSize: fontSize}} key={prefixCls} dangerouslySetInnerHTML={{ __html: title }}>
+      <div ref='title' className={className} style={{fontSize: fontSize}} key={prefixCls} dangerouslySetInnerHTML={{ __html: title }}>
       </div>
     );
   }