diff --git a/src/resources/api/autoexec/action/action.js b/src/resources/api/autoexec/action/action.js
index 0eba77084f67cd37d1edb58e4f817d8268d47c5a..86224aa8f73b023dec51f135204564e654d6bd18 100644
--- a/src/resources/api/autoexec/action/action.js
+++ b/src/resources/api/autoexec/action/action.js
@@ -115,7 +115,7 @@ const action = {
     // 获取可执行组合工具分类列表
     return axios.post('/api/rest/autoexec/combop/type/executable/list', params);
   },
-  searchResourceCustomList(params) {
+  searchResourceCustomList(params) { //废弃
     // 高级查询资源中心数据列表
     return axios.post('/api/rest/resourcecenter/resource/custom/list', params);
   },
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index d02a24405e206ebf6b6506db286e2a99dd730201..dd61d3fc3fac0e4a1dd996b3379377b4876df2b1 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -914,7 +914,10 @@
     "parall": "Concurrent quantity",
     "paralldesc": "Execute the execution targets in order of concurrency.",
     "jobrecord": "Automated job recording",
-    "jobcount": "Number of automated tasks"
+    "jobcount": "Number of automated tasks",
+    "precondition": "pre-filter",
+    "globalprecondition": "Global pre filter",
+    "preconditiontip": "If empty, inherit the global pre filter"
   },
   "framework": {
     "roleauth": "Authorize immediately after creating the role",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index e6e6cde7c2907a2322551333900b73df940d8b77..80ba71ff5f86277fc1ff189ed22cf7c3d40ed3cc 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -914,7 +914,10 @@
     "parall": "并发数量",
     "paralldesc": "将执行目标按并发数量先后执行。",
     "jobrecord": "自动化作业记录",
-    "jobcount": "自动化作业数"
+    "jobcount": "自动化作业数",
+    "precondition": "前置过滤器",
+    "globalprecondition": "全局前置过滤器",
+    "preconditiontip": "如果为空时，继承全局前置过滤器"
   },
   "framework": {
     "roleauth": "创建完角色立即授权",
diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index 75b947c8dc18694a23be5b3bc40d457547ec7ae5..01f1aad07edf74ee6eb0521e1059fffda294c8a8 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -7,7 +7,7 @@
           :key="tindex"
           :name="tindex"
           :fade="false"
-          class="tag-item-text border-color radius-sm overflow bg-op"
+          class="tag-item-text border-base radius-sm overflow bg-op"
         >
           <span class="text-title">{{ getLabel(tindex) }}</span>
           <span class="ml-xs mr-xs">:</span>
@@ -130,7 +130,7 @@
                 </div>
                 <div v-else>
                   <Button ghost class="mr-nm" @click.native="handleCancel">{{ $t('page.cancel') }}</Button>
-                  <Button type="primary" @click.native="doSearch">{{ $t('page.search') }}</Button>
+                  <Button type="primary" @click.native="doSearch">{{ searchText }}</Button>
                 </div>
               </div>
             </li>
@@ -227,6 +227,12 @@ export default {
       // 底部是否显示高级模式文案
       type: Boolean,
       default: false
+    },
+    searchText: {
+      type: String,
+      default() {
+        return this.$t('page.search');
+      }
     }
   },
   data() {
@@ -739,7 +745,6 @@ export default {
   display: none;
 }
 .tag-item-text{
-  border: 1px dashed;
   padding: 0 16px;
   line-height: 30px;
   display: inline-block;
diff --git a/src/resources/plugins/TsForm/TsFormItem.vue b/src/resources/plugins/TsForm/TsFormItem.vue
index 677f977d42d7ab876bfbd7903a31fffa139a5e71..12e4273dae1ef52b19f02b6db834c5dafa5e9ae8 100755
--- a/src/resources/plugins/TsForm/TsFormItem.vue
+++ b/src/resources/plugins/TsForm/TsFormItem.vue
@@ -256,7 +256,7 @@ function getRequired(validateList, required) {
 }
 </script>
 <style lang="less" scoped>
-.ivu-form-label-left {
+.ivu-form-item.ivu-form-label-left {
   > .ivu-form-item-label {
     position: absolute;
     line-height: 32px;
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-filters.vue b/src/views/pages/autoexec/components/common/addTarget/add-filters.vue
index 6134f3e1eb4b76a64a4252da9d4ff19688cc8fec..1de329aca61155ca7629a48ff424ead3b07300db 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-filters.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-filters.vue
@@ -6,6 +6,7 @@
         :canEdit="canEdit"
         :defaultValue="searchVal"
         :defaultSearchValue="defaultSearchValue"
+        :preCondition="preCondition"
       ></Filters>
     </div>
   </div>
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-input.vue b/src/views/pages/autoexec/components/common/addTarget/add-input.vue
index 329598a5bc37beff99e087342d73dda5fa35bef8..1c5905f19065263c6781679db1fcaf559e0803eb 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-input.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-input.vue
@@ -213,6 +213,9 @@ export default {
         inputNodeList: list,
         cmdbGroupType: this.opType
       };
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        data.preCondition = this.preCondition;
+      }
       this.isLoading = true;
       return this.$api.autoexec.action.validinputnodelist(data).then(res => {
         if (res.Status == 'OK') {
@@ -247,6 +250,14 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    preCondition: {
+      handler(val) {
+        if (!this.$utils.isEmpty(val)) {
+          this.clearAll();
+        }
+      },
+      deep: true
     }
   }
 };
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-node.vue b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
index 7d7e65946a8293b654c66e5d4a9ce497a97d803f..ee49546d32c7f14b9fda0bcd7e784665169e7a8b 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-node.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
@@ -180,6 +180,9 @@ export default {
         ...this.searchVal,
         ...this.defaultSearchValue
       };
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        data.preCondition = this.preCondition;
+      }
       this.$api.autoexec.action.getNodeList(data).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
@@ -259,8 +262,11 @@ export default {
         ...this.defaultSearchValue,
         ...searchVal
       };
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        params.preCondition = this.preCondition;
+      }
       this.loadingShow = true;
-      this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
+      this.$api.autoexec.action.getNodeList(params).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
         }
@@ -303,6 +309,15 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    preCondition: {
+      handler(val) {
+        if (!this.$utils.isEmpty(val)) {
+          this.clearAll();
+          this.handlePageChange();
+        }
+      },
+      deep: true
     }
   }
 };
