Home Explore Help
Register Sign In
usoft
/
kanban-parent
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

【看板整合】【看板展示-支持自定义grid样式定义/看板配置-调整增加grid样式定义项】

zhuth 8 years ago
parent
1dfffde6c8
commit
9f2cc4b714
5 changed files with 27 additions and 7 deletions
Unified View Show Diff Stats
  1. 2 2
      kanban-console/src/main/webapp/WEB-INF/views/boardshow.html
  2. 6 2
      kanban-console/src/main/webapp/resources/app/controller/board.js
  3. 18 2
      kanban-console/src/main/webapp/resources/app/view/component/gridcomponent.js
  4. 0 0
      kanban-console/src/main/webapp/resources/js/boardshow/src/main.bundle.js
  5. 1 1
      kanban-console/src/main/webapp/resources/js/boardshow/src/manifest.js

+ 2 - 2
kanban-console/src/main/webapp/WEB-INF/views/boardshow.html
View File 

@@ -3,8 +3,8 @@
 
 <head lang="en">

 <head lang="en">

   <meta charset="UTF-8">

   <meta charset="UTF-8">

   <title>Board</title>

   <title>Board</title>

-<link rel="shortcut icon" href="favicon.ico"><link href="static/css/boardshow/main.css?2d0bde58ba5ac1bdb64a" rel="stylesheet"></head>

+<link rel="shortcut icon" href="favicon.ico"><link href="static/css/boardshow/main.css?706f6124f48906933931" rel="stylesheet"></head>

 <body style="margin:0px">

 <body style="margin:0px">

   <div id="root"></div>

   <div id="root"></div>

-<script type="text/javascript" src="static/js/boardshow/src/manifest.js?2d0bde58ba5ac1bdb64a"></script><script type="text/javascript" src="static/js/boardshow/src/vendor.js?2d0bde58ba5ac1bdb64a"></script><script type="text/javascript" src="static/js/boardshow/src/main.bundle.js?2d0bde58ba5ac1bdb64a"></script></body>

+<script type="text/javascript" src="static/js/boardshow/src/manifest.js?706f6124f48906933931"></script><script type="text/javascript" src="static/js/boardshow/src/vendor.js?706f6124f48906933931"></script><script type="text/javascript" src="static/js/boardshow/src/main.bundle.js?706f6124f48906933931"></script></body>

 </html>
 
 </html>

+ 6 - 2
kanban-console/src/main/webapp/resources/app/controller/board.js
View File 

