瀏覽代碼

form添加宽度控制,报错item宽度和field-value宽度,原有width=100%逻辑改为“换行

zhuth 8 年之前
父節點
當前提交
cf5d30841b

+ 6 - 0
kanban-console/src/main/resources/map-rule.xsl

@@ -32,6 +32,9 @@
                                     <text>
                                         <xsl:value-of select="@name"/>
                                     </text>
+                                    <width>
+                                    	<xsl:value-of select="@fieldwidth"/>
+                                    </width>
                                     <style>
                                         <xsl:value-of select="@fieldstyle"/>
                                     </style>
@@ -40,6 +43,9 @@
                                     <text>
                                         <xsl:value-of select="@value"/>
                                     </text>
+                                    <width>
+                                    	<xsl:value-of select="@valuewidth"/>
+                                    </width>
                                     <style>
                                         <xsl:value-of select="@valuestyle"/>
                                     </style>

+ 9 - 7
kanban-console/src/main/webapp/resources/app/controller/board.js

@@ -166,16 +166,15 @@ Ext.define('erp.controller.board', {
 					var builderPanel = Ext.getCmp('modelbuilderpanel');
 					var currenSelectPanel = builderPanel.currenSelectPanel; 
 					var propconfig = currenSelectPanel.config.propGridDefault.propconfig;
-
+					
+					var editor;
 					for(var i = 0; i < propconfig.length; i++) {
 						if(propconfig[i].property == record.get('property')) {
-							record.set('editor', propconfig[i].editor)
+							console.log(propconfig[i].editor);
+							editor = propconfig[i].editor || {xtype: 'textfield'};
 						}
 					}
-					var startTime ={
-						xtype: record.get('editor') || 'textfield'
-					};
-					column.setEditor(startTime);
+					column.setEditor(editor);
 					gridview.up('grid').getPlugin().startEditByPosition({row: rowIndex, column: 1});
                 }
     		}
@@ -308,8 +307,11 @@ Ext.define('erp.controller.board', {
     			var propfields = [];
 	    		if(nodeName == 'form') {
 	    			propfields.push(
-	    				{display: "宽度(%)", property: "width", propvalue: v.getAttribute('width')},
 						{display: "变量名", property: "value", propvalue: v.getAttribute('value')},
+	    				{display: "宽度(%)", property: "width", propvalue: v.getAttribute('width')},
+	    				{display: "field宽度(%)", property: "fieldwidth", propvalue: v.getAttribute('fieldwidth')},
+	    				{display: "value宽度(%)", property: "valuewidth", propvalue: v.getAttribute('valuewidth')},
+	    				{display: "换行", property: "fill", propvalue: v.getAttribute('fill')},
 						{display: "field-style", property: "fieldstyle", propvalue: v.getAttribute('fieldstyle')},
 						{display: "value-style", property: "valuestyle", propvalue: v.getAttribute('valuestyle')},
 						{display: "显示", property: "rendername", propvalue: v.getAttribute('rendername')});

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

@@ -35,7 +35,6 @@ Ext.define('erp.view.boardmodel.detailpropertiesgrid',{
 				}
 			}
 	 		var editorType = record.get('editor') || 'textfield';
-	 		console.log(editorType);
 	 		var icon = '';
 	 		if(editorType == 'styletrigger') {
 	 			icon = 'style';

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

@@ -2,7 +2,7 @@
 Ext.define('erp.view.boardmodel.elementconfigpanel',{
 	extend:'Ext.tab.Panel',
 	id:'elementconfigpanel',
-	width:300,
+	width:330,
 	alias:'widget.elementconfigpanel',
 	currenSelectPanel:null,
 	split:true,

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

@@ -11,7 +11,7 @@ Ext.define('erp.view.boardmodel.viewport',{
 		Ext.apply(me, {
 			items : [{
 				xtype:'modeltree',
-				width:250,
+				width:230,
 				region:'west'
 			},{
 				xtype:'modeleditpanel',

+ 1 - 1
kanban-console/src/main/webapp/resources/app/view/core/trigger/StyleTrigger.js

@@ -128,7 +128,7 @@ Ext.define('erp.view.core.trigger.StyleTrigger', {
                     queryMode: 'local',
                     displayField: 'name',
                     valueField: 'value',
-                    emptyText: '居中'
+                    emptyText: '左对齐'
                 }, {
                     xtype: 'textfield',
                     fieldLabel: '自定义',

文件差異過大導致無法顯示
+ 0 - 0
kanban-console/src/main/webapp/resources/js/boardshow/main.bundle.js


文件差異過大導致無法顯示
+ 0 - 0
kanban-console/src/main/webapp/resources/lib/boardshow/vendor.js


部分文件因文件數量過多而無法顯示