Merge pull request #10138 from vhwweng/issue_10019

feat：支持插件开发者设置默认的超时时间和默认的失败时的策略 #10019
TencentBlueKing · May 30, 2024 · a853527 · a853527
2 parents d2bb605 + 89c7827
commit a853527
Show file tree

Hide file tree

Showing 3 changed files with 194 additions and 173 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/AtomContent.vue b/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/AtomContent.vue
@@ -103,6 +103,7 @@
                         <atom-option
                             v-if="element['@type'] !== 'manualTrigger'"
                             :element-index="elementIndex"
+                            :atom-props-model="atom.atomModal.props"
                             :container-index="containerIndex"
                             :stage-index="stageIndex"
                             :element="element"

diff --git a/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/AtomOption.vue b/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/AtomOption.vue
@@ -36,6 +36,9 @@
             atomVersion () {
                 return this.element.version
             },
+            atomOptionConfig () {
+                return this.atomPropsModel.config || {}
+            },
             optionModel () {
                 const model = { ...this.ATOM_OPTION }
                 const failControlManualRetryOption = {