diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue index d46b7c850f3bb9dbd1c9e20ad56e6c7e4525ab33..cfc58332f7c41ef121d242601e68ddb9ae61c39e 100644 --- a/src/views/pages/autoexec/components/script/script-list.vue +++ b/src/views/pages/autoexec/components/script/script-list.vue @@ -284,7 +284,6 @@ export default { let _this = this; _this.list.forEach(l => { if (l.uuid == id) { - console.log(config); Object.assign(l, config); } }); @@ -314,7 +313,7 @@ export default { childrendom.forEach(children => { if (children.__vue__ && children.__vue__.valid) { if (!children.__vue__.valid()) { - children.__vue__.$options.parent.step.isShow = true; + this.setShowStep(children.__vue__.$options.parent); isValid = false; } } @@ -323,6 +322,17 @@ export default { return isValid; } }, + setShowStep(parent) { //设置父级的显示 + if (parent) { + if (parent.step) { + parent.step.isShow = true; + } else { + if (parent.$options.parent) { + this.setShowStep(parent.$options.parent); + } + } + } + }, refreshProfile() { if (this.phaseOperationList && this.phaseOperationList.length) { this.phaseOperationList.forEach(item => { diff --git a/src/views/pages/autoexec/detail/action-detail.vue b/src/views/pages/autoexec/detail/action-detail.vue index f9c641668ce0459fb09c58ae366bd20c60a8d01c..9fee20c30d7c15a7ba9faaebf9b41a3ae15245ae 100644 --- a/src/views/pages/autoexec/detail/action-detail.vue +++ b/src/views/pages/autoexec/detail/action-detail.vue @@ -1256,7 +1256,7 @@ export default { if (p.operationName == 'native/IF-Block') { if (p.config) { !p.config.condition && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputcondition'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputcondition'), type: 'error', config: { stepName: step.name, @@ -1264,6 +1264,17 @@ export default { stepUuid: step.uuid } }); + if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) { + validList.push({ + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】:' + this.$t('term.deploy.chooseatleastonetool'), + type: 'error', + config: { + stepName: step.name, + validComponent: 'operation', + stepUuid: step.uuid + } + }); + } if (p.config.ifList && p.config.ifList.length) { let validIfList = this.validPhaseOperationList(step, p.config.ifList); validIfList.length && validList.push(...validIfList); @@ -1276,7 +1287,7 @@ export default { } else if (p.operationName == 'native/LOOP-Block') { if (p.config) { !p.config.loopItems && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopitems'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopitems'), type: 'error', config: { stepName: step.name, @@ -1285,7 +1296,7 @@ export default { } }); !p.config.loopItemVar && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopitemvar'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopitemvar'), type: 'error', config: { stepName: step.name, @@ -1294,7 +1305,7 @@ export default { } }); (!p.config.operations || p.config.operations.length == 0) && validList.push({ - text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopoperations'), + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopoperations'), type: 'error', config: { stepName: step.name, diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue index 6b51ec038b5514b227e6aec0dec63ed27b1a783f..b7330f1809d2eb43efd5a74974e8581fdc2dc558 100644 --- a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue +++ b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue @@ -119,7 +119,7 @@ export default { transfer: true, needCallback: false, border: 'border', - validateList: ['required'], + validateList: this.isRequired ? ['required'] : [], dealDataByUrl: this.$utils.getRunnerGroupList, dynamicUrl: '/api/rest/runnergroup/search', params: { diff --git a/src/views/pages/deploy/application-config/application-config-pipeline.vue b/src/views/pages/deploy/application-config/application-config-pipeline.vue index d9f0080f3b7fcf54b90d5f09dde00e5418aecfed..4735cdd5651e87289ff284efa1ab0ab494993574 100644 --- a/src/views/pages/deploy/application-config/application-config-pipeline.vue +++ b/src/views/pages/deploy/application-config/application-config-pipeline.vue @@ -608,6 +608,16 @@ export default { id: '#id_' + step.uuid + '_' + p.uuid, current: 1 }); + if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) { + validList.push({ + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】:' + this.$t('term.deploy.chooseatleastonetool'), + type: 'error', + stepUuid: step.uuid, + operationUuid: p.uuid, + id: '#id_' + step.uuid + '_' + p.uuid, + current: 1 + }); + } if (p.config.ifList && p.config.ifList.length) { let validIfList = this.validPhaseOperationList(step, p.config.ifList); validIfList.length && validList.push(...validIfList); diff --git a/src/views/pages/deploy/application-config/pipeline-detail.vue b/src/views/pages/deploy/application-config/pipeline-detail.vue index 87faa0940204f5c51b8ac974c2c787a8622976c1..bb2b6453c41b89c6ae1b854e62a83bae1cbaf1ad 100644 --- a/src/views/pages/deploy/application-config/pipeline-detail.vue +++ b/src/views/pages/deploy/application-config/pipeline-detail.vue @@ -934,6 +934,15 @@ export default { operationUuid: p.uuid, id: '#id_' + step.uuid + '_' + p.uuid }); + if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) { + validList.push({ + text: this.$t('page.phase') + step.name + '【' + p.operationName + '】:' + this.$t('term.deploy.chooseatleastonetool'), + type: 'error', + stepUuid: step.uuid, + operationUuid: p.uuid, + id: '#id_' + step.uuid + '_' + p.uuid + }); + } if (p.config.ifList && p.config.ifList.length) { let validIfList = this.validPhaseOperationList(step, p.config.ifList); validIfList.length && validList.push(...validIfList); 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 fbcdf1a04a83e92891ee7ad4a986f2657a087ea4..6172778d6a8a4edf17ecbf883953fda5b8c1f830 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 @@ -102,6 +102,7 @@ :config="executeConfig.runnerGroupTag" :disabled="!canEdit" :runtimeParamList="runtimeParamList" + :isRequired="false" >