diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 5bc242545f862e5ddbb423d927e138a4a763c1c4..c2804744078ffc7c9b54bfe26cd8c714e9ce9eeb 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -903,7 +903,8 @@
"setinputloopoperations": "Settings: Please enter at least one tool",
"runnergrouptagprocesstips": "If form assignment is required, please set the executor group to the \"Job Parameters\" type in the combination tool",
"runnergroupprocesstips": "If form assignment is required, please set the \"Executor Group\" to the \"Job Parameter\" type in the combination tool",
- "resetrunnerphase": "Reset phase or not"
+ "resetrunnerphase": "Reset phase or not",
+ "runnerGroupTooltip": "If the actuator group is not filled in here, the current stage will inherit the combination tool actuator group by default. If the actuator group is filled in here, the current stage will use the one filled in here; During execution, the executor group of the stage cannot be modified"
},
"framework": {
"roleauth": "Authorize immediately after creating the role",
@@ -2145,7 +2146,8 @@
"actuatorgrouptag": "Actuator group label",
"blueset": "Blue green setting",
"blueSet": "Blue Green",
- "ismodified": "Modified"
+ "ismodified": "Modified",
+ "presetrunnergroup": "Preset actuator group"
},
"inspect": {
"alarmprompt": "Alarm Prompt",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index f5f7fca3e3181a7fc77a19894b173aeededd143e..0bc48656898aab538e7f52c2672940e4d78ee266 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -903,7 +903,8 @@
"setinputloopoperations": "设置：请输入至少一个工具",
"runnergrouptagprocesstips": "如果需要表单赋值，请在组合工具设置“执行器组标签”为“作业参数”类型",
"runnergroupprocesstips": "如果需要表单赋值，请在组合工具设置“执行器组”为“作业参数”类型",
- "resetrunnerphase": "是否重置阶段"
+ "resetrunnerphase": "是否重置阶段",
+ "runnerGroupTooltip": "若此处不填写执行器组，当前阶段默认继承组合工具执行器组，若此处填写执行器组，当前阶段将采用此处填写的；执行时，不可修改阶段的执行器组"
},
"framework": {
"roleauth": "创建完角色立即授权",
@@ -2142,7 +2143,8 @@
"actuatorgrouptag": "执行器组标签",
"blueset": "蓝绿设置",
"blueSet": "蓝绿",
- "ismodified": "已修改"
+ "ismodified": "已修改",
+ "presetrunnergroup": "预设执行器组"
},
"inspect": {
"alarmprompt": "告警提示",
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 3ac4dfccf2b6b4e73623e64411e276a5e3363762..ddc12d27a3bcba8dc923d9ce9fcf31d39e31bbd9 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
@@ -98,29 +98,41 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -268,6 +280,7 @@ export default {
roundCount: null,
isPresetExecuteConfig: 0,
executeNodeConfig: {},
+ isPresetRunnerGroup: 0,
runnerGroup: null,
runnerGroupTag: null
@@ -276,7 +289,8 @@ export default {
resultList: [], //校验结果
validateList: ['required'],
executePolicyList: [],
- executeTooltip: this.$t('term.autoexec.executeTooltip')
+ executeTooltip: this.$t('term.autoexec.executeTooltip'),
+ runnerGroupTooltip: this.$t('term.autoexec.runnerGroupTooltip')
};
},
beforeCreate() {},
@@ -293,6 +307,9 @@ export default {
this.executeConfig[key] = this.config.config.executeConfig[key];
}
});
+ if (!this.$utils.isEmpty(this.executeConfig.runnerGroup) || !this.$utils.isEmpty(this.executeConfig.runnerGroupTag)) {
+ this.$set(this.executeConfig, 'isPresetRunnerGroup', 1);
+ }
}
}
for (let key in this.formItem) {
@@ -334,7 +351,7 @@ export default {
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.editConfig.execMode === 'runner' ? this.executeConfig : {});
+ this.$emit('close', editConfig, this.executeConfig.isPresetExecuteConfig || this.executeConfig.isPresetRunnerGroup ? this.executeConfig : {});
}
},
checkExist(key, val) {
@@ -372,6 +389,7 @@ export default {
protocolId: '',
executeUser: {},
executeNodeConfig: {},
+ isPresetRunnerGroup: 0,
runnerGroup: null,
runnerGroupTag: null
};
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 c3384d1f89b134e4c79a202addf7cdeb4a0539e4..fbcdf1a04a83e92891ee7ad4a986f2657a087ea4 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
@@ -84,29 +84,39 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -233,13 +243,15 @@ export default {
roundCount: null,
isPresetExecuteConfig: 0,
executeNodeConfig: {},
+ isPresetRunnerGroup: 0,
runnerGroup: null,
runnerGroupTag: null
},
resultList: [], //执行目标校验结果
isValid: true, //校验结果通过
isShowTargetValid: false,
- executeTooltip: this.$t('term.autoexec.executeTooltip')
+ executeTooltip: this.$t('term.autoexec.executeTooltip'),
+ runnerGroupTooltip: this.$t('term.autoexec.runnerGroupTooltip')
};
},
beforeCreate() {},
@@ -266,6 +278,9 @@ export default {
this.executeConfig[key] = this.editConfig.config.executeConfig[key];
}
});
+ if (!this.$utils.isEmpty(this.executeConfig.runnerGroup) || !this.$utils.isEmpty(this.executeConfig.runnerGroupTag)) {
+ this.$set(this.executeConfig, 'isPresetRunnerGroup', 1);
+ }
}
}
for (let key in this.formItem) {
@@ -284,7 +299,7 @@ export default {
if (!this.isValid) {
return;
}
- if (this.executeConfig.isPresetExecuteConfig || this.editConfig.execMode === 'runner') {
+ if (this.executeConfig.isPresetExecuteConfig || this.executeConfig.isPresetRunnerGroup) {
this.saveExecuteNodeConfig();
} else if (this.editConfig.config) {
this.$set(this.editConfig.config, 'executeConfig', {});