From 6ac32a85f4a8209245ca30bd970ff4224c31f211 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 16 May 2025 15:21:40 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[1417233421533184]?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96-=E9=98=B6=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E8=AE=BE=E8=A6=81=E6=94=AF=E6=8C=81=EF=BC=8Crunner?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E6=8C=87=E5=AE=9A=E5=92=8C=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=9A=84=E6=8C=87=E5=AE=9A=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/14172334215?=
 =?UTF-8?q?33184?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actionDetail/runnergroup-setting.vue      |   2 +
 .../actionDetail/runnergrouptag-setting.vue   |   3 +-
 .../actionDetail/step/edit/step-edit.vue      | 128 ++++++++++++------
 .../config/env/env-instance-edit.vue          |   5 +-
 .../pipeline/step/step-edit.vue               | 116 ++++++++++------
 .../pipeline/step/step-list.vue               |   4 +-
 6 files changed, 170 insertions(+), 88 deletions(-)

diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
index c2c946771..6b51ec038 100644
--- a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
@@ -7,6 +7,7 @@
           :dataList="mappingModeList"
           :disabled="disabled"
           :clearable="false"
+          border="border"
           transfer
           @change="changeMappingMode"
         ></TsFormSelect>
@@ -22,6 +23,7 @@
           :firstText="$t('term.autoexec.jobparam')"
           :firstSelect="false"
           :firstLi="isEditRuntimeParam"
+          border="border"
           @first="gotoAddParameter"
         ></TsFormSelect>
         <TsFormSelect
diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
index 7744a5a07..fcd20939b 100644
--- a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
@@ -7,6 +7,7 @@
           :dataList="mappingModeList"
           :disabled="disabled"
           :clearable="false"
+          border="border"
           transfer
           @change="changeMappingMode"
         ></TsFormSelect>
@@ -21,6 +22,7 @@
           transfer
           :firstText="$t('term.autoexec.jobparam')"
           :firstSelect="false"
+          border="border"
           :firstLi="isEditRuntimeParam"
           @first="gotoAddParameter"
         ></TsFormSelect>
@@ -55,7 +57,6 @@
   </div>
 </template>
 <script>
