diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue index c1d81f96bbf..bc322b59a29 100644 --- a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue +++ b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue @@ -126,7 +126,7 @@ key: 'parallelSetting', value: this.$t(`settings.runningOption.${runLockType ?? '--'}`) }, - ...(runLockType === 'group_lock' + ...(['group_lock', 'multiple'].includes(runLockType) ? [{ key: 'parallelConfDetail' }] @@ -135,30 +135,51 @@ ] }, parallelSettingRows () { + const runLockType = this.basicInfo?.runLockType?.toLowerCase?.() + if (runLockType === 'group_lock') { + return [ + { + key: 'concurrencyGroup', + label: 'group.groupName', + value: this.basicInfo?.concurrencyGroup ?? '--' + }, + { + key: 'concurrencyCancelInProgress', + label: 'settings.stopWhenNewCome', + value: this.$t(this.basicInfo?.concurrencyCancelInProgress ? 'true' : 'false') + }, + ...(!this.basicInfo?.concurrencyCancelInProgress + ? [ + { + key: 'maxQueueSize', + label: 'settings.largestNum', + value: this.basicInfo?.maxQueueSize ?? '--' + }, + { + key: 'waitQueueTimeMinute', + label: 'settings.lagestTime', + value: Number.isInteger(this.basicInfo?.waitQueueTimeMinute) ? `${this.basicInfo?.waitQueueTimeMinute}${this.$t('settings.minutes')}` : '--' + } + + ] + : [] + ) + ] + } + return [ - { - key: 'concurrencyGroup', - label: 'group.groupName', - value: this.basicInfo?.concurrencyGroup ?? '--' - }, - { - key: 'concurrencyCancelInProgress', - label: 'settings.stopWhenNewCome', - value: this.$t(this.basicInfo?.concurrencyCancelInProgress ? 'true' : 'false') - }, ...(!this.basicInfo?.concurrencyCancelInProgress ? [ { - key: 'maxQueueSize', - label: 'settings.largestNum', - value: this.basicInfo?.maxQueueSize ?? '--' + key: 'maxConRunningQueueSize', + label: 'settings.concurrentMaxConcurrency', + value: this.basicInfo?.maxConRunningQueueSize ?? '--' }, { key: 'waitQueueTimeMinute', - label: 'settings.lagestTime', + label: 'settings.concurrentTimeout', value: Number.isInteger(this.basicInfo?.waitQueueTimeMinute) ? `${this.basicInfo?.waitQueueTimeMinute}${this.$t('settings.minutes')}` : '--' } - ] : [] ) diff --git a/src/frontend/devops-pipeline/src/components/pipelineSetting/RunningLock.vue b/src/frontend/devops-pipeline/src/components/pipelineSetting/RunningLock.vue index 67b650f8867..b335569b7bb 100755 --- a/src/frontend/devops-pipeline/src/components/pipelineSetting/RunningLock.vue +++ b/src/frontend/devops-pipeline/src/components/pipelineSetting/RunningLock.vue @@ -55,6 +55,49 @@ {{ $t('settings.runningOption.multiple') }} + +