Merge pull request #1422 from luofann/fix_09_29

refactor: 平台/项目部分资源鉴权逻辑调整 --story=119946365
TencentBlueKing · Oct 8, 2024 · e34310b · e34310b
2 parents c8d3adb + fcde759
commit e34310b
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 103 deletions.
diff --git a/frontend/pc/src/utils/ajax.js b/frontend/pc/src/utils/ajax.js
@@ -33,7 +33,7 @@ const instance = axios.create({
   // `headers` are custom headers to be sent
   headers: { 'X-Requested-With': 'XMLHttpRequest' },
   // csrftoken变量名
-  xsrfCookieName: `${window.BKAPP_CSRF_COOKIE_NAME}_csrftoken`,
+  xsrfCookieName: window.BKAPP_CSRF_COOKIE_NAME,
   // cookie中的csrftoken信息名称
   xsrfHeaderName: 'X-CSRFToken',
   withCredentials: true,

diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
@@ -36,8 +36,8 @@
           <ul class="bk-dropdown-list" slot="dropdown-content">
             <li>
               <a href="javascript:;"
-                v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-                :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
                 :title="$t(`m.systemConfig['接入API']`)"
                 data-test-id="api_a_apiTableAccessApi"
                 @click="openShade('JOIN')">
@@ -47,8 +47,8 @@
             <li>
               <a href="javascript:;"
                 data-test-id="api_a_apiTableCreateApi"
-                v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-                :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
                 :title="$t(`m.systemConfig['新增API']`)"
                 @click="openShade('ADD')">
                 {{$t(`m.systemConfig['新增API']`)}}
@@ -60,16 +60,16 @@
           data-test-id="api_button_apiTableuploadApi"
           :theme="'default'"
           :disabled="disableImport"
-          v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-          :class="['mr10 bk-btn-file', { 'btn-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }]"
+          v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+          :class="['mr10 bk-btn-file', { 'btn-permission-disable': !hasPermission(targetPerms, curPerms) }]"
           :title="$t(`m.systemConfig['点击上传']`)">
-          <input :disabled="disableImport" :type="!hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) ? 'button' : 'file'" :value="fileVal" class="bk-input-file" @change="handleFile" @click="hasImportPermission">
+          <input :disabled="disableImport" :type="!hasPermission(targetPerms, curPerms) ? 'button' : 'file'" :value="fileVal" class="bk-input-file" @change="handleFile" @click="hasImportPermission">
           {{$t(`m.systemConfig['导入']`)}}
         </bk-button>
         <bk-button :theme="'default'"
-          v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+          v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
           data-test-id="api_button_apiTableBatchDeleteApi"
-          :class="['mr10 batch-remove-btn', { 'btn-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }]"
+          :class="['mr10 batch-remove-btn', { 'btn-permission-disable': !hasPermission(targetPerms, curPerms) }]"
           :title="$t(`m.systemConfig['批量移除']`)"
           :disabled="!checkList.length"
           @click="deleteCheck">
@@ -111,8 +111,8 @@
           <!-- :disabled="props.row.is_builtin || !!props.row.count" -->
           <span class="bk-lable-primary"
             data-test-id="api_span_apiTableViewDetail"
-            v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-            :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+            v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+            :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
             :title="props.row.name"
             @click="entryOne(props.row)">
             {{props.row.name || '--'}}
@@ -163,17 +163,17 @@
           </bk-button>
           <bk-button theme="primary" text
             data-test-id="api_button_apiTableEditApi"
-            v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-            :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+            v-cursor="{ active: !props.row.is_builtin && !props.row.count && !hasPermission(targetPerms, curPerms) }"
+            :class="{ 'text-permission-disable': !props.row.is_builtin && !props.row.count && !hasPermission(targetPerms, curPerms) }"
             :title="$t(`m.systemConfig['编辑']`)"
             :disabled="props.row.is_builtin || !!props.row.count"
             @click="entryOne(props.row)">
             {{ $t('m.systemConfig["编辑"]') }}
           </bk-button>
           <bk-button theme="primary" text
             data-test-id="api_button_apiTableDeleteApi"
-            v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-            :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+            v-cursor="{ active: !props.row.is_builtin && !hasPermission(targetPerms, curPerms) }"
+            :class="{ 'text-permission-disable': !props.row.is_builtin && !hasPermission(targetPerms, curPerms) }"
             :title="$t(`m.systemConfig['移除']`)"
             :disabled="props.row.is_builtin"
             @click="openDelete(props.row)">
@@ -309,17 +309,18 @@
       disableImport() {
         return Number(this.remoteSystem) === 0;
       },
-    },
-    watch: {
-    },
-    mounted() {
-
+      targetPerms() {
+        return this.projectId ? ['system_settings_manage'] : ['public_apis_manage'];
+      },
+      curPerms() {
+        return this.projectId ? this.$store.state.project.projectAuthActions : this.$store.state.common.systemPermission;
+      },
     },
     methods: {
       async entryOne(item) {
         // 公共api
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          this.applyProjectManagePerm();
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
           return;
         }
         this.$parent.displayInfo.level_1 = item;
@@ -344,20 +345,23 @@
       changTitle(item, index) {
         this.checkIndex = index;
       },
-      applyProjectManagePerm() {
-        const projectInfo = this.$store.state.project.projectInfo;
-        const resourceData = {
-          project: [{
-            id: projectInfo.key,
-            name: projectInfo.name,
-          }],
-        };
-        this.applyForPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions, resourceData);
+      applyPerm() {
+        let resourceData = {};
+        if (this.projectId) {
+          const projectInfo = this.$store.state.project.projectInfo;
+          resourceData = {
+            project: [{
+              id: projectInfo.key,
+              name: projectInfo.name,
+            }],
+          };
+        }
+        this.applyForPermission(this.targetPerms, this.curPerms, resourceData);
       },
       // 新增
       openShade(type) {
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          this.applyProjectManagePerm();
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
         } else {
           this.typeInfo = type;
           this.entryInfo.title = type === 'ADD'
@@ -413,14 +417,14 @@
       },
       disabledFn(item) {
         if (!this.projectId) {
-          return this.hasPermission(['public_api_manage'], item.auth_actions) && !item.is_builtin;
+          return this.hasPermission(this.targetPerms, this.curPerms) && !item.is_builtin;
         }
         return !item.is_builtin;
       },
       // 二次弹窗确认
       openDelete(item) {
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          this.applyProjectManagePerm();
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
           return;
         }
         this.$bkInfo({
@@ -450,8 +454,8 @@
         });
       },
       deleteCheck() {
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          this.applyProjectManagePerm();
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
           return;
         }
         this.$bkInfo({
@@ -482,8 +486,8 @@
       },
       //
       hasImportPermission() {
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          this.applyProjectManagePerm();
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
         }
       },
       // 上传文件模板

diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTree.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTree.vue
@@ -42,8 +42,8 @@
                 <li>
                   <a href="javascript:;"
                     data-test-id="api_a_accessApi"
-                    v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-                    :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                    v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                    :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
                     :title="$t(`m.systemConfig['系统接入']`)"
                     @click="openDictionary('JION')">
                     {{ $t(`m.systemConfig['系统接入']`) }}
@@ -52,8 +52,8 @@
                 <li>
                   <a href="javascript:;"
                     data-test-id="api_a_createApi"
-                    v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-                    :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                    v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                    :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
                     :title="$t(`m.systemConfig['系统新增']`)"
                     @click="openDictionary('ADD')">
                     {{$t(`m.systemConfig['系统新增']`)}}
@@ -90,15 +90,15 @@
                       <li
                         v-if="!item.is_builtin"
                         data-test-id="api_li_deleteApiDirectory"
-                        v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-                        :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                        v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                        :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
                         @click.stop="openDelete(item)">
                         <span>{{ $t('m.systemConfig["删除"]') }}</span>
                       </li>
                       <li
                         data-test-id="api_li_editApiDirectory"
-                        v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
-                        :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                        v-cursor="{ active: !hasPermission(targetPerms, curPerms) }"
+                        :class="{ 'text-permission-disable': !hasPermission(targetPerms, curPerms) }"
                         @click.stop="openDictionary('CHANGE' ,item)">
                         <span>{{ $t('m.systemConfig["编辑"]') }}</span>
                       </li>
@@ -320,6 +320,12 @@
           });
         },
       },
