From 788e5993c156d419c87104c5426217ccf479da7c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 2 Sep 2025 15:57:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20#[15007694868643?=
 =?UTF-8?q?84]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8D=A1=E9=A1=BF=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1500?=
 =?UTF-8?q?769486864384?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoexec/components/param/edit/input.vue  |   2 +-
 .../autoexec/components/param/edit/text.vue   |   2 +-
 .../components/param/edit/textarea.vue        |   2 +-
 .../components/script/item/condition-tool.vue |   2 +-
 .../item/condition/condition-tool-list.vue    |  34 ------
 .../components/script/item/condition/tool.vue |   7 +-
 .../components/script/item/loop-block.vue     |   4 +-
 .../script/item/param/inputparam.vue          |   2 +-
 .../components/script/script-list.vue         | 115 +++++++++++-------
 .../components/script/script-state.js         |  13 ++
 .../pages/autoexec/detail/action-detail.vue   |  76 ++++++++----
 .../detail/actionDetail/step/step-config.vue  |  33 ++---
 12 files changed, 159 insertions(+), 133 deletions(-)
 delete mode 100644 src/views/pages/autoexec/components/script/item/condition/condition-tool-list.vue
 create mode 100644 src/views/pages/autoexec/components/script/script-state.js

diff --git a/src/views/pages/autoexec/components/param/edit/input.vue b/src/views/pages/autoexec/components/param/edit/input.vue
index 69aaab19..e3dbe821 100644
--- a/src/views/pages/autoexec/components/param/edit/input.vue
+++ b/src/views/pages/autoexec/components/param/edit/input.vue
@@ -6,7 +6,7 @@
     :disabled="disabled"
     v-bind="getSetting"
     border="border"
-    @on-change="updateval"
+    @on-blur="updateval"
   ></TsFormInput>
 </template>
 
diff --git a/src/views/pages/autoexec/components/param/edit/text.vue b/src/views/pages/autoexec/components/param/edit/text.vue
index 80cefacf..de5a01e0 100644
--- a/src/views/pages/autoexec/components/param/edit/text.vue
+++ b/src/views/pages/autoexec/components/param/edit/text.vue
@@ -24,7 +24,7 @@
           :class="type==='textarea'?'pre':''"
           border="border"
           :maxlength="config && config.maxlength ?config.maxlength : type==='textarea'? 6114:2048"
-          @on-change="updateval"
+          @on-blur="updateval"
         ></TsFormInput>
       </Col>
     </TsRow>
diff --git a/src/views/pages/autoexec/components/param/edit/textarea.vue b/src/views/pages/autoexec/components/param/edit/textarea.vue
index 5fe19f13..a73a926e 100644
--- a/src/views/pages/autoexec/components/param/edit/textarea.vue
+++ b/src/views/pages/autoexec/components/param/edit/textarea.vue
@@ -8,7 +8,7 @@
     border="border"
     type="textarea"
     :maxlength="maxlength"
-    @on-change="updateval"
+    @on-blur="updateval"
   ></TsFormInput>
 </template>
 <script>
diff --git a/src/views/pages/autoexec/components/script/item/condition-tool.vue b/src/views/pages/autoexec/components/script/item/condition-tool.vue
index 0df416aa..aa711822 100644
--- a/src/views/pages/autoexec/components/script/item/condition-tool.vue
+++ b/src/views/pages/autoexec/components/script/item/condition-tool.vue
@@ -19,7 +19,7 @@
         :validateList="validateList"
         class="condition-param"
         :readonly="!canEdit"
-        @change="changeCondition"
+        @on-blur="changeCondition"
       ></TsFormInput>
     </div>
     <!-- 满足执行 -->
