From 2dcd4e597c06fb66b0b5f3a1ad1e58b0fd374b93 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 29 Jan 2024 16:47:26 +0800
Subject: [PATCH 01/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496554?=
 =?UTF-8?q?283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/10?=
 =?UTF-8?q?79496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/framework/users/auth-adduser.vue    |   3 -
 .../pages/framework/users/auth-manage.vue     | 430 +++++++++---------
 2 files changed, 214 insertions(+), 219 deletions(-)

diff --git a/src/views/pages/framework/users/auth-adduser.vue b/src/views/pages/framework/users/auth-adduser.vue
index bb4d5811..e4384a4c 100644
--- a/src/views/pages/framework/users/auth-adduser.vue
+++ b/src/views/pages/framework/users/auth-adduser.vue
@@ -218,11 +218,8 @@ export default {
       }
     }
   },
-
   filter: {},
-
   computed: {},
-
   watch: {}
 };
 </script>
diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 5a8de4af..fc3e8b76 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -1,112 +1,61 @@
 <template>
-  <div class="auth-setting">
+  <div>
     <Loading :loadingShow="loadingShow" type="fix"></Loading>
     <TsContain>
       <template slot="topRight">
-        <TsRow class="search-item">
-          <Col span="6">
-            <TsFormSelect
-              :dataList="authGroupList"
-              :value="selectedModuleName"
-              :clearable="false"
-              border="border"
-              @on-change="changeSelect"
-            ></TsFormSelect>
-          </Col>
-          <Col span="18">
-            <InputSearcher
-              v-model="keyword"
-              :placeholder="$t('page.keyword')"
-              @change="search()"
-            ></InputSearcher>
+        <TsRow>
+          <Col span="24">
+            <CombineSearcher
+              v-if="!$utils.isEmpty(defaultMenuList)"
+              v-model="searchVal"
+              v-bind="searchConfig"
+              @change="searchAuthData()"
+            >
+              <template v-slot:defaultValue="{valueConfig, textConfig}">
+                <TsFormSelect
+                  v-model="valueConfig.defaultValue"
+                  v-bind="defaultValueConfig"
+                  @change="(val) => {
+                    $set(valueConfig, 'defaultValue', null)
+                    if(val) {
+                      $set(valueConfig, 'defaultValue', val)
+                    }
+                  }"
+                  @change-label="(label) => {
+                    if(label) {
+                      $set(textConfig, 'defaultValue', label);
+                    } else {
+                      $delete(textConfig, 'defaultValue')
+                    }
+                  }"
+                >
+                  <template v-slot:option="{item}">
+                    <Tooltip placement="right">
+                      <span>{{ item.text }}</span>
+                      <div slot="content">
+                        {{ getMenuName(item) }}
+                      </div>
+                    </Tooltip>
+                  </template>
+                </TsFormSelect>
+              </template>
+            </CombineSearcher>
           </Col>
         </TsRow>
       </template>
-      <div slot="content" class="content">
-        <div class="card-wrapper">
-          <div v-if="authList && authList.length > 0">
-            <div class="card-top text-grey">
-              <TsRow>
-                <Col span="6">
-                  {{ $t('term.framework.authname') }}
-                </Col>
-                <Col span="2">
-                  {{ $t('term.framework.belongmodule') }}
-                </Col>
-                <Col span="10">
-                  {{ $t('term.framework.authdesc') }}
-                </Col>
-                <Col span="2">
-                  {{ $t('term.framework.usercount') }}
-                </Col>
-                <Col span="2">
-                  {{ $t('term.framework.rolecount') }}
-                </Col>
-                <Col span="2">
-                  {{ $t('page.action') }}
-                </Col>
-              </TsRow>
-            </div>
-            <div v-for="(item, index) in authList" :key="index" class="card-item bg-op radius-lg card-hover-shadow">
-              <TsRow>
-                <Col span="6">
-                  <Poptip
-                    trigger="hover"
-                    :content="item.displayName"
-                    class="des-tip"
-                    transfer
-                  >
-                    <div>
-                      <div class="overflow">{{ item.displayName }}</div>
-                    </div>
-                  </Poptip>
-                </Col>
-                <Col span="2">
-                  <Poptip
-                    trigger="hover"
-                    :content="item.authGroupName"
-                    class="des-tip"
-                    transfer
-                  >
-                    <div>
-                      <div class="overflow">{{ item.authGroupName }}</div>
-                    </div>
-                  </Poptip>
-                </Col>
-                <Col span="10">
-                  <Poptip
-                    trigger="hover"
-                    :content="item.description"
-                    class="des-tip"
-                    transfer
-                  >
-                    <div>
-                      <div class="overflow">{{ item.description }}</div>
-                    </div>
-                  </Poptip>
-                </Col>
-                <Col span="2">
-                  <li class="tsfont-userinfo count text-left" :title="$t('term.framework.usercount')">
-                    <span>{{ item.userCount }}</span>
-                  </li>
-                </Col>
-                <Col span="2">
-                  <li class="tsfont-team count text-left" :title="$t('term.framework.rolecount')">
-                    <span>{{ item.roleCount }}</span>
-                  </li>
-                </Col>
-                <Col span="2" class="action">
-                  <ul class="tstable-action-ul">
-                    <li class="tsfont-permission text-action" @click="toAuthAdduser(item)">{{ $t('page.auth') }}</li>
-                  </ul>
-                </Col>
-              </TsRow>
+      <div slot="content">
+        <TsTable
+          v-bind="tableConfig"
+          :theadList="theadList"
+        >
+          <template slot="action" slot-scope="{ row }">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li class="tsfont-permission" @click="toAuthAdduserPage(row)">{{ $t('page.auth') }}</li>
+              </ul>
             </div>
-          </div>
-          <div v-else>
-            <NoData v-show="!loadingShow"></NoData>
-          </div>
-        </div>
+          </template>
+        </TsTable>
       </div>
     </TsContain>
   </div>
@@ -116,160 +65,209 @@
 export default {
   name: 'AuthManage',
   components: {
-    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
-    InputSearcher: resolve => require(['@/resources/components/InputSearcher/InputSearcher.vue'], resolve)
+    CombineSearcher: resolve => require(['@/resources/components/CombineSearcher/CombineSearcher.vue'], resolve),
+    TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve),
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve)
   },
