diff --git a/src/views/pages/deploy/job/add-batch-job-dialog.vue b/src/views/pages/deploy/job/add-batch-job-dialog.vue index 526ad7bd6ac81cfb09bfacfdf22c74e7a02ad38d..d817b48db9b1743512eb3cf4a35cc5527fe9b15f 100644 --- a/src/views/pages/deploy/job/add-batch-job-dialog.vue +++ b/src/views/pages/deploy/job/add-batch-job-dialog.vue @@ -219,7 +219,8 @@ export default { dataList.push({ value: item.id, text: item.abbrName + (item.name ? '(' + item.name + ')' : ''), - _disabled: this.getDisabledText(item, type) + _disabled: this.getDisabledText(item, type), + tooltip: this.getDisabledText(item, type) || null }); }); } @@ -229,7 +230,7 @@ export default { let text = false; if (!item.isHasAllAuthority && type == 'app') { if (item.authActionSet && item.authActionSet.length) { - if (!item.authActionSet.includes('operation#execute') && !item.authActionSet.includes('operation#all')) { + if (!item.isHasAuthPipeline && !item.authActionSet.includes('operation#pipeline') && !item.authActionSet.includes('operation#all')) { text = this.$t('term.deploy.notapplyallexecuteauth'); } else if (!item.authActionSet.find((item) => item.includes('scenario#')) && !item.authActionSet.includes('scenario#all')) { text = this.$t('term.deploy.notapplyallsceneexecuteauth'); diff --git a/src/views/pages/deploy/schedule/components/job-base-info.vue b/src/views/pages/deploy/schedule/components/job-base-info.vue index b82782c8c3a6a7b0f0401236f54e566a1b314e6c..eb67a6cef0f02c86b4d36aa907d05f6b367e15f2 100644 --- a/src/views/pages/deploy/schedule/components/job-base-info.vue +++ b/src/views/pages/deploy/schedule/components/job-base-info.vue @@ -228,7 +228,8 @@ export default { dataList.push({ value: item.id, text: item.abbrName + (item.name ? '(' + item.name + ')' : ''), - _disabled: this.getDisabledText(item, type) + _disabled: this.getDisabledText(item, type), + tooltip: this.getDisabledText(item, type) || null }); }); } @@ -238,7 +239,7 @@ export default { let text = false; if (!item.isHasAllAuthority && type == 'app') { if (item.authActionSet && item.authActionSet.length) { - if (!item.authActionSet.includes('operation#execute') && !item.authActionSet.includes('operation#all')) { + if (!item.isHasAuthPipeline && !item.authActionSet.includes('operation#pipeline') && !item.authActionSet.includes('operation#all')) { text = this.$t('term.deploy.notapplyallexecuteauth'); } else if (!item.authActionSet.find((item) => item.includes('scenario#')) && !item.authActionSet.includes('scenario#all')) { text = this.$t('term.deploy.notapplyallsceneexecuteauth');