Merge branch 'dev' into feature-format-code

kanban-console/pom.xml

@@ -178,17 +178,17 @@
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>
-                                            com.google.code.maven-svn-revision-number-plugin
+                                            org.codehaus.mojo
                                         </groupId>
                                         <artifactId>
-                                            svn-revision-number-maven-plugin
+                                            buildnumber-maven-plugin
                                         </artifactId>
                                         <versionRange>
-                                            [1.13,)
+                                            [1.3,)
                                         </versionRange>
                                         <goals>
                                             <goal>
-                                                revision
+                                                create-timestamp
                                             </goal>
                                         </goals>
                                     </pluginExecutionFilter>

kanban-console/src/main/webapp/resources/app/view/desktop/BoardManageMainPanel.js

@@ -48,7 +48,7 @@ Ext.define('erp.view.desktop.BoardManageMainPanel', {
 				fieldLabel: '模板字段',
 				name: 'templateCodes',
 				id:'templateCodes',
-				hidden:false
+				hidden:true
 			},{
 				xtype: 'combobox',
 				fieldLabel: '资源点',

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

@@ -15,6 +15,20 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 		me.refreshWindow(true);
 		me.callParent(arguments);
 	},
+	buttonAlign: 'center',
+	buttons:[{
+		text:'确定',
+		formBind:true,
+		handler:function(){
+			var me = Ext.getCmp('template');
+			me.saveBoardSetting();
+		}
+	},{
+		text:'取消',
+		handler:function(btn){
+			btn.ownerCt.ownerCt.close()
+		}
+	}],
 	refreshWindow: function(firstBuild) {
 		var me = this;
 		var record = me.record;
@@ -213,20 +227,6 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 					allowBlank:templateCode.length>0?false:true,//如果有多个模板，则切换频率是必填项
 					minValue:1
 				}]
-			}],
-			buttons:[{
-				text:'确定',
-				formBind:true,
-				handler:function(){
-					var me = Ext.getCmp('template');
-					me.saveBoardSetting();
-				}
-			},{
-				text:'取消',
-				handler:function(btn){
-					var form = btn.ownerCt.ownerCt;
-					form.ownerCt.close();
-				}
 			}]
 		},{
 			xtype: 'grid',