From 855f8ce9ea31ba4687136523cadeb3cb3cba7a15 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 23 Oct 2025 16:21:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[15339921745838?=
 =?UTF-8?q?08]=E8=87=AA=E5=8A=A8=E5=8C=96=E6=9C=8D=E5=8A=A1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=AE=A1=E7=90=86=E5=89=8D=E7=BD=AE=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E6=98=AF=E5=8F=AA=E8=AF=BB=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?=
 =?UTF-8?q?33992174583808?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quick-service/catalog/service.vue         | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue
index 0fc296cf..bd537e0c 100644
--- a/src/views/pages/autoexec/quick-service/catalog/service.vue
+++ b/src/views/pages/autoexec/quick-service/catalog/service.vue
@@ -284,10 +284,13 @@
         <span>{{ $t('term.autoexec.executetarget') }}</span>
         <span class="tsfont-down cursor" :class="unfoldAndFold.executeTarget ? 'tsfont-down' : 'tsfont-up'" @click.stop="handleUnfoldAndFold('executeTarget')"></span>
       </div>
-      <TsFormItem v-if="!$utils.isEmpty(preCondition)" :label="$t('term.autoexec.precondition')">
+      <TsFormItem :label="$t('term.autoexec.precondition')">
         <PreconditionDetail
           :defaultValue="preCondition"
-          :canEdit="false"
+          :canEdit="true"
+          @changeValue="(val)=>{
+            changePreCondition(val);
+          }"
         ></PreconditionDetail>
       </TsFormItem>
       <TsFormItem v-show="unfoldAndFold.executeTarget" :label="$t('term.autoexec.executetarget')" :required="hasRequired(executeNode.mappingMode)">
@@ -804,7 +807,8 @@ export default {
         desc: this.$t('term.autoexec.paralldesc'),
         disabled: false
       },
-      preCondition: null
+      preCondition: null,
+      newPreCondition: null
     };
   },
   beforeCreate() {},
