feat：流水线并发运行时，支持限制并发个数和排队 #10718

src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BaseConfig.vue

@@ -126,39 +126,60 @@
                         key: 'parallelSetting',
                         value: this.$t(`settings.runningOption.${runLockType ?? '--'}`)
                     },
-                    ...(runLockType === 'group_lock'
+                    ...(['group_lock', 'multiple'].includes(runLockType)
                         ? [{
                             key: 'parallelConfDetail'
                         }]
                         : []
                     )
                 ]
             },
-            parallelSettingRows () {
+            prarallelSettingRows () {
+                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')}` : '--'
                             }
-
                         ]
                         : []
                     )

src/frontend/devops-pipeline/src/components/pipelineSetting/RunningLock.vue

@@ -55,6 +55,49 @@
                             {{ $t('settings.runningOption.multiple') }}
                         </bk-radio>
                     </div>
+                </bk-radio-group>
+                <div
+                    v-if="isMultipleLock"
+                    class="single-lock-sub-form"
+                    :key="pipelineSetting.runLockType"
+                >
+                    <bk-form-item
+                        :label="$t('settings.concurrentMaxConcurrency')"
+                        error-display-type="normal"
+                        property="maxConRunningQueueSize"
+                    >
+                        <bk-input
+                            type="number"
+                            :disabled="!editable"
+                            :placeholder="$t('settings.maxConcurrencyPlaceholder')"
+                            v-model="pipelineSetting.maxConRunningQueueSize"
+                            @change="val => handleBaseInfoChange('maxConRunningQueueSize', val ? Number(val) : null)"
+                        />
+                    </bk-form-item>
+
+                    <bk-form-item
+                        :required="isMultipleLock"
+                        :label="$t('settings.concurrentTimeout')"
+                        error-display-type="normal"
+                        property="waitQueueTimeMinute"
+                    >
+                        <bk-input
+                            type="number"
+                            :disabled="!editable"
+                            :placeholder="$t('settings.itemPlaceholder')"
+                            v-model="pipelineSetting.waitQueueTimeMinute"
+                            @change="val => handleBaseInfoChange('waitQueueTimeMinute', val ? Number(val) : null)"
+                        >
+                            <template slot="append">
+                                <span class="pipeline-setting-unit">{{ $t('settings.minutes') }}</span>
+                            </template>
+                        </bk-input>
+                    </bk-form-item>
+                </div>
+                <bk-radio-group
+                    :value="pipelineSetting.runLockType"
+                    @change="handleLockTypeChange"
+                >
                     <div class="run-lock-radio-item">
                         <bk-radio
                             :disabled="!editable"
@@ -65,9 +108,10 @@
                     </div>
                 </bk-radio-group>
             </bk-form-item>
+
             <div
-                class="single-lock-sub-form"
                 v-if="isSingleLock"
+                class="single-lock-sub-form"
             >
                 <bk-form-item
                     :required="isSingleLock"
@@ -176,6 +220,9 @@
             isSingleLock () {
                 return [this.runTypeMap.GROUP, this.runTypeMap.SINGLE].includes(this.pipelineSetting?.runLockType)
             },
+            isMultipleLock () {
+                return [this.runTypeMap.MULTIPLE].includes(this.pipelineSetting?.runLockType)
+            },
             formRule () {
                 const requiredRule = {
                     required: this.isSingleLock,
@@ -202,9 +249,25 @@
                         {
                             validator: (val) => {
                                 const intVal = parseInt(val, 10)
-                                return !this.isSingleLock || (intVal <= 1440 && intVal >= 1)
+                                if (this.isSingleLock || this.isMultipleLock) {
+                                    return intVal <= 1440 && intVal >= 1
+                                }
+                                return true
+                            },
+                            message: `${this.isSingleLock
+                                ? this.$t('settings.lagestTime')
+                                : this.$t('settings.concurrentTimeout')
+                            }${this.$t('numberRange', [1, 1440])}`,
+                            trigger: 'blur'
+                        }
+                    ],
+                    maxConRunningQueueSize: [
+                        requiredRule,
+                        {
+                            validator: (val) => {
+                                return /^(?:[1-9]|[1-9][0-9]|1[0-9]{2}|200)$/.test(val)
                             },
-                            message: `${this.$t('settings.lagestTime')}${this.$t('numberRange', [1, 1440])}`,
+                            message: this.$t('settings.maxConRunningQueueSizeTips'),
                             trigger: 'blur'
                         }
                     ]

src/frontend/locale/pipeline/en-US.json

@@ -373,7 +373,11 @@
     "mdLink": "Markdown Link",
     "conCopySuc": "Copied Succeed",
     "additionDesc": "Description",
-    "voice": "Voice"
+    "voice": "Voice",
+    "concurrentMaxConcurrency": "Maximum Concurrency",
+    "concurrentTimeout": "Queue Timeout for Exceeding Limit",
+    "maxConRunningQueueSizeTips": "The range of maximum concurrency is between 1 and 200-200之间",
+    "maxConcurrencyPlaceholder": "Default to system settings when not specified"
   },
   "template": {
     "addTemplate": "New Template",

src/frontend/locale/pipeline/zh-CN.json

@@ -370,7 +370,11 @@
     "mdLink": "markdown链接",
     "conCopySuc": "内容复制成功",
     "additionDesc": "其他描述",
-    "voice": "语音"
+    "voice": "语音",
+    "concurrentMaxConcurrency": "最大可并发数",
+    "concurrentTimeout": "超限时排队，排队超时时间",
+    "maxConRunningQueueSizeTips": "最大可并发数范围在1-200之间",
+    "maxConcurrencyPlaceholder": "缺省时以系统设置为准"
   },
   "template": {
     "addTemplate": "新建模板",