From ac04d84c53a5ebd325c4beed5b7d449a513b4fa2 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 30 Nov 2018 21:50:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=91=E8=A1=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=8C=E5=B1=95=E5=BC=80=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=B8=85=E7=90=86=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8E=92=E9=99=A4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=91=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=90=8E=E6=94=AF=E6=8C=81=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E7=88=B6=E8=8A=82=E7=82=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/modules/gen/crud/controller.xml | 2 +- .../templates/modules/gen/crud/viewList.xml | 2 +- .../modules/gen/query/controller.xml | 2 +- .../templates/modules/gen/query/viewList.xml | 2 +- web/db/mysql/create_user.sql | 2 +- .../modules/test/web/TestTreeController.java | 3 --- .../views/modules/test/testTreeList.html | 23 +++++++++++++------ 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index c2203a53..a1e81e54 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -89,7 +89,7 @@ public class ${ClassName}Controller extends BaseController { ${className}.setParentCode(${ClassName}.ROOT_CODE); } <% for(c in table.columnList){ %> - <% if(c.isQuery == "1" && !c.isTreeEntityColumn){ %> + <% if(c.isQuery == "1" && !c.isTreeEntityColumn && c.attrName != 'status'){ %> if (StringUtils.isNotBlank(${className}.${c.attrNameForGetMethod})){ ${className}.setParentCode(null); } diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml index d44c90a5..7a2ee884 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml @@ -130,7 +130,7 @@ $('#dataGrid').dataGrid({ defaultExpandLevel: 0, // 默认展开的层次 expandNodeClearPostData: '<% for(c in table.columnList){ - if(c.isQuery == "1" && !c.isTreeEntityColumn){ + if(c.isQuery == "1" && !c.isTreeEntityColumn && c.attrName != 'status'){ print(c.attrName + ','); } } %>', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据） diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml index fc600a92..ccd4bae3 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml @@ -87,7 +87,7 @@ public class ${ClassName}Controller extends BaseController { ${className}.setParentCode(${ClassName}.ROOT_CODE); } <% for(c in table.columnList){ %> - <% if(c.isQuery == "1" && !c.isTreeEntityColumn){ %> + <% if(c.isQuery == "1" && !c.isTreeEntityColumn && c.attrName != 'status'){ %> if (StringUtils.isNotBlank(${className}.${c.attrNameForGetMethod})){ ${className}.setParentCode(null); } diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml index 97bf262b..1d1010c0 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml @@ -111,7 +111,7 @@ $('#dataGrid').dataGrid({ defaultExpandLevel: 0, // 默认展开的层次 expandNodeClearPostData: '<% for(c in table.columnList){ - if(c.isQuery == "1" && !c.isTreeEntityColumn){ + if(c.isQuery == "1" && !c.isTreeEntityColumn && c.attrName != 'status'){ print(c.attrName + ','); } } %>', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据） diff --git a/web/db/mysql/create_user.sql b/web/db/mysql/create_user.sql index b58c02f2..077f880a 100644 --- a/web/db/mysql/create_user.sql +++ b/web/db/mysql/create_user.sql @@ -6,7 +6,7 @@ set global read_only=0; create user 'jeesite'@'%' identified by 'jeesite'; -create database jeesite DEFAULT CHARSET utf8 COLLATE utf8_general_ci; +create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite'; diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java b/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java index eb47c957..45e336c3 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java @@ -69,9 +69,6 @@ public class TestTreeController extends BaseController { if (StringUtils.isNotBlank(testTree.getTreeName())){ testTree.setParentCode(null); } - if (StringUtils.isNotBlank(testTree.getStatus())){ - testTree.setParentCode(null); - } if (StringUtils.isNotBlank(testTree.getRemarks())){ testTree.setParentCode(null); } diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html index 62e6ea37..616ed4e7 100644 --- a/web/src/main/resources/views/modules/test/testTreeList.html +++ b/web/src/main/resources/views/modules/test/testTreeList.html @@ -12,6 +12,7 @@ ${text('折叠')} <% if(hasPermi('test:testTree:edit')){ %> ${text('新增')} + 修复 <% } %> @@ -24,17 +25,17 @@ <#form:input path="treeName" maxlength="200" class="form-control width-120"/> -
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> -
-
<#form:input path="remarks" maxlength="500" class="form-control width-120"/>
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> +
@@ -79,9 +80,17 @@ $('#dataGrid').dataGrid({ ], treeGrid: true, // 启用树结构表格 defaultExpandLevel: 0, // 默认展开的层次 - expandNodeClearPostData: 'treeName,status,remarks,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据） // 加载成功后执行事件 + expandNodeClearPostData: 'treeName,remarks,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据） // 加载成功后执行事件 ajaxSuccess: function(data){ } }); + +// 修复树表数据（包含字段：parentCodes、treeLeaf、treeLevel、treeSorts、treeNames） +$("#btnFixTreeData").click(function(){ + js.ajaxSubmit("${ctx}/test/testTree/fixTreeData", function(data){ + js.showMessage(data.message); + }); + return false; +}); \ No newline at end of file