@@ -914,6 +918,7 @@ export default {
       this.parallelPolicyForm.disabled = false;
       this.parallelCount = {mappingMode: 'constant', value: null}; //并发数量
       this.preCondition = null;
+      this.newPreCondition = null;
     },
     async initData() {
       this.defaultIniData();
@@ -965,10 +970,10 @@ export default {
             if (config) {
               for (let key in config) {
                 if (!this.$utils.isEmpty(config[key])) {
-                  this[key] = config[key]; // 分批数量，执行目标，执行器组标签，执行器组
+                  this[key] = config[key]; // 分批数量，执行目标，执行器组标签，执行器组 ，前置条件
                 }
               }
-              if (config && !this.$utils.isEmpty(runtimeParamList)) {
+              if (!this.$utils.isEmpty(runtimeParamList)) {
                 runtimeParamList.forEach(item => {
                   if (item.key) {
                     this.$set(this.jobParamValue, [item.key], item.value);
@@ -985,6 +990,9 @@ export default {
                 this.$set(this.executeNode, 'mappingMode', executeNodeConfig.mappingMode || 'constant');
                 this.$set(this.executeNode, 'value', executeNodeConfig.value);
               }
+              if (!this.$utils.isEmpty(this.preCondition)) {
+                this.newPreCondition = this.$utils.deepClone(config.preCondition);
+              }
             }
             this.basicFormItemList &&
               this.basicFormItemList.forEach(item => {
@@ -1200,6 +1208,9 @@ export default {
         // 组合工具，执行器组标签如果是作业参数，不需要传递给后端
         delete params.config.runnerGroupTag;
       }
+      if (!this.$utils.isEmpty(this.newPreCondition)) {
+        params.config.preCondition = this.newPreCondition;
+      }
       if (params && params.config) {
         // 删除额外的属性，不需要传递给后端
         const { runnerGroupTag, runnerGroup } = params.config;
@@ -1317,7 +1328,7 @@ export default {
               this.executeUser.value = this.executeUser && this.executeUser.value ? this.executeUser.value : executeConfig['executeUser'] ? executeConfig['executeUser']['value'] : '';
               this.protocol.value = this.protocol && this.protocol.value ? this.protocol.value : executeConfig['protocolId'];
             }
-            if (!this.$utils.isEmpty(executeConfig.preCondition)) {
+            if (this.$utils.isEmpty(this.newPreCondition) && !this.$utils.isEmpty(executeConfig.preCondition)) {
               this.preCondition = executeConfig.preCondition;
             }
           }
@@ -1329,6 +1340,10 @@ export default {
     changeParallelPolicy(val) {
       this.roundCount.value = null;
       this.parallelCount.value = null;
+    },
+    changePreCondition(val) {
+      this.preCondition = val;
+      this.newPreCondition = this.$utils.deepClone(val);
     }
   },
   filter: {},
-- 
Gitee


From 71d5de4374d6a39a7c8d1ff0c8e36bab51395fe8 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 24 Oct 2025 15:27:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20#[15339921745838?=
 =?UTF-8?q?08]=E8=87=AA=E5=8A=A8=E5=8C=96=E6=9C=8D=E5=8A=A1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=AE=A1=E7=90=86=E5=89=8D=E7=BD=AE=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E6=98=AF=E5=8F=AA=E8=AF=BB=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?=
 =?UTF-8?q?33992174583808?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/autoexec/quick-service/catalog/service.vue      | 8 ++++----
 .../service-catalog/no-form-service-edit.vue              | 4 ++++
 .../quick-service/service-catalog/other-params.vue        | 8 +++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue
index bd537e0c..51848081 100644
--- a/src/views/pages/autoexec/quick-service/catalog/service.vue
+++ b/src/views/pages/autoexec/quick-service/catalog/service.vue
@@ -808,7 +808,7 @@ export default {
         disabled: false
       },
       preCondition: null,
-      newPreCondition: null
+      newPreCondition: null // 服务目录从新设置前置条件
     };
   },
   beforeCreate() {},
@@ -990,7 +990,7 @@ export default {
                 this.$set(this.executeNode, 'mappingMode', executeNodeConfig.mappingMode || 'constant');
                 this.$set(this.executeNode, 'value', executeNodeConfig.value);
               }
-              if (!this.$utils.isEmpty(this.preCondition)) {
+              if (config.preCondition) {
                 this.newPreCondition = this.$utils.deepClone(config.preCondition);
               }
             }
@@ -1208,7 +1208,7 @@ export default {
         // 组合工具，执行器组标签如果是作业参数，不需要传递给后端
         delete params.config.runnerGroupTag;
       }
-      if (!this.$utils.isEmpty(this.newPreCondition)) {
+      if (this.newPreCondition) {
         params.config.preCondition = this.newPreCondition;
       }
       if (params && params.config) {
@@ -1343,7 +1343,7 @@ export default {
     },
     changePreCondition(val) {
       this.preCondition = val;
-      this.newPreCondition = this.$utils.deepClone(val);
+      this.newPreCondition = this.$utils.deepClone(val) || {};
     }
   },
   filter: {},
diff --git a/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue b/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
index d5508a03..991f5b8f 100644
--- a/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
+++ b/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
@@ -562,6 +562,10 @@ export default {
             if (this.runtimeParamList && !this.$utils.isEmpty(this.runtimeParamList)) {
               this.initConfig(); // 设置作业参数值
             }
+            //服务目录前置条件
+            if (this.defaultData['config'].hasOwnProperty('preCondition')) {
+              this.$set(this.executeConfig, 'preCondition', this.defaultData['config'].preCondition);
+            }
           }
         });
     },
diff --git a/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue b/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
index 55878c48..055cb2b4 100644
--- a/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
+++ b/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
@@ -130,9 +130,11 @@
       :label="$t('term.autoexec.precondition')"
     >
       <PreconditionDetail
+        v-if="!$utils.isEmpty(executeConfig.preCondition)"
         :defaultValue="executeConfig.preCondition"
         :canEdit="false"
       ></PreconditionDetail>
+      <div v-else>-</div>
     </TsFormItem>
     <TsFormItem :label="$t('term.autoexec.executetarget')">
       <TsFormSelect
@@ -415,7 +417,7 @@ export default {
         let { executeNodeConfig = {}, runnerGroup = {}, runnerGroupTag = {} } = config || {};
         let { value = '', mappingMode } = executeNodeConfig || {};
         if (mappingMode == 'constant') {
-          if (!this.$utils.isEmpty(value)) {
+          if (!this.$utils.isEmpty(value) && this.executeConfig.whenToSpecify === 'runtime') {
             this.filterSearchValue = value || {}; // 执行目标值回显
             this.$set(this.executeConfig, 'executeNodeConfig', this.filterSearchValue); // 执行目标回显
           }
@@ -474,6 +476,10 @@ export default {
             }
             item.isHidden = isHidden;
           });
+          //服务目录前置条件
+          if (this.serviceData['config'].hasOwnProperty('preCondition')) {
+            this.$set(this.executeConfig, 'preCondition', this.serviceData['config'].preCondition);
+          }
         }
       }
       this.$nextTick(() => {
-- 
Gitee