diff --git a/src/views/pages/autoexec/components/script/item/condition/condition-tool-list.vue b/src/views/pages/autoexec/components/script/item/condition/condition-tool-list.vue
deleted file mode 100644
index 9fccdd7b..00000000
--- a/src/views/pages/autoexec/components/script/item/condition/condition-tool-list.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<script>
-import ScriptList from '@/views/pages/autoexec/components/script/script-list.vue';
-export default {
-  name: '',
-  components: {
-  },
-  extends: ScriptList,
-  props: {},
-  data() {
-    return {
-
-    };
-  },
-  beforeCreate() {},
-  created() { },
-  beforeMount() {},
-  mounted() {
-    
-  },
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-  },
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less">
-</style>
diff --git a/src/views/pages/autoexec/components/script/item/condition/tool.vue b/src/views/pages/autoexec/components/script/item/condition/tool.vue
index 135fefba..eca01399 100644
--- a/src/views/pages/autoexec/components/script/item/condition/tool.vue
+++ b/src/views/pages/autoexec/components/script/item/condition/tool.vue
@@ -6,7 +6,7 @@
     </div>
 
     <div v-if="phaseOperationList&& phaseOperationList.length" class="config-list">
-      <ConditionToolList
+      <ScriptList
         ref="conditionToolList"
         :phaseOperationList="phaseOperationList"
         :canEdit="canEdit"
@@ -19,7 +19,7 @@
         :inputTypeList="inputTypeList"
         :execMode="execMode"
         @sortList="sortList"
-      ></ConditionToolList>
+      ></ScriptList>
     </div>
     <AddOperation
       v-if="isAdd"
@@ -33,10 +33,11 @@
 </template>
 <script>
 import itemmixin from '@/views/pages/autoexec/components/script/item/itemmixin.js';