-import { sync } from '../../../pbc/policy/phase';
 export default {
   name: '',
   inject: {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
index bd4d91cf5..3ac4dfccf 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
@@ -53,48 +53,76 @@
               ></TsFormSelect>
             </TsFormItem>
           </div>
-          <div v-if="editConfig.execMode !='runner' && editConfig.execMode !='sqlfile' && (!groupConfig || groupConfig.policy !='grayScale')" class="mt-lg">
-            <TsFormItem
-              :label="$t('term.deploy.presetexecutiontarget')"
-              labelPosition="left"
-              :labelWidth="115"
-              :tooltip="executeTooltip"
-            >
-              <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
-            </TsFormItem>
-            <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
-              <TsForm
-                ref="executeForm"
-                v-model="executeConfig"
-                :itemList="executeForm"
+          <template v-if="!groupConfig || groupConfig.policy !='grayScale'">
+            <div v-if="editConfig.execMode !='runner' && editConfig.execMode !='sqlfile'" class="mt-lg">
+              <TsFormItem
+                :label="$t('term.deploy.presetexecutiontarget')"
                 labelPosition="left"
-                tipPlacement="right"
                 :labelWidth="115"
+                :tooltip="executeTooltip"
               >
-                <template v-slot:executeUser>
-                  <ExecuteuserSetting
-                    ref="executeUser"
-                    :config="executeConfig.executeUser"
-                    :disabled="!canEdit"
-                    :runtimeParamList="runtimeParamList"
-                  ></ExecuteuserSetting>
-                </template>
-              </TsForm>
-              <div class="pt-nm">
-                <TargetDetail
-                  :id="id"
-                  ref="targetDetail"
-                  :canEdit="canEdit"
-                  :config="executeConfig.executeNodeConfig"
-                  :isAddParam="true"
+                <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
+              </TsFormItem>
+              <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
+                <TsForm
+                  ref="executeForm"
+                  v-model="executeConfig"
+                  :itemList="executeForm"
+                  labelPosition="left"
+                  tipPlacement="right"
                   :labelWidth="115"
-                  :isAddPrenode="prevStepList.length > 0 ? true : false"
-                  :prevStepList="prevStepList"
+                >
+                  <template v-slot:executeUser>
+                    <ExecuteuserSetting
+                      ref="executeUser"
+                      :config="executeConfig.executeUser"
+                      :disabled="!canEdit"
+                      :runtimeParamList="runtimeParamList"
+                    ></ExecuteuserSetting>
+                  </template>
+                </TsForm>
+                <div class="pt-nm">
+                  <TargetDetail
+                    :id="id"
+                    ref="targetDetail"
+                    :canEdit="canEdit"
+                    :config="executeConfig.executeNodeConfig"
+                    :isAddParam="true"
+                    :labelWidth="115"
+                    :isAddPrenode="prevStepList.length > 0 ? true : false"
+                    :prevStepList="prevStepList"
+                    :runtimeParamList="runtimeParamList"
+                  ></TargetDetail>
+                </div>
+              </template>
+            </div>
+            <div v-if="editConfig.execMode ==='runner'">
+              <TsFormItem
+                :label="$t('term.deploy.actuatorgrouptag')"
+                labelPosition="left"
+                :labelWidth="115"
+              >
+                <RunnerGroupTagSetting
+                  ref="runnerGroupTag"
+                  :config="executeConfig.runnerGroupTag"
+                  :disabled="!canEdit"
                   :runtimeParamList="runtimeParamList"
-                ></TargetDetail>
-              </div>
-            </template>
-          </div>
+                ></RunnerGroupTagSetting>
+              </TsFormItem>
+              <TsFormItem
+                :label="$t('page.autoexeccomboprunnergrouplabel')"
+                labelPosition="left"
+                :labelWidth="115"
+              >
+                <RunnerGroupSetting
+                  ref="runnerGroup"
+                  :config="executeConfig.runnerGroup"
+                  :disabled="!canEdit"
+                  :runtimeParamList="runtimeParamList"
+                ></RunnerGroupSetting>
+              </TsFormItem>
+            </div>
+          </template>
         </div>
       </template>
       <template v-slot:footer>
@@ -130,7 +158,9 @@ export default {
     TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
-    ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue')
+    ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'),
+    RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
+    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue')
   },
   filters: {},
   props: {
@@ -237,7 +267,10 @@ export default {
         executeUser: {},
         roundCount: null,
         isPresetExecuteConfig: 0,
-        executeNodeConfig: {}
+        executeNodeConfig: {},
+        runnerGroup: null,
+        runnerGroupTag: null
+
       },
       isValid: false, // 校验执行目标
       resultList: [], //校验结果
@@ -289,12 +322,19 @@ export default {
       } else {
         this.executeConfig.executeNodeConfig = {};
       }
+      if (this.$refs.runnerGroupTag) {
+        this.$set(this.executeConfig, 'runnerGroupTag', this.$refs.runnerGroupTag.save());
+      }
+      if (this.$refs.runnerGroup) {
+        this.$set(this.executeConfig, 'runnerGroup', this.$refs.runnerGroup.save());
+      }
+   
       if (this.$refs.form.valid()) {
         let editConfig = this.$utils.deepClone(this.editConfig);
         if (editConfig.policy && (!this.groupConfig || this.groupConfig.policy != 'grayScale' || (this.editConfig.execMode && this.editConfig.execMode != 'runner' && this.editConfig.execMode != 'sqlfile'))) {
           this.$delete(editConfig, 'policy');
         }
-        this.$emit('close', editConfig, this.executeConfig.isPresetExecuteConfig ? this.executeConfig : {});
+        this.$emit('close', editConfig, this.executeConfig.isPresetExecuteConfig || this.editConfig.execMode === 'runner' ? this.executeConfig : {});
       }
     },
     checkExist(key, val) {
@@ -326,14 +366,14 @@ export default {
       }
     },
     toggleExecuteForm(type) {
-      let _this = this;
       //runner方式的阶段无需选执行目标；其他方式需要（非必选)
       if (type == 'runner') {
-        _this.executeConfig = {
+        this.executeConfig = {
           protocolId: '',
           executeUser: {},
-          isPresetExecuteConfig: 0,
-          executeNodeConfig: {}
+          executeNodeConfig: {},
+          runnerGroup: null,
+          runnerGroupTag: null
         };
       }
     },
diff --git a/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue b/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
index 6fa4cc959..07df4adb5 100644
--- a/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
@@ -64,7 +64,8 @@ export default {
             },
             {
               text: this.$t('term.deploy.selectexistexample'),
-              value: 2
+              value: 2,
+              description: '1. 应用环境和关联模块数据为空的实例\n2. 应用环境为当前环境且关联模块数据为空的实例\n3. 应用环境数据为空且关联模块为当前模块的实例'
             }
           ],
           validateList: ['required'],
@@ -103,7 +104,7 @@ export default {
           multiple: true,
           transfer: true,
           validateList: ['required'],
-          params: {...this.params, isAutoConfig: 0},
+          params: {...this.params},
           rootName: 'tbodyList',
           dynamicUrl: 'api/rest/deploy/app/config/instance/search',
           dealDataByUrl: (list) => this.dealDataByUrl(list)
diff --git a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue
index dde31bebf..c3384d1f8 100644
--- a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue
+++ b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue
@@ -41,46 +41,74 @@
               ></TsFormSelect>
             </TsFormItem>
           </div>
-          <div v-if="envId && editConfig.execMode !='runner' && editConfig.execMode !='sqlfile' && (!groupConfig || groupConfig.policy !='grayScale')" class="mt-lg">
-            <TsFormItem
-              :label="$t('term.deploy.presetexecutiontarget')"
-              labelPosition="left"
-              :labelWidth="115"
-              :tooltip="executeTooltip"
-            >
-              <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
-            </TsFormItem>
-            <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
-              <TsForm
-                ref="executeForm"
-                v-model="executeConfig"
-                :itemList="executeForm"
+          <template v-if="envId && (!groupConfig || groupConfig.policy !='grayScale')">
+            <div v-if="editConfig.execMode !='runner' && editConfig.execMode !='sqlfile'" class="mt-lg">
+              <TsFormItem
+                :label="$t('term.deploy.presetexecutiontarget')"
                 labelPosition="left"
-                tipPlacement="right"
                 :labelWidth="115"
+                :tooltip="executeTooltip"
               >
-                <template v-slot:executeUser>
-                  <ExecuteuserSetting
-                    ref="executeUser"
-                    :config="executeConfig.executeUser"
-                    :disabled="!canEdit"
+                <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
+              </TsFormItem>
+              <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
+                <TsForm
+                  ref="executeForm"
+                  v-model="executeConfig"
+                  :itemList="executeForm"
+                  labelPosition="left"
+                  tipPlacement="right"
+                  :labelWidth="115"
+                >
+                  <template v-slot:executeUser>
+                    <ExecuteuserSetting
+                      ref="executeUser"
+                      :config="executeConfig.executeUser"
+                      :disabled="!canEdit"
+                      :runtimeParamList="runtimeParamList"
+                      :isEditRuntimeParam="false"
+                    ></ExecuteuserSetting>
+                  </template>
+                </TsForm>
+                <div class="pt-nm">
+                  <TargetDetail
+                    ref="targetDetail"
                     :runtimeParamList="runtimeParamList"
-                    :isEditRuntimeParam="false"
-                  ></ExecuteuserSetting>
-                </template>
-              </TsForm>
-              <div class="pt-nm">
-                <TargetDetail
-                  ref="targetDetail"
+                    :canEdit="canEdit"
+                    :config="executeConfig.executeNodeConfig"
+                    :isAddParam="true"
+                    :labelWidth="115"
+                  ></TargetDetail>
+                </div>
+              </template>
+            </div>
+            <div v-if="editConfig.execMode ==='runner'">
+              <TsFormItem
+                :label="$t('term.deploy.actuatorgrouptag')"
+                labelPosition="left"
+                :labelWidth="115"
+              >
+                <RunnerGroupTagSetting
+                  ref="runnerGroupTag"
+                  :config="executeConfig.runnerGroupTag"
+                  :disabled="!canEdit"
                   :runtimeParamList="runtimeParamList"
-                  :canEdit="canEdit"
-                  :config="executeConfig.executeNodeConfig"
-                  :isAddParam="true"
-                  :labelWidth="115"
-                ></TargetDetail>
-              </div>
-            </template>
-          </div>
+                ></RunnerGroupTagSetting>
+              </TsFormItem>
+              <TsFormItem
+                :label="$t('page.autoexeccomboprunnergrouplabel')"
+                labelPosition="left"
+                :labelWidth="115"
+              >
+                <RunnerGroupSetting
+                  ref="runnerGroup"
+                  :config="executeConfig.runnerGroup"
+                  :disabled="!canEdit"
+                  :runtimeParamList="runtimeParamList"
+                ></RunnerGroupSetting>
+              </TsFormItem>
+            </div>
+          </template>
         </div>
       </template>
       <template v-slot:footer>
@@ -114,7 +142,9 @@ export default {
     TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
     TargetDetail: () => import('@/views/pages/autoexec/components/common/addTarget/target-detail'),
     TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue'),
-    ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue')
+    ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'),
+    RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
+    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue')
   },
   props: {
     canEdit: {
@@ -202,7 +232,9 @@ export default {
         executeUser: {},
         roundCount: null,
         isPresetExecuteConfig: 0,
-        executeNodeConfig: {}
+        executeNodeConfig: {},
+        runnerGroup: null,
+        runnerGroupTag: null
       },
       resultList: [], //执行目标校验结果
       isValid: true, //校验结果通过
@@ -252,7 +284,7 @@ export default {
         if (!this.isValid) {
           return;
         }
-        if (this.executeConfig.isPresetExecuteConfig) {
+        if (this.executeConfig.isPresetExecuteConfig || this.editConfig.execMode === 'runner') {
           this.saveExecuteNodeConfig();
         } else if (this.editConfig.config) {
           this.$set(this.editConfig.config, 'executeConfig', {});
@@ -353,11 +385,17 @@ export default {
       if (this.$refs.executeUser) {
         this.$set(this.executeConfig, 'executeUser', this.$refs.executeUser.save());
       }
+      if (this.$refs.runnerGroupTag) {
+        this.$set(this.executeConfig, 'runnerGroupTag', this.$refs.runnerGroupTag.save());
+      }
+      if (this.$refs.runnerGroup) {
+        this.$set(this.executeConfig, 'runnerGroup', this.$refs.runnerGroup.save());
+      }
       if (this.$refs.targetDetail) {
         let executeNodeConfig = this.$refs.targetDetail.save();
         this.executeConfig.executeNodeConfig = executeNodeConfig;
-        this.$set(this.editConfig.config, 'executeConfig', this.executeConfig);
       }
+      this.$set(this.editConfig.config, 'executeConfig', this.executeConfig);
     },
     saveValid() {
       this.saveExecuteNodeConfig();
diff --git a/src/views/pages/deploy/application-config/pipeline/step/step-list.vue b/src/views/pages/deploy/application-config/pipeline/step/step-list.vue
index 3c93a339f..ca8d9baa1 100644
--- a/src/views/pages/deploy/application-config/pipeline/step/step-list.vue
+++ b/src/views/pages/deploy/application-config/pipeline/step/step-list.vue
@@ -78,9 +78,9 @@
                           <span class="text-grey fz10">{{ getExecModeText(step.execMode) }}</span>
                         </div>
                         <div class="stepBtn" @click.stop>
-                          <!-- 阶段的增删：只能在应用层; 阶段的修改：应用层可以修改名称，模块层不能修改阶段，环境层只能修改执行目标 -->
+                          <!-- 阶段的增删：只能在应用层; 阶段的修改：应用层可以修改名称，模块层不能修改阶段;环境层只能修改执行目标且阶段必须重载 -->
                           <i v-if="canEdit && !appModuleId && !envId" class="tsfont-plus text-tip-active" @click="editStep('add', step, sindex)"></i>
-                          <i v-if="canEdit && (envId || (appSystemId && !appModuleId && !envId))" class="tsfont-edit text-tip-active pl-md" @click="editStep('edit', step, sindex)"></i>
+                          <i v-if="canEdit && ((envId && step.hasOwnProperty('override') && step.override) || (appSystemId && !appModuleId && !envId))" class="tsfont-edit text-tip-active pl-md" @click="editStep('edit', step, sindex)"></i>
                           <i v-if="canEdit && !appModuleId && !envId" class="tsfont-trash-o text-tip-active pl-md" @click="delStep(step,sindex)"></i>
                           <i class="text-tip-active pl-md" :class="step.isShow? 'tsfont-up' : 'tsfont-down'" @click="showStep(step)"></i>
                         </div>
-- 
Gitee