item配置项显示trigger图标/将刷新频率和切换频率合并

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

@@ -1,7 +1,8 @@
 Ext.QuickTips.init();
 Ext.define('erp.controller.desktop', {
     extend: 'Ext.app.Controller',
-    views:['desktop.Desktop', 'desktop.BoardManageLeftPanel', 'desktop.BoardManageMainPanel', 'desktop.BoardManageRightPanel','user.UserSetting'],
+    views:['desktop.Desktop', 'desktop.BoardManageLeftPanel', 'desktop.BoardManageMainPanel', 'desktop.BoardManageRightPanel','user.UserSetting',
+    'core.trigger.TextTrigger'],
     stores:['desktopboard','user'],
     init:function(){
     	var me = this;

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

@@ -5,7 +5,7 @@ Ext.define('erp.view.boardmodel.detailpropertiesgrid',{
 	border:false,
 	plugins: [
         Ext.create('Ext.grid.plugin.CellEditing', {
-            clicksToEdit: 1
+            clicksToEdit: 2
         })
     ],
 	store:Ext.create('Ext.data.Store',{
@@ -22,17 +22,30 @@ Ext.define('erp.view.boardmodel.detailpropertiesgrid',{
 	},{
 		header:'值',
 		flex:0.6,
-		dataIndex:'propvalue'
-	},{
-		xtype:'actioncolumn', 
-		flex:0.1,
-		align: 'center', 
-		items:[{
-	        iconCls: 'text-trigger-icon-grid',
-	        tooltip: '编辑',
-	        handler: function(th, rowIndex, colIndex) {
-	        	alert(1243);
-	        }
-		}]
+		dataIndex:'propvalue',
+		renderer: function(val, meta, record, row, col, store, view){
+	 		var grid = view.ownerCt,column = grid.columns[col];
+			var builderPanel = Ext.getCmp('modelbuilderpanel');
+			var currenSelectPanel = builderPanel.currenSelectPanel; 
+			var propconfig = currenSelectPanel.config.propGridDefault.propconfig;
+
+			for(var i = 0; i < propconfig.length; i++) {
+				if(propconfig[i].property == record.get('property')) {
+					record.set('editor', propconfig[i].editor)
+				}
+			}
+	 		var editorType = record.get('editor') || 'textfield';
+	 		console.log(editorType);
+	 		var icon = '';
+	 		if(editorType == 'styletrigger') {
+	 			icon = 'style';
+	 		}else if(editorType == 'gridrendertrigger' || editorType == 'formrendertrigger') {
+	 			icon = 'render';
+	 		}else return val;
+	 		'Ext.getCmp(\'detailpropertiesgrid\').plugins[0].startEditByPosition({row:5,column:1})'
+		 	meta.style="padding-right:0px!important";
+	 		return  '<span style="display:inline-block;padding-left:2px;width:80%; text-overflow: ellipsis; white-space:nowrap; overflow:hidden;">'+val+'</span>'+
+	 				'<span><img src="'+basePath+'static/images/icons/' + icon + '.png" style="display: inline; float: right; padding-right: 5px;"></span>';
+		 }
 	}]
 });

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

@@ -47,7 +47,7 @@ Ext.define('erp.view.desktop.BoardManageRightPanel',{
                     return v;
                 }
                 },
-                { text: '备注', dataIndex: 'description', flex: 1, editor: 'textfield', renderer: function (v, metadata, record, rowIndex, columnIndex, store) {
+                { text: '备注', dataIndex: 'description', flex: 1, editor: 'texttrigger', renderer: function (v, metadata, record, rowIndex, columnIndex, store) {
                     metadata.tdAttr = 'data-qtip="' + (v || '') + '"';
                     return v;
                 }

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

@@ -29,18 +29,16 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
                 title:'运行设置',
                 layout:'column',
                 defaults:{
-                    columnWidth:0.5,
-                    labelWidth:120
                 },
                 items:[{
                     xtype:'numberfield',
                     id:'refreshFrequency',
                     name:'refreshFrequency',
-                    fieldLabel:'刷新频率(秒/次)',
+                    fieldLabel:'刷新/切换频率(秒/次)',
                     value:'5',
                     minValue:1,
                     allowBlank:false
-                },{
+                },/*{
                     xtype:'numberfield',
                     id:'switchFrequency',
                     name:'switchFrequency',
@@ -48,7 +46,7 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
                     minValue:3,
                     value:'30',
                     minValue:1
-                }]
+                }*/]
             }],
             /**
              * 添加面板参数下拉组件
@@ -206,7 +204,7 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
                             var formData = {
                                 data: {
                                     refreshFrequency: res.refreshFrequency,
-                                    switchFrequency: res.switchFrequency,
+                                    switchFrequency: res.refreshFrequency,
                                 },
                                 getData: function() {
                                     return this.data
@@ -269,16 +267,16 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
             code: me.resData.code,
             parameters: Ext.encode(parameters),
             refreshFrequency: config.refreshFrequency,
-            switchFrequency: config.switchFrequency,
+            switchFrequency: config.refreshFrequency,
             relatedKanbans: relatedKanbans
         }
     },
     checkFrequency:function(){
         var me = this;
         var refreshFreq = Ext.getCmp('refreshFrequency').value;
-        var switchFreq = Ext.getCmp('switchFrequency').value;
+        var switchFreq = Ext.getCmp('refreshFrequency').value;
         if(switchFreq){
-            if(refreshFreq>=switchFreq){
+            if(refreshFreq>switchFreq){
                 showErrorMsg('警告','刷新频率必须小于切换频率!');
                 return false;
             }

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

@@ -474,3 +474,11 @@ div.ux-taskbar div.x-toolbar {
 .x-tool-close {
     background-image:url(../images/icons/window-close.png) !important;
 }
+
+/** trigger icon **/
+.text-trigger-icon-form {
+    background-repeat: no-repeat !important;
+    background-position-y: 2px !important;
+    background-position-x: 0 !important;
+    background-image: url(../images/icons/text.png) !important;
+}