Browse Source

调整配置中心面板保存按钮位置/调整window标题栏按钮样式(更大)/调整看板添加因为排序不能添加到最后一行的问题

zhuth 8 years ago
parent
commit
6fe05b892c

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

@@ -16,9 +16,7 @@ Ext.define('erp.view.desktop.BoardManageMainPanel', {
             fields: ['type', 'name'],
             data: [
                 { "type": "String", "name": "下拉框" },
-				{ "type": "SQL", "name": "SQL取数" },
-				// { "type": "Date", "name": "日期"},
-				// { "type": "Number", "name": "数字"}
+				{ "type": "SQL", "name": "SQL取数" }
             ]
         });
         var dataTypeCombo = new Ext.form.ComboBox({
@@ -41,6 +39,7 @@ Ext.define('erp.view.desktop.BoardManageMainPanel', {
 			xtype: 'form',
 			id:'boardSetForm',
 			region: 'north',
+			height: '30%',
 			bodyStyle: {
 				border: 'none'
 			},
@@ -106,10 +105,81 @@ Ext.define('erp.view.desktop.BoardManageMainPanel', {
 				queryMode: 'local',
 				displayField: 'name',
 				valueField: 'code'
-			}]
+			}],
+			bbar: ['->', {
+				xtype: 'button',
+				text: '保存',
+				width: 100,
+				handler: function() {
+					var formpanel = Ext.getCmp('boardSetForm');
+					if(formpanel.isValid()) {
+						formpanel.savePanel(formpanel)
+					}else {
+						Ext.Msg.alert('警告', '有必填项未填!');
+					}
+				}
+			}, '->'],
+			savePanel: function(formpanel) {
+				var me = this;
+				var managePanel = Ext.getCmp('manage');
+				var el = me.getEl();
+				if(!managePanel.selectedPanelRecord) {
+					Ext.Msg.confirm('提示', '请先选择左侧面板')
+					return;
+				}
+				var newRecord = {
+					data: formpanel.getForm().getValues(),
+					getData: function() {
+						return this.data;
+					}
+				};
+		
+				var values = formpanel.getForm().getValues();
+				
+				var type;
+				if(values.code){
+					type = 'update';
+				}else{
+					type = 'save';
+				}
+				el.mask('保存中...');
+				Ext.Ajax.request({
+					url:'panel/'+type,
+					method:'POST',
+					params:{
+						json:Ext.encode(values)
+					},
+					callback:function(options,success,response){
+						el.unmask();
+						var res = Ext.decode(response.responseText);
+						if(typeof(res.success)!=='undefined'&&res.success==false){
+							Ext.Msg.alert('保存失败',res.message);
+						}else{
+							Ext.Msg.alert('提示','保存成功!');
+							var desktop = Ext.getCmp('desktop');
+							desktop.shortcutsView.store.reload();
+							if(type=='save'){
+								newRecord.data.code = res.code;
+							}
+							var r = {
+								data: newRecord.data,
+								get: function(key) {return this[key]},
+								set: function(key, value) {this[key] = value},
+								getData: function() {return this.data}
+							}
+							// 更新左侧item
+							var leftpanel = Ext.getCmp('manageleft');
+							leftpanel.updateItem(r);
+		
+							me.setPanelDisabled();
+						}
+					}
+				});
+			}
 		}, {
 			xtype: 'grid',
 			region: 'center',
+			height: '70%',
 			id:'boardParamsGrid',
 			store: Ext.create('Ext.data.JsonStore',{
 				fields: ['code', 'name', 'type', 'optionalValues'],

+ 3 - 20
kanban-console/src/main/webapp/resources/app/view/desktop/BoardManageRightPanel.js

@@ -95,7 +95,7 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 				disabled: true,
 				handler: function() {
 					if(!Ext.getCmp('managemain').initRecord.get('code')) {
-						Ext.Msg.alert('提示', '请先保存面板再执行添加参数操作!');
+						Ext.Msg.alert('提示', '请先保存面板再执行添加看板操作!');
 						return;
 					}
 					var grid = this.up('grid');
@@ -153,25 +153,8 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 			},
 			addModel: function(record) {
 				var grid = this;
-				grid.getStore().add(record);
-				grid.getPlugin().startEditByPosition({ row: grid.getStore().getCount() - 1, column: 1 });
-				return;
-				Ext.Ajax.request({
-					url:'kanban/save',
-					method:'POST',
-					params:{
-						json:Ext.encode(record)
-					},
-					callback:function(options,success,response){
-						var res = Ext.decode(response.responseText);
-						if(typeof(res.success)!=='undefined'&&res.success==false){
-							Ext.Msg.alert('添加失败',res.message);
-						}else{
-							grid.getStore().add(record);
-							grid.getPlugin().startEditByPosition({ row: grid.getStore().getCount() - 1, column: 1 });
-						}
-					}
-				});
+				grid.getStore().insert(grid.getStore().getCount(), record);
+				grid.getPlugin().startEditByPosition({ row: grid.getStore().getCount() - 1, column: 0 });
 			},
 			saveModel: function(record) {
 				var grid = this;

+ 4 - 82
kanban-console/src/main/webapp/resources/app/view/desktop/BoardManageWindow.js

@@ -17,100 +17,22 @@ Ext.define('erp.view.desktop.BoardManageWindow',{
 			layout: 'border',
 			items: [{
 				xtype: 'manageleft',
-				width: 200,
+				width: '20%',
 				region: 'west'
 			},{
 				xtype: 'managemain',
+				width: '40%',
 				region: 'center',
 			},{
 				xtype: 'manageright',
 				region: 'east',
-				width:550
+				width: '40%',
 			}]
 		}];
-		me.buttons = [{
-			xtype: 'button',
-			text: '保存',
-			handler: function() {
-				var panel = me.items.items[0].items.items[1];
-				var formpanel = panel.items.items[0];
-				if(formpanel.isValid()) {
-					me.save(formpanel, panel)
-				}else {
-					Ext.Msg.alert('警告', '有必填项未填!');
-				}
-			}
-		}, {
-			xtype: 'button',
-			text: '退出',
-			handler: function(btn) {
-				btn.ownerCt.ownerCt.close();
-			}
-		}],	
 		me.callParent(arguments);
 	},
 	setSelectPanelRecord: function(record) {
 		this.selectedPanelRecord = record;
 	},
-	save: function(formpanel, panel) {
-		var me = this;
-		var el = me.getEl();
-		if(!me.selectedPanelRecord) {
-			Ext.Msg.confirm('提示', '请先选择左侧面板')
-			return;
-		}
-		var newRecord = {
-			data: formpanel.getForm().getValues(),
-			getData: function() {
-				return this.data;
-			}
-		};
-
-		var values = formpanel.getForm().getValues();
-		
-		var type;
-		if(values.code){
-			type = 'update';
-		}else{
-			type = 'save';
-			// delete values.code;
-		}
-		el.mask('保存中...');
-		Ext.Ajax.request({
-			url:'panel/'+type,
-			method:'POST',
-			params:{
-				json:Ext.encode(values)
-			},
-			callback:function(options,success,response){
-				el.unmask();
-				var res = Ext.decode(response.responseText);
-				if(typeof(res.success)!=='undefined'&&res.success==false){
-					Ext.Msg.alert('保存失败',res.message);
-				}else{
-					Ext.Msg.alert('提示','保存成功!');
-					// Ext.getCmp('code').setValue(res.code);
-					var desktop = Ext.getCmp('desktop');
-					desktop.shortcutsView.store.reload();
-					if(type=='save'){
-						newRecord.data.code = res.code;
-					}
-					var r = {
-						data: newRecord.data,
-						get: function(key) {return this[key]},
-						set: function(key, value) {this[key] = value},
-						getData: function() {return this.data}
-					}
-					// panel.initRecord = r;
-					// 更新左侧item
-					var leftpanel = Ext.getCmp('manageleft');
-					leftpanel.updateItem(r);
-
-					var mainpanel = Ext.getCmp('managemain');
-					mainpanel.setPanelDisabled();
-					// panel.load(r);
-				}
-			}
-		});
-	},
+	
 }); 

+ 35 - 0
kanban-console/src/main/webapp/resources/css/desktop.css

@@ -435,3 +435,38 @@ div.ux-taskbar div.x-toolbar {
 	background-position-x: 0 !important; 
 }
 
+/*----------------------------------------------------
+    base window
+*/
+
+.x-window-header-default .x-box-inner {
+    height: 20px !important;
+}
+.x-tool {
+    height: 20px !important;
+}
+.x-box-target .x-tool:nth-last-of-type(3) { 
+    margin-left: -50px !important;
+}
+.x-box-target .x-tool:nth-last-of-type(2) { 
+    margin-left: -50px !important;
+}
+.x-box-target .x-tool:nth-last-of-type(1) { 
+    margin-left: -16px !important;
+}
+.x-tool-img {
+    height: 20px !important;
+    width: 20px !important;
+    background-repeat: no-repeat !important; 
+    background-position-y: 0px !important;
+	background-position-x: 0 !important;
+}
+.x-tool-maximize {
+	background-image:url(../images/icons/window-fullscreen.png) !important;
+}
+.x-tool-restore {
+    background-image:url(../images/icons/window-restore.png) !important;
+}
+.x-tool-close {
+    background-image:url(../images/icons/window-close.png) !important;
+}

BIN
kanban-console/src/main/webapp/resources/images/icons/fullscreen.png


BIN
kanban-console/src/main/webapp/resources/images/icons/window-close.png


BIN
kanban-console/src/main/webapp/resources/images/icons/window-fullscreen.png


BIN
kanban-console/src/main/webapp/resources/images/icons/window-restore.png