From fb75f9dc57d0b7bf16eb2c2a526c2ba8bcf92f2a Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 18 Aug 2025 18:43:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[14907003470807?= =?UTF-8?q?04]=E4=B8=80=E9=94=AE=E5=8F=91=E5=B8=83&=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A-=E6=9C=89=E5=BA=94=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=9D=83=E9=99=90?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E5=8F=91=E8=B5=B7=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1490?= =?UTF-8?q?700347080704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/deploy/job/add-batch-job-dialog.vue | 5 +++-- src/views/pages/deploy/schedule/components/job-base-info.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 526ad7bd..976bf293 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.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 b82782c8..9bdc3262 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.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'); -- Gitee From 6860d9b8811bddcad2ef2196296b30585889a6d5 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 19 Aug 2025 10:52:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[14907003470807?= =?UTF-8?q?04]=E4=B8=80=E9=94=AE=E5=8F=91=E5=B8=83&=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A-=E6=9C=89=E5=BA=94=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=9D=83=E9=99=90?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E5=8F=91=E8=B5=B7=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1490?= =?UTF-8?q?700347080704?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/deploy/job/add-batch-job-dialog.vue | 2 +- src/views/pages/deploy/schedule/components/job-base-info.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 976bf293..d817b48d 100644 --- a/src/views/pages/deploy/job/add-batch-job-dialog.vue +++ b/src/views/pages/deploy/job/add-batch-job-dialog.vue @@ -230,7 +230,7 @@ export default { let text = false; if (!item.isHasAllAuthority && type == 'app') { if (item.authActionSet && item.authActionSet.length) { - if (!item.authActionSet.includes('operation#pipeline') && !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 9bdc3262..eb67a6ce 100644 --- a/src/views/pages/deploy/schedule/components/job-base-info.vue +++ b/src/views/pages/deploy/schedule/components/job-base-info.vue @@ -239,7 +239,7 @@ export default { let text = false; if (!item.isHasAllAuthority && type == 'app') { if (item.authActionSet && item.authActionSet.length) { - if (!item.authActionSet.includes('operation#pipeline') && !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'); -- Gitee