diff --git a/src/views/pages/autoexec/components/common/addTarget/addtargetmixin.js b/src/views/pages/autoexec/components/common/addTarget/addtargetmixin.js
index f6c86cf628452f0ed5409c77578cef427d8cdf72..930ba222502f302983729a88a564d381918875ac 100644
--- a/src/views/pages/autoexec/components/common/addTarget/addtargetmixin.js
+++ b/src/views/pages/autoexec/components/common/addTarget/addtargetmixin.js
@@ -12,6 +12,10 @@ export default {
     defaultSearchValue: { //默认搜索条件，不可改变
       type: Object,
       default: null
+    },
+    preCondition: { //前置过滤条件
+      type: Object,
+      default: null
     }
   },
   data() {
diff --git a/src/views/pages/autoexec/components/common/addTarget/target-detail.vue b/src/views/pages/autoexec/components/common/addTarget/target-detail.vue
index 129ae7e2b329f5c16dc66df19485781c68c4e52a..6e5dd26a2198534cdf361b077aa7f4767744958b 100644
--- a/src/views/pages/autoexec/components/common/addTarget/target-detail.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/target-detail.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div>
     <TsFormItem
@@ -25,6 +24,7 @@
       :defaultValue="executeNodeConfig.filter"
       :canEdit="canEdit"
       :defaultSearchValue="defaultSearchValue"
+      :preCondition="preCondition"
     ></AddFilters>
     <!-- 参数：添加阶段的时候可以选参数 -->
     <AddParam
@@ -45,6 +45,7 @@
       :defaultValue="executeNodeConfig.inputNodeList"
       :canEdit="canEdit"
       :defaultSearchValue="defaultSearchValue"
+      :preCondition="preCondition"
     ></InputTag>
     <!-- 节点 -->
     <AddNode
@@ -54,6 +55,7 @@
       :defaultValue="executeNodeConfig.selectNodeList"
       :canEdit="canEdit"
       :defaultSearchValue="defaultSearchValue"
+      :preCondition="preCondition"
     ></AddNode>
     <!-- 上游参数 -->
     <AddPrenode
@@ -114,7 +116,8 @@ export default {
       type: Boolean,
       default: false
     },
-    prevStepList: Array
+    prevStepList: Array, 
+    preCondition: Object //前置搜索条件
   },
   data() {
     return {
diff --git a/src/views/pages/autoexec/components/common/executionMode/filters.vue b/src/views/pages/autoexec/components/common/executionMode/filters.vue
index 5e684b4da4f9de37e299ee644b0383906e6e05cf..bd0beca8fe3b5e2e9b6b824b0e351ee79bdf9138 100644
--- a/src/views/pages/autoexec/components/common/executionMode/filters.vue
+++ b/src/views/pages/autoexec/components/common/executionMode/filters.vue
@@ -81,6 +81,10 @@ export default {
     bgOp: {
       type: Boolean,
       default: true
+    },
+    preCondition: { //前置过滤条件
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -145,6 +149,9 @@ export default {
       if (!this.$utils.isEmpty(this.defaultSearchValue)) {
         Object.assign(data, this.defaultSearchValue);
       }
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        data.preCondition = this.preCondition;
+      }
       data.cmdbGroupType = this.opType;
       this.$api.autoexec.action.getNodeList(data).then(res => {
         if (res.Status == 'OK') {
@@ -170,6 +177,7 @@ export default {
       }
     },
     changeValue(val) {
+      this.$emit('change', val);
       this.complexModeSearchValue = {};
       this.searchVal = this.$utils.deepClone(val);
       this.getDataList('currentPage', 1);
@@ -180,7 +188,11 @@ export default {
       params.cmdbGroupType = this.opType;
       this.complexModeSearchValue = searchVal;
       this.loadingShow = true;
-      this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        params.preCondition = this.preCondition;
+      }
+      this.$emit('change', searchVal);
+      this.$api.autoexec.action.getNodeList(params).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
           this.$set(this.tableData, 'theadList', this.theadList);
@@ -188,6 +200,17 @@ export default {
       }).finally(() => {
         this.loadingShow = false;
       });
+    },
+    searchPreCondition() {
+      if (!this.$utils.isEmpty(this.searchVal)) {
+        if (this.searchVal.hasOwnProperty('conditionGroupList')) {
+          this.advancedModeSearch(this.searchVal);
+        } else {
+          this.searchNodeList(this.searchVal);
+        }
+      } else {
+        this.searchNodeList();
+      }
     }
   },
   computed: {
@@ -213,6 +236,12 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    preCondition: {
+      handler(val) {
+        this.searchPreCondition();
+      },
+      deep: true
     }
   }
 };
diff --git a/src/views/pages/autoexec/components/common/filter-search.vue b/src/views/pages/autoexec/components/common/filter-search.vue
index 90af3f47e0b885f9ae85f4b62a7de8a7361f69a7..71fcc7d9af93d51f410296724a3dfb3cab6cdfd8 100644
--- a/src/views/pages/autoexec/components/common/filter-search.vue
+++ b/src/views/pages/autoexec/components/common/filter-search.vue
@@ -17,6 +17,7 @@
       :isRequired="isRequired"
       :readonly="readonly"
       :showSearchNumber="showSearchNumber"
+      :searchText="searchText"
       @change="simpleModeSearch"
       @switchMode="switchMode"
     >
@@ -29,6 +30,7 @@
       :searchList="searchList"
       :disabledUuidList="disabledUuidList"
       :disabledGroupUuidList="disabledGroupUuidList"
+      :searchText="searchText"
       class="advanced-mode-search-filter-btn"
       @search="advancedModeSearch"
       @switchMode="switchMode"
@@ -62,7 +64,13 @@ export default {
       type: Boolean,
       default: false
     },
-    showSearchNumber: Number
+    showSearchNumber: Number,
+    searchText: {
+      type: String,
+      default() {
+        return this.$t('page.search');
+      }
+    }
   },
   data() {
     return {
@@ -195,18 +203,6 @@ export default {
       disabledUuidList: [], // 复杂模式，禁用的搜索条件
       disabledGroupUuidList: [],
       searchList: [
-        {
-          name: 'typeIdList',
-          type: 'tree',
-          label: this.$t('term.cmdb.citype'),
-          search: true,
-          transfer: true,
-          multiple: true,
-          textName: 'label',
-          valueName: 'id',
-          url: '/api/rest/resourcecenter/resourcetype/tree',
-          validateList: [{name: 'required', message: ''}]
-        },
         {
           name: 'appSystemIdList',
           type: 'select',
@@ -249,48 +245,33 @@ export default {
           validateList: [{name: 'required', message: ''}]
         },
         {
-          name: 'protocolIdList',
+          name: 'inspectStatusList',
           type: 'select',
-          label: this.$t('page.protocol'),
+          label: this.$t('term.autoexec.inspectstatus'),
           search: true,
           transfer: true,
           defaultValue: [],
-          rootName: 'tbodyList',
           multiple: true,
-          dealDataByUrl: 'getProtocolDataList',
           className: 'block-span',
-          dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
+          params: {
+            'enumClass': 'neatlogic.framework.common.constvalue.InspectStatus'
+          },
+          url: '/api/rest/universal/enum/get',
           validateList: [{name: 'required', message: ''}]
         },
         {
-          name: 'tagIdList',
-          type: 'select',
-          label: this.$t('page.tag'),
-          search: true,
-          textName: 'name',
-          transfer: true,
-          valueName: 'id',
-          defaultValue: [],
-          rootName: 'tbodyList',
-          multiple: true,
-          dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
-          validateList: [{name: 'required', message: ''}]
+          name: 'ip',
+          type: 'input',
+          label: this.$t('page.ip'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
         },
         {
-          name: 'stateIdList',
-          type: 'select',
-          label: this.$t('term.autoexec.assetstatus'),
-          search: true,
-          transfer: true,
-          defaultValue: [],
-          multiple: true,
-          className: 'block-span',
-          url: '/api/rest/resourcecenter/state/list/forselect',
-          params: { needPage: false },
-          rootName: 'tbodyList',
-          textName: 'name',
-          valueName: 'id',
-          validateList: [{name: 'required', message: ''}]
+          name: 'name',
+          type: 'input',
+          label: this.$t('page.name'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
         },
         {
           name: 'vendorIdList',
@@ -310,95 +291,50 @@ export default {
           validateList: [{name: 'required', message: ''}]
         },
         {
-          name: 'inspectStatusList',
+          name: 'tagIdList',
           type: 'select',
-          label: this.$t('term.autoexec.inspectstatus'),
+          label: this.$t('page.tag'),
           search: true,
+          textName: 'name',
           transfer: true,
+          valueName: 'id',
           defaultValue: [],
+          rootName: 'tbodyList',
           multiple: true,
-          className: 'block-span',
-          params: {
-            'enumClass': 'neatlogic.framework.common.constvalue.InspectStatus'
-          },
-          url: '/api/rest/universal/enum/get',
-          validateList: [{name: 'required', message: ''}]
-        },
-        {
-          name: 'port',
-          type: 'input',
-          label: this.$t('page.port'),
-          validateList: [{name: 'required', message: ''}],
-          maxlength: 256
-        },
-        {
-          name: 'ip',
-          type: 'input',
-          label: this.$t('page.ip'),
-          validateList: [{name: 'required', message: ''}],
-          maxlength: 256
-        },
-        {
-          name: 'name',
-          type: 'input',
-          label: this.$t('page.name'),
-          validateList: [{name: 'required', message: ''}],
-          maxlength: 256
-        },
-        {
-          name: 'description',
-          type: 'input',
-          label: this.$t('page.description'),
-          validateList: [{name: 'required', message: ''}],
-          maxlength: 256
-        },
-        {
-          name: 'networkArea',
-          type: 'input',
-          label: this.$t('page.networkarea'),
-          validateList: [{name: 'required', message: ''}],
-          maxlength: 256
-        },
-        {
-          name: 'maintenanceWindow',
-          type: 'datetimerange',
-          label: this.$t('term.autoexec.maintenanceperiod'),
-          format: 'yyyy-MM-dd HH:mm',
+          dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
           validateList: [{name: 'required', message: ''}]
         },
         {
-          name: 'ownerList',
+          name: 'protocolIdList',
           type: 'select',
-          label: this.$t('page.owner'),
+          label: this.$t('page.protocol'),
           search: true,
           transfer: true,
-          multiple: true,
-          dynamicUrl: '/api/rest/user/search/forselect',
+          defaultValue: [],
           rootName: 'tbodyList',
-          textName: 'userName',
-          valueName: 'uuid',
-          params: {
-            needPage: true
-          },
+          multiple: true,
+          dealDataByUrl: 'getProtocolDataList',
+          className: 'block-span',
+          dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
           validateList: [{name: 'required', message: ''}]
         },
         {
-          name: 'bgList',
+          name: 'stateIdList',
           type: 'select',
-          label: this.$t('term.autoexec.subordinatedepartment'),
+          label: this.$t('term.autoexec.assetstatus'),
           search: true,
           transfer: true,
+          defaultValue: [],
           multiple: true,
-          dynamicUrl: '/api/rest/team/search',
-          rootName: 'teamList',
+          className: 'block-span',
+          url: '/api/rest/resourcecenter/state/list/forselect',
+          params: { needPage: false },
+          rootName: 'tbodyList',
           textName: 'name',
-          valueName: 'uuid',
-          params: {
-            needPage: true,
-            level: 'department'
-          },
+          valueName: 'id',
           validateList: [{name: 'required', message: ''}]
-        }]
+        }
+      ]
     };
   },
   beforeCreate() {},
@@ -486,10 +422,10 @@ export default {
       handler(val) {
         this.isSimpleMode = true; // 重置简单模式，防止编辑执行目标时，模式回显不正确问题
         if (val) {
-          if (val && val.hasOwnProperty('conditionGroupList')) {
+          if (val && val.hasOwnProperty('conditionGroupList') && !this.$utils.isEmpty(val.conditionGroupList) && !this.$utils.isSame(val, this.complexSearchVal)) {
             this.complexSearchVal = this.$utils.deepClone(val);
             this.isSimpleMode = !this.isSimpleMode;
-          } else {
+          } else if (!this.$utils.isSame(val, this.searchVal)) {
             this.searchVal = this.$utils.deepClone(val);
           }
         }
@@ -500,7 +436,7 @@ export default {
     defaultSearchValue: {
       handler(val) {
         if (val) {
-          if (val && val.hasOwnProperty('conditionGroupList')) {
+          if (val && val.hasOwnProperty('conditionGroupList') && !this.$utils.isEmpty(val.conditionGroupList)) {
             this.isSimpleMode = true;
             this.isSimpleMode = !this.isSimpleMode;
             this.complexInit(); // 复杂模式设置禁用值
diff --git a/src/views/pages/autoexec/components/common/targetView/target-filter.vue b/src/views/pages/autoexec/components/common/targetView/target-filter.vue
index 2866cca4b2d9bac1da232abe722270d2b92bbf80..1aac87e435033ef87a8c172385aef22ddc6a76f8 100644
--- a/src/views/pages/autoexec/components/common/targetView/target-filter.vue
+++ b/src/views/pages/autoexec/components/common/targetView/target-filter.vue
@@ -1,6 +1,20 @@
 
 <template>
   <div>
+    <TsFormItem v-if="!$utils.isEmpty(preCondition)" :label="$t('term.autoexec.precondition')" labelPosition="left">
+      <FilterSearch
+        :defaultValue="preCondition"
+        :readonly="true"
+        :showSearchNumber="3"
+      ></FilterSearch>
+    </TsFormItem>
+    <TsFormItem v-else-if="!$utils.isEmpty(globalPreCondition)" :label="$t('term.autoexec.globalprecondition')" labelPosition="left">
+      <FilterSearch
+        :defaultValue="globalPreCondition"
+        :readonly="true"
+        :showSearchNumber="3"
+      ></FilterSearch>
+    </TsFormItem>
     <div class="pb-md">
       <FilterSearch
         :defaultValue="searchVal"
@@ -42,12 +56,15 @@ export default {
   name: '',
   components: {
     FilterSearch,
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem')
   },
   filters: {
   },
   props: {
-    config: Object
+    config: Object,
+    preCondition: Object,
+    globalPreCondition: Object //全局前置过滤器
   },
   data() {
     return {
@@ -96,6 +113,11 @@ export default {
       if (param) {
         Object.assign(data, param);
       }
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        data.preCondition = this.preCondition;
+      } else if (!this.$utils.isEmpty(this.globalPreCondition)) {
+        data.preCondition = this.globalPreCondition;
+      }
       this.$api.autoexec.action.getNodeList(data).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
@@ -141,7 +163,12 @@ export default {
       params.cmdbGroupType = this.opType;
       this.complexModeSearchValue = searchVal;
       this.loadingShow = true;
-      this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
+      if (!this.$utils.isEmpty(this.preCondition)) {
+        params.preCondition = this.preCondition;
+      } else if (!this.$utils.isEmpty(this.globalPreCondition)) {
+        params.preCondition = this.globalPreCondition;
+      }
+      this.$api.autoexec.action.getNodeList(params).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
           this.$set(this.tableData, 'theadList', this.theadList);
diff --git a/src/views/pages/autoexec/components/common/targetView/target.vue b/src/views/pages/autoexec/components/common/targetView/target.vue
index 9d6e3bf803f7f066d344cdf3e76b94da6ea1f2bd..a78570ff5c886ccb77f52425bd5325ce1972e5b0 100644
--- a/src/views/pages/autoexec/components/common/targetView/target.vue
+++ b/src/views/pages/autoexec/components/common/targetView/target.vue
@@ -1,7 +1,12 @@
 
 <template>
   <div v-if="config">
-    <div :is="getNodeHandler()" :config="config"></div>
+    <div
+      :is="getNodeHandler()"
+      :config="config"
+      :preCondition="preCondition"
+      :globalPreCondition="globalPreCondition"
+    ></div>
   </div>
 </template>
 <script>
@@ -15,7 +20,9 @@ export default {
   filters: {
   },
   props: {
-    config: Object
+    config: Object,
+    preCondition: Object,
+    globalPreCondition: Object //全局前置过滤器
   },
   data() {
     return {
diff --git a/src/views/pages/autoexec/components/param/edit/node/add-node.vue b/src/views/pages/autoexec/components/param/edit/node/add-node.vue
index 9874b78f9906f6cad0c09f609427b2ff4bc0b919..839bbfd197bcd81b21bd5768a47a603f07bad8ea 100644
--- a/src/views/pages/autoexec/components/param/edit/node/add-node.vue
+++ b/src/views/pages/autoexec/components/param/edit/node/add-node.vue
@@ -225,7 +225,7 @@ export default {
         ...complexModeSearchValue
       };
       this.loading = true;
-      this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
+      this.$api.autoexec.action.getNodeList(params).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
           this.$set(this.tableData, 'theadList', this.theadList);
diff --git a/src/views/pages/autoexec/detail/action-detail.vue b/src/views/pages/autoexec/detail/action-detail.vue
index d56fc70a7ddcd6ea037eb180bc17f35efa97ebc1..e5e8f6bfeb5369f55ca9cabb0ed26cb8ef88aa0f 100644
--- a/src/views/pages/autoexec/detail/action-detail.vue
+++ b/src/views/pages/autoexec/detail/action-detail.vue
@@ -126,6 +126,7 @@
           :canEdit="effectiveEditable && operationType == 'combop' ? true : false"
           :execModeList="execModeList"
           :runtimeParamList="runtimeParamList"
+          :globalPreCondition="executeConfig?executeConfig.preCondition:null"
           @updateSort="updateSort"
           @change="changeSelectStep"
         ></StepList>
@@ -187,6 +188,7 @@
                 :currentGroupConfig="currentGroupConfig"
                 :runtimeParamList="runtimeParamList"
                 :canEdit="effectiveEditable && operationType == 'combop' ? true : false"
+                :globalPreCondition="executeConfig?executeConfig.preCondition:null"
                 @save="saveCurrentGroupConfig"
               ></StepGroup>
             </div>
diff --git a/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue b/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue
index baceb77aec2636ee0b39f29002384ae6a40df511..71d8b119a770ee00fdb5c356fdd8c2110cd14928 100644
--- a/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue
@@ -45,6 +45,17 @@
                 {{ $t('page.autoexeccomboprunnergrouptips') }}
               </div>
             </template>
+            <template v-slot:preCondition>
+              <div>
+                <div v-if="!isEditSetting && $utils.isEmpty(preCondition)">-</div>
+                <PreconditionDetail
+                  ref="preconditionDetail"
+                  :canEdit="isEditSetting"
+                  :defaultValue="preCondition"
+                  @changeValue="changePreConditionValue"
+                ></PreconditionDetail>
+              </div>
+            </template>
           </TsForm>
         </div>
         <div v-if="settingConfig.whenToSpecify == 'now'" class="execute-main">
@@ -57,18 +68,10 @@
               :type="settingConfig.whenToSpecify"
               :required="true"
               :labelWidth="113"
+              :preCondition="preCondition"
             ></TargetDetail>
           </div>
         </div>
-        <div v-else-if="settingConfig.whenToSpecify == 'runtime'" class="execute-main">
-          <div class="target-detail">
-            <Filters
-              ref="runtimeFilter"
-              :tipText="$t('term.autoexec.setfilterexecutelimitdesc')"
-              :defaultValue="runtimeFilter"
-            ></Filters>
-          </div>
-        </div>
         <div v-else-if="settingConfig.whenToSpecify == 'runtimeparam'" class="execute-main">
           <div class="target-detail">
             <ExecutionModeParam
@@ -108,11 +111,11 @@ export default {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
     TargetDetail: () => import('@/views/pages/autoexec/components/common/addTarget/target-detail'),
     ExecutionModeParam: () => import('@/views/pages/autoexec/components/common/executionMode/param'),
-    Filters: () => import('@/views/pages/autoexec/components/common/executionMode/filters'),
     TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue'),
     ExecuteuserSetting: () => import('./executeuser-setting.vue'),
     RunnerGroupSetting: () => import('./runnergroup-setting.vue'),
-    RunnerGroupTagSetting: () => import('./runnergrouptag-setting.vue')
+    RunnerGroupTagSetting: () => import('./runnergrouptag-setting.vue'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue')
   },
   filters: {},
   props: {
@@ -207,6 +210,11 @@ export default {
           dataList: this.$utils.getRoundCountList(),
           labelWidth: '113'
         },
+        preCondition: {
+          type: 'slot',
+          label: this.$t('term.autoexec.precondition'),
+          labelWidth: '113'
+        },
         whenToSpecify: {
           type: 'radio',
           label: this.$t('term.autoexec.choosethetime'),
@@ -229,12 +237,13 @@ export default {
         roundCount: null,
         parallelCount: null,
         whenToSpecify: 'runtime',
+        preCondition: null,
         executeNodeConfig: {}
       },
       isValid: false,
       resultList: [],
       nodeTypeParamList: [], //可选的节点参数
-      runtimeFilter: {}
+      preCondition: null
     };
   },
   beforeCreate() {},
@@ -266,9 +275,7 @@ export default {
             this.$set(this.form.parallelCount, 'isHidden', false);
           }
         });
-        if (this.settingConfig.whenToSpecify == 'runtime') {
-          this.runtimeFilter = this.settingConfig.executeNodeConfig.filter || {};
-        }
+        this.preCondition = this.$utils.deepClone(this.settingConfig['preCondition']);
       }
       this.loadingShow = false;
     },
@@ -291,13 +298,12 @@ export default {
       this.$set(this.settingConfig, 'executeUser', this.$refs.executeUser.save());
       this.$set(this.settingConfig, 'runnerGroup', this.$refs.runnerGroup.save());
       this.$set(this.settingConfig, 'runnerGroupTag', this.$refs.runnerGroupTag.save());
+      this.$set(this.settingConfig, 'preCondition', !this.$utils.isEmpty(this.preCondition) ? this.preCondition : null);
+
       this.settingConfig.executeNodeConfig = {};
       if (this.settingConfig.whenToSpecify == 'now') {
         this.validSetting(true);
       } else if (this.settingConfig.whenToSpecify == 'runtime') {
-        let filterValue = this.$refs.runtimeFilter.save();
-        let complexModeSearchValue = this.$refs.runtimeFilter.getComplexModeSearchValue(); // 获取复杂模式搜索值
-        this.$set(this.settingConfig.executeNodeConfig, 'filter', complexModeSearchValue && !this.$utils.isEmptyObj(complexModeSearchValue) ? complexModeSearchValue : filterValue);
         this.save();
       } else if (this.settingConfig.whenToSpecify == 'runtimeparam') {
         let paramList = this.$refs.runtimeparam.save();
@@ -389,6 +395,9 @@ export default {
           this.$set(this.form.parallelCount, 'isHidden', false);
         }
       });
+    },
+    changePreConditionValue(val) {
+      this.preCondition = val;
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/detail/actionDetail/precondition-detail.vue b/src/views/pages/autoexec/detail/actionDetail/precondition-detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f6b9ba844fee977ebd59633b8037eda5573022c0
--- /dev/null
+++ b/src/views/pages/autoexec/detail/actionDetail/precondition-detail.vue
@@ -0,0 +1,125 @@
+<template>
+  <div>
+    <div class="flex-start">
+      <Filters
+        v-if="!$utils.isEmpty(preCondition)"
+        ref="filterMain"
+        :defaultValue="preCondition"
+        :readonly="true"
+        :bgOp="false"
+        class="nopadding overflow"
+      ></Filters>
+      <Button
+        v-if="canEdit && $utils.isEmpty(preCondition)"
+        type="primary"
+        ghost
+        @click="addData()"
+      ><span class="tsfont-plus text-href">{{ $t('page.condition') }}</span>
+      </Button>
+      <div class="pl-xs" style="flex: none;">
+        <span v-if="!canEdit && !$utils.isEmpty(preCondition)" class="text-tip-active pl-xs" @click="editData()">{{ $t('page.viewdetails') }}</span>
+        <span
+          v-if="canEdit && !$utils.isEmpty(preCondition)"
+          class="tsfont-edit-s text-tip-active pl-xs"
+          :title="$t('page.edit')"
+          @click="editData()"
+        ></span>
+        <span v-if="canEdit && !$utils.isEmpty(preCondition)" class="text-href pl-xs" @click="clearData()">{{ $t('page.clear') }}</span>
+      </div>
+    </div>
+    <TsDialog
+      v-if="isShow"
+      type="slider"
+      :isShow="true"
+      width="medium"
+      :title="$t('page.detail')"
+      :hasFooter="canEdit"
+      :maskClose="!canEdit"
+      @on-close="isShow = false"
+      @on-ok="onOk()"
+    >
+      <Filters
+        ref="filterMain"
+        :defaultValue="preCondition"
+        :bgOp="false"
+        class="nopadding overflow"
+        @change="changeValue"
+      ></Filters>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    Filters: () => import('@/views/pages/autoexec/components/common/executionMode/filters.vue')
+  },
+  props: {
+    canEdit: {
+      type: Boolean,
+      default: false
+    },
+    defaultValue: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      isShow: false,
+      preCondition: null,
+      currentPreCondition: null
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeValue(val) {
+      this.currentPreCondition = val;
+    },
+    addData() {
+      this.isShow = true;
+      this.currentPreCondition = null;
+    },
+    editData() {
+      this.isShow = true;
+      this.currentPreCondition = this.$utils.deepClone(this.preCondition);
+    },
+    onOk() {
+      this.$emit('changeValue', this.currentPreCondition);
+      this.isShow = false;
+    },
+    clearData() {
+      this.preCondition = null;
+      this.$emit('changeValue', null);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {
+    defaultValue: {
+      handler(val) {
+        if (!this.$utils.isSame(val, this.preCondition)) {
+          this.preCondition = this.$utils.deepClone(val);
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.nopadding {
+  padding: 0 !important;
+}
+</style>
diff --git a/src/views/pages/autoexec/detail/actionDetail/step-group.vue b/src/views/pages/autoexec/detail/actionDetail/step-group.vue
index 05617862529bc1e31a9d73d1af3db0b533fcf319..40e8ebea826d0159523339095e74eb0c2426cc54 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step-group.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step-group.vue
@@ -5,7 +5,7 @@
       <div class="pr-xs">{{ $t('term.autoexec.stagegroup') }}</div>
       <div class="group-sort border-color">{{ currentGroupConfig.sort + 1 }}</div>
     </div>
-    <TsFormItem :label="$t('term.deploy.executivestrategy')" labelWidth="80" :required="true">
+    <TsFormItem :label="$t('term.deploy.executivestrategy')" labelWidth="100" :required="true">
       <TsFormSelect
         v-model="groupPolicy"
         :dataList="dataList"
@@ -33,7 +33,16 @@
         </div>
       </div>
       <template v-if="groupConfig.config.executeConfig && !$utils.isEmpty(groupConfig.config.executeConfig)">
-        <TsFormItem :label="$t('term.autoexec.executetarget')" labelWidth="80" class="">
+        <TsFormItem :label="$t('term.autoexec.precondition')" labelWidth="100">
+          <template v-if="!$utils.isEmpty(groupConfig.config.executeConfig.preCondition)">
+            <PreconditionDetail
+              :defaultValue="groupConfig.config.executeConfig.preCondition"
+              :canEdit="false"
+            ></PreconditionDetail>
+          </template>
+          <template v-else>-</template>
+        </TsFormItem>
+        <TsFormItem :label="$t('term.autoexec.executetarget')" labelWidth="100">
           <template v-if="!$utils.isEmpty(groupConfig.config.executeConfig.executeNodeConfig)">
             <template v-if="groupConfig.config.executeConfig.executeNodeConfig.filter">
               <Filters
@@ -43,7 +52,7 @@
                 :showSearchNumber="2"
                 class="nopadding"
               ></Filters>
-              <div class="text-right text-tip-active" @click="moreVisible=true">{{ $t('page.viewdetails') }}</div>
+              <div class="text-right text-tip-active" @click="lookDetail()">{{ $t('page.viewdetails') }}</div>
             </template>
             <template v-else-if="groupConfig.config.executeConfig.executeNodeConfig.selectNodeList">
               <NodeView :list="groupConfig.config.executeConfig.executeNodeConfig.selectNodeList"></NodeView>
@@ -68,19 +77,19 @@
           </template>
           <template v-else>-</template>
         </TsFormItem>
-        <TsFormItem :label="$t('page.whitelist')" labelWidth="80">
+        <TsFormItem :label="$t('page.whitelist')" labelWidth="100">
           <template v-if="!$utils.isEmpty(groupConfig.config.executeConfig.whitelist)">
             <NodeView :list="groupConfig.config.executeConfig.whitelist"></NodeView>
           </template>
           <template v-else>-</template>
         </TsFormItem>
-        <TsFormItem :label="$t('page.blacklist')" labelWidth="80">
+        <TsFormItem :label="$t('page.blacklist')" labelWidth="100">
           <template v-if="!$utils.isEmpty(groupConfig.config.executeConfig.blacklist)">
             <NodeView :list="groupConfig.config.executeConfig.blacklist"></NodeView>
           </template>
           <template v-else>-</template>
         </TsFormItem>
-        <TsFormItem :label="$t('page.protocol')" labelWidth="80">
+        <TsFormItem :label="$t('page.protocol')" labelWidth="100">
           <template v-if="!$utils.isEmpty(groupConfig.config.executeConfig.protocolId)">
             <TsFormSelect
               v-bind="executeForm.itemList.protocolId"
@@ -90,7 +99,7 @@
           </template>
           <template v-else>-</template>
         </TsFormItem>
-        <TsFormItem :label="$t('page.executeuser')" labelWidth="80">
+        <TsFormItem :label="$t('page.executeuser')" labelWidth="100">
           <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.executeUser)">
             <ExecuteuserSetting
               :config="groupConfig.config.executeConfig.executeUser"
@@ -100,19 +109,19 @@
           </div>
           <div v-else>-</div>
         </TsFormItem>
-        <TsFormItem :label="$t('page.autoexecparallpolicy')" labelWidth="80">
+        <TsFormItem :label="$t('page.autoexecparallpolicy')" labelWidth="100">
           <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.parallelPolicy)">
             {{ getParallelPolicyText(groupConfig.config.executeConfig.parallelPolicy) }}
           </div>
           <div v-else>-</div>
         </TsFormItem>
-        <TsFormItem v-if="groupConfig.config.executeConfig.parallelPolicy === 'roundCount'" :label="$t('term.autoexec.batchquantity')" labelWidth="80">
+        <TsFormItem v-if="groupConfig.config.executeConfig.parallelPolicy === 'roundCount'" :label="$t('term.autoexec.batchquantity')" labelWidth="100">
           <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.roundCount)">
             {{ getRoundCountText(groupConfig.config.executeConfig.roundCount) }}
           </div>
           <div v-else>-</div>
         </TsFormItem>
-        <TsFormItem v-else :label="$t('term.autoexec.parall')" labelWidth="80">
+        <TsFormItem v-else :label="$t('term.autoexec.parall')" labelWidth="100">
           <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.parallelCount)">
             {{ getRoundCountText(groupConfig.config.executeConfig.parallelCount) }}
           </div>
@@ -149,6 +158,17 @@
                     :runtimeParamList="runtimeParamList"
                   ></ExecuteuserSetting>
                 </template>
+                <template v-slot:preCondition>
+                  <FilterSearch
+                    ref="preCondition"
+                    :defaultValue="executeConfig.preCondition"
+                    :readonly="!canEdit"
+                    :searchText="$t('page.confirm')"
+                    @changeValue="changePreConditionValue"
+                    @advancedModeSearch="changePreConditionValue"
+                  ></FilterSearch>
+                  <div class="text-tip">{{ $t('term.autoexec.preconditiontip') }}</div>
+                </template>
               </TsForm>
             </div>
             <div>
@@ -157,7 +177,10 @@
                 ref="targetDetail"
                 :canEdit="canEdit"
                 :config="executeConfig.executeNodeConfig"
+                :preCondition="executeConfig.preCondition || globalPreCondition"
                 :isAddParam="true"
+                :labelWidth="100"
+                :required="!$utils.isEmpty(executeConfig.preCondition)"
               ></TargetDetail>
             </div>
           </div>
@@ -190,11 +213,11 @@
       </template>
       <template v-slot:footer>
         <Button @click="close()">{{ $t('page.cancel') }}</Button>
-        <Button
+        <!-- <Button
           type="primary"
           ghost
           @click="validSetting()"
-        >{{ $t('page.validate') }}</Button>
+        >{{ $t('page.validate') }}</Button> -->
         <Button type="primary" @click="save()">{{ $t('page.confirm') }}</Button>
       </template>
     </TsDialog>
@@ -208,7 +231,7 @@
       :maskClose="true"
       @on-close="moreVisible = false"
     >
-      <TargetView :config="groupConfig.config.executeConfig.executeNodeConfig"></TargetView>
+      <TargetView :config="groupConfig.config.executeConfig.executeNodeConfig" :preCondition="executeConfig.preCondition" :globalPreCondition="globalPreCondition"></TargetView>
     </TsDialog>
     <TargetValid
       v-if="isValid"
@@ -233,7 +256,9 @@ export default {
     Filters: () => import('@/views/pages/autoexec/components/common/executionMode/filters.vue'),
     TargetView: () => import('@/views/pages/autoexec/components/common/targetView/target.vue'),
     TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue'),
-    ExecuteuserSetting: () => import('./executeuser-setting.vue')
+    ExecuteuserSetting: () => import('./executeuser-setting.vue'),
+    FilterSearch: () => import('@/views/pages/autoexec/components/common/filter-search.vue'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue')
   },
   filters: {
   },
@@ -241,7 +266,8 @@ export default {
     id: [Number, String],
     canEdit: Boolean,
     currentGroupConfig: Object,
-    runtimeParamList: Array //运行参数
+    runtimeParamList: Array, //运行参数
+    globalPreCondition: Object //全局前置过滤器
   },
   data() {
     let _this = this;
@@ -250,7 +276,7 @@ export default {
       dataList: [],
       executeForm: {
         labelPosition: 'left',
-        labelWidth: 80,
+        labelWidth: 100,
         itemList: {
           protocolId: {
             type: 'select',
@@ -305,6 +331,10 @@ export default {
             desc: this.$t('term.autoexec.paralldesc'),
             dataList: this.$utils.getRoundCountList(),
             isHidden: true
+          },
+          preCondition: {
+            type: 'slot',
+            label: this.$t('term.autoexec.precondition')
           }
         }
       },
@@ -365,7 +395,8 @@ export default {
         parallelPolicy: null,
         executeNodeConfig: {},
         whitelist: [],
-        blacklist: []
+        blacklist: [],
+        preCondition: null
       };
     },
     addTarget() {
@@ -492,7 +523,10 @@ export default {
     },
     async save() {
       this.isValid = false;
-      await this.validSetting(true);
+      if (!this.$refs.targetDetail.valid()) {
+        return;
+      }
+      // await this.validSetting(true);//废弃接口校验规则
       if (this.isValid) {
         return;
       } else {
@@ -518,6 +552,18 @@ export default {
           this.$set(this.executeForm.itemList.parallelCount, 'isHidden', false);
         }
       });
+    },
+    changePreConditionValue(val) {
+      this.$set(this.executeConfig, 'preCondition', !this.$utils.isEmpty(val) ? val : null);
+    },
+    lookDetail() {
+      if (!this.executeConfig) {
+        this.executeConfig = {};
+      }
+      if (this.groupConfig.config && this.groupConfig.config.executeConfig) {
+        this.executeConfig.preCondition = this.groupConfig.config.executeConfig.preCondition;
+      }
+      this.moreVisible = true;
     }
   },
   computed: {
@@ -599,11 +645,13 @@ export default {
     width: 100%;
   }
 }
-::v-deep .tag-item-text{
+.step-group {
+  ::v-deep .tag-item-text{
   display: block !important;
-  &:not(:last-of-type){
-    margin-right: 0 !important;
-    margin-bottom: 10px;
+    &:not(:last-of-type){
+      margin-right: 0 !important;
+      margin-bottom: 10px;
+    }
   }
 }
 .param-item {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
index 8ea62f2421be073e24ee7c6f87e9a4d647ee20fe..3de2f77075785873c2a8f8d6fbd94756c3b3dd9e 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
@@ -80,6 +80,15 @@
                       :runtimeParamList="runtimeParamList"
                     ></ExecuteuserSetting>
                   </template>
+                  <template v-slot:preCondition>
+                    <PreconditionDetail
+                      ref="preCondition"
+                      :defaultValue="preCondition"
+                      :canEdit="canEdit"
+                      @changeValue="changePreConditionValue"
+                    ></PreconditionDetail>
+                    <div class="text-tip">{{ $t('term.autoexec.preconditiontip') }}</div>
+                  </template>
                 </TsForm>
                 <div class="pt-nm">
                   <TargetDetail
@@ -92,6 +101,8 @@
                     :isAddPrenode="prevStepList.length > 0 ? true : false"
                     :prevStepList="prevStepList"
                     :runtimeParamList="runtimeParamList"
+                    :preCondition="preCondition || globalPreCondition"
+                    :required="!$utils.isEmpty(preCondition)"
                   ></TargetDetail>
                 </div>
               </template>
@@ -139,12 +150,12 @@
       </template>
       <template v-slot:footer>
         <Button @click="close()">{{ $t('page.cancel') }}</Button>
-        <Button
+        <!-- <Button
           v-if="editConfig.execMode !='runner'"
           type="primary"
           ghost
           @click="validSetting()"
-        >{{ $t('page.validate') }}</Button>
+        >{{ $t('page.validate') }}</Button> -->
         <Button type="primary" @click="ok()">{{ $t('page.confirm') }}</Button>
       </template>
     </TsDialog>
@@ -172,7 +183,8 @@ export default {
     TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
     ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'),
     RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
-    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue')
+    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue')
   },
   filters: {},
   props: {
@@ -203,7 +215,8 @@ export default {
       type: Array,
       default: () => []
     },
-    runtimeParamList: Array
+    runtimeParamList: Array,
+    globalPreCondition: Object //全局前置过滤器
   },
   data() {
     let _this = this;
@@ -299,6 +312,10 @@ export default {
           label: this.$t('term.autoexec.parall'),
           desc: this.$t('term.autoexec.paralldesc'),
           dataList: this.$utils.getRoundCountList()
+        },
+        preCondition: {
+          type: 'slot',
+          label: this.$t('term.autoexec.precondition')
         }
       },
       executeConfig: {
@@ -311,7 +328,8 @@ export default {
         executeNodeConfig: {},
         isPresetRunnerGroup: 0,
         runnerGroup: null,
-        runnerGroupTag: null
+        runnerGroupTag: null,
+        preCondition: null
 
       },
       isValid: false, // 校验执行目标
@@ -324,7 +342,8 @@ export default {
         mappingMode: 'constant',
         value: '',
         text: ''
-      }
+      },
+      preCondition: null
     };
   },
   beforeCreate() {},
@@ -341,6 +360,7 @@ export default {
             this.executeConfig[key] = this.config.config.executeConfig[key];
           }
         });
+        this.preCondition = !this.$utils.isEmpty(this.executeConfig.preCondition) ? this.$utils.deepClone(this.executeConfig.preCondition) : null;
         if (!this.$utils.isEmpty(this.executeConfig.runnerGroup) || !this.$utils.isEmpty(this.executeConfig.runnerGroupTag)) {
           this.$set(this.executeConfig, 'isPresetRunnerGroup', 1);
         }
@@ -395,7 +415,7 @@ export default {
       } else {
         this.executeConfig.parallelCount = null;
       }
-   
+      this.executeConfig.preCondition = !this.$utils.isEmpty(this.preCondition) ? this.preCondition : null;
       if (this.$refs.form.valid()) {
         let editConfig = this.$utils.deepClone(this.editConfig);
         if (editConfig.policy && (!this.groupConfig || this.groupConfig.policy != 'grayScale' || (this.editConfig.execMode && this.editConfig.execMode != 'runner' && this.editConfig.execMode != 'sqlfile'))) {
@@ -485,14 +505,12 @@ export default {
         }
       });
     },
-    async ok() {
-      this.isValid = false;
-      (this.editConfig.execMode != 'runner') && (await this.validSetting(true));
-      if (this.isValid) {
+    ok() {
+      if (!this.$utils.isEmpty(this.preCondition) && this.$refs.targetDetail && !this.$refs.targetDetail.valid()) {
         return;
-      } else {
-        this.confirmEdit();
       }
+      // (this.editConfig.execMode != 'runner') && (await this.validSetting(true)); //废弃接口校验规则
+      this.confirmEdit();
     },
     saveValid() { //校验完成，保存
       this.confirmEdit();
@@ -521,6 +539,9 @@ export default {
           this.$set(this.executeForm.parallelCount, 'isHidden', false);
         }
       });
+    },
+    changePreConditionValue(val) { 
+      this.preCondition = !this.$utils.isEmpty(val) ? val : null;
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/step-list.vue b/src/views/pages/autoexec/detail/actionDetail/step/step-list.vue
index aeabacb059af11a6ffe4fc4ff08ef94359cba8ed..98804203be90ffa9f21217016198cd7971890b63 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/step-list.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/step-list.vue
@@ -98,6 +98,7 @@
       :groupConfig="groupConfig"
       :prevStepList="getPrev(editConfig, stepList)"
       :runtimeParamList="runtimeParamList"
+      :globalPreCondition="globalPreCondition"
       @close="close"
     ></StepEdit>
   </div>
@@ -145,7 +146,8 @@ export default {
       type: Array
     },
     scrollLeft: Number,
-    runtimeParamList: Array
+    runtimeParamList: Array,
+    globalPreCondition: Object //全局前置条件
   },
   data() {
     return {
diff --git a/src/views/pages/autoexec/detail/runner-detail.vue b/src/views/pages/autoexec/detail/runner-detail.vue
index 01b02d7541c9292ce409fb031070162af3f82a79..603b8a6f4c209a63a8f109df84d4d7b4bce66bdf 100644
--- a/src/views/pages/autoexec/detail/runner-detail.vue
+++ b/src/views/pages/autoexec/detail/runner-detail.vue
@@ -60,7 +60,7 @@
           <div>
             <TsFormItem
               :label="$t('page.autoexecparallpolicy')"
-              :labelWidth="100"
+              :labelWidth="110"
               labelPosition="left"
               :required="true"
             >
@@ -74,7 +74,7 @@
           <div v-if="parallelPolicy !== 'roundCount'">
             <TsFormItem
               :label="$t('term.autoexec.parall')"
-              :labelWidth="100"
+              :labelWidth="110"
               labelPosition="left"
               :required="true"
             >
@@ -88,7 +88,7 @@
           <div v-else>
             <TsFormItem
               :label="$t('term.autoexec.batchquantity')"
-              :labelWidth="100"
+              :labelWidth="110"
               labelPosition="left"
               :required="true"
             >
@@ -151,7 +151,18 @@
         </div>
         <div>
           <Divider orientation="start">{{ $t('term.autoexec.executetarget') }}</Divider>
-          <div v-if="needExecuteNode" class="box-block">
+          <TsFormItem
+            v-if="!$utils.isEmpty(preCondition)"
+            :label="$t('term.autoexec.precondition')"
+            :labelWidth="110"
+            labelPosition="left"
+          >
+            <PreconditionDetail
+              :defaultValue="preCondition"
+              :canEdit="false"
+            ></PreconditionDetail>
+          </TsFormItem>
+          <div v-if="needExecuteNode" class="box-block"> 
             <AddTarget
               :id="actionId"
               ref="addTarget"
@@ -162,6 +173,7 @@
               :runtimeParamList="runtimeParamList"
               :needBorder="needExecuteUser|| needProtocol"
               :filterSearchValue="filterSearchValue"
+              :preCondition="preCondition"
             ></AddTarget>
           </div>
           <div v-else class="box-block text-tip">
@@ -289,7 +301,8 @@ export default {
     ExpiredReasonAlert: () => import('./expired-reason-alert'),
     ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'),
     RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
-    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue')
+    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue')
   },
   filters: {},
   props: {
@@ -346,7 +359,7 @@ export default {
         }
       },
       executeForm: {
-        labelWidth: 100,
+        labelWidth: 110,
         labelPosition: 'left',
         itemList: {
           protocolId: {
@@ -436,7 +449,8 @@ export default {
           value: 'roundCount'
         }
       ],
-      parallelPolicy: 'parallel'
+      parallelPolicy: 'parallel',
+      preCondition: null
     };
   },
   beforeCreate() {},
@@ -577,6 +591,9 @@ export default {
             this.scenarioList = this.dataConfig.config.scenarioList;
           }
           this.getSelectStepList(this.scenarioId);
+          if (this.dataConfig.config.executeConfig && !this.$utils.isEmpty(this.dataConfig.config.executeConfig.preCondition)) {
+            this.preCondition = this.dataConfig.config.executeConfig.preCondition;
+          }
         })
         .finally(res => {
           this.loading = false;
diff --git a/src/views/pages/autoexec/detail/runnerDetail/add-target.vue b/src/views/pages/autoexec/detail/runnerDetail/add-target.vue
index a584af5808fad5aa6518690f27d8291f6a239b35..90dd9165639298effe2da36d19ee32e880f6c9e7 100644
--- a/src/views/pages/autoexec/detail/runnerDetail/add-target.vue
+++ b/src/views/pages/autoexec/detail/runnerDetail/add-target.vue
@@ -1,6 +1,35 @@
 <template>
   <div class="target-div">
     <div>
+      <!-- 过滤器 -->
+      <div v-if="filter">
+        <TsFormItem
+          :label="$t('page.filter')"
+          :labelWidth="110"
+          labelPosition="left"
+        >
+          <div class="flex-start">
+            <Filters
+              ref="filterMain"
+              :defaultValue="filter"
+              :readonly="true"
+              :bgOp="false"
+              class="nopadding overflow"
+              @clickMoreBtn="moreVisible=true"
+            ></Filters>
+            <div class="pl-xs" style="flex: none;">
+              <span v-if="type=='now'" class="text-tip-active pl-xs" @click="moreVisible=true">{{ $t('page.viewdetails') }}</span>
+              <span
+                v-else-if="canEdit && type=='runtime' && filter"
+                class="tsfont-edit-s text-tip-active pl-xs"
+                :title="$t('page.edit')"
+                @click="moreVisible=true"
+              ></span>
+              <span v-if="canEdit && filter" class="text-href pl-xs" @click="clearTarget">{{ $t('page.clear') }}</span>
+            </div>
+          </div>
+        </TsFormItem>
+      </div>
       <div class="div-content">
         <!-- 作业参数作为执行目标 -->
         <template v-if="paramList.length">
@@ -9,25 +38,6 @@
             <span v-if="getParamText(p.text)" :key="`p_${pindex}`" class="item border-color bg-op">{{ getParamText(p.text) }}</span>
           </template>
         </template>
-        <!-- 过滤器 -->
-        <template v-if="filter">
-          <Filters
-            ref="filterMain"
-            :defaultValue="filter"
-            :readonly="true"
-            :bgOp="false"
-            class="nopadding filter-main overflow"
-            @clickMoreBtn="moreVisible=true"
-          ></Filters>
-          <span v-if="type=='now'" class="btn text-tip-active" @click="moreVisible=true">{{ $t('page.viewdetails') }}</span>
-          <span
-            v-else-if="canEdit && type=='runtime' && filter"
-            class="tsfont-edit-s btn text-tip-active"
-            :title="$t('page.edit')"
-            @click="moreVisible=true"
-          ></span>
-          <span v-if="canEdit && filter" class="btn text-href" @click="clearTarget">{{ $t('page.clear') }}</span>
-        </template>
         <!-- 添加按钮 -->
         <Button
           v-if="canEdit && type=='runtime' && showData.length<=0 && !filter"
@@ -72,19 +82,35 @@
       @on-close="onOkUpdateList(false)"
     >
       <div class="pl-nm pr-nm">
-        <TargetDetail
-          v-if="type=='runtime'"
-          :id="id"
-          ref="targetDetail"
-          :config="valueConfig"
-          :canEdit="canEdit"
-          :defaultSearchValue="filterSearchValue"
-        ></TargetDetail>
+        <template v-if="type=='runtime'">
+          <TsFormItem
+            v-if="!$utils.isEmpty(preCondition)"
+            :label="$t('term.autoexec.precondition')"
+            :labelWidth="110"
+            labelPosition="left"
+          >
+            <FilterSearch
+              :defaultValue="preCondition"
+              :readonly="true"
+              class="nopadding"
+            ></FilterSearch>
+          </TsFormItem>
+          <TargetDetail
+            :id="id"
+            ref="targetDetail"
+            :config="valueConfig"
+            :canEdit="canEdit"
+            :defaultSearchValue="filterSearchValue"
+            :preCondition="preCondition"
+            :labelWidth="110"
+          ></TargetDetail>
+        </template>
         <TargetView
           v-else
           :id="id"
           :config="valueConfig"
           :defaultSearchValue="filterSearchValue"
+          :preCondition="preCondition"
         ></TargetView>
       </div>
       <template v-slot:footer>
@@ -126,7 +152,9 @@ export default {
     NodeDetail: () => import('@/views/pages/autoexec/components/param/edit/node/add-node.vue'),
     Filters: () => import('@/views/pages/autoexec/components/common/executionMode/filters.vue'),
     TargetView: () => import('@/views/pages/autoexec/components/common/targetView/target.vue'),
-    TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue')
+    TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue'),
+    FilterSearch: () => import('@/views/pages/autoexec/components/common/filter-search.vue'),
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem')
   },
   filters: {},
   props: {
@@ -159,7 +187,8 @@ export default {
     filterSearchValue: { //节点搜索条件
       type: Object
     },
-    defaultTagFilter: Array
+    defaultTagFilter: Array,
+    preCondition: Object //全局前置过滤器
   },
   data() {
     return {
@@ -518,12 +547,9 @@ export default {
         cursor: pointer;
       }
     }
-    .nopadding {
-      padding: 0 !important;
-    }
-    .filter-main {
-      max-width: 80%;
-    }
   }
 }
+.nopadding {
+  padding: 0 !important;
+}
 </style>
diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue
index bfcdb65f09c946e992f41d1ce150b463fed61dc0..0fc296cfb8d3a0b0c11ac9a2e8675afbfe1a9f79 100644
--- a/src/views/pages/autoexec/quick-service/catalog/service.vue
+++ b/src/views/pages/autoexec/quick-service/catalog/service.vue
@@ -284,6 +284,12 @@
         <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')">
+        <PreconditionDetail
+          :defaultValue="preCondition"
+          :canEdit="false"
+        ></PreconditionDetail>
+      </TsFormItem>
       <TsFormItem v-show="unfoldAndFold.executeTarget" :label="$t('term.autoexec.executetarget')" :required="hasRequired(executeNode.mappingMode)">
         <div id="positioningkey_executeNodeConfig" :class="executeNode.mappingMode == 'formattr' || executeNode.mappingMode == 'constant' ? 'form-wrap-box' : ''">
           <TsFormSelect
@@ -325,6 +331,7 @@
               :needBorder="needExecuteUser || needProtocol"
               :filterSearchValue="filterSearchValue"
               :isRequired="hasRequired(executeNode.mappingMode)"
+              :preCondition="preCondition"
             ></AddTarget>
           </div>
         </div>
@@ -503,7 +510,8 @@ export default {
     ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'),
     RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
     RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue'),
-    ExpiredReasonAlert: () => import('../service-catalog/expired-reason-alert'), // 服务失效原因提示列表
+    ExpiredReasonAlert: () => import('../service-catalog/expired-reason-alert'), // 
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue'),
     ...Component
   },
   mixins: [catalogmixin],
@@ -795,7 +803,8 @@ export default {
         transfer: true,
         desc: this.$t('term.autoexec.paralldesc'),
         disabled: false
-      }
+      },
+      preCondition: null
     };
   },
   beforeCreate() {},
@@ -904,6 +913,7 @@ export default {
       this.parallelPolicy = { mappingMode: 'constant', value: null }; //并发策略
       this.parallelPolicyForm.disabled = false;
       this.parallelCount = {mappingMode: 'constant', value: null}; //并发数量
+      this.preCondition = null;
     },
     async initData() {
       this.defaultIniData();
@@ -1307,6 +1317,9 @@ 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)) {
+              this.preCondition = executeConfig.preCondition;
+            }
           }
         })
         .finally(() => {
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 8d0fdd89501237cd8869ca4863393970df0be3b2..d5508a036fcad7033cfc79872c09de947f57274f 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
@@ -158,6 +158,15 @@
         </template>
       </div>
       <div v-show="unfoldAndFold.executeNodeConfig">
+        <TsFormItem
+          v-if="executeConfig && executeConfig.preCondition"
+          :label="$t('term.autoexec.precondition')"
+        >
+          <PreconditionDetail
+            :defaultValue="executeConfig.preCondition"
+            :canEdit="false"
+          ></PreconditionDetail>
+        </TsFormItem>
         <TsFormItem v-if="needExecuteNode" :label="$t('term.autoexec.executetarget')" :required="true">
           <AddTarget
             :id="combopId"
@@ -169,6 +178,7 @@
             :runtimeParamList="runtimeParamList"
             :needBorder="needExecuteUser|| needProtocol"
             :filterSearchValue="filterSearchValue"
+            :preCondition="executeConfig? executeConfig.preCondition : null"
             @on-ok="handleChange"
           ></AddTarget>
         </TsFormItem>
@@ -278,6 +288,7 @@ export default {
     ExpiredReasonAlert: () => import('@/views/pages/autoexec/quick-service/service-catalog/expired-reason-alert'), // 服务失效原因提示列表
     RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
     RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue'),
     ...Component
   },
   mixins: [serviceMixin],
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 03cdb41f4fc1bc943ea5d31c3f499d618531e5cb..55878c4804c80246767391605ede9cbf5d9e7685 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
@@ -125,6 +125,15 @@
         </div>
       </div>
     </TsFormItem>
+    <TsFormItem
+      v-if="executeConfig && executeConfig.preCondition"
+      :label="$t('term.autoexec.precondition')"
+    >
+      <PreconditionDetail
+        :defaultValue="executeConfig.preCondition"
+        :canEdit="false"
+      ></PreconditionDetail>
+    </TsFormItem>
     <TsFormItem :label="$t('term.autoexec.executetarget')">
       <TsFormSelect
         v-if="executeNode.mappingMode == 'formattr'"
@@ -173,6 +182,7 @@ export default {
     AddTarget: () => import('@/views/pages/autoexec/detail/runnerDetail/add-target.vue'),
     RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
     RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue'),
     ...Component
   },
   props: {
diff --git a/src/views/pages/cmdb/asset/advanced-mode-search.vue b/src/views/pages/cmdb/asset/advanced-mode-search.vue
index 5c2c5c1b5124381acf34cc43e6ab1fc9d0b4e7df..1837d8870cfd8286eaf6c1a14efb8ced26da1034 100644
--- a/src/views/pages/cmdb/asset/advanced-mode-search.vue
+++ b/src/views/pages/cmdb/asset/advanced-mode-search.vue
@@ -8,7 +8,7 @@
             <span
               v-if="item.text"
               :key="item.uuid"
-              class="tag-item-text border-color radius-sm overflow bg-op"
+              class="tag-item-text border-base radius-sm overflow bg-op"
             >
               <span class="text-title">{{ item.label }}</span>
               <span class="ml-xs mr-xs">:</span>
@@ -188,7 +188,7 @@
                         <Button @click="isVisible = false">{{ $t('page.cancel') }}</Button>
                       </div>
                       <div class="action-item">
-                        <Button type="primary" @click="searchConditionBtn">{{ $t('page.search') }}</Button>
+                        <Button type="primary" @click="searchConditionBtn">{{ searchText }}</Button>
                       </div>
                     </div>
                   </div>
@@ -245,6 +245,12 @@ export default {
       // 搜索条件列表
       type: Array,
       default: () => { return []; }
+    },
+    searchText: {
+      type: String,
+      default() {
+        return this.$t('page.search');
+      }
     }
   },
   data() {
@@ -921,7 +927,6 @@ export default {
     white-space: nowrap;
     overflow: hidden;
     .tag-item-text{
-      border: 1px dashed;
       padding: 0 16px;
       line-height: 30px;
       display: inline-block;
diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index fe1bab57668985dbca4877b4e907019907caba21..5b85e4d5ac3a6dff2c9b34b2a4bdf5eb65d27da2 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -1086,7 +1086,7 @@ export default {
       };
       this.loadingShow = true;
       this.$api.autoexec.action
-        .searchResourceCustomList(params)
+        .getNodeList(params)
         .then(res => {
           if (res.Status == 'OK') {
             this.tableConfig = Object.assign(this.tableConfig, res.Return || {});
diff --git a/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue b/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue
index d4a463d4c801e54214a3e63a27fa66df6ed1cba5..57c218bbf970022baad51b3986f10fb8dac36a53 100644
--- a/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue
+++ b/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue
@@ -318,11 +318,10 @@ export default {
             isRequired: item.isRequired,
             key: item.key,
             mappingMode: item.mappingMode,
-            name: item.name
+            name: item.name,
+            value: item.value
           };
-          if (item.mappingMode === 'constant' || item.mappingMode === 'runtimeparam') {
-            obj.value = item.value;
-          } else {
+          if (item.mappingMode !== 'constant' && item.mappingMode !== 'runtimeparam') {
             obj.mappingList = [{
               mappingMode: '',
               value: '',
diff --git a/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue b/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue
index bfbb6e95e944b08e0a5fa7f6bb92fd018526086c..a49b45e34a465ac7c0dd98516e5c6659bb3818a4 100644
--- a/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue
+++ b/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue
@@ -17,10 +17,19 @@
       </span>
     </div>
     <div>
-      <template v-for="(item,index) in executeParamMappingGroupList">
+      <div v-for="(item,index) in executeParamMappingGroupList" :key="index" class="mb-nm">
         <TsFormItem
-          v-if="whitelist.includes(item.key)"
-          :key="index"
+          v-if="item.key==='preCondition'"
+          :label="item.name"
+          labelPosition="left"
+        >
+          <PreconditionDetail
+            :defaultValue="item.value"
+            :canEdit="false"
+          ></PreconditionDetail>
+        </TsFormItem>
+        <TsFormItem
+          v-else-if="whitelist.includes(item.key)"
           :label="item.name"
           :required="!!item.isRequired"
           labelPosition="left"
@@ -133,7 +142,7 @@
             </div>
           </div>
         </TsFormItem>
-      </template>
+      </div>
       <template v-if="isShowExecuteParam('parallelPolicy')">
         <TsFormItem
           :label="$t('page.autoexecparallpolicy')"
@@ -370,8 +379,8 @@ export default {
     FilterList: () => import('../filter-list.vue'),
     ExecuteNodeReadonly: () => import('@/views/pages/autoexec/form/component/formresoureces/index.vue'),
     ProtocolReadonly: () => import('./protocol-readonly'),
-    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio')
-   
+    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'),
+    PreconditionDetail: () => import('@/views/pages/autoexec/detail/actionDetail/precondition-detail.vue')
   },
   props: {
     allFormitemList: Array,