Browse Source

【看板整合】【grid变量名配置项还原】

zhuth 8 years ago
parent
commit
bef2cb6a71

+ 4 - 3
kanban-console/src/main/webapp/resources/app/controller/board.js

@@ -263,10 +263,10 @@ Ext.define('erp.controller.board', {
 	    		if(nodeName == 'form') {
 	    			propfields.push(
 	    				{display: "宽度(%)", property: "width", propvalue: v.getAttribute('width')},
-	            		/*{display: "高度(%)", property: "height", propvalue: v.getAttribute('height')},*/
 						{display: "变量名", property: "value", propvalue: v.getAttribute('value')},
 						{display: "field-style", property: "fieldstyle", propvalue: v.getAttribute('fieldstyle')},
-						{display: "value-style", property: "valuestyle", propvalue: v.getAttribute('valuestyle')});
+						{display: "value-style", property: "valuestyle", propvalue: v.getAttribute('valuestyle')},
+						{display: "显示", property: "rendername", propvalue: v.getAttribute('rendername')});
 	    		}else if(nodeName == 'grid') {
 	    			propfields.push({display: "宽度", property: "width", propvalue: v.getAttribute('width')},
 	            		{display: "排序", property: "sort", propvalue: v.getAttribute('sort')},
@@ -274,7 +274,8 @@ Ext.define('erp.controller.board', {
 						{display: "列样式", property: "rowstyle", propvalue: v.getAttribute('rowstyle')},
 						{display: "显示", property: "rendername", propvalue: v.getAttribute('rendername')},
 						{display: "数据绑定", property: "dataindex", propvalue: v.getAttribute('dataindex')},
-						{display: "值(仅作展示)", property: "data", propvalue: v.getAttribute('data')});
+						{display: "值(仅作展示)", property: "data", propvalue: v.getAttribute('data')},
+						{display: "变量名", property: "value", propvalue: v.getAttribute('value')});
 	    		}else {
 	    			
 	    		}

+ 2 - 2
kanban-console/src/main/webapp/resources/app/view/component/gridcomponent.js

@@ -104,11 +104,11 @@ Ext.define('erp.view.component.gridcomponent',{
 						display: '值(仅作展示)',
 						property: 'data',
 						propvalue: (Math.random()*100 | 0) + ',' + (Math.random()*100 | 0) + ',' + (Math.random()*100 | 0)
-					}/*,{
+					},{
 						display:'变量名',
 						property:'value',
 						propvalue:''
-					}*/]			
+					}]			
 				}
 			}
 		});