From 6957663a747345208b38c3998f819ea625a664fa Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 22 Jan 2024 14:14:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=20=20-=20[=E5=85=B3=E8=81=94]#[1073326858?=
 =?UTF-8?q?928128]=E5=89=8D=E7=AB=AF=E7=BB=99=E7=94=A8=E6=88=B7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?=
 =?UTF-8?q?3057/1073326858928128?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/store/modules/topMenu.js         |  1 +
 .../pages/framework/users/auth-manage.vue      | 18 ++++++++++--------
 src/views/pages/knowledge/knowledge.js         | 14 ++------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/resources/store/modules/topMenu.js b/src/resources/store/modules/topMenu.js
index f57cb555..3d29891f 100644
--- a/src/resources/store/modules/topMenu.js
+++ b/src/resources/store/modules/topMenu.js
@@ -43,6 +43,7 @@ const actions = {
     const menuConfigList = getAllMenuTypeList();
     let moduleList = [];
     let userAuthList = [];
+    console.log('topmenujs');
     state.gettingModuleList = menuApi.getModuleList();
     const res = await state.gettingModuleList;
     let showModuleList = null; //可以显示的模块，如果不是单独命令行的就默认null全部需要展示，如果有单独配置的获取配置
diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index e68215e7..b65ec7cc 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -4,13 +4,15 @@
     <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="6">
+            <TsFormSelect
+              :dataList="authGroupList"
+              :value="selectedModuleName"
+              :clearable="false"
+              border="border"
+              @on-change="changeSelect"
+            ></TsFormSelect>
+          </Col>
           <Col span="18">
             <InputSearcher
               v-model="keyword"
@@ -95,7 +97,7 @@
                 </Col>
                 <Col span="2" class="action">
                   <ul class="tstable-action-ul">
-                    <li class="tsfont-permission text-action" @click="adduser(item.name)">{{ $t('page.auth') }}</li>
+                    <li class="tsfont-permission text-action" @click="toAuthAdduser(item)">{{ $t('page.auth') }}</li>
                   </ul>
                 </Col>
               </TsRow>
diff --git a/src/views/pages/knowledge/knowledge.js b/src/views/pages/knowledge/knowledge.js
index ec281010..be16a3b7 100644
--- a/src/views/pages/knowledge/knowledge.js
+++ b/src/views/pages/knowledge/knowledge.js
@@ -1,17 +1,14 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
+import VueI18n from 'vue-i18n';
 import Knowledge from './knowledge.vue';
 import routers from './router.js';
 import store from '@/resources/store';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
-import { $t } from '@/resources/init.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
-
-import VueI18n from 'vue-i18n';
-//公共的全局组件、样式等
 import '@/resources/base.js';
-import { initRouter, initI18n } from '@/resources/init.js';
+import { initRouter, initI18n, $t } from '@/resources/init.js';
 
 Vue.use(VueRouter);
 Vue.use(VueI18n);
@@ -30,11 +27,6 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$localStore = new LocalStore('knowledge', router);
 
-//知识库的路由拦截有自己逻辑，因此需要覆盖公共方法
-const gettingUserInfo = store.dispatch('getUserInfo');
-const gettingModuleList = store.dispatch('getModuleList');
-const gettingKnowledgeTypeMenu = store.dispatch('leftMenu/getKnowledgeTypeMenu');
-
 // eslint-disable-next-line space-before-function-paren
 router.beforeEach(async (to, from, next) => {
   let title = to.meta.title ? to.meta.title : to.name || to.path;
@@ -48,8 +40,6 @@ router.beforeEach(async (to, from, next) => {
       window.location.href = HOME + '/login.html?tenant=' + TENANT + '&redirect=' + MODULEID + '.html#';
     }
   } else {
-    await gettingUserInfo;
-    await gettingKnowledgeTypeMenu;
     const auth = to.meta ? to.meta.authority : null;
     if (!auth || store.getters.userAuthList.includes(auth)) {
       next();
-- 
Gitee


From 39557c9a379c639c0883d07a68a07addc415601c Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 22 Jan 2024 15:23:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1073326?=
 =?UTF-8?q?858928128]=E5=89=8D=E7=AB=AF=E7=BB=99=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1073326858928128=20-=20[=E4=BF=AE=E5=A4=8D]?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9F=A5=E8=AF=86=E5=BA=93=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/store/modules/topMenu.js          | 1 -
 src/views/pages/framework/users/auth-manage.vue | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/resources/store/modules/topMenu.js b/src/resources/store/modules/topMenu.js
index 3d29891f..f57cb555 100644
--- a/src/resources/store/modules/topMenu.js
+++ b/src/resources/store/modules/topMenu.js
@@ -43,7 +43,6 @@ const actions = {
     const menuConfigList = getAllMenuTypeList();
     let moduleList = [];
     let userAuthList = [];
-    console.log('topmenujs');
     state.gettingModuleList = menuApi.getModuleList();
     const res = await state.gettingModuleList;
     let showModuleList = null; //可以显示的模块，如果不是单独命令行的就默认null全部需要展示，如果有单独配置的获取配置
diff --git a/src/views/pages/framework/users/auth-manage.vue b/src/views/pages/framework/users/auth-manage.vue
index b65ec7cc..5a8de4af 100644
--- a/src/views/pages/framework/users/auth-manage.vue
+++ b/src/views/pages/framework/users/auth-manage.vue
@@ -181,10 +181,11 @@ export default {
       this.selectedModuleName = val;
       this.getAuthList();
     },
-    adduser: function(val) {
+    toAuthAdduser(item) {
+      let {name = '', authGroup = ''} = item || {};
       this.$router.push({
         path: `auth-adduser`,
-        query: { name: val, groupName: this.selectedModuleName }
+        query: { name: name, groupName: authGroup }
       });
     }
   },
-- 
Gitee