From cc8da29107cea23c135fccafb190486a3feae2e8 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 21 Apr 2018 16:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/bin/deploy.bat | 2 - .../main/resources/config/jeesite-core.yml | 2 +- .../i18n/core/common/i18n_zh_CN.properties | 2 - .../i18n/core/common_view/i18n_en.properties | 34 ++++++- .../i18n/core/sys/i18n_en.properties | 88 +++++++++++++++++++ .../main/resources/views/include/jslibs.html | 1 + .../views/modules/sys/companyForm.html | 12 +-- .../views/modules/sys/companyList.html | 34 +++---- .../resources/views/modules/sys/logList.html | 2 +- .../views/modules/sys/officeForm.html | 6 +- .../views/modules/sys/officeList.html | 34 +++---- .../views/modules/sys/onlineList.html | 2 +- .../resources/views/modules/sys/postForm.html | 6 +- .../resources/views/modules/sys/postList.html | 28 +++--- .../views/modules/sys/user/empUserForm.html | 10 +-- .../sys/user/empUserFormAuthDataScope.html | 6 +- .../views/modules/sys/user/empUserIndex.html | 10 +-- .../views/modules/sys/user/empUserList.html | 42 ++++----- .../views/modules/sys/user/secAdminList.html | 2 +- web/db/mysql/test.sql | 4 +- web/db/oracle/test.sql | 4 +- web/db/postgresql/test.sql | 4 +- web/db/test.erm | 10 +-- .../jeesite/modules/test/entity/TestData.java | 8 +- .../modules/test/entity/TestDataChild.java | 8 +- web/src/main/resources/config/jeesite.yml | 2 +- .../views/modules/demo/dataGridEditGrid.html | 16 ++-- .../views/modules/demo/dataGridGroupGrid.html | 10 +-- .../views/modules/demo/formEditForm.html | 16 ++-- .../views/modules/demo/formLayoutForm.html | 8 +- .../views/modules/demo/formTableForm.html | 16 ++-- .../views/modules/test/testDataForm.html | 16 ++-- .../views/modules/test/testDataList.html | 10 +-- 33 files changed, 285 insertions(+), 170 deletions(-) diff --git a/common/bin/deploy.bat b/common/bin/deploy.bat index 5cfb2b1a..5e52bb4b 100644 --- a/common/bin/deploy.bat +++ b/common/bin/deploy.bat @@ -7,8 +7,6 @@ rem */ echo. echo [信息] 部署工程版本到Nexus服务器。 echo. -pause -echo. %~d0 cd %~dp0 diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 5ce242f4..77cd54cc 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -166,7 +166,7 @@ user: [{ moduleCode: "core", ctrlPermi: "0", - ctrlName: "閮ㄩ棬鏉冮檺", + ctrlName: "鏈烘瀯鏉冮檺", ctrlType: "Office", ctrlDataUrl: "/sys/office/treeData", chkboxType: {"Y":"ps","N":"ps"}, diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties index 956506e3..ee22a7fd 100644 --- a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties +++ b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties @@ -53,8 +53,6 @@ sys.error.404.message.p1=鍙兘鏄涓嬪師鍥犲紩璧风殑杩欎釜閿欒锛 sys.error.404.message.p2=鍦板潃杈撳叆閿欒锛岄摼鎺ュ凡缁忓け鏁堣繃鏈. sys.error.404.message.p3=鎮ㄨ闂殑鍦板潃涓猴細 sys.error.404.message.p4=鑻ユ湁鐤戦棶璇疯仈绯荤鐞嗗憳. -sys.error.404.message=鎮ㄨ闂殑椤甸潰涓嶅瓨鍦紒 -sys.error.404.message=鎮ㄨ闂殑椤甸潰涓嶅瓨鍦紒 sys.error.500.title=绯荤粺鍐呴儴閿欒 sys.error.500.message=鎮ㄨ闂殑椤甸潰鍑洪敊鍟︼紒 sys.error.500.message.p1=瀵逛笉璧凤紝浣犺闂殑椤甸潰鍑虹幇浜嗕竴鐐归棶棰橈紝璇峰強鏃惰仈绯荤鐞嗗憳瑙ｅ喅锛 diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties index 05f7ea83..53e787ed 100644 --- a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties @@ -1,11 +1,23 @@ -# =========== 瑙嗗浘閫氱敤 =========== +# =========== common =========== 淇漒 瀛=Save 鍏砛 闂=Close 纭畾=Ok 娓呴櫎=Clear 鍏抽棴=Close +鏌ヨ=Search +閲嶇疆=Reset +鏂板=New +澧炶=New line +鍒锋柊=Refresh +灞曞紑=Expand +灞曞紑涓绾=Expand level 1 +鎶樺彔=Collapse +鎶樺彔鍏ㄩ儴=Collapse all +鎿嶄綔=Actions +鏇村鎿嶄綔=More action +鐘舵=Status # =========== imageclip =========== @@ -35,7 +47,7 @@ 涓嶈兘閫夋嫨鐖惰妭鐐=Cannot select parent node 璇烽噸鏂伴夋嫨=Please reselect -# =========== treeselect =========== +# =========== fileupload =========== 鏂囦欢=File 鏂囨。=Document @@ -45,3 +57,21 @@ 寮濮嬩笂浼=Start upload 鎴栧皢鐓х墖鎷栧埌杩欓噷锛屾渶澶氬彲閫塡 {0}\ 寮=Drag the photo here, at most \ {0} \ sheet 鎴栧皢鐓х墖鎷栧埌杩欓噷锛屾渶澶氬彲閫塡 {0}\ 涓=Drag the photo here, at most \ {0} + +# =========== iconselect =========== + +鍥炬爣閫夋嫨=Icon select +鎻愮ず锛氬弻鍑婚夋嫨鍥炬爣銆=Tip: double-click the selection icon. + +# =========== ueditor =========== + +鐩綍鏍囬=Directory title +鏆傛棤澶х翰鏍囬=There is no outline title. + +# =========== validcode =========== + +楠岃瘉鐮=Captcha +璇峰～鍐欓獙璇佺爜=Please fill in the captcha. +楠岃瘉鐮佷笉姝ｇ‘=The captcha is incorrect. +鐪嬩笉娓咃紝鐐瑰嚮鍥剧墖鍒锋柊=Can't see clearly, click on the picture to refresh. + diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties index f694b0d4..1b62a483 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties @@ -1,6 +1,8 @@ # =========== sysLogin =========== +鑻辫=English + 鐧诲綍=Login 璇峰～鍐欑櫥褰曡处鍙.=Please enter login account. @@ -63,3 +65,89 @@ 鏂扮殑瀵嗕繚闂鍙婄瓟妗=New secret questions and answers 鏂颁繚瀵嗛棶棰=New secret questions 鏂颁繚瀵嗛棶棰樼瓟妗=New secret answers + +# =========== 閫氱敤瀛楀吀鍒楄〃 =========== + +鏄=Yes +鍚=No +鐢=Man +濂=Woman +姝ｅ父=Normal +鍒犻櫎=Delete +鍋滅敤=Disable +鍐荤粨=Freeze +寰呭=Audit +椹冲洖=Rejected +鑽夌ǹ=Draft + +# =========== 鏍稿績鍔熻兘鍚嶇О =========== + +绯荤粺绠＄悊=System mgt +缁勭粐绠＄悊=Organization +鐢ㄦ埛绠＄悊=User manage +鏈烘瀯绠＄悊=Office manage +鍏徃绠＄悊=Company manage +宀椾綅绠＄悊=Position manage + +缁勭粐鏈烘瀯=Office + +鐢ㄦ埛閫夋嫨=User select +鏈烘瀯閫夋嫨=Office select +鍖哄煙閫夋嫨=Area select + +# =========== empUserList =========== + +鏂板鐢ㄦ埛=New user +缂栬緫鐢ㄦ埛=Edit user + +鍋滅敤鐢ㄦ埛=Disable user +纭瑕佸仠鐢ㄨ鐢ㄦ埛鍚楋紵=Are you sure want to disable this user? +鍚敤鐢ㄦ埛=Enable user +纭瑕佸惎鐢ㄨ鐢ㄦ埛鍚楋紵=Are you sure want to enable this user? +鍒犻櫎鐢ㄦ埛=Delete user +纭瑕佸垹闄よ鐢ㄦ埛鍚楋紵=Are you sure want to delete this user? +鐢ㄦ埛鍒嗛厤瑙掕壊=User assign roles +鍒嗛厤瑙掕壊=Assign roles +鐢ㄦ埛鍒嗛厤鏁版嵁鏉冮檺=User assign data scopes +鏁版嵁鏉冮檺=Data scopes +鐢ㄦ埛瀵嗙爜閲嶇疆=User password reset +纭瑕佸皢璇ョ敤鎴峰瘑鐮侀噸缃埌鍒濆鐘舵佸悧锛=Are you sure want to reset the user password to the initial state? +閲嶇疆瀵嗙爜=Reset password + +# =========== officeList =========== + +鏂板鏈烘瀯=New office +缂栬緫鏈烘瀯=Edit office + +鍋滅敤鏈烘瀯=Disable office +纭瑕佸仠鐢ㄨ鏈烘瀯鍚楋紵=Are you sure want to disable this office? +鍚敤鏈烘瀯=Enable office +纭瑕佸惎鐢ㄨ鏈烘瀯鍚楋紵=Are you sure want to enable this office? +鍒犻櫎鏈烘瀯=Delete office +纭瑕佸垹闄よ鏈烘瀯鍙婃墍鏈夊瓙鏈烘瀯鍚楋紵=Are you sure want to delete this office and sub office? +鏂板涓嬬骇鏈烘瀯=New sub office + +# =========== companyList =========== + +鏂板鍏徃=New company +缂栬緫鍏徃=Edit company + +鍋滅敤鍏徃=Disable company +纭瑕佸仠鐢ㄨ鍏徃鍚楋紵=Are you sure want to disable this company? +鍚敤鍏徃=Enable company +纭瑕佸惎鐢ㄨ鍏徃鍚楋紵=Are you sure want to enable this company? +鍒犻櫎鍏徃=Delete company +纭瑕佸垹闄よ鍏徃鍙婃墍鏈夊瓙鍏徃鍚楋紵=Are you sure want to delete this company and sub company? +鏂板涓嬬骇鍏徃=New sub company + +# =========== empUserList =========== + +鏂板宀椾綅=New position +缂栬緫宀椾綅=Edit position + +鍋滅敤宀椾綅=Disable position +纭瑕佸仠鐢ㄨ宀椾綅鍚楋紵=Are you sure want to disable this position? +鍚敤宀椾綅=Enable position +纭瑕佸惎鐢ㄨ宀椾綅鍚楋紵=Are you sure want to enable this position? +鍒犻櫎宀椾綅=Delete position +纭瑕佸垹闄よ宀椾綅鍚楋紵=Are you sure want to delete this position? diff --git a/modules/core/src/main/resources/views/include/jslibs.html b/modules/core/src/main/resources/views/include/jslibs.html index 0fd13d37..d415311b 100644 --- a/modules/core/src/main/resources/views/include/jslibs.html +++ b/modules/core/src/main/resources/views/include/jslibs.html @@ -14,6 +14,7 @@ <% if (@ListUtils.inString('dataGrid', libs!)){ %> + <% } %> <% if (@ListUtils.inString('validate', libs!)){ %> diff --git a/modules/core/src/main/resources/views/modules/sys/companyForm.html b/modules/core/src/main/resources/views/modules/sys/companyForm.html index 2ba40a22..49c3d2e0 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyForm.html +++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html @@ -3,7 +3,7 @@
- ${company.isNewRecord ? '鏂板鍏徃' : '缂栬緫鍏徃'} + ${text(company.isNewRecord ? '鏂板鍏徃' : '缂栬緫鍏徃')}
@@ -73,7 +73,7 @@
- <#form:treeselect id="area" title="鍖哄煙" + <#form:treeselect id="area" title="鍖哄煙閫夋嫨" path="area.areaCode" labelName="area.areaName" labelValue="${company.area.treeNames!}" url="${ctx}/sys/area/treeData" returnFullName="true" class=" " allowClear="true"/> @@ -83,9 +83,9 @@
+ * 鍖呭惈鏈烘瀯锛
- <#form:treeselect id="companyOfficeList" title="閮ㄩ棬" + <#form:treeselect id="companyOfficeList" title="鏈烘瀯閫夋嫨" value="${@ListUtils.extractToString(officeList!, 'officeCode', ',')}" labelValue="${@ListUtils.extractToString(officeList!, 'officeName', ',')}" url="${ctx}/sys/office/treeData" checkbox="true" @@ -112,9 +112,9 @@
<% if (hasPermi('sys:company:edit')){ %> -   +   <% } %> - +
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 d2e17a95..0ad62ac7 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -3,15 +3,15 @@
- 鍏徃绠＄悊 + ${text('鍏徃绠＄悊')}
- 鏌ヨ - 鍒锋柊 - 灞曞紑 - 鎶樺彔 + ${text('鏌ヨ')} + ${text('鍒锋柊')} + ${text('灞曞紑')} + ${text('鎶樺彔')} <% if(hasPermi('sys:company:edit')){ %> - 鏂板 + ${text('鏂板')} <% } %>
@@ -37,14 +37,14 @@
- +
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
- - + +
@@ -58,28 +58,28 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'鍏徃鍚嶇О', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.viewCode+' ) '+''+(val||row.id)+''; + return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, {header:'鍏徃鍏ㄧО', name:'fullName', index:'a.full_name', width:200, align:"left"}, {header:'鎺掑簭鍙', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, {header:'褰掑睘鍖哄煙', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"}, {header:'鏇存柊鏃堕棿', name:'updateDate', index:'a.update_date', width:200, align:"center"}, {header:'澶囨敞淇℃伅', name:'remarks', index:'a.remarks', width:200, align:"left"}, - {header:'鐘舵', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ + {header:'${text('鐘舵')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '鏈煡', true); }}, - {header:'鎿嶄綔', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text('鎿嶄綔')}', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:company:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); - actions.push(' '); + actions.push(' '); + actions.push(' '); <% } %> return actions.join(''); }} 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 55e6dd2b..58ecf7c3 100644 --- a/modules/core/src/main/resources/views/modules/sys/logList.html +++ b/modules/core/src/main/resources/views/modules/sys/logList.html @@ -33,7 +33,7 @@
- <#form:listselect id="userSelect" title="鐢ㄦ埛" path="createBy" + <#form:listselect id="userSelect" title="鐢ㄦ埛閫夋嫨" path="createBy" url="${ctx}/sys/user/userSelect?userType=" allowClear="false" checkbox="false" itemCode="userCode" itemName="userName"/>
diff --git a/modules/core/src/main/resources/views/modules/sys/officeForm.html b/modules/core/src/main/resources/views/modules/sys/officeForm.html index 62dad5f6..f82f3d99 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeForm.html +++ b/modules/core/src/main/resources/views/modules/sys/officeForm.html @@ -3,7 +3,7 @@
- ${office.isNewRecord ? '鏂板鏈烘瀯' : '缂栬緫鏈烘瀯'} + ${text(office.isNewRecord ? '鏂板鏈烘瀯' : '缂栬緫鏈烘瀯')}
@@ -145,9 +145,9 @@
<% if (hasPermi('sys:office:edit')){ %> -   +   <% } %> - +
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 072e7bcc..20e36317 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -3,15 +3,15 @@
- 鏈烘瀯绠＄悊 + ${text('鏈烘瀯绠＄悊')}
- 鏌ヨ - 鍒锋柊 - 灞曞紑 - 鎶樺彔 + ${text('鏌ヨ')} + ${text('鍒锋柊')} + ${text('灞曞紑')} + ${text('鎶樺彔')} <% if(hasPermi('sys:office:edit')){ %> - 鏂板 + ${text('鏂板')} <% } %>
@@ -43,14 +43,14 @@
- +
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
- - + +
@@ -64,7 +64,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'鏈烘瀯鍚嶇О', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.viewCode+' ) '+''+(val||row.id)+''; + return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, {header:'鏈烘瀯鍏ㄧО', name:'fullName', index:'a.full_name', width:200, align:"left"}, {header:'鎺掑簭鍙', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, @@ -73,21 +73,21 @@ $('#dataGrid').dataGrid({ }}, {header:'鏇存柊鏃堕棿', name:'updateDate', index:'a.update_date', width:150, align:"center"}, {header:'澶囨敞淇℃伅', name:'remarks', index:'a.remarks', width:200, align:"left"}, - {header:'鐘舵', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ + {header:'${text('鐘舵')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '鏈煡', true); }}, - {header:'鎿嶄綔', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text('鎿嶄綔')}', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:office:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); - actions.push(' '); + 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 ae0cd7a8..29cf8887 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -15,7 +15,7 @@
- <#form:listselect id="userSelect" title="鐢ㄦ埛" path="userCode" + <#form:listselect id="userSelect" title="鐢ㄦ埛閫夋嫨" path="userCode" url="${ctx}/sys/user/userSelect?userType=" allowClear="false" checkbox="false" itemCode="userCode" itemName="userName"/>
diff --git a/modules/core/src/main/resources/views/modules/sys/postForm.html b/modules/core/src/main/resources/views/modules/sys/postForm.html index 546e168c..aa2202c3 100644 --- a/modules/core/src/main/resources/views/modules/sys/postForm.html +++ b/modules/core/src/main/resources/views/modules/sys/postForm.html @@ -3,7 +3,7 @@
- ${post.isNewRecord ? '鏂板宀椾綅' : '缂栬緫宀椾綅'} + ${text(post.isNewRecord ? '鏂板宀椾綅' : '缂栬緫宀椾綅')}
@@ -72,9 +72,9 @@
<% if (hasPermi('sys:post:edit')){ %> -   +   <% } %> - +
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 aede9639..4201cb3e 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -3,12 +3,12 @@
- 宀椾綅绠＄悊 + ${text('宀椾綅绠＄悊')}
- 鏌ヨ + ${text('鏌ヨ')} <% if(hasPermi('sys:post:edit')){ %> - 鏂板 + ${text('鏂板')} <% } %>
@@ -34,14 +34,14 @@
- +
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
-
- - +
+ +
@@ -56,7 +56,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'宀椾綅鍚嶇О', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + return ''+(val||row.id)+''; }}, {header:'宀椾綅缂栫爜', name:'postCode', index:'a.post_code', width:200, align:"center"}, {header:'鎺掑簭鍙', name:'postSort', index:'a.post_sort', width:80, align:"center"}, @@ -65,20 +65,20 @@ $('#dataGrid').dataGrid({ }}, {header:'鏇存柊鏃堕棿', name:'updateDate', index:'a.update_date', width:150, align:"center"}, {header:'澶囨敞淇℃伅', name:'remarks', index:'a.remarks', width:200, align:"left"}, - {header:'鐘舵', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ + {header:'${text('鐘舵')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '鏈煡', true); }}, - {header:'鎿嶄綔', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text('鎿嶄綔')}', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:post:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); + 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 d6b4d84d..ba899f6f 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 @@ -3,7 +3,7 @@
- ${empUser.isNewRecord ? '鏂板鐢ㄦ埛' : op == 'auth' ? '鐢ㄦ埛鎺堟潈瑙掕壊' : '缂栬緫鐢ㄦ埛'} + ${text(empUser.isNewRecord ? '鏂板鐢ㄦ埛' : op == 'auth' ? '鐢ㄦ埛鍒嗛厤瑙掕壊' : '缂栬緫鐢ㄦ埛')}
@@ -23,7 +23,7 @@
- <#form:treeselect id="office" title="閮ㄩ棬" + <#form:treeselect id="office" title="鏈烘瀯閫夋嫨" path="employee.office.officeCode" labelPath="employee.office.officeName" url="${ctx}/sys/office/treeData" class="required" allowClear="false"/>
@@ -34,7 +34,7 @@
- <#form:treeselect id="company" title="鍏徃" + <#form:treeselect id="company" title="鍏徃閫夋嫨" path="employee.company.companyCode" labelPath="employee.company.companyName" url="${ctx}/sys/company/treeData" btnClass="" allowClear="true"/>
@@ -185,9 +185,9 @@
<% if (hasPermi('sys:empUser:edit')){ %> -   +   <% } %> - +
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 595bd8c0..8ac3ef61 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 @@ -3,7 +3,7 @@
- 鐢ㄦ埛鎺堟潈鏁版嵁鏉冮檺 + ${text('鐢ㄦ埛鍒嗛厤鏁版嵁鏉冮檺')}
@@ -61,9 +61,9 @@
<% if (hasPermi('sys:empUser:edit')){ %> -   +   <% } %> - +
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index 6e4122b4..c74d6aa1 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -4,15 +4,15 @@
- 缁勭粐鏈烘瀯 + ${text('缁勭粐鏈烘瀯')}
<% if(hasPermi('sys:office:edit')){ %> - + <% } %> - - - + + +
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 68fef433..7fd73faf 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 @@ -3,12 +3,12 @@
- 鐢ㄦ埛绠＄悊 + ${text('鐢ㄦ埛绠＄悊')}
- 鏌ヨ + ${text('鏌ヨ')} <% if(hasPermi('sys:empUser:edit')){ %> - 鏂板 + ${text('鏂板')} <% } %>
@@ -53,9 +53,9 @@
- +
- <#form:treeselect id="office" title="閮ㄩ棬" + <#form:treeselect id="office" title="鏈烘瀯閫夋嫨" path="employee.office.officeCode" labelPath="employee.office.officeName" url="${ctx}/sys/office/treeData" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
@@ -63,7 +63,7 @@
- <#form:treeselect id="company" title="鍏徃" + <#form:treeselect id="company" title="鍏徃閫夋嫨" path="employee.company.companyCode" labelPath="employee.company.companyName" url="${ctx}/sys/company/treeData" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
@@ -76,14 +76,14 @@
- +
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/>
- - + +
@@ -98,35 +98,35 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'鐧诲綍璐﹀彿', name:'loginCode', index:'a.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + return ''+(val||row.id)+''; }}, {header:'鐢ㄦ埛鏄电О', name:'userName', index:'a.user_name', width:200, align:"center"}, {header:'鐢ㄦ埛濮撳悕', name:'refName', index:'a.ref_name', width:200, align:"center"}, - {header:'褰掑睘閮ㄩ棬', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, + {header:'褰掑睘鏈烘瀯', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, {header:'褰掑睘鍏徃', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"}, {header:'鐢靛瓙閭', name:'email', index:'a.email', width:200, align:"center"}, {header:'鎵嬫満鍙风爜', name:'mobile', index:'a.mobile', width:200, align:"center"}, {header:'鍔炲叕鐢佃瘽', name:'phone', index:'a.phone', width:200, align:"center"}, {header:'鏇存柊鏃堕棿', name:'updateDate', index:'a.update_date', width:200, align:"center"}, - {header:'鐘舵', name:'status', index:'a.status', width:100, align:"center", formatter: function(val, obj, row, act){ + {header:'${text('鐘舵')}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '鏈煡', true); }}, - {header:'鎿嶄綔', name:'actions', width:250, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text('鎿嶄綔')}', name:'actions', width:260, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:empUser:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); - actions.push(' '); + actions.push(' '); + actions.push(' '); actions.push('
'); - actions.push(' 鍒嗛厤瑙掕壊 '); - actions.push(' 鏁版嵁鏉冮檺 '); - actions.push(' 閲嶇疆瀵嗙爜 '); + actions.push(' ${text('鍒嗛厤瑙掕壊')} '); + actions.push(' ${text('鏁版嵁鏉冮檺')} '); + actions.push(' ${text('閲嶇疆瀵嗙爜')} '); actions.push('
'); <% } %> return actions.join(''); 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 69e28d83..e9dfa98c 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,7 +60,7 @@
<% var userType = isNotBlank(parameter.userType)?parameter.userType:'employee'; %> -
<#form:listselect id="userSelect" title="鐢ㄦ埛" +
<#form:listselect id="userSelect" title="鐢ㄦ埛閫夋嫨" url="${ctx}/sys/user/userSelect?userType=${userType}" allowClear="false" checkbox="false" itemCode="userCode" itemName="userName"/>
<% } %> diff --git a/web/db/mysql/test.sql b/web/db/mysql/test.sql index fd2e63e8..0b6b2234 100644 --- a/web/db/mysql/test.sql +++ b/web/db/mysql/test.sql @@ -24,7 +24,7 @@ CREATE TABLE test_data test_date datetime COMMENT '鏃ユ湡閫夋嫨', test_datetime datetime COMMENT '鏃ユ湡鏃堕棿', test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨', - test_office_code varchar(64) COMMENT '閮ㄩ棬閫夋嫨', + test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨', test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨', test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О', status char(1) DEFAULT '0' NOT NULL COMMENT '鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛', @@ -52,7 +52,7 @@ CREATE TABLE test_data_child test_date datetime COMMENT '鏃ユ湡閫夋嫨', test_datetime datetime COMMENT '鏃ユ湡鏃堕棿', test_user_code varchar(64) COMMENT '鐢ㄦ埛閫夋嫨', - test_office_code varchar(64) COMMENT '閮ㄩ棬閫夋嫨', + test_office_code varchar(64) COMMENT '鏈烘瀯閫夋嫨', test_area_code varchar(64) COMMENT '鍖哄煙閫夋嫨', test_area_name varchar(100) COMMENT '鍖哄煙鍚嶇О', PRIMARY KEY (id) diff --git a/web/db/oracle/test.sql b/web/db/oracle/test.sql index c215c552..7620cd95 100644 --- a/web/db/oracle/test.sql +++ b/web/db/oracle/test.sql @@ -94,7 +94,7 @@ COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉夋'; COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨'; COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿'; COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨'; -COMMENT ON COLUMN test_data.test_office_code IS '閮ㄩ棬閫夋嫨'; +COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨'; COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨'; COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О'; COMMENT ON COLUMN test_data.status IS '鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛'; @@ -116,7 +116,7 @@ COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉夋'; COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨'; COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿'; COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨'; -COMMENT ON COLUMN test_data_child.test_office_code IS '閮ㄩ棬閫夋嫨'; +COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨'; COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨'; COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О'; COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃'; diff --git a/web/db/postgresql/test.sql b/web/db/postgresql/test.sql index 93ae65b2..dc02a51f 100644 --- a/web/db/postgresql/test.sql +++ b/web/db/postgresql/test.sql @@ -94,7 +94,7 @@ COMMENT ON COLUMN test_data.test_checkbox IS '澶嶉夋'; COMMENT ON COLUMN test_data.test_date IS '鏃ユ湡閫夋嫨'; COMMENT ON COLUMN test_data.test_datetime IS '鏃ユ湡鏃堕棿'; COMMENT ON COLUMN test_data.test_user_code IS '鐢ㄦ埛閫夋嫨'; -COMMENT ON COLUMN test_data.test_office_code IS '閮ㄩ棬閫夋嫨'; +COMMENT ON COLUMN test_data.test_office_code IS '鏈烘瀯閫夋嫨'; COMMENT ON COLUMN test_data.test_area_code IS '鍖哄煙閫夋嫨'; COMMENT ON COLUMN test_data.test_area_name IS '鍖哄煙鍚嶇О'; COMMENT ON COLUMN test_data.status IS '鐘舵侊紙0姝ｅ父 1鍒犻櫎 2鍋滅敤锛'; @@ -116,7 +116,7 @@ COMMENT ON COLUMN test_data_child.test_checkbox IS '澶嶉夋'; COMMENT ON COLUMN test_data_child.test_date IS '鏃ユ湡閫夋嫨'; COMMENT ON COLUMN test_data_child.test_datetime IS '鏃ユ湡鏃堕棿'; COMMENT ON COLUMN test_data_child.test_user_code IS '鐢ㄦ埛閫夋嫨'; -COMMENT ON COLUMN test_data_child.test_office_code IS '閮ㄩ棬閫夋嫨'; +COMMENT ON COLUMN test_data_child.test_office_code IS '鏈烘瀯閫夋嫨'; COMMENT ON COLUMN test_data_child.test_area_code IS '鍖哄煙閫夋嫨'; COMMENT ON COLUMN test_data_child.test_area_name IS '鍖哄煙鍚嶇О'; COMMENT ON TABLE test_tree IS '娴嬭瘯鏍戣〃'; diff --git a/web/db/test.erm b/web/db/test.erm index 80def1ec..55ef0b14 100644 --- a/web/db/test.erm +++ b/web/db/test.erm @@ -12,7 +12,7 @@ 0 1.0 0 - 0 + 99 128 128 @@ -760,7 +760,7 @@ varchar(n) - 5d32d32e3e7a7e115fe0ec3dff297801019dcd78 + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb 64 null false @@ -771,7 +771,7 @@ false - 閮ㄩ棬閫夋嫨 + 鏈烘瀯閫夋嫨 test_office_code varchar(n) @@ -1438,7 +1438,7 @@ - 5d32d32e3e7a7e115fe0ec3dff297801019dcd78 + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb 16121b5aa08fc170883408ec2d0487281a132d9d @@ -1997,7 +1997,7 @@ - 5d32d32e3e7a7e115fe0ec3dff297801019dcd78 + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb 23041cb30875514136904ea11043c7ea1924f048 diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index ab54f58d..15a2b2ed 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -35,7 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="test_date", attrName="testDate", label="鏃ユ湡閫夋嫨"), @Column(name="test_datetime", attrName="testDatetime", label="鏃ユ湡鏃堕棿"), @Column(name="test_user_code", attrName="testUser.userCode", label="鐢ㄦ埛閫夋嫨"), - @Column(name="test_office_code", attrName="testOffice.officeCode", label="閮ㄩ棬閫夋嫨"), + @Column(name="test_office_code", attrName="testOffice.officeCode", label="鏈烘瀯閫夋嫨"), @Column(name="test_area_code", attrName="testAreaCode", label="鍖哄煙閫夋嫨"), @Column(name="test_area_name", attrName="testAreaName", label="鍖哄煙鍚嶇О"), @Column(includeEntity=DataEntity.class), @@ -47,8 +47,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; }), @JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u11", on="u11.office_code = a.test_office_code", columns={ - @Column(name="office_code", label="閮ㄩ棬缂栫爜", isPK=true), - @Column(name="office_name", label="閮ㄩ棬鍚嶇О", isQuery=false), + @Column(name="office_code", label="鏈烘瀯缂栫爜", isPK=true), + @Column(name="office_name", label="鏈烘瀯鍚嶇О", isQuery=false), }), }, orderBy="a.update_date DESC" ) @@ -64,7 +64,7 @@ public class TestData extends DataEntity { private Date testDate; // 鏃ユ湡閫夋嫨 private Date testDatetime; // 鏃ユ湡鏃堕棿 private User testUser; // 鐢ㄦ埛閫夋嫨 - private Office testOffice; // 閮ㄩ棬閫夋嫨 + private Office testOffice; // 鏈烘瀯閫夋嫨 private String testAreaCode; // 鍖哄煙閫夋嫨 private String testAreaName; // 鍖哄煙鍚嶇О private List testDataChildList = ListUtils.newArrayList(); // 瀛愯〃鍒楄〃 diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index be1ccb23..7f93cf3f 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -35,7 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="test_date", attrName="testDate", label="鏃ユ湡閫夋嫨"), @Column(name="test_datetime", attrName="testDatetime", label="鏃ユ湡鏃堕棿"), @Column(name="test_user_code", attrName="testUser.userCode", label="鐢ㄦ埛閫夋嫨"), - @Column(name="test_office_code", attrName="testOffice.officeCode", label="閮ㄩ棬閫夋嫨"), + @Column(name="test_office_code", attrName="testOffice.officeCode", label="鏈烘瀯閫夋嫨"), @Column(name="test_area_code", attrName="testAreaCode", label="鍖哄煙閫夋嫨"), @Column(name="test_area_name", attrName="testAreaName", label="鍖哄煙鍚嶇О", isQuery=false), }, joinTable={ @@ -46,8 +46,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; }), @JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u13", on="u13.office_code = a.test_office_code", columns={ - @Column(name="office_code", label="閮ㄩ棬缂栫爜", isPK=true), - @Column(name="office_name", label="閮ㄩ棬鍚嶇О", isQuery=false), + @Column(name="office_code", label="鏈烘瀯缂栫爜", isPK=true), + @Column(name="office_name", label="鏈烘瀯鍚嶇О", isQuery=false), }), }, orderBy="a.id ASC" ) @@ -65,7 +65,7 @@ public class TestDataChild extends DataEntity { private Date testDate; // 鏃ユ湡閫夋嫨 private Date testDatetime; // 鏃ユ湡鏃堕棿 private User testUser; // 鐢ㄦ埛閫夋嫨 - private Office testOffice; // 閮ㄩ棬閫夋嫨 + private Office testOffice; // 鏈烘瀯閫夋嫨 private String testAreaCode; // 鍖哄煙閫夋嫨 private String testAreaName; // 鍖哄煙鍚嶇О diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml index 179af9b1..2fa2945e 100644 --- a/web/src/main/resources/config/jeesite.yml +++ b/web/src/main/resources/config/jeesite.yml @@ -165,7 +165,7 @@ jdbc: # [{ # moduleCode: "core", # ctrlPermi: "0", -# ctrlName: "閮ㄩ棬鏉冮檺", +# ctrlName: "鏈烘瀯鏉冮檺", # ctrlType: "Office", # ctrlDataUrl: "/sys/office/treeData", # chkboxType: {"Y":"ps","N":"ps"}, diff --git a/web/src/main/resources/views/modules/demo/dataGridEditGrid.html b/web/src/main/resources/views/modules/demo/dataGridEditGrid.html index 3ead6f3e..22d0bb67 100644 --- a/web/src/main/resources/views/modules/demo/dataGridEditGrid.html +++ b/web/src/main/resources/views/modules/demo/dataGridEditGrid.html @@ -74,15 +74,15 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#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="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" allowClear="true"/>
@@ -90,7 +90,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" allowClear="true"/>
@@ -168,7 +168,7 @@ $('#dataGrid').dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'user_'+editOptions.id, title: '鐢ㄦ埛', + id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', name: 'testUser.userCode', value: val.split('|')[0], labelName: 'testUser.userName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: '' @@ -176,13 +176,13 @@ $('#dataGrid').dataGrid({ } } }, - {header:'閮ㄩ棬閫夋嫨', name:'testOffice', width:150, + {header:'鏈烘瀯閫夋嫨', name:'testOffice', width:150, formatter: function(val, obj, row, act){ return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'office_'+editOptions.id, title: '閮ㄩ棬', + id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', name: 'testOffice.officeCode', value: val.split('|')[0], labelName: 'testOffice.officeName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: '' @@ -196,7 +196,7 @@ $('#dataGrid').dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'area_'+editOptions.id, title: '鍖哄煙', + id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', name: 'testAreaCode', value: val.split('|')[0], labelName: 'testAreaName', labelValue: val.split('|')[1], url: '${ctx}/sys/area/treeData', cssClass: '' diff --git a/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html index 2dadf4a5..4eaf8a1b 100644 --- a/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html @@ -74,15 +74,15 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#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="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" allowClear="true"/>
@@ -90,7 +90,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" allowClear="true"/>
@@ -151,7 +151,7 @@ $('#dataGrid').dataGrid({ {header:'鏃ユ湡閫夋嫨', name:'testDate', index:'a.test_date', width:150, align:"center"}, {header:'鏃ユ湡鏃堕棿', name:'testDatetime', index:'a.test_datetime', width:150, align:"center"}, {header:'鐢ㄦ埛閫夋嫨', name:'testUser.userName', index:'a.test_user_code', width:150, align:"center"}, - {header:'閮ㄩ棬閫夋嫨', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"}, + {header:'鏈烘瀯閫夋嫨', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"}, {header:'鍖哄煙閫夋嫨', name:'testAreaName', index:'a.test_area_code', width:150, align:"center"}, {header:'鍖哄煙鍚嶇О', name:'testAreaName', index:'a.test_area_name', width:150, align:"left"}, {header:'鐘舵', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){ diff --git a/web/src/main/resources/views/modules/demo/formEditForm.html b/web/src/main/resources/views/modules/demo/formEditForm.html index cb34922e..8b2702b2 100644 --- a/web/src/main/resources/views/modules/demo/formEditForm.html +++ b/web/src/main/resources/views/modules/demo/formEditForm.html @@ -103,7 +103,7 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨" path="testUser.userCode" labelPath="testUser.userName" url="${ctx}/sys/office/treeData?isLoadUser=true" class="" allowClear="true"/> @@ -113,9 +113,9 @@
+ * 鏈烘瀯閫夋嫨锛
- <#form:treeselect id="testOffice" title="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" class="" allowClear="true"/> @@ -129,7 +129,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" class="" allowClear="true"/> @@ -263,7 +263,7 @@ $("#testDataChildDataGrid").dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'user_'+editOptions.id, title: '鐢ㄦ埛', + id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', name: 'testUser.userCode', value: val.split('|')[0], labelName: 'testUser.userName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: '' @@ -271,13 +271,13 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'閮ㄩ棬閫夋嫨', name:'testOffice', width:150, + {header:'鏈烘瀯閫夋嫨', name:'testOffice', width:150, formatter: function(val, obj, row, act){ return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'office_'+editOptions.id, title: '閮ㄩ棬', + id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', name: 'testOffice.officeCode', value: val.split('|')[0], labelName: 'testOffice.officeName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: '' @@ -291,7 +291,7 @@ $("#testDataChildDataGrid").dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'area_'+editOptions.id, title: '鍖哄煙', + id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', name: 'testAreaCode', value: val.split('|')[0], labelName: 'testAreaName', labelValue: val.split('|')[1], url: '${ctx}/sys/area/treeData', cssClass: '' diff --git a/web/src/main/resources/views/modules/demo/formLayoutForm.html b/web/src/main/resources/views/modules/demo/formLayoutForm.html index c4e51bca..393a326b 100644 --- a/web/src/main/resources/views/modules/demo/formLayoutForm.html +++ b/web/src/main/resources/views/modules/demo/formLayoutForm.html @@ -103,7 +103,7 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨" path="testUser.userCode" labelPath="testUser.userName" url="${ctx}/sys/office/treeData?isLoadUser=true" class="" allowClear="true"/> @@ -115,9 +115,9 @@
+ * 鏈烘瀯锛
- <#form:treeselect id="testOffice" title="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" class="" allowClear="true"/> @@ -129,7 +129,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" class="" allowClear="true"/> diff --git a/web/src/main/resources/views/modules/demo/formTableForm.html b/web/src/main/resources/views/modules/demo/formTableForm.html index 68ef86d1..64abdb2d 100644 --- a/web/src/main/resources/views/modules/demo/formTableForm.html +++ b/web/src/main/resources/views/modules/demo/formTableForm.html @@ -103,7 +103,7 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨" path="testUser.userCode" labelPath="testUser.userName" url="${ctx}/sys/office/treeData?isLoadUser=true" class="" allowClear="true"/> @@ -113,9 +113,9 @@
+ * 鏈烘瀯閫夋嫨锛
- <#form:treeselect id="testOffice" title="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" class="" allowClear="true"/> @@ -129,7 +129,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" class="" allowClear="true"/> @@ -263,7 +263,7 @@ $("#testDataChildDataGrid").dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'user_'+editOptions.id, title: '鐢ㄦ埛', + id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', name: 'testUser.userCode', value: val.split('|')[0], labelName: 'testUser.userName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: '' @@ -271,13 +271,13 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'閮ㄩ棬閫夋嫨', name:'testOffice', width:150, + {header:'鏈烘瀯閫夋嫨', name:'testOffice', width:150, formatter: function(val, obj, row, act){ return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'office_'+editOptions.id, title: '閮ㄩ棬', + id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', name: 'testOffice.officeCode', value: val.split('|')[0], labelName: 'testOffice.officeName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: '' @@ -291,7 +291,7 @@ $("#testDataChildDataGrid").dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'area_'+editOptions.id, title: '鍖哄煙', + id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', name: 'testAreaCode', value: val.split('|')[0], labelName: 'testAreaName', labelValue: val.split('|')[1], url: '${ctx}/sys/area/treeData', cssClass: '' diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 68ef86d1..64abdb2d 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -103,7 +103,7 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#form:treeselect id="testUser" title="鐢ㄦ埛閫夋嫨" path="testUser.userCode" labelPath="testUser.userName" url="${ctx}/sys/office/treeData?isLoadUser=true" class="" allowClear="true"/> @@ -113,9 +113,9 @@
+ * 鏈烘瀯閫夋嫨锛
- <#form:treeselect id="testOffice" title="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" class="" allowClear="true"/> @@ -129,7 +129,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" class="" allowClear="true"/> @@ -263,7 +263,7 @@ $("#testDataChildDataGrid").dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'user_'+editOptions.id, title: '鐢ㄦ埛', + id: 'user_'+editOptions.id, title: '鐢ㄦ埛閫夋嫨', name: 'testUser.userCode', value: val.split('|')[0], labelName: 'testUser.userName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: '' @@ -271,13 +271,13 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'閮ㄩ棬閫夋嫨', name:'testOffice', width:150, + {header:'鏈烘瀯閫夋嫨', name:'testOffice', width:150, formatter: function(val, obj, row, act){ return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'office_'+editOptions.id, title: '閮ㄩ棬', + id: 'office_'+editOptions.id, title: '鏈烘瀯閫夋嫨', name: 'testOffice.officeCode', value: val.split('|')[0], labelName: 'testOffice.officeName', labelValue: val.split('|')[1], url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: '' @@ -291,7 +291,7 @@ $("#testDataChildDataGrid").dataGrid({ }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { return js.template('treeselectTpl', { - id: 'area_'+editOptions.id, title: '鍖哄煙', + id: 'area_'+editOptions.id, title: '鍖哄煙閫夋嫨', name: 'testAreaCode', value: val.split('|')[0], labelName: 'testAreaName', labelValue: val.split('|')[1], url: '${ctx}/sys/area/treeData', cssClass: '' diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index 01654783..1f480b2b 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -74,15 +74,15 @@
- <#form:treeselect id="testUser" title="鐢ㄦ埛" + <#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="閮ㄩ棬" + <#form:treeselect id="testOffice" title="鏈烘瀯閫夋嫨" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" allowClear="true"/>
@@ -90,7 +90,7 @@
- <#form:treeselect id="testAreaCode" title="鍖哄煙" + <#form:treeselect id="testAreaCode" title="鍖哄煙閫夋嫨" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" allowClear="true"/>
@@ -142,7 +142,7 @@ $('#dataGrid').dataGrid({ {header:'鏃ユ湡閫夋嫨', name:'testDate', index:'a.test_date', width:150, align:"center"}, {header:'鏃ユ湡鏃堕棿', name:'testDatetime', index:'a.test_datetime', width:150, align:"center"}, {header:'鐢ㄦ埛閫夋嫨', name:'testUser.userName', index:'a.test_user_code', width:150, align:"center"}, - {header:'閮ㄩ棬閫夋嫨', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"}, + {header:'鏈烘瀯閫夋嫨', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"}, {header:'鍖哄煙閫夋嫨', name:'testAreaName', index:'a.test_area_code', width:150, align:"center"}, {header:'鍖哄煙鍚嶇О', name:'testAreaName', index:'a.test_area_name', width:150, align:"left"}, {header:'鐘舵', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){