From d2038f94c5a3d471efe4ce4b8529005e51c439f8 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Sun, 29 Sep 2024 10:35:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20csrftoken=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=20--stor?=
 =?UTF-8?q?y=3D119912007=20#=20Reviewed,=20transaction=20id:=2019662?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/pc/src/utils/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/pc/src/utils/ajax.js b/frontend/pc/src/utils/ajax.js
index 9f0e886d..7dc85f3b 100644
--- 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: 'bkitsm_csrftoken',
+  xsrfCookieName: `${BKAPP_CSRF_COOKIE_NAME}_csrftoken`,
   // cookie中的csrftoken信息名称
   xsrfHeaderName: 'X-CSRFToken',
   withCredentials: true,

From ce6322db8071d71ebec04284edaf7e3662aa312b Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Sun, 29 Sep 2024 10:39:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20csrftoken=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=20--stor?=
 =?UTF-8?q?y=3D119912007=20#=20Reviewed,=20transaction=20id:=2019665?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/pc/src/utils/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/pc/src/utils/ajax.js b/frontend/pc/src/utils/ajax.js
index 7dc85f3b..a647b5a6 100644
--- 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: `${BKAPP_CSRF_COOKIE_NAME}_csrftoken`,
+  xsrfCookieName: `${window.BKAPP_CSRF_COOKIE_NAME}_csrftoken`,
   // cookie中的csrftoken信息名称
   xsrfHeaderName: 'X-CSRFToken',
   withCredentials: true,

From 22c47aa08a7548378c886680a4b5eff361079491 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Sun, 29 Sep 2024 12:29:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=89=B4=E6=9D=83=E4=BC=98=E5=8C=96=20--story=3D11985?=
 =?UTF-8?q?0967=20#=20Reviewed,=20transaction=20id:=2019671?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/pc/index.html                        |  1 +
 .../evaluation/EvaluationTicketContent.vue    |  8 +-
 .../evaluation/EvaluationTicketModal.vue      |  6 +-
 .../apiConfigure/apiTable.vue                 | 78 +++++++------------
 .../apiConfigure/apiTree.vue                  | 56 ++++++-------
 frontend/pc/src/views/project/notice.vue      | 31 +++++++-
 frontend/pc/src/views/service/serviceList.vue | 15 +++-
 7 files changed, 111 insertions(+), 84 deletions(-)

diff --git a/frontend/pc/index.html b/frontend/pc/index.html
index 207bae3b..a4b9505f 100644
--- a/frontend/pc/index.html
+++ b/frontend/pc/index.html
@@ -37,6 +37,7 @@
             window.BK_SHARED_RES_URL = "{{BK_SHARED_RES_URL}}"
             window.BK_PLATFORM_NAME = "{{BK_PLATFORM_NAME}}"
             window.VERSION = "{{VERSION}}"
+            window.BKAPP_CSRF_COOKIE_NAME = "{{BKAPP_CSRF_COOKIE_NAME}}"
         </script>
         <script>
             var isMobileDevice = false;
diff --git a/frontend/pc/src/components/ticket/evaluation/EvaluationTicketContent.vue b/frontend/pc/src/components/ticket/evaluation/EvaluationTicketContent.vue
index 6ec2f545..c264116f 100644
--- a/frontend/pc/src/components/ticket/evaluation/EvaluationTicketContent.vue
+++ b/frontend/pc/src/components/ticket/evaluation/EvaluationTicketContent.vue
@@ -241,18 +241,19 @@
         }
         const id = this.ticketInfo.comment_id;
 
-        this.$emit('beforeSubmit');
+        this.$emit('updatePendingStatus', true);
         this.$store.dispatch('evaluation/postEvaluation', { params, id }).then(() => {
+          this.$emit('submitSuccess');
           this.$bkMessage({
             message: this.$t('m.newCommon["评价成功"]'),
             theme: 'success',
           });
         })
           .catch((res) => {
+            this.$emit('updatePendingStatus', false);
             errorHandler(res, this);
           })
           .finally(() => {
-            this.$emit('submitSuccess');
             this.scoreInfo.clickSecond = false;
           });
       },