@@ -270,7 +270,9 @@ Ext.define('erp.controller.board', {
 
 	    		}else if(nodeName == 'grid') {

 	    		}else if(nodeName == 'grid') {

 	    			propfields.push({display: "宽度", property: "width", propvalue: v.getAttribute('width')},

 	    			propfields.push({display: "宽度", property: "width", propvalue: v.getAttribute('width')},

 	            		{display: "排序", property: "sort", propvalue: v.getAttribute('sort')},

 	            		{display: "排序", property: "sort", propvalue: v.getAttribute('sort')},

-						{display: "样式名", property: "cls", propvalue: v.getAttribute('cls')},

+						/*{display: "样式名", property: "cls", propvalue: v.getAttribute('cls')},*/

+						{display: "列头样式", property: "headerrowstyle", propvalue: v.getAttribute('headerrowstyle')},

+						{display: "列样式", property: "rowstyle", propvalue: v.getAttribute('rowstyle')},

 						{display: "显示", property: "rendername", propvalue: v.getAttribute('rendername')},

 						{display: "显示", property: "rendername", propvalue: v.getAttribute('rendername')},

 						{display: "数据绑定", property: "dataindex", propvalue: v.getAttribute('dataindex')},

 						{display: "数据绑定", property: "dataindex", propvalue: v.getAttribute('dataindex')},

 						{display: "值（仅作展示）", property: "data", propvalue: v.getAttribute('data')},

 						{display: "值（仅作展示）", property: "data", propvalue: v.getAttribute('data')},

@@ -289,7 +291,9 @@ Ext.define('erp.controller.board', {
 
     		

     		

     		var baseConfigFormValue = {

     		var baseConfigFormValue = {

 				title: ch.getAttribute('title'),

 				title: ch.getAttribute('title'),

-				allcls: ch.getAttribute('allcls'),

+				/*allcls: ch.getAttribute('allcls'),*/

+				headerrowsstyle: ch.getAttribute('headerrowsstyle'),

+				rowsstyle: ch.getAttribute('rowsstyle'),

 				allrender: ch.getAttribute('allrender'),

 				allrender: ch.getAttribute('allrender'),

 				interval: ch.getAttribute('interval'),

 				interval: ch.getAttribute('interval'),

 				pagesize: ch.getAttribute('pagesize'),

 				pagesize: ch.getAttribute('pagesize'),

+ 18 - 2
kanban-console/src/main/webapp/resources/app/view/component/gridcomponent.js
View File 

@@ -27,10 +27,18 @@ Ext.define('erp.view.component.gridcomponent',{
 
 						},

 						},

 						scope:this				        

 						scope:this				        

 					}

 					}

-				},{

+				},/*{

 					xtype: 'textfield',

 					xtype: 'textfield',

 					fieldLabel: '样式名',

 					fieldLabel: '样式名',

 					name: 'allcls'

 					name: 'allcls'

+				},*/{

+					xtype: 'textfield',

+					fieldLabel: '表头样式',

+					name: 'headerrowsstyle'

+				},{

+					xtype: 'textfield',

+					fieldLabel: '行样式',

+					name: 'rowsstyle'

 				},{

 				},{

 					xtype: 'textfield',

 					xtype: 'textfield',

 					fieldLabel: '显示',

 					fieldLabel: '显示',

@@ -76,10 +84,18 @@ Ext.define('erp.view.component.gridcomponent',{
 
 						display: '排序',

 						display: '排序',

 						property: 'sort',

 						property: 'sort',

 						propvalue: 0

 						propvalue: 0

-					},{

+					},/*{

 						display: '样式名',

 						display: '样式名',

 						property: 'cls',

 						property: 'cls',

 						propvalue:''

 						propvalue:''

+					},*/{

+						display: '列头样式',

+						property: 'headerrowstyle',

+						propvalue:''

+					},{

+						display: '列样式',

+						property: 'rowstyle',

+						propvalue:''

 					},{

 					},{

 						display: '显示',

 						display: '显示',

 						property: 'rendername',

 						property: 'rendername',

File diff suppressed because it is too large
+ 0 - 0
kanban-console/src/main/webapp/resources/js/boardshow/src/main.bundle.js


+ 1 - 1
kanban-console/src/main/webapp/resources/js/boardshow/src/manifest.js
View File 

@@ -1 +1 @@
 
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,i){for(var a,u,s,f=0,l=[];f<t.length;f++)u=t[f],o[u]&&l.push(o[u][0]),o[u]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(r&&r(t,c,i);l.length;)l.shift()();if(i)for(f=0;f<i.length;f++)s=n(n.s=i[f]);return s};var t={},o={2:0};n.e=function(e){function r(){a.onerror=a.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var i=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,n.nc&&a.setAttribute("nonce",n.nc),a.src=n.p+""+({0:"vendor",1:"static/js/boardshow/src/main"}[e]||e)+"."+{0:"47ac1c99",1:"c723e119"}[e]+".js";var u=setTimeout(r,12e4);return a.onerror=a.onload=r,i.appendChild(a),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
 
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,s,f=0,l=[];f<t.length;f++)u=t[f],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(f=0;f<a.length;f++)s=n(n.s=a[f]);return s};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+({0:"vendor",1:"static/js/boardshow/src/main"}[e]||e)+"."+{0:"47ac1c99",1:"83a33048"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);

Some files were not shown because too many files changed in this diff