From 497988c16c350b18afd03eff6e1fab4ad0bef90c Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 14 Nov 2019 14:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8E(change)=EF=BC=8C=E5=85=8D=E7=82=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E8=BF=9B=E8=A1=8C=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/modules/gen/include/dataGridScript.html | 3 +-- .../templates/modules/gen/include/searchForm.html | 2 +- .../src/main/resources/views/modules/msg/msgInnerList.html | 2 +- .../src/main/resources/views/modules/sys/areaList.html | 5 ++--- .../src/main/resources/views/modules/sys/companyList.html | 5 ++--- .../src/main/resources/views/modules/sys/dictDataList.html | 5 ++--- .../src/main/resources/views/modules/sys/dictTypeList.html | 7 +++---- .../src/main/resources/views/modules/sys/officeList.html | 5 ++--- .../src/main/resources/views/modules/sys/postList.html | 5 ++--- .../resources/views/modules/sys/user/corpAdminList.html | 5 ++--- .../main/resources/views/modules/sys/user/empUserList.html | 5 ++--- .../resources/views/modules/sys/user/secAdminList.html | 2 +- .../resources/views/modules/demo/demoDataGridEditGrid.html | 2 +- .../views/modules/demo/demoDataGridGroupGrid.html | 5 ++--- .../main/resources/views/modules/test/testDataList.html | 5 ++--- .../main/resources/views/modules/test/testTreeList.html | 5 ++--- 16 files changed, 28 insertions(+), 40 deletions(-) diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html index 427efec2..00b0aab9 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 @@ -80,8 +80,7 @@ $('#dataGrid').dataGrid({ <% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %> if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } <% } %> 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 c12e8ded..eab61ff7 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 @@ -18,7 +18,7 @@ <% }else if(c.showType == 'select' || c.showType == 'select_multiple'){ var isMultiple = (c.showType == 'select_multiple'); %>
- <${'#'}form:select path="${c.attrName}" dictType="${c.optionMap['dictType']}"${isMultiple?' multiple="true"':''} blankOption="true" class="form-control"/> + <${'#'}form:select path="${c.attrName}" dictType="${c.optionMap['dictType']}"${isMultiple?' multiple="true"':''} blankOption="true" class="${c.attrName=='status'?'isQuick ':''}form-control"/>
<% }else if(c.showType == 'radio'){ %>
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 b7dc2a1f..f38b75c5 100644 --- a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html +++ b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html @@ -46,7 +46,7 @@
- <#form:select path="status" dictType="msg_inner_msg_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="msg_inner_msg_status" blankOption="true" class="isQuick form-control"/>
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 528134b0..a7357f7e 100644 --- a/modules/core/src/main/resources/views/modules/sys/areaList.html +++ b/modules/core/src/main/resources/views/modules/sys/areaList.html @@ -33,7 +33,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -70,8 +70,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 57fa5470..3381cc1f 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -40,7 +40,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -75,8 +75,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 07e3fecc..235b0ec3 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictDataList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictDataList.html @@ -45,7 +45,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -83,8 +83,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 13e629dd..718cac92 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html @@ -36,7 +36,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -76,10 +76,9 @@ $('#dataGrid').dataGrid({ <% } %> actions.push(' '); <% if(hasPermi('sys:dictType:edit')){ %> - if (row.status == Global.STATUS_NORMAL){ + if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 4411c1f7..a89021a8 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -47,7 +47,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -84,8 +84,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 d40929d1..053c8795 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -36,7 +36,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -74,8 +74,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 a5ade851..9ea7e930 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 @@ -46,7 +46,7 @@
- <#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_user_status" blankOption="true" class="isQuick form-control"/>
@@ -88,8 +88,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); 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 8fa34721..6e73ea5e 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 @@ -88,7 +88,7 @@
- <#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_user_status" blankOption="true" class="isQuick form-control"/>
@@ -129,8 +129,7 @@ $('#dataGrid').dataGrid({ <% if(hasPermi('sys:empUser:updateStatus')){ %> if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + }else if (row.status == Global.STATUS_DISABLE || row.status == Global.STATUS_FREEZE){ actions.push(' '); } <% } %> 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 9ad0cf92..a5ec60a7 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 @@ -46,7 +46,7 @@
- <#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_user_status" blankOption="true" class="isQuick form-control"/>
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html index 4a01c2c3..799c6e7b 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html @@ -98,7 +98,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index 20eb1b04..9c6890b9 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -98,7 +98,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -165,8 +165,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index cf020f51..dc7b422f 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -99,7 +99,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -157,8 +157,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' '); diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html index c9ff684e..9caffd42 100644 --- a/web/src/main/resources/views/modules/test/testTreeList.html +++ b/web/src/main/resources/views/modules/test/testTreeList.html @@ -34,7 +34,7 @@
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> + <#form:select path="status" dictType="sys_search_status" blankOption="true" class="isQuick form-control"/>
@@ -68,8 +68,7 @@ $('#dataGrid').dataGrid({ actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); - } - if (row.status == Global.STATUS_DISABLE){ + } else if (row.status == Global.STATUS_DISABLE){ actions.push(' '); } actions.push(' ');