@@ -336,7 +337,7 @@
           id = this.ticketInfo.id;
         }
 
-        this.$emit('beforeSubmit');
+        this.$emit('updatePendingStatus', true);
         this.$store.dispatch(url, { params, id }).then(() => {
           this.$bkMessage({
             message: this.$t('m.newCommon["发送成功"]'),
@@ -345,6 +346,7 @@
           this.$emit('submitSuccess');
         })
           .catch(() => {
+            this.$emit('updatePendingStatus', false);
             errorHandler(this);
           })
           .finally(() => {
diff --git a/frontend/pc/src/components/ticket/evaluation/EvaluationTicketModal.vue b/frontend/pc/src/components/ticket/evaluation/EvaluationTicketModal.vue
index 0be3d36e..97785283 100644
--- a/frontend/pc/src/components/ticket/evaluation/EvaluationTicketModal.vue
+++ b/frontend/pc/src/components/ticket/evaluation/EvaluationTicketModal.vue
@@ -35,7 +35,7 @@
         :satisfact-info="satisfactInfo"
         :ticket-info="ticketInfo"
         :is-show-submit-btn="false"
-        @beforeSubmit="onBeforeSubmit"
+        @updatePendingStatus="onUpdatePendingStatus"
         @submitSuccess="onSubmitSuccess">
       </evaluation-ticket-content>
     </div>
@@ -117,8 +117,8 @@
         this.submitting = false;
         this.$emit('submitSuccess');
       },
-      onBeforeSubmit() {
-        this.submitting = true;
+      onUpdatePendingStatus(status = true) {
+        this.submitting = status;
       },
     },
   };
diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
index ad7d7be1..bb173c98 100644
--- a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
+++ b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
@@ -67,8 +67,9 @@
           {{$t(`m.systemConfig['导入']`)}}
         </bk-button>
         <bk-button :theme="'default'"
+          v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
           data-test-id="api_button_apiTableBatchDeleteApi"
-          class="mr10 batch-remove-btn"
+          :class="['mr10 batch-remove-btn', { 'btn-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }]"
           :title="$t(`m.systemConfig['批量移除']`)"
           :disabled="!checkList.length"
           @click="deleteCheck">
@@ -110,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: !projectId && !hasPermission(['public_api_manage'], props.row.auth_actions) }"
-            :class="{ 'text-permission-disable': !projectId && !hasPermission(['public_api_manage'], props.row.auth_actions) }"
+            v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+            :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
             :title="props.row.name"
             @click="entryOne(props.row)">
             {{props.row.name || '--'}}
@@ -162,22 +163,17 @@
           </bk-button>
           <bk-button theme="primary" text
             data-test-id="api_button_apiTableEditApi"
-            v-cursor="{ active: !projectId
-              && !hasPermission(['public_api_manage'], props.row.auth_actions) }"
-            :class="{ 'text-permission-disable': !projectId
-              && !hasPermission(['public_api_manage'], props.row.auth_actions) }"
+            v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+            :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
             :title="$t(`m.systemConfig['编辑']`)"
-            :disabled="(projectId || hasPermission(['public_api_manage'], props.row.auth_actions))
-              && (props.row.is_builtin || !!props.row.count)"
+            :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: !projectId
-              && !hasPermission(['public_api_manage'], props.row.auth_actions) }"
-            :class="{ 'text-permission-disable': !projectId
-              && !hasPermission(['public_api_manage'], props.row.auth_actions) }"
+            v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+            :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
             :title="$t(`m.systemConfig['移除']`)"
             :disabled="props.row.is_builtin"
             @click="openDelete(props.row)">
@@ -322,14 +318,8 @@
     methods: {
       async entryOne(item) {
         // 公共api
-        if (!this.projectId && !this.hasPermission(['public_api_manage'], item.auth_actions)) {
-          const resourceData = {
-            public_api: [{
-              id: item.id,
-              name: item.name,
-            }],
-          };
-          this.applyForPermission(['public_api_manage'], item.auth_actions, resourceData);
+        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
+          this.applyProjectManagePerm();
           return;
         }
         this.$parent.displayInfo.level_1 = item;
@@ -354,17 +344,20 @@
       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);
+      },
       // 新增
       openShade(type) {
         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);
