From cdebf586d5cb9639c18c910dce924824196ec4ff Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 23 Oct 2023 10:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87=E3=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/app/appCommentList.html | 10 ++-- .../views/modules/app/appUpgradeList.html | 10 ++-- .../views/modules/cms/articleList.html | 8 ++-- .../views/modules/cms/categoryList.html | 4 +- .../views/modules/cms/commentList.html | 4 +- .../views/modules/cms/reportList.html | 4 +- .../resources/views/modules/cms/siteList.html | 4 +- .../views/modules/cms/visitLogList.html | 4 +- .../modules/gen/include/searchForm.html | 4 +- .../views/modules/msg/msgInnerList.html | 4 +- .../resources/views/modules/sys/areaList.html | 4 +- .../views/modules/sys/auditList.html | 6 +-- .../views/modules/sys/auditMenuList.html | 4 +- .../views/modules/sys/auditUserList.html | 4 +- .../views/modules/sys/companyList.html | 10 ++-- .../views/modules/sys/configList.html | 4 +- .../views/modules/sys/dictDataList.html | 4 +- .../views/modules/sys/dictTypeList.html | 4 +- .../resources/views/modules/sys/langList.html | 4 +- .../resources/views/modules/sys/logList.html | 4 +- .../resources/views/modules/sys/menuList.html | 10 ++-- .../views/modules/sys/moduleList.html | 4 +- .../views/modules/sys/officeList.html | 4 +- .../views/modules/sys/onlineList.html | 4 +- .../resources/views/modules/sys/postList.html | 4 +- .../views/modules/sys/roleFormAuthUser.html | 4 +- .../resources/views/modules/sys/roleList.html | 4 +- .../views/modules/sys/user/corpAdminList.html | 4 +- .../views/modules/sys/user/empUserList.html | 46 ++++++++++--------- .../views/modules/sys/user/secAdminList.html | 4 +- .../views/modules/sys/user/userSelect.html | 4 +- .../modules/demo/demoDataGridEditGrid.html | 4 +- .../modules/demo/demoDataGridGroupGrid.html | 4 +- .../modules/demo/demoDataGridMultiGrid.html | 4 +- .../views/modules/test/testDataList.html | 8 ++-- .../views/modules/test/testTreeList.html | 4 +- .../modules/demo/demoDataGridEditGrid.html | 4 +- .../modules/demo/demoDataGridGroupGrid.html | 4 +- .../modules/demo/demoDataGridMultiGrid.html | 4 +- .../views/modules/test/testDataList.html | 8 ++-- .../views/modules/test/testTreeList.html | 4 +- 41 files changed, 123 insertions(+), 121 deletions(-) diff --git a/modules/app/src/main/resources/views/modules/app/appCommentList.html b/modules/app/src/main/resources/views/modules/app/appCommentList.html index 87207f70..2617ed16 100644 --- a/modules/app/src/main/resources/views/modules/app/appCommentList.html +++ b/modules/app/src/main/resources/views/modules/app/appCommentList.html @@ -18,20 +18,20 @@ data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-
+
<#form:select path="category" dictType="app_comment_category" blankOption="true" class="form-control"/>
- <#form:input path="content" maxlength="500" class="form-control width-120"/> + <#form:input path="content" maxlength="500" class="form-control width-90"/>
- <#form:input path="contact" maxlength="200" class="form-control width-120"/> + <#form:input path="contact" maxlength="200" class="form-control width-90"/>
@@ -49,8 +49,8 @@
- - + +
diff --git a/modules/app/src/main/resources/views/modules/app/appUpgradeList.html b/modules/app/src/main/resources/views/modules/app/appUpgradeList.html index 3cb1eb02..2d03e2b6 100644 --- a/modules/app/src/main/resources/views/modules/app/appUpgradeList.html +++ b/modules/app/src/main/resources/views/modules/app/appUpgradeList.html @@ -18,19 +18,19 @@ data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-
+
<#form:select path="appCode" dictType="app_code" blankOption="true" class="form-control"/>
- <#form:input path="upTitle" maxlength="200" class="form-control width-120"/> + <#form:input path="upTitle" maxlength="200" class="form-control width-90"/>
-
+
<#form:select path="upType" dictType="app_upgrade_type" blankOption="true" class="form-control"/>
@@ -48,8 +48,8 @@
- - + +
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 14dea0df..36efbb07 100644 --- a/modules/cms/src/main/resources/views/modules/cms/articleList.html +++ b/modules/cms/src/main/resources/views/modules/cms/articleList.html @@ -28,12 +28,12 @@ <#form:input path="title" maxlength="255" class="form-control width-120"/> -
+
@@ -41,8 +41,8 @@
- - + +
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 1e1a85fb..1b821563 100644 --- a/modules/cms/src/main/resources/views/modules/cms/categoryList.html +++ b/modules/cms/src/main/resources/views/modules/cms/categoryList.html @@ -57,8 +57,8 @@
- - + +
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 2607c392..09bfbfea 100644 --- a/modules/cms/src/main/resources/views/modules/cms/commentList.html +++ b/modules/cms/src/main/resources/views/modules/cms/commentList.html @@ -94,8 +94,8 @@
- - + +
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 141b68b5..179c5ee8 100644 --- a/modules/cms/src/main/resources/views/modules/cms/reportList.html +++ b/modules/cms/src/main/resources/views/modules/cms/reportList.html @@ -46,8 +46,8 @@
- - + +
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 815ca532..ea08d1f3 100644 --- a/modules/cms/src/main/resources/views/modules/cms/siteList.html +++ b/modules/cms/src/main/resources/views/modules/cms/siteList.html @@ -40,8 +40,8 @@
- - + +
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 23de0a7b..20fe2a8e 100644 --- a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html +++ b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html @@ -53,8 +53,8 @@
- - + +
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html b/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html index 5491327f..481e7688 100644 --- a/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html +++ b/modules/core/src/main/resources/templates/modules/gen/include/searchForm.html @@ -67,8 +67,8 @@ <% } %> <% } %>
- - + +
<% /* 查询表单 end // 此行是为了去除空行 */ %> \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html index bd022005..b1952afa 100644 --- a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html +++ b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html @@ -51,8 +51,8 @@
- - + +
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 ba3bf18a..dc18ef30 100644 --- a/modules/core/src/main/resources/views/modules/sys/areaList.html +++ b/modules/core/src/main/resources/views/modules/sys/areaList.html @@ -38,8 +38,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/auditList.html b/modules/core/src/main/resources/views/modules/sys/auditList.html index a710e14a..7ca0252b 100644 --- a/modules/core/src/main/resources/views/modules/sys/auditList.html +++ b/modules/core/src/main/resources/views/modules/sys/auditList.html @@ -47,9 +47,9 @@
- - - + + +
diff --git a/modules/core/src/main/resources/views/modules/sys/auditMenuList.html b/modules/core/src/main/resources/views/modules/sys/auditMenuList.html index 37fe390e..3eae745e 100644 --- a/modules/core/src/main/resources/views/modules/sys/auditMenuList.html +++ b/modules/core/src/main/resources/views/modules/sys/auditMenuList.html @@ -72,8 +72,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/auditUserList.html b/modules/core/src/main/resources/views/modules/sys/auditUserList.html index b6224fc7..5293593d 100644 --- a/modules/core/src/main/resources/views/modules/sys/auditUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/auditUserList.html @@ -63,8 +63,8 @@
- - + +
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 2744a057..b8a16b16 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -24,19 +24,19 @@
- <#form:input path="viewCode" maxlength="100" class="form-control width-120"/> + <#form:input path="viewCode" maxlength="100" class="form-control width-90"/>
- <#form:input path="companyName" maxlength="200" class="form-control width-120"/> + <#form:input path="companyName" maxlength="200" class="form-control width-90"/>
- <#form:input path="fullName" maxlength="200" class="form-control width-120"/> + <#form:input path="fullName" maxlength="200" class="form-control width-90"/>
@@ -46,8 +46,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/configList.html b/modules/core/src/main/resources/views/modules/sys/configList.html index a2d1e5e0..0f6c05ad 100644 --- a/modules/core/src/main/resources/views/modules/sys/configList.html +++ b/modules/core/src/main/resources/views/modules/sys/configList.html @@ -48,8 +48,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataList.html b/modules/core/src/main/resources/views/modules/sys/dictDataList.html index a9351288..54811a6d 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictDataList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictDataList.html @@ -50,8 +50,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html index d88f8a08..96fa33dc 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html @@ -41,8 +41,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/langList.html b/modules/core/src/main/resources/views/modules/sys/langList.html index b608806c..951bce7d 100644 --- a/modules/core/src/main/resources/views/modules/sys/langList.html +++ b/modules/core/src/main/resources/views/modules/sys/langList.html @@ -45,8 +45,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html index c7666b0f..8c674f5f 100644 --- a/modules/core/src/main/resources/views/modules/sys/logList.html +++ b/modules/core/src/main/resources/views/modules/sys/logList.html @@ -89,8 +89,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/menuList.html b/modules/core/src/main/resources/views/modules/sys/menuList.html index 1f25f87b..189806af 100644 --- a/modules/core/src/main/resources/views/modules/sys/menuList.html +++ b/modules/core/src/main/resources/views/modules/sys/menuList.html @@ -42,19 +42,19 @@
- <#form:input path="menuNameRaw" maxlength="50" class="form-control" /> + <#form:input path="menuNameRaw" maxlength="50" class="form-control width-90" />
- <#form:input path="menuHref" maxlength="50" class="form-control" /> + <#form:input path="menuHref" maxlength="50" class="form-control width-90" />
- <#form:input path="permission" maxlength="50" class="form-control" /> + <#form:input path="permission" maxlength="50" class="form-control width-90" />
@@ -64,8 +64,8 @@
- - + +
<#form:form id="dataGridForm" action="${ctx}/sys/menu/updateTreeSort" method="post"> diff --git a/modules/core/src/main/resources/views/modules/sys/moduleList.html b/modules/core/src/main/resources/views/modules/sys/moduleList.html index 172c1ccc..66a9d9f7 100644 --- a/modules/core/src/main/resources/views/modules/sys/moduleList.html +++ b/modules/core/src/main/resources/views/modules/sys/moduleList.html @@ -37,8 +37,8 @@
- - + +
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 cf406512..915d7b38 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -54,8 +54,8 @@
- - + +
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 786d5f83..5866a1aa 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -34,8 +34,8 @@
- - + +
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 7702cead..5bc7713b 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -41,8 +41,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/roleFormAuthUser.html b/modules/core/src/main/resources/views/modules/sys/roleFormAuthUser.html index c21fe872..287718e8 100644 --- a/modules/core/src/main/resources/views/modules/sys/roleFormAuthUser.html +++ b/modules/core/src/main/resources/views/modules/sys/roleFormAuthUser.html @@ -55,8 +55,8 @@
- - + +
diff --git a/modules/core/src/main/resources/views/modules/sys/roleList.html b/modules/core/src/main/resources/views/modules/sys/roleList.html index 26a73457..d211e4a7 100644 --- a/modules/core/src/main/resources/views/modules/sys/roleList.html +++ b/modules/core/src/main/resources/views/modules/sys/roleList.html @@ -56,8 +56,8 @@
- - + +
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 ba2863a8..39c970cc 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 @@ -51,8 +51,8 @@
- - + +
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 a2473d95..82c914bb 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 @@ -47,12 +47,6 @@ <#form:input path="refName" maxlength="100" class="form-control width-90"/> -
- -
- <#form:input path="mobile" maxlength="100" class="form-control width-90"/> -
-
@@ -61,16 +55,22 @@
- - - + + +
+
+ +
+ <#form:input path="mobile" maxlength="100" class="form-control width-90"/> +
+
<#form:treeselect id="office" title="${text('机构选择')}" - path="employee.office.officeCode" labelPath="employee.office.officeName" + path="employee.office.officeCode" labelPath="employee.office.officeName" url="${ctx}/sys/office/treeData?ctrlPermi=${ctrlPermi}" btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
@@ -79,7 +79,7 @@
<#form:treeselect id="company" title="${text('公司选择')}" - path="employee.company.companyCode" labelPath="employee.company.companyName" + path="employee.company.companyCode" labelPath="employee.company.companyName" url="${ctx}/sys/company/treeData?ctrlPermi=${ctrlPermi}" btnClass="btn-sm" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
@@ -96,18 +96,20 @@ <#form:input path="phone" maxlength="100" class="form-control width-90"/>
-
- -
- <#form:select name="employee.postCode" items="${postList}" - itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/> +
+
+ +
+ <#form:select name="employee.postCode" items="${postList}" + itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/> +
-
-
- -
- <#form:select name="roleCode" items="${roleList}" - itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/> +
+ +
+ <#form:select name="roleCode" items="${roleList}" + itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/> +
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 3020281a..e83cbf6b 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 @@ -60,8 +60,8 @@
- - + +
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 b72a1da4..6c0321f6 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 @@ -40,8 +40,8 @@
- - + +
diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html index 0f9e645b..bfa2d1df 100644 --- a/web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html +++ b/web-fast/src/main/resources/views/modules/demo/demoDataGridEditGrid.html @@ -107,8 +107,8 @@
- - + +
<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal table-form"> diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index 9a318fa2..d86391be 100644 --- a/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web-fast/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -109,8 +109,8 @@
- - + +
diff --git a/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html b/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html index 3e87c365..63887216 100644 --- a/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html +++ b/web-fast/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html @@ -12,8 +12,8 @@ data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize!3}" data-order-by="${parameter.orderBy!'post_code desc'}">
- - + +
diff --git a/web-fast/src/main/resources/views/modules/test/testDataList.html b/web-fast/src/main/resources/views/modules/test/testDataList.html index 252e2c14..e8ba6a67 100644 --- a/web-fast/src/main/resources/views/modules/test/testDataList.html +++ b/web-fast/src/main/resources/views/modules/test/testDataList.html @@ -23,7 +23,7 @@ <#form:input path="testInput" maxlength="200" class="form-control width-120"/> -
+
<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> @@ -46,9 +46,9 @@
- - - + + +
diff --git a/web-fast/src/main/resources/views/modules/test/testTreeList.html b/web-fast/src/main/resources/views/modules/test/testTreeList.html index 2da3af9d..c70680d6 100644 --- a/web-fast/src/main/resources/views/modules/test/testTreeList.html +++ b/web-fast/src/main/resources/views/modules/test/testTreeList.html @@ -38,8 +38,8 @@
- - + +
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html index 0f9e645b..bfa2d1df 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html @@ -107,8 +107,8 @@
- - + +
<#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal table-form"> diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index 9a318fa2..d86391be 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -109,8 +109,8 @@
- - + +
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html index 3e87c365..63887216 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridMultiGrid.html @@ -12,8 +12,8 @@ data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize!3}" data-order-by="${parameter.orderBy!'post_code desc'}">
- - + +
diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index e2f54671..f6b2a1a8 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -23,7 +23,7 @@ <#form:input path="testInput" maxlength="200" class="form-control width-120"/> -
+
<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> @@ -46,9 +46,9 @@
- - - + + +
diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html index 2da3af9d..c70680d6 100644 --- a/web/src/main/resources/views/modules/test/testTreeList.html +++ b/web/src/main/resources/views/modules/test/testTreeList.html @@ -38,8 +38,8 @@
- - + +