Merge branch 'master' of ssh://10.10.101.21/source/kanban-parent

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

@@ -270,13 +270,11 @@ Ext.define('erp.controller.board', {
 	    		}else if(nodeName == 'grid') {
 	    			propfields.push({display: "宽度", property: "width", propvalue: v.getAttribute('width')},
 	            		{display: "排序", property: "sort", propvalue: v.getAttribute('sort')},
-						/*{display: "样式名", property: "cls", propvalue: v.getAttribute('cls')},*/
 						{display: "列头样式", property: "headerrowstyle", propvalue: v.getAttribute('headerrowstyle')},
 						{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: "value", propvalue: v.getAttribute('value')});
+						{display: "值（仅作展示）", property: "data", propvalue: v.getAttribute('data')});
 	    		}else {
 	    			
 	    		}

kanban-console/src/main/webapp/resources/app/view/component/barcomponent.js

@@ -41,7 +41,8 @@ Ext.define('erp.view.component.barcomponent',{
 				},{
 					xtype:'checkbox',
 					fieldLabel:'是否开启动画',
-					name:'animate'
+					name:'animate',
+					hidden: true
 				},{
 					xtype:'fieldset',
 					title:'X轴',
@@ -128,7 +129,7 @@ Ext.define('erp.view.component.barcomponent',{
 					}]
 				},{
 					xtype:'textfield', 
-					fieldLabel:'数据组',
+					fieldLabel:'数据组字段',
 					name:'fields',
 					value: '数据组0,数据组1,数据组2'
 				},{

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

@@ -84,11 +84,7 @@ Ext.define('erp.view.component.gridcomponent',{
 						display: '排序',
 						property: 'sort',
 						propvalue: 0
-					},/*{
-						display: '样式名',
-						property: 'cls',
-						propvalue:''
-					},*/{
+					},{
 						display: '列头样式',
 						property: 'headerrowstyle',
 						propvalue:''
@@ -108,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:''
-					}]			
+					}*/]			
 				}
 			}
 		});

kanban-console/src/main/webapp/resources/app/view/component/linecomponent.js

@@ -41,7 +41,8 @@ Ext.define('erp.view.component.linecomponent',{
 				},{
 					xtype:'checkbox',
 					fieldLabel:'是否开启动画',
-					name:'animate'
+					name:'animate',
+					hidden: true
 				},{
 					xtype:'fieldset',
 					title:'X轴',
@@ -128,7 +129,7 @@ Ext.define('erp.view.component.linecomponent',{
 					}]
 				},{
 					xtype:'textfield', 
-					fieldLabel:'数据组',
+					fieldLabel:'数据组字段',
 					name:'fields',
 					value: '数据组0,数据组1,数据组2'
 				},{

kanban-console/src/main/webapp/resources/app/view/component/piecomponent.js

@@ -31,14 +31,15 @@ Ext.define('erp.view.component.piecomponent',{
 				},{
 					xtype:'checkbox',
 					fieldLabel:'是否开启动画',
-					name:'animate'
+					name:'animate',
+					hidden: true
 				},{
 					xtype:'textfield',
-					fieldLabel:'数据组名',
+					fieldLabel:'名称字段',
 					name:'field'
 				},{
 					xtype:'textfield',
-					fieldLabel:'数据值名',
+					fieldLabel:'值字段',
 					name:'value'
 				},{
 					xtype:'textarea',