From 0c95a95d1ba5095b83a22ca636cd8565b9537056 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 1 Aug 2025 17:36:15 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[1478296397643776]?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E5=88=9B=E5=BB=BA=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E9=A1=B5=E9=9D=A2=E5=A6=82=E6=9E=9C=E6=89=80=E6=9C=89?=
 =?UTF-8?q?runner=E9=98=B6=E6=AE=B5=E9=83=BD=E8=AE=BE=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84=EF=BC=8C=E5=88=99=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0?=
 =?UTF-8?q?=E9=9C=80=E8=AE=BE=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1478296397643776?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/autoexec/detail/runner-detail.vue     |  2 +-
 .../pages/autoexec/quick-service/catalog/service.vue  | 11 +++++++----
 .../service-catalog/no-form-service-edit.vue          |  6 ++++--
 .../quick-service/service-catalog/other-params.vue    |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/pages/autoexec/detail/runner-detail.vue b/src/views/pages/autoexec/detail/runner-detail.vue
index 9fb66115..e01e2e21 100644
--- a/src/views/pages/autoexec/detail/runner-detail.vue
+++ b/src/views/pages/autoexec/detail/runner-detail.vue
@@ -123,7 +123,7 @@
             {{ $t('page.autoexeccomboprunnergrouptagtips') }}
           </div>
         </div>
-        <div>
+        <div v-if="dataConfig.needRunnerGroup">
           <Divider orientation="start">{{ $t('term.deploy.actuatorgroup') }}</Divider>
           <div v-if="dataConfig.existRunnerOrSqlExecMode && runnerGroup && runnerGroup.mappingMode==='runtimeparam'">
             <RunnerGroupSetting
diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue
index febe359a..bfcdb65f 100644
--- a/src/views/pages/autoexec/quick-service/catalog/service.vue
+++ b/src/views/pages/autoexec/quick-service/catalog/service.vue
@@ -209,7 +209,7 @@
         </div>
       </TsFormItem>
     </div>
-    <div v-if="hasCombopId" class="radius-lg bg-op padding mt-nm">
+    <div v-if="hasCombopId && needRunnerGroup" class="radius-lg bg-op padding mt-nm">
       <div class="flex-between" :class="unfoldAndFold.runnerGroup ? 'mb-sm' : ''">
         <span>{{ $t('page.autoexeccomboprunnergrouplabel') }}</span>
         <span class="tsfont-down cursor" :class="unfoldAndFold.runnerGroup ? 'tsfont-down' : 'tsfont-up'" @click.stop="handleUnfoldAndFold('runnerGroup')"></span>