+          this.applyProjectManagePerm();
         } else {
           this.typeInfo = type;
           this.entryInfo.title = type === 'ADD'
@@ -426,17 +419,9 @@
       },
       // 二次弹窗确认
       openDelete(item) {
-        if (!this.projectId) {
-          if (!this.hasPermission(['public_api_manage'], item.auth_actions)) {
-            const resourceData = {
-              public_api: [{
-                id: item.id,
-                name: item.name,
-              }],
-            };
-            this.applyForPermission(['public_api_manage'], item.auth_actions, resourceData);
-            return;
-          }
+        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
+          this.applyProjectManagePerm();
+          return;
         }
         this.$bkInfo({
           type: 'warning',
@@ -465,6 +450,10 @@
         });
       },
       deleteCheck() {
+        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
+          this.applyProjectManagePerm();
+          return;
+        }
         this.$bkInfo({
           type: 'warning',
           title: this.$t('m.systemConfig["确认移除服务？"]'),
@@ -494,14 +483,7 @@
       //
       hasImportPermission() {
         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);
+          this.applyProjectManagePerm();
         }
       },
       // 上传文件模板
diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTree.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTree.vue
index fdacec14..08d2570d 100644
--- 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: !projectId && !hasPermission(['public_api_create']) }"
-                    :class="{ 'text-permission-disable': !projectId && !hasPermission(['public_api_create']) }"
+                    v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                    :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
                     :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: !projectId && !hasPermission(['public_api_create']) }"
-                    :class="{ 'text-permission-disable': !projectId && !hasPermission(['public_api_create']) }"
+                    v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                    :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
                     :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: !projectId && hasPermission(['public_api_manage']) }"
-                        :class="{ 'text-permission-disable': !projectId && hasPermission(['public_api_manage']) }"
+                        v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                        :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
                         @click.stop="openDelete(item)">
                         <span>{{ $t('m.systemConfig["删除"]') }}</span>
                       </li>
                       <li
                         data-test-id="api_li_editApiDirectory"
-                        v-cursor="{ active: !projectId && hasPermission(['public_api_manage']) }"
-                        :class="{ 'text-permission-disable': !projectId && hasPermission(['public_api_manage']) }"
+                        v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+                        :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
                         @click.stop="openDictionary('CHANGE' ,item)">
                         <span>{{ $t('m.systemConfig["编辑"]') }}</span>
                       </li>
@@ -443,24 +443,16 @@
         });
       },
       openDictionary(type, item) {
-        if (!this.projectId) {
-          let reqPerm = ['public_api_create'];
-          let crtPerm = [];
-          let resourceData = {};
-          if (!['JION', 'ADD'].includes(type)) {
-            reqPerm = ['public_api_manage'];
-            crtPerm = item.auth_actions;
-            resourceData = {
-              public_api: [{
-                id: item.id,
-                name: item.name,
-              }],
-            };
-          }
-          if (crtPerm && !this.hasPermission(reqPerm, crtPerm)) {
-            this.applyForPermission(reqPerm, crtPerm, resourceData);
-            return;
-          }
+        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);
+          return;
         }
         this.dictDataTable.showDialog = true;
         this.dictDataTable.type = type;
@@ -492,6 +484,17 @@
       },
       // 二次弹窗确认
       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);
