Merge pull request #11106 from vhwweng/issue_9820_

feat：第三方构建机支持使用 dcoker 运行构建任务 #9820
TencentBlueKing · Oct 21, 2024 · 5f6d68a · 5f6d68a
2 parents dd483c3 + 419a8ec
commit 5f6d68a
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/LinuxOsDockerImage.vue b/src/frontend/devops-pipeline/src/components/ContainerPropertyPanel/LinuxOsDockerImage.vue
@@ -277,31 +277,46 @@
         methods: {
             handleeEnableDockerChange () {
                 this.enableDocker = !this.enableDocker
-                const dockerInfo = this.enableDocker
+                let { dispatchType } = this.container
+                dispatchType = this.enableDocker
                     ? {
-                        imageType: 'THIRD'
+                        ...dispatchType,
+                        dockerInfo: {
+                            ...dispatchType.dockerInfo,
+                            imageType: 'THIRD'
+                        }
+                    }
+                    : {
+                        ...dispatchType,
+                        dockerInfo: undefined
                     }
-                    : {}
                 this.handleContainerChange(
                     'dispatchType',
                     Object.assign({
-                        ...this.container.dispatchType,
-                        dockerInfo
+                        ...dispatchType
                     })
                 )
             },
 
             changeImageType (name, value) {
+                const dockerInfo = {
+                    ...this.container.dispatchType?.dockerInfo,
+                    [name]: value
+                }
+
+                if (value !== 'THIRD') {
+                    dockerInfo.image = ''
+                    dockerInfo.credential = ''
+                } else {
+                    dockerInfo.storeImage = undefined
+                }
+
                 this.handleContainerChange(
                     'dispatchType',
                     Object.assign({
                         ...this.container.dispatchType,
                         dockerInfo: {
-                            ...this.container.dispatchType.dockerInfo,
-                            image: value === 'THIRD' ? this.container.dispatchType.dockerInfo.image : '',
-                            credential: value === 'THIRD' ? this.container.dispatchType.dockerInfo.credential : '',
-                            storeImage: value === 'THIRD' ? {} : this.container.dispatchType.dockerInfo.storeImage,
-                            [name]: value
+                            ...dockerInfo
                         }
                     })
                 )