多看版时切换频率必填检验/看板展示table增加边框线，行高计算微调/看板设置支持updatePart

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

@@ -245,8 +245,6 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 		if(extraParams){
 			Ext.apply(json,extraParams);
 		}
-		json.name = modelName;
-		json.panelCode = panelCode;
 		Ext.Ajax.request({
         	url:'kanban/'+type,
         	method:'POST',

kanban-console/src/main/webapp/resources/app/view/boardmodel/modeltree.js

@@ -8,7 +8,6 @@ Ext.define('erp.view.boardmodel.modeltree',{
 	title: panelName + '  >>  ' + modelName,
 	collapsible:true,
 	columnLines: true,
-	// plugins:[Ext.create('erp.view.plugin.tplgridcontextmenu')],
 	store: Ext.create('Ext.data.JsonStore',{
 		fields: ['code', 'name', 'optionalValues'],
 		data: []

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

@@ -66,9 +66,18 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 						data.set = function(key, value) {
 							this[key] = value;
 						}
-						// delete data.content;
-						// delete data.title;
-						grid.saveModel(data);
+						delete data.content;
+						delete data.title;
+						var record = {
+							code: data.code,
+							panelCode: data.panelCode,
+							description: data.description,
+							enabled: data.enabled,
+							name: data.name,
+							get: data.get,
+							set: data.set
+						}
+						grid.saveModel(record);
 					}
 				}, '-', {
 					iconCls: 'edit',
@@ -166,7 +175,7 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
 			},
 			saveModel: function(record) {
 				var grid = this;
-				var type = record.get('code') ? 'updatePart' : 'save'
+				var type = record.get('code') ? 'updatePart' : 'savePart'
 				Ext.Ajax.request({
 					url:'kanban/' + type,
 					method:'POST',

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

@@ -22,8 +22,6 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 			items:[{
 				xtype:'fieldset',
 				title:'参数设置',
-				// items:items,
-				// hidden:items.length>0?false:true
 			},{
 				xtype:'fieldset',
 				title:'运行设置',
@@ -47,7 +45,6 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 					fieldLabel:'切换频率(秒/次)',
 					minValue:3,
 					value:'30',
-					// allowBlank:templateCode.length>0?false:true,//如果有多个模板，则切换频率是必填项
 					minValue:1
 				}]
 			}],
@@ -154,6 +151,7 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 			var formpanel = Ext.getCmp('paramForm');
 			if(formpanel.isValid()) {
 				me.savePanelInstance();
+				me.setFullScreen();
 			}else {
 				Ext.Msg.alert('警告', '有必填项未填!');
 			}
@@ -269,6 +267,8 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 		})
 		return {
 			code: me.resData.code,
+			panelCode: me.resData.panelCode,
+			userCode: me.resData.userCode,
 			panelVersion: me.resData.panelVersion,
 			userPanelRelationCode: me.resData.userPanelRelationCode,
 			parameters: Ext.encode(parameters),
@@ -278,23 +278,42 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 		}
 	},
     checkFrequency:function(){
-    	var me = this;
+		var me = this;
     	var refreshFreq = Ext.getCmp('refreshFrequency').value;
     	var switchFreq = Ext.getCmp('switchFrequency').value;
     	if(switchFreq){
-    		if(refreshFreq>=switchFreq){
-    			Ext.Msg.alert('警告','刷新频率必须小于切换频率!');
+			if(refreshFreq>=switchFreq){
+				Ext.Msg.alert('警告','刷新频率必须小于切换频率!');
     			return false;
     		}
-    	}
+		}else {
+			var modelGrid = Ext.getCmp('modelGrid');
+			// 看板数量为2个以上时切换频率不可为空
+			if(modelGrid.getSelectedModels().length >= 2) {
+				Ext.Msg.alert('警告','切换频率不可为空');
+    			return false;
+			}
+		}
     	return true;
     },
     viewBoard:function(){
-    	var me = this;
+		var me = this;
     	Ext.getCmp('template').close();
     	Ext.create('erp.view.desktop.BoardWindow',{
     		instanceCode:me.resData.code,
     		html:'<iframe src="boardshow?code=' + me.resData.code + '" width="100%" height="100%" style="border:none"></iframe>'
-    	}).show();
+		}).show();
+	},
+	setFullScreen: function () {
+		var element = document.documentElement;
+		if (element.requestFullscreen) {
+			element.requestFullscreen();
+		} else if (element.mozRequestFullScreen) {
+			element.mozRequestFullScreen();
+		} else if (element.webkitRequestFullscreen) {
+			element.webkitRequestFullscreen();
+		} else if (element.msRequestFullscreen) {
+			element.msRequestFullscreen();
+		}
 	}
 }); 

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

@@ -15,9 +15,6 @@ Ext.define('erp.view.desktop.BoardWindow',{
 	id:'win',
 	fullscreen:false,
 	listeners:{
-		afterrender:function(win){
-			win.setFullScreen();
-		},
 		resize:function( win, width, height, eOpts ){
 			Ext.Array.each(win.dockedItems.items,function(item){
 				if(window.innerHeight == screen.height){
@@ -42,7 +39,6 @@ Ext.define('erp.view.desktop.BoardWindow',{
 		}
 	}],
 	setFullScreen:function(){
-    	var me = this;
 		var element = document.documentElement;
         if (element.requestFullscreen) {
           element.requestFullscreen();

kanban-console/src/main/webapp/resources/css/boardshow/main.css

@@ -194,11 +194,14 @@ body,
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  border: 1px solid white;
+  box-sizing: border-box;
 }
 .fade-enter {
   animation-duration: .5s;
   animation-fill-mode: both;
   opacity: .7;
+  border: none;
   animation-timing-function: linear;
   animation-play-state: paused;
 }
@@ -206,6 +209,7 @@ body,
   animation-duration: .5s;
   animation-fill-mode: both;
   opacity: .7;
+  border: none;
   animation-timing-function: linear;
   animation-play-state: paused;
 }
@@ -214,6 +218,7 @@ body,
   animation-fill-mode: both;
   transform: translateX(0px);
   opacity: .5;
+  border: none;
   animation-timing-function: ease-out;
   animation-play-state: paused;
 }
@@ -232,17 +237,21 @@ body,
 @keyframes fadeIn {
   0% {
     opacity: .7;
+    border: none;
   }
   100% {
     opacity: 1;
+    border: none;
   }
 }
 @keyframes fadeOut {
   0% {
     opacity: .5;
+    border: none;
   }
   100% {
     opacity: 0;
+    border: none;
   }
 }
 .rc-title {