From 76d0f94fadaf5c65aa62c1b2eac8735384c422dc Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Fri, 26 Jan 2024 11:04:30 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90=E6=90=9C=E7=B4=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=A4=84=E7=90=86=E5=A4=A7=E5=B0=8F=E5=86=99?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extramenu/authority-view-dialog.vue       | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/views/pages/framework/extramenu/authority-view-dialog.vue b/src/views/pages/framework/extramenu/authority-view-dialog.vue
index c2c37852..ddaee866 100644
--- a/src/views/pages/framework/extramenu/authority-view-dialog.vue
+++ b/src/views/pages/framework/extramenu/authority-view-dialog.vue
@@ -11,7 +11,6 @@
     >
       <template v-slot>
         <div>
-          <Loading :loadingShow="loadingShow" type="fix"></Loading>
           <TsContain>
             <template slot="topRight">
               <TsRow>
@@ -21,7 +20,7 @@
                     :dataList="groupList"
                     :placeholder="$t('form.placeholder.pleaseselect',{'target':$t('page.module')})"
                     border="border"
-                    @change="changeGroup"
+                    @change="searchKeyword"
                   ></TsFormSelect>
                 </Col>
                 <Col span="18">
@@ -57,7 +56,6 @@ export default {
   props: {},
   data() {
     return {
-      loadingShow: false,
       isShow: true,
       moduleName: '',
       keyword: '',
@@ -172,41 +170,27 @@ export default {
       });
       return routerConfig;
     },
-    changeGroup(groupName) {
-      this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
-      if (!this.$utils.isEmpty(groupName)) {
-        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-          item.module === groupName
-        );
-      } else if (!this.$utils.isEmpty(this.keyword)) {
-        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-          item.moduleName.indexOf(this.keyword) != -1 || item.menuName.indexOf(this.keyword) != -1 || item.authority.indexOf(this.keyword) != -1
-        );
-      }
-    },
     handleModuleName(module) {
       let moduleConfig = this.groupList.find((item) => item.value == module);
       if (moduleConfig) {
         return `${moduleConfig.text}(${moduleConfig.value})`;
       }
     },
-    searchKeyword(keyword) {
-      if (this.$utils.isEmpty(keyword)) {
-        this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
-        if (this.moduleName) {
-          this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-            item.moduleName.indexOf(this.moduleName) != -1 
-          );
-        }
+    searchKeyword() {
+      let keyword = this.keyword ? this.keyword.toUpperCase() : '';
+      this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
+      if (this.$utils.isEmpty(keyword) && !this.$utils.isEmpty(this.moduleName)) {
+        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+          item.moduleName.indexOf(this.moduleName) != -1 
+        );
         return false;
       }
+      this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+        item.moduleName.indexOf(keyword) != -1 || item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1
+      );
       if (this.moduleName) {
         this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-          item.moduleName.indexOf(this.moduleName) != -1 && (item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1) 
-        );
-      } else {
-        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-          item.moduleName.indexOf(keyword) != -1 || item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1
+          item.moduleName.indexOf(this.moduleName) != -1
         );
       }
     }
-- 
Gitee