Merge pull request #8469 from TencentBlueKing/v3.14.x

3.14.x合入feature-tenant分支

Author: wcy00000000000000

src/ui/src/components/modal/permission-resource-name.js

@@ -94,7 +94,7 @@ export const IAM_VIEWS_INST_NAME = {
     return business.bk_biz_name
   },
   async [IAM_VIEWS.BIZ_SET](vm, id) {
-    const { info: list = [] } = await businessSetService.getAll(requestConfigBase('biz_set'))
+    const { info: list = [] } = await businessSetService.getAll(requestConfigBase(`biz_set_${id}`))
     const MODEL_ID_KEY = BUILTIN_MODEL_PROPERTY_KEYS[BUILTIN_MODELS.BUSINESS_SET].ID
     const MODEL_NAME_KEY = BUILTIN_MODEL_PROPERTY_KEYS[BUILTIN_MODELS.BUSINESS_SET].NAME
     const businessSet = list.find(item => item[MODEL_ID_KEY] === Number(id))

src/ui/src/router/business-interceptor.js

@@ -54,14 +54,16 @@ export const before = async function (to, from, next) {
     }
   }
 
+
+  // 业务逻辑中依赖bizSet中的相关ID值，这里只要完成了上面的检查即设置
+  store.commit('bizSet/setBizSetId', from.params.bizSetId || to.params.bizSetId)
+  store.commit('bizSet/setBizId', from.query.bizId || to.query.bizId)
+
   // 记录上一次是否使用的是业务集视图并且保存id值
   const isMatchedBusinessSetView = fromTopRoute?.name === MENU_BUSINESS_SET || toTopRoute?.name === MENU_BUSINESS_SET
   const availableBusinessSetView = isMatchedBusinessSetView && fromTopRoute?.meta?.view !== 'permission'
-
   if (availableBusinessSetView) {
     setBizSetIdToStorage(from.params.bizSetId || to.params.bizSetId)
-    store.commit('bizSet/setBizSetId', from.params.bizSetId || to.params.bizSetId)
-    store.commit('bizSet/setBizId', from.query.bizId || to.query.bizId)
     setBizSetRecentlyUsed(true)
   }