+      targetPerms() {
+        return this.projectId ? ['system_settings_manage'] : ['public_apis_manage'];
+      },
+      curPerms() {
+        return this.projectId ? this.$store.state.project.projectAuthActions : this.$store.state.common.systemPermission;
+      },
     },
     async mounted() {
       await this.treeListOri;
@@ -443,15 +449,8 @@
         });
       },
       openDictionary(type, item) {
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          const projectInfo = this.$store.state.project.projectInfo;
-          const resourceData = {
-            project: [{
-              id: projectInfo.key,
-              name: projectInfo.name,
-            }],
-          };
-          this.applyForPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions, resourceData);
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
           return;
         }
         this.dictDataTable.showDialog = true;
@@ -484,15 +483,8 @@
       },
       // 二次弹窗确认
       openDelete(item) {
-        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
-          const projectInfo = this.$store.state.project.projectInfo;
-          const resourceData = {
-            project: [{
-              id: projectInfo.key,
-              name: projectInfo.name,
-            }],
-          };
-          this.applyForPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions, resourceData);
+        if (!this.hasPermission(this.targetPerms, this.curPerms)) {
+          this.applyPerm();
           return;
         }
         this.$bkInfo({
@@ -521,6 +513,19 @@
           },
         });
       },
+      applyPerm() {
+        let resourceData = {};
+        if (this.projectId) {
+          const projectInfo = this.$store.state.project.projectInfo;
+          resourceData = {
+            project: [{
+              id: projectInfo.key,
+              name: projectInfo.name,
+            }],
+          };
+        }
+        this.applyForPermission(this.targetPerms, this.curPerms, resourceData);
+      },
     },
   };
 </script>