-  props: [''],
+  props: {},
   data() {
     return {
-      keyword: null,
-      authList: [], //权限列表
-      authGroupList: [], //权限组列表
-      selectedModuleName: '',
-      loadingShow: true
+      groupName: '',
+      loadingShow: true,
+      defaultMenuList: [],
+      authGroupList: [],
+      searchVal: {},
+      defaultValueConfig: {
+        dataList: [],
+        search: true,
+        multiple: true,
+        transfer: true
+      },
+      searchConfig: {
+        search: true,
+        placeholder: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.keyword')}),
+        searchList: [
+          {
+            label: this.$t('term.framework.belongmodule'),
+            type: 'select',
+            name: 'groupName',
+            url: '/api/rest/auth/group',
+            clearable: false,
+            search: true,
+            defaultValueIsFirst: true,
+            transfer: true,
+            rootName: 'groupList',
+            onChange: (groupName) => {
+              this.searchVal.defaultValue = null;
+              if (this.$utils.isEmpty(groupName) || groupName == 'all') {
+                this.defaultValueConfig.dataList = this.defaultMenuList;
+              } else {
+                this.defaultValueConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
+              }
+            }
+          },
+          {
+            type: 'slot',
+            name: 'defaultValue',
+            label: this.$t('page.menuname')
+          }
+        ]
+      },
+      tableConfig: {
+        tbodyList: []
+      },
+      theadList: [
+        {
+          title: this.$t('term.framework.authname'),
+          key: 'displayName'
+        },
+        {
+          title: this.$t('term.framework.belongmodule'),
+          key: 'authGroupName'
+        },
+        {
+          title: this.$t('term.framework.authdesc'),
+          key: 'description',
+          width: 500
+        },
+        {
+          title: this.$t('term.framework.usercount'),
+          key: 'userCount'
+        },
+        {
+          title: this.$t('term.framework.rolecount'),
+          key: 'roleCount'
+        },
+        {
+          key: 'action'
+        }
+      ]
     };
   },