@@ -572,6 +572,7 @@ export default {
       needExecuteUser: false,
       needProtocol: false,
       needRoundCount: false, // 是否需要显示分批数量，组合工具设置分批数量，这里不需要再次设置分批数量
+      needRunnerGroup: false, // 是否需要显示执行器组
       filterSearchValue: {},
       formDataList: [],
       nociteFormMappingModeList: [
@@ -883,6 +884,7 @@ export default {
       this.needProtocol = false;
       this.needRoundCount = false;
       this.needExecuteNode = false;
+      this.needRunnerGroup = false; // 是否需要显示执行器组
       this.roundCountForm.disabled = false;
       this.scenarioList = [];
       this.valueConfig = {}; //所有值对应的集合
@@ -1180,7 +1182,7 @@ export default {
       if (!this.needProtocol) {
         delete params.config.protocol;
       }
-      if (this.runnerGroup && this.runnerGroup.mappingMode == 'runtimeparam') {
+      if (this.runnerGroup && this.runnerGroup.mappingMode == 'runtimeparam' || !this.needRunnerGroup) {
         // 组合工具，执行器组如果是作业参数，不需要传递给后端
         delete params.config.runnerGroup;
       }
@@ -1239,7 +1241,7 @@ export default {
         .then(res => {
           if (res.Status == 'OK') {
             dataInfo = res.Return;
-            const { config = {}, needExecuteNode = false, needExecuteUser = false, needProtocol = false, needRoundCount = false } = res.Return || {};
+            const { config = {}, needExecuteNode = false, needExecuteUser = false, needProtocol = false, needRoundCount = false, needRunnerGroup = false} = res.Return || {};
             const { combopPhaseList = [], runtimeParamList = [], executeConfig = {}, scenarioList = [], defaultScenarioId = null } = config;
             const { runnerGroup = '', runnerGroupTag = {}, executeNodeConfig = {} } = executeConfig;
             const { filter = {} } = executeNodeConfig;
@@ -1250,6 +1252,7 @@ export default {
             this.needExecuteUser = needExecuteUser;
             this.needProtocol = needProtocol;
             this.needRoundCount = needRoundCount;
+            this.needRunnerGroup = needRunnerGroup;
             this.executeConfig = this.$utils.deepClone(executeConfig) || {};
             const shouldUseCurrentValue = (obj) => {
               return !this.$utils.isEmpty(obj) && !this.$utils.isEmpty(obj['value']) && (obj['mappingMode'] === 'notsetup' || !this.$utils.isEmpty(obj['mappingMode'])); // 处理值为空，还是以自动化存储的值为主
@@ -1289,7 +1292,7 @@ export default {
             } else {
               this.filterSearchValue = !this.$utils.isEmpty(this.filterSearchValue) ? this.filterSearchValue : filter || {};
             }
-            this.scenarioId = defaultScenarioId;
+            this.scenarioId = this.scenarioId || defaultScenarioId;
             if (executeConfig && !this.$utils.isEmpty(executeConfig)) {
               // 连接协议和执行账户回显
               let { executeUser = {}, protocolId = '' } = executeConfig || {};
diff --git a/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue b/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
index c93672ed..8d0fdd89 100644
--- a/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
+++ b/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
@@ -110,7 +110,7 @@
         </div>
       </TsFormItem>
     </div>
-    <div v-if="hasServiceValue.runnerGroup" :class="getClassByBorder">
+    <div v-if="hasServiceValue.runnerGroup && needRunnerGroup" :class="getClassByBorder">
       <div :class="getFlexClass(unfoldAndFold.runnerGroup)">
         <template v-if="border !='border'">
           <span class="tsfont-down cursor" :class="getDownUpClass(unfoldAndFold.runnerGroup)" @click.stop="handleUnfoldAndFold('runnerGroup')"></span>
@@ -336,6 +336,7 @@ export default {
       needExecuteNode: false, // 是否需要显示执行目标
       needExecuteUser: false, // 是否需要显示执行用户
       needProtocol: false, // 是否需要显示协议
+      needRunnerGroup: false, // 是否需要显示执行器组
       filterSearchValue: {},
       jobNameForm: {
         maxlength: 50,
@@ -508,7 +509,7 @@ export default {
         .getActionDetail({id: this.combopId}).then((res) => {
           if (res.Status == 'OK') {
             this.dataConfig = res.Return;
-            let {config = {}, needExecuteNode = false, needExecuteUser = false, needProtocol = false, needRoundCount = false} = this.dataConfig || {};
+            let {config = {}, needExecuteNode = false, needExecuteUser = false, needProtocol = false, needRoundCount = false, needRunnerGroup = false} = this.dataConfig || {};
             let {executeConfig = {}, scenarioList = [], combopPhaseList = []} = config || {};
             let {executeUser: configexecuteUser, protocolId = null, executeNodeConfig = {}, runnerGroupTag = {}} = executeConfig || {};
             const {filter = {}} = executeNodeConfig;
@@ -517,6 +518,7 @@ export default {
             this.needExecuteUser = needExecuteUser;
             this.needProtocol = needProtocol;
             this.needRoundCount = needRoundCount;
+            this.needRunnerGroup = needRunnerGroup;
             this.executeConfig = executeConfig;
             if (this.executeConfig.whenToSpecify == 'runtime') { // 过滤器运行在执行，需要把执行目标值清空
               this.$set(this.executeConfig, 'executeNodeConfig', this.filterSearchValue || {});
diff --git a/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue b/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
index d661849e..03cdb41f 100644
--- a/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
+++ b/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
@@ -84,7 +84,7 @@
         {{ $t('page.autoexeccomboprunnergrouptagtips') }}
       </div>
     </TsFormItem>
-    <TsFormItem :label="$t('page.autoexeccomboprunnergrouplabel')">
+    <TsFormItem v-if="dataConfig.needRunnerGroup" :label="$t('page.autoexeccomboprunnergrouplabel')">
       <div>
         <template v-if="dataConfig && dataConfig.existRunnerOrSqlExecMode && runnerGroup">
           <template v-if="runnerGroup.mappingMode === 'runtimeparam'">
-- 
Gitee