diff --git a/frontend/pc/src/views/processManagement/publicField/index.vue b/frontend/pc/src/views/processManagement/publicField/index.vue
@@ -379,14 +379,17 @@
         }
         return status;
       },
+      viewFieldPerm() {
+        return this.projectId ? ['field_view'] : ['public_fields_manage'];
+      },
       createFieldPerm() {
-        return this.projectId ? ['field_create'] : ['public_field_create'];
+        return this.projectId ? ['field_create'] : ['public_fields_manage'];
       },
       editFieldPerm() {
-        return this.projectId ? ['field_edit'] : ['public_field_edit'];
+        return this.projectId ? ['field_edit'] : ['public_fields_manage'];
       },
       deleteFieldPerm() {
-        return this.projectId ? ['field_delete'] : ['public_field_delete'];
+        return this.projectId ? ['field_delete'] : ['public_fields_manage'];
       },
       sliderStatus() {
         return this.$store.state.common.slideStatus;
@@ -395,7 +398,7 @@
         return this.$store.state.common.configurInfo;
       },
       curPermission() {
-        return this.projectId ? this.$store.state.project.projectAuthActions : [];
+        return this.projectId ? this.$store.state.project.projectAuthActions : this.$store.state.common.systemPermission;
       },
     },
     mounted() {

diff --git a/frontend/pc/src/views/processManagement/publicTrigger/addTrigger.vue b/frontend/pc/src/views/processManagement/publicTrigger/addTrigger.vue
@@ -784,8 +784,7 @@
       // 创建多个触发器规则（响应条件）
       createRespond(value) {
         const params = value;
-        const id = this.originInfoToTrigger.id;
-        this.$store.dispatch('trigger/createRespond', { id, params }).then((res) => {
+        this.$store.dispatch('trigger/createRespond', { id: this.triggerInfo.id, params }).then((res) => {
           this.backInfo.responseList = res.data;
           // 触发条件
           this.createTriggerCondition();