+import ScriptList from '@/views/pages/autoexec/components/script/script-list.vue';
 export default {
   name: '',
   components: {
-    ConditionToolList: () => import('./condition-tool-list'),
+    ScriptList,
     AddOperation: () => import('@/views/pages/autoexec/detail/actionDetail/step/edit/operation-add')
   },
   mixins: [itemmixin],
diff --git a/src/views/pages/autoexec/components/script/item/loop-block.vue b/src/views/pages/autoexec/components/script/item/loop-block.vue
index 47441787..bd00eb93 100644
--- a/src/views/pages/autoexec/components/script/item/loop-block.vue
+++ b/src/views/pages/autoexec/components/script/item/loop-block.vue
@@ -14,7 +14,7 @@
           :validateList="validateList"
           class="condition-param"
           :readonly="!canEdit"
-          @change="changeLoopItems"
+          @on-blur="changeLoopItems"
         ></TsFormInput>
       </TsFormItem>
       <TsFormItem
@@ -30,7 +30,7 @@
           :validateList="validateList"
           class="condition-param"
           :readonly="!canEdit"
-          @change="changeLoopItemVar"
+          @on-blur="changeLoopItemVar"
         ></TsFormInput>
       </TsFormItem>
     </div>
diff --git a/src/views/pages/autoexec/components/script/item/param/inputparam.vue b/src/views/pages/autoexec/components/script/item/param/inputparam.vue
index e326087a..9d4ab782 100644
--- a/src/views/pages/autoexec/components/script/item/param/inputparam.vue
+++ b/src/views/pages/autoexec/components/script/item/param/inputparam.vue
@@ -511,7 +511,7 @@ export default {
     },
     getProfileParamConfig() {
       return (profileParamVoList, item) => {
-        let config = '';
+        let config = {};
         let findItem = null;
         if (!this.$utils.isEmpty(this.overrideProfileList)) {
           findItem = this.overrideProfileList.find(p => p.profileId === this.profileId);
diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue
index cfc58332..050de11c 100644
--- a/src/views/pages/autoexec/components/script/script-list.vue
+++ b/src/views/pages/autoexec/components/script/script-list.vue
@@ -15,39 +15,29 @@
       @end="changeDragStatus('end')"
     >
       <li v-for="(step, sindex) in list" :id="'id_' + combopConfig.combopUuid + '_' + step.uuid" :key="sindex+'_'+step.uuid">
-        <div v-if="step.operation" class="inner-block radius-lg" :class="{'hide-li':dragStatus == 'start' || !step.isShow, 'show-li': step.isShow, 'bg-op': step.operationName != 'native/IF-Block' && step.operationName != 'native/LOOP-Block', 'border-base': step.operationName == 'native/IF-Block' || step.operationName == 'native/LOOP-Block'}">
-          <!-- <div class="script-title border-color overflow" :class="step.operationType && step.operationType == 'script' ? 'tsfont-cloud' : 'tsfont-block'"> -->
-          <div>
-            <Tooltip
-              theme="light"
-              transfer
-              :content="step.isShow? $t('page.clickandputaway'):$t('page.clicktoexpand')"
-              :style="{'width': '100%'}"
-            >
-              <div class="script-title border-color" @click="toggleshow(step)">
-                <div class="overflow">
-                  【{{ typeText(step.operationType) }}】
-                  <span class="text-action name" :title="step.operationName" @click.stop="gotoDateil(step)">{{ step.operationName }}</span>
-                  <RiskItem v-if="step.operation.riskVo" :text="step.operation.riskVo.name" :color="step.operation.riskVo.color"></RiskItem>
-                </div>
-                <div class="text-tip description overflow">
-                  <span v-if="step.description" :title="step.description">{{ step.description }}</span>
-                  <span v-else-if="!canEdit">-</span>
-                  <i v-if="canEdit" class="text-action edit-des tsfont-edit" @click.stop="editDescription(step)"></i>
-                </div>
-                <i v-if="canEdit && operationType=='combop'" class="item-sort tsfont-bar"></i>
-                <i class="item-index text-tip">#{{ sindex+1 }}</i>
-                <span class="item-actionIcon" @click.stop>
-                  <i v-if="canEdit && operationType=='combop'" class="item-copy tsfont-copy text-tip" @click="copyScript(step)"></i>
-                  <i v-if="canEdit && operationType=='combop'" class="item-delete tsfont-close text-tip" @click="deleteScript(step,sindex)"></i>
-                  <i class="item-toggle tsfont text-tip" @click="toggleshow(step)"></i>
-                </span>
-              </div>
-            </Tooltip>
+        <div v-if="step.operation" class="inner-block radius-lg" :class="{'hide-li':dragStatus == 'start' || !phaseShowMap[step.uuid], 'show-li': phaseShowMap[step.uuid], 'bg-op': step.operationName != 'native/IF-Block' && step.operationName != 'native/LOOP-Block', 'border-base': step.operationName == 'native/IF-Block' || step.operationName == 'native/LOOP-Block'}">
+          <div class="script-title border-color" @click="toggleshow(step)">
+            <div class="overflow">
+              【{{ typeText(step.operationType) }}】
+              <span class="text-action name" :title="step.operationName" @click.stop="gotoDateil(step)">{{ step.operationName }}</span>
+              <RiskItem v-if="step.operation.riskVo" :text="step.operation.riskVo.name" :color="step.operation.riskVo.color"></RiskItem>
+            </div>
+            <div class="text-tip description overflow">
+              <span v-if="step.description" :title="step.description">{{ step.description }}</span>
+              <span v-else-if="!canEdit">-</span>
+              <i v-if="canEdit" class="text-action edit-des tsfont-edit" @click.stop="editDescription(step)"></i>
+            </div>
+            <i v-if="canEdit && operationType=='combop'" class="item-sort tsfont-bar"></i>
+            <i class="item-index text-tip">#{{ sindex+1 }}</i>
+            <span class="item-actionIcon" @click.stop>
+              <i v-if="canEdit && operationType=='combop'" class="item-copy tsfont-copy text-tip" @click="copyScript(step)"></i>
+              <i v-if="canEdit && operationType=='combop'" class="item-delete tsfont-close text-tip" @click="deleteScript(step,sindex)"></i>
+              <i class="item-toggle tsfont text-tip" @click="toggleshow(step)"></i>
+            </span>
           </div>
           <item
             :is="geScriptType(step)"
-            v-show="step.isShow"
+            v-if="phaseShowMap[step.uuid]"
             :ref="'toolDetail'+step.uuid"
             :config="step"
             :canEdit="canEdit"
@@ -99,9 +89,10 @@
   </div>
 </template>
 <script>
-import item from './item/index.js';
 import draggable from 'vuedraggable';
-import RiskItem from '../risk-item.vue';
+import item from '@/views/pages/autoexec/components/script/item/index.js';
+import RiskItem from '@/views/pages/autoexec/components/risk-item.vue';
+import { storeScript, mutationsScript } from './script-state.js';
 export default {
   name: '',
   inject: {
@@ -169,6 +160,12 @@ export default {
     operationType: {
       type: String,
       default: 'combop'
+    },
+    validPhaseOperationUuidList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
     }
   },
   data() {
@@ -178,7 +175,8 @@ export default {
       isValid: true,
       showDialog: false,
       currentStep: null,
-      description: ''
+      description: '',
+      isUpdateSort: false //是否更新排序
     };
   },
   beforeCreate() {},
@@ -189,9 +187,17 @@ export default {
   updated() {},
   activated() {},
   deactivated() {},
-  beforeDestroy() {},
+  beforeDestroy() {
+    this.clearObservable();
+  },
   destroyed() {},
   methods: {
+    clearObservable() {
+      //清空状态管理的数据
+      Object.keys(storeScript).forEach(key => {
+        storeScript[key] = null;
+      });
+    },
     changeDragStatus(type) {
       this.dragStatus = type;
       if (type == 'end') {
@@ -199,16 +205,17 @@ export default {
       }
     },
     updatedSort() {
-      this.list.forEach((item, index) => {
+      this.isUpdateSort = true;
+      let list = this.$utils.deepClone(this.list);
+      list.forEach((item, index) => {
         this.$set(item, 'sort', index);
       });
+      if (!this.$utils.isSame(list, this.list)) {
+        this.list = list;
+      }
     },
     toggleshow(item) {
-      if (item.isShow != false) {
-        this.$set(item, 'isShow', false);
-      } else {
-        this.$set(item, 'isShow', true);
-      }
+      mutationsScript.setCombopPhaseShowMap(item.uuid);
       this.renderHeight && this.renderHeight();
     },
     deleteScript(item, index) {
@@ -243,7 +250,6 @@ export default {
         return {
           ...v,
           uuid: v.uuid || this.$utils.setUuid(),
-          isShow: v.isShow == undefined ? false : v.isShow,
           sort: vindex
         };
       });
@@ -281,8 +287,8 @@ export default {
       return this.isValid;
     },
     changeStep(config, id) {
-      let _this = this;
-      _this.list.forEach(l => {
+      this.isUpdateSort = false;
+      this.list.forEach(l => {
         if (l.uuid == id) {
           Object.assign(l, config);
         }
@@ -325,7 +331,7 @@ export default {
     setShowStep(parent) { //设置父级的显示
       if (parent) {
         if (parent.step) {
-          parent.step.isShow = true;
+          mutationsScript.setCombopPhaseShowMap(parent.step.uuid, true);
         } else {
           if (parent.$options.parent) {
             this.setShowStep(parent.$options.parent);
@@ -348,6 +354,7 @@ export default {
       this.showDialog = true;
     },
     okDialog() {
+      this.isUpdateSort = false;
       this.list.forEach(item => {
         if (item.uuid === this.currentStep.uuid) {
           this.$set(item, 'description', this.description);
@@ -362,6 +369,9 @@ export default {
     }
   },
   computed: {
+    phaseShowMap() {
+      return storeScript.phaseShowMap || {};
+    },
     getPrev() {
       return function(index, prevStepList) {
         let list = [];
@@ -435,8 +445,7 @@ export default {
             }
             return {
               ...v,
-              uuid: v.uuid || this.$utils.setUuid(),
-              isShow: v.isShow == undefined ? false : v.isShow
+              uuid: v.uuid || this.$utils.setUuid()
             };
           });
           this.updatedSort();
@@ -447,7 +456,19 @@ export default {
     },
     list: {
       handler(val) {
-        this.$emit('sortList', val);
+        if (this.canEdit) {
+          this.$emit('sortList', val, this.isUpdateSort);
+        }
+      },
+      deep: true
+    },
+    validPhaseOperationUuidList: {
+      handler(val) {
+        if(!this.$utils.isEmpty(val)) {
+          val.forEach(item => {
+            mutationsScript.setCombopPhaseShowMap(item, true);
+          })
+        }
       },
       deep: true
     }
diff --git a/src/views/pages/autoexec/components/script/script-state.js b/src/views/pages/autoexec/components/script/script-state.js
new file mode 100644
index 00000000..86887958
--- /dev/null
+++ b/src/views/pages/autoexec/components/script/script-state.js
@@ -0,0 +1,13 @@
+import Vue from 'vue';
+let scriptData = {
+  phaseShowMap: {} //流水线阶段显示map
+};
+export let storeScript = Vue.observable(scriptData);
+export let mutationsScript = {
+  setCombopPhaseShowMap(uuid, isShow) {
+    if (!storeScript.phaseShowMap) {
+      storeScript.phaseShowMap = {};
+    }
+    Vue.set(storeScript.phaseShowMap, uuid, isShow || !storeScript.phaseShowMap[uuid]);
+  }
+};
diff --git a/src/views/pages/autoexec/detail/action-detail.vue b/src/views/pages/autoexec/detail/action-detail.vue
index 9fee20c3..bb6c6821 100644
--- a/src/views/pages/autoexec/detail/action-detail.vue
+++ b/src/views/pages/autoexec/detail/action-detail.vue
@@ -116,9 +116,6 @@
           </Col>
         </TsRow>
       </template>
-      <!-- <template v-slot:topRight>
-
-      </template> -->
       <!-- 左侧步骤列表 -->
       <template v-slot:sider>
         <StepList
@@ -157,6 +154,7 @@
               :canEdit="effectiveEditable"
               :prevStepList="getPrev(currentConfig, stepList)"
               :operationType="operationType"
+              :validPhaseOperationUuidList="validPhaseOperationUuidList"
               @changeOperation="changeOperation"
             ></StepConfig>
           </div>
@@ -498,7 +496,8 @@ export default {
       isShowTestDialog: false,
       configExpired: 0,
       configExpiredReason: {},
-      opType: 'readonly' //操作类型
+      opType: 'readonly', //操作类型
+      validPhaseOperationUuidList: [] //校验定位工具列表
     };
   },
   beforeCreate() {},
@@ -689,7 +688,6 @@ export default {
     savePhaseOperationList(list) {
       let phaseOperationList = this.$utils.deepClone(list);
       phaseOperationList.forEach(item => {
-        delete item.isShow;
         delete item.operation;
         if (item.operationName == 'native/IF-Block') {
           if (item.config.ifList && item.config.ifList.length) {
@@ -735,6 +733,7 @@ export default {
         this.currentStep = null;
         let data = this.getData();
         this.$set(data, 'status', 'draft');
+        this.loading =true;
         await this.$api.autoexec.action
           .saveActionVersion(data)
           .then(res => {
@@ -1047,13 +1046,6 @@ export default {
       valid.length > 0 && this.$refs.stepConfig && this.$utils.validForm(this.$refs.stepConfig.$el);
       return valid;
     },
-    // validCurrentStepConfig() {
-    //   if (this.$refs.stepConfig) {
-    //     return this.$refs.stepConfig.valid();
-    //   } else {
-    //     return true;
-    //   }
-    // },
     selectValidItem(config) {
       //获取其中一个校验，进行特殊处理
       if (config) {
@@ -1066,8 +1058,16 @@ export default {
             let stepItem = this.stepList.find(c => c.uuid == this.currentStep);
             stepItem && (groupUuid = stepItem.groupUuid);
             groupUuid && (this.currentGroupConfig = this.combopGroupList.find(g => g.uuid == groupUuid));
+            if(!this.$utils.isEmpty(config.config.operationUuid)) {
+              this.validPhaseOperationUuidList = config.config.operationUuid;
+            }
             this.$nextTick(() => {
-              this.$refs.stepConfig && this.$refs.stepConfig.valid();
+              this.$refs.stepConfig && this.$refs.stepConfig.valid(config.config);
+              if(!this.$utils.isEmpty(config.config.id)) {
+                this.$nextTick(() => {
+                  this.$utils.jumpTo(config.config.id);
+                });
+              }
             });
           } else if (config.config.type == 'executeSetting') {
             //执行目标校验不通过
@@ -1249,10 +1249,11 @@ export default {
         }
       });
     },
-    validPhaseOperationList(step, phaseOperationList) { //校验工具列表
+    validPhaseOperationList(step, phaseOperationList, validPperationUuidList) { //校验工具列表
       let validList = [];
       //如果输入参数有必填但是没填的
       phaseOperationList.forEach(p => {
+        let validUuidList = [p.uuid, ...validPperationUuidList || []];
         if (p.operationName == 'native/IF-Block') {
           if (p.config) {
             !p.config.condition && validList.push({
@@ -1261,7 +1262,9 @@ export default {
               config: {
                 stepName: step.name,
                 validComponent: 'operation',
-                stepUuid: step.uuid
+                stepUuid: step.uuid,
+                operationUuid: validUuidList,
+                id: '#id_' + step.uuid + '_' + p.uuid
               }
             });
             if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) {
@@ -1271,16 +1274,18 @@ export default {
                 config: {
                   stepName: step.name,
                   validComponent: 'operation',
-                  stepUuid: step.uuid
+                  stepUuid: step.uuid,
+                  operationUuid: validUuidList,
+                  id: '#id_' + step.uuid + '_' + p.uuid
                 }
               });
             }
             if (p.config.ifList && p.config.ifList.length) {
-              let validIfList = this.validPhaseOperationList(step, p.config.ifList);
+              let validIfList = this.validPhaseOperationList(step, p.config.ifList, validUuidList);
               validIfList.length && validList.push(...validIfList);
             }
             if (p.config.elseList && p.config.elseList.length) {
-              let validElseList = this.validPhaseOperationList(step, p.config.elseList);
+              let validElseList = this.validPhaseOperationList(step, p.config.elseList, validUuidList);
               validElseList.length && validList.push(...validElseList);
             }
           }
@@ -1292,7 +1297,9 @@ export default {
               config: {
                 stepName: step.name,
                 validComponent: 'operation',
-                stepUuid: step.uuid
+                stepUuid: step.uuid,
+                operationUuid: validUuidList,
+                id: '#id_' + step.uuid + '_' + p.uuid
               }
             });
             !p.config.loopItemVar && validList.push({
@@ -1301,7 +1308,9 @@ export default {
               config: {
                 stepName: step.name,
                 validComponent: 'operation',
-                stepUuid: step.uuid
+                stepUuid: step.uuid,
+                operationUuid: validUuidList,
+                id: '#id_' + step.uuid + '_' + p.uuid
               }
             });
             (!p.config.operations || p.config.operations.length == 0) && validList.push({
@@ -1310,11 +1319,13 @@ export default {
               config: {
                 stepName: step.name,
                 validComponent: 'operation',
-                stepUuid: step.uuid
+                stepUuid: step.uuid,
+                operationUuid: validUuidList,
+                id: '#id_' + step.uuid + '_' + p.uuid
               }
             });
             if (p.config.operations && p.config.operations.length) {
-              let validOperations = this.validPhaseOperationList(step, p.config.operations);
+              let validOperations = this.validPhaseOperationList(step, p.config.operations, validUuidList);
               validOperations.length && validList.push(...validOperations);
             }
           }
@@ -1341,7 +1352,9 @@ export default {
                   config: {
                     stepName: step.name,
                     validComponent: 'operation',
-                    stepUuid: step.uuid
+                    stepUuid: step.uuid,
+                    operationUuid: validUuidList,
+                    id: '#id_' + step.uuid + '_' + p.uuid
                   }
                 });
               }
@@ -1365,7 +1378,9 @@ export default {
                   config: {
                     stepName: step.name,
                     validComponent: 'operation',
-                    stepUuid: step.uuid
+                    stepUuid: step.uuid,
+                    operationUuid: validUuidList,
+                    id: '#id_' + step.uuid + '_' + p.uuid
                   }
                 });
               }
@@ -1380,7 +1395,9 @@ export default {
                 config: {
                   stepName: step.name,
                   validComponent: 'operation',
-                  stepUuid: step.uuid
+                  stepUuid: step.uuid,
+                  operationUuid: validUuidList,
+                  id: '#id_' + step.uuid + '_' + p.uuid
                 }
               });
             }
@@ -1391,7 +1408,10 @@ export default {
               config: {
                 stepName: step.name,
                 validComponent: 'operation',
-                stepUuid: step.uuid
+                stepUuid: step.uuid,
+                operationUuid: p.uuid,
+                operationUuid: validUuidList,
+                id: '#id_' + step.uuid + '_' + p.uuid
               }
             });
           }
@@ -1542,12 +1562,14 @@ export default {
     getPrev() {
       return function(config, list) {
         let uk = config.uuid;
+        let prevList = [];
         let index = list.findIndex(l => {
           return l.uuid == uk;
         });
-        return list.filter((s, sindex) => {
+        prevList = list.filter((s, sindex) => {
           return sindex < index;
         });
+        return prevList;
       };
     },
     combopGroupList() {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue b/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
index 09c7a0c7..00779a74 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/step-config.vue
@@ -15,6 +15,7 @@
           :inputTypeList="inputTypeList"
           :execMode="execMode"
           :operationType="operationType"
+          :validPhaseOperationUuidList="validPhaseOperationUuidList"
           @sortList="sortList"
         ></ScriptList>
       </div>
@@ -80,6 +81,12 @@ export default {
     operationType: { //组合工具类型不是combop时，只能修改输入参数，预设参数、自由参数，不可对阶段信息进行修改
       type: String,
       default: 'combop'
+    },
+    validPhaseOperationUuidList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
     }
   },
   data() {
@@ -128,8 +135,9 @@ export default {
     async close(list) {
       this.isAdd = false;
       if (list && list.length) {
+        let phaseOperationList = this.$utils.deepClone(this.phaseOperationList) || [];
         list.forEach(async(l) => {
-          let prevlength = this.phaseOperationList.filter(p => { return p.operationId == l.operationId; });
+          let prevlength = phaseOperationList.filter(p => { return p.operationId == l.operationId; });
           let defaulParam = [];
           if (l.inputParamList && l.inputParamList.length) {
             let profileParamVoList = [];
@@ -184,10 +192,11 @@ export default {
               this.$set(item.config, 'profileId', l.defaultProfileId);
             }
           }
-          this.phaseOperationList.push(item);
-          this.$nextTick(() => {
-            this.$refs.list.updateList(this.phaseOperationList);
-          });
+          phaseOperationList.push(item);
+        });
+        this.phaseOperationList = phaseOperationList;
+        this.$nextTick(() => {
+          this.$refs.list.updateList(this.phaseOperationList);
         });
       }
     },
@@ -215,16 +224,10 @@ export default {
       this.totalheight = window.innerHeight || document.body.clientHeight;
       this.$el && (this.height = this.$el.getBoundingClientRect().top);
     },
-    valid() {
-      if (!this.phaseOperationList || !this.phaseOperationList.length) {
-        return this.$t('page.notarget', {target: this.$t('term.autoexec.tool')});
-      } else {
-        if (this.$refs.list) {
-          return this.$refs.list.valid();
-        } else {
-          return true;
-        }
-      }
+    valid(config) {
+     if (this.$refs.list) {
+        this.$refs.list.valid(config);
+      } 
     },
     getFailPolicyOption() {
       //获取失败策略下拉
-- 
Gitee


From 5d9b0906c6a179041730ddaff05aefc2e5fbd82e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 2 Sep 2025 16:15:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[15007694868643?=
 =?UTF-8?q?84]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8D=A1=E9=A1=BF=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1500?=
 =?UTF-8?q?769486864384?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/autoexec/components/script/script-list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue
index 050de11c..3abb269c 100644
--- a/src/views/pages/autoexec/components/script/script-list.vue
+++ b/src/views/pages/autoexec/components/script/script-list.vue
@@ -16,7 +16,7 @@
     >
       <li v-for="(step, sindex) in list" :id="'id_' + combopConfig.combopUuid + '_' + step.uuid" :key="sindex+'_'+step.uuid">
         <div v-if="step.operation" class="inner-block radius-lg" :class="{'hide-li':dragStatus == 'start' || !phaseShowMap[step.uuid], 'show-li': phaseShowMap[step.uuid], 'bg-op': step.operationName != 'native/IF-Block' && step.operationName != 'native/LOOP-Block', 'border-base': step.operationName == 'native/IF-Block' || step.operationName == 'native/LOOP-Block'}">
-          <div class="script-title border-color" @click="toggleshow(step)">
+          <div class="script-title border-color cursor-pointer" @click="toggleshow(step)">
             <div class="overflow">
               【{{ typeText(step.operationType) }}】
               <span class="text-action name" :title="step.operationName" @click.stop="gotoDateil(step)">{{ step.operationName }}</span>
-- 
Gitee