-
   beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {
-    this.getAuthGrouplist();
+  async created() {
+    await this.getAuthGrouplist();
+    this.getRouterConfig();
+    this.searchAuthData();
   },
+  beforeMount() {},
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    //获取权限组列表
     getAuthGrouplist() {
-      let data = {};
-      this.$api.common.getAuthGroup(data).then(res => {
+      return this.$api.common.getAuthGroup().then(res => {
         if (res.Status == 'OK') {
-          this.authGroupList = res.Return.groupList;
-          this.selectedModuleName = this.selectedModuleName || (this.authGroupList[0] ? this.authGroupList[0].value : null); // 下榻页面返回，选中对应模块
-          this.getAuthList();
+          this.authGroupList = res.Return.groupList || [];
         }
       });
     },
     //获取权限列表
-    getAuthList() {
+    searchAuthData() {
+      let defaultValueList = [];
+      this.defaultMenuList.forEach((item) => {
+        if (item && item.value && this.searchVal.defaultValue && this.searchVal.defaultValue.includes(item.value) && item.authority) {
+          defaultValueList.push(...item.authority.split(','));
+        }
+      });
       let data = {
-        groupName: this.selectedModuleName,
-        keyword: this.keyword
+        ...this.searchVal,
+        defaultValue: this.$utils.uniqueArr(defaultValueList)
       };
       this.loadingShow = true;
-      this.$addHistoryData('keyword', this.keyword);
-      this.$addHistoryData('selectedModuleName', this.selectedModuleName);
+      this.$addHistoryData('searchVal', this.searchVal);
       this.$api.framework.auth.getAuthList(data).then(res => {
-        this.authList = res.Return;
+        this.tableConfig.tbodyList = res.Return || [];
       }).finally(() => {
         this.loadingShow = false;
       });
     },
     restoreHistory(historyData) {
-      this.keyword = historyData['keyword'];
-      this.selectedModuleName = historyData['selectedModuleName'];
+      this.searchVal = historyData['searchVal'];
     },
-    //搜索
-    search() {
-      this.getAuthList();
-    },
-    //切换权限组
-    changeSelect(val) {
-      this.selectedModuleName = val;
-      this.getAuthList();
-    },
-    toAuthAdduser(item) {
+    toAuthAdduserPage(item) {
       let {name = '', authGroup = ''} = item || {};
       this.$router.push({
         path: `auth-adduser`,
         query: { name: name, groupName: authGroup }
       });
+    },
+    getRouterConfig() {
+      let routerConfig = {};
+      let menuList = [];
+      let routerPathList = [require.context('@/views/pages', true, /router.js$/)];
+      routerPathList.forEach(item => {
+        if (item && item.keys()) {
+          item.keys().forEach(routerPath => {
+            const moduleNames = routerPath.split('/')[1];
+            const lastValue = moduleNames.split('-');
+            const moduleName = lastValue?.pop() || moduleNames;
+            const routeList = item(routerPath).default || [];
+            routerConfig[moduleName] = routeList;
+          });
+        }
+      });
+      let commercialRouterConfig = this.getCommercialRouter();
+      Object.keys(commercialRouterConfig).forEach(key => {
+        if (!routerConfig[key]) {
+          //模块引入
+          routerConfig[key] = commercialRouterConfig[key];
+        }
+      });
+      for (let key in routerConfig) {
+        if (key) {
+          routerConfig[key].forEach((item) => {
+            if (item.name && item.meta && item.meta.ismenu && item.meta.authority) {
+              menuList.push({
+                text: `${item.meta.title}`,
+                value: `${item.name}_${item.path}_${key}`,
+                groupName: key,
+                authority: item.meta.authority ? (typeof item.meta.authority == 'string' ? item.meta.authority : (typeof item.meta.authority == 'object' ? item.meta.authority.join(',') : '')) : ''
+              });
+            }
+          });
+        }
+      }
+      this.defaultMenuList = this.$utils.deepClone(menuList);
+      this.defaultValueConfig.dataList = menuList;
+    },
+    getCommercialRouter() {
+      //商业版模块
+      let routerConfig = {};
+      let routerPathList = [];
+      try {
+        routerPathList.push(require.context('@/commercial-module', true, /router.js$/));
+      } catch {
+        // 模块找不到
+      }
+      routerPathList.forEach(item => {
+        if (item && item.keys()) {
+          item.keys().forEach(routerPath => {
+            const moduleNames = routerPath.split('/')[1];
+            const lastValue = moduleNames.split('-');
+            const moduleName = lastValue?.pop() || moduleNames;
+            const routeList = item(routerPath).default || [];
+            routerConfig[moduleName] = routeList;
+          });
+        }
+      });
+      return routerConfig;
     }
   },
   filter: {},
-  computed: {},
+  computed: {
+    getMenuName() {
+      return (item) => {
+        let groupName = this.authGroupList.find((v) => v.value == item.groupName);
+        return groupName && groupName.text ? `${item.text}(${groupName.text})` : item.text; 
+      };
+    }
+  },
   watch: {}
 };
 </script>
 <style lang="less">
-@import '~@/resources/assets/css/framework/manage.less';
-.auth-setting {
-  .top {
-    .bar-top {
-      .select {
-        width: 200px;
-      }
-      .search {
-        width: 400px;
-      }
-    }
-  }
-  .content {
-    .card-wrapper {
-      .card-top {
-        padding: 0 20px 8px 20px;
-        .action {
-          text-align: center;
-        }
-      }
-      .card-item {
-        height: 56px;
-        line-height: 56px;
-        padding: 0 20px;
-        margin-bottom: 8px;
-        // &:hover {
-        //   .action {
-        //     display: block;
-        //   }
-        // }
-        // .action {
-        //   display: none;
-        //   cursor: pointer;
-        // }
-        .count {
-          > span {
-            margin-left: 5px;
-          }
-        }
-        .tstable-action-ul {
-          li {
-            display: inline-block;
-            padding: 0 @space-xs;
-            &:not(:last-of-type) {
-              position: relative;
-              &::after {
-                content: '|';
-                width: 1px;
-                height: 14px;
-                color: @dividing-color;
-                right: 0px;
-                position: absolute;
-              }
-            }
-            &::before {
-              margin-right: 4px;
-            }
-            // &:first-of-type {
-            //   padding-right: @space-xs;
-            // }
-            // &:hover {
-            //   color: @primary-color;
-            // }
-          }
-        }
-      }
-    }
-  }
-}
-</style>
-<style lang="less" scoped>
-/deep/.des-tip {
-  max-width: 100%;
-  .ivu-poptip-rel {
-    width: 100%;
-  }
-}
 </style>
-- 
Gitee


From 506b8354e4e3ba0102caaaef602938bb9e65df9b Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 29 Jan 2024 16:53:55 +0800
Subject: [PATCH 02/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/framework/users/auth-manage.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index fc3e8b76..2e6d992e 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -48,6 +48,14 @@
           v-bind="tableConfig"
           :theadList="theadList"
         >
+          <template slot="displayName" slot-scope="{ row }">
+            <Tooltip placement="top" :transfer="true">
+              <span>{{ row.displayName }}</span>
+              <div slot="content">
+                {{ row.displayName }}{{ row.name ? `(${row.name})` : '' }}
+              </div>
+            </Tooltip>
+          </template>
           <template slot="action" slot-scope="{ row }">
             <div class="tstable-action">
               <ul class="tstable-action-ul">
-- 
Gitee


From 3ebc98f9c15f60b97c0360743658da4b1e8fc399 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 29 Jan 2024 19:07:48 +0800
Subject: [PATCH 03/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CombineSearcher/CombineSearcher.vue       |  3 +-
 .../pages/framework/users/auth-manage.vue     | 76 +++++++++++--------
 2 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index 44c46ff6..8a418004 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -428,7 +428,7 @@ export default {
               if (this.totalText[k].length == 0) {
                 this.$delete(this.totalText, k);
               }
-            } else if (k && typeof this.totalText[k].toString() == 'string' && this.$utils.isEmpty(this.totalText[k])) {
+            } else if (k && this.totalText[k] && typeof this.totalText[k].toString() == 'string' && this.$utils.isEmpty(this.totalText[k])) {
             // 清除为空的字符串，避免回显为空情况
               this.$delete(this.totalText, k);
             }  
@@ -563,6 +563,7 @@ export default {
           let isEmit = this.$utils.isSame(totalSearch, this.value);
           if (!isEmit) {
             if (this.searchMode == 'realtimeSearch') {
+              console.log('searchValue', totalSearch);
               this.$emit('change', totalSearch);
             }
           }
diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 2e6d992e..7cad51d3 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    {{ searchVal }}
     <TsContain>
       <template slot="topRight">
         <TsRow>
@@ -11,29 +12,18 @@
               v-bind="searchConfig"
               @change="searchAuthData()"
             >
-              <template v-slot:defaultValue="{valueConfig, textConfig}">
+              <template v-slot:menuName="{valueConfig, textConfig}">
                 <TsFormSelect
-                  v-model="valueConfig.defaultValue"
-                  v-bind="defaultValueConfig"
-                  @change="(val) => {
-                    $set(valueConfig, 'defaultValue', null)
-                    if(val) {
-                      $set(valueConfig, 'defaultValue', val)
-                    }
-                  }"
-                  @change-label="(label) => {
-                    if(label) {
-                      $set(textConfig, 'defaultValue', label);
-                    } else {
-                      $delete(textConfig, 'defaultValue')
-                    }
-                  }"
+                  v-model="valueConfig.menuName"
+                  v-bind="menuNameConfig"
+                  @change="(val) => changeDefault(valueConfig, textConfig, val)"
+                  @change-label="(label) => changeLabel(valueConfig, textConfig, label)"
                 >
                   <template v-slot:option="{item}">
                     <Tooltip placement="right">
                       <span>{{ item.text }}</span>
                       <div slot="content">
-                        {{ getMenuName(item) }}
+                        {{ item.text }}
                       </div>
                     </Tooltip>
                   </template>
@@ -85,7 +75,7 @@ export default {
       defaultMenuList: [],
       authGroupList: [],
       searchVal: {},
-      defaultValueConfig: {
+      menuNameConfig: {
         dataList: [],
         search: true,
         multiple: true,
@@ -102,21 +92,20 @@ export default {
             url: '/api/rest/auth/group',
             clearable: false,
             search: true,
-            defaultValueIsFirst: true,
             transfer: true,
             rootName: 'groupList',
             onChange: (groupName) => {
-              this.searchVal.defaultValue = null;
               if (this.$utils.isEmpty(groupName) || groupName == 'all') {
-                this.defaultValueConfig.dataList = this.defaultMenuList;
+                this.menuNameConfig.dataList = this.defaultMenuList;
               } else {
-                this.defaultValueConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
+                this.menuNameConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
               }
+              console.log('groupName', groupName, this.searchVal, this.menuNameConfig.dataList);
             }
           },
           {
             type: 'slot',
-            name: 'defaultValue',
+            name: 'menuName',
             label: this.$t('page.menuname')
           }
         ]
@@ -154,7 +143,7 @@ export default {
   },
   beforeCreate() {},
   async created() {
-    await this.getAuthGrouplist();
+    // await this.getAuthGrouplist();
     this.getRouterConfig();
     this.searchAuthData();
   },
@@ -166,6 +155,26 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    changeDefault(valueConfig, textConfig, val) {
+      console.log(valueConfig, textConfig, this.searchVal.groupName);
+      if (!this.$utils.isEmpty(val)) {
+        this.$set(textConfig, 'menuName', val);
+      } else {
+        this.$delete(textConfig, 'menuName');
+      }
+    },
+    changeLabel(valueConfig, textConfig, label) {
+      console.log('label', valueConfig, textConfig, label);
+      if (this.$utils.isEmpty(this.searchVal.groupName)) {
+        this.$delete(this.searchVal, 'menuName');
+        return false;
+      }
+      if (!this.$utils.isEmpty(label)) {
+        this.$set(textConfig, 'menuName', label);
+      } else {
+        this.$delete(textConfig, 'menuName');
+      }
+    },
     getAuthGrouplist() {
       return this.$api.common.getAuthGroup().then(res => {
         if (res.Status == 'OK') {
@@ -177,12 +186,13 @@ export default {
     searchAuthData() {
       let defaultValueList = [];
       this.defaultMenuList.forEach((item) => {
-        if (item && item.value && this.searchVal.defaultValue && this.searchVal.defaultValue.includes(item.value) && item.authority) {
+        if (item && item.value && this.searchVal.menuName && this.searchVal.menuName.includes(item.value) && item.authority) {
           defaultValueList.push(...item.authority.split(','));
         }
       });
+      console.log('搜索', this.searchVal);
       let data = {
-        ...this.searchVal,
+        groupName: this.searchVal.groupName,
         defaultValue: this.$utils.uniqueArr(defaultValueList)
       };
       this.loadingShow = true;
@@ -240,7 +250,7 @@ export default {
         }
       }
       this.defaultMenuList = this.$utils.deepClone(menuList);
-      this.defaultValueConfig.dataList = menuList;
+      this.menuNameConfig.dataList = menuList;
     },
     getCommercialRouter() {
       //商业版模块
@@ -267,12 +277,12 @@ export default {
   },
   filter: {},
   computed: {
-    getMenuName() {
-      return (item) => {
-        let groupName = this.authGroupList.find((v) => v.value == item.groupName);
-        return groupName && groupName.text ? `${item.text}(${groupName.text})` : item.text; 
-      };
-    }
+    // getMenuName() {
+    //   return (item) => {
+    //     let groupName = this.authGroupList.find((v) => v.value == item.groupName);
+    //     return groupName && groupName.text ? `${item.text}(${groupName.text})` : item.text; 
+    //   };
+    // }
   },
   watch: {}
 };
-- 
Gitee


From 03bbe52775c49af000df9da6f20a0ff29241051f Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 30 Jan 2024 15:17:28 +0800
Subject: [PATCH 04/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/framework/users/auth-manage.vue     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 7cad51d3..773f78b0 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -10,18 +10,18 @@
               v-if="!$utils.isEmpty(defaultMenuList)"
               v-model="searchVal"
               v-bind="searchConfig"
-              @change="searchAuthData()"
+              @change="(val) => searchAuthData(val)"
             >
               <template v-slot:menuName="{valueConfig, textConfig}">
                 <TsFormSelect
                   v-model="valueConfig.menuName"
                   v-bind="menuNameConfig"
-                  @change="(val) => changeDefault(valueConfig, textConfig, val)"
+                  @change="(val, selectedList) => changeDefault(valueConfig, textConfig, selectedList)"
                   @change-label="(label) => changeLabel(valueConfig, textConfig, label)"
                 >
                   <template v-slot:option="{item}">
                     <Tooltip placement="right">
-                      <span>{{ item.text }}</span>
+                      <div>{{ item.text }}</div>
                       <div slot="content">
                         {{ item.text }}
                       </div>
@@ -83,6 +83,7 @@ export default {
       },
       searchConfig: {
         search: true,
+        searchMode: 'clickBtnSearch',
         placeholder: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.keyword')}),
         searchList: [
           {
@@ -100,7 +101,8 @@ export default {
               } else {
                 this.menuNameConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
               }
-              console.log('groupName', groupName, this.searchVal, this.menuNameConfig.dataList);
+              this.$set(this.searchVal, 'menuName', []);
+              console.log('groupName', groupName, this.searchVal);
             }
           },
           {
@@ -143,7 +145,7 @@ export default {
   },
   beforeCreate() {},
   async created() {
-    // await this.getAuthGrouplist();
+    await this.getAuthGrouplist();
     this.getRouterConfig();
     this.searchAuthData();
   },
@@ -155,24 +157,20 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    changeDefault(valueConfig, textConfig, val) {
-      console.log(valueConfig, textConfig, this.searchVal.groupName);
-      if (!this.$utils.isEmpty(val)) {
-        this.$set(textConfig, 'menuName', val);
+    changeDefault(valueConfig, textConfig, selectedList) {
+      console.log('change', valueConfig, textConfig, selectedList);
+      if (!this.$utils.isEmpty(selectedList)) {
+        this.$set(textConfig, 'menuName', selectedList.map(item => item.text));
       } else {
         this.$delete(textConfig, 'menuName');
       }
     },
     changeLabel(valueConfig, textConfig, label) {
       console.log('label', valueConfig, textConfig, label);
-      if (this.$utils.isEmpty(this.searchVal.groupName)) {
-        this.$delete(this.searchVal, 'menuName');
-        return false;
-      }
-      if (!this.$utils.isEmpty(label)) {
-        this.$set(textConfig, 'menuName', label);
-      } else {
+      if (this.$utils.isEmpty(label)) {
         this.$delete(textConfig, 'menuName');
+      } else if (!this.$utils.isEmpty(label)) {
+        this.$set(textConfig, 'menuName', label);
       }
     },
     getAuthGrouplist() {
@@ -190,11 +188,11 @@ export default {
           defaultValueList.push(...item.authority.split(','));
         }
       });
-      console.log('搜索', this.searchVal);
       let data = {
         groupName: this.searchVal.groupName,
         defaultValue: this.$utils.uniqueArr(defaultValueList)
       };
+      console.log('搜索接口', data);
       this.loadingShow = true;
       this.$addHistoryData('searchVal', this.searchVal);
       this.$api.framework.auth.getAuthList(data).then(res => {
-- 
Gitee


From eb3aea581dfd83064c1c62c49f7c2455a98a183c Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 30 Jan 2024 16:53:29 +0800
Subject: [PATCH 05/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/framework/users/auth-manage.vue     | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 773f78b0..3dc10460 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    {{ searchVal }}
     <TsContain>
       <template slot="topRight">
         <TsRow>
@@ -16,14 +15,29 @@
                 <TsFormSelect
                   v-model="valueConfig.menuName"
                   v-bind="menuNameConfig"
-                  @change="(val, selectedList) => changeDefault(valueConfig, textConfig, selectedList)"
-                  @change-label="(label) => changeLabel(valueConfig, textConfig, label)"
+                  @change="(val, selectedList) => {
+                    if (!$utils.isEmpty(selectedList)) {
+                      $set(textConfig, 'menuName', selectedList.map(item => item.text));
+                    } else {
+                      $delete(textConfig, 'menuName');
+                      $delete(valueConfig, 'menuName');
+                    }
+                    isFlag = false;
+                  }"
+                  @change-label="(label) => {
+                    if ($utils.isEmpty(label) || ($utils.isEmpty(valueConfig.groupName) && valueConfig.menuName && isFlag)) {
+                      $delete(textConfig, 'menuName');
+                      $delete(valueConfig, 'menuName');
+                    } else {
+                      $set(textConfig, 'menuName', label);
+                    }
+                  }"
                 >
                   <template v-slot:option="{item}">
                     <Tooltip placement="right">
                       <div>{{ item.text }}</div>
                       <div slot="content">
-                        {{ item.text }}
+                        {{ item.menuName }}
                       </div>
                     </Tooltip>
                   </template>
@@ -70,6 +84,7 @@ export default {
   props: {},
   data() {
     return {
+      isFlag: false, // 作为标识，联动改变时，是否需要删除对应联动的值
       groupName: '',
       loadingShow: true,
       defaultMenuList: [],
@@ -96,13 +111,11 @@ export default {
             transfer: true,
             rootName: 'groupList',
             onChange: (groupName) => {
-              if (this.$utils.isEmpty(groupName) || groupName == 'all') {
-                this.menuNameConfig.dataList = this.defaultMenuList;
-              } else {
-                this.menuNameConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
+              this.handleDefaultValueConfig(groupName);
+              this.isFlag = true;
+              if (!this.$utils.isEmpty(this.searchVal.menuName)) {
+                this.$delete(this.searchVal, 'menuName');
               }
-              this.$set(this.searchVal, 'menuName', []);
-              console.log('groupName', groupName, this.searchVal);
             }
           },
           {
@@ -157,22 +170,7 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    changeDefault(valueConfig, textConfig, selectedList) {
-      console.log('change', valueConfig, textConfig, selectedList);
-      if (!this.$utils.isEmpty(selectedList)) {
-        this.$set(textConfig, 'menuName', selectedList.map(item => item.text));
-      } else {
-        this.$delete(textConfig, 'menuName');
-      }
-    },
-    changeLabel(valueConfig, textConfig, label) {
-      console.log('label', valueConfig, textConfig, label);
-      if (this.$utils.isEmpty(label)) {
-        this.$delete(textConfig, 'menuName');
-      } else if (!this.$utils.isEmpty(label)) {
-        this.$set(textConfig, 'menuName', label);
-      }
-    },
+ 
     getAuthGrouplist() {
       return this.$api.common.getAuthGroup().then(res => {
         if (res.Status == 'OK') {
@@ -192,7 +190,6 @@ export default {
         groupName: this.searchVal.groupName,
         defaultValue: this.$utils.uniqueArr(defaultValueList)
       };
-      console.log('搜索接口', data);
       this.loadingShow = true;
       this.$addHistoryData('searchVal', this.searchVal);
       this.$api.framework.auth.getAuthList(data).then(res => {
@@ -240,6 +237,7 @@ export default {
               menuList.push({
                 text: `${item.meta.title}`,
                 value: `${item.name}_${item.path}_${key}`,
+                menuName: this.getMenuName(key, item.meta.title),
                 groupName: key,
                 authority: item.meta.authority ? (typeof item.meta.authority == 'string' ? item.meta.authority : (typeof item.meta.authority == 'object' ? item.meta.authority.join(',') : '')) : ''
               });
@@ -248,7 +246,14 @@ export default {
         }
       }
       this.defaultMenuList = this.$utils.deepClone(menuList);
-      this.menuNameConfig.dataList = menuList;
+      this.handleDefaultValueConfig(this.searchVal.groupName);
+    },
+    handleDefaultValueConfig(groupName) {
+      if (this.$utils.isEmpty(groupName) || groupName == 'all') {
+        this.menuNameConfig.dataList = this.defaultMenuList;
+      } else {
+        this.menuNameConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
+      }
     },
     getCommercialRouter() {
       //商业版模块
@@ -275,12 +280,12 @@ export default {
   },
   filter: {},
   computed: {
-    // getMenuName() {
-    //   return (item) => {
-    //     let groupName = this.authGroupList.find((v) => v.value == item.groupName);
-    //     return groupName && groupName.text ? `${item.text}(${groupName.text})` : item.text; 
-    //   };
-    // }
+    getMenuName() {
+      return (groupName, text) => {
+        let menuName = this.authGroupList.find((v) => v.value == groupName);
+        return menuName && menuName.text ? `${text}(${menuName.text})` : text; 
+      };
+    }
   },
   watch: {}
 };
-- 
Gitee


From c72c890def283e368632a7a82e6363cd84f85b0b Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 30 Jan 2024 16:59:17 +0800
Subject: [PATCH 06/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/framework/users/auth-manage.vue     | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 3dc10460..727f606c 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -11,25 +11,25 @@
               v-bind="searchConfig"
               @change="(val) => searchAuthData(val)"
             >
-              <template v-slot:menuName="{valueConfig, textConfig}">
+              <template v-slot:defaultValue="{valueConfig, textConfig}">
                 <TsFormSelect
-                  v-model="valueConfig.menuName"
-                  v-bind="menuNameConfig"
+                  v-model="valueConfig.defaultValue"
+                  v-bind="defaultValueConfig"
                   @change="(val, selectedList) => {
                     if (!$utils.isEmpty(selectedList)) {
-                      $set(textConfig, 'menuName', selectedList.map(item => item.text));
+                      $set(textConfig, 'defaultValue', selectedList.map(item => item.text));
                     } else {
-                      $delete(textConfig, 'menuName');
-                      $delete(valueConfig, 'menuName');
+                      $delete(textConfig, 'defaultValue');
+                      $delete(valueConfig, 'defaultValue');
                     }
                     isFlag = false;
                   }"
                   @change-label="(label) => {
-                    if ($utils.isEmpty(label) || ($utils.isEmpty(valueConfig.groupName) && valueConfig.menuName && isFlag)) {
-                      $delete(textConfig, 'menuName');
-                      $delete(valueConfig, 'menuName');
+                    if ($utils.isEmpty(label) || ($utils.isEmpty(valueConfig.groupName) && valueConfig.defaultValue && isFlag)) {
+                      $delete(textConfig, 'defaultValue');
+                      $delete(valueConfig, 'defaultValue');
                     } else {
-                      $set(textConfig, 'menuName', label);
+                      $set(textConfig, 'defaultValue', label);
                     }
                   }"
                 >
@@ -90,7 +90,7 @@ export default {
       defaultMenuList: [],
       authGroupList: [],
       searchVal: {},
-      menuNameConfig: {
+      defaultValueConfig: {
         dataList: [],
         search: true,
         multiple: true,
@@ -113,14 +113,14 @@ export default {
             onChange: (groupName) => {
               this.handleDefaultValueConfig(groupName);
               this.isFlag = true;
-              if (!this.$utils.isEmpty(this.searchVal.menuName)) {
-                this.$delete(this.searchVal, 'menuName');
+              if (!this.$utils.isEmpty(this.searchVal.defaultValue)) {
+                this.$delete(this.searchVal, 'defaultValue');
               }
             }
           },
           {
             type: 'slot',
-            name: 'menuName',
+            name: 'defaultValue',
             label: this.$t('page.menuname')
           }
         ]
@@ -182,7 +182,7 @@ export default {
     searchAuthData() {
       let defaultValueList = [];
       this.defaultMenuList.forEach((item) => {
-        if (item && item.value && this.searchVal.menuName && this.searchVal.menuName.includes(item.value) && item.authority) {
+        if (item && item.value && this.searchVal.defaultValue && this.searchVal.defaultValue.includes(item.value) && item.authority) {
           defaultValueList.push(...item.authority.split(','));
         }
       });
@@ -250,9 +250,9 @@ export default {
     },
     handleDefaultValueConfig(groupName) {
       if (this.$utils.isEmpty(groupName) || groupName == 'all') {
-        this.menuNameConfig.dataList = this.defaultMenuList;
+        this.defaultValueConfig.dataList = this.defaultMenuList;
       } else {
-        this.menuNameConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
+        this.defaultValueConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
       }
     },
     getCommercialRouter() {
-- 
Gitee


From 69fafb9201db339ac463eebbefab6bc8cb2656f4 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 30 Jan 2024 17:22:30 +0800
Subject: [PATCH 07/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CombineSearcher/CombineSearcher.vue        | 3 +--
 src/views/pages/framework/users/auth-manage.vue           | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index 8a418004..44c46ff6 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -428,7 +428,7 @@ export default {
               if (this.totalText[k].length == 0) {
                 this.$delete(this.totalText, k);
               }
-            } else if (k && this.totalText[k] && typeof this.totalText[k].toString() == 'string' && this.$utils.isEmpty(this.totalText[k])) {
+            } else if (k && typeof this.totalText[k].toString() == 'string' && this.$utils.isEmpty(this.totalText[k])) {
             // 清除为空的字符串，避免回显为空情况
               this.$delete(this.totalText, k);
             }  
@@ -563,7 +563,6 @@ export default {
           let isEmit = this.$utils.isSame(totalSearch, this.value);
           if (!isEmit) {
             if (this.searchMode == 'realtimeSearch') {
-              console.log('searchValue', totalSearch);
               this.$emit('change', totalSearch);
             }
           }
diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 727f606c..ae2a2e64 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -170,7 +170,6 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
- 
     getAuthGrouplist() {
       return this.$api.common.getAuthGroup().then(res => {
         if (res.Status == 'OK') {
@@ -188,8 +187,13 @@ export default {
       });
       let data = {
         groupName: this.searchVal.groupName,
-        defaultValue: this.$utils.uniqueArr(defaultValueList)
+        defaultValue: this.$utils.uniqueArr(defaultValueList),
+        keyword: this.searchVal.keyword
       };
+      if (this.$utils.isEmpty(this.searchVal)) {
+        // 全部删除后，设置默认所有
+        this.handleDefaultValueConfig();
+      }
       this.loadingShow = true;
       this.$addHistoryData('searchVal', this.searchVal);
       this.$api.framework.auth.getAuthList(data).then(res => {
-- 
Gitee


From c619eaa92036f213ec1d9362a5a8e919c45b7280 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 31 Jan 2024 11:57:11 +0800
Subject: [PATCH 08/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/framework/users/auth-manage.vue     | 146 +++++++++---------
 1 file changed, 70 insertions(+), 76 deletions(-)

diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index ae2a2e64..535ecdf7 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -4,30 +4,39 @@
     <TsContain>
       <template slot="topRight">
         <TsRow>
-          <Col span="24">
+          <Col span="8">
+            <TsFormSelect
+              v-model="groupName"
+              :dataList="groupList"
+              :defaultValueIsFirst="true"
+              :search="true"
+              :clearable="false"
+              transfer
+              border="border"
+              @change="changeGroupName"
+            ></TsFormSelect>
+          </Col>
+          <Col span="16">
             <CombineSearcher
-              v-if="!$utils.isEmpty(defaultMenuList)"
+              v-if="!$utils.isEmpty(defaultValueList)"
               v-model="searchVal"
               v-bind="searchConfig"
-              @change="(val) => searchAuthData(val)"
+              @change="searchAuthData()"
             >
               <template v-slot:defaultValue="{valueConfig, textConfig}">
                 <TsFormSelect
                   v-model="valueConfig.defaultValue"
                   v-bind="defaultValueConfig"
                   @change="(val, selectedList) => {
-                    if (!$utils.isEmpty(selectedList)) {
-                      $set(textConfig, 'defaultValue', selectedList.map(item => item.text));
-                    } else {
+                    if ($utils.isEmpty(selectedList)) {
                       $delete(textConfig, 'defaultValue');
-                      $delete(valueConfig, 'defaultValue');
+                    } else {
+                      $set(textConfig, 'defaultValue', selectedList.map(item => item.text));
                     }
-                    isFlag = false;
                   }"
                   @change-label="(label) => {
-                    if ($utils.isEmpty(label) || ($utils.isEmpty(valueConfig.groupName) && valueConfig.defaultValue && isFlag)) {
+                    if ($utils.isEmpty(label)) {
                       $delete(textConfig, 'defaultValue');
-                      $delete(valueConfig, 'defaultValue');
                     } else {
                       $set(textConfig, 'defaultValue', label);
                     }
@@ -84,12 +93,14 @@ export default {
   props: {},
   data() {
     return {
-      isFlag: false, // 作为标识，联动改变时，是否需要删除对应联动的值
       groupName: '',
       loadingShow: true,
-      defaultMenuList: [],
-      authGroupList: [],
+      defaultValueList: [],
+      groupList: [],
       searchVal: {},
+      tableConfig: {
+        tbodyList: []
+      },
       defaultValueConfig: {
         dataList: [],
         search: true,
@@ -98,26 +109,8 @@ export default {
       },
       searchConfig: {
         search: true,
-        searchMode: 'clickBtnSearch',
         placeholder: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.keyword')}),
         searchList: [
-          {
-            label: this.$t('term.framework.belongmodule'),
-            type: 'select',
-            name: 'groupName',
-            url: '/api/rest/auth/group',
-            clearable: false,
-            search: true,
-            transfer: true,
-            rootName: 'groupList',
-            onChange: (groupName) => {
-              this.handleDefaultValueConfig(groupName);
-              this.isFlag = true;
-              if (!this.$utils.isEmpty(this.searchVal.defaultValue)) {
-                this.$delete(this.searchVal, 'defaultValue');
-              }
-            }
-          },
           {
             type: 'slot',
             name: 'defaultValue',
@@ -125,9 +118,6 @@ export default {
           }
         ]
       },
-      tableConfig: {
-        tbodyList: []
-      },
       theadList: [
         {
           title: this.$t('term.framework.authname'),
@@ -158,7 +148,7 @@ export default {
   },
   beforeCreate() {},
   async created() {
-    await this.getAuthGrouplist();
+    await this.searchGroupNameData();
     this.getRouterConfig();
     this.searchAuthData();
   },
@@ -170,31 +160,27 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    getAuthGrouplist() {
+    searchGroupNameData() {
       return this.$api.common.getAuthGroup().then(res => {
         if (res.Status == 'OK') {
-          this.authGroupList = res.Return.groupList || [];
+          this.groupList = res.Return.groupList || [];
         }
       });
     },
     //获取权限列表
     searchAuthData() {
-      let defaultValueList = [];
-      this.defaultMenuList.forEach((item) => {
-        if (item && item.value && this.searchVal.defaultValue && this.searchVal.defaultValue.includes(item.value) && item.authority) {
-          defaultValueList.push(...item.authority.split(','));
-        }
-      });
-      let data = {
-        groupName: this.searchVal.groupName,
-        defaultValue: this.$utils.uniqueArr(defaultValueList),
+      this.loadingShow = true;
+      const defaultValueList = this.defaultValueList
+        .filter(item => 
+          item && item.value && this.searchVal.defaultValue && this.searchVal.defaultValue.includes(item.value) && item.authority
+        )
+        .flatMap(item => item.authority.split(',')); // flatMap扁平化数组
+      const data = {
+        groupName: this.groupName,
+        defaultValue: [...new Set(defaultValueList)], // new set 数组去重
         keyword: this.searchVal.keyword
       };
-      if (this.$utils.isEmpty(this.searchVal)) {
-        // 全部删除后，设置默认所有
-        this.handleDefaultValueConfig();
-      }
-      this.loadingShow = true;
+      this.$addHistoryData('groupName', this.groupName);
       this.$addHistoryData('searchVal', this.searchVal);
       this.$api.framework.auth.getAuthList(data).then(res => {
         this.tableConfig.tbodyList = res.Return || [];
@@ -204,6 +190,7 @@ export default {
     },
     restoreHistory(historyData) {
       this.searchVal = historyData['searchVal'];
+      this.groupName = historyData['groupName'];
     },
     toAuthAdduserPage(item) {
       let {name = '', authGroup = ''} = item || {};
@@ -213,27 +200,26 @@ export default {
       });
     },
     getRouterConfig() {
-      let routerConfig = {};
-      let menuList = [];
-      let routerPathList = [require.context('@/views/pages', true, /router.js$/)];
+      const routerConfig = {};
+      const menuList = [];
+
+      const routerPathList = [require.context('@/views/pages', true, /router.js$/)];
       routerPathList.forEach(item => {
-        if (item && item.keys()) {
-          item.keys().forEach(routerPath => {
-            const moduleNames = routerPath.split('/')[1];
-            const lastValue = moduleNames.split('-');
-            const moduleName = lastValue?.pop() || moduleNames;
-            const routeList = item(routerPath).default || [];
-            routerConfig[moduleName] = routeList;
-          });
-        }
+        item.keys().forEach(routerPath => {
+          const moduleNames = routerPath.split('/')[1];
+          const moduleName = moduleNames.split('-').pop() || moduleNames;
+          const routeList = item(routerPath).default || [];
+          routerConfig[moduleName] = routeList;
+        });
       });
-      let commercialRouterConfig = this.getCommercialRouter();
-      Object.keys(commercialRouterConfig).forEach(key => {
-        if (!routerConfig[key]) {
-          //模块引入
+
+      const commercialRouterConfig = this.getCommercialRouter();
+      Object.keys(commercialRouterConfig)
+        .filter(key => !routerConfig[key])
+        .forEach(key => {
           routerConfig[key] = commercialRouterConfig[key];
-        }
-      });
+        });
+
       for (let key in routerConfig) {
         if (key) {
           routerConfig[key].forEach((item) => {
@@ -249,14 +235,15 @@ export default {
           });
         }
       }
-      this.defaultMenuList = this.$utils.deepClone(menuList);
+
+      this.defaultValueList = this.$utils.deepClone(menuList);
       this.handleDefaultValueConfig(this.searchVal.groupName);
     },
     handleDefaultValueConfig(groupName) {
       if (this.$utils.isEmpty(groupName) || groupName == 'all') {
-        this.defaultValueConfig.dataList = this.defaultMenuList;
+        this.defaultValueConfig.dataList = this.defaultValueList;
       } else {
-        this.defaultValueConfig.dataList = this.defaultMenuList.filter((item) => item.groupName == groupName);
+        this.defaultValueConfig.dataList = this.defaultValueList.filter((item) => item.groupName == groupName);
       }
     },
     getCommercialRouter() {
@@ -272,21 +259,28 @@ export default {
         if (item && item.keys()) {
           item.keys().forEach(routerPath => {
             const moduleNames = routerPath.split('/')[1];
-            const lastValue = moduleNames.split('-');
-            const moduleName = lastValue?.pop() || moduleNames;
-            const routeList = item(routerPath).default || [];
+            const moduleName = moduleNames.split('-').pop() || moduleNames;
+            const routeList = (item(routerPath).default || []);
             routerConfig[moduleName] = routeList;
           });
         }
       });
       return routerConfig;
+    },
+    changeGroupName(groupName) {
+      console.log(groupName);
+      this.handleDefaultValueConfig(groupName);
+      if (!this.$utils.isEmpty(this.searchVal.defaultValue)) {
+        this.$delete(this.searchVal, 'defaultValue'); // 切换不同模块，清空模块下的菜单
+      }
+      this.searchAuthData();
     }
   },
   filter: {},
   computed: {
     getMenuName() {
       return (groupName, text) => {
-        let menuName = this.authGroupList.find((v) => v.value == groupName);
+        let menuName = this.groupList.find((v) => v.value == groupName);
         return menuName && menuName.text ? `${text}(${menuName.text})` : text; 
       };
     }
-- 
Gitee


From 005d284b7e24daefb414dd334227cb02a712ddba Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 31 Jan 2024 12:03:55 +0800
Subject: [PATCH 09/10] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8console.log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/framework/users/auth-manage.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index 535ecdf7..a574b38b 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -268,7 +268,6 @@ export default {
       return routerConfig;
     },
     changeGroupName(groupName) {
-      console.log(groupName);
       this.handleDefaultValueConfig(groupName);
       if (!this.$utils.isEmpty(this.searchVal.defaultValue)) {
         this.$delete(this.searchVal, 'defaultValue'); // 切换不同模块，清空模块下的菜单
-- 
Gitee


From 9a29450f0993d75bb7748632dc646d26185ef5ab Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 31 Jan 2024 17:33:27 +0800
Subject: [PATCH 10/10] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1079496?=
 =?UTF-8?q?554283008]=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8F=9C=E5=8D=95=E8=BF=87=E6=BB=A4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1079496554283008?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/TsForm/TsFormCascader.vue         |  18 +--
 .../pages/framework/users/auth-manage.vue     | 121 ++++++------------
 2 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/src/resources/plugins/TsForm/TsFormCascader.vue b/src/resources/plugins/TsForm/TsFormCascader.vue
index 94a88850..37ef8871 100644
--- a/src/resources/plugins/TsForm/TsFormCascader.vue
+++ b/src/resources/plugins/TsForm/TsFormCascader.vue
@@ -129,7 +129,7 @@ export default {
       if (!(!this.isChangeWrite && isSame)) {
         //改变值时出发on-change事件
         this.$emit('on-change', value, selectedData);
-        typeof this.onChange == 'function' && this.onChange(value);
+        typeof this.onChange == 'function' && this.onChange(value, selectedData || []);
       }
       if (!isSame) {
         if (this.currentValidList.length > 0) {
@@ -139,6 +139,7 @@ export default {
         this.validMesage = '';
         this.isValidPass = true;
       }
+      this.$emit('change-label', (selectedData || []).filter(obj => obj.__label).map(obj => obj.__label));
     },
     renderFormat(labels, selectedData) {
       let data = labels.join(' / ');
@@ -148,14 +149,13 @@ export default {
       this.labels = data;
       return data;
     },
-    getLabel(i, value, list) {
-      let _this = this;
-      let finditem = list.find(l => l.value == value[i]);
+    getLabel(index, value, list) {
+      let finditem = list.find(l => l.value == value[index]);
       if (finditem) {
-        _this.labeList.push(finditem.label);
-        _this.selectedData.push(finditem);
-        if (i < value.length && !_this.$utils.isEmpty(finditem.children)) {
-          _this.getLabel(i + 1, value, finditem.children);
+        this.labeList.push(finditem.text || finditem.label);
+        this.selectedData.push(finditem);
+        if (index < value.length - 1 && !this.$utils.isEmpty(finditem.children)) {
+          this.getLabel(index + 1, value, finditem.children);
         }
       }
     },
@@ -219,7 +219,9 @@ export default {
           this.$nextTick(() => {
             this.currentValue = this.$utils.isEmpty(newValue) ? [] : [].concat(newValue);
             if (!this.$utils.isEmpty(this.currentValue) && !this.$utils.isEmpty(this.dataList)) {
+              this.labeList = []; // 切换不同的级联，上一个值没有清空
               this.getLabel(0, this.currentValue, this.dataList);
+              this.$emit('change-label', this.labeList);
             }
           });
         }
diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index a574b38b..e5564205 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -13,45 +13,16 @@
               :clearable="false"
               transfer
               border="border"
-              @change="changeGroupName"
+              @change="searchAuthData()"
             ></TsFormSelect>
           </Col>
           <Col span="16">
             <CombineSearcher
-              v-if="!$utils.isEmpty(defaultValueList)"
+              v-if="searchConfig.searchList[0].dataList.length > 0"
               v-model="searchVal"
               v-bind="searchConfig"
               @change="searchAuthData()"
             >
-              <template v-slot:defaultValue="{valueConfig, textConfig}">
-                <TsFormSelect
-                  v-model="valueConfig.defaultValue"
-                  v-bind="defaultValueConfig"
-                  @change="(val, selectedList) => {
-                    if ($utils.isEmpty(selectedList)) {
-                      $delete(textConfig, 'defaultValue');
-                    } else {
-                      $set(textConfig, 'defaultValue', selectedList.map(item => item.text));
-                    }
-                  }"
-                  @change-label="(label) => {
-                    if ($utils.isEmpty(label)) {
-                      $delete(textConfig, 'defaultValue');
-                    } else {
-                      $set(textConfig, 'defaultValue', label);
-                    }
-                  }"
-                >
-                  <template v-slot:option="{item}">
-                    <Tooltip placement="right">
-                      <div>{{ item.text }}</div>
-                      <div slot="content">
-                        {{ item.menuName }}
-                      </div>
-                    </Tooltip>
-                  </template>
-                </TsFormSelect>
-              </template>
             </CombineSearcher>
           </Col>
         </TsRow>
@@ -95,26 +66,26 @@ export default {
     return {
       groupName: '',
       loadingShow: true,
-      defaultValueList: [],
       groupList: [],
+      defaultValueList: [],
       searchVal: {},
       tableConfig: {
         tbodyList: []
       },
-      defaultValueConfig: {
-        dataList: [],
-        search: true,
-        multiple: true,
-        transfer: true
-      },
       searchConfig: {
         search: true,
         placeholder: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.keyword')}),
         searchList: [
           {
-            type: 'slot',
+            type: 'cascader',
+            dataList: [],
             name: 'defaultValue',
-            label: this.$t('page.menuname')
+            label: this.$t('page.menuname'),
+            transfer: true,
+            filterable: true,
+            onChange: (val, selectedList) => {
+              this.defaultValueList = selectedList.filter(item => item.authority).map((v) => v.authority);
+            }
           }
         ]
       },
@@ -170,14 +141,15 @@ export default {
     //获取权限列表
     searchAuthData() {
       this.loadingShow = true;
-      const defaultValueList = this.defaultValueList
-        .filter(item => 
-          item && item.value && this.searchVal.defaultValue && this.searchVal.defaultValue.includes(item.value) && item.authority
-        )
-        .flatMap(item => item.authority.split(',')); // flatMap扁平化数组
+      let defaultValue = [];
+      this.defaultValueList.forEach((item) => {
+        if (item) {
+          defaultValue.push(...item.split(','));
+        }
+      });
       const data = {
         groupName: this.groupName,
-        defaultValue: [...new Set(defaultValueList)], // new set 数组去重
+        defaultValue: [...new Set(defaultValue)], // new set 数组去重
         keyword: this.searchVal.keyword
       };
       this.$addHistoryData('groupName', this.groupName);
@@ -201,7 +173,7 @@ export default {
     },
     getRouterConfig() {
       const routerConfig = {};
-      const menuList = [];
+      const dataList = [];
 
       const routerPathList = [require.context('@/views/pages', true, /router.js$/)];
       routerPathList.forEach(item => {
@@ -219,32 +191,33 @@ export default {
         .forEach(key => {
           routerConfig[key] = commercialRouterConfig[key];
         });
-
       for (let key in routerConfig) {
-        if (key) {
+        let groupItem = this.groupList.find((item) => item.value == key); 
+        if (key && !this.$utils.isEmpty(groupItem) && !this.$utils.isEmpty(groupItem.text)) {
+          dataList.push({
+            text: groupItem.text,
+            value: key,
+            children: []
+          });
           routerConfig[key].forEach((item) => {
             if (item.name && item.meta && item.meta.ismenu && item.meta.authority) {
-              menuList.push({
-                text: `${item.meta.title}`,
-                value: `${item.name}_${item.path}_${key}`,
-                menuName: this.getMenuName(key, item.meta.title),
-                groupName: key,
-                authority: item.meta.authority ? (typeof item.meta.authority == 'string' ? item.meta.authority : (typeof item.meta.authority == 'object' ? item.meta.authority.join(',') : '')) : ''
-              });
+              let childrenItem = dataList.find((item) => item.value == key);
+              if (!this.$utils.isEmpty(childrenItem)) {
+                childrenItem.children.push({
+                  text: `${item.meta.title}`,
+                  value: `${item.name}_${item.path}_${key}`,
+                  authority: item.meta.authority ? (typeof item.meta.authority == 'string' ? item.meta.authority : (typeof item.meta.authority == 'object' ? item.meta.authority.join(',') : '')) : ''
+                });
+              }
             }
           });
         }
       }
-
-      this.defaultValueList = this.$utils.deepClone(menuList);
-      this.handleDefaultValueConfig(this.searchVal.groupName);
-    },
-    handleDefaultValueConfig(groupName) {
-      if (this.$utils.isEmpty(groupName) || groupName == 'all') {
-        this.defaultValueConfig.dataList = this.defaultValueList;
-      } else {
-        this.defaultValueConfig.dataList = this.defaultValueList.filter((item) => item.groupName == groupName);
-      }
+      this.searchConfig.searchList.forEach((item) => {
+        if (item.name == 'defaultValue') {
+          item.dataList = dataList;
+        }
+      });
     },
     getCommercialRouter() {
       //商业版模块
@@ -266,24 +239,10 @@ export default {
         }
       });
       return routerConfig;
-    },
-    changeGroupName(groupName) {
-      this.handleDefaultValueConfig(groupName);
-      if (!this.$utils.isEmpty(this.searchVal.defaultValue)) {
-        this.$delete(this.searchVal, 'defaultValue'); // 切换不同模块，清空模块下的菜单
-      }
-      this.searchAuthData();
     }
   },
   filter: {},
-  computed: {
-    getMenuName() {
-      return (groupName, text) => {
-        let menuName = this.groupList.find((v) => v.value == groupName);
-        return menuName && menuName.text ? `${text}(${menuName.text})` : text; 
-      };
-    }
-  },
+  computed: {},
   watch: {}
 };
 </script>
-- 
Gitee