Browse Source

公共参数文本框类型保存展示调整

zhuth 8 years ago
parent
commit
0c08bec3bd

+ 2 - 2
kanban-console/src/main/webapp/resources/app/view/desktop/BoardParamWindow.js

@@ -109,10 +109,10 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 		return items;
 	},
 	getManualField:function(param){
-		var xtype;
+		var xtype = 'textfield';
 		if(param.type=='Number'){
 			xtype = 'numberfield';
-		}else if(param.type=='Number'){
+		}else if(param.type=='Text'){
 			xtype = 'textfield';
 		}else if(param.type=='Date'){
 			xtype = 'datefield';

+ 9 - 4
kanban-console/src/main/webapp/resources/app/view/desktop/GlobalParamWindow.js

@@ -85,10 +85,15 @@ Ext.define('erp.view.desktop.GlobalParamWindow', {
                     handler: function(grid, rowIndex, colIndex) {
                         var rec = grid.getStore().getAt(rowIndex);
                         var data = rec.data;
-                        if(data.type == 'String') {
-                            data.optionalValues = data.optionalValues instanceof Array ? data.optionalValues : data.optionalValues.split(',')
-                        }else if(data.type == 'SQL') {
-                            data.optionalValues = data.optionalValues instanceof Array ? data.optionalValues : [data.optionalValues]
+                        if(data.inputMode == 'Manual') {
+                            delete data.defaultOptionalValueIndex
+                            delete data.optionalValues
+                        }else {
+                            if(data.type == 'String') {
+                                data.optionalValues = data.optionalValues instanceof Array ? data.optionalValues : data.optionalValues.split(',')
+                            }else if(data.type == 'SQL') {
+                                data.optionalValues = data.optionalValues instanceof Array ? data.optionalValues : [data.optionalValues]
+                            }
                         }
                         me.saveParam(data, grid);
                     }