+          return;
+        }
         this.$bkInfo({
           type: 'warning',
           title: this.$t('m.systemConfig["确认移除系统？"]'),
@@ -551,7 +554,6 @@
             .bk-group-li {
                 color: #4b8fff;
                 background-color: #e1ecff;
-                
             }
 
             .bk-group-name {
diff --git a/frontend/pc/src/views/project/notice.vue b/frontend/pc/src/views/project/notice.vue
index 8f632d22..ffb1901b 100644
--- a/frontend/pc/src/views/project/notice.vue
+++ b/frontend/pc/src/views/project/notice.vue
@@ -15,8 +15,11 @@
         </li>
       </ul>
       <div class="bk-only-btn">
-        <bk-button theme="primary"
+        <bk-button
           data-test-id="notice_button_create"
+          theme="primary"
+          v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+          :class="{ 'btn-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
           @click="addNotice">
           <i class="bk-itsm-icon icon-itsm-icon-one-five"></i>
           {{ $t(`m.deployPage['新增']`) }}
@@ -45,12 +48,16 @@
         <bk-table-column :label="$t(`m.deployPage['操作']`)" width="150">
           <template slot-scope="props">
             <bk-button
+              v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+              :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
               theme="primary"
               text
               @click="editNotice(props.row)">
               {{ $t('m.deployPage["编辑"]') }}
             </bk-button>
             <bk-button
+              v-cursor="{ active: !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
+              :class="{ 'text-permission-disable': !hasPermission(['system_settings_manage'], $store.state.project.projectAuthActions) }"
               theme="primary"
               text
               @click="deleteNotice(props.row)">
@@ -314,10 +321,18 @@
       },
       // 新增配置
       addNotice() {
+        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
+          this.applyProjectPerm();
+          return;
+        }
         this.isEdit = false;
         this.isShowEdit = true;
       },
       editNotice(row) {
+        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
+          this.applyProjectPerm();
+          return;
+        }
         this.editNoticeId = row.id;
         this.formData.noticeUserBy = row.used_by;
         this.handleSelectUserBy(row.used_by);
@@ -330,6 +345,10 @@
         this.isShowEdit = true;
       },
       deleteNotice(row) {
+        if (!this.hasPermission(['system_settings_manage'], this.$store.state.project.projectAuthActions)) {
+          this.applyProjectPerm();
+          return;
+        }
         this.$bkInfo({
           title: this.$t('m["确认要删除？"]'),
           confirmLoading: true,
@@ -347,6 +366,16 @@
       closeEditor() {
         this.isShowEdit = false;
       },
+      applyProjectPerm() {
+        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);
+      },
     },
   };
 
diff --git a/frontend/pc/src/views/service/serviceList.vue b/frontend/pc/src/views/service/serviceList.vue
index 171a18a7..cc6da8b0 100644
--- a/frontend/pc/src/views/service/serviceList.vue
+++ b/frontend/pc/src/views/service/serviceList.vue
@@ -166,7 +166,11 @@
                       :title="type.name"
                       :key="typeIndex">
                       {{ type.name }}
-                      <i v-show="tableHoverId === row.id" @click="handleChange('key', row)" class="bk-itsm-icon icon-itsm-icon-six"></i>
+                      <i
+                        v-show="tableHoverId === row.id && hasPermission(['service_manage'], [...row.auth_actions, ...$store.state.project.projectAuthActions])"
+                        class="bk-itsm-icon icon-itsm-icon-six"
+                        @click="handleChange('key', row)">
+                      </i>
                     </span>
                   </template>
                 </template>
@@ -216,7 +220,14 @@
                 </template>
               </template>
               <template v-else-if="field.id === 'bounded_catalogs'">
-                <span v-if="row.id !== changeFrom.bounded_catalogs" :title="row.bounded_catalogs[0]">{{ row.bounded_catalogs[0] || '--' }}<i v-show="tableHoverId === row.id" @click="handleChange('catalog_id', row)" class="bk-itsm-icon icon-itsm-icon-six"></i></span>
+                <span v-if="row.id !== changeFrom.bounded_catalogs" :title="row.bounded_catalogs[0]">
+                  {{ row.bounded_catalogs[0] || '--' }}
+                  <i
+                    v-show="tableHoverId === row.id && hasPermission(['service_manage'], [...row.auth_actions, ...$store.state.project.projectAuthActions])"
+                    class="bk-itsm-icon icon-itsm-icon-six"
+                    @click="handleChange('catalog_id', row)">
+                  </i>
+                </span>
                 <div v-else class="hover-show-icon">
                   <bk-cascade
                     :list="dirList"