From 9c4de01bf8dbfecb0ec947ed281de6ff7ea36c3e Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 6 Dec 2023 15:39:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]codehub=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=20-=20[=E5=85=B3=E8=81=94]#[1035306810179?=
 =?UTF-8?q?584]codehub=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=85=A5=E5=8F=A3=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/10353068101?=
 =?UTF-8?q?79584?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application-config-manage.vue             |   8 +-
 .../application-config/config/app-manage.vue  |   4 +-
 .../config/app/app-edit.vue                   |  45 ++--
 .../config/app/app-info-manage.vue            | 237 +++++++++---------
 .../config/app/components/auth-edit.vue       |  80 +++---
 .../app/components/batch-edit-auth-dialog.vue |  19 +-
 6 files changed, 203 insertions(+), 190 deletions(-)

diff --git a/src/views/pages/deploy/application-config/application-config-manage.vue b/src/views/pages/deploy/application-config/application-config-manage.vue
index 2aa50b71a..147ac2fe8 100644
--- a/src/views/pages/deploy/application-config/application-config-manage.vue
+++ b/src/views/pages/deploy/application-config/application-config-manage.vue
@@ -60,7 +60,7 @@
               <AppManage
                 v-if="configType == 'app'"
                 :appSystemId="appSystemId"
-                :hasEditConfigAuth="canShow ? canEdit : canShow"
+                :hasEditConfigAuth="canEdit"
                 :authList="authList"
                 :hasEditPipelineAuth="canShow ? hasEditPipelineAuth : canShow"
                 :hideFucntionExcludeAppModuleRunner="hideFucntionExcludeAppModuleRunner"
@@ -89,10 +89,11 @@
               </div>
               <template v-else>
                 <!-- codehub无配置流水线时，需要展示应用层和模块层 -->
+                {{ canEdit }}
                 <AppManage
                   v-if="configType == 'app'"
                   :appSystemId="appSystemId"
-                  :hasEditConfigAuth="canShow ? canEdit : canShow"
+                  :hasEditConfigAuth="canEdit"
                   :authList="authList"
                   :hasEditPipelineAuth="canShow ? hasEditPipelineAuth : canShow"
                   :hideFucntionExcludeAppModuleRunner="hideFucntionExcludeAppModuleRunner"
@@ -141,7 +142,7 @@ export default {
   },
   props: {
     hideFucntionExcludeAppModuleRunner: {
-      //  codehub新增应用配置入口，为了维护应用和模块，以及模块对应的runner组,发布其他功能全部屏蔽
+      //  codehub新增应用配置入口，为了维护应用和模块，应用权限以及模块对应的runner组,发布其他功能全部屏蔽
       type: Boolean,
       default: false
     }
@@ -488,6 +489,7 @@ export default {
     canEdit() {
       // 是否有“编辑配置”权限，isHasAllAuthority 表示自动发布管理员权限
       if (this.authList.includes('operation#all') || this.authList.includes('operation#edit') || (this.selectedApp && this.selectedApp.isHasAllAuthority)) {
+        console.log('返回的值', this.selectedApp, this.authList);
         return true;
       }
       return false;
diff --git a/src/views/pages/deploy/application-config/config/app-manage.vue b/src/views/pages/deploy/application-config/config/app-manage.vue
index e0e9a5e9f..afa7352e9 100644
--- a/src/views/pages/deploy/application-config/config/app-manage.vue
+++ b/src/views/pages/deploy/application-config/config/app-manage.vue
@@ -15,7 +15,7 @@
           @updateAuth="updateAuth"
         ></AppInfoManage>
       </TabPane>
-      <TabPane v-if="hasEditConfigAuth" :label="$t('term.deploy.continuousintegration')" name="integrated">
+      <TabPane v-if="!hideFucntionExcludeAppModuleRunner" :label="$t('term.deploy.continuousintegration')" name="integrated">
         <IntegratedManage v-if="tabValue == 'integrated'" :appSystemId="appSystemId"></IntegratedManage>
       </TabPane>
       <TabPane v-if="hasEditPipelineAuth" :label="$t('term.deploy.superpipeline')" name="pipeline">
@@ -59,7 +59,7 @@ export default {
       default: false
     },
     hideFucntionExcludeAppModuleRunner: {
-      // codehub新增应用配置入口，为了维护应用和模块，以及模块对应的runner组,发布其他功能全部屏蔽
+      // codehub新增应用配置入口，为了维护应用和模块，应用权限以及模块对应的runner组,发布其他功能全部屏蔽
       type: Boolean,
       default: false
     }
diff --git a/src/views/pages/deploy/application-config/config/app/app-edit.vue b/src/views/pages/deploy/application-config/config/app/app-edit.vue
index 89f6c411f..c27b19c0c 100644
--- a/src/views/pages/deploy/application-config/config/app/app-edit.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-edit.vue
@@ -26,29 +26,29 @@
                     <div class="text-grey auth-text">{{ $t('term.deploy.operationauth') }}</div>
                     <AuthEdit
                       v-model="authConfig.operationAuthList"
-                      :appSystemId="params.appSystemId"
+                      :authSetting="authSetting"
                       :isEdit="isEdit"
                       operationType="operation"
                     ></AuthEdit>
                   </div>
                 </li>
-                <li class="bg-op radius-sm mb-nm">
+                <li v-if="canShowEnvScenario" class="bg-op radius-sm mb-nm">
                   <div class="padding">
                     <div class="text-grey auth-text">{{ $t('term.deploy.envauth') }}</div>
                     <AuthEdit
                       v-model="authConfig.envAuthList"
-                      :appSystemId="params.appSystemId"
+                      :authSetting="authSetting"
                       :isEdit="isEdit"
                       operationType="env"
                     ></AuthEdit>
                   </div>
                 </li>
-                <li class="bg-op radius-sm mb-nm">
+                <li v-if="canShowEnvScenario" class="bg-op radius-sm mb-nm">
                   <div class="padding">
                     <div class="text-grey auth-text">{{ $t('term.deploy.scenarioauth') }}</div>
                     <AuthEdit
                       v-model="authConfig.scenarioAuthList"
-                      :appSystemId="params.appSystemId"
+                      :authSetting="authSetting"
                       :isEdit="isEdit"
                       operationType="scenario"
                     ></AuthEdit>
@@ -77,7 +77,12 @@ export default {
         return {};
       }
     },
-    isEdit: Number // 是否是编辑：0否 1是
+    isEdit: Number, // 是否是编辑：0否 1是
+    hideFucntionExcludeAppModuleRunner: {
+      //  codehub新增应用配置入口，为了维护应用和模块，应用权限以及模块对应的runner组,发布其他功能全部屏蔽
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -93,6 +98,7 @@ export default {
         scenarioAuthList: [], // 场景权限列表
         envAuthList: [] // 环境权限列表
       },
+      authSetting: {},
       authRequired: false, // 权限必填
       loadingShow: true,
       defaultoperationAuthList: [], // 权限列表，用户回显操作
@@ -118,17 +124,14 @@ export default {
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
+  async mounted() {
     this.loadingShow = true; 
-    this.getAuthList().then(() => {
-      if (this.isEdit) {
-        this.getAuthInfoById();
-      } else {
-        this.loadingShow = false;
-      }
-    }).catch(() => {
+    await this.getAuthList();
+    if (this.isEdit) {
+      this.getAuthInfoById();
+    } else {
       this.loadingShow = false;
-    });
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -238,9 +241,10 @@ export default {
         this.loadingShow = false;
       });
     },
-    async getAuthList() {
-      await this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId}).then((res) => {
+    getAuthList() {
+      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId, isCodehub: this.hideFucntionExcludeAppModuleRunner ? 1 : 0}).then((res) => {
         if (res && res.Status == 'OK') {
+          this.authSetting = res.Return || {};
           for (let key in res.Return) {
             if (key && res.Return[key]) {
               res.Return[key].forEach((item) => {
@@ -253,7 +257,12 @@ export default {
     }
   },
   filter: {},
-  computed: {},
+  computed: {
+    canShowEnvScenario() {
+      // 显示环境场景
+      return !this.hideFucntionExcludeAppModuleRunner;
+    }
+  },
   watch: {}
 };
 </script>
diff --git a/src/views/pages/deploy/application-config/config/app/app-info-manage.vue b/src/views/pages/deploy/application-config/config/app/app-info-manage.vue
index 18b60ee76..097326a4d 100644
--- a/src/views/pages/deploy/application-config/config/app/app-info-manage.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-info-manage.vue
@@ -7,122 +7,124 @@
       v-if="appSystemId && canShow"
       :appSystemId="appSystemId"
     ></DeployNoticeSetting>
-    <template v-if="canShow">
-      <div class="border-bottom border-color"></div>
-      <div class="pt-nm">
-        <span class="pl-nm">{{ $t('page.authority') }}</span>
-      </div>
-      <div class="pt-nm pl-nm pr-nm">
-        <TsRow class="pb-sm">
-          <Col span="10">
-            <div class="action-group mt-xs">
-              <span v-show="hasEditConfigAuth" class="action-item tsfont-plus text-href" @click="openAuthDialog">{{ $t('page.add') }}</span>
-              <span
-                v-show="hasEditConfigAuth"
-                class="action-item tsfont-edit"
-                :class="!selectedAuthList || selectedAuthList.length == 0 ? 'disable' : ''"
-                @click="batchEdit"
-              >{{ $t('page.edit') }}</span>
-              <span
-                v-show="hasEditConfigAuth"
-                class="action-item tsfont-trash-o"
-                :class="!selectedAuthList || selectedAuthList.length == 0 ? 'disable' : ''"
-                @click="batchDeleteAuth"
-              >{{ $t('page.delete') }}</span>
-            </div>
-          </Col>
-          <Col span="6">
-            <TsFormSelect
-              v-model="actionList"
-              transfer
-              :multiple="false"
-              :dataList="authList"
-              :placeholder="$t('page.authority')"
-              @on-change="searchAuth(1)"
-            ></TsFormSelect>
-          </Col>
-          <Col span="8">
-            <UserSelect
-              v-model="authorityStrList"
-              :multiple="false"
-              :transfer="true"
-              :placeholder="$t('page.user')"
-              :groupList="['user', 'role', 'team']"
-              @on-change="searchAuth(1)"
-            ></UserSelect>
-          </Col>
-        </TsRow>
-        <div class="tstable-container pb-nm">
-          <Loading :loadingShow="loadingShow" type="fix"></Loading>
-          <div ref="tableMain" class="tstable-main">
-            <table ref="tableBody" class="tstable-body">
-              <thead> 
-                <tr>
-                  <th
-                    v-for="(th, thIndex) in tableConfig.theadList"
-                    :key="thIndex"
-                    :class="[borderRight(th.key, thIndex + 1), (th.key != 'user') ? 'text-center' : '']"
-                  >
-                    <Checkbox
-                      v-if="th.key == 'selection'"
-                      v-model="checkAll"
-                      :indeterminate="indeterminate"
-                      @on-change="selectedAll"
-                    ></Checkbox>
-                    <span v-else>{{ th.title }}</span>
-                  </th>
-                </tr>
-              </thead>
-              <tbody v-if="!loadingShow" class="text-center">
-                <template v-if="tableConfig.tbodyList.length > 0">
-                  <tr
-                    v-for="(item, index) in tableConfig.tbodyList"
-                    :key="item.id"
-                    style="position: relative;"
-                    @mouseout="onMouseout(item, index)"
-                    @mouseover="onMouseover(item, index)"
-                  >
-                    <td
-                      v-for="(innerItem, nIndex) in tableConfig.theadList"
-                      :key="nIndex"
-                      :class="borderRight(innerItem.key, nIndex + 1)"
-                    > 
-                      <template v-if="innerItem.key == 'selection'">
-                        <Checkbox :value="item.isSelected" @on-change="(isSelected) => getSelected(isSelected, item, item.authUuid)"></Checkbox>
-                      </template>
-                      <template v-else-if="innerItem.key == 'user'">
-                        <UserSelect
-                          v-if="item.authType && item.authUuid"
-                          :value="`${item.authType}#${item.authUuid}`"
-                          :readonly="true"
-                        ></UserSelect>
-                      </template>
-                      <span v-else :class="item && item[innerItem.name] ? 'tsfont-check text-success' : 'tsfont-close text-grey'"></span>
-                    </td>
-                    <div :class="item.isShow ? 'show-operation bg-selected' : 'hide-operation'" :style="item.isShow && topRightWidth ? {right: `${topRightWidth}px`} : ''">
-                      <span v-show="hasEditConfigAuth" class="tsfont-edit text-action cursor pr-sm" @click.stop="editAuth(item)">{{ $t('page.edit') }}</span>
-                      <span v-show="hasEditConfigAuth" class="tsfont-trash-s text-action cursor" @click.stop="delAuth(item)">{{ $t('page.delete') }}</span>
-                    </div>
-                  </tr>
-                </template>
-                <template v-else>
-                  <tr class="text-center">
-                    <td :colspan="tableConfig.theadList.length">{{ $t('page.nodata') }}</td>
-                  </tr>
-                </template>
-              </tbody>
-            </table>
+    <div class="border-bottom border-color"></div>
+    <div class="pt-nm">
+      <span class="pl-nm">{{ $t('page.authority') }}</span>
+    </div>
+    <div class="pt-nm pl-nm pr-nm">
+      <TsRow class="pb-sm">
+        <Col span="10">
+          <div v-show="hasEditConfigAuth" class="action-group mt-xs">
+            <span class="action-item tsfont-plus text-href" @click="openAuthDialog">{{ $t('page.add') }}</span>
+            <span
+              class="action-item tsfont-edit"
+              :class="!selectedAuthList || selectedAuthList.length == 0 ? 'disable' : ''"
+              @click="batchEdit"
+            >{{ $t('page.edit') }}</span>
+            <span
+              class="action-item tsfont-trash-o"
+              :class="!selectedAuthList || selectedAuthList.length == 0 ? 'disable' : ''"
+              @click="batchDeleteAuth"
+            >{{ $t('page.delete') }}</span>
           </div>
+        </Col>
+        <Col span="6">
+          <TsFormSelect
+            v-model="actionList"
+            transfer
+            :multiple="false"
+            :dataList="authList"
+            :placeholder="$t('page.authority')"
+            @on-change="searchAuth(1)"
+          ></TsFormSelect>
+        </Col>
+        <Col span="8">
+          <UserSelect
+            v-model="authorityStrList"
+            :multiple="false"
+            :transfer="true"
+            :placeholder="$t('page.user')"
+            :groupList="['user', 'role', 'team']"
+            @on-change="searchAuth(1)"
+          ></UserSelect>
+        </Col>
+      </TsRow>
+      <div class="tstable-container pb-nm">
+        <Loading :loadingShow="loadingShow" type="fix"></Loading>
+        <div ref="tableMain" class="tstable-main">
+          <table ref="tableBody" class="tstable-body">
+            <thead> 
+              <tr>
+                <th
+                  v-for="(th, thIndex) in tableConfig.theadList"
+                  :key="thIndex"
+                  :class="[borderRight(th.key, thIndex + 1), (th.key != 'user') ? 'text-center' : '']"
+                >
+                  <Checkbox
+                    v-if="th.key == 'selection'"
+                    v-model="checkAll"
+                    :indeterminate="indeterminate"
+                    @on-change="selectedAll"
+                  ></Checkbox>
+                  <span v-else>{{ th.title }}</span>
+                </th>
+              </tr>
+            </thead>
+            <tbody v-if="!loadingShow" class="text-center">
+              <template v-if="tableConfig.tbodyList.length > 0">
+                <tr
+                  v-for="(item, index) in tableConfig.tbodyList"
+                  :key="item.id"
+                  style="position: relative;"
+                  @mouseout="onMouseout(item, index)"
+                  @mouseover="onMouseover(item, index)"
+                >
+                  <td
+                    v-for="(innerItem, nIndex) in tableConfig.theadList"
+                    :key="nIndex"
+                    :class="borderRight(innerItem.key, nIndex + 1)"
+                  > 
+                    <template v-if="innerItem.key == 'selection'">
+                      <Checkbox :value="item.isSelected" @on-change="(isSelected) => getSelected(isSelected, item, item.authUuid)"></Checkbox>
+                    </template>
+                    <template v-else-if="innerItem.key == 'user'">
+                      <UserSelect
+                        v-if="item.authType && item.authUuid"
+                        :value="`${item.authType}#${item.authUuid}`"
+                        :readonly="true"
+                      ></UserSelect>
+                    </template>
+                    <span v-else :class="item && item[innerItem.name] ? 'tsfont-check text-success' : 'tsfont-close text-grey'"></span>
+                  </td>
+                  <div :class="item.isShow ? 'show-operation bg-selected' : 'hide-operation'" :style="item.isShow && topRightWidth ? {right: `${topRightWidth}px`} : ''">
+                    <span v-show="hasEditConfigAuth" class="tsfont-edit text-action cursor pr-sm" @click.stop="editAuth(item)">{{ $t('page.edit') }}</span>
+                    <span v-show="hasEditConfigAuth" class="tsfont-trash-s text-action cursor" @click.stop="delAuth(item)">{{ $t('page.delete') }}</span>
+                  </div>
+                </tr>
+              </template>
+              <template v-else>
+                <tr class="text-center">
+                  <td :colspan="tableConfig.theadList.length">{{ $t('page.nodata') }}</td>
+                </tr>
+              </template>
+            </tbody>
+          </table>
         </div>
       </div>
-    </template>
+    </div>
     <AppEdit
       v-if="isShowAuthDialog"
       :isEdit="isEdit"
+      :hideFucntionExcludeAppModuleRunner="hideFucntionExcludeAppModuleRunner"
       :params="appEditParams"
       @close="closeAuthDialog"
     ></AppEdit>
-    <BatchEditAuthDialog v-if="isShowBatchEditDialog" :params="batchEditAppParams" @close="closeBatchEditDialog"></BatchEditAuthDialog>
+    <BatchEditAuthDialog
+      v-if="isShowBatchEditDialog"
+      :params="batchEditAppParams"
+      :hideFucntionExcludeAppModuleRunner="hideFucntionExcludeAppModuleRunner"
+      @close="closeBatchEditDialog"
+    ></BatchEditAuthDialog>
   </div>
 </template>
 <script>
@@ -147,7 +149,7 @@ export default {
       default: false
     },
     hideFucntionExcludeAppModuleRunner: {
-      //  codehub新增应用配置入口，为了维护应用和模块，以及模块对应的runner组,发布其他功能全部屏蔽
+      //  codehub新增应用配置入口，为了维护应用和模块，应用权限以及模块对应的runner组,发布其他功能全部屏蔽
       type: Boolean,
       default: false
     }
@@ -183,15 +185,10 @@ export default {
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
-    if (this.canShow) {
-      this.loadingShow = true;
-      this.getAuthList().then(() => {
-        this.searchAuth(1);
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    }
+  async mounted() {
+    this.loadingShow = true;
+    await this.getAuthList();
+    this.searchAuth(1);
   },
   beforeUpdate() {},
   updated() {},
@@ -200,8 +197,8 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    async getAuthList() {
-      await this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.appSystemId}).then((res) => {
+    getAuthList() {
+      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.appSystemId, isCodehub: !this.canShow ? 1 : 0}).then((res) => {
         if (res && res.Status == 'OK') {
           let dataInfo = res.Return || {};
           this.handleAuthListData(dataInfo);
@@ -228,7 +225,7 @@ export default {
         authorityStrList: this.authorityStrList ? [this.authorityStrList] : []
       };
       this.loadingShow = true;
-      this.$api.deploy.applicationConfig.getAppConfigAuthList({...this.searchParam, ...searchParam}).then((res) => {
+      this.$api.deploy.applicationConfig.getAppConfigAuthList({...this.searchParam, ...searchParam, isCodehub: !this.canShow ? 1 : 0}).then((res) => {
         if (res && res.Status == 'OK') {
           this.operationAuthLength = 0;
           this.envAuthLength = 0;
diff --git a/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue b/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue
index 5a3d4f452..0eb763d25 100644
--- a/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue
+++ b/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue
@@ -41,10 +41,6 @@ export default {
         return [];
       }
     },
-    appSystemId: {
-      type: Number,
-      default: null
-    },
     isEdit: {
       type: Number,
       default: 0
@@ -52,6 +48,12 @@ export default {
     operationType: {
       type: String,
       default: 'opertaion' // operation/env/scenario 操作/环境/场景
+    },
+    authSetting: {
+      type: Object,
+      default: () => {
+        return {};
+      }
     }
   },
   data() {
@@ -65,7 +67,7 @@ export default {
   },
   beforeCreate() {},
   created() {
-    this.getAuthList();
+    this.handleAuthData();
   },
   beforeMount() {},
   mounted() {},
@@ -76,43 +78,39 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    getAuthList() {
-      this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.appSystemId}).then((res) => {
-        if (res && res.Status == 'OK') {
-          let operationTypeObj = {
-            operation: 'operationAuthList',
-            env: 'envAuthList',
-            scenario: 'scenarioAuthList'
-          };
-          this.checkboxList = res.Return[operationTypeObj[this.operationType]] || [];
-          this.defaultAuthList = this.$utils.deepClone(this.checkboxList);
-          if (this.value.length == 0) {
-            this.checkAll = false;
-            this.indeterminate = false;
-          } else {
-            if (this.checkboxList.length == this.value.length) {
-              this.checkAll = true;
-              this.indeterminate = false;
-            } else {
-              this.checkAll = false;
-              this.indeterminate = true;
-            }
-          }
-          if (!this.isEdit) {
-            // 默认选中所有
-            let authList = [];
-            if (this.checkboxList && this.checkboxList.length > 0) {
-              this.checkboxList.forEach((item) => {
-                authList.push(item.value);
-              });
-            }
-            this.indeterminate = false;
-            this.checkAll = !(authList && authList.length == 0);
-            this.authList = authList;
-            this.handleEmit();
-          }
+    handleAuthData() {
+      let operationTypeObj = {
+        operation: 'operationAuthList',
+        env: 'envAuthList',
+        scenario: 'scenarioAuthList'
+      };
+      this.checkboxList = this.authSetting[operationTypeObj[this.operationType]] || [];
+      this.defaultAuthList = this.$utils.deepClone(this.checkboxList);
+      if (this.value.length == 0) {
+        this.checkAll = false;
+        this.indeterminate = false;
+      } else {
+        if (this.checkboxList.length == this.value.length) {
+          this.checkAll = true;
+          this.indeterminate = false;
+        } else {
+          this.checkAll = false;
+          this.indeterminate = true;
+        }
+      }
+      if (!this.isEdit) {
+        // 默认选中所有
+        let authList = [];
+        if (this.checkboxList && this.checkboxList.length > 0) {
+          this.checkboxList.forEach((item) => {
+            authList.push(item.value);
+          });
         }
-      });
+        this.indeterminate = false;
+        this.checkAll = !(authList && authList.length == 0);
+        this.authList = authList;
+        this.handleEmit();
+      }
     },
     handleCheckAll() {
       if (this.indeterminate) {
diff --git a/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue b/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue
index 72c1e12bc..11bd584d6 100644
--- a/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue
@@ -22,9 +22,9 @@
                     <div class="text-grey auth-text">{{ $t('term.deploy.operationauth') }}</div>
                     <AuthEdit
                       v-model="authConfig.operationAuthList"
-                      :appSystemId="params.appSystemId"
                       :isEdit="isEdit"
                       operationType="operation"
+                      :authSetting="authSetting"
                     ></AuthEdit>
                   </div>
                 </li>
@@ -33,9 +33,9 @@
                     <div class="text-grey auth-text">{{ $t('term.deploy.envauth') }}</div>
                     <AuthEdit
                       v-model="authConfig.envAuthList"
-                      :appSystemId="params.appSystemId"
                       :isEdit="isEdit"
                       operationType="env"
+                      :authSetting="authSetting"
                     ></AuthEdit>
                   </div>
                 </li>
@@ -44,9 +44,9 @@
                     <div class="text-grey auth-text">{{ $t('term.deploy.scenarioauth') }}</div>
                     <AuthEdit
                       v-model="authConfig.scenarioAuthList"
-                      :appSystemId="params.appSystemId"
                       :isEdit="isEdit"
                       operationType="scenario"
+                      :authSetting="authSetting"
                     ></AuthEdit>
                   </div>
                 </li>
@@ -72,6 +72,11 @@ export default {
       default: function() {
         return {};
       }
+    },
+    hideFucntionExcludeAppModuleRunner: {
+      //  codehub新增应用配置入口，为了维护应用和模块，应用权限以及模块对应的runner组,发布其他功能全部屏蔽
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -85,6 +90,7 @@ export default {
         envAuthList: [],
         scenarioAuthList: []
       },
+      authSetting: {},
       dialogSetting: {
         type: 'slider',
         title: this.$t('term.deploy.batcheditpermission'),
@@ -113,8 +119,8 @@ export default {
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
-    this.getAuthList();
+  async mounted() {
+    await this.getAuthList();
     this.getAuthInfoById();
   },
   beforeUpdate() {},
@@ -215,8 +221,9 @@ export default {
       });
     },
     getAuthList() {
-      this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId}).then((res) => {
+      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId, isCodehub: this.hideFucntionExcludeAppModuleRunner ? 1 : 0}).then((res) => {
         if (res && res.Status == 'OK') {
+          this.authSetting = res.Return || {};
           for (let key in res.Return) {
             if (key && res.Return[key]) {
               res.Return[key].forEach((item) => {
-- 
Gitee


From 590be0ab44524f8626453c49166b007a8f122ea6 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 6 Dec 2023 17:16:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=B0=83=E6=95=B4i?=
 =?UTF-8?q?sCodehub=E5=AD=97=E6=AE=B5=E4=B8=BAactionList=EF=BC=8C=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E6=9D=83=E9=99=90=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/app/app-edit.vue                   |  2 +-
 .../config/app/app-info-manage.vue            | 14 ++++++++------
 .../config/app/components/auth-edit.vue       | 19 +++++++++++++++----
 .../app/components/batch-edit-auth-dialog.vue |  2 +-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/pages/deploy/application-config/config/app/app-edit.vue b/src/views/pages/deploy/application-config/config/app/app-edit.vue
index c27b19c0c..771717ee6 100644
--- a/src/views/pages/deploy/application-config/config/app/app-edit.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-edit.vue
@@ -242,7 +242,7 @@ export default {
       });
     },
     getAuthList() {
-      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId, isCodehub: this.hideFucntionExcludeAppModuleRunner ? 1 : 0}).then((res) => {
+      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId, actionList: this.hideFucntionExcludeAppModuleRunner ? ['view', 'edit'] : []}).then((res) => {
         if (res && res.Status == 'OK') {
           this.authSetting = res.Return || {};
           for (let key in res.Return) {
diff --git a/src/views/pages/deploy/application-config/config/app/app-info-manage.vue b/src/views/pages/deploy/application-config/config/app/app-info-manage.vue
index 097326a4d..df5ef9d29 100644
--- a/src/views/pages/deploy/application-config/config/app/app-info-manage.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-info-manage.vue
@@ -198,7 +198,7 @@ export default {
   destroyed() {},
   methods: {
     getAuthList() {
-      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.appSystemId, isCodehub: !this.canShow ? 1 : 0}).then((res) => {
+      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.appSystemId, actionList: !this.canShow ? ['view', 'edit'] : []}).then((res) => {
         if (res && res.Status == 'OK') {
           let dataInfo = res.Return || {};
           this.handleAuthListData(dataInfo);
@@ -225,7 +225,7 @@ export default {
         authorityStrList: this.authorityStrList ? [this.authorityStrList] : []
       };
       this.loadingShow = true;
-      this.$api.deploy.applicationConfig.getAppConfigAuthList({...this.searchParam, ...searchParam, isCodehub: !this.canShow ? 1 : 0}).then((res) => {
+      this.$api.deploy.applicationConfig.getAppConfigAuthList({...this.searchParam, ...searchParam, actionList: !this.canShow ? ['view', 'edit'] : []}).then((res) => {
         if (res && res.Status == 'OK') {
           this.operationAuthLength = 0;
           this.envAuthLength = 0;
@@ -446,10 +446,12 @@ export default {
         for (let key in authObj) {
           if (key && authObj[key]) {
             authObj[key].forEach((item) => {
-              this.authList.push({
-                text: item.text,
-                value: item.value ? `${obj[key]}/${item.value}` : ''
-              });
+              if (item && item.value) {
+                this.authList.push({
+                  text: item.text,
+                  value: item.value ? `${obj[key]}/${item.value}` : ''
+                });
+              }
             });
           }
         }
diff --git a/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue b/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue
index 0eb763d25..39ddf63ce 100644
--- a/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue
+++ b/src/views/pages/deploy/application-config/config/app/components/auth-edit.vue
@@ -84,7 +84,14 @@ export default {
         env: 'envAuthList',
         scenario: 'scenarioAuthList'
       };
-      this.checkboxList = this.authSetting[operationTypeObj[this.operationType]] || [];
+      this.checkboxList = [];
+      let checkboxList = this.authSetting[operationTypeObj[this.operationType]] || [];
+      checkboxList.forEach((item) => {
+        // 过滤为空对象
+        if (item && item.value) {
+          this.checkboxList.push(item);
+        }
+      });
       this.defaultAuthList = this.$utils.deepClone(this.checkboxList);
       if (this.value.length == 0) {
         this.checkAll = false;
@@ -103,7 +110,9 @@ export default {
         let authList = [];
         if (this.checkboxList && this.checkboxList.length > 0) {
           this.checkboxList.forEach((item) => {
-            authList.push(item.value);
+            if (item && item.value) {
+              authList.push(item.value);
+            }
           });
         }
         this.indeterminate = false;
@@ -122,9 +131,11 @@ export default {
       if (this.checkAll) {
         let authList = [];
         this.defaultAuthList && this.defaultAuthList.forEach((item) => {
-          authList.push(item.value);
-          this.authList = authList;
+          if (item && item.value) {
+            authList.push(item.value);
+          }
         });
+        this.authList = authList;
       } else {
         this.authList = [];
       }
diff --git a/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue b/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue
index 11bd584d6..c4d50e1c8 100644
--- a/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/app/components/batch-edit-auth-dialog.vue
@@ -221,7 +221,7 @@ export default {
       });
     },
     getAuthList() {
-      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId, isCodehub: this.hideFucntionExcludeAppModuleRunner ? 1 : 0}).then((res) => {
+      return this.$api.deploy.applicationConfig.getAuthList({appSystemId: this.params.appSystemId, actionList: this.hideFucntionExcludeAppModuleRunner ? ['view', 'edit'] : []}).then((res) => {
         if (res && res.Status == 'OK') {
           this.authSetting = res.Return || {};
           for (let key in res.Return) {
-- 
Gitee


From e1b10d249bb868d9e058d185fb45b1740ad3268c Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 6 Dec 2023 17:41:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/application-config/application-config-manage.vue      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/pages/deploy/application-config/application-config-manage.vue b/src/views/pages/deploy/application-config/application-config-manage.vue
index 147ac2fe8..f89269266 100644
--- a/src/views/pages/deploy/application-config/application-config-manage.vue
+++ b/src/views/pages/deploy/application-config/application-config-manage.vue
@@ -89,7 +89,6 @@
               </div>
               <template v-else>
                 <!-- codehub无配置流水线时，需要展示应用层和模块层 -->
-                {{ canEdit }}
                 <AppManage
                   v-if="configType == 'app'"
                   :appSystemId="appSystemId"
-- 
Gitee