manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker-build

Browse Source
This commit is contained in:
thinkgem
2021-12-21 10:11:21 +08:00
parent dddf34e3aa
commit 6b8cbe0bad
29 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cms/db/cms.erm
View File

@@ -1923,7 +1923,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>本级排序号（升序）</logical_name>
<logical_name>排序号（升序）</logical_name>
<physical_name>tree_sort</physical_name>
<type>decimal(p)</type>
</word>
@@ -1939,7 +1939,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>所有级别排序号</logical_name>
<logical_name>所有排序号</logical_name>
<physical_name>tree_sorts</physical_name>
<type>varchar(n)</type>
</word>

4
modules/cms/db/mysql/cms.sql
View File

@@ -90,8 +90,8 @@ CREATE TABLE js_cms_category
category_code varchar(64) NOT NULL COMMENT '栏目编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',

4
modules/cms/db/oracle/cms.sql
View File

@@ -383,8 +383,8 @@ COMMENT ON TABLE js_cms_category IS '栏目表';
COMMENT ON COLUMN js_cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN js_cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN js_cms_category.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_cms_category.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_cms_category.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN js_cms_category.tree_names IS '全节点名';

4
modules/cms/db/postgresql/cms.sql
View File

@@ -383,8 +383,8 @@ COMMENT ON TABLE js_cms_category IS '栏目表';
COMMENT ON COLUMN js_cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN js_cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN js_cms_category.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_cms_category.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_cms_category.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN js_cms_category.tree_names IS '全节点名';

4
modules/cms/src/main/resources/db/create/mysql/cms.sql
View File

@@ -90,8 +90,8 @@ CREATE TABLE ${_prefix}cms_category
category_code varchar(64) NOT NULL COMMENT '栏目编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',

4
modules/cms/src/main/resources/db/create/oracle/cms.sql
View File

@@ -383,8 +383,8 @@ COMMENT ON TABLE ${_prefix}cms_category IS '栏目表';
COMMENT ON COLUMN ${_prefix}cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN ${_prefix}cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}cms_category.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}cms_category.tree_names IS '全节点名';

4
modules/cms/src/main/resources/db/create/postgresql/cms.sql
View File

@@ -383,8 +383,8 @@ COMMENT ON TABLE ${_prefix}cms_category IS '栏目表';
COMMENT ON COLUMN ${_prefix}cms_category.category_code IS '栏目编码';
COMMENT ON COLUMN ${_prefix}cms_category.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}cms_category.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}cms_category.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}cms_category.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}cms_category.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}cms_category.tree_names IS '全节点名';

2
modules/cms/src/main/resources/views/modules/cms/categoryForm.html
View File

@@ -69,7 +69,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> ${text('本级排序号')}：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('排序号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="treeSort" class="form-control required digits" />
</div>

4
modules/core/db/core.erm
View File

@@ -3971,7 +3971,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>本级排序号（升序）</logical_name>
<logical_name>排序号（升序）</logical_name>
<physical_name>tree_sort</physical_name>
<type>decimal(p)</type>
</word>
@@ -3987,7 +3987,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>所有级别排序号</logical_name>
<logical_name>所有排序号</logical_name>
<physical_name>tree_sorts</physical_name>
<type>varchar(n)</type>
</word>

20
modules/core/db/mysql/core.sql
View File

@@ -62,8 +62,8 @@ CREATE TABLE js_sys_area
area_code varchar(100) NOT NULL COMMENT '区域编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -85,8 +85,8 @@ CREATE TABLE js_sys_company
company_code varchar(64) NOT NULL COMMENT '公司编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -159,8 +159,8 @@ CREATE TABLE js_sys_dict_data
dict_code varchar(64) NOT NULL COMMENT '字典编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -410,8 +410,8 @@ CREATE TABLE js_sys_menu
menu_code varchar(64) NOT NULL COMMENT '菜单编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -602,8 +602,8 @@ CREATE TABLE js_sys_office
office_code varchar(64) NOT NULL COMMENT '机构编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',

20
modules/core/db/oracle/core.sql
View File

@@ -997,8 +997,8 @@ COMMENT ON TABLE js_sys_area IS '行政区划';
COMMENT ON COLUMN js_sys_area.area_code IS '区域编码';
COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_area.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_area.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_area.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_area.tree_names IS '全节点名';
@@ -1014,8 +1014,8 @@ COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_company.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_company.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_company.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_company.tree_names IS '全节点名';
@@ -1070,8 +1070,8 @@ COMMENT ON TABLE js_sys_dict_data IS '字典数据表';
COMMENT ON COLUMN js_sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN js_sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_dict_data.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_dict_data.tree_names IS '全节点名';
@@ -1255,8 +1255,8 @@ COMMENT ON TABLE js_sys_menu IS '菜单表';
COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_menu.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_menu.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_menu.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_menu.tree_names IS '全节点名';
@@ -1405,8 +1405,8 @@ COMMENT ON TABLE js_sys_office IS '组织机构表';
COMMENT ON COLUMN js_sys_office.office_code IS '机构编码';
COMMENT ON COLUMN js_sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_office.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_office.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_office.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_office.tree_names IS '全节点名';

20
modules/core/db/postgresql/core.sql
View File

@@ -997,8 +997,8 @@ COMMENT ON TABLE js_sys_area IS '行政区划';
COMMENT ON COLUMN js_sys_area.area_code IS '区域编码';
COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_area.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_area.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_area.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_area.tree_names IS '全节点名';
@@ -1014,8 +1014,8 @@ COMMENT ON TABLE js_sys_company IS '公司表';
COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
COMMENT ON COLUMN js_sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_company.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_company.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_company.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_company.tree_names IS '全节点名';
@@ -1070,8 +1070,8 @@ COMMENT ON TABLE js_sys_dict_data IS '字典数据表';
COMMENT ON COLUMN js_sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN js_sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_dict_data.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_dict_data.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_dict_data.tree_names IS '全节点名';
@@ -1255,8 +1255,8 @@ COMMENT ON TABLE js_sys_menu IS '菜单表';
COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_menu.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_menu.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_menu.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_menu.tree_names IS '全节点名';
@@ -1405,8 +1405,8 @@ COMMENT ON TABLE js_sys_office IS '组织机构表';
COMMENT ON COLUMN js_sys_office.office_code IS '机构编码';
COMMENT ON COLUMN js_sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN js_sys_office.parent_codes IS '所有父级编号';
COMMENT ON COLUMN js_sys_office.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN js_sys_office.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN js_sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN js_sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN js_sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN js_sys_office.tree_names IS '全节点名';

20
modules/core/src/main/resources/db/create/mysql/core.sql
View File

@@ -62,8 +62,8 @@ CREATE TABLE ${_prefix}sys_area
area_code varchar(100) NOT NULL COMMENT '区域编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -85,8 +85,8 @@ CREATE TABLE ${_prefix}sys_company
company_code varchar(64) NOT NULL COMMENT '公司编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -159,8 +159,8 @@ CREATE TABLE ${_prefix}sys_dict_data
dict_code varchar(64) NOT NULL COMMENT '字典编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -410,8 +410,8 @@ CREATE TABLE ${_prefix}sys_menu
menu_code varchar(64) NOT NULL COMMENT '菜单编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -602,8 +602,8 @@ CREATE TABLE ${_prefix}sys_office
office_code varchar(64) NOT NULL COMMENT '机构编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',

20
modules/core/src/main/resources/db/create/oracle/core.sql
View File

@@ -997,8 +997,8 @@ COMMENT ON TABLE ${_prefix}sys_area IS '行政区划';
COMMENT ON COLUMN ${_prefix}sys_area.area_code IS '区域编码';
COMMENT ON COLUMN ${_prefix}sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_area.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_area.tree_names IS '全节点名';
@@ -1014,8 +1014,8 @@ COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
COMMENT ON COLUMN ${_prefix}sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_company.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_company.tree_names IS '全节点名';
@@ -1070,8 +1070,8 @@ COMMENT ON TABLE ${_prefix}sys_dict_data IS '字典数据表';
COMMENT ON COLUMN ${_prefix}sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_names IS '全节点名';
@@ -1255,8 +1255,8 @@ COMMENT ON TABLE ${_prefix}sys_menu IS '菜单表';
COMMENT ON COLUMN ${_prefix}sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_names IS '全节点名';
@@ -1405,8 +1405,8 @@ COMMENT ON TABLE ${_prefix}sys_office IS '组织机构表';
COMMENT ON COLUMN ${_prefix}sys_office.office_code IS '机构编码';
COMMENT ON COLUMN ${_prefix}sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_office.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_office.tree_names IS '全节点名';

20
modules/core/src/main/resources/db/create/postgresql/core.sql
View File

@@ -997,8 +997,8 @@ COMMENT ON TABLE ${_prefix}sys_area IS '行政区划';
COMMENT ON COLUMN ${_prefix}sys_area.area_code IS '区域编码';
COMMENT ON COLUMN ${_prefix}sys_area.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_area.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_area.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_area.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_area.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_area.tree_names IS '全节点名';
@@ -1014,8 +1014,8 @@ COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
COMMENT ON COLUMN ${_prefix}sys_company.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_company.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_company.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_company.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_company.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_company.tree_names IS '全节点名';
@@ -1070,8 +1070,8 @@ COMMENT ON TABLE ${_prefix}sys_dict_data IS '字典数据表';
COMMENT ON COLUMN ${_prefix}sys_dict_data.dict_code IS '字典编码';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_dict_data.tree_names IS '全节点名';
@@ -1255,8 +1255,8 @@ COMMENT ON TABLE ${_prefix}sys_menu IS '菜单表';
COMMENT ON COLUMN ${_prefix}sys_menu.menu_code IS '菜单编码';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_menu.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_menu.tree_names IS '全节点名';
@@ -1405,8 +1405,8 @@ COMMENT ON TABLE ${_prefix}sys_office IS '组织机构表';
COMMENT ON COLUMN ${_prefix}sys_office.office_code IS '机构编码';
COMMENT ON COLUMN ${_prefix}sys_office.parent_code IS '父级编号';
COMMENT ON COLUMN ${_prefix}sys_office.parent_codes IS '所有父级编号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN ${_prefix}sys_office.tree_sorts IS '所有排序号';
COMMENT ON COLUMN ${_prefix}sys_office.tree_leaf IS '是否最末级';
COMMENT ON COLUMN ${_prefix}sys_office.tree_level IS '层次级别';
COMMENT ON COLUMN ${_prefix}sys_office.tree_names IS '全节点名';

8
modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
View File

@@ -220,7 +220,7 @@ if(table.isTreeEntity){
{
title: t('${c.columnLabel}'),
dataIndex: '${c.attrName}',
width: 250,
width: 230,
align: 'left',
slots: { customRender: 'firstColumn' },
},
@@ -252,11 +252,11 @@ for(c in table.columnList){
sorter: true,
<% } %>
<% if(firstColumn){ %>
width: 250,
width: 230,
<% }else{ %>
width: 150,
width: 130,
<% } %>
<% if (@StringUtils.inString(c.attrType, 'java.util.Date', 'Integer', 'Long') && !firstColumn){ %>
<% if ((isNotBlank(c.optionMap['dictType']) || @StringUtils.inString(c.attrType, 'java.util.Date', 'Integer', 'Long')) && !firstColumn){ %>
align: 'center',
<% }else if (@StringUtils.inString(c.attrType, 'Float', 'Double') && !firstColumn){ %>
align: 'right',

4
modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
View File

@@ -970,7 +970,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>本级排序号（升序）</logical_name>
<logical_name>排序号（升序）</logical_name>
<physical_name>tree_sort</physical_name>
<type>decimal(p)</type>
</word>
@@ -986,7 +986,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>所有级别排序号</logical_name>
<logical_name>所有排序号</logical_name>
<physical_name>tree_sorts</physical_name>
<type>varchar(n)</type>
</word>

4
modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
View File

@@ -970,7 +970,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>本级排序号（升序）</logical_name>
<logical_name>排序号（升序）</logical_name>
<physical_name>tree_sort</physical_name>
<type>decimal(p)</type>
</word>
@@ -986,7 +986,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>所有级别排序号</logical_name>
<logical_name>所有排序号</logical_name>
<physical_name>tree_sorts</physical_name>
<type>varchar(n)</type>
</word>

4
modules/template/db/template.erm
View File

@@ -963,7 +963,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>本级排序号（升序）</logical_name>
<logical_name>排序号（升序）</logical_name>
<physical_name>tree_sort</physical_name>
<type>decimal(p)</type>
</word>
@@ -979,7 +979,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>所有级别排序号</logical_name>
<logical_name>所有排序号</logical_name>
<physical_name>tree_sorts</physical_name>
<type>varchar(n)</type>
</word>

4
parent/pom.xml
View File

@@ -52,8 +52,8 @@
<log4j2.version>2.17.0</log4j2.version>
<!-- jdbc setting -->
<!-- <mysql.version>5.1.47</mysql.version> -->
<mysql.version>8.0.11</mysql.version>
<!-- <mysql.version>5.1.49</mysql.version> -->
<mysql.version>8.0.27</mysql.version>
<!-- environment setting -->
<java.version>1.8</java.version>

4
web/db/mysql/test.sql
View File

@@ -57,8 +57,8 @@ CREATE TABLE test_tree
tree_code varchar(64) NOT NULL COMMENT '节点编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',

4
web/db/oracle/test.sql
View File

@@ -115,8 +115,8 @@ COMMENT ON TABLE test_tree IS '测试树表';
COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
COMMENT ON COLUMN test_tree.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
COMMENT ON COLUMN test_tree.tree_names IS '全节点名';

4
web/db/postgresql/test.sql
View File

@@ -115,8 +115,8 @@ COMMENT ON TABLE test_tree IS '测试树表';
COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
COMMENT ON COLUMN test_tree.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
COMMENT ON COLUMN test_tree.tree_names IS '全节点名';

4
web/db/test.erm
View File

@@ -963,7 +963,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>本级排序号（升序）</logical_name>
<logical_name>排序号（升序）</logical_name>
<physical_name>tree_sort</physical_name>
<type>decimal(p)</type>
</word>
@@ -979,7 +979,7 @@
<args></args>
<char_semantics>false</char_semantics>
<description></description>
<logical_name>所有级别排序号</logical_name>
<logical_name>所有排序号</logical_name>
<physical_name>tree_sorts</physical_name>
<type>varchar(n)</type>
</word>

4
web/src/main/resources/db/create/mysql/test.sql
View File

@@ -57,8 +57,8 @@ CREATE TABLE test_tree
tree_code varchar(64) NOT NULL COMMENT '节点编码',
parent_code varchar(64) NOT NULL COMMENT '父级编号',
parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
tree_leaf char(1) NOT NULL COMMENT '是否最末级',
tree_level decimal(4) NOT NULL COMMENT '层次级别',
tree_names varchar(1000) NOT NULL COMMENT '全节点名',

4
web/src/main/resources/db/create/oracle/test.sql
View File

@@ -115,8 +115,8 @@ COMMENT ON TABLE test_tree IS '测试树表';
COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
COMMENT ON COLUMN test_tree.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
COMMENT ON COLUMN test_tree.tree_names IS '全节点名';

4
web/src/main/resources/db/create/postgresql/test.sql
View File

@@ -115,8 +115,8 @@ COMMENT ON TABLE test_tree IS '测试树表';
COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
COMMENT ON COLUMN test_tree.tree_sort IS '本级排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有级别排序号';
COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
COMMENT ON COLUMN test_tree.tree_names IS '全节点名';

66
web/src/main/resources/views/modules/test/testTreeForm.html
View File

@@ -48,7 +48,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> ${text('本级排序号')}：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('排序号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="treeSort" class="form-control required digits"/>
</div>
@@ -56,38 +56,38 @@
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">${text('图片上传')}：</label>
<div class="col-sm-10">
<#form:fileupload id="uploadImage" bizKey="${testTree.id}" bizType="testTree_image"
uploadType="image" class="" readonly="false" preview="true"/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">${text('附件上传')}：</label>
<div class="col-sm-10">
<#form:fileupload id="uploadFile" bizKey="${testTree.id}" bizType="testTree_file"
uploadType="all" class="" readonly="false" preview="true"/>
</div>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">${text('图片上传')}：</label>
<div class="col-sm-10">
<#form:fileupload id="uploadImage" bizKey="${testTree.id}" bizType="testTree_image"
uploadType="image" class="" readonly="false" preview="true"/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">${text('附件上传')}：</label>
<div class="col-sm-10">
<#form:fileupload id="uploadFile" bizKey="${testTree.id}" bizType="testTree_file"
uploadType="all" class="" readonly="false" preview="true"/>
</div>
</div>
</div>
</div>
</div>
<div class="box-footer">
<div class="row">

44
web/src/main/resources/views/modules/test/testTreeList.html
View File

@@ -1,22 +1,22 @@
<% layout('/layouts/default.html', {title: '数据管理', libs: ['dataGrid']}){ %>
<div class="main-content">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-notebook"></i> ${text('数据管理')}
</div>
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
<a href="#" class="btn btn-default" id="btnRefreshTree" title="${text('刷新')}"><i class="fa fa-refresh"></i> ${text('刷新')}</a>
<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="${text('展开一级')}"><i class="fa fa-angle-double-down"></i> ${text('展开')}</a>
<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> ${text('折叠')}</a>
<% if(hasPermi('test:testTree:edit')){ %>
<% layout('/layouts/default.html', {title: '数据管理', libs: ['dataGrid']}){ %>
<div class="main-content">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-notebook"></i> ${text('数据管理')}
</div>
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
<a href="#" class="btn btn-default" id="btnRefreshTree" title="${text('刷新')}"><i class="fa fa-refresh"></i> ${text('刷新')}</a>
<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="${text('展开一级')}"><i class="fa fa-angle-double-down"></i> ${text('展开')}</a>
<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> ${text('折叠')}</a>
<% if(hasPermi('test:testTree:edit')){ %>
<a href="${ctx}/test/testTree/form" class="btn btn-default btnTool" title="${text('新增数据')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<a href="#" class="btn btn-default" id="btnFixTreeData" title="修复树表数据（包含字段：parentCodes、treeLeaf、treeLevel、treeSorts、treeNames）"><i class="fa fa-refresh"></i> 修复</a>
<% } %>
</div>
</div>
<div class="box-body">
</div>
</div>
<div class="box-body">
<#form:form id="searchForm" model="${testTree}" action="${ctx}/test/testTree/listData" method="post" class="form-inline hide"
data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
<div class="form-group">
@@ -42,11 +42,11 @@
<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
</div>
</#form:form>
<table id="dataGrid"></table>
</div>
</div>
</div>
<% } %>
<table id="dataGrid"></table>
</div>
</div>
</div>
<% } %>
<script>
// 初始化DataGrid对象
$('#dataGrid').dataGrid({
@@ -55,7 +55,7 @@ $('#dataGrid').dataGrid({
{header:'${text("节点名称")}', name:'treeName', index:'a.tree_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '( '+row.treeCode+' ) '+'<a href="${ctx}/test/testTree/form?treeCode='+row.treeCode+'" class="btnList" data-title="${text("编辑数据")}">'+(val||row.id)+'</a>';
}},
{header:'${text("本级排序号")}', name:'treeSort', index:'a.tree_sort', width:150, align:"center"},
{header:'${text("排序号")}', name:'treeSort', index:'a.tree_sort', width:150, align:"center"},
{header:'${text("节点名称")}', name:'treeName', index:'a.tree_name', width:150, align:"left"},
{header:'${text("状态")}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text("未知")}', true);