调整看板展示对于style、render的支持

kanban-console/src/main/webapp/resources/app/view/core/trigger/FormRenderTrigger.js

@@ -22,7 +22,7 @@ Ext.define('erp.view.core.trigger.FormRenderTrigger', {
         var renderEditor = Ext.create('Ext.window.Window', {
             field: trigger,
             title: trigger.fieldLabel,
-            width:600,
+            width:700,
             height:400,
             modal:true,
             layout:'border',
@@ -54,10 +54,10 @@ Ext.define('erp.view.core.trigger.FormRenderTrigger', {
                 columns: [
                     { text: '条件连接符', dataIndex: 'symbol', flex: 1, editor: symbolCombobox },
                     { text: '条件表达式', dataIndex: 'expression', flex: 2, editor: 'texttrigger' },
-                    { text: '返回field值', dataIndex: 'text', flex: 1, editor: 'texttrigger' },
-                    { text: '返回field值样式', dataIndex: 'style', flex: 1, editor: 'styletrigger' },
-                    { text: '返回value值', dataIndex: 'text', flex: 1, editor: 'texttrigger' },
-                    { text: '返回value值样式', dataIndex: 'style', flex: 1, editor: 'styletrigger' }
+                    { text: 'field值', dataIndex: 'fieldtext', flex: 1, editor: 'texttrigger' },
+                    { text: 'field值样式', dataIndex: 'fieldstyle', flex: 1, editor: 'styletrigger' },
+                    { text: 'value值', dataIndex: 'valuetext', flex: 1, editor: 'texttrigger' },
+                    { text: 'value值样式', dataIndex: 'valuestyle', flex: 1, editor: 'styletrigger' }
                 ],
                 plugins: [
                     Ext.create('Ext.grid.plugin.CellEditing', {
@@ -71,9 +71,11 @@ Ext.define('erp.view.core.trigger.FormRenderTrigger', {
                         var grid = this.up('grid');
                         var record = {
                             symbol: 'if',
-                            expression: '1=1',
-                            text: 'value',
-                            style: ''
+                            expression: '1==1',
+                            fieldtext: 'field',
+                            fieldstyle: '{}',
+                            valuetext: 'value',
+                            valuestyle: '{}'
                         };
                         grid.addParam(record);
                     }
@@ -111,7 +113,6 @@ Ext.define('erp.view.core.trigger.FormRenderTrigger', {
                         var rowIndex = store.indexOf(selected);
                         grid.getPlugin().startEditByPosition({row: rowIndex, column: 1});
                     }else {
-                        win.getRender();
                         win.field.setValue(win.getRender());
                     }
                     win.close();
@@ -148,9 +149,9 @@ Ext.define('erp.view.core.trigger.FormRenderTrigger', {
                 var renderFuncStr = '';
                 var conditionStr = '';
                 returnValue.map(function(v) {
-                    conditionStr += v.symbol + '('+ v.expression +'){return{field:{text:' + v.fieldtext + ',style:'+ v.fieldstyle +'},value:{text:'+ v.valuetext +',style:'+ v.valuestyle +'}}}'
+                    conditionStr += v.symbol + (v.symbol=='else'?'':'('+ v.expression +')')+'{return{field:{text:' + v.fieldtext + ',style:'+ v.fieldstyle +'},value:{text:'+ v.valuetext +',style:'+ v.valuestyle +'}}}'
                 });
-                renderFuncStr += 'function(field,value){' + functionBody + conditionStr + '}';
+                renderFuncStr += 'function(field,value){' + functionBody + ';' + conditionStr + '}';
                 return renderFuncStr;
             }
         });

kanban-console/src/main/webapp/resources/app/view/core/trigger/GridRenderTrigger.js

@@ -71,7 +71,7 @@ Ext.define('erp.view.core.trigger.GridRenderTrigger', {
                             symbol: 'if',
                             expression: '1=1',
                             text: 'value',
-                            style: ''
+                            style: '{}'
                         };
                         grid.addParam(record);
                     }
@@ -107,9 +107,10 @@ Ext.define('erp.view.core.trigger.GridRenderTrigger', {
                         var selected = selections[0];
                         selected.set(fieldname, win.getRender());
                         var rowIndex = store.indexOf(selected);
+
+                        debugger;
                         grid.getPlugin().startEditByPosition({row: rowIndex, column: 1});
                     }else {
-                        win.getRender();
                         win.field.setValue(win.getRender());
                     }
                     win.close();
@@ -159,9 +160,9 @@ Ext.define('erp.view.core.trigger.GridRenderTrigger', {
                 var renderFuncStr = '';
                 var conditionStr = '';
                 returnValue.map(function(v) {
-                    conditionStr += v.symbol + '('+ v.expression +'){return{children:' + v.text + ',props:{style:'+ v.style +'}}}'
+                    conditionStr += v.symbol + (v.symbol=='else'?'':'('+ v.expression +')')+'{return{children:' + v.text + ',props:{style:'+ v.style +'}}}'
                 });
-                renderFuncStr += 'function(value,record,index){' + functionBody + conditionStr + '}';
+                renderFuncStr += 'function(value,record,index){' + functionBody + ';' + conditionStr + '}';
                 return renderFuncStr;
             }
         });

kanban-console/src/main/webapp/resources/app/view/core/trigger/TextTrigger.js

@@ -39,7 +39,19 @@ Ext.define('erp.view.core.trigger.TextTrigger', {
                 formBind:true,
                 handler:function(btn){
                     var win = btn.ownerCt.ownerCt;
-                    win.field.setValue(win.getText());
+                    var componet = Ext.getCmp(win.field.ownerCt.el.dom.parentNode.id);
+                    if(componet) {
+                        var grid = componet;
+                        var fieldname = win.field.column.dataIndex;
+                        var selections = grid.getSelectionModel().getSelection();
+                        var store = grid.getStore();
+                        var selected = selections[0];
+                        selected.set(fieldname, win.getText());
+                        var rowIndex = store.indexOf(selected);
+                        grid.getPlugin().startEditByPosition({row: rowIndex, column: 1});
+                    }else {
+                        win.field.setValue(win.getText());
+                    }
                     win.close();
                 }
             },{

kanban-console/src/main/webapp/resources/css/boardshow/main.css

@@ -174,7 +174,7 @@ body,
 .rc-table-title {
   text-align: center;
   font-weight: bold;
-  padding: 5px;
+  padding: 0 5px;
 }
 .rc-table-content {
   height: 100%;