Ver código fonte

启动参数行列取值范围调整/修复charts图形切换图形残存bug

zhuth 7 anos atrás
pai
commit
c2b2e0572f

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

@@ -27,6 +27,8 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 	        	layout: 'vbox',
 	        	anchor: '100% 40%',
 	        	defaults: {
+	        		allowBlank: false,
+	        		msgTarget: 'under',
 	        		margin: 5
 	        	},
 	        	items: [{
@@ -83,7 +85,7 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 	        		name: 'areacount',
 	        		value: 1,
 	        		minValue: 1,
-	        		maxValue: 8,
+	        		maxValue: 4,
 	        		hidden: true,
 	        		listeners: {
 	        			change: function(countfiedl) {
@@ -103,7 +105,7 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 	        		name: 'arearows',
 	        		value: 1,
 	        		minValue: 1,
-	        		maxValue: 2,
+	        		maxValue: 4,
 	        		listeners: {
 	        			change: function(rowsfield) {
 	        				var colsfield = rowsfield.nextSibling();
@@ -310,10 +312,15 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
             var me = Ext.getCmp('template'),
             	areaView = Ext.getCmp('areaView'),
                 	areaConfig = areaView.getAreaConfig(),
-                	emptyKanbanIndex = [];
-                	
+                	emptyKanbanIndex = [],
+                	areaForm = Ext.getCmp('areaForm');
+                	areafm = areaForm.getForm(),
+                	areaValues = areafm.getValues();
+              
             if(me.checkAreaConfig(areaConfig)) {
-            	if(Ext.getCmp('areaForm').getForm().findField('viewtype').getValue()=='single') {
+            	if((areaValues.viewtype == 'single' && areafm.findField('arearows').isValid() && areafm.findField('areacols').isValid())
+            		|| (areaValues.viewtype == 'more' && areafm.findField('areacount').isValid())
+            	) {
             		me.setFullScreen();
             	}
             	me.saveAreaView();

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
kanban-console/src/main/webapp/resources/js/boardshow/main.bundle.js


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff