From c11de8fc8e51d4a599c1eb6ade55a7a80c4453c5 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 6 Jun 2022 10:20:14 +0800 Subject: [PATCH] format --- .../views/modules/cms/articleList.html | 4 +- .../views/modules/cms/categoryList.html | 4 +- .../views/modules/cms/commentList.html | 128 +++++------ .../views/modules/cms/reportList.html | 78 +++---- .../resources/views/modules/cms/siteList.html | 66 +++--- .../views/modules/cms/visitLogList.html | 92 ++++---- .../modules/gen/include/dataGridScript.html | 4 +- .../resources/views/modules/sys/areaList.html | 4 +- .../views/modules/sys/companyList.html | 52 ++--- .../views/modules/sys/officeList.html | 74 +++---- .../views/modules/sys/onlineList.html | 4 +- .../resources/views/modules/sys/postList.html | 48 ++--- .../views/modules/sys/user/corpAdminForm.html | 10 +- .../views/modules/sys/user/corpAdminList.html | 12 +- .../views/modules/sys/user/empUserForm.html | 12 +- .../sys/user/empUserFormAuthDataScope.html | 4 +- .../views/modules/sys/user/empUserList.html | 28 +-- .../views/modules/sys/user/empUserSelect.html | 4 +- .../views/modules/sys/user/secAdminForm.html | 4 +- .../views/modules/sys/user/secAdminList.html | 40 ++-- .../views/modules/sys/user/userSelect.html | 4 +- .../modules/demo/demoDataGridGroupGrid.html | 202 +++++++++--------- .../views/modules/test/testDataList.html | 4 +- .../views/modules/test/testTreeList.html | 4 +- 24 files changed, 443 insertions(+), 443 deletions(-) diff --git a/modules/cms/src/main/resources/views/modules/cms/articleList.html b/modules/cms/src/main/resources/views/modules/cms/articleList.html index 8499485e..fe0be0d2 100644 --- a/modules/cms/src/main/resources/views/modules/cms/articleList.html +++ b/modules/cms/src/main/resources/views/modules/cms/articleList.html @@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({ // {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('cms:article:edit')){ %> + //<% if(hasPermi('cms:article:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -82,7 +82,7 @@ $('#dataGrid').dataGrid({ if (row.status == Global.STATUS_NORMAL){ actions.push(' '); } - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryList.html b/modules/cms/src/main/resources/views/modules/cms/categoryList.html index 391df42e..dff056b4 100644 --- a/modules/cms/src/main/resources/views/modules/cms/categoryList.html +++ b/modules/cms/src/main/resources/views/modules/cms/categoryList.html @@ -87,7 +87,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('cms:category:edit')){ %> + //<% if(hasPermi('cms:category:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -100,7 +100,7 @@ $('#dataGrid').dataGrid({ if (row.status == Global.STATUS_NORMAL){ actions.push(' '); } - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/cms/src/main/resources/views/modules/cms/commentList.html b/modules/cms/src/main/resources/views/modules/cms/commentList.html index a1f70a02..8ba19011 100644 --- a/modules/cms/src/main/resources/views/modules/cms/commentList.html +++ b/modules/cms/src/main/resources/views/modules/cms/commentList.html @@ -1,18 +1,18 @@ -<% layout('/layouts/default.html', {title: '文章评论表管理', libs: ['dataGrid']}){ %> -
-
-
-
- ${text('文章评论表管理')} -
-
- ${text('查询')} - <% if(hasPermi('cms:comment:edit')){ %> - ${text('新增')} - <% } %> -
-
-
+<% layout('/layouts/default.html', {title: '文章评论表管理', libs: ['dataGrid']}){ %> +
+
+
+
+ ${text('文章评论表管理')} +
+
+ ${text('查询')} + <% if(hasPermi('cms:comment:edit')){ %> + ${text('新增')} + <% } %> +
+
+
<#form:form id="searchForm" model="${comment}" action="${ctx}/cms/comment/listData" method="post" class="form-inline hide" data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
@@ -98,53 +98,53 @@
-
-
-
-
-
-<% } %> - \ No newline at end of file diff --git a/modules/cms/src/main/resources/views/modules/cms/reportList.html b/modules/cms/src/main/resources/views/modules/cms/reportList.html index a912d99f..f2672eac 100644 --- a/modules/cms/src/main/resources/views/modules/cms/reportList.html +++ b/modules/cms/src/main/resources/views/modules/cms/reportList.html @@ -13,43 +13,43 @@
- <#form:form id="searchForm" model="${report}" action="${ctx}/cms/report/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="reportSource" maxlength="1" class="form-control width-120"/> -
-
-
- -
- <#form:input path="reportContent" maxlength="500" class="form-control width-120"/> -
-
-
- -
- <#form:input path="reportUrl" maxlength="1000" class="form-control width-120"/> -
-
-
- -
- <#form:input path="reportType" maxlength="1" class="form-control width-120"/> -
-
-
- -
- <#form:input path="reportCause" maxlength="500" class="form-control width-120"/> -
-
-
- - -
- + <#form:form id="searchForm" model="${report}" action="${ctx}/cms/report/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="reportSource" maxlength="1" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="reportContent" maxlength="500" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="reportUrl" maxlength="1000" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="reportType" maxlength="1" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="reportCause" maxlength="500" class="form-control width-120"/> +
+
+
+ + +
+
@@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({ {header:'${text('举报原因')}', name:'reportCause', index:'a.report_cause', width:150, align:"left"}, {header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('cms:report:edit')){ %> + //<% if(hasPermi('cms:report:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -79,7 +79,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/cms/src/main/resources/views/modules/cms/siteList.html b/modules/cms/src/main/resources/views/modules/cms/siteList.html index d649d341..1271ff32 100644 --- a/modules/cms/src/main/resources/views/modules/cms/siteList.html +++ b/modules/cms/src/main/resources/views/modules/cms/siteList.html @@ -13,37 +13,37 @@
- <#form:form id="searchForm" model="${site}" action="${ctx}/cms/site/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="siteName" maxlength="100" class="form-control width-120"/> -
-
-
- -
- <#form:input path="title" maxlength="100" class="form-control width-120"/> -
-
-
- -
- <#form:input path="domain" maxlength="500" class="form-control width-120"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> -
-
-
- - -
- + <#form:form id="searchForm" model="${site}" action="${ctx}/cms/site/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="siteName" maxlength="100" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="title" maxlength="100" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="domain" maxlength="500" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> +
+
+
+ + +
+
@@ -69,7 +69,7 @@ $('#dataGrid').dataGrid({ {header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('cms:site:edit')){ %> + //<% if(hasPermi('cms:site:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -81,7 +81,7 @@ $('#dataGrid').dataGrid({ if (row.status == Global.STATUS_NORMAL){ actions.push(' '); } - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html index 8463bc5a..0bf549e8 100644 --- a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html +++ b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html @@ -13,50 +13,50 @@
- <#form:form id="searchForm" model="${visitLog}" action="${ctx}/cms/visitLog/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="requestUrl" maxlength="1000" class="form-control width-120"/> -
-
-
- -
- <#form:input path="requestUrlHost" maxlength="128" class="form-control width-120"/> -
-
-
- -
- <#form:input path="sourceReferer" maxlength="1000" class="form-control width-120"/> -
-
-
- -
- <#form:input path="sourceRefererHost" maxlength="128" class="form-control width-120"/> -
-
- -
- -
- <#form:input path="searchWord" maxlength="200" class="form-control width-120"/> -
-
- - - - - - -
- - -
- + <#form:form id="searchForm" model="${visitLog}" action="${ctx}/cms/visitLog/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="requestUrl" maxlength="1000" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="requestUrlHost" maxlength="128" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="sourceReferer" maxlength="1000" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="sourceRefererHost" maxlength="128" class="form-control width-120"/> +
+
+ +
+ +
+ <#form:input path="searchWord" maxlength="200" class="form-control width-120"/> +
+
+ + + + + + +
+ + +
+
@@ -91,7 +91,7 @@ $('#dataGrid').dataGrid({ {header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('cms:visitLog:edit')){ %> + //<% if(hasPermi('cms:visitLog:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -100,7 +100,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], 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 4b611651..642a27ed 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 @@ -75,7 +75,7 @@ $('#dataGrid').dataGrid({ <% if(isQueryTpl){ %> actions.push(' '); <% }else{ %> - \<% if(hasPermi('${permissionPrefix}:edit')){ %> + //\<% if(hasPermi('${permissionPrefix}:edit')){ %> actions.push(' '); <% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %> if (row.status == Global.STATUS_NORMAL){ @@ -90,7 +90,7 @@ $('#dataGrid').dataGrid({ <% if(table.isTreeEntity){ %> actions.push(' '); <% } %> - \<% } %> + //\<% } %> <% if(toBoolean(table.optionMap['isBpmForm'])){ %> if (row.status != Global.STATUS_DRAFT){ actions.push(' '); diff --git a/modules/core/src/main/resources/views/modules/sys/areaList.html b/modules/core/src/main/resources/views/modules/sys/areaList.html index 0f4aa071..a91d1ec1 100644 --- a/modules/core/src/main/resources/views/modules/sys/areaList.html +++ b/modules/core/src/main/resources/views/modules/sys/areaList.html @@ -67,7 +67,7 @@ $('#dataGrid').dataGrid({ {header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"}, {header:'操作', name:'actions', width:130, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:area:edit')){ %> + //<% if(hasPermi('sys:area:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -76,7 +76,7 @@ $('#dataGrid').dataGrid({ } actions.push(' '); actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html index abb6fedf..64dec2cf 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -17,8 +17,8 @@
- <#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> + <#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> <#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/> <#form:hidden path="companyCode" class="isReset"/>
@@ -27,28 +27,28 @@ <#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
-
- -
- <#form:input path="companyName" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:input path="fullName" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> -
-
-
- - -
+
+ +
+ <#form:input path="companyName" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="fullName" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> +
+
+
+ + +
@@ -73,7 +73,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:company:edit')){ %> + //<% if(hasPermi('sys:company:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -82,7 +82,7 @@ $('#dataGrid').dataGrid({ } actions.push(' '); actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html index 86114e53..f1a23314 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -19,44 +19,44 @@
- <#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> + <#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> <#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/> <#form:hidden path="officeCode" class="isReset"/> -
- -
- <#form:input path="viewCode" maxlength="100" class="form-control width-90"/> -
-
-
- +
+
- <#form:input path="officeName" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="fullName" maxlength="200" class="form-control width-90"/> -
-
-
- -
- <#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> -
-
-
- - -
+ <#form:input path="viewCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="officeName" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="fullName" maxlength="200" class="form-control width-90"/> +
+
+
+ +
+ <#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> +
+
+
+ + +
@@ -83,7 +83,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:office:edit')){ %> + //<% if(hasPermi('sys:office:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -92,7 +92,7 @@ $('#dataGrid').dataGrid({ } actions.push(' '); actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html index 2820235f..d567641f 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -61,13 +61,13 @@ $('#dataGrid').dataGrid({ {header:'${text("设备类型")}', name:'deviceType', width:50, align:'center', formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, '${text('未设置')}', true); }} - <% if(hasPermi('sys:online:edit')){ %> + //<% if(hasPermi('sys:online:edit')){ %> ,{header:'${text("操作")}', name:'actions', width:100, sortable:false, formatter: function(val, obj, row, act){ var actions = []; actions.push(' '); return actions.join(''); }} - <% } %> + //<% } %> ], // 加载成功后执行事件 ajaxSuccess: function(data){ diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html index 0cea7b8c..55475762 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -14,36 +14,36 @@
- <#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="postCode" maxlength="64" class="form-control width-120"/> -
-
-
- -
- <#form:input path="postName_like" maxlength="100" class="form-control width-120"/> -
-
-
- -
- <#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/> -
+ <#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="postCode" maxlength="64" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="postName_like" maxlength="100" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/> +
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-
+
- -
+ +
@@ -71,7 +71,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:post:edit')){ %> + //<% if(hasPermi('sys:post:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -79,7 +79,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index 69d7b331..64dcccae 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html @@ -175,9 +175,9 @@ $('#corpCode_').change(function(){ var roleGrid = $("#roleGrid").dataGrid({ url: '${ctx}/sys/role/treeData', postData: [ -<%// {name:'userType',value:'employee'}, // 指定用户类型的角色 %> -<%// {name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'} // 过滤可管理的角色 %> - {name:'isAll',value:'true'} <% // 显示所有角色（与上方两个条件互斥） %> +//<%// {name:'userType',value:'employee'}, // 指定用户类型的角色 %> +//<%// {name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'} // 过滤可管理的角色 %> + {name:'isAll',value:'true'} //<% // 显示所有角色（与上方两个条件互斥） %> ], columnModel: [ {header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"}, @@ -203,9 +203,9 @@ var roleGrid = $("#roleGrid").dataGrid({ } }, ajaxSuccess: function(){ - <% for (role in roleList!){ %> + //<% for (role in roleList!){ %> roleGrid.dataGrid('setSelectRow', '${role.roleCode}'); - <% } %> + //<% } %> } }); diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index 8c139639..14c4ebe3 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -70,12 +70,12 @@ $('#dataGrid').dataGrid({ return ''+(val||row.id)+''; }}, {header:'${text("用户昵称")}', name:'userName', index:'a.user_name', width:200, align:"center"}, - <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> + //<% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> {header:'${text("租户代码")}', name:'corpCode_', index:'a.corp_code', width:200, align:"center", formatter: function(val, obj, row, act){ return ''+val+''; }}, {header:'${text("租户名称")}', name:'corpName_', index:'a.corp_name', width:200, align:"center"}, - <% } %> + //<% } %> {header:'${text("电子邮箱")}', name:'email', index:'a.email', width:200, align:"center"}, {header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:200, align:"center"}, {header:'${text("办公电话")}', name:'phone', index:'a.phone', width:200, align:"center"}, @@ -85,7 +85,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:corpAdmin:edit')){ %> + //<% if(hasPermi('sys:corpAdmin:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -93,14 +93,14 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> + //<% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> actions.push(' '); - <% } %> + //<% } %> actions.push(' '); actions.push('
'); actions.push(' ${text("重置密码")} '); actions.push('
'); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html index a334acae..de938da9 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html @@ -267,7 +267,7 @@ $("#empOfficeGrid").dataGrid({ } }); -<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) {%> +//<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) {%> // 加载角色列表 var roleGrid = $("#roleGrid").dataGrid({ url: '${ctx}/sys/role/treeData', @@ -287,17 +287,17 @@ var roleGrid = $("#roleGrid").dataGrid({ return $('#inputForm .box-body').width()-20; }, ajaxSuccess: function(){ - <% for (role in roleList!){ %> + //<% for (role in roleList!){ %> roleGrid.dataGrid('setSelectRow', '${role.roleCode}'); - <% } %> + //<% } %> } }); -<% } %> +//<% } %> $("#inputForm").validate({ submitHandler: function(form){ - <% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %> + //<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %> $("#userRoleString").val(roleGrid.dataGrid('getSelectRows').join(',')); - <% } %> + //<% } %> var empNo = $('#employee_empNo').val(); if (empNo == ''){ $('#employee_empNo').val($('#loginCode').val()); diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html index 040b016e..6abeb706 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html @@ -167,8 +167,8 @@ for (var i=0; i +//<% for(dataScope in userDataScopeList){ %> try{dataScopeTrees['${dataScope.ctrlType}'].checkNode(dataScopeTrees['${dataScope.ctrlType}'] .getNodeByParam("id","${dataScope.ctrlData}"), true, false);}catch(e){} -<% } %> +//<% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 0b4f2e4c..36821e03 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -139,33 +139,33 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:empUser:edit')){ %> + //<% if(hasPermi('sys:empUser:edit')){ %> actions.push(' '); - <% } %> - <% if(hasPermi('sys:empUser:updateStatus')){ %> + //<% } %> + //<% if(hasPermi('sys:empUser:updateStatus')){ %> if (row.status == Global.STATUS_NORMAL){ actions.push(' '); }else if (row.status == Global.STATUS_DISABLE || row.status == Global.STATUS_FREEZE || row.status == Global.STATUS_AUDIT){ actions.push(' '); } - <% } %> - <% if(hasPermi('sys:empUser:edit')){ %> + //<% } %> + //<% if(hasPermi('sys:empUser:edit')){ %> actions.push(' '); - <% } %> - <% if(hasPermi('sys:empUser:authRole,sys:empUser:authDataScope,sys:empUser:resetpwd', 'or')){ %> + //<% } %> + //<% if(hasPermi('sys:empUser:authRole,sys:empUser:authDataScope,sys:empUser:resetpwd', 'or')){ %> actions.push(' '); actions.push('
'); - <% if(hasPermi('sys:empUser:authRole')){ %> + //<% if(hasPermi('sys:empUser:authRole')){ %> actions.push(' ${text("分配角色")} '); - <% } %> - <% if(hasPermi('sys:empUser:authDataScope')){ %> + //<% } %> + //<% if(hasPermi('sys:empUser:authDataScope')){ %> actions.push(' ${text("数据权限")} '); - <% } %> - <% if(hasPermi('sys:empUser:resetpwd')){ %> + //<% } %> + //<% if(hasPermi('sys:empUser:resetpwd')){ %> actions.push(' ${text("重置密码")} '); - <% } %> + //<% } %> actions.push('
'); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html index 00adebd9..7aa92727 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html @@ -130,9 +130,9 @@ var setting = {view:{selectedMulti:false},data:{simpleData:{enable:true}}, if (queryType == 'userType'){ $('#queryTypeName').text('${text("按用户类型")}'); tree = $.fn.zTree.init($("#tree"), setting, [ - <% for(dict in @DictUtils.getDictList('sys_user_type')){ %> + //<% for(dict in @DictUtils.getDictList('sys_user_type')){ %> {id: '${dict.dictValue}', name: '${text(dict.dictLabel + "类型")}'}, - <% } %> + //<% } %> {id: 'none', name: '${text("系统管理员")}'} ]); tree.expandAll(true); diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html index 67e979e9..420cca73 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html @@ -167,8 +167,8 @@ for (var i=0; i +//<% for(dataScope in userDataScopeList){ %> try{dataScopeTrees['${dataScope.ctrlType}'].checkNode(dataScopeTrees['${dataScope.ctrlType}'] .getNodeByParam("id","${dataScope.ctrlData}"), true, false);}catch(e){} -<% } %> +//<% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html index 83a8b958..132fb079 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html @@ -20,20 +20,20 @@ 对应的管理权限功能，如用户管理、机构管理、公司管理，将启用为拥有权限的数据过滤，因此二级管理设置的管理权限将没有意义。 若启用该功能，请打开 application.yml 设置为管理的权限：user.adminCtrlPermi=2

- <% } %> - <#form:form id="searchForm" model="${user}" action="${ctx}/sys/secAdmin/listData" method="post" class="form-inline " + <% } %> + <#form:form id="searchForm" model="${user}" action="${ctx}/sys/secAdmin/listData" method="post" class="form-inline " data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
+
+ +
+ <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="userName" maxlength="100" class="form-control width-90"/> +
@@ -52,16 +52,16 @@
<#form:input path="phone" maxlength="100" class="form-control width-90"/>
-
+
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
-
-
- - +
+
+ +
@@ -91,10 +91,10 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('sys:secAdmin:edit')){ %> + //<% if(hasPermi('sys:secAdmin:edit')){ %> actions.push(' '); actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/modules/core/src/main/resources/views/modules/sys/user/userSelect.html b/modules/core/src/main/resources/views/modules/sys/user/userSelect.html index 3fc9f8b5..47c29a22 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/userSelect.html +++ b/modules/core/src/main/resources/views/modules/sys/user/userSelect.html @@ -71,11 +71,11 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({ {header:'${text("状态")}', name:'status', index:'a.status', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, - <% if(isBlank(user.userType)){ %> + //<% if(isBlank(user.userType)){ %> {header:'${text("类型")}', name:'userType', index:'a.user_type', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_user_type')}, val, '无', true); }}, - <% } %> + //<% } %> {header:'行数据', name:'rowData', hidden:true, formatter: function(val, obj, row, act){ return JSON.stringify(row); }} diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index 3be4e152..aac75305 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -14,105 +14,105 @@
- <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="testInput" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/> -  -  - <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> -
-
-
- -
- <#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/> -  -  - <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/> -
-
-
- -
- <#form:treeselect id="testUser" title="用户选择" - path="testUser.userCode" labelPath="testUser.userName" - url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/> -
-
-
- -
- <#form:treeselect id="testOffice" title="机构选择" - path="testOffice.officeCode" labelPath="testOffice.officeName" - url="${ctx}/sys/office/treeData" allowClear="true"/> -
-
-
- -
- <#form:treeselect id="testAreaCode" title="区域选择" - path="testAreaCode" labelPath="testAreaName" - url="${ctx}/sys/area/treeData" allowClear="true"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> -
-
-
- -
- <#form:input path="remarks" maxlength="500" class="form-control width-120"/> -
-
-
- - -
- + <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="testInput" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/> +  -  + <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" + dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> +
+
+
+ +
+ <#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/> +  -  + <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/> +
+
+
+ +
+ <#form:treeselect id="testUser" title="用户选择" + path="testUser.userCode" labelPath="testUser.userName" + url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testOffice" title="机构选择" + path="testOffice.officeCode" labelPath="testOffice.officeName" + url="${ctx}/sys/office/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testAreaCode" title="区域选择" + path="testAreaCode" labelPath="testAreaName" + url="${ctx}/sys/area/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> +
+
+
+ +
+ <#form:input path="remarks" maxlength="500" class="form-control width-120"/> +
+
+
+ + +
+
@@ -162,7 +162,7 @@ $('#dataGrid').dataGrid({ {header:'备注信息', name:'remarks', index:'a.remarks', width:150, align:"left"}, {header:'操作', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('test:testData:edit')){ %> + //<% if(hasPermi('test:testData:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -170,7 +170,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index 33ab0380..3759f74c 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -153,7 +153,7 @@ $('#dataGrid').dataGrid({ {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"}, {header:'${text("操作")}', name:'actions', width:100, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('test:testData:edit')){ %> + //<% if(hasPermi('test:testData:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -161,7 +161,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); } actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ], diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html index 6b7d0ff6..a2a7a6f1 100644 --- a/web/src/main/resources/views/modules/test/testTreeList.html +++ b/web/src/main/resources/views/modules/test/testTreeList.html @@ -64,7 +64,7 @@ $('#dataGrid').dataGrid({ {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"}, {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; - <% if(hasPermi('test:testTree:edit')){ %> + //<% if(hasPermi('test:testTree:edit')){ %> actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); @@ -73,7 +73,7 @@ $('#dataGrid').dataGrid({ } actions.push(' '); actions.push(' '); - <% } %> + //<% } %> return actions.join(''); }} ],