ソースを参照

添加备份时先执行保存/form列数设置无效问题处理

zhuth 8 年 前
コミット
6704874275

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

@@ -347,6 +347,7 @@ Ext.define('erp.controller.board', {
 				interval: ch.getAttribute('interval'),
 				pagesize: ch.getAttribute('pagesize'),
 				sql: ch.getAttribute('sql'),
+				columns: ch.getAttribute('columns'),
 				fieldstyle: ch.getAttribute('fieldstyle'),
 				valuestyle: ch.getAttribute('valuestyle'),
 				fields: ch.getAttribute('fields'),

+ 1 - 0
kanban-console/src/main/webapp/resources/app/view/boardmodel/modelbackupgrid.js

@@ -57,6 +57,7 @@ Ext.define('erp.view.boardmodel.modelbackupgrid',{
 												this[key] = value;
 											};
 											view.fireEvent('repaintcomponent', view, record);
+											Ext.getCmp('modelbackupwin').close();
 										}catch(e) {
 											Ext.Msg.alert(e.name, e.message)
 										}

+ 28 - 19
kanban-console/src/main/webapp/resources/app/view/boardmodel/modeleditpanel.js

@@ -62,23 +62,26 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 						if(btn == 'cancel') {
 							return;
 						}
-						me.el.mask('loading...');
-						Ext.Ajax.request({
-							url:'kanbanHistory/backup/byKanban/' + modelCode,
-							params: {
-								description: txt
-							},
-							method:'POST',
-							callback:function(options,success,response){
-								me.el.unmask();
-								if(response.responseText == '') return;
-								var res = JSON.parse(response.responseText);
-								if(success) {
-									showErrorMsg('成功', '备份成功!');
-								}else {
-									showErrorMsg('失败', res.message);
+						me.saveAsXml(null, function() {
+							me.el.mask('loading...');
+							Ext.Ajax.request({
+								url:'kanbanHistory/backup/byKanban/' + modelCode,
+								params: {
+									description: txt
+								},
+								method:'POST',
+								callback:function(options,success,response){
+									me.el.unmask();
+									if(response.responseText == '') return;
+									var res = JSON.parse(response.responseText);
+									if(success) {
+										showErrorMsg('成功', '备份成功!');
+									}else {
+										showErrorMsg('失败', res.message);
+									}
 								}
-							}
+							});
+						
 						});
 					});
 				}
@@ -254,7 +257,7 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 		}
 		win.show();
 	},
-	saveAsXml:function(extraParams){
+	saveAsXml:function(extraParams, callBackFunction){
 		var me = this;
 		var builderPanel = Ext.getCmp('modelbuilderpanel');
 		var items = builderPanel.items.items;
@@ -269,7 +272,7 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 				return;
 			}
 		}
-		me.save(content,extraParams);
+		me.save(content,extraParams, callBackFunction);
 	},
 	getParams: function(content) {
 		var reg = /\$P{([^\}]{0,})\}/g
@@ -308,7 +311,8 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 		content += '</content>';	
 		return content;
 	},
-	save:function(content,extraParams){
+	save:function(content,extraParams,callBackFunction){
+		var me = this;
 		var modelbuilderpanel = Ext.getCmp('modelbuilderpanel');
 		var record = modelbuilderpanel.modelRecord;
 		var modelCode = record.get('code');
@@ -324,6 +328,7 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 		if(extraParams){
 			Ext.apply(json,extraParams);
 		}
+		me.el.mask('loading...');
 		Ext.Ajax.request({
         	url:'kanban/'+type,
         	method:'POST',
@@ -331,8 +336,12 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
         		json:Ext.encode(json)
         	},
         	callback:function(options,success,response){
+        		me.el.unmask();
 				var res = Ext.decode(response.responseText);
 				if(success) {
+					if(callBackFunction) {
+						callBackFunction();
+					}
 					showErrorMsg('提示','保存成功!');
 				}else {
 					showErrorMsg('失败', res.message);