调整form样式获取逻辑

kanban-client/app/data/cc.json

@@ -40,7 +40,7 @@
                 },
                 "type": "form",
                 "config": {
-                    "valueStyle": "{\"border\":\"1px solid white\"}",
+                    "valueStyle": "{\"color\":\"blue\",\"border\":\"1px solid white\"}",
                     "data": [{
                         "field": {
                             "text": "组长"
@@ -49,7 +49,7 @@
                             "style": "{\"fontStyle\":\"oblique\"}",
                             "text": "余海文1111111111111111111111"
                         },
-                        "render": "function(field,value){;if(1==1){return{field:{text:field,style:{\"fontStyle\":\"oblique\"}},value:{text:'1000',style:{\"fontStyle\":\"oblique\"}}}}}"
+                        "render": "function(field,value){;if(1==1){return{field:{text:field,style:{\"fontStyle\":\"oblique\"}},value:{text:'1000',style:{\"color\":\"blue\",\"fontStyle\":\"oblique\"}}}}}"
                     }, {
                         "field": {
                             "text": "PE"
@@ -113,7 +113,7 @@
                     "columns": 2,
                     "header": {
                         "text": "header",
-                        "style":"{\"color\":\"red\"}"
+                        "style":"{\"color\":\"blue\"}"
                     }
                 }
             }, {

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

@@ -61,8 +61,9 @@ export default class Form extends React.Component {
     }
 
     getContent() {
-        const { fontSize, prefixCls, fieldCls, fieldStyle, valueCls, valueStyle } = this.state;
+        const { fontSize, prefixCls, fieldStyle, valueStyle } = this.state;
         const { columns } = this.state;
+
         let columnsData = this.getItemColumns();
         const contentEl = <tbody style={{ fontSize: fontSize }} className={`${prefixCls}-content`} key="form_content">
             {
@@ -74,11 +75,12 @@ export default class Form extends React.Component {
                                 let colSpan = td.colSpan.replace('%','')/2 + '%';
                                 let field = td.render ? ((td.render(td.field.text, td.value.text)) ? td.render(td.field.text, td.value.text).field.text : '' ) : (typeof td.field === 'object' ? td.field.text : td.field);
                                 let value = td.render ? ((td.render(td.field.text, td.value.text)) ? td.render(td.field.text, td.value.text).value.text : '' ) : (typeof td.value === 'object' ? td.value.text : td.value);
-                                let fieldStyle = td.render ? ((td.render(td.field.text, td.value.text)) ? td.render(td.field.text, td.value.text).field.style : {} ) : (typeof td.field === 'object' ? (isEmptyObject(td.field.style) ? td.fieldStyle : td.field.style) : td.fieldStyle);
-                                let valueStyle = td.render ? ((td.render(td.field.text, td.value.text)) ? td.render(td.field.text, td.value.text).value.style : {} ) : (typeof td.value === 'object' ? (isEmptyObject(td.value.style) ? td.valueStyle : td.value.style) : td.valueStyle);
+                                let currentFieldStyle = td.render ? ((td.render(td.field.text, td.value.text)) ? td.render(td.field.text, td.value.text).field.style : {} ) : (typeof td.field === 'object' ? (isEmptyObject(td.field.style) ? fieldStyle : td.field.style) : fieldStyle);
+                                let currentValueStyle = td.render ? ((td.render(td.field.text, td.value.text)) ? td.render(td.field.text, td.value.text).value.style : {} ) : (typeof td.value === 'object' ? (isEmptyObject(td.value.style) ? valueStyle : td.value.style) : valueStyle);
+                                
                                 return [
-                                    <td colSpan={colSpan} className={`${prefixCls}-item-field`} style={fieldStyle} > {field}</td>,
-                                    <td colSpan={colSpan} className={`${prefixCls}-item-value`} style={valueStyle} > {value}</td>
+                                    <td colSpan={colSpan} className={`${prefixCls}-item-field`} style={currentFieldStyle} > {field}</td>,
+                                    <td colSpan={colSpan} className={`${prefixCls}-item-value`} style={currentValueStyle} > {value}</td>
                                 ];
                             })
                         }