From a3f3a87d7d1b293deacbcb7d6fbca48636e46a5f Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 22 Nov 2021 20:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/modules/gen/include/dataGridScript.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html index 943742a3..4b611651 100644 --- a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html +++ b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html @@ -32,10 +32,10 @@ $('#dataGrid').dataGrid({ for(c in table.columnList){ if(c.isList == "1"){ // 如果是树结构的字段，则自动忽略 - if(table.isTreeEntity && @StringUtils.inString(c.columnName, 'parent_code', + if(table.isTreeEntity && (@StringUtils.inString(c.columnName, 'parent_code', 'parent_codes', 'tree_sorts', 'tree_leaf', 'tree_level', 'tree_names') - && c.attrName != table.treeViewCodeAttrName - && c.attrName != table.treeViewNameAttrName){ + || c.attrName == table.treeViewCodeAttrName + || c.attrName == table.treeViewNameAttrName)){ } // 如果是首列，则输出带链接的列 else if(firstColumn){