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 2aa50b71a01750bd9120428c004048bc6785732f..f89269266505a6fd9bea12b4c59eebf7ba3199b1 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 @@ - + @@ -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 89f6c411f17a6a1747b2ff9fd30e06ff5dacda34..771717ee60e84175be213eb222308f3ed30e491d 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 @@
{{ $t('term.deploy.operationauth') }}
-
  • +
  • {{ $t('term.deploy.envauth') }}
  • -
  • +
  • {{ $t('term.deploy.scenarioauth') }}
    @@ -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, actionList: this.hideFucntionExcludeAppModuleRunner ? ['view', 'edit'] : []}).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: {} }; 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 18b60ee766274703f5e648fad7a60a910e86dd54..df5ef9d296cc4de941673e86fd959f170124f57b 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" > - +
    - +