From c4e3133c2a90bcfca02ec0dfa961dda65df013df Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 25 Sep 2025 11:02:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20#[15180131094691?=
 =?UTF-8?q?84]=E9=9B=86=E6=88=90=E5=8F=91=E5=B8=83-=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=9A=E8=B6=85=E7=BA=A7=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF=E7=89=88=E6=9C=AC=E6=A0=A1=E9=AA=8C=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?Bug=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050?=
 =?UTF-8?q?947543040/939050947543057/1518013109469184?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/deploy/schedule/components/params/pipeline.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/deploy/schedule/components/params/pipeline.vue b/src/views/pages/deploy/schedule/components/params/pipeline.vue
index cb5f5098..cae7d57c 100644
--- a/src/views/pages/deploy/schedule/components/params/pipeline.vue
+++ b/src/views/pages/deploy/schedule/components/params/pipeline.vue
@@ -16,7 +16,7 @@
         </div>
       </template>
       <template v-slot:version="{ row, index }">
-        <div v-if="row._selected">
+        <div v-if="row._selected && (row.isHasBuildTypeTool == 1 || row.isHasDeployTypeTool == 1)">
           <div class="grid">
             <TsFormSelect
               :ref="'version' + index"
@@ -202,7 +202,7 @@ export default {
   computed: {
     versionValidateList() {
       return row => {
-        if (row._selected) {
+        if (row._selected && (row.isHasBuildTypeTool == 1 || row.isHasDeployTypeTool == 1)) {
           return [{ name: 'required', message: ' ' }];
         } else {
           return [];
-- 
Gitee


From 6ffc6218a7cf6d235a49213326af7b0522a5c2a8 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 25 Sep 2025 11:47:21 +0800
Subject: [PATCH 2/3] commit

---
 src/views/pages/deploy/schedule/components/job-base-info.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/pages/deploy/schedule/components/job-base-info.vue b/src/views/pages/deploy/schedule/components/job-base-info.vue
index 59d5b85a..d6c4e00f 100644
--- a/src/views/pages/deploy/schedule/components/job-base-info.vue
+++ b/src/views/pages/deploy/schedule/components/job-base-info.vue
@@ -237,7 +237,6 @@ export default {
     },
     getDisabledText(item, type) {
       let text = false;
-      console.log(type);
       if (!item.isHasAllAuthority && (type == 'appsystem' || type == 'app')) {
         if (type == 'appsystem') {
           if (item.isHasAuthPipeline) {
-- 
Gitee


From 323e7eba06f8756c8d85f466a9d0f315705b01fd Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 25 Sep 2025 14:47:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[15180131094691?=
 =?UTF-8?q?84]=E9=9B=86=E6=88=90=E5=8F=91=E5=B8=83-=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=9A=E8=B6=85=E7=BA=A7=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF=E7=89=88=E6=9C=AC=E6=A0=A1=E9=AA=8C=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?Bug=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050?=
 =?UTF-8?q?947543040/939050947543057/1518013109469184?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/pipeline/add-deployjob-form.vue    | 160 ++----------------
 1 file changed, 12 insertions(+), 148 deletions(-)

diff --git a/src/views/pages/deploy/pipeline/add-deployjob-form.vue b/src/views/pages/deploy/pipeline/add-deployjob-form.vue
index b6c16b89..32f520d4 100644
--- a/src/views/pages/deploy/pipeline/add-deployjob-form.vue
+++ b/src/views/pages/deploy/pipeline/add-deployjob-form.vue
@@ -8,44 +8,10 @@
         :labelWidth="90"
       >
         <template v-slot:moduleList>
-          <TsTable
-            v-if="appSystemModuleEnvList.length"
-            :theadList="theadList"
-            :multiple="true"
-            :canSelectRow="false"
-            :tbodyList="appSystemModuleEnvList"
-            @getSelected="getSelectedAppSystemModuleVersion"
-          >
-            <template v-slot:envScenario="{ row }">
-              <div style="while-space:normal">
-                <Tag v-for="(envscenario, index) in row.envScenarioList" :key="index">{{ envscenario.envName }}（{{ envscenario.scenarioName }}）</Tag>
-              </div>
-            </template>
-            <template v-slot:version="{ row, index }">
-              <div v-if="row._selected && (row.isHasBuildTypeTool == 1 || row.isHasDeployTypeTool == 1)" class="grid">
-                <div>
-                  <TsFormSelect
-                    :ref="'version' + index"
-                    v-model="row.versionId"
-                    v-bind="getVersionSelectConfig(row)"
-                    transfer
-                    :validateList="versionValidateList(row)"
-                    @first="addVersion(row)"
-                    @change="
-                      versionId => {
-                        setVersionId(row, versionId);
-                      }
-                    "
-                  ></TsFormSelect>
-                </div>
-                <div v-if="versionValidateList(row).length > 0" class="text-error">*</div>
-              </div>
-            </template>
-          </TsTable>
+          <Pipeline ref="moduleList" :baseParams="jobData"></Pipeline>
         </template>
       </TsForm>
     </div>
-    <VersionDialog v-if="isVersionDialogShow" :jobTemplateData="currentJobTemplate" @close="closeVersionDialog"></VersionDialog>
   </div>
 </template>
 <script>
@@ -53,28 +19,14 @@ export default {
   name: '',
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
-    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    VersionDialog: () => import('./version-dialog.vue')
+    Pipeline: () => import('@/views/pages/deploy/schedule/components/params/pipeline.vue')
   },
   props: {
     id: { type: Number }
   },
   data() {
     return {
-      isVersionDialogShow: false,
-      currentJobTemplate: null,
       jobData: { pipelineId: this.id, appSystemModuleVersionList: [], triggerType: 'manual'},
-      theadList: [
-        {
-          key: 'selection'
-        },
-        { key: 'appSystemAbbrName', title: this.$t('page.apply') },
-        { key: 'appModuleAbbrName', title: this.$t('page.module') },
-        { key: 'envScenario', title: this.$t('term.deploy.envscene') },
-        { key: 'version', title: this.$t('page.versions'), width: 250 }
-      ],
-      appSystemModuleEnvList: [],
       pipelineData: {},
       formConfig: {
         name: {
@@ -118,7 +70,6 @@ export default {
   },
   beforeCreate() {},
   created() {
-    this.listPipelineAppSystemModuleEnvScenario();
     this.jobData.planStartTime = (new Date()).getTime() + 60 * 10 * 1000; //默认十分钟之后
   },
   beforeMount() {},
@@ -132,93 +83,11 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    setVersionId(row, versionId) {
-      this.jobData.appSystemModuleVersionList.forEach(element => {
-        if (element.appSystemId == row.appSystemId && element.appModuleId == row.appModuleId) {
-          this.$set(element, 'versionId', versionId);
-        }
-      });
-    },
-    getSelectedAppSystemModuleVersion(indexList, itemList) {
-      this.jobData.appSystemModuleVersionList = [];
-      if (itemList && itemList.length > 0) {
-        itemList.forEach(item => {
-          this.jobData.appSystemModuleVersionList.push({
-            appSystemId: item.appSystemId,
-            appModuleId: item.appModuleId,
-            versionId: item.versionId
-          });
-        });
-      }
-    },
-    getVersionSelectConfig(jobTemplate) {
-      return {
-        dynamicUrl: '/api/rest/deploy/version/search',
-        params: {
-          appSystemIdList: [jobTemplate.appSystemId],
-          appModuleIdList: [jobTemplate.appModuleId]
-        },
-        rootName: 'tbodyList',
-        transfer: true,
-        search: true,
-        dealDataByUrl: this.dealDataFilter,
-        firstSelect: false,
-        firstText: this.$t('page.versions'),
-        firstLi: true
-      };
-    },
-    addVersion(row) {
-      this.isVersionDialogShow = true;
-      this.currentJobTemplate = row;
-    },
-    closeVersionDialog(needRefresh) {
-      this.isVersionDialogShow = false;
-      if (needRefresh) {
-        //
-      }
-    },
-    dealDataFilter(nodeList) {
-      // 处理默认值的数据结构
-      let columlist = [];
-      nodeList.forEach(v => {
-        let text = v.version;
-        if (v.isFreeze) {
-          text += this.$t('term.deploy.sealededition');
-        } else {
-          text;
-        }
-        columlist.push({
-          text: text,
-          value: v.id,
-          _disabled: v.isFreeze
-        });
-      });
-      columlist.sort((d1, d2) => {
-        return d1._disabled - d2._disabled;
-      });
-      return columlist;
-    },
-    listPipelineAppSystemModuleEnvScenario() {
-      if (this.id) {
-        this.$api.deploy.pipeline.ListPipelineAppSystemModuleEnvScenario(this.id).then(res => {
-          this.appSystemModuleEnvList = res.Return;
-        });
-      } else {
-        this.appSystemModuleEnvList = [];
-      }
-    },
-    close() {
-      this.$emit('close');
-    },
     validateForm() {
       const form = this.$refs['form'];
       let isValid = true;
-      if (this.appSystemModuleEnvList && this.appSystemModuleEnvList.length > 0) {
-        this.appSystemModuleEnvList.forEach((item, index) => {
-          if (this.$refs['version' + index] && !this.$refs['version' + index].valid()) {
-            isValid = false;
-          }
-        });
+      if (this.$refs.moduleList && !this.$refs.moduleList.valid()) {
+        isValid = false;
       }
       if (form && !form.valid()) {
         isValid = false;
@@ -226,36 +95,31 @@ export default {
       return isValid;
     },
     async submitForm() {
+      if (this.$refs.moduleList) {
+        const data = this.$refs.moduleList.saveJobData();
+        this.$set(this.jobData, 'appSystemModuleVersionList', data.appSystemModuleVersionList);
+      }
       await this.$api.deploy.pipeline.addBatchJob(this.jobData).then(res => {
         if (res.Status == 'OK') {
           this.$Message.success(this.$t('message.savesuccess'));
         }
       });
     },
-    getVersionValidateList(row) {
-      return ['required'];
-    },
     save() {
+      if (this.$refs.moduleList) {
+        const data = this.$refs.moduleList.saveJobData();
+        this.$set(this.jobData, 'appSystemModuleVersionList', data.appSystemModuleVersionList);
+      }
       return this.jobData;
     }
   },
   filter: {},
   computed: {
-    versionValidateList() {
-      return row => {
-        if (row._selected && (row.isHasBuildTypeTool == 1 || row.isHasDeployTypeTool == 1)) {
-          return [{ name: 'required', message: ' ' }];
-        } else {
-          return [];
-        }
-      };
-    }
   },
   watch: {
     id: {
       handler(val) {
         this.$set(this.jobData, 'pipelineId', val);
-        this.listPipelineAppSystemModuleEnvScenario();
       },
       immediate: true
     }
-- 
Gitee