diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue index 29dcfb02d959c18199b91382cc8eee33a9786318..60348149ab1ceb3f989c5b51bb07088b26af36fe 100644 --- a/src/views/pages/autoexec/quick-service/catalog/service.vue +++ b/src/views/pages/autoexec/quick-service/catalog/service.vue @@ -54,14 +54,15 @@ @@ -1064,7 +1065,7 @@ export default { }, valid() { let isValid = true; - let formList = ['basicForm', 'scenarioForm', 'roundCountForm', 'executeTarget', 'executeUserForm', 'protocolForm']; + let formList = ['basicForm', 'scenarioForm', 'roundCountForm', 'executeTarget', 'executeUserForm', 'protocolForm', 'parallelCountForm', 'parallelPolicy']; let jobParamFormList = this.$refs.jobParamForm || []; let mappingModeFormList = ['roundCountmappingMode', 'executeNodemappingMode', 'protocolmappingMode', 'executeUsermappingMode']; // 映射关系下拉列表 !this.$utils.isEmpty(formList) && @@ -1302,6 +1303,10 @@ export default { .finally(() => { this.loadingShow = false; }); + }, + changeParallelPolicy(val) { + this.roundCount.value = null; + this.parallelCount.value = null; } }, filter: {}, 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 2d4bf3f6025cf71b49071b1db1e626175c94557c..c93672edcb05b7dff036a21d83abb7c9bad6b9b8 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 @@ -47,7 +47,7 @@ > -
+
- - - + +
@@ -295,7 +308,9 @@ export default { executeNodeConfig: false, runtimeParamList: false, runnerGroupTag: false, // 执行器组标签 - runnerGroup: false // 执行器组 + runnerGroup: false, // 执行器组 + parallelCount: false, + parallelPolicy: false }, valueConfig: {}, //所有值对应的集合 itemConfig: {}, //所以组件对应的渲染config集合 @@ -352,7 +367,23 @@ export default { // 执行账户 validateList: ['required'] }, - isReady: false + isReady: false, + parallelPolicy: { + value: '' + }, + parallelCount: null, + parallelCountForm: { + // 分批数量 + dataList: this.$utils.getRoundCountList(), + border: 'border', + filterName: 'text', + labelWidth: 0, + hideLabel: true, + search: true, + transfer: true, + desc: this.$t('term.autoexec.paralldesc'), + validateList: ['required', 'maxNum'] + } }; }, beforeCreate() {}, @@ -422,6 +453,7 @@ export default { this.paramKeyList = []; // 没有设置执行目标key值 this.needExecuteUser = ''; this.needProtocol = ''; + this.parallelCount = null; }, async initData() { // 初始化 @@ -443,6 +475,9 @@ export default { this.$set(this.hasServiceValue, [key], true); } } + if (key === 'parallelPolicy') { + this.parallelPolicy = config.parallelPolicy; + } } if (!this.$utils.isEmpty(runtimeParamList)) { // 作业参数映射关系为不设置时,需要把对应作业参数显示出来 @@ -585,6 +620,9 @@ export default { if (!this.$utils.isEmpty(this.runnerGroupTag)) { params.runnerGroupTag = this.runnerGroupTag; } + if (this.parallelCount) { + params.parallelCount = this.parallelCount; + } return params; }, valid() { 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 4549aee5aed2cd9fcf3cfe483a8239ca9f1b2238..d661849e9986d3211a484334043c5a41ecc8d405 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 @@ -251,6 +251,21 @@ export default { readonly: true } }, + { + name: 'parallelCount', + label: this.$t('term.autoexec.parall'), + constantMappingMode: { + type: 'select', + dataList: this.$utils.getRoundCountList(), + border: 'border', + filterName: 'text', + allowCreate: true, + search: true, + transfer: true, + desc: this.$t('term.autoexec.paralldesc'), + readonly: true + } + }, { label: this.$t('page.protocol'), name: 'protocol', @@ -435,6 +450,20 @@ export default { }); } } + this.otherParamItemList.forEach(item => { + let isHidden = false; + if (item.name === 'roundCount') { + if (this.otherParamFormValue.parallelPolicy === 'parallel' || this.$utils.isEmpty(this.otherParamFormValue.roundCount)) { + isHidden = true; + } + } + if (item.name === 'parallelCount') { + if (this.otherParamFormValue.parallelPolicy === 'roundCount' || this.$utils.isEmpty(this.otherParamFormValue.parallelCount)) { + isHidden = true; + } + } + item.isHidden = isHidden; + }); } } this.$nextTick(() => {