diff --git a/package.json b/package.json
index 5f21768b626863f4d667e4678dc7e33773916dc8..a30537fbd758f9127eee8235cc13b8c862b46bf9 100755
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@fullcalendar/core": "^6.1.11",
     "@fullcalendar/daygrid": "^6.1.11",
     "@fullcalendar/vue": "^6.1.11",
-    "@hpcc-js/wasm": "2.20.0",
+    "@hpcc-js/wasm": "2.22.4",
     "antlr4": "^4.13.0",
     "axios": "^1.7.9",
     "codemirror": "^5.65.18",
diff --git a/src/resources/api/autoexec/job/time-job.js b/src/resources/api/autoexec/job/time-job.js
index df530fefb1db3f39b8cf876a209dba9619a61c0e..bf1b4494c0367ae521a439de4345fce6a55cd4f8 100644
--- a/src/resources/api/autoexec/job/time-job.js
+++ b/src/resources/api/autoexec/job/time-job.js
@@ -24,6 +24,10 @@ const timeJob = {
   toggleAction(params) {
     // 更新激活状态
     return axios.post('/api/rest/autoexec/schedule/isactive/update', params);
+  },
+  test(params) {
+    // 测试
+    return axios.post('/api/rest/autoexec/job/test', params);
   }
 };
 
diff --git a/src/resources/api/deploy/schedule/schedule.js b/src/resources/api/deploy/schedule/schedule.js
index bf911f509a042853f04e8a9ddf7614449f8df14e..20103a682a6c93e046febc245ad6483ff93751d9 100644
--- a/src/resources/api/deploy/schedule/schedule.js
+++ b/src/resources/api/deploy/schedule/schedule.js
@@ -19,6 +19,10 @@ const schedule = {
   updateSchedule(params) {
     //启用/禁用定时作业
     return axios.post('/api/rest/deploy/schedule/isactive/update', params);
+  },
+  test(params) {
+    // 测试
+    return axios.post('/api/rest/deploy/job/test', params);
   }
 };
 export default schedule;
diff --git a/src/resources/api/framework/index.js b/src/resources/api/framework/index.js
index 867bb4256a8ab8f4c20433cee1749e2d97a3cb22..9fb60fdeeb24ef196500937799d347f2c79badeb 100644
--- a/src/resources/api/framework/index.js
+++ b/src/resources/api/framework/index.js
@@ -37,6 +37,7 @@ import extramenu from './extramenu/extramenu'; //附加菜单
 import region from './region/region';//地域管理
 import homepage from './homepage/homepage';//默认首页
 import changelogaudit from './changelogaudit/changelogaudit';//数据库变更记录
+import log from './log/log';// 查看日志
 export default {
   role,
   user,
@@ -75,5 +76,6 @@ export default {
   extramenu,
   region,
   homepage,
-  changelogaudit
+  changelogaudit,
+  log
 };
diff --git a/src/resources/api/framework/log/log.js b/src/resources/api/framework/log/log.js
new file mode 100644
index 0000000000000000000000000000000000000000..0cb7852c5963c0150650a9d33800f76995484a64
--- /dev/null
+++ b/src/resources/api/framework/log/log.js
@@ -0,0 +1,15 @@
+import axios from '../../http';
+
+const log = {
+  getLogFileNameList(params) {
+    return axios.post('/api/rest/log/filename/list', params);
+  },
+  getLogContent(params) {
+    return axios.post('/api/rest/log/content/get', params);
+  },
+  updateLogLevel(params) {
+    return axios.post('/api/rest/logger/updatelevel', params);
+  }
+};
+
+export default log;
diff --git a/src/resources/api/framework/schedule/schedule.js b/src/resources/api/framework/schedule/schedule.js
index 2bad1fb2eb8278cc8c406c71d5f8a2d189f3b202..3099a05f7baa6c30c262158166b4e888e6d2199f 100644
--- a/src/resources/api/framework/schedule/schedule.js
+++ b/src/resources/api/framework/schedule/schedule.js
@@ -36,6 +36,10 @@ const job = {
   //获取内存的定时作业列表
   searchMemoryJob(params) {
     return axios.post('/api/rest/scheduler/memory/search', params);
+  },
+  //测试定时作业
+  test(params) {
+    return axios.post('/api/rest/job/test', params);
   }
 };
 export default job;
diff --git a/src/resources/api/framework/server/server.js b/src/resources/api/framework/server/server.js
index 364e199a8b5df5d070bd4a49ab96ef2cd47954c2..a7e25a889db1ab56454d0990687f44b2109ae8e1 100644
--- a/src/resources/api/framework/server/server.js
+++ b/src/resources/api/framework/server/server.js
@@ -1,8 +1,8 @@
 import axios from '../../http';
 
 const server = {
-  getServerList() {
-    return axios.post('api/rest/server/list', {});
+  getServerList(param) {
+    return axios.post('api/rest/server/list', param);
   },
   saveServer(param) {
     return axios.post('api/rest/server/save', param);
diff --git a/src/resources/api/framework/tagent/tagent.js b/src/resources/api/framework/tagent/tagent.js
index 1b2ac3d6125803571de8ea5b93a126ea371ba3ac..df62a8a93f59c1a626212789ec2a6d65d96b89e7 100644
--- a/src/resources/api/framework/tagent/tagent.js
+++ b/src/resources/api/framework/tagent/tagent.js
@@ -7,6 +7,10 @@ const tagent = {
   deleteTagents(params) {
     return axios.post('/api/rest/tagent/delete', params);
   },
+  //批量删除tagent
+  batchDeleteTagent(params) {
+    return axios.post('/api/rest/tagent/delete/batch', params);
+  },
   //查看密码
   getAccountById(params) {
     return axios.post('api/rest/tagent/account/get', params);
diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less
index 18036cd5e00e13c6ebfbd8d6e838328c4306164f..3201b59443846c2ce83b0c19773a41598d22e5f5 100644
--- a/src/resources/assets/css/common.less
+++ b/src/resources/assets/css/common.less
@@ -612,6 +612,27 @@ html {
         }
       }
     }
+    &.border-tabs {
+      > .@{iv-prev}tabs-bar {
+        margin-bottom: 0px;
+        .@{iv-prev}tabs-tab {
+          border: 1px solid;
+          line-height: 32px;
+          height: 32px;
+          margin-right: 4px;
+          border-top-left-radius: @item-border-radius;
+          border-top-right-radius: @item-border-radius;
+          padding: 0px @space-normal;
+        }
+        .@{iv-prev}tabs-ink-bar {
+          display: none;
+        }
+      }
+      .@{iv-prev}tabs-content {
+        border-radius: @block-border-radius;
+        border-top-left-radius: 0px;
+      }
+    }
 
     &.@{iv-prev}tabs-card {
       > .@{iv-prev}tabs-bar {
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index 4d5f11d6c636ca6a702b9a1440d16f8f19c21cf4..5b3fc45e98b037b0d949679020539dba0ddd20f9 100644
--- a/src/resources/assets/css/theme.less
+++ b/src/resources/assets/css/theme.less
@@ -1383,6 +1383,9 @@
     background-color: var(--primary-grey, @primary-grey);
   }
 
+  .bg-stripe {
+    background-color: @table-stripe-color;
+  }
   .item-selected {
     background-color: var(--primary-grey, @primary-grey);
     color: var(--primary-color, @primary-color);
@@ -3448,6 +3451,31 @@
         // background: @op-color;
       }
     }
+    &.border-tabs {
+      > .ivu-tabs-bar {
+        .ivu-tabs-tab {
+          background-color: @tab-bar-bg;
+          color: @title-color;
+          border-color: var(--border-color, @border-color-base);
+
+          &.ivu-tabs-tab-active {
+            background-color: @op-color;
+            color: var(--primary-color, @primary-color);
+            border-color: var(--border-color, @border-color-base) !important;
+          }
+        }
+      }
+
+      .ivu-tabs-nav-container {
+        margin-top: 0px;
+        margin-bottom: 0px;
+      }
+
+      .ivu-tabs-content {
+        background-color: @op-color;
+        border: 1px solid var(--border-color, @border-color-base);
+      }
+    }
 
     &.block-span {
       > .ivu-tabs-bar {
@@ -3621,6 +3649,7 @@
 
   .@{iv-prev}collapse {
     background-color: @table-stripe-color;
+    border-color: var(--border-color, @border-color-base);
   }
   .@{iv-prev}collapse-simple {
     background-color: transparent;
diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index a13b5964f7b9555c93653f09de65b5ef39523045..e81b3b329d5273bb5c643937a298cc0e8f1bf6f2 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -72,6 +72,7 @@ setInterval(callback, delay, alwaysRun = false)  定时器
 sortByObj(obj)                               对象的属性按首字母排序
 getUnicodeByClassName(className)             获取className的unicode编码
 convertWoff2ToBase64                         将woff2文件转换为base64
+deepRemoveEmptyValues(data)                  深度移除对象中的空值
 */
 import _ from 'lodash';
 import store from '@/resources/store';
@@ -1225,6 +1226,22 @@ const methods = {
         font-display: swap;
         max-width: 16px;
       }`;
-  }
+  },
+  deepRemoveEmptyValues(obj) { //删除数据里的空值
+    let _this = this;
+    const result = _this.deepClone(obj); // 深拷贝对象以避免修改原始对象
+    for (const key in result) {
+      if (result.hasOwnProperty(key)) {
+        if (_this.isEmpty(result[key])) { // 检查并删除空值
+          delete result[key]; // 删除空值属性
+        } else if (_.isArray(result[key])) { // 处理数组内的空值元素
+          result[key] = result[key].filter(item => !_this.isEmpty(item)); // 过滤掉数组中的空值元素
+        }else  if (_.isObject(result[key])) { // 如果是对象
+          result[key] = _this.deepRemoveEmptyValues(result[key]); // 递归处理深层对象
+        } 
+      }
+    }
+    return result;
+  },
 };
 export default methods;
diff --git a/src/resources/assets/languages/dialog/en.json b/src/resources/assets/languages/dialog/en.json
index ca0950e21ed2ad66923f5264c660a22c973c14d7..b2a44a5235800b8fb01184b0552d9af910d6a4c7 100644
--- a/src/resources/assets/languages/dialog/en.json
+++ b/src/resources/assets/languages/dialog/en.json
@@ -41,7 +41,8 @@
     "actionconfirm": "Operation confirmation",
     "editconfirm": "Edit confirmation",
     "canceleditconfirm": "Exit editing confirmation",
-    "lockconfirm": "Lock Confirmation"
+    "lockconfirm": "Lock Confirmation",
+    "testconfirm": "TEST confirmation"
   },
   "content": {
     "pauseconfirm": "Are you sure to pause {target}？",
@@ -86,6 +87,7 @@
     "closecomfirm": "Are you sure to close this {target}?",
     "opencomfirm": "Are you sure to open this {target}?",
     "canceleditconfirm": "Are you sure to exit editing and unlock the current schema diagram?",
-    "lockconfirm": "Are you sure you want to lock the current {target}?"
+    "lockconfirm": "Are you sure you want to lock the current {target}?",
+    "testconfirm": "Are you sure to test the current {target}"
   }
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/dialog/zh.json b/src/resources/assets/languages/dialog/zh.json
index 58b166efa4df63a54a2c3951db8d322361e50716..1627ddd2a3a90077e703c28e1d0f46098625dddf 100644
--- a/src/resources/assets/languages/dialog/zh.json
+++ b/src/resources/assets/languages/dialog/zh.json
@@ -41,7 +41,8 @@
     "actionconfirm": "操作确认",
     "editconfirm": "编辑确认",
     "canceleditconfirm": "退出编辑确认",
-    "lockconfirm": "锁定确认"
+    "lockconfirm": "锁定确认",
+    "testconfirm": "测试确认"
   },
   "content": {
     "pausecomfirm": "是否确认暂停当前{target}？",
@@ -86,6 +87,7 @@
     "closecomfirm": "是否确认关闭当前{target}？",
     "opencomfirm": "是否确认打开当前{target}？",
     "canceleditconfirm": "是否确认退出编辑并解除锁定当前架构图？",
-    "lockconfirm": "是否确认锁定当前{target}？"
+    "lockconfirm": "是否确认锁定当前{target}？",
+    "testconfirm": "是否确认测试当前{target}"
   }
-}
+}
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index e86bb39eaf6685d2f844a083f56bdc208f26be91..aa34785c660052a328bab9cae9d57ee8f8515db6 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1076,5 +1076,7 @@
   "autoexecbatchround": "in batches",
   "autoexecparall": "Concurrency",
   "autoexecparallel": "Concurrent settings",
-  "paramkeyword": "Participate in search"
+  "paramkeyword": "Participate in search",
+  "loglevel": "log level",
+  "bluegreen": "Blue green execution"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index fe13d332d3b55176dbe5a742736691b035b07285..6a19d149c036c093d5083f92a5cf8b4a1a4ee5b2 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -1078,5 +1078,7 @@
   "autoexecbatchround": "分批",
   "autoexecparall": "并发",
   "autoexecparallel": "并发设置",
-  "paramkeyword": "入参搜索"
+  "paramkeyword": "入参搜索",
+  "loglevel": "日志级别",
+  "bluegreen": "蓝绿执行"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/router/en.json b/src/resources/assets/languages/router/en.json
index cc1a64b3e6c1eb0c88356121b1dc06275f4d2da3..22778a4b8228a6d573ee6710c0f950453b350db5 100644
--- a/src/resources/assets/languages/router/en.json
+++ b/src/resources/assets/languages/router/en.json
@@ -170,7 +170,8 @@
     "license": "License Management",
     "extramenu": "Menu management",
     "homepage": "default page ",
-    "changelogaudit": "Database Change Log"
+    "changelogaudit": "Database Change Log",
+    "log": "view log"
   },
   "knowledge": {
     "knowledgedetail": "entry details",
diff --git a/src/resources/assets/languages/router/zh.json b/src/resources/assets/languages/router/zh.json
index 9d4626d540198177c65f3a64000b27728f8bc0b9..0e70111e70dc26e17bacafb9fe3b6ceaab5ea4f3 100644
--- a/src/resources/assets/languages/router/zh.json
+++ b/src/resources/assets/languages/router/zh.json
@@ -170,7 +170,8 @@
     "license": "许可管理",
     "extramenu": "菜单管理",
     "homepage": "默认首页",
-    "changelogaudit": "数据库变更记录"
+    "changelogaudit": "数据库变更记录",
+    "log": "查看日志"
   },
   "knowledge": {
     "knowledgedetail": "词条详情",
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index cb1cf8604cfc46b6de0cf6ae92c0e2cb95380cfc..1f4d07ac5207ae2f2932f128f7101001c49ed735 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -910,7 +910,9 @@
     "isfirenext": "Do you want to activate the next group",
     "inputnodelimit": "The quantity cannot exceed 1000",
     "parall": "Concurrent quantity",
-    "paralldesc": "Execute the execution targets in order of concurrency."
+    "paralldesc": "Execute the execution targets in order of concurrency.",
+    "jobrecord": "Automated job recording",
+    "jobcount": "Number of automated tasks"
   },
   "framework": {
     "roleauth": "Authorize immediately after creating the role",
@@ -1353,7 +1355,8 @@
     "tagentuploadupgradepkg": "Upload upgrade package",
     "versionremarks": "Version Remarks",
     "heartbeaturl": "Backend server address",
-    "runnergrouptips": "The request for login authentication needs to carry a header as a rule expression (note that the header parameter in the expression must be all lowercase and the prefix must be {prefix}). If the value of the expression after execution is true, the executor group will take effect, and false and syntax exceptions will not take effect. For example:"
+    "runnergrouptips": "The request for login authentication needs to carry a header as a rule expression (note that the header parameter in the expression must be all lowercase and the prefix must be {prefix}). If the value of the expression after execution is true, the executor group will take effect, and false and syntax exceptions will not take effect. For example:",
+    "batchdeletetagenttooltip": "Tagent in connected state cannot be deleted"
   },
   "knowledge": {
     "document": "Document",
@@ -2156,7 +2159,10 @@
     "blueSet": "Blue Green",
     "ismodified": "Modified",
     "presetrunnergroup": "Preset actuator group",
-    "testrunnerdesc": "If not specified, actuators will be automatically assigned based on IP matching of actuator groups according to network segments"
+    "testrunnerdesc": "If not specified, actuators will be automatically assigned based on IP matching of actuator groups according to network segments",
+    "jobcount": "Number of published assignments",
+    "jobrecord": "Publish homework records",
+    "notapplyallexecuteauth": "You do not have the execution permission for the current application"
   },
   "inspect": {
     "alarmprompt": "Alarm Prompt",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 63b7cdb88dfe5196026bddce4e7b2c6404f1d70a..7e901aa7d39119a7e4f8df7e761c831168510fb1 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -910,7 +910,9 @@
     "isfirenext": "是否激活下一个组",
     "inputnodelimit": "数量不能大于1000",
     "parall": "并发数量",
-    "paralldesc": "将执行目标按并发数量先后执行。"
+    "paralldesc": "将执行目标按并发数量先后执行。",
+    "jobrecord": "自动化作业记录",
+    "jobcount": "自动化作业数"
   },
   "framework": {
     "roleauth": "创建完角色立即授权",
@@ -1353,7 +1355,8 @@
     "tagentuploadupgradepkg": "上传升级包",
     "versionremarks": "版本备注",
     "heartbeaturl": "后端服务器地址",
-    "runnergrouptips": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写，且前缀必须为{prefix})，如果表达式执行后的值为true则该执行器组生效，false和语法异常都不生效。如:"
+    "runnergrouptips": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写，且前缀必须为{prefix})，如果表达式执行后的值为true则该执行器组生效，false和语法异常都不生效。如:",
+    "batchdeletetagenttooltip": "已连接状态的tagent不能删除"
   },
   "knowledge": {
     "document": "文档",
@@ -2153,7 +2156,10 @@
     "blueSet": "蓝绿",
     "ismodified": "已修改",
     "presetrunnergroup": "预设执行器组",
-    "testrunnerdesc": "如果不指定则会通过ip根据网段匹配执行器组自动分配执行器"
+    "testrunnerdesc": "如果不指定则会通过ip根据网段匹配执行器组自动分配执行器",
+    "jobcount": "发布作业数",
+    "jobrecord": "发布作业记录",
+    "notapplyallexecuteauth": "您没有当前应用的执行权限"
   },
   "inspect": {
     "alarmprompt": "告警提示",
diff --git a/src/resources/plugins/TsForm/TsForm.vue b/src/resources/plugins/TsForm/TsForm.vue
index b4fd01a401c83e429947a265a31866b4017d58ff..3baf0ed2a49ec95c862969e9410ccf0ffdd13f34 100755
--- a/src/resources/plugins/TsForm/TsForm.vue
+++ b/src/resources/plugins/TsForm/TsForm.vue
@@ -303,6 +303,8 @@ export default {
         //主要用来回显input框的数据
         item.width = item.width || _this.width;
         item.theme = _this.$utils.deepClone(_this.theme);
+        item.readonly = item.readonly || _this.readonly;
+        item.disabled = item.disabled || _this.disabled;
         $handler = h(ITEMTYPELIST[item.type], {
           key: item.name,
           props: item,
diff --git a/src/resources/plugins/TsForm/TsFormInput.vue b/src/resources/plugins/TsForm/TsFormInput.vue
index 48d964935011f282bae0201222c8d9e878a5222e..e8d1e4573988e4190c6266a67cb7173a913b3c42 100755
--- a/src/resources/plugins/TsForm/TsFormInput.vue
+++ b/src/resources/plugins/TsForm/TsFormInput.vue
@@ -2,7 +2,20 @@
   <div class="form-li" :class="borderClass" @keydown.stop>
     <!-- <input v-if="type == 'password'" type="text" class="hidden" />
     <input v-if="type == 'password'" type="password" class="hidden" /> -->
-    <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]" :title="readonlyTitle">{{ currentValue || currentValue === 0 ? currentValue : '-' }}</span>
+    <template v-if="readonly">
+      <span
+        v-if="type == 'textarea'"
+        :class="[readonlyClass, readonlyTextHighlightClass]"
+        :title="readonlyTitle"
+        class="pre"
+        v-html="handleReadonlyValue(currentValue)"
+      ></span>
+      <span
+        v-else
+        :class="[readonlyClass, readonlyTextHighlightClass]"
+        :title="readonlyTitle"
+      >{{ handleReadonlyValue(currentValue) }}</span>
+    </template>
     <div v-else :style="getStyle">
       <Input
         v-if="type != 'number'"
@@ -297,6 +310,11 @@ export default {
           });
       }
       return clearable;
+    },
+    handleReadonlyValue() {
+      return (currentValue) => {
+        return currentValue || currentValue === 0 ? currentValue : '-';
+      };
     }
   },
   watch: {
diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index 4068f56712f32215fa42cdf2f0ba7021cf9cee67..462826c310a8c994a4ad0dec82f4a5dbdff99be8 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -1167,9 +1167,9 @@ export default {
     //根据联动配置初始化watch
     initReactionWatch() {
       this.needWatch = false;
-      if (this.config.reaction) {
-        for (let key in this.config.reaction) {
-          if (this.config.reaction[key].some(d => !this.$utils.isEmpty(d)) > 0) {
+      if (this.reaction) {
+        for (let key in this.reaction) {
+          if (this.reaction[key].some(d => !this.$utils.isEmpty(d)) > 0) {
             this.needWatch = true;
             break;
           }
@@ -1182,9 +1182,8 @@ export default {
             this.$nextTick(() => {
               const newVal = newValue && JSON.parse(newValue);
               const oldVal = oldValue && JSON.parse(oldValue);
-
-              for (let key in this.config.reaction) {
-                this.config.reaction[key].forEach(reaction => {
+              for (let key in this.reaction) {
+                this.reaction[key].forEach(reaction => {
                   if (this.mode !== 'edit' && reaction.rows && reaction.rows.length > 0) {
                     const reactionResult = this.executeReaction(reaction, newVal, oldVal);
                     if (key === 'hiderow') {
@@ -1780,9 +1779,9 @@ export default {
     },
     //行是否有联动设置
     hasReaction(index) {
-      if (this.config.reaction) {
-        for (let key in this.config.reaction) {
-          const reactionList = this.config.reaction[key];
+      if (this.reaction) {
+        for (let key in this.reaction) {
+          const reactionList = this.reaction[key];
           if (reactionList && reactionList.length > 0) {
             for (let i = 0; i < reactionList.length; i++) {
               const reaction = reactionList[i];
@@ -1796,9 +1795,9 @@ export default {
       return false;
     },
     isHideRow(index) {
-      if (this.config.reaction && this.config.reaction.hiderow) {
-        for (let i = 0; i < this.config.reaction.hiderow.length; i++) {
-          const hiderow = this.config.reaction.hiderow[i];
+      if (this.reaction && this.reaction.hiderow) {
+        for (let i = 0; i < this.reaction.hiderow.length; i++) {
+          const hiderow = this.reaction.hiderow[i];
           if (hiderow.rows && hiderow.rows.length > 0 && hiderow.rows.includes(index)) {
             return true;
           }
@@ -2104,9 +2103,9 @@ export default {
     conditionData() {
       return uuid => {
         const conditionData = {};
-        if (this.config.reaction) {
-          for (let key in this.config.reaction) {
-            const reactionList = this.config.reaction[key];
+        if (this.reaction) {
+          for (let key in this.reaction) {
+            const reactionList = this.reaction[key];
             if (reactionList && reactionList.length > 0) {
               reactionList.forEach(reaction => {
                 if (reaction && !this.$utils.isEmpty(reaction) && reaction.conditionGroupList) {
@@ -2400,6 +2399,9 @@ export default {
         let {componentTopLeftTip = ''} = config;
         return componentTopLeftTip;
       };
+    },
+    reaction() {
+      return this.config && this.config.reaction;
     }
   },
   watch: {
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index f76674e0c5644f71134a93337e2ea6983c6aa9b7..57439642ff452751a2ae4fe492387954887eba8a 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="form-item radius-md" :class="{ 'bg-error-grey': showStatusIcon && (hasDataError || hasConfigError) }">
-    <i v-if="isShowComponent(formItem) && formItem.config && formItem.config.isRequired && !readonly && !formItem.config.isReadOnly" class="require-tip text-error">*</i>
     <!--编辑模式下的非container组件需要增加遮罩屏蔽所有操作，container组件需要接受拖拽组件进去，不需要遮罩-->
     <div v-if="(mode === 'edit' || mode === 'editSubform') && !formItem.isContainer" class="editor-mask"></div>
     <div v-if="mode != 'defaultvalue' && mode !== 'condition' && ((formItem.override_config && formItem.override_config.isMask) || (formItem.config && formItem.config.isMask))" class="mask">
@@ -50,84 +49,87 @@
     <div v-if="clearable && mode == 'edit'" class="corner-close-icon tsfont-close-o text-tip-active" @mousedown.prevent.stop="$emit('delete')"></div>
     <div v-if="mode == 'edit' && formItem.config && formItem.config.isHide" class="corner-bottom-icon text-grey tsfont-eye-off"></div>
     <div v-if="needLabel" class="mb-xs">{{ formItem.label }}</div>
-    <template v-if="isShowComponent(formItem) && (!formItem.type || formItem.type === 'form')">
-      <component
-        :is="formItem.handler"
-        v-if="isExistComponent && formItem.handler !== 'formcustom'"
-        ref="formItem"
-        :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
-        :formItem="formItem"
-        :formItemList="formItemList"
-        :value="formItemValue"
-        :mode="mode"
-        :filter="filter"
-        :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-        :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-        :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
-        :formData="formData"
-        :readonlyTextIsHighlight="readonlyTextIsHighlight"
-        :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
-        :isCustomValue="isCustomValue"
-        :isClearSpecifiedAttr="isClearSpecifiedAttr"
-        :externalData="externalData"
-        :rowUuid="rowUuid"
-        :extendConfigList="extendConfigList"
-        @setValue="setValue"
-        @resize="$emit('resize')"
-        @select="selectFormItem"
-        @dropHideComponent="(enevt)=>{
-          $emit('dropHideComponent', enevt)
-        }"
-      ></component>
-      <component
-        :is="formItem.customName"
-        v-else-if="isExistComponent && formItem.handler === 'formcustom'"
+    <template v-if="isShowComponent(formItem)">
+      <i v-if="formItem.config && formItem.config.isRequired && !readonly && !formItem.config.isReadOnly" class="require-tip text-error">*</i>
+      <template v-if=" (!formItem.type || formItem.type === 'form')">
+        <component
+          :is="formItem.handler"
+          v-if="isExistComponent && formItem.handler !== 'formcustom'"
+          ref="formItem"
+          :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
+          :formItem="formItem"
+          :formItemList="formItemList"
+          :value="formItemValue"
+          :mode="mode"
+          :filter="filter"
+          :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
+          :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
+          :formData="formData"
+          :readonlyTextIsHighlight="readonlyTextIsHighlight"
+          :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
+          :isCustomValue="isCustomValue"
+          :isClearSpecifiedAttr="isClearSpecifiedAttr"
+          :externalData="externalData"
+          :rowUuid="rowUuid"
+          :extendConfigList="extendConfigList"
+          @setValue="setValue"
+          @resize="$emit('resize')"
+          @select="selectFormItem"
+          @dropHideComponent="(enevt)=>{
+            $emit('dropHideComponent', enevt)
+          }"
+        ></component>
+        <component
+          :is="formItem.customName"
+          v-else-if="isExistComponent && formItem.handler === 'formcustom'"
+          ref="formItem"
+          :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
+          :formItem="formItem"
+          :formItemList="formItemList"
+          :value="formItemValue"
+          :mode="mode"
+          :filter="filter"
+          :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
+          :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
+          :formData="formData"
+          :readonlyTextIsHighlight="readonlyTextIsHighlight"
+          :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
+          :isCustomValue="isCustomValue"
+          :isClearSpecifiedAttr="isClearSpecifiedAttr"
+          :externalData="externalData"
+          :historyValue="isCustomValue ? formItemValue : ''"
+          @setValue="setValue"
+          @resize="$emit('resize')"
+          @select="selectFormItem"
+          @setExtendValue="setExtendValue"
+        ></component>
+        <div v-else class="text-warning">
+          {{ getComponentTip() }}
+        </div>
+      </template>
+      <CustomItem
+        v-else-if="formItem.type === 'custom'"
         ref="formItem"
-        :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
+        :style="{ width: (formItem.config && formItem.config.width) || '100%' }"
         :formItem="formItem"
         :formItemList="formItemList"
+        :customFormItem="customFormItem"
         :value="formItemValue"
         :mode="mode"
         :filter="filter"
-        :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-        :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-        :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
-        :formData="formData"
+        :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
+        :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled"
         :readonlyTextIsHighlight="readonlyTextIsHighlight"
-        :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
-        :isCustomValue="isCustomValue"
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
-        :historyValue="isCustomValue ? formItemValue : ''"
         @setValue="setValue"
         @resize="$emit('resize')"
         @select="selectFormItem"
-        @setExtendValue="setExtendValue"
-      ></component>
-      <div v-else class="text-warning">
-        {{ getComponentTip(formItem) }}
-      </div>
+      ></CustomItem>
+      <div v-if=" formItem.config && formItem.config.description" class="tsfont-info-o text-tip">{{ formItem.config.description }}</div>
     </template>
-    <CustomItem
-      v-else-if="isShowComponent(formItem) && formItem.type === 'custom'"
-      ref="formItem"
-      :style="{ width: (formItem.config && formItem.config.width) || '100%' }"
-      :formItem="formItem"
-      :formItemList="formItemList"
-      :customFormItem="customFormItem"
-      :value="formItemValue"
-      :mode="mode"
-      :filter="filter"
-      :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-      :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-      :readonlyTextIsHighlight="readonlyTextIsHighlight"
-      :isClearSpecifiedAttr="isClearSpecifiedAttr"
-      :externalData="externalData"
-      @setValue="setValue"
-      @resize="$emit('resize')"
-      @select="selectFormItem"
-    ></CustomItem>
-    <div v-if="isShowComponent(formItem) && formItem.config && formItem.config.description" class="tsfont-info-o text-tip">{{ formItem.config.description }}</div>
   </div>
 </template>
 <script>
@@ -205,6 +207,14 @@ export default {
     extendConfigList: {
       type: Array,
       default: () => []
+    },
+    extraFormItemList: {
+      type: Array,
+      default: () => []
+    },
+    isSetValue: { //是否更新formData
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -231,14 +241,15 @@ export default {
       filter: [], //格式[{column:'矩阵属性uuid',expression:'equal',valueList:["value"]}]
       REACTION: REACTION, //联动规则
       isShowErrorMessage: true,
-      currentItemHide: false //当前组件是否隐藏
+      currentItemHide: false, //当前组件是否隐藏
+      reactionFormItemUuidMap: {} //规格内需要的表单组件值
     };
   },
   beforeCreate() {},
   created() {
+    this.initReactionFormItemUuid();
     this.updateConfig();
     this.initStatus();
-    this.initReactionWatch();
   },
   beforeMount() {},
   mounted() {
@@ -253,6 +264,78 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    initReactionFormItemUuid() { //获取规则内用到的表单组件uuid
+      this.needWatch = false;
+      if (this.reaction) {
+        for (let key in this.reaction) {
+          if (!this.$utils.isEmpty(this.reaction[key])) {
+            this.needWatch = true;
+            break;
+          }
+        }
+      }
+      if (this.mode === 'read' || this.mode === 'readSubform') {
+        if (!this.$utils.isEmpty(this.reactionFormItemUuidMap) || !this.needWatch) {
+          return;
+        }
+        if (this.reaction && !this.$utils.isEmpty(this.reaction)) {
+          for (let action in this.reaction) {
+            const reaction = this.reaction[action];
+            if (action !== 'filter') {
+              const conditinoGroupList = reaction['conditionGroupList'];
+              if (conditinoGroupList && conditinoGroupList.length > 0) {
+                for (let i = 0; i < reaction['conditionGroupList'].length; i++) {
+                  const conditionGroup = reaction['conditionGroupList'][i];
+                  const conditionList = conditionGroup['conditionList'];
+                  if (conditionList && conditionList.length > 0) {
+                    for (let j = 0; j < conditionList.length; j++) {
+                      const condition = conditionList[j];
+                      const uuidList = condition['formItemUuid'].split('#');
+                      const formItemUuid = uuidList[0];
+                      if (!this.reactionFormItemUuidMap.hasOwnProperty(formItemUuid)) {
+                        this.$set(this.reactionFormItemUuidMap, formItemUuid, null);
+                      }
+                    }
+                  }
+                }
+              }
+            } else {
+              const ruleList = reaction['ruleList'];
+              if (ruleList && ruleList.length > 0) {
+                for (let i = 0; i < reaction['ruleList'].length; i++) {
+                  const rule = reaction['ruleList'][i];
+                  let list = rule['formItemUuid'].split('#');
+                  let ruleFormItemUuid = list[0];
+                  if (!this.reactionFormItemUuidMap.hasOwnProperty(ruleFormItemUuid)) {
+                    this.$set(this.reactionFormItemUuidMap, ruleFormItemUuid, null);
+                  }
+                }
+              }
+            }
+          }
+        }
+        if (!this.$utils.isEmpty(this.reactionFormItemUuidMap) && this.formData) {
+          Object.keys(this.reactionFormItemUuidMap).forEach((key) => {
+            this.$set(this.reactionFormItemUuidMap, key, this.formData[key]);
+          });
+        }
+        this.executionReaction(this.reactionFormItemUuidMap);
+      }
+    },
+    executionReaction(newVal, oldVal) { //规则
+      for (let action in this.reaction) {
+        //如果override_config有配置，则相关联动不生效
+        const overrideConfig = this.formItem.override_config || {};
+        const reaction = this.reaction[action];
+        if (reaction && !this.$utils.isEmpty(reaction) && this.isConditionDataChange(action, reaction, newVal, oldVal, this.formItem.uuid)) {
+          const result = this.executeReaction(reaction, newVal, oldVal);
+          if (this.REACTION[action]) {
+            //联动操作
+            this.REACTION[action]({ overrideConfig: overrideConfig, reaction: reaction, result: result, view: this });
+          }
+        }
+      }
+    },
     selectFormItem(formItem) {
       this.$emit('select', formItem);
     },
@@ -283,13 +366,13 @@ export default {
         }
       }
     },
-    //根据联动配置初始化watch
+    //根据联动配置初始化watch，----废弃
     initReactionWatch() {
       if (this.mode === 'read' || this.mode === 'readSubform') {
         this.needWatch = false;
-        if (this.formItem.reaction) {
-          for (let key in this.formItem.reaction) {
-            if (!this.$utils.isEmpty(this.formItem.reaction[key])) {
+        if (this.reaction) {
+          for (let key in this.reaction) {
+            if (!this.$utils.isEmpty(this.reaction[key])) {
               this.needWatch = true;
               break;
             }
@@ -300,13 +383,12 @@ export default {
             'formDataForWatch',
             (newValue, oldValue) => {
               this.enqueueReaction(this.componentUuid, () => {
-                // console.log('开始单个处理');
                 const newVal = newValue && JSON.parse(newValue);
                 const oldVal = oldValue && JSON.parse(oldValue);
-                for (let action in this.formItem.reaction) {
+                for (let action in this.reaction) {
                   //如果override_config有配置，则相关联动不生效
                   const overrideConfig = this.formItem.override_config || {};
-                  const reaction = this.formItem.reaction[action];
+                  const reaction = this.reaction[action];
                   if (reaction && !this.$utils.isEmpty(reaction) && this.isConditionDataChange(action, reaction, newVal, oldVal, this.formItem.uuid)) {
                     const result = this.executeReaction(reaction, newVal, oldVal);
                     if (this.REACTION[action]) {
@@ -471,7 +553,7 @@ export default {
     },
     setValue(val) {
       //formData不一定会提供，例如在联动设置中就不会传入formData，只有在表单正式使用过程中才会有formData
-      if (this.formData) {
+      if (this.formData && this.isSetValue) {
         this.$set(this.formData, this.formItem.uuid, val);
       }
       this.$emit('change', val);
@@ -522,6 +604,25 @@ export default {
     },
     handleCloseErrorMessage() {
       this.isShowErrorMessage = false;
+    },
+    isExistComponent() {
+      let handler = '';
+      if (this.formItem.handler === 'formcustom') {
+        handler = this.formItem.customName;
+      } else {
+        handler = this.formItem.handler;
+      }
+      let component = true;
+      if (!handler || !formItems[handler]) {
+        component = false;
+      }
+      return component;
+    },
+    getComponentTip() {
+      const { label = '', customName = '' } = this.formItem || {};
+      const nameParts = customName.split('-');
+      const componentName = nameParts.length > 1 ? nameParts[0] : customName;
+      return `【${label}(${componentName})】${this.$t('term.framework.componentnoexist')}`;
     }
   },
   filter: {},
@@ -535,13 +636,16 @@ export default {
       }
       return null;
     },
+    reaction() {
+      return this.formItem && this.formItem.reaction;
+    },
     //由于condition的valueList类型是数组，所以不能直接在script中以字符串的方式复制
     conditionData() {
       return uuid => {
         const conditionData = {};
-        if (this.formItem.reaction) {
-          for (let key in this.formItem.reaction) {
-            const reaction = this.formItem.reaction[key];
+        if (this.reaction) {
+          for (let key in this.reaction) {
+            const reaction = this.reaction[key];
             if (reaction && !this.$utils.isEmpty(reaction) && reaction.conditionGroupList) {
               reaction.conditionGroupList.forEach(cg => {
                 if (cg.conditionList) {
@@ -567,9 +671,9 @@ export default {
     },
     //是否配置联动
     hasReaction() {
-      if (!this.$utils.isEmpty(this.formItem.reaction)) {
-        for (let action in this.formItem.reaction) {
-          if (!this.$utils.isEmpty(this.formItem.reaction[action])) {
+      if (!this.$utils.isEmpty(this.reaction)) {
+        for (let action in this.reaction) {
+          if (!this.$utils.isEmpty(this.reaction[action])) {
             return true;
           }
         }
@@ -598,30 +702,35 @@ export default {
         readonlyTextIsHighlight = true;
       }
       return readonlyTextIsHighlight;
-    },
-    isExistComponent() {
-      let handler = '';
-      if (this.formItem.handler === 'formcustom') {
-        handler = this.formItem.customName;
-      } else {
-        handler = this.formItem.handler;
-      }
-      let component = true;
-      if (!handler || !formItems[handler]) {
-        component = false;
-      }
-      return component;
-    },
-    getComponentTip() {
-      return (formItem) => {
-        const { label = '', customName = '' } = formItem || {};
-        const nameParts = customName.split('-');
-        const componentName = nameParts.length > 1 ? nameParts[0] : customName;
-        return `【${label}(${componentName})】${this.$t('term.framework.componentnoexist')}`;
-      };
     }
   },
-  watch: {}
+  watch: {
+    formDataForWatch: {
+      handler(val) {
+        if (val && (this.mode === 'read' || this.mode === 'readSubform')) {
+          this.enqueueReaction(this.componentUuid, () => {
+            //联动规格
+            const formData = JSON.parse(val);
+            if (!this.$utils.isEmpty(this.reactionFormItemUuidMap)) {
+              let reactionFormItemUuidMap = this.$utils.deepClone(this.reactionFormItemUuidMap);
+              Object.keys(reactionFormItemUuidMap).forEach((key) => {
+                reactionFormItemUuidMap[key] = formData[key];
+              });
+              if (!this.$utils.isSame(reactionFormItemUuidMap, this.reactionFormItemUuidMap)) {
+                this.executionReaction(reactionFormItemUuidMap, this.reactionFormItemUuidMap);
+                this.reactionFormItemUuidMap = reactionFormItemUuidMap;
+              }
+            }
+            if (this.formItem.config && this.formItem.config.isHide && this.formItem.config.isRequired) {
+              // 拿到隐藏+必填表单uuid
+              this.$emit('updateHiddenComponentList', val, this.formItem.uuid);
+            }
+          });
+        }
+      },
+      immediate: true
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index 50bd6d0f2f69451aa330d3428f53537aed71a139..9c39f9083c3852b38f7a4a516e3bcc68a98840f5 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -71,10 +71,11 @@
           <div :key="extra.uuid" @click.stop>
             <FormItem
               :ref="'formitem_' + extra.uuid + '_' + index"
-              :formItem="getExtraFormItem(extra, row)"
-              :value="getDefaultValue(extra.uuid, row)"
-              :formData="{ ...filterUuid(initFormData), ...row }"
-              :formItemList="$utils.deepClone(extraList.concat(formItemList))"
+              :formItem="$utils.deepClone(extra)"
+              :formData="{ ...filterUuid(formData), ...row }"
+              :isSetValue="false"
+              :formItemList="formItemList"
+              :extraFormItemList="extraList"
               :showStatusIcon="false"
               mode="read"
               :readonly="readonly"
@@ -130,17 +131,14 @@ export default {
       isShowExportExcelTemplate: true,
       isShowExportExcel: true,
       loading: false,
-      conditionFormItemUuidList: [], //外部组件参与联动条件的uuid列表
       filterComponentList: ['formtableselector', 'formtableinputer', 'formsubassembly', 'formupload', 'formcube', 'formtable', 'formresoureces', 'formprotocol'], //过滤不参与规则的组件
-      initExternalData: {}, //用于对比外部组件值变换
-      initFormData: this.$utils.deepClone(this.formData)
+      initExternalData: {} //用于对比外部组件值变换
     };
   },
   beforeCreate() {},
   created() {
     if (this.mode !== 'edit') {
       this.init();
-      this.getConditionFormItemList();
     }
   },
   beforeMount() {},
@@ -231,33 +229,6 @@ export default {
       Object.assign(data, this.initExternalData);
       this.tableData.tbodyList.push(data);
     },
-    //从表格选择列表行数据中获取指定字段作为扩展字段的过滤值
-    getExtraFormItem(extraFormItem, row) {
-      //由于每行的过滤值都不一样，所以需要复制，避免互相影响
-      if (!this.rowFormItem[row.uuid]) {
-        this.rowFormItem[row.uuid] = {};
-      }
-      if (!this.rowFormItem[row.uuid][extraFormItem.uuid]) {
-        this.rowFormItem[row.uuid][extraFormItem.uuid] = this.$utils.deepClone(extraFormItem);
-      }
-      const formItem = this.rowFormItem[row.uuid][extraFormItem.uuid];
-      const config = formItem.config;
-      if (config && config.sourceColumnList && config.sourceColumnList.length > 0) {
-        config.sourceColumnList.forEach(sourceColumn => {
-          if (sourceColumn.valueColumn) {
-            sourceColumn.valueList = [row[sourceColumn.valueColumn]];
-            sourceColumn.expression = 'equal';
-          }
-        });
-      }
-      if (this.disabled) {
-        this.$set(formItem.config, 'isDisabled', true);
-      }
-      if (this.readonly) {
-        this.$set(formItem.config, 'isReadOnly', true);
-      }
-      return { ...formItem };
-    },
     validConfig() {
       const errorList = [];
       if (!this.config.dataConfig || this.config.dataConfig.length == 0) {
@@ -394,7 +365,9 @@ export default {
       }
     },
     changeRow(val, uuid, row) {
-      this.$set(row, uuid, val);
+      if (!this.$utils.isSame(val, row[uuid])) {
+        this.$set(row, uuid, val);
+      }
     },
     updateRowSort(event) {
       let beforeVal = this.tableData.tbodyList.splice(event.oldIndex, 1)[0];
@@ -863,16 +836,6 @@ export default {
       }
       return typeof value == 'number' ? String(value) : value;
     },
-    getConditionFormItemList() {
-      //获取可以作为联动的条件的组件(外部组件和当前行下组件的属性)
-      this.conditionFormItemUuidList = [];
-      let allFormItem = this.formItemList.concat(this.formItem.config.dataConfig);
-      let formItemList = allFormItem.filter(d => d.hasValue && (!this.formItem || (this.formItem && d.uuid != this.formItem.uuid)) && !this.filterComponentList.includes(d.handler));
-      if (formItemList && formItemList.length > 0) {
-        this.conditionFormItemUuidList = this.$utils.mapArray(formItemList, 'uuid');
-      }
-      this.conditionFormItemUuidList.push('uuid');
-    },
     updateCurrentRow(row, val) {
       this.$nextTick(() => {
         if (val) {
@@ -881,10 +844,14 @@ export default {
       });
     },
     filterUuid(obj) {
-      if (obj.uuid) {
-        delete obj.uuid;
+      let formData = this.$utils.deepClone(obj);
+      if (formData.uuid) {
+        delete formData.uuid;
+      }
+      if (formData.hasOwnProperty(this.formItem.uuid)) {
+        delete formData[this.formItem.uuid];
       }
-      return obj;
+      return formData;
     }
   },
   filter: {},
@@ -898,48 +865,12 @@ export default {
     extraList() {
       return this.config.dataConfig.filter(d => d.isPC);
     },
-    getDefaultValue() {
-      return (uuid, row) => {
-        let dataConfig = null;
-        if (!this.$utils.isEmpty(this.value) && Array.isArray(this.value)) {
-          let valueItem = this.value.find(i => i.uuid === row.uuid);
-          if (valueItem) {
-            dataConfig = valueItem;
-          }
-        }
-        if (!dataConfig) {
-          dataConfig = this.config.dataConfig.find(d => d.uuid === uuid);
-        }
-        if (dataConfig) {
-          if (dataConfig.config) {
-            const defaultValue = dataConfig.config.defaultValue;
-            if (dataConfig.config.defaultValueType === 'custom') {
-              return defaultValue;
-            } else if (dataConfig.config.defaultValueType === 'matrix') {
-              if (['formselect', 'formradio', 'formcheckbox'].includes(dataConfig.handler)) {
-                const defaultValueField = dataConfig.config.defaultValueField;
-                const defaultTextField = dataConfig.config.defaultTextField;
-                return { text: row[defaultValueField], value: row[defaultTextField] };
-              } else {
-                return row[defaultValue];
-              }
-            } else {
-              return defaultValue;
-            }
-          }
-        }
-        return null;
-      };
-    },
     canAdd() {
       return !this.config.hasOwnProperty('isCanAdd') || this.config.isCanAdd;
     },
     canShowImportExportBtn() {
       return !this.config.hasOwnProperty('isShowImportExportBtn') || this.config.isShowImportExportBtn;
     },
-    formDataForWatch() {
-      return JSON.parse(JSON.stringify(this.formData));
-    },
     showTable() {
       const { hideHeaderWhenDataEmpty = false } = this.config || {};
       const { tbodyList = [] } = this.tableData || {};
@@ -982,15 +913,6 @@ export default {
       },
       deep: true,
       immediate: true
-    },
-    formDataForWatch: {
-      handler(val) {
-        if (this.mode != 'edit' && this.mode != 'editSubform' && !this.$utils.isSame(val, this.initFormData)) {
-          this.initFormData = this.$utils.deepClone(val) || {};
-        }
-      },
-      deep: true,
-      immediate: true
     }
   }
 };
diff --git a/src/resources/plugins/TsSheet/form/conditionexpression/change.js b/src/resources/plugins/TsSheet/form/conditionexpression/change.js
index a889822340c25a72bef89a68de7482a10b1300a8..69df687dc968570f1c992ebdcc5ea0c3ed5afd0d 100644
--- a/src/resources/plugins/TsSheet/form/conditionexpression/change.js
+++ b/src/resources/plugins/TsSheet/form/conditionexpression/change.js
@@ -1,5 +1,6 @@
-export default (currentValue, oldValue, condition) => {
-  if (JSON.stringify(currentValue) !== JSON.stringify(oldValue)) {
+import utils from '@/resources/assets/js/util.js';
+export default (currentValue, oldValue, condition, view) => {
+  if (!utils.isSame(currentValue, oldValue)) {
     return true;
   }
   return false;
diff --git a/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js b/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
index f308e4fb2d6cc4806467d6019cc811b4c638fe89..a933d4ed5cdf5ed4a27830528c01cfb83d9563f0 100644
--- a/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
+++ b/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
@@ -1,10 +1,11 @@
+import utils from '@/resources/assets/js/util.js';
 export default (currentValue, oldValue, condition) => {
   let isExclude = false;
   let conditionValue = condition.valueList;
   //处理隐藏属性过滤
   let uuidList = (condition.formItemUuid && condition.formItemUuid.split('#')) || [];
   let uuid = uuidList[1] || 'value';
-  if (currentValue == null || currentValue == '' || currentValue == [] || currentValue == {}) {
+  if (utils.isEmpty(currentValue)) {
     isExclude = true;
   } else {
     let conditionValueList = [];
diff --git a/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue b/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue
index f0260d93f179156e1987ae2812498306f167420a..979dae48b85a0df24ae07da3065a15e83ec9a642 100644
--- a/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue
+++ b/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue
@@ -1,9 +1,14 @@
 <template>
   <div>
-    <Row v-if="formItem.handler && formItem.handler == 'formselect'" :gutter="10" class="mb-sm">
+    <Row :gutter="10" class="mb-sm">
       <Col :span="24">
         <Alert show-icon>
-          {{ $t('term.framework.requiredselectedtips') }}
+          <template v-if="formItem.handler && formItem.handler == 'formselect'">
+            对于下拉框组件：{{ $t('term.framework.requiredselectedtips') }}
+          </template>
+          <div :class="formItem.handler && formItem.handler == 'formselect' ? 'mt-xs' : ''">
+            目前可作为组件值的组件有：下拉框、单选框、复选框、用户选择、上报人、日期、时间。
+          </div>
         </Alert>
       </Col>
     </Row>
diff --git a/src/resources/plugins/TsSheet/form/reaction/filter.js b/src/resources/plugins/TsSheet/form/reaction/filter.js
index 667fe1b7780107040cc53d6975d82f5441a69bc1..2825d1a33b3ffdf9e55391e1a6ef44d6265eb56b 100644
--- a/src/resources/plugins/TsSheet/form/reaction/filter.js
+++ b/src/resources/plugins/TsSheet/form/reaction/filter.js
@@ -6,6 +6,9 @@ export default ({ reaction, view }) => {
       let formItemUuid = list[0];
       let column = list[1] ? list[1] : 'value';
       let formItem = view.formItemList.find(d => d.uuid === formItemUuid);
+      if (!formItem) {
+        formItem = view.extraFormItemList.find(d => d.uuid === formItemUuid);
+      }
       if (formItem && formItem.config) {
         let valueList = [];
         let textList = [];
diff --git a/src/views/pages/autoexec/components/param/edit/json.vue b/src/views/pages/autoexec/components/param/edit/json.vue
index e1b8b63b5cb0cc7faf66f0bca939d60032c9cda0..bb5155ae8d4e9fac1451276665ef5a36b2cbbf34 100644
--- a/src/views/pages/autoexec/components/param/edit/json.vue
+++ b/src/views/pages/autoexec/components/param/edit/json.vue
@@ -62,7 +62,7 @@ export default {
   filter: {},
   computed: {
     getSetting() {
-      let setting = this.$utils.deepClone(this.config);
+      let setting = this.$utils.deepClone(this.config || {});
       Object.assign(setting, {
         rows: 1, type: 'textarea'
       });
diff --git a/src/views/pages/autoexec/config/profile/component/params-list.vue b/src/views/pages/autoexec/config/profile/component/params-list.vue
index d28ca222a73f85e8b92afcf28171d162bca4d16d..e7e22506096cd60020e59dcbbaa09dc194f769be 100644
--- a/src/views/pages/autoexec/config/profile/component/params-list.vue
+++ b/src/views/pages/autoexec/config/profile/component/params-list.vue
@@ -1,5 +1,9 @@
 <template>
   <div class="params-list-box bg-op radius-lg padding">
+    <Loading
+      :loadingShow="isShowLoading"
+      type="fix"
+    ></Loading>
     <Row v-if="!isShowLoading && list && list.length > 0" type="flex">
       <Col v-for="(data ,index) in list" :key="index" :span="24">
         <TsFormItem
@@ -47,7 +51,6 @@
       </Col>
     </Row>
     <div v-else-if="!isShowLoading" class="text-tip tips">{{ $t('page.notarget', {target: $t('page.inputparam')}) }}</div>
-    <Loading v-else-if="isShowLoading"></Loading>
   </div>
 </template>
 <script>
@@ -73,9 +76,7 @@ export default {
     };
   },
   beforeCreate() {},
-  async created() {
-    await this.getParamInvokeTypeList();
-  },
+  created() {},
   beforeMount() {},
   mounted() {
     this.getParamList();
@@ -99,23 +100,27 @@ export default {
       }
       return dataList;
     },
-    async getParamInvokeTypeList() {
+    getParamInvokeTypeList() {
+      this.isShowLoading = true;
       let params = {
         enumClass: 'neatlogic.framework.autoexec.constvalue.AutoexecProfileParamInvokeType'
       };
-      await this.$api.autoexec.globalParams.getTypeList(params).then((res) => {
+      return this.$api.autoexec.globalParams.getTypeList(params).then((res) => {
         if (res && res.Status == 'OK') {
           this.invokeTypeList = res.Return || [];
         }
+      }).finally(() => {
+        this.isShowLoading = false;
       });
     },
-    getParamList() {
-      this.isShowLoading = false;
-      this.list = this.$utils.deepClone(this.paramList);
-      this.list && this.list.forEach((item) => {
+    async getParamList() {
+      await this.getParamInvokeTypeList();
+      let list = this.$utils.deepClone(this.paramList);
+      list && list.forEach((item) => {
         item.mappingMode = item.mappingMode == 'globalparam' ? 'globalparam' : 'constant';
         item.invokeTypeList = this.$utils.deepClone(this.invokeTypeList);
       });
+      this.list = list;
       this.initConfig();
     },
     handleValueList(list) {
@@ -173,8 +178,7 @@ export default {
   },
   watch: {
     paramList: {
-      async handler() {
-        await this.getParamInvokeTypeList();
+      handler() {
         this.getParamList();
       },
       deep: true
diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
index b7330f1809d2eb43efd5a74974e8581fdc2dc558..20e821b62d661006d7683c55bcb7ef5bf9da0724 100644
--- a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
@@ -156,6 +156,7 @@ export default {
     },
     save() {
       if (this.runnerGroup.value) {
+        delete this.runnerGroup.text;
         return this.runnerGroup;
       } else {
         return {};
@@ -179,8 +180,8 @@ export default {
       return label;
     },
     async getRunnerGroupLabel() {
-      if (this.runnerGroup.value == -1) {
-        return;
+      if (this.$utils.isEmpty(this.runnerGroup.value) || this.runnerGroup.value == -1) {
+        return false;
       }
       let params = {defaultValue: [this.runnerGroup.value]};
       await this.$api.framework.runner.getRunnerGroup(params)
diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
index fcd20939b2c0895b355052439f3693c1a0ef8e87..8e985ddd229c965c7c795917b3662b7a96d3c1ab 100644
--- a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
@@ -149,6 +149,7 @@ export default {
       this.openParamsSetting();
     },
     save() {
+      delete this.runnerGroupTag.text;
       return this.runnerGroupTag;
     },
     valid() {
@@ -169,6 +170,9 @@ export default {
       return label;
     },
     async getRunnerGroupTagLabel() {
+      if (this.$utils.isEmpty(this.runnerGroupTag.value)) {
+        return false;
+      }
       let params = {defaultValue: [this.runnerGroupTag.value]};
       await this.$api.framework.runner.getRunnerGroupTag(params)
         .then(res => {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step-group.vue b/src/views/pages/autoexec/detail/actionDetail/step-group.vue
index 78136ed589cbca9ba6a53569395a378fdb46df12..05617862529bc1e31a9d73d1af3db0b533fcf319 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step-group.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step-group.vue
@@ -294,7 +294,8 @@ export default {
             transfer: true,
             label: this.$t('term.autoexec.batchquantity'),
             desc: this.$t('term.deploy.executetargetdesc'),
-            dataList: this.$utils.getRoundCountList()
+            dataList: this.$utils.getRoundCountList(),
+            isHidden: true
           },
           parallelCount: {
             type: 'select',
@@ -302,7 +303,8 @@ export default {
             transfer: true,
             label: this.$t('term.autoexec.parall'),
             desc: this.$t('term.autoexec.paralldesc'),
-            dataList: this.$utils.getRoundCountList()
+            dataList: this.$utils.getRoundCountList(),
+            isHidden: true
           }
         }
       },
@@ -368,6 +370,8 @@ export default {
     },
     addTarget() {
       this.executeConfig = this.getInitExecuteConfig();
+      this.$set(this.executeForm.itemList.roundCount, 'isHidden', true);
+      this.$set(this.executeForm.itemList.parallelCount, 'isHidden', true);
       this.isShowDialog = true;
     },
     editTarget() {
diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue
index 329eeee1212aa4fe9c8bd7ffa0547973217de764..c66c9e7fc6c0ef72f7eae765f1b31d4e76d806b0 100644
--- a/src/views/pages/autoexec/detail/job-detail.vue
+++ b/src/views/pages/autoexec/detail/job-detail.vue
@@ -14,12 +14,23 @@
       <template v-slot:topLeft>
         <div class="action-group">
           <div class="action-item">
-            <strong
-              :title="jobData.name"
-              class="text-grey overflow"
-              style="display: inline-block;line-height: normal;vertical-align: middle;"
-              :style="{maxWidth: jobNameWidth + 'px'}"
-            >{{ jobData.name }}</strong>
+            <Tooltip
+              max-width="320"
+              theme="light"
+              transfer
+            >
+              <strong
+                :title="jobData.name"
+                class="text-grey overflow"
+                style="display: inline-block;line-height: normal;vertical-align: middle;"
+                :style="{maxWidth: jobNameWidth + 'px'}"
+              >{{ jobData.name }}</strong>
+              <div slot="content">
+                <div>{{ $t('page.autoexecparallpolicy') }}: {{ parallelPolicyTrans(jobData.parallelPolicy) }}</div>
+                <div v-if="!$utils.isEmpty(jobData.roundCount)">{{ $t('term.autoexec.batchquantity') }}: {{ parallelOrRoundCountTrans(jobData.roundCount) }}</div>
+                <div v-if="!$utils.isEmpty(jobData.parallelCount)">{{ $t('term.autoexec.parall') }}: {{ parallelOrRoundCountTrans(jobData.parallelCount) }}</div>
+              </div>
+            </Tooltip>
           </div>
           <div class="action-item" style="padding: 0px"><Divider type="vertical" style="margin: 0px" /></div>
           <div ref="userRef" class="action-item">
@@ -581,6 +592,28 @@ export default {
         path: path,
         query: { jobId: this.jobData.id }
       });
+    },
+    parallelPolicyTrans(policy) {
+      let parallelPolicy = policy;
+      if (parallelPolicy === 'parallel') {
+        return this.$t('page.autoexecparall');
+      } else if (parallelPolicy === 'roundCount') {
+        return this.$t('page.autoexecbatchround');
+      } else {
+        return policy;
+      }
+    },
+    parallelOrRoundCountTrans(count) {
+      let parallelOrRoundCountTrans = count;
+      if (parallelOrRoundCountTrans == 0) {
+        return this.$t('page.fulllist');
+      } else if (parallelOrRoundCountTrans == 1) {
+        return this.$t('page.allparallel');
+      } else if (parallelOrRoundCountTrans == -1) {
+        return this.$t('page.bluegreen');
+      } else {
+        return parallelOrRoundCountTrans;
+      }
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
index 50c328ad03ef414b911d5bee3adad455a80311cd..2aef7f96757e5624c79bd3bb5f4e0508a7432eb1 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -3,7 +3,23 @@
     <ul v-if="phaseGroupList && phaseGroupList.length > 0" class="phaseList">
       <template v-for="(group, index) in phaseGroupList">
         <li v-if="group.phaseList && group.phaseList.length > 0" :key="index" class="step-li border-color">
-          <span class="stepIndex tips" :class="{ 'text-primary border-primary': group.phaseList.findIndex(d => d.id === activePhaseId) >= 0, 'text-grey': group.phaseList.findIndex(d => d.id === activePhaseId) === -1 }">{{ index + 1 }}</span>
+          <div v-if="group.parallelPolicy" class="group">
+            <Tooltip
+              max-width="320"
+              theme="light"
+              transfer
+              :offset="-20"
+              :disabled="!group.parallelPolicy"
+            >
+              <span class="stepIndex tips" :class="{ 'text-primary border-primary': group.phaseList.findIndex(d => d.id === activePhaseId) >= 0, 'text-grey': group.phaseList.findIndex(d => d.id === activePhaseId) === -1 }">{{ index + 1 }}</span>
+              <div slot="content">
+                <div>{{ $t('page.autoexecparallpolicy') }}: {{ parallelPolicyTrans(group.parallelPolicy) }}</div>
+                <div v-if="!$utils.isEmpty(group.roundCount)">{{ $t('term.autoexec.batchquantity') }}: {{ parallelOrRoundCountTrans(group.roundCount) }}</div>
+                <div v-if="!$utils.isEmpty(group.parallelCount)">{{ $t('term.autoexec.parall') }}: {{ parallelOrRoundCountTrans(group.parallelCount) }}</div>
+              </div>
+            </Tooltip>
+          </div>
+          <span v-else class="stepIndex tips" :class="{ 'text-primary border-primary': group.phaseList.findIndex(d => d.id === activePhaseId) >= 0, 'text-grey': group.phaseList.findIndex(d => d.id === activePhaseId) === -1 }">{{ index + 1 }}</span>
           <ul>
             <li
               v-for="(phase, pindex) in group.phaseList"
@@ -195,6 +211,28 @@ export default {
     },
     handleWaitingData(group) {
       this.$set(this.waitingTableConfig, 'tbodyList', this.waitingDetail.filter(t => t.groupSortList.includes(group.groupSort)));
+    },
+    parallelOrRoundCountTrans(count) {
+      let parallelOrRoundCount = count;
+      if (parallelOrRoundCount == 0) {
+        return this.$t('page.fulllist');
+      } else if (parallelOrRoundCount == 1) {
+        return this.$t('page.allparallel');
+      } else if (parallelOrRoundCount == -1) {
+        return this.$t('page.bluegreen');
+      } else {
+        return parallelOrRoundCount;
+      }
+    },
+    parallelPolicyTrans(policy) {
+      let parallelPolicy = policy;
+      if (parallelPolicy === 'parallel') {
+        return this.$t('page.autoexecparall');
+      } else if (parallelPolicy === 'roundCount') {
+        return this.$t('page.autoexecbatchround');
+      } else {
+        return policy;
+      }
     }
   },
   computed: {
@@ -204,7 +242,7 @@ export default {
         this.phaseList.forEach(phase => {
           let group = groupList.find(d => d.groupId == phase.groupId);
           if (!group) {
-            group = { groupId: phase.groupId, phaseList: [], groupSort: phase.jobGroupVo.sort };
+            group = { groupId: phase.groupId, phaseList: [], groupSort: phase.jobGroupVo.sort, parallelPolicy: phase.jobGroupVo.parallelPolicy, parallelCount: phase.jobGroupVo.parallelCount, roundCount: phase.jobGroupVo.roundCount};
             groupList.push(group);
           }
           group['phaseList'].push(phase);
@@ -407,5 +445,13 @@ export default {
       }
     }
   }
+  .group{
+    position: absolute;
+    ::v-deep .ivu-tooltip-rel {
+      width: 100%;
+      position: static;
+      border-color: rgb(229, 229, 229);
+    }
+  }
 }
 </style>
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
index d305994f634c214193d974ae21bc1847a1cd31a7..04cbada95e6ff34a59d9ecd08dc07872dbb64109 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
@@ -77,7 +77,7 @@
               <span class="status-text text-pending">{{ $t('term.autoexec.parall') }}:{{ parallelCount }} </span>
               <div slot="content">
                 <div>{{ $t('term.autoexec.parall') }}{{ $t('page.source') }}: {{ phaseData.roundCountFrom }}</div>
-                <div>{{ $t('term.autoexec.batchquantity') }}: {{ phaseData.roundCount }}</div>
+                <div>{{ $t('term.autoexec.batchquantity') }}: {{ roundCount }}</div>
               </div>
             </Tooltip>
             <Tooltip
diff --git a/src/views/pages/autoexec/detail/runner-detail.vue b/src/views/pages/autoexec/detail/runner-detail.vue
index 3244dfe718aba4ed5b31cb2df311a7b5484ef368..fef3905129f3f4c277b7c443389bee78d047b2f8 100644
--- a/src/views/pages/autoexec/detail/runner-detail.vue
+++ b/src/views/pages/autoexec/detail/runner-detail.vue
@@ -110,7 +110,7 @@
               :runtimeParamList="runtimeParamList"
             ></RunnerGroupTagSetting>
           </div>
-          <div v-if="runnerGroupTag && runnerGroupTag.mappingMode==='constant'">
+          <div v-if="runnerGroupTag && (!runnerGroupTag.mappingMode || runnerGroupTag.mappingMode==='constant')">
             <RunnerGroupTagSetting
               ref="runnerGroupTag"
               :config="runnerGroupTag"
@@ -523,8 +523,8 @@ export default {
             if (this.jobId) {
               this.setJobParams(this.jobConfig);
             } else {
-              this.roundCount = this.executeConfig.roundCount || 64;
-              this.parallelCount = this.executeConfig.parallelCount || 32;
+              this.roundCount = !this.$utils.isEmpty(this.executeConfig.roundCount) ? this.executeConfig.roundCount : 64;
+              this.parallelCount = !this.$utils.isEmpty(this.executeConfig.parallelCount) ? this.executeConfig.parallelCount : 32;
               this.parallelPolicy = this.executeConfig.parallelPolicy || 'parallel';
               
               if (this.executeConfig.whenToSpecify == 'runtime') {
@@ -692,11 +692,11 @@ export default {
       if (this.dataConfig && this.dataConfig.needRoundCount) { //是否需要设置分批数量
         this.$set(data, 'parallelPolicy', this.parallelPolicy || 'parallel');
         if (this.parallelPolicy == 'parallel') {
-          this.$set(data, 'parallelCount', this.parallelCount || 32);
+          this.$set(data, 'parallelCount', !this.$utils.isEmpty(this.parallelCount) ? this.parallelCount : 32);
           this.$set(data, 'roundCount', null);
         } else {
           this.$set(data, 'parallelCount', null);
-          this.$set(data, 'roundCount', this.roundCount || 64);
+          this.$set(data, 'roundCount', !this.$utils.isEmpty(this.roundCount) ? this.roundCount : 64);
         }
       }
       if (this.$refs.param) {
@@ -769,9 +769,13 @@ export default {
     },
     changeParallelPolicy(val) {
       if (val && val == 'roundCount') {
-        this.roundCount = this.roundCount || 64;
+        if (this.$utils.isEmpty(this.roundCount)) {
+          this.roundCount = 64;
+        }
       } else {
-        this.parallelCount = this.parallelCount || 32;
+        if (this.$utils.isEmpty(this.parallelCount)) {
+          this.parallelCount = 32;
+        }
       }
     }
   },
diff --git a/src/views/pages/autoexec/detail/time-job-detail.vue b/src/views/pages/autoexec/detail/time-job-detail.vue
index 3b8ba7a09a8692000e3685403f98dbcbfef6c500..fd4d10f8281c47b2f3d91fdd2a84debedb5c91b1 100644
--- a/src/views/pages/autoexec/detail/time-job-detail.vue
+++ b/src/views/pages/autoexec/detail/time-job-detail.vue
@@ -164,8 +164,7 @@ export default {
           transfer: true,
           label: _this.$t('term.autoexec.planendtime') // 计划结束时间
         }
-      },
-      initData: {}
+      }
     };
   },
   beforeCreate() {},
@@ -191,6 +190,14 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    beforeLeaveCompare(oldData) {
+      const newVal = this.$utils.deepRemoveEmptyValues(this.getToolParams());
+      const oldval = this.$utils.deepRemoveEmptyValues(oldData);
+      return this.$utils.isSame(oldval, newVal);
+    },
+    async beforeLeave() {
+      return await this.save();
+    },
     changeTabValue(item) {
       // 点击切换按钮
       this.current = item;
@@ -234,8 +241,8 @@ export default {
         return false;
       }
       let params = this.getToolParams();
-      this.initData = params;
-      this.$api.autoexec.timeJob.saveTimeJob(params).then((res) => {
+      this.$addWatchData(params);
+      return this.$api.autoexec.timeJob.saveTimeJob(params).then((res) => {
         if (res.Status == 'OK') {
           this.$Message.success(this.$t('message.savesuccess')); // 保存成功
           this.$router.push({
@@ -256,10 +263,11 @@ export default {
       return this.$api.autoexec.timeJob.getTimeJob(param).then((res) => {
         if (res.Status == 'OK') {
           let data = res.Return;
+          let initData = {};
           if (this.id) {
             for (let key in this.formSetting) {
               this.$set(this.formSetting[key], 'value', data[key]);
-              this.$set(this.initData, key, data[key]);
+              this.$set(initData, key, data[key]);
             }
           }
           if (!this.defaultCombopId) {
@@ -267,7 +275,8 @@ export default {
           }
           this.config = data.config;
           this.isShow = true;
-          this.$set(this.initData, 'config', this.config);
+          this.$set(initData, 'config', this.config);
+          this.$addWatchData(initData);
         }
       }).finally(() => {
         this.isLoading = false;
@@ -276,29 +285,7 @@ export default {
   },
   filter: {},
   computed: {},
-  watch: {},
-  beforeRouteLeave(to, from, next, url) {
-    let data = this.getToolParams();
-    if (this.$utils.isSame(data, this.initData)) {
-      url ? this.$utils.gotoHref(url) : next(true);
-    } else {
-      let _this = this;
-      this.$utils.jumpDialog.call(
-        this,
-        {
-          save: {
-            fn: async vnode => {
-              return await _this.save();
-            }
-          }
-        },
-        to,
-        from,
-        next,
-        url
-      );
-    }
-  }
+  watch: {}
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/views/pages/autoexec/manage/job-manage.vue b/src/views/pages/autoexec/manage/job-manage.vue
index d5cc30c5cee2b9bc362fc22042f743fe1f0f343c..a80f2782d6f953fce9cf52c14fc125535b0b37c4 100644
--- a/src/views/pages/autoexec/manage/job-manage.vue
+++ b/src/views/pages/autoexec/manage/job-manage.vue
@@ -394,7 +394,7 @@ export default {
         window.open(HOME + '/deploy.html#/job-manage', '_blank');
       } else if (row.source == 'deployschedulegeneral' || row.source == 'deployschedulepipeline') {
         window.open(HOME + '/deploy.html#/schedule-job-edit?id=' + routeConfig.id, '_blank');
-      } else if (row.source == 'deployci') {
+      } else if (row.source == 'deployci' || row.source == 'deploycipipeline') {
         window.open(HOME + '/deploy.html#/config-add?appSystemId=' + routeConfig.appSystemId + '&id=' + routeConfig.id, '_blank');
       } else if (row.source === 'dr') {
         window.open(HOME + '/dr.html#/preparation-job-detail?id=' + routeConfig.id, '_blank');
diff --git a/src/views/pages/autoexec/manage/job/job-list.vue b/src/views/pages/autoexec/manage/job/job-list.vue
index 6dc69f23a61d43a2659bc534d077d8fb5f2f0d3a..7ad417d4ea60497608d6a19361ebf1129bc604d5 100644
--- a/src/views/pages/autoexec/manage/job/job-list.vue
+++ b/src/views/pages/autoexec/manage/job/job-list.vue
@@ -306,7 +306,7 @@ export default {
         window.open(HOME + '/deploy.html#/job-manage', '_blank');
       } else if (row.source == 'deployschedulegeneral' || row.source == 'deployschedulepipeline') {
         window.open(HOME + '/deploy.html#/schedule-job-edit?id=' + routeConfig.id, '_blank');
-      } else if (row.source == 'deployci') {
+      } else if (row.source == 'deployci' || row.source == 'deploycipipeline') {
         window.open(HOME + '/deploy.html#/config-add?appSystemId=' + routeConfig.appSystemId + '&id=' + routeConfig.id, '_blank');
       }
       console.log('row.source', row.source);
diff --git a/src/views/pages/autoexec/manage/time-job-list.vue b/src/views/pages/autoexec/manage/time-job-list.vue
index 3a4035da01755786e0058e42ddcd27beeeb41796..5a4f4d7d59761186eca959a118aabcd6f0f73de1 100644
--- a/src/views/pages/autoexec/manage/time-job-list.vue
+++ b/src/views/pages/autoexec/manage/time-job-list.vue
@@ -77,7 +77,7 @@
           </template>
           <template slot="action" slot-scope="{ row }">
             <div class="tstable-action">
-              <ul v-if="row.editable" class="tstable-action-ul">
+              <ul class="tstable-action-ul">
                 <li :title="!row.editable ? $t('page.notauthrelationadmin') : ''" @click.stop>
                   <TsFormSwitch
                     v-model="row.isActive"
@@ -88,6 +88,18 @@
                     @on-change="toggleAction(row)"
                   ></TsFormSwitch>
                 </li>
+                <li
+                  class="tsfont-test icon"
+                  :title="
+                    !row.editable
+                      ? $t('page.notauthrelationadmin')
+                      : row.isActive === 1
+                        ? '禁用才能测试'
+                        : ''
+                  "
+                  :class="{ disable: !row.editable || row.isActive == 1 }"
+                  @click="testRow(row, jobHandler)"
+                >{{ $t('page.test') }}</li>
                 <li
                   class="icon tsfont-trash-o"
                   :title="!row.deletable ? $t('page.notauthrelationadmin') : ''"
@@ -98,7 +110,14 @@
                   {{ $t('page.delete') }}
                 </li>
                 <li
-                  v-if="row.execCount > 0"
+                  class="tsfont-putongjigui"
+                  :title="$t('term.autoexec.jobrecord')"
+                  @click="toRecord(row)"
+                >
+                  <!-- 自动化作业记录 -->
+                  {{ $t('term.autoexec.jobrecord') }}
+                </li>
+                <li
                   class="tsfont-putongjigui"
                   :title="$t('term.autoexec.executionrecord')"
                   @click="showAudit(row.uuid)"
@@ -173,7 +192,7 @@ export default {
           { key: 'isLoad', title: this.$t('page.loaded')},
           { key: 'cron', title: this.$t('term.autoexec.timingplan') }, // cron表达式
           { key: 'autoexecCombopName', title: this.$t('term.autoexec.relatecombinationtool') }, // 关联组合工具
-          { key: 'execCount', title: this.$t('term.autoexec.executecount') }, // 执行次数
+          { key: 'execCount', title: this.$t('term.autoexec.jobcount') }, // 执行次数
           { key: 'lcuVo', title: this.$t('page.fcu'), type: 'user' }, // 修改人
           { key: 'lcd', title: this.$t('page.fcd'), type: 'time' }, // 修改时间
           { key: 'jobStatus', title: this.$t('term.autoexec.executionsituation') },
@@ -184,7 +203,8 @@ export default {
         currentPage: 1,
         keyword: '', // 关键字
         autoexecCombopId: null // 组合工具id
-      }
+      },
+      jobHandler: null
     };
   },
   beforeCreate() {},
@@ -222,6 +242,7 @@ export default {
         if (res.Status == 'OK') {
           this.loadingShow = false;
           this.tableData = Object.assign(this.tableData, res.Return);
+          this.jobHandler = res.Return.handler;
         }
       });
     },
@@ -267,7 +288,7 @@ export default {
     },
     toRecord(row) {
       // 打开执行记录
-      if (row && row.execCount) {
+      if (row) {
         this.autoexecCombopId = row.autoexecCombopId;
         this.scheduleId = row.id;
         this.isShowRecord = true;
@@ -293,6 +314,28 @@ export default {
     closeAuditDialog() {
       this.isAuditShow = false;
       this.currentJobUuid = null;
+    },
+    testRow: function(row, handler) {
+      if (!row.editable || row.isActive == 1) {
+        return;
+      }
+      this.$createDialog({
+        title: this.$t('dialog.title.testconfirm'),
+        content: this.$t('dialog.content.testconfirm', {target: row.name}),
+        btnType: 'primary',
+        'on-ok': vnode => {
+          let params = { jobUuid: row.uuid, jobHandlerClassName: handler};
+          this.$api.autoexec.timeJob
+            .test(params)
+            .then(res => {
+              if (res.Status == 'OK') {
+                this.$Message.success(this.$t('message.executesuccess'));
+                this.getTableDataList(1);
+                vnode.isShow = false;
+              }
+            });
+        }
+      });
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue
index 60348149ab1ceb3f989c5b51bb07088b26af36fe..febe359a7c62222a5f9a15764e37abb534d071a0 100644
--- a/src/views/pages/autoexec/quick-service/catalog/service.vue
+++ b/src/views/pages/autoexec/quick-service/catalog/service.vue
@@ -1164,6 +1164,12 @@ export default {
         delete params.config.roundCount;
         delete params.config.parallelPolicy;
         delete params.config.parallelCount;
+      } else {
+        if (params.config.parallelPolicy.value === 'parallel') {
+          delete params.config.roundCount;
+        } else {
+          delete params.config.parallelCount;
+        }
       }
       if (!this.needExecuteNode) {
         delete params.config.executeNodeConfig;
diff --git a/src/views/pages/autoexec/router.js b/src/views/pages/autoexec/router.js
index 08afbc1277e5aa06179b32876baa24ee33960cce..e6a423a016742a52a2fc15cdb90e10a91d7e47d8 100644
--- a/src/views/pages/autoexec/router.js
+++ b/src/views/pages/autoexec/router.js
@@ -97,7 +97,7 @@ export default [
       title: $t('router.autoexec.timejob'),
       ismenu: true,
       icon: 'tsfont-formtime',
-      authority: 'AUTOEXEC_MODIFY',
+      authority: 'AUTOEXEC_SCHEDULE_MODIFY',
       type: 'job'
     }
   },
@@ -110,7 +110,7 @@ export default [
       title: $t('router.autoexec.timejob'),
       ismenu: false,
       icon: 'tsfont-formtime',
-      authority: 'AUTOEXEC_MODIFY',
+      authority: 'AUTOEXEC_SCHEDULE_MODIFY',
       type: 'detail'
     }
   },
@@ -122,7 +122,7 @@ export default [
       title: $t('router.autoexec.timejob'),
       ismenu: false,
       icon: 'tsfont-formtime',
-      authority: 'AUTOEXEC_MODIFY',
+      authority: 'AUTOEXEC_SCHEDULE_MODIFY',
       type: 'detail'
     }
   },
diff --git a/src/views/pages/cmdb/customview/view-data-list.vue b/src/views/pages/cmdb/customview/view-data-list.vue
index 7ec32900e59ac924276fd54ca9d7332e8ef11a32..ac66081ad69e84de2ea05eba3fdaa21039a19426 100644
--- a/src/views/pages/cmdb/customview/view-data-list.vue
+++ b/src/views/pages/cmdb/customview/view-data-list.vue
@@ -410,6 +410,7 @@ export default {
           params.attrFilterList.push({
             attrUuid: d.attrUuid,
             valueList: d.valueList,
+            actualValueList: d.actualValueList,
             expression: d.expression,
             type: key.startsWith('constattr_') ? 'constattr' : key.startsWith('globalattr_') ? 'globalattr' : 'attr'
           });
diff --git a/src/views/pages/cmdb/form/component/formcientitymodify/import-template.vue b/src/views/pages/cmdb/form/component/formcientitymodify/import-template.vue
index e3633bb8489ec9fa36c8307101ca3d8da8bc0a97..54a623e2878bedbc78f45b50de12fd199bba9300 100644
--- a/src/views/pages/cmdb/form/component/formcientitymodify/import-template.vue
+++ b/src/views/pages/cmdb/form/component/formcientitymodify/import-template.vue
@@ -100,13 +100,18 @@ export default {
         }
       });
       this.tbodyList = [...glbalTbodyList, ...attrTbodyList, ...relTbodyList];
+      let selectedList = [];
       if (this.formConfigList && this.formConfigList.length > 0 && this.tbodyList && this.tbodyList.length > 0) {
         this.formConfigList.forEach(formitem => {
           const item = this.tbodyList.find(tbodyitem => formitem.key === tbodyitem.rowType + '_' + tbodyitem.id);
           if (item) {
+            selectedList.push(item);
             this.$set(item, '_selected', true);
           }
         });
+        if (!this.$utils.isEmpty(selectedList)) {
+          this.getSelected([], selectedList);
+        }
       }
     },
     close() {
diff --git a/src/views/pages/deploy/application-config/application-config-manage.vue b/src/views/pages/deploy/application-config/application-config-manage.vue
index 8aa8d1deedd461e3f925a111d195b065f1700603..7b3cd19119686109df97a8232f7a62d85ba3f1f0 100644
--- a/src/views/pages/deploy/application-config/application-config-manage.vue
+++ b/src/views/pages/deploy/application-config/application-config-manage.vue
@@ -251,7 +251,6 @@ export default {
       if (this.envId) {
         this.$set(query, 'envId', this.envId);
       }
-      this.$set(query, 'hasEditAuth', this.canEdit); // 编辑配置权限
       this.$router.push({
         path: '/application-config-pipeline-detail',
         query: query
diff --git a/src/views/pages/deploy/application-config/config/app/app-pipeline.vue b/src/views/pages/deploy/application-config/config/app/app-pipeline.vue
index 3db4d4435f28529792fb85330546e653e07f61f9..82ec711be354b2ac5ab091af15575154a884435f 100644
--- a/src/views/pages/deploy/application-config/config/app/app-pipeline.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-pipeline.vue
@@ -24,7 +24,7 @@
         <div class="tstable-action">
           <ul class="tstable-action-ul">
             <li class="tsfont-list" @click="showJobList(row)">{{ $t('term.deploy.joblist') }}</li>
-            <li class="tsfont-plus" @click="addBatchJob(row)">{{ $t('term.deploy.batchjob') }}</li>
+            <li v-auth="'BATCHDEPLOY_MODIFY'" class="tsfont-plus" @click="addBatchJob(row)">{{ $t('term.deploy.batchjob') }}</li>
             <li class="tsfont-trash-o" @click="deletePipeline(row)">{{ $t('page.delete') }}</li>
           </ul>
         </div>
diff --git a/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue b/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue
index 87f8a3c67cb8cab0f2347f119b9a3f1ea55014c7..f409f5909e58abb8437d09a7b89f7e79c296872d 100644
--- a/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue
@@ -2,7 +2,7 @@
   <div class="env-autoconfig-box bg-op env-autoconfig-radius">
     <div class="text-right">
       <ul class="pt-nm pr-nm action-group">
-        <li v-if="hasAutoConfig && hasEditConfigAuth" class="action-item tsfont-edit text-href" @click="editAutoConfig">{{ $t('page.edit') }}</li>
+        <li v-if="hasEditConfigAuth" class="action-item tsfont-edit text-href" @click="editAutoConfig">{{ $t('page.edit') }}</li>
         <template v-else>
           <Tooltip
             max-width="400"
diff --git a/src/views/pages/deploy/application-config/config/env/env-instance-list.vue b/src/views/pages/deploy/application-config/config/env/env-instance-list.vue
index 52b054969fdf7b3c50f8dfe25ce438ca03a060d5..e6c028d2a7a2272c050d5d29e0f48f925c6f7d91 100644
--- a/src/views/pages/deploy/application-config/config/env/env-instance-list.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-instance-list.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="bg-op padding env-example-radius">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
     <div class="pb-nm">
       <TsRow>
         <Col :span="12">
@@ -166,7 +167,8 @@ export default {
       blueGreenId: null,
       selectedInstanceIdList: [],
       isEdit: false,
-      instanceData: null
+      instanceData: null,
+      loadingShow: true
     };
   },
   beforeCreate() {},
@@ -199,6 +201,7 @@ export default {
         ...this.params
       };
       if (params) {
+        this.loadingShow = true;
         this.$api.deploy.applicationConfig.getEnvInfo(params).then((res) => {
           if (res && res.Status == 'OK') {
             let {instanceList} = res.Return;
@@ -210,6 +213,8 @@ export default {
               this.defaultTbodyList = instanceList;
             }
           }
+        }).finally(() => {
+          this.loadingShow = false;
         });
       }
     },
@@ -301,6 +306,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .env-example-radius {
+  position: relative;
   height: calc(100vh - 50px - 50px - 32px - 16px);
   border-radius: 0 10px 10px;
 }
diff --git a/src/views/pages/deploy/application-config/config/integrated/single-add-job.vue b/src/views/pages/deploy/application-config/config/integrated/single-add-job.vue
index 3d76e08e70c811b4f04522b576edfa990cf80f41..b6aa21b3ded2fb0cc1654fc9e44c53f2031a6652 100644
--- a/src/views/pages/deploy/application-config/config/integrated/single-add-job.vue
+++ b/src/views/pages/deploy/application-config/config/integrated/single-add-job.vue
@@ -210,13 +210,44 @@ export default {
           type: 'slot',
           label: ''
         },
+        {
+          name: 'parallelPolicy',
+          type: 'radio',
+          label: this.$t('page.autoexecparallpolicy'),
+          dataList: [
+            {
+              text: this.$t('page.autoexecparall'),
+              value: 'parallel'
+            },
+            {
+              text: this.$t('page.autoexecbatchround'),
+              value: 'roundCount'
+            }
+          ],
+          allowToggle: true,
+          transfer: true,
+          validateList: ['required'],
+          onChange: (val) => {
+            this.changeParallelPolicy(val);
+          }
+        },
         {
           name: 'roundCount',
           type: 'select',
           label: this.$t('term.autoexec.batchquantity'),
           desc: this.$t('term.autoexec.roundcountdescrition'),
           dataList: this.$utils.getRoundCountList(),
-          filterName: 'text'
+          filterName: 'text',
+          validateList: ['required']
+        },
+        {
+          name: 'parallelCount',
+          type: 'select',
+          label: this.$t('term.autoexec.parall'),
+          desc: this.$t('term.autoexec.paralldesc'),
+          dataList: this.$utils.getRoundCountList(),
+          filterName: 'text',
+          validateList: ['required']
         },
         {
           name: 'jobParam',
@@ -263,6 +294,8 @@ export default {
   created() {
     if (!this.value || !this.$utils.isEmptyObj(this.value)) {
       this.setFormValue();
+    } else {
+      this.changeParallelPolicy();
     }
     if (this.appModuleId) {
       // 编辑配置
@@ -296,12 +329,15 @@ export default {
           this.$set(currentValue, 'instanceFilterList', defaultInstanceIdList);
           this.instanceList = defaultInstanceIdList;
         }
-        this.$set(currentValue, 'roundCount', this.value.config.roundCount);
+        this.$set(currentValue, 'parallelPolicy', this.value.config.parallelPolicy);
+        this.$set(currentValue, 'parallelCount', !this.$utils.isEmpty(this.value.config.parallelCount) ? this.value.config.parallelCount : 32);
+        this.$set(currentValue, 'roundCount', !this.$utils.isEmpty(this.value.config.roundCount) ? this.value.config.roundCount : 64);
         this.envId = this.value.config.envId;
         this.scenarioId = this.value.config.scenarioId;
         delete currentValue.config;
-      }
+      }    
       this.formValue = Object.assign({}, this.formValue, currentValue);
+      this.changeParallelPolicy(this.formValue.parallelPolicy);
     },
     switchSceneAndEnv(type, item) {
       if (type == 'env') {
@@ -316,9 +352,13 @@ export default {
       let formValue = this.$utils.deepClone(this.formValue) || {};
       formValue.config = {};
       let selectNodeList = [];
-      let deleteFields = ['instanceFilter', 'instanceFilterList', 'roundCount']; // 删除多余的字段
-      if (formValue.roundCount) {
-        this.$set(formValue.config, 'roundCount', formValue.roundCount || 0);
+      let deleteFields = ['instanceFilter', 'instanceFilterList', 'roundCount', 'parallelPolicy', 'parallelCount']; // 删除多余的字段
+      
+      this.$set(formValue.config, 'parallelPolicy', formValue.parallelPolicy);
+      if (formValue.parallelPolicy === 'parallel') {
+        this.$set(formValue.config, 'parallelCount', formValue.parallelCount);
+      } else {
+        this.$set(formValue.config, 'roundCount', formValue.roundCount);
       }
       if (formValue.instanceFilterList) {
         // 单独处理实例过滤列表，处理传递给后端的数据
@@ -488,6 +528,16 @@ export default {
           }
         });
       }
+    },
+    changeParallelPolicy(val) {
+      this.formList.forEach((item) => {
+        if (item.name === 'parallelCount') {
+          this.$set(item, 'isHidden', !val || val === 'roundCount');
+        }
+        if (item.name === 'roundCount') {
+          this.$set(item, 'isHidden', !val || val === 'parallel');
+        }
+      });
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/application-config/pipeline-detail.vue b/src/views/pages/deploy/application-config/pipeline-detail.vue
index bb2b6453c41b89c6ae1b854e62a83bae1cbaf1ad..217ff2304319195c66d0ac511c64af5bd9060069 100644
--- a/src/views/pages/deploy/application-config/pipeline-detail.vue
+++ b/src/views/pages/deploy/application-config/pipeline-detail.vue
@@ -311,14 +311,8 @@ export default {
       this.envId = parseInt(this.$route.query.envId);
       this.combopConfig.isEditRuntimeParam = false;
     }
-    if (this.appSystemId && this.$route.query.hasOwnProperty('hasEditAuth')) {
-      // 是否有编辑配置权限
-      let hasEditAuth = this.$route.query.hasEditAuth == 'true';
-      this.hasEditAuth = hasEditAuth;
-    } else {
-      // 预置参数集，跳转到编辑流水线，需要判断是否有编辑配置权限
-      await this.getAuthInfo();
-    }
+    //跳转到编辑流水线，需要判断是否有编辑配置权限
+    await this.getAuthInfo();
     this.getAppPipeline();
   },
   beforeMount() {},
@@ -1041,6 +1035,8 @@ export default {
           if (authList.includes('operation#all') || authList.includes('operation#edit') || (authInfo && authInfo.isHasAllAuthority)) {
             // 有编辑配置权限
             this.hasEditAuth = true;
+          } else if (authList.includes('operation#view') || authList.includes('operation#auth') || authList.includes('operation#execute')) {
+            this.hasEditAuth = false;
           } else {
             this.$router.push({
               path: '/no-authority',
diff --git a/src/views/pages/deploy/job/add-batch-job-dialog.vue b/src/views/pages/deploy/job/add-batch-job-dialog.vue
index 11d7cabbf96b9faaf0c903792b66c2a4aee8b43b..ede76ae365e8790596db3b0c13978eb584e6f343 100644
--- a/src/views/pages/deploy/job/add-batch-job-dialog.vue
+++ b/src/views/pages/deploy/job/add-batch-job-dialog.vue
@@ -8,8 +8,14 @@
             :item-list="formConfig"
             :labelWidth="90"
           >
+            <template v-slot:pipelineId>
+              <TsForm
+                ref="pipelineFormConfig"
+                :itemList="pipelineFormConfig"
+                :labelWidth="90"
+              ></TsForm>
+            </template>
           </TsForm>
-
           <AddDeployJobForm
             v-if="createMethod === 'pipeline'"
             :id="pipelineId"
@@ -64,6 +70,7 @@ export default {
             this.createMethod = val;
             this.$set(this.formConfig.name, 'isHidden', !(val === 'custom'));
             this.$set(this.formConfig.pipelineId, 'isHidden', val === 'custom');
+            this.handlePipelineId('appsystem');
           }
         },
         name: {
@@ -74,25 +81,54 @@ export default {
           maxlength: 50
         },
         pipelineId: {
+          type: 'slot',
+          isHidden: true,
+          labelWidth: 1
+        }
+      },
+      saveLoading: false,
+      pipelineFormConfig: {
+        pipelineType: {
+          type: 'radio',
+          label: this.$t('term.deploy.pipelinetype'),
+          value: 'appsystem', //global(全局)，appsystem（应用）
+          url: '/api/rest/universal/enum/get',
+          params: { enumClass: 'PipelineType' },
+          validateList: ['required'],
+          onChange: (val) => {
+            this.handlePipelineId(val);
+          }
+        },
+        appSystemId: {
           type: 'select',
-          label: this.$t('term.deploy.superpipeline'),
+          label: this.$t('page.apply'),
           value: null,
+          dynamicUrl: '/api/rest/deploy/app/config/appsystem/search',
+          dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList, 'app'); },
+          params: {authorityActionList: ['view']},
+          rootName: 'tbodyList',
+          border: 'border',
           transfer: true,
-          isHidden: true,
+          validateList: ['required'],
+          onChange: (val) => {
+            this.changeAppSystemId(val);
+          }
+        },
+        pipelineId: {
+          type: 'select',
+          label: this.$t('term.autoexec.pipeline'),
+          value: null,
           dynamicUrl: '/api/rest/deploy/pipeline/search',
+          params: {type: 'appsystem', needVerifyAuth: 1},
           rootName: 'tbodyList',
-          textName: 'name',
-          valueName: 'id',
-          multiple: false,
-          validateList: [
-            'required'
-          ],
+          dealDataByUrl: this.dealPipelineData,
+          validateList: ['required'],
+          transfer: true,
           onChange: val => {
             this.pipelineId = val;
           }
         }
-      },
-      saveLoading: false
+      }
     };
   },
   beforeCreate() {},
@@ -122,18 +158,99 @@ export default {
     save() {
       const dialogForm = this.$refs['dialogForm'];
       const pipelineForm = this.$refs['pipelineForm'];
-      if ((dialogForm && !dialogForm.valid()) || (pipelineForm && !pipelineForm.validateForm())) {
+      const pipelineFormConfig = this.$refs['pipelineFormConfig'];
+      if ((dialogForm && !dialogForm.valid()) || (pipelineForm && !pipelineForm.validateForm() && (pipelineFormConfig && !pipelineFormConfig.valid()))) {
         return false;
       }
+      let data = {
+        ...pipelineForm.save()
+      };
+      if (this.$refs.pipelineFormConfig) {
+        Object.assign(data, this.$refs.pipelineFormConfig.getFormValue());
+      }
       this.saveLoading = true;
-      pipelineForm.submitForm().then(() => {
-        this.close(true);
+
+      this.$api.deploy.pipeline.addBatchJob(data).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          this.close(true);
+        }
       }).finally(() => {
         this.saveLoading = false;
       });
     },
     close(needRefresh = false) {
       this.$emit('close', needRefresh);
+    },
+    dealDataByUrl(nodeList, type) {
+      let dataList = [];
+      if (nodeList) {
+        nodeList.forEach(item => {
+          dataList.push({
+            value: item.id,
+            text: item.abbrName + (item.name ? '(' + item.name + ')' : ''),
+            _disabled: this.getDisabledText(item, type)
+          });
+        });
+      }
+      return dataList;
+    },
+    getDisabledText(item, type) {
+      let text = false;
+      if (!item.isHasAllAuthority && type == 'app') {
+        if (item.authActionSet && item.authActionSet.length) {
+          if (!item.authActionSet.includes('operation#execute') && !item.authActionSet.includes('operation#all')) {
+            text = this.$t('term.deploy.notapplyallexecuteauth');
+          } else if (!item.authActionSet.find((item) => item.includes('scenario#')) && !item.authActionSet.includes('scenario#all')) {
+            text = this.$t('term.deploy.notapplyallsceneexecuteauth');
+          } else if (!item.authActionSet.find((item) => item.includes('env#')) && !item.authActionSet.includes('env#all')) {
+            text = this.$t('term.deploy.notapplyallenvexecuteauth');
+          }
+        } else {
+          text = this.$t('term.deploy.notapplyallexecuteauth');
+        }
+      } else if (!item.isConfig) {
+        text = this.$t('term.deploy.applynotconfigpipeline');
+      } else if (type == 'app' && !item.isHasModule) {
+        text = this.$t('term.deploy.applynotconfigmodule');
+      } else if (!item.isHasEnv) {
+        type == 'app' && (text = this.$t('term.deploy.applynotconfigenv'));
+        type == 'module' && (text = this.$t('term.deploy.modulenotconfigenv'));
+      }
+      return text;
+    },
+    dealPipelineData(nodeList) {
+      let dataList = [];
+      if (nodeList) {
+        nodeList.forEach(item => {
+          dataList.push({
+            value: item.id,
+            text: item.name + (item.appSystemAbbrName ? '/' + item.appSystemAbbrName : '')
+          });
+        });
+      }
+      return dataList;
+    },
+    changeAppSystemId(val) { //应用流水线切换
+      this.$set(this.pipelineFormConfig.pipelineId, 'value', null);
+      this.$set(this.pipelineFormConfig.pipelineId.params, 'appSystemId', val);
+      if (val) {
+        this.$set(this.pipelineFormConfig.pipelineId, 'disabled', false);
+      } else {
+        this.$set(this.pipelineFormConfig.pipelineId, 'disabled', true);
+      }
+    },
+    handlePipelineId(val) {
+      this.$set(this.pipelineFormConfig.pipelineId, 'value', null);
+      this.$set(this.pipelineFormConfig.pipelineId.params, 'type', val);
+      this.$set(this.pipelineFormConfig.pipelineId.params, 'appSystemId', null);
+      if (val == 'appsystem') {
+        this.$set(this.pipelineFormConfig.pipelineId, 'disabled', true);
+      } else if (val == 'global') {
+        this.$set(this.pipelineFormConfig.pipelineId, 'disabled', false);
+      }
+      this.$set(this.pipelineFormConfig.appSystemId, 'value', null);
+      this.$set(this.pipelineFormConfig.appSystemId, 'isHidden', val !== 'appsystem');
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/job/job-add.vue b/src/views/pages/deploy/job/job-add.vue
index 50f74e4b3bae7289686d63fc78c9e15e3be11ecf..19531cfd97d90656655e873b5b2de6747a7899ac 100644
--- a/src/views/pages/deploy/job/job-add.vue
+++ b/src/views/pages/deploy/job/job-add.vue
@@ -427,12 +427,15 @@ export default {
         appSystemId: this.appSystemId,
         envId: this.envId,
         scenarioId: this.scenarioId,
-        roundCount: this.roundCount,
-        parallelCount: this.parallelCount,
         parallelPolicy: this.parallelPolicy,
         param: {},
         moduleList: this.$refs.moduleList.getData()
       };
+      if (this.parallelPolicy === 'parallel') {
+        data.parallelCount = this.parallelCount;
+      } else {
+        data.roundCount = this.roundCount;
+      }
       if (this.$refs.param) {
         this.$set(data, 'param', this.$refs.param.getValue());
       }
@@ -608,9 +611,13 @@ export default {
     },
     changeParallelPolicy(val) {
       if (val && val == 'roundCount') {
-        this.roundCount = this.roundCount || 64;
+        if (this.$utils.isEmpty(this.roundCount)) {
+          this.roundCount = 64;
+        }
       } else {
-        this.parallelCount = this.parallelCount || 32;
+        if (this.$utils.isEmpty(this.parallelCount)) {
+          this.parallelCount = 32;
+        }
       }
     }
   },
diff --git a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
index 03b88c6641203637d3ad8c9333a9fde9123bdf92..2301f263666a7e1d2dd86f63b7c17a587602a61d 100644
--- a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
+++ b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
@@ -303,7 +303,7 @@ export default {
         return;
       } else if (row.source == 'deployschedulegeneral' || row.source == 'deployschedulepipeline') {
         window.open(HOME + '/deploy.html#/schedule-job-edit?id=' + routeConfig.id, '_blank');
-      } else if (row.source == 'deployci') {
+      } else if (row.source == 'deployci' || row.source == 'deploycipipeline') {
         window.open(HOME + '/deploy.html#/config-add?appSystemId=' + routeConfig.appSystemId + '&id=' + routeConfig.id, '_blank');
       }
     },
diff --git a/src/views/pages/deploy/pipeline/add-deployjob-form.vue b/src/views/pages/deploy/pipeline/add-deployjob-form.vue
index f4a00fefa3f513b365fdd811231ceb9eeec0c31b..b6c16b896ae60942bb47f6ba73f2e6b286aaa41d 100644
--- a/src/views/pages/deploy/pipeline/add-deployjob-form.vue
+++ b/src/views/pages/deploy/pipeline/add-deployjob-form.vue
@@ -234,6 +234,9 @@ export default {
     },
     getVersionValidateList(row) {
       return ['required'];
+    },
+    save() {
+      return this.jobData;
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue b/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue
index a8ed543e6d672b9fad3aca18358c03f8ecaaf9e5..8609ee52bfea0eb6ef89a0feaab565f6730a1e3e 100644
--- a/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue
+++ b/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue
@@ -461,9 +461,13 @@ export default {
     },
     changeParallelPolicy(val) {
       if (val && val == 'roundCount') {
-        this.jobTemplateData.roundCount = this.jobTemplateData.roundCount || 2;
+        if (this.$utils.isEmpty(this.jobTemplateData.roundCount)) {
+          this.jobTemplateData.roundCount = 2;
+        }
       } else {
-        this.jobTemplateData.parallelCount = this.jobTemplateData.parallelCount || 2;
+        if (this.$utils.isEmpty(this.jobTemplateData.parallelCount)) {
+          this.jobTemplateData.parallelCount = 2;
+        }
       }
     }
   },
diff --git a/src/views/pages/deploy/pipeline/pipeline-manage.vue b/src/views/pages/deploy/pipeline/pipeline-manage.vue
index e6e8cc6978f7c4d578345efa8ec6100fb9d3cfd6..0a3bb6bfc88cc0d0b732e5a0badb757eec0d9524 100644
--- a/src/views/pages/deploy/pipeline/pipeline-manage.vue
+++ b/src/views/pages/deploy/pipeline/pipeline-manage.vue
@@ -38,7 +38,7 @@
             <div class="tstable-action">
               <ul class="tstable-action-ul">
                 <li class="tsfont-list" @click="showJobList(row)">{{ $t('term.deploy.joblist') }}</li>
-                <li class="tsfont-plus" @click="addBatchJob(row)">{{ $t('term.deploy.batchjob') }}</li>
+                <li v-auth="'BATCHDEPLOY_MODIFY'" class="tsfont-plus" @click="addBatchJob(row)">{{ $t('term.deploy.batchjob') }}</li>
                 <li class="tsfont-trash-o" @click="deletePipeline(row)">{{ $t('page.delete') }}</li>
               </ul>
             </div>
diff --git a/src/views/pages/deploy/router.js b/src/views/pages/deploy/router.js
index c202c048c5843b16e7cdf5cba00da57016f4fdb3..3c6316c7213452b9c2d9fdad9db8ab4a18a6455b 100644
--- a/src/views/pages/deploy/router.js
+++ b/src/views/pages/deploy/router.js
@@ -317,7 +317,7 @@ export default [
       title: $t('router.deploy.schedulejob'),
       ismenu: true,
       icon: 'tsfont-formtime',
-      authority: 'DEPLOY_BASE',
+      authority: 'DEPLOY_SCHEDULE_MODIFY',
       type: 'job'
     }
   },
diff --git a/src/views/pages/deploy/schedule/components/job-base-info.vue b/src/views/pages/deploy/schedule/components/job-base-info.vue
index dbd05c1ea77d56d460d454e5248b70e79c335666..b82782c8c3a6a7b0f0401236f54e566a1b314e6c 100644
--- a/src/views/pages/deploy/schedule/components/job-base-info.vue
+++ b/src/views/pages/deploy/schedule/components/job-base-info.vue
@@ -120,6 +120,7 @@ export default {
           validateList: ['required'],
           dynamicUrl: '/api/rest/deploy/app/config/appsystem/search',
           dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList, 'app'); },
+          params: {authorityActionList: ['view']},
           rootName: 'tbodyList',
           border: 'border',
           transfer: true,
@@ -160,6 +161,7 @@ export default {
           value: null,
           dynamicUrl: '/api/rest/deploy/app/config/appsystem/search',
           dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList, 'app'); },
+          params: {authorityActionList: ['view']},
           rootName: 'tbodyList',
           border: 'border',
           transfer: true,
@@ -236,15 +238,15 @@ export default {
       let text = false;
       if (!item.isHasAllAuthority && type == 'app') {
         if (item.authActionSet && item.authActionSet.length) {
-          if (!item.authActionSet.includes('operation#edit') && !item.authActionSet.includes('operation#all')) {
-            text = this.$t('term.deploy.notapplyeditconfigauth');
+          if (!item.authActionSet.includes('operation#execute') && !item.authActionSet.includes('operation#all')) {
+            text = this.$t('term.deploy.notapplyallexecuteauth');
           } else if (!item.authActionSet.find((item) => item.includes('scenario#')) && !item.authActionSet.includes('scenario#all')) {
             text = this.$t('term.deploy.notapplyallsceneexecuteauth');
           } else if (!item.authActionSet.find((item) => item.includes('env#')) && !item.authActionSet.includes('env#all')) {
             text = this.$t('term.deploy.notapplyallenvexecuteauth');
           }
         } else {
-          text = this.$t('term.deploy.notapplyeditconfigauth');
+          text = this.$t('term.deploy.notapplyallexecuteauth');
         }
       } else if (!item.isConfig) {
         text = this.$t('term.deploy.applynotconfigpipeline');
diff --git a/src/views/pages/deploy/schedule/components/params/general.vue b/src/views/pages/deploy/schedule/components/params/general.vue
index 9ed3d4c83e07335572e41ab979866d6a0759c8de..981f727c288c528fe1c872289e4b8fbf2c7ceb6e 100644
--- a/src/views/pages/deploy/schedule/components/params/general.vue
+++ b/src/views/pages/deploy/schedule/components/params/general.vue
@@ -245,11 +245,17 @@ export default {
     initJobParams(data) {
       this.envId = data.envId || null;
       this.scenarioId = data.scenarioId || null;
-      this.roundCount = data.roundCount || null;
-      this.parallelCount = data.parallelCount || null;
       this.parallelPolicy = data.parallelPolicy || 'roundCount';
       this.param = data.param || {};
       this.defaultModuleList = data.moduleList || [];
+      this.roundCount = null;
+      this.parallelCount = null;
+      if (!this.$utils.isEmpty(data.roundCount)) {
+        this.roundCount = data.roundCount;
+      }
+      if (!this.$utils.isEmpty(this.parallelCount)) {
+        this.parallelCount = data.parallelCount;
+      }
     },
     getAppPipeline() { //流水线
       this.$api.deploy.apppipeline.getAppPipeline(this.searchParams).then(res => {
@@ -443,18 +449,14 @@ export default {
       let data = {
         envId: this.envId,
         scenarioId: this.scenarioId,
-        roundCount: this.roundCount,
-        parallelCount: this.parallelCount,
         parallelPolicy: this.parallelPolicy,
         param: {},
         moduleList: this.$refs.moduleList.getData()
       };
       if (this.parallelPolicy == 'parallel') {
-        this.$set(data, 'parallelCount', this.parallelCount || 32);
-        this.$set(data, 'roundCount', null);
+        this.$set(data, 'parallelCount', !this.$utils.isEmpty(this.parallelCount) ? this.parallelCount : 32);
       } else {
-        this.$set(data, 'parallelCount', null);
-        this.$set(data, 'roundCount', this.roundCount || 64);
+        this.$set(data, 'roundCount', !this.$utils.isEmpty(this.roundCount) ? this.roundCount : 64);
       }
       if (this.$refs.param) {
         this.$set(data, 'param', this.$refs.param.getValue());
@@ -473,9 +475,13 @@ export default {
     },
     changeParallelPolicy(val) {
       if (val && val == 'roundCount') {
-        this.roundCount = this.roundCount || 64;
+        if (this.$utils.isEmpty(this.roundCount)) {
+          this.roundCount = 64;
+        }
       } else {
-        this.parallelCount = this.parallelCount || 32;
+        if (this.$utils.isEmpty(this.parallelCount)) {
+          this.parallelCount = 32;
+        }
       }
     }
   },
diff --git a/src/views/pages/deploy/schedule/schedule-job-edit.vue b/src/views/pages/deploy/schedule/schedule-job-edit.vue
index 350e842dac346c3fe279158d28af3e10c6700366..1feb954332422f38ad0884a303d83b5c4c70f217 100644
--- a/src/views/pages/deploy/schedule/schedule-job-edit.vue
+++ b/src/views/pages/deploy/schedule/schedule-job-edit.vue
@@ -89,7 +89,9 @@ export default {
   destroyed() {},
   methods: {
     beforeLeaveCompare(oldData) {
-      return this.$utils.isSame(oldData, this.getSaveData());
+      const newVal = this.$utils.deepRemoveEmptyValues(this.getSaveData());
+      const oldval = this.$utils.deepRemoveEmptyValues(oldData);
+      return this.$utils.isSame(oldval, newVal);
     },
     async beforeLeave() {
       return await this.saveTimeJob();
diff --git a/src/views/pages/deploy/schedule/schedule-job-manage.vue b/src/views/pages/deploy/schedule/schedule-job-manage.vue
index 5bd4db7ed89c90218f722abf936aa666679cdba8..b2b2fd4b5c76ad5d51128542bf285fdbb0a4cc81 100644
--- a/src/views/pages/deploy/schedule/schedule-job-manage.vue
+++ b/src/views/pages/deploy/schedule/schedule-job-manage.vue
@@ -114,6 +114,18 @@
                       @on-change="updateSchedule(row)"
                     ></TsFormSwitch>
                   </li>
+                  <li
+                    class="tsfont-test icon"
+                    :title="
+                      !row.editable
+                        ? $t('page.notauthrelationadmin')
+                        : row.isActive === 1
+                          ? '禁用才能测试'
+                          : ''
+                    "
+                    :class="{ disable: !row.editable || row.isActive == 1}"
+                    @click.stop="testRow(row, jobHandler)"
+                  >{{ $t('page.test') }}</li>
                   <li
                     class="tsfont-trash-o"
                     :title="!row.deletable ? $t('page.notauthrelationadmin'):''"
@@ -122,6 +134,22 @@
                   >
                     {{ $t('page.delete') }}
                   </li>
+                  <li
+                    class="tsfont-putongjigui"
+                    :title="$t('term.deploy.jobrecord')"
+                    @click="showJobList(row)"
+                  >
+                    <!-- 执行记录 -->
+                    {{ $t('term.deploy.jobrecord') }}
+                  </li>
+                  <li
+                    class="tsfont-putongjigui"
+                    :title="$t('term.autoexec.executionrecord')"
+                    @click="showAudit(row)"
+                  >
+                    <!-- 执行记录 -->
+                    {{ '执行记录' }}
+                  </li>
                 </ul>
               </div>
             </template>
@@ -130,6 +158,7 @@
       </template>
     </TsContain>
     <ListDeployJobDialog v-if="isListDeployJobDialogShow" :invokeIdList="invokeIdList" @close="closeListJob"></ListDeployJobDialog>
+    <JobAudit v-if="isAuditShow" :jobUuid="currentJobUuid" @close="closeAuditDialog"></JobAudit>
   </div>
 </template>
 <script>
@@ -141,7 +170,8 @@ export default {
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     TsQuartz: () => import('@/resources/plugins/TsQuartz/TsQuartz.vue'),
     TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
-    ListDeployJobDialog: () => import('@/views/pages/deploy/pipeline/list-deployjob-dialog.vue')
+    ListDeployJobDialog: () => import('@/views/pages/deploy/pipeline/list-deployjob-dialog.vue'),
+    JobAudit: () => import('../../framework/schedule/job-audit-dialog.vue')
   },
   props: {},
   data() {
@@ -187,7 +217,7 @@ export default {
           key: 'appSystemAbbrName'
         },
         {
-          title: this.$t('term.autoexec.executionrecord'),
+          title: this.$t('term.deploy.jobcount'),
           key: 'execCount'
         },
         {
@@ -207,7 +237,9 @@ export default {
         { key: 'action' }
       ],
       isListDeployJobDialogShow: false,
-      invokeIdList: []
+      invokeIdList: [],
+      jobHandler: null,
+      isAuditShow: false
     };
   },
   beforeCreate() {},
@@ -232,6 +264,7 @@ export default {
       this.$api.deploy.schedule.searchSchedule({...this.searchParam, ...this.searchValue}).then(res => {
         if (res.Status == 'OK') {
           this.scheduleData = res.Return;
+          this.jobHandler = res.Return.handler;
         }
       }).finally(() => {
         this.loadingShow = false;
@@ -315,9 +348,6 @@ export default {
       });
     },
     showJobList(row) {
-      if (!row.execCount) {
-        return;
-      }
       this.invokeIdList = [row.id];
       this.isListDeployJobDialogShow = true;
     },
@@ -327,6 +357,36 @@ export default {
     },
     restoreHistory(historyData) {
       this.appModuleData = historyData['appModuleEnvData'] || {};
+    },
+    testRow: function(row, handler) {
+      if (!row.editable || row.isActive == 1) {
+        return;
+      }
+      this.$createDialog({
+        title: this.$t('dialog.title.testconfirm'),
+        content: this.$t('dialog.content.testconfirm', {target: row.name}),
+        btnType: 'primary',
+        'on-ok': vnode => {
+          let params = { jobUuid: row.uuid, jobHandlerClassName: handler};
+          this.$api.deploy.schedule
+            .test(params)
+            .then(res => {
+              if (res.Status == 'OK') {
+                this.$Message.success(this.$t('message.executesuccess'));
+                this.searchSchedule(1);
+                vnode.isShow = false;
+              }
+            });
+        }
+      });
+    },
+    showAudit(row) {
+      this.isAuditShow = true;
+      this.currentJobUuid = row.uuid;
+    },
+    closeAuditDialog() {
+      this.isAuditShow = false;
+      this.currentJobUuid = null;
     }
   },
   filter: {},
diff --git a/src/views/pages/framework/database/database-edit.vue b/src/views/pages/framework/database/database-edit.vue
index fef55bfa368800ca2e92951ca1182607ee075864..4f6bb2db32b91bb82aae6adfe3a78ec296f397b8 100644
--- a/src/views/pages/framework/database/database-edit.vue
+++ b/src/views/pages/framework/database/database-edit.vue
@@ -95,6 +95,7 @@ export default {
           type: 'textarea',
           name: 'config',
           label: this.$t('page.config'),
+          tooltip: '{"user":"root","password":"********","driverClassName":"com.mysql.jdbc.Driver","url":"jdbc:mysql://localhost:3306/neatlogic?characterEncoding=UTF-8"}',
           validateList: ['required'],
           onChange: config => {
             this.databaseData.config = config;
diff --git a/src/views/pages/framework/database/database-manage.vue b/src/views/pages/framework/database/database-manage.vue
index bf7c5253d4484f4ce8215d877c77a51916366aec..f2e3f404b87d0e0f4f858ffef5bc1289ebfa4637 100644
--- a/src/views/pages/framework/database/database-manage.vue
+++ b/src/views/pages/framework/database/database-manage.vue
@@ -10,8 +10,8 @@
       </template>
       <div slot="content">
         <TsTable
-          v-if="tbodyList"
-          v-bind="tbodyList"
+          v-if="tableData"
+          v-bind="tableData"
           :theadList="theadList"
           @changeCurrent="changePage"
           @changePageSize="changePageSize"
@@ -61,7 +61,7 @@ export default {
           key: 'action'
         }
       ],
-      tbodyList: []
+      tableData: []
     };
   },
   beforeCreate() {},
@@ -79,10 +79,10 @@ export default {
   methods: {
     searchDatabaseList() {
       this.$api.framework.database.searchDatabaseList(this.searchParam).then(res => {
-        this.tbodyList = res.Return;
+        this.tableData = res.Return;
       });
     },
-    changePage() {
+    changePage(currentPage) {
       if (currentPage) {
         this.searchParam.currentPage = currentPage;
       } else {
diff --git a/src/views/pages/framework/integration/integration-audit-detail.vue b/src/views/pages/framework/integration/integration-audit-detail.vue
index feed26d1ef044a78559c5a8b8c80523013832bc9..45a80e753ad0ddf61a49342f6dc747abae7749b9 100644
--- a/src/views/pages/framework/integration/integration-audit-detail.vue
+++ b/src/views/pages/framework/integration/integration-audit-detail.vue
@@ -5,7 +5,7 @@
         {{ $t('page.detail') }}
       </template>
       <template v-slot>
-        <pre class="overflow" style="word-break: break-all; white-space: normal">{{ contentFormated }}</pre>
+        <JsonViewer boxed copyable :value="contentFormated"></JsonViewer>
       </template>
       <template v-slot:footer>
         <Button @click="close()">{{ $t('page.cancel') }}</Button>
@@ -19,7 +19,9 @@ import download from '@/resources/directives/download.js';
 export default {
   name: '',
   directives: { download },
-  components: {},
+  components: {
+    JsonViewer: () => import('vue-json-viewer')
+  },
   props: { filePath: { type: String } },
   data() {
     return {
@@ -30,7 +32,7 @@ export default {
         type: 'modal',
         maskClose: true,
         isShow: true,
-        width: 'small'
+        width: 'large'
       }
     };
   },
@@ -64,7 +66,7 @@ export default {
     contentFormated: function() {
       try {
         let j = JSON.parse(this.content);
-        return JSON.stringify(j, null, 2);
+        return j;
       } catch (e) {
         return this.content;
       }
diff --git a/src/views/pages/framework/log/log-manage.vue b/src/views/pages/framework/log/log-manage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..811d4c89763cb6ca2fa5428fb4ca219664317540
--- /dev/null
+++ b/src/views/pages/framework/log/log-manage.vue
@@ -0,0 +1,213 @@
+<template>
+  <div>
+    <TsContain>
+      <template v-slot:topLeft>
+        <div class="action-group">
+          <span v-if="level != null" class="mr-xs text-grey">{{ $t('page.loglevel') }}</span>
+          <span v-if="searchParam.serverId != null && level != null" class="action-item" @click="editLogLevel()">
+            <span>
+              <b>{{ level }}</b>
+            </span>
+            <span class="tsfont-edit"></span>
+          </span>
+        </div>
+      </template>
+      <template v-slot:topRight>
+        <div>
+          <Row class="action-group" span="24" :gutter="16">
+            <Col span="8">
+              <TsFormSelect
+                v-model="serverSelectSetting.value"
+                v-bind="serverSelectSetting"
+                @change="handleChangeServerId"
+              ></TsFormSelect>
+            </Col>
+            <Col span="12">
+              <TsFormSelect
+                v-model="fileNameSelectSetting.value"
+                v-bind="fileNameSelectSetting"
+                @change="handleChangeFileName"
+              ></TsFormSelect>
+            </Col>
+            <Col span="2">
+              <div v-if="searchParam.fileName != null" class="action-item tsfont-refresh" @click="refreshLog()">{{ $t('page.refresh') }}</div>
+            </Col>
+            <Col span="2">
+              <div v-if="searchParam.fileSize != null" class="action-item tsfont-download" @click="exportLog()">{{ $t('page.export') }}</div>
+            </Col>
+          </Row>
+        </div>
+      </template>
+      <div slot="content">
+        <div ref="textContainer" style="overflow: auto; white-space: pre-wrap">
+          <div 
+            v-for="(line, index) in logLines"
+            :key="index"
+            :class="getLineClass(line)"
+          >
+            {{ line }}
+          </div>
+        </div>
+      </div>
+    </TsContain>
+    <LogLevelEdit v-if="searchParam.serverId != null && isEditShow" :serverId="searchParam.serverId" @close="closeEditDialog"></LogLevelEdit>
+  </div>
+</template>
+<script>
+import download from '@/resources/mixins/download.js';
+export default {
+  name: '',
+  components: {
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect.vue'),
+    LogLevelEdit: () => import('./loglevel-edit.vue')
+  },
+  mixins: [download],
+  props: {},
+  data() {
+    return {
+      searchParam: {
+        serverId: null,
+        fileName: null,
+        fileSize: null
+      },
+      serverSelectSetting: {
+        defaultValueIsFirst: false,
+        dataList: [],
+        transfer: true,
+        placeholder: this.$t('page.server'),
+        value: ''
+      },
+      fileNameSelectSetting: {
+        defaultValueIsFirst: false,
+        dataList: [],
+        transfer: true,
+        placeholder: this.$t('page.filename'),
+        value: ''
+      },
+      logLines: [],
+      level: null,
+      isEditShow: false
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.getServerList();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestory() {},
+  destroyed() {},
+  methods: {
+    getServerList() {
+      let _this = this;
+      let param = {
+        status: 'startup'
+      };
+      this.$api.framework.server.getServerList(param).then(res => {
+        if (res.Status === 'OK') {
+          let tbodyList = res.Return.tbodyList;
+          tbodyList.forEach(item => {
+            _this.serverSelectSetting.dataList.push({
+              value: item.serverId,
+              text: item.serverId + ' (' + item.host + ')'
+            });
+          });
+          _this.serverSelectSetting.value = res.Return.currentServerId;
+          this.handleChangeServerId(res.Return.currentServerId);
+        }
+      });
+    },
+    handleChangeServerId(serverId) {
+      this.searchParam.fileName = null;
+      this.searchParam.fileSize = null;
+      this.logLines = [];
+      if (serverId != null) {
+        this.searchParam.serverId = serverId;
+      } else {
+        this.searchParam.serverId = null;
+        this.level = null;
+      }
+      this.fileNameSelectSetting.value = null;
+      this.getLogFileNameList();
+    },
+    getLogFileNameList() {
+      let _this = this;
+      _this.fileNameSelectSetting.dataList = [];
+      if (this.searchParam && this.searchParam.serverId != null) {
+        this.$api.framework.log.getLogFileNameList(this.searchParam).then(res => {
+          _this.level = res.Return.level;
+          let tbodyList = res.Return.tbodyList;
+          tbodyList.forEach(item => {
+            _this.fileNameSelectSetting.dataList.push({
+              value: item.fileName,
+              text: item.fileName + ' (' + item.fileSize + ')'
+            });
+          });
+        });
+      }
+    },
+    handleChangeFileName(fileName) {
+      if (fileName != null) {
+        this.searchParam.fileName = fileName;
+        this.getLogContent(false);
+      } else {
+        this.searchParam.fileName = null;
+        this.searchParam.fileSize = null;
+        this.logLines = [];
+      }
+    },
+    getLogContent(isRefresh) {
+      if (this.searchParam && this.searchParam.serverId != null && this.searchParam.fileName != null) {
+        this.$api.framework.log.getLogContent(this.searchParam).then(res => {
+          if (res.Return.isRefresh == 1) {
+            let logData = res.Return.content;
+            this.logLines = logData.split('\n');
+            this.searchParam.fileSize = res.Return.fileSize;
+            if (isRefresh) {
+              this.$Message.success(this.$t('message.refreshsuccess'));
+            }
+          } else {
+            if (isRefresh) {
+              this.$Message.success(this.$t('message.nothingchange'));
+            }
+          }
+        });
+      }
+    },
+    getLineClass(line) {
+      if (line.includes('\tat neatlogic')) {
+        return 'text-error';
+      }
+    },
+    refreshLog() {
+      this.getLogContent(true);
+    },
+    exportLog() {
+      let param = {
+        url: 'api/binary/log/file/export',
+        params: this.searchParam
+      };
+      this.download(param);
+    },
+    editLogLevel() {
+      this.isEditShow = true;
+    },
+    closeEditDialog(needRefresh) {
+      this.isEditShow = false;
+      if (needRefresh) {
+        this.getLogFileNameList();
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+
+</style>
diff --git a/src/views/pages/framework/log/loglevel-edit.vue b/src/views/pages/framework/log/loglevel-edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2b5287890eb9a96649f385174f3d959278cd20d6
--- /dev/null
+++ b/src/views/pages/framework/log/loglevel-edit.vue
@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <TsDialog
+      v-bind="dialogConfig"
+      @on-close="close"
+      @on-ok="save"
+    >
+      <template v-slot>
+        <TsForm ref="form" :item-list="formConfig"></TsForm>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm.vue')
+  },
+  props: {
+    serverId: {
+      type: Number
+    }
+  },
+  data() {
+    return {
+      level: null,
+      dialogConfig: {
+        type: 'modal',
+        maskClose: false,
+        isShow: true,
+        title: this.$t('dialog.title.edittarget', { target: this.$t('page.loglevel') }),
+        width: 'mini',
+        height: '260px'
+      },
+      formConfig: [
+        {
+          type: 'select',
+          name: 'level',
+          label: this.$t('page.loglevel'),
+          dataList: [
+            {
+              value: 'TRACE',
+              text: 'TRACE'
+            },
+            {
+              value: 'DEBUG',
+              text: 'DEBUG'
+            },
+            {
+              value: 'INFO',
+              text: 'INFO'
+            },
+            {
+              value: 'WARN',
+              text: 'WARN'
+            },
+            {
+              value: 'ERROR',
+              text: 'ERROR'
+            },
+            {
+              value: 'OFF',
+              text: 'OFF'
+            }
+          ],
+          validateList: ['required'],
+          width: '200px',
+          onChange: level => {
+            this.level = level;
+          }
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    save() {
+      const form = this.$refs['form'];
+      if (form.valid()) {
+        let param = {
+          serverId: this.serverId,
+          level: this.level
+        };
+        this.$api.framework.log.updateLogLevel(param).then(res => {
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.savesuccess'));
+            this.close(true);
+          }
+        });
+      }
+    },
+    close(needRefresh) {
+      this.$emit('close', needRefresh);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js
index d751ed90edef816d4f829bb62350a844064562de..7e8531f34fa710ce8643c4d3826f967666da03af 100644
--- a/src/views/pages/framework/router.js
+++ b/src/views/pages/framework/router.js
@@ -61,6 +61,7 @@ const extramenuManage = () => import('./extramenu/extramenu-manage.vue'); //菜
 const regionManage = () => import('./region/region-manage.vue');//地域管理
 const homepageManage = () => import('./homepage/homepage-manage.vue');//首页管理
 const changelogAuditManage = () => import('./changelogaudit/changelogaudit-manage.vue');//数据库变更记录
+const logManage = () => import('./log/log-manage.vue');//查看日志
 
 import { $t } from '@/resources/init.js';
 import { config } from './config.js';
@@ -754,7 +755,19 @@ let routerList = [
       ismenu: true,
       icon: 'tsfont-formstaticlist',
       authority: 'ADMIN',
-      type: 'others'
+      type: 'healthcheck'
+    }
+  },
+  {
+    path: '/log-manage',
+    name: 'logManage',
+    component: logManage,
+    meta: {
+      title: $t('router.framework.log'),
+      ismenu: true,
+      icon: 'tsfont-history',
+      authority: 'ADMIN',
+      type: 'healthcheck'
     }
   }
 ];
diff --git a/src/views/pages/framework/schedule/job-manage.vue b/src/views/pages/framework/schedule/job-manage.vue
index 2b6d3d90f3c8913e0ab594ee383fa0ce71c0a12f..edfef5d8ada7bd658c25362b654567d1846e199a 100644
--- a/src/views/pages/framework/schedule/job-manage.vue
+++ b/src/views/pages/framework/schedule/job-manage.vue
@@ -86,10 +86,20 @@
           <template slot="action" slot-scope="{ row }">
             <div class="tstable-action">
               <ul class="tstable-action-ul">
-                <li class="tsfont-history" @click="showAudit(row.uuid)">{{ $t('term.autoexec.executionrecord') }}</li>
-                <li class="tsfont-copy icon" @click="copyRow(row.uuid)">{{ $t('page.copy') }}</li>
+                <li
+                  class="tsfont-test icon"
+                  :title="
+                    row.isActive === 1
+                      ? '禁用才能测试'
+                      : ''
+                  "
+                  :class="{ disable: row.isActive == 1 }"
+                  @click="testRow(row, row.handler)"
+                >{{ $t('page.test') }}</li>
+                <li class="tsfont-copy icon" @click="copyRow(row.uuid,row.handler,row.group)">{{ $t('page.copy') }}</li>
                 <!-- <li class="tsfont-edit icon" @click="editRow(row.uuid)">{{ $t('page.edit') }}</li> -->
                 <li class="tsfont-trash-o icon" @click="deleteRow(row.uuid, row.name)">{{ $t('page.delete') }}</li>
+                <li class="tsfont-history" @click="showAudit(row.uuid)">{{ $t('term.autoexec.executionrecord') }}</li>
               </ul>
             </div>
           </template>
@@ -294,6 +304,28 @@ export default {
             });
         }
       });
+    },
+    testRow: function(row, handler) {
+      if (row.isActive == 1) {
+        return;
+      }
+      this.$createDialog({
+        title: this.$t('dialog.title.testconfirm'),
+        content: this.$t('dialog.content.testconfirm', {target: row.name}),
+        btnType: 'primary',
+        'on-ok': vnode => {
+          vnode.isShow = false;
+          let params = { jobUuid: row.uuid, jobHandlerClassName: handler};
+          this.$api.framework.schedule
+            .test(params)
+            .then(res => {
+              if (res.Status == 'OK') {
+                this.$Message.success(this.$t('message.executesuccess'));
+                this.searchJob(1);
+              }
+            });
+        }
+      });
     }
   },
 
diff --git a/src/views/pages/framework/server/server-manage.vue b/src/views/pages/framework/server/server-manage.vue
index 2c7916484732aba8a5de1ab7b073301b1226f161..6bd92535d699b6f03907cb988bab8edd77f97e38 100644
--- a/src/views/pages/framework/server/server-manage.vue
+++ b/src/views/pages/framework/server/server-manage.vue
@@ -3,7 +3,12 @@
     <TsContain>
       <template v-slot:topLeft>
         <div class="action-group">
-
+          <div v-if="currentServerId != null" class="action-item">
+            <span class="mr-xs text-grey">{{ $t('page.serverid') }}</span>
+            <span>
+              <b>{{ currentServerId }}</b>
+            </span>
+          </div>
         </div>
       </template>
       <template v-slot:topRight>
@@ -64,6 +69,7 @@ export default {
   props: {},
   data() {
     return {
+      currentServerId: null,
       loading: false,
       currentPage: 1,
       pageSize: 20,
@@ -143,9 +149,10 @@ export default {
     },
     getServerList() {
       this.loading = true;
-      this.$api.framework.server.getServerList().then(res => {
+      this.$api.framework.server.getServerList({}).then(res => {
         if (res.Status === 'OK') {
           this.tableData = res.Return;
+          this.currentServerId = res.Return.currentServerId;
         }
       }).finally(() => {
         this.loading = false;
diff --git a/src/views/pages/framework/tagent/tagent-manage.vue b/src/views/pages/framework/tagent/tagent-manage.vue
index 7e20a982c1e2256e3ba180164b94fa40b7991565..fafb5b0528cda42b16e7e08cce63fa06400a3127 100644
--- a/src/views/pages/framework/tagent/tagent-manage.vue
+++ b/src/views/pages/framework/tagent/tagent-manage.vue
@@ -7,6 +7,22 @@
           <span class="tsfont-refresh action-item" @click="goPages('batchUpgrade')">{{ $t('term.framework.batchupgrade') }}</span>
           <span class="tsfont-restart action-item" @click="goPages('batchReboot')">{{ $t('term.framework.batchreboot') }}</span>
           <span class="tsfont-edit action-item" @click="goPages('batchResetcred')">{{ $t('term.framework.batchresetcred') }}</span>
+          <Tooltip
+            max-width="400"
+            theme="light"
+            transfer
+            :disabled="!batchDeleteIsDisabled"
+          >
+            <span 
+              v-if="selected && selected.length > 0" 
+              class="tsfont-trash-o" 
+              :class="{ 'action-item': !batchDeleteIsDisabled, 'text-disabled': batchDeleteIsDisabled}" 
+              @click="batchDelete"
+            >
+              {{ $t('page.batchdelete') }}
+            </span>
+            <div slot="content" style="max-height: 400px;overflow:auto;">{{ $t('term.framework.batchdeletetagenttooltip') }}</div>
+          </Tooltip>
           <span class="tsfont-anzhuangbao action-item" @click="goPages('installationPackage')">{{ $t('term.framework.tagentupgrade') }}</span>
           <span class="tsfont-question-s action-item" @click="openInstallTipsDialog">{{ $t('term.framework.tagentinstall') }}</span>
           <span class="tsfont-download action-item" @click="exportExcel">{{ $t('page.export') }}</span>
@@ -25,6 +41,8 @@
           v-else
           v-bind="tableData"
           :theadList="theadList"
+          multiple
+          @getSelected="getSelected"
           @changeCurrent="changeCurrent"
           @changePageSize="changePageSize"
           @headerTitleOperation="headerTitleOperation"
@@ -109,6 +127,7 @@ export default {
       tableData: {
         currentPage: 1,
         pageSize: 20,
+        pageSizeOpts: [10, 20, 40, 60, 80, 100, 200, 500, 1000],
         tbodyList: []
       },
       searchConfig: {
@@ -155,6 +174,7 @@ export default {
         ]
       },
       theadList: [
+        { key: 'selection' },
         { key: 'name', title: this.$t('page.name'), textValue: 'views'},
         { key: 'ip', title: 'IP:PORT' },
         { key: 'status', title: this.$t('page.status'), headerIcon: 'tsfont-refresh'},
@@ -168,7 +188,9 @@ export default {
         { key: 'mem', title: this.$t('term.framework.mem'), type: 'company', value: 'MB' },
         { key: 'lcd', title: this.$t('page.updatetime'), type: 'time' },
         { key: 'action'}
-      ]
+      ],
+      selected: [],
+      batchDeleteIsDisabled: false
     };
   },
   beforeCreate() {},
@@ -367,6 +389,53 @@ export default {
     },
     exportExcel() {
       this.download({ url: '/api/binary/tagent/export', params: this.searchVal });
+    },
+    getSelected(indexList, itemList) {
+      this.batchDeleteIsDisabled = false;
+      itemList.forEach(item => {
+        if (item.status === 'connected') {
+          this.batchDeleteIsDisabled = true;
+        }
+      });
+      this.selected = itemList;
+    },
+    batchDelete() {
+      if (this.selected && this.selected.length > 0) {
+        let tagentNameList = [];
+        let tagentIdList = [];
+        let flag = false;
+        this.selected.forEach(item => {
+          if (item.status === 'connected') {
+            flag = true;
+          }
+          tagentNameList.push(item.name);
+          tagentIdList.push(item.id);
+        });
+        if (flag) {
+          return;
+        }
+        let params = {
+          idList: tagentIdList
+        };
+        // 批量删除确认提示框
+        this.$createDialog({
+          title: this.$t('dialog.title.deleteconfirm'),
+          content: this.$t('dialog.content.deletetargetconfirm', {target: tagentNameList.join(', ')}),
+          btnType: 'error',
+          'on-ok': vnode => {
+            this.$api.framework.tagent.batchDeleteTagent(params)
+              .then((res) => {
+                if (res.Status == 'OK') {
+                  this.changeCurrent();
+                  this.selected = [];
+                  this.$Message.success(this.$t('message.deletesuccess'));
+                }
+              }).finally(res => {
+                vnode.isShow = false;
+              });
+          }
+        });
+      }
     }
   },
   computed: {},
diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
index 52746bc9ffcf074b2211b8994c3c386b789b5ff9..05a80fa7a0a95ed29ced202743dc944fda548a63 100644
--- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
@@ -617,7 +617,7 @@ export default {
         file: true,
         reportingHistory: true
       },
-      loadingShow: false, // 解决固定页面之后，tab的顺序改变了，不是渲染前的顺序
+      loadingShow: true, // 解决固定页面之后，tab的顺序改变了，不是渲染前的顺序
       fixedPageList: [],
       mouseoverTabName: '', // 鼠标进入事件
       hasAccessoriesList: true,
@@ -979,23 +979,25 @@ export default {
       this.setTimeUpdata = setTimeout(() => {
         this.$nextTick(() => {
           // 确保子组件渲染完成，否则第一次拿不到formdata的值，导致返回上一层页面，路由数据对比有问题
-          let allData = this.getData();
-          this.$emit('update', allData);
+          if (this.actionConfig.save) {
+            let allData = this.getData();
+            this.$emit('update', allData);
+          }
         });
         this.setTimeUpdata = null;
       }, 300);
     },
-    async initData() {
-      await this.getStepStatusList();
+    initData() {
+      this.getStepStatusList();
       this.wipeCenterDetail();
       this.getActivityList();
       this.getAllFileList();
-    
       this.getTaskComment();
       this.getRepeatList();
       this.initTabList();
       this.$nextTick(() => {
         this.update();
+        this.loadingShow = false;
       });
     },
     wipeCenterDetail() {
@@ -1060,6 +1062,19 @@ export default {
           }
         }
       }
+      //补充默认展示前置步骤tab（eoa）
+      if (this.processTaskConfig.currentProcessTaskStep && this.processTaskConfig.currentProcessTaskStep.viewPrevNodeUuidList) {
+        let viewPrevNodeUuidList = this.processTaskConfig.currentProcessTaskStep.viewPrevNodeUuidList;
+        const viewPrevNodeList = this.processTaskConfig.currentProcessTaskStep.viewPrevNodeList || [];
+        if (!this.$utils.isEmpty(viewPrevNodeUuidList)) {
+          viewPrevNodeUuidList.forEach(pre => {
+            let step = viewPrevNodeList.find(step => step.processStepUuid === pre);
+            if (!this.$utils.isEmpty(step)) {
+              this.viewStepData.push(step);
+            }
+          });
+        }
+      }
     },
     getStepList(data) {
       //刷新子策略数据
@@ -1095,7 +1110,7 @@ export default {
       let data = {
         processTaskId: this.processTaskId
       };
-      return this.$api.process.processtask.getStepStatusList(data).then(res => {
+      this.$api.process.processtask.getStepStatusList(data).then(res => {
         if (res.Status == 'OK') {
           this.stepData = res.Return;
           mutations.setStepList(res.Return);
@@ -1104,18 +1119,6 @@ export default {
             this.stepData.forEach(item => {
               this.$set(item, 'isShow', false);
             });
-            //补充默认展示步骤tab
-            if (this.processTaskConfig.currentProcessTaskStep && this.processTaskConfig.currentProcessTaskStep.handlerStepInfo) {
-              let viewPrevNodeUuidList = this.processTaskConfig.currentProcessTaskStep.viewPrevNodeUuidList;
-              if (!this.$utils.isEmpty(viewPrevNodeUuidList)) {
-                viewPrevNodeUuidList.forEach(pre => {
-                  let step = this.stepData.find(step => step.processStepUuid === pre);
-                  if (!this.$utils.isEmpty(step)) {
-                    this.viewStepData.push(step);
-                  }
-                });
-              }
-            }
           }
         }
       });
diff --git a/src/views/pages/process/task/task-dispatch.vue b/src/views/pages/process/task/task-dispatch.vue
index b7821812a3ccee12e7df2b399e67befb06e7e9a9..5e07bbdd2f5b0fb6cfb3a18b0a57b1f9fcd1ac94 100644
--- a/src/views/pages/process/task/task-dispatch.vue
+++ b/src/views/pages/process/task/task-dispatch.vue
@@ -181,9 +181,10 @@ export default {
     this.invoke = invoke;
     await this.getChannel();
     this.getChannelInfo();
-    this.$nextTick(() => {
-      this.setTimer();
-    });
+    //草稿屏蔽定时保存
+    // this.$nextTick(() => {
+    //   this.setTimer();
+    // });
   },
   beforeMount() {},
   mounted() {},
diff --git a/src/views/pages/report/report/paramconfig/base.vue b/src/views/pages/report/report/paramconfig/base.vue
new file mode 100644
index 0000000000000000000000000000000000000000..77b883114632f07efb2a1fd6ee0c7817c8f6e8f3
--- /dev/null
+++ b/src/views/pages/report/report/paramconfig/base.vue
@@ -0,0 +1,50 @@
+<script>
+
+export default {
+  components: {
+    ReactionFilter: () => import('@/views/pages/report/report/paramconfig/reaction/filter.vue')
+  },
+  props: {
+    config: {
+      type: Object
+    },
+    rowData: {
+      // 编辑当前行的数据
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    paramList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    }
+  },
+  methods: {
+    valid() {
+      const formRef = this.$refs;
+      let isValidPass = true;
+      for (let key in formRef) {
+        const refKey = this.$refs[key];
+        if (key && refKey && refKey.valid && !refKey.valid()) {
+          isValidPass = false;
+        }
+      }
+      return isValidPass;
+    },
+    setConfig() {
+      const formData = this.$utils.deepClone(this.$refs['formMain'].getFormValue()) || {};
+      const reactionFilterList = this.$refs?.reactionFilterRef?.saveData() || [];
+      if (!this.$utils.isEmpty(formData)) {
+        delete formData['reactionFilter'];
+      }
+      return {
+        ...formData,
+        reactionFilterList: reactionFilterList
+      };
+    }
+  }
+};
+</script>
diff --git a/src/views/pages/report/report/paramconfig/formcheckbox-config.vue b/src/views/pages/report/report/paramconfig/formcheckbox-config.vue
index 5e438aa97aab60e7fc0ecc678aeeabfa19aaf993..d6f83c7b696d88606104597267bf747c1726de30 100644
--- a/src/views/pages/report/report/paramconfig/formcheckbox-config.vue
+++ b/src/views/pages/report/report/paramconfig/formcheckbox-config.vue
@@ -1,18 +1,27 @@
 <template>
   <div>
     <TsForm ref="formMain" :item-list="formConfig">
+      <template slot="reactionFilter">
+        <ReactionFilter
+          ref="reactionFilterRef"
+          :matrixAttrUuidList="matrixAttrUuidList"
+          :rowData="rowData"
+          :paramList="paramList"
+          :reactionFilterList="reactionFilterList"
+        ></ReactionFilter>
+      </template>
     </TsForm>
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
-  props: {config: {type: Object} },
+  extends: BaseConfig,
   data() {
-    const _this = this;
     return {
       myConfig: {matrix: '', valueKey: '', textKey: ''},
       formConfig: {
@@ -26,8 +35,8 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required'],
-          onChange: function(val) {
-            _this.currentMatrix = val;
+          onChange: (val) => {
+            this.currentMatrix = val;
           }
         },
         valueKey: {
@@ -47,9 +56,16 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required']
+        },
+        reactionFilter: {
+          name: 'reactionFilter',
+          type: 'slot',
+          label: '联动过滤'
         }
       },
-      currentMatrix: null
+      currentMatrix: null,
+      matrixAttrUuidList: [],
+      reactionFilterList: []
     };
   },
   beforeCreate() {},
@@ -61,6 +77,10 @@ export default {
       this.formConfig[k].value = this.myConfig[k];
     }
     this.currentMatrix = this.myConfig['matrix'];
+    const { reactionFilterList = [] } = this.config || {};
+    if (reactionFilterList?.length > 0) {
+      this.reactionFilterList = reactionFilterList;
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -68,11 +88,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
   watch: {
@@ -83,8 +99,10 @@ export default {
             matrixUuid: val
           }).then(res => {
             if (res.Status == 'OK') {
-              this.formConfig.valueKey.dataList = res.Return.tbodyList;
-              this.formConfig.textKey.dataList = res.Return.tbodyList;
+              const { tbodyList = [] } = res?.Return || {};
+              this.formConfig.valueKey.dataList = tbodyList;
+              this.formConfig.textKey.dataList = tbodyList;
+              this.matrixAttrUuidList = tbodyList;
             }
           });
         }
diff --git a/src/views/pages/report/report/paramconfig/formdate-config.vue b/src/views/pages/report/report/paramconfig/formdate-config.vue
index b1617380fe3e541e34ba45b293d9103c0071b6d7..070297a2df5c07740e9c2cee2fd144e85aa1ece4 100644
--- a/src/views/pages/report/report/paramconfig/formdate-config.vue
+++ b/src/views/pages/report/report/paramconfig/formdate-config.vue
@@ -5,18 +5,16 @@
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
-  components: { TsForm: () => import('@/resources/plugins/TsForm/TsForm')
-  },
-  props: {
-    config: {
-      type: Object
-    }
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
+  extends: BaseConfig,
   data() {
     return {
-      myConfig: {defaultValue: ''},
+      myConfig: { defaultValue: '' },
       formConfig: {
         defaultValue: {
           type: 'date',
@@ -44,15 +42,10 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
-  watch: {
-  }
+  watch: {}
 };
 </script>
 <style lang="less">
diff --git a/src/views/pages/report/report/paramconfig/formdaterange-config.vue b/src/views/pages/report/report/paramconfig/formdaterange-config.vue
index 303feb0fd18eccddb28296cff3e6ef36aea8b507..e487698e5807e261d16fc49a0bb9d204c165005d 100644
--- a/src/views/pages/report/report/paramconfig/formdaterange-config.vue
+++ b/src/views/pages/report/report/paramconfig/formdaterange-config.vue
@@ -5,18 +5,16 @@
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
-  components: { TsForm: () => import('@/resources/plugins/TsForm/TsForm')
-  },
-  props: {
-    config: {
-      type: Object
-    }
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
+  extends: BaseConfig,
   data() {
     return {
-      myConfig: {defaultValue: ''},
+      myConfig: { defaultValue: '' },
       formConfig: {
         defaultValue: {
           type: 'datetimerange',
@@ -44,11 +42,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
   watch: {
diff --git a/src/views/pages/report/report/paramconfig/forminput-config.vue b/src/views/pages/report/report/paramconfig/forminput-config.vue
index b2660f2c6ce60d0eaaf8cbc4cdf2bdff6a44b7fb..28fdc2e3525fa68d24b65484f99087eba76db2ad 100644
--- a/src/views/pages/report/report/paramconfig/forminput-config.vue
+++ b/src/views/pages/report/report/paramconfig/forminput-config.vue
@@ -5,15 +5,13 @@
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
-  components: { TsForm: () => import('@/resources/plugins/TsForm/TsForm')
-  },
-  props: {
-    config: {
-      type: Object
-    }
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
+  extends: BaseConfig,
   data() {
     return {
       myConfig: {length: '', defaultValue: ''},
@@ -43,11 +41,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
   watch: {
diff --git a/src/views/pages/report/report/paramconfig/formradio-config.vue b/src/views/pages/report/report/paramconfig/formradio-config.vue
index 5e438aa97aab60e7fc0ecc678aeeabfa19aaf993..d6f83c7b696d88606104597267bf747c1726de30 100644
--- a/src/views/pages/report/report/paramconfig/formradio-config.vue
+++ b/src/views/pages/report/report/paramconfig/formradio-config.vue
@@ -1,18 +1,27 @@
 <template>
   <div>
     <TsForm ref="formMain" :item-list="formConfig">
+      <template slot="reactionFilter">
+        <ReactionFilter
+          ref="reactionFilterRef"
+          :matrixAttrUuidList="matrixAttrUuidList"
+          :rowData="rowData"
+          :paramList="paramList"
+          :reactionFilterList="reactionFilterList"
+        ></ReactionFilter>
+      </template>
     </TsForm>
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
-  props: {config: {type: Object} },
+  extends: BaseConfig,
   data() {
-    const _this = this;
     return {
       myConfig: {matrix: '', valueKey: '', textKey: ''},
       formConfig: {
@@ -26,8 +35,8 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required'],
-          onChange: function(val) {
-            _this.currentMatrix = val;
+          onChange: (val) => {
+            this.currentMatrix = val;
           }
         },
         valueKey: {
@@ -47,9 +56,16 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required']
+        },
+        reactionFilter: {
+          name: 'reactionFilter',
+          type: 'slot',
+          label: '联动过滤'
         }
       },
-      currentMatrix: null
+      currentMatrix: null,
+      matrixAttrUuidList: [],
+      reactionFilterList: []
     };
   },
   beforeCreate() {},
@@ -61,6 +77,10 @@ export default {
       this.formConfig[k].value = this.myConfig[k];
     }
     this.currentMatrix = this.myConfig['matrix'];
+    const { reactionFilterList = [] } = this.config || {};
+    if (reactionFilterList?.length > 0) {
+      this.reactionFilterList = reactionFilterList;
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -68,11 +88,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
   watch: {
@@ -83,8 +99,10 @@ export default {
             matrixUuid: val
           }).then(res => {
             if (res.Status == 'OK') {
-              this.formConfig.valueKey.dataList = res.Return.tbodyList;
-              this.formConfig.textKey.dataList = res.Return.tbodyList;
+              const { tbodyList = [] } = res?.Return || {};
+              this.formConfig.valueKey.dataList = tbodyList;
+              this.formConfig.textKey.dataList = tbodyList;
+              this.matrixAttrUuidList = tbodyList;
             }
           });
         }
diff --git a/src/views/pages/report/report/paramconfig/formselect-config.vue b/src/views/pages/report/report/paramconfig/formselect-config.vue
index 5e438aa97aab60e7fc0ecc678aeeabfa19aaf993..b63bbc57b6df548b08416fdbe1a269a9dff347d1 100644
--- a/src/views/pages/report/report/paramconfig/formselect-config.vue
+++ b/src/views/pages/report/report/paramconfig/formselect-config.vue
@@ -1,20 +1,29 @@
 <template>
   <div>
     <TsForm ref="formMain" :item-list="formConfig">
+      <template slot="reactionFilter">
+        <ReactionFilter
+          ref="reactionFilterRef"
+          :matrixAttrUuidList="matrixAttrUuidList"
+          :rowData="rowData"
+          :paramList="paramList"
+          :reactionFilterList="reactionFilterList"
+        ></ReactionFilter>
+      </template>
     </TsForm>
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
-  props: {config: {type: Object} },
+  extends: BaseConfig,
   data() {
-    const _this = this;
     return {
-      myConfig: {matrix: '', valueKey: '', textKey: ''},
+      myConfig: { matrix: '', valueKey: '', textKey: '' },
       formConfig: {
         matrix: {
           type: 'select',
@@ -26,8 +35,8 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required'],
-          onChange: function(val) {
-            _this.currentMatrix = val;
+          onChange: (val) => {
+            this.currentMatrix = val;
           }
         },
         valueKey: {
@@ -47,20 +56,32 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required']
+        },
+        reactionFilter: {
+          name: 'reactionFilter',
+          type: 'slot',
+          label: '联动过滤'
         }
       },
-      currentMatrix: null
+      currentMatrix: null,
+      matrixAttrUuidList: [],
+      reactionFilterList: []
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() { //由于父组件是通过component :is的方式加载，所以每次打开都会执行mouted方法
+  mounted() {
+    //由于父组件是通过component :is的方式加载，所以每次打开都会执行mouted方法
     this.myConfig = this.config;
     for (const k in this.formConfig) {
       this.formConfig[k].value = this.myConfig[k];
     }
     this.currentMatrix = this.myConfig['matrix'];
+    const { reactionFilterList = [] } = this.config || {};
+    if (reactionFilterList?.length > 0) {
+      this.reactionFilterList = reactionFilterList;
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -68,11 +89,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
   watch: {
@@ -83,8 +100,10 @@ export default {
             matrixUuid: val
           }).then(res => {
             if (res.Status == 'OK') {
-              this.formConfig.valueKey.dataList = res.Return.tbodyList;
-              this.formConfig.textKey.dataList = res.Return.tbodyList;
+              const { tbodyList = [] } = res?.Return || {};
+              this.formConfig.valueKey.dataList = tbodyList;
+              this.formConfig.textKey.dataList = tbodyList;
+              this.matrixAttrUuidList = tbodyList;
             }
           });
         }
diff --git a/src/views/pages/report/report/paramconfig/formselects-config.vue b/src/views/pages/report/report/paramconfig/formselects-config.vue
index 5e438aa97aab60e7fc0ecc678aeeabfa19aaf993..5ac31d88b294e3f1b98d946cb5f38e4a6ad944df 100644
--- a/src/views/pages/report/report/paramconfig/formselects-config.vue
+++ b/src/views/pages/report/report/paramconfig/formselects-config.vue
@@ -1,20 +1,29 @@
 <template>
   <div>
     <TsForm ref="formMain" :item-list="formConfig">
+      <template slot="reactionFilter">
+        <ReactionFilter
+          ref="reactionFilterRef"
+          :matrixAttrUuidList="matrixAttrUuidList"
+          :rowData="rowData"
+          :paramList="paramList"
+          :reactionFilterList="reactionFilterList"
+        ></ReactionFilter>
+      </template>
     </TsForm>
   </div>
 </template>
 <script>
+import BaseConfig from '@/views/pages/report/report/paramconfig/base.vue';
 export default {
   name: '',
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm')
   },
-  props: {config: {type: Object} },
+  extends: BaseConfig,
   data() {
-    const _this = this;
     return {
-      myConfig: {matrix: '', valueKey: '', textKey: ''},
+      myConfig: { matrix: '', valueKey: '', textKey: '' },
       formConfig: {
         matrix: {
           type: 'select',
@@ -26,8 +35,8 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required'],
-          onChange: function(val) {
-            _this.currentMatrix = val;
+          onChange: (val) => {
+            this.currentMatrix = val;
           }
         },
         valueKey: {
@@ -47,9 +56,16 @@ export default {
           valueName: 'uuid',
           transfer: true,
           validateList: ['required']
+        },
+        reactionFilter: {
+          name: 'reactionFilter',
+          type: 'slot',
+          label: '联动过滤'
         }
       },
-      currentMatrix: null
+      currentMatrix: null,
+      matrixAttrUuidList: [],
+      reactionFilterList: []
     };
   },
   beforeCreate() {},
@@ -61,6 +77,10 @@ export default {
       this.formConfig[k].value = this.myConfig[k];
     }
     this.currentMatrix = this.myConfig['matrix'];
+    const { reactionFilterList = [] } = this.config || {};
+    if (reactionFilterList?.length > 0) {
+      this.reactionFilterList = reactionFilterList;
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -68,11 +88,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-    setConfig: function() {
-      return this.$refs['formMain'].getFormValue();
-    }
-  },
+  methods: {},
   filter: {},
   computed: {},
   watch: {
@@ -83,8 +99,10 @@ export default {
             matrixUuid: val
           }).then(res => {
             if (res.Status == 'OK') {
-              this.formConfig.valueKey.dataList = res.Return.tbodyList;
-              this.formConfig.textKey.dataList = res.Return.tbodyList;
+              const { tbodyList = [] } = res?.Return || {};
+              this.formConfig.valueKey.dataList = tbodyList;
+              this.formConfig.textKey.dataList = tbodyList;
+              this.matrixAttrUuidList = tbodyList;
             }
           });
         }
diff --git a/src/views/pages/report/report/paramconfig/reaction/filter.vue b/src/views/pages/report/report/paramconfig/reaction/filter.vue
new file mode 100644
index 0000000000000000000000000000000000000000..36fea755b31e4ad379e6e480792746675335ecf8
--- /dev/null
+++ b/src/views/pages/report/report/paramconfig/reaction/filter.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="bg-op radius-sm padding">
+    <Alert show-icon>
+      <div>
+        <ul>
+          <li>配置过滤属性时，<span class="text-error">当前矩阵过滤属性值，需要和过滤组件值的【值字段】保持一致。</span>否则过滤不生效。</li>
+          <li>示例：通过 “系统名称” 过滤其下属的所有 “模块名称”，需按以下信息配置：
+            <ul>
+              <li>先配置 “系统名称”，将其【值字段】设为 “系统 id”；</li>
+              <li>配置 “模块名称” 的联动过滤时，【属性】必须选择 “系统 id”（与上述 “系统名称” 的【值字段】保持一致）</li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </Alert>
+    <TsRow>
+      <Col span="8" class="text-grey">
+        属性
+      </Col>
+      <Col span="2">
+      </Col>
+      <Col span="10" class="text-grey">
+        组件值
+      </Col>
+      <Col span="4">
+      </Col>
+    </TsRow>
+    <span v-if="$utils.isEmpty(filterList)" class="tsfont-plus text-href mt-sm" @click.stop="addFilterCondition">过滤条件</span>
+    <TsRow v-for="(item, index) in filterList" :key="item.uuid" className="mb-nm">
+      <Col span="8">
+        <TsFormSelect
+          :ref="`formAttrRef_${index}`"
+          v-model="item.matrixAttrUuid"
+          :dataList="handleDisabled(matrixAttrUuidList, filterList)"
+          textName="name"
+          valueName="uuid"
+          :validateList="['required']"
+          transfer
+          border="border"
+        ></TsFormSelect>
+      </Col>
+      <Col span="2">等于</Col>
+      <Col span="10">
+        <TsFormSelect
+          :ref="`formRef_${index}`"
+          v-model="item.formItemUuid"
+          :dataList="conditionList()"
+          :validateList="['required']"
+          transfer
+          border="border"
+        ></TsFormSelect>
+      </Col>
+      <Col span="4">
+        <span class="tsfont-plus text-action mr-xs" @click.stop="addRow(index)"></span>
+        <span class="tsfont-trash-o text-action" @click.stop="deleteRow(index)"></span>
+      </Col>
+    </TsRow>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+  },
+  props: {
+    rowData: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    paramList: {
+      // 条件配置名称列表
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
+    reactionFilterList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
+    matrixAttrUuidList: {
+      // 矩阵属性列表
+      type: Array,
+      default: () => {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {
+      filterList: []
+    };
+  },
+  beforeCreate() {},
+  created() {
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    addFilterCondition() {
+      this.filterList.push({
+        uuid: this.$utils.setUuid(),
+        matrixAttrUuid: '',
+        formItemUuid: ''
+      });
+    },
+    addRow(index) {
+      this.filterList.splice(
+        index + 1,
+        0,
+        {
+          uuid: this.$utils.setUuid(),
+          matrixAttrUuid: '',
+          formItemUuid: ''
+        }
+      );
+    },
+    deleteRow(index) {
+      this.filterList.splice(index, 1);
+    },
+    saveData() {
+      // 提供给外部使用
+      return this.filterList;
+    }
+  },
+  filter: {},
+  computed: {
+    conditionList() {
+      return () => {
+        let dataList = [];
+        const { name = '' } = this.rowData || {};
+        this.paramList.forEach((item) => {
+          if (item?.name && item?.label && item.name != name) { // 排除自身，不能联动自身
+            dataList.push({value: item.name, text: item.label});
+          }
+        });
+        return dataList;
+      };
+    },
+    handleDisabled() {
+      return (dataList = [], filterList = []) => {
+        const selectedUuids = filterList.filter((v) => v?.matrixAttrUuid).map(v => v.matrixAttrUuid);
+        dataList.forEach((item) => {
+          item._disabled = false;
+          if (item?.uuid && selectedUuids.includes(item.uuid)) {
+            this.$set(item, '_disabled', true);
+          }
+        });
+        return dataList;
+      };
+    }
+  },
+  watch: {
+    reactionFilterList: {
+      handler(list, oldList) {
+        this.filterList = list;
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/report/report/paramhandler/formcheckbox.vue b/src/views/pages/report/report/paramhandler/formcheckbox.vue
index 68dba615f9b27b7c30a957d9fbd34945792ca814..799ee353727db18984f1adc318ccf51724bd8f63 100644
--- a/src/views/pages/report/report/paramhandler/formcheckbox.vue
+++ b/src/views/pages/report/report/paramhandler/formcheckbox.vue
@@ -2,7 +2,7 @@
   <div>
     <TsFormCheckbox
       v-model="value"
-      v-bind="myConfig"
+      v-bind="formConfig"
       border="border"
       :search="true"
       :isCustomValue="true"
@@ -18,6 +18,12 @@ export default {
     TsFormCheckbox
   },
   props: {
+    searchParam: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    },
     config: {
       type: Object
     },
@@ -30,15 +36,6 @@ export default {
   },
   data() {
     return {
-      myConfig: {
-        url: '/api/rest/matrix/column/data/search/forselect',
-        rootName: 'dataList',
-        params: {
-          matrixUuid: this.config.matrix,
-          valueField: this.config.valueKey,
-          textField: this.config.textKey
-        }
-      },
       value: []
     };
   },
@@ -54,7 +51,34 @@ export default {
   destroyed() {},
   methods: {},
   filter: {},
-  computed: {},
+  computed: {
+    formConfig() {
+      const { matrix = '', valueKey = '', textKey = '', reactionFilterList = [] } = this.config || {};
+      const config = {
+        url: '/api/rest/matrix/column/data/search/forselect',
+        rootName: 'dataList',
+        params: {
+          matrixUuid: matrix,
+          valueField: valueKey,
+          textField: textKey,
+          filterList: []
+        }
+      };
+      if (reactionFilterList && reactionFilterList.length > 0) {
+        reactionFilterList.forEach((v) => {
+          if (v?.matrixAttrUuid) {
+            const searchValue = this.searchParam?.[v.formItemUuid];
+            const valueList = Array.isArray(searchValue) ? searchValue : !this.$utils.isEmpty(searchValue) ? [searchValue] : [];
+            config.params.filterList.push({
+              uuid: v.matrixAttrUuid,
+              valueList: valueList
+            });
+          }
+        });
+      }
+      return config;
+    }
+  },
   watch: {
     value: {
       handler: function(val, oldVal) {
diff --git a/src/views/pages/report/report/paramhandler/formradio.vue b/src/views/pages/report/report/paramhandler/formradio.vue
index f847df73caf5d719c2935857490e7ff43e55e0bd..07f31ec3ce93f485d72726e095a6367ea716bb55 100644
--- a/src/views/pages/report/report/paramhandler/formradio.vue
+++ b/src/views/pages/report/report/paramhandler/formradio.vue
@@ -2,7 +2,7 @@
   <div>
     <TsFormRadio
       v-model="value"
-      v-bind="myConfig"
+      v-bind="formConfig"
       border="border"
       :search="true"
       :isCustomValue="true"
@@ -18,6 +18,12 @@ export default {
     TsFormRadio
   },
   props: {
+    searchParam: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    },
     config: {
       type: Object
     },
@@ -30,15 +36,6 @@ export default {
   },
   data() {
     return {
-      myConfig: {
-        url: '/api/rest/matrix/column/data/search/forselect',
-        rootName: 'dataList',
-        params: {
-          matrixUuid: this.config.matrix,
-          valueField: this.config.valueKey,
-          textField: this.config.textKey
-        }
-      },
       value: ''
     };
   },
@@ -54,7 +51,34 @@ export default {
   destroyed() {},
   methods: {},
   filter: {},
-  computed: {},
+  computed: {
+    formConfig() {
+      const { matrix = '', valueKey = '', textKey = '', reactionFilterList = [] } = this.config || {};
+      const config = {
+        url: '/api/rest/matrix/column/data/search/forselect',
+        rootName: 'dataList',
+        params: {
+          matrixUuid: matrix,
+          valueField: valueKey,
+          textField: textKey,
+          filterList: []
+        }
+      };
+      if (reactionFilterList && reactionFilterList.length > 0) {
+        reactionFilterList.forEach((v) => {
+          if (v?.matrixAttrUuid) {
+            const searchValue = this.searchParam?.[v.formItemUuid];
+            const valueList = Array.isArray(searchValue) ? searchValue : !this.$utils.isEmpty(searchValue) ? [searchValue] : [];
+            config.params.filterList.push({
+              uuid: v.matrixAttrUuid,
+              valueList: valueList
+            });
+          }
+        });
+      }
+      return config;
+    }
+  },
   watch: {
     value: {
       handler: function(val, oldVal) {
diff --git a/src/views/pages/report/report/paramhandler/formselect.vue b/src/views/pages/report/report/paramhandler/formselect.vue
index 2b0970d69280c173c1efbffd152381dfb4ad4da8..a54d43edb428ea10b8f29945c29feed2b9abf9d4 100644
--- a/src/views/pages/report/report/paramhandler/formselect.vue
+++ b/src/views/pages/report/report/paramhandler/formselect.vue
@@ -2,7 +2,7 @@
   <div>
     <TsFormSelect
       v-model="value"
-      v-bind="myConfig"
+      v-bind="formConfig"
       border="border"
       :search="true"
       :transfer="true"
@@ -18,6 +18,12 @@ export default {
     TsFormSelect
   },
   props: {
+    searchParam: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    },
     config: {
       type: Object
     },
@@ -30,16 +36,7 @@ export default {
   },
   data() {
     return {
-      myConfig: {
-        dynamicUrl: '/api/rest/matrix/column/data/search/forselect',
-        rootName: 'dataList',
-        params: {
-          matrixUuid: this.config.matrix,
-          valueField: this.config.valueKey,
-          textField: this.config.textKey,
-          keywordColumn: this.config.textKey
-        }
-      },
+    
       value: ''
     };
   },
@@ -56,7 +53,35 @@ export default {
   destroyed() {},
   methods: {},
   filter: {},
-  computed: {},
+  computed: {
+    formConfig() {
+      const { matrix = '', valueKey = '', textKey = '', reactionFilterList = [] } = this.config || {};
+      const config = {
+        dynamicUrl: '/api/rest/matrix/column/data/search/forselect',
+        rootName: 'dataList',
+        params: {
+          matrixUuid: matrix,
+          valueField: valueKey,
+          textField: textKey,
+          keywordColumn: textKey,
+          filterList: []
+        }
+      };
+      if (reactionFilterList && reactionFilterList.length > 0) {
+        reactionFilterList.forEach((v) => {
+          if (v?.matrixAttrUuid) {
+            const searchValue = this.searchParam?.[v.formItemUuid];
+            const valueList = Array.isArray(searchValue) ? searchValue : !this.$utils.isEmpty(searchValue) ? [searchValue] : [];
+            config.params.filterList.push({
+              uuid: v.matrixAttrUuid,
+              valueList: valueList
+            });
+          }
+        });
+      }
+      return config;
+    }
+  },
   watch: {
     value: {
       handler: function(val, oldVal) {
diff --git a/src/views/pages/report/report/paramhandler/formselects.vue b/src/views/pages/report/report/paramhandler/formselects.vue
index 3f0160f2ae009cbaebd62db93fdf8addde8940ec..248a46ddc38211cf8def8b7caf68108c33343dfe 100644
--- a/src/views/pages/report/report/paramhandler/formselects.vue
+++ b/src/views/pages/report/report/paramhandler/formselects.vue
@@ -2,7 +2,7 @@
   <div>
     <TsFormSelect
       v-model="value"
-      v-bind="myConfig"
+      v-bind="formConfig"
       border="border"
       :search="true"
       :transfer="true"
@@ -19,6 +19,12 @@ export default {
     TsFormSelect
   },
   props: {
+    searchParam: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    },
     config: {
       type: Object
     },
@@ -31,16 +37,6 @@ export default {
   },
   data() {
     return {
-      myConfig: {
-        dynamicUrl: '/api/rest/matrix/column/data/search/forselect',
-        rootName: 'dataList',
-        params: {
-          matrixUuid: this.config.matrix,
-          valueField: this.config.valueKey,
-          textField: this.config.textKey,
-          keywordColumn: this.config.textKey
-        }
-      },
       value: ''
     };
   },
@@ -56,7 +52,35 @@ export default {
   destroyed() {},
   methods: {},
   filter: {},
-  computed: {},
+  computed: {
+    formConfig() {
+      const { matrix = '', valueKey = '', textKey = '', reactionFilterList = [] } = this.config || {};
+      const config = {
+        dynamicUrl: '/api/rest/matrix/column/data/search/forselect',
+        rootName: 'dataList',
+        params: {
+          matrixUuid: matrix,
+          valueField: valueKey,
+          textField: textKey,
+          keywordColumn: textKey,
+          filterList: []
+        }
+      };
+      if (reactionFilterList && reactionFilterList.length > 0) {
+        reactionFilterList.forEach((v) => {
+          if (v?.matrixAttrUuid) {
+            const searchValue = this.searchParam?.[v.formItemUuid];
+            const valueList = Array.isArray(searchValue) ? searchValue : !this.$utils.isEmpty(searchValue) ? [searchValue] : [];
+            config.params.filterList.push({
+              uuid: v.matrixAttrUuid,
+              valueList: valueList
+            });
+          }
+        });
+      }
+      return config;
+    }
+  },
   watch: {
     value: {
       handler: function(val, oldVal) {
diff --git a/src/views/pages/report/report/report-param.vue b/src/views/pages/report/report/report-param.vue
index 8d3949da5774406a87f8e7e95e186e955808ee52..3f7289b6ccfb68f860ab21cb1565986d3753ce7b 100644
--- a/src/views/pages/report/report/report-param.vue
+++ b/src/views/pages/report/report/report-param.vue
@@ -95,7 +95,13 @@
         <div>{{ $t('term.report.paramconfig') }}</div>
       </template>
       <template v-slot>
-        <component :is="currentParam.type+'config'" ref="paramComponent" :config="currentParam.config"></component>
+        <component
+          :is="currentParam.type + 'config'"
+          ref="paramComponent"
+          :paramList="myParamList"
+          :rowData="currentParam"
+          :config="currentParam.config"
+        ></component>
       </template>
       <template v-slot:footer>
         <Button @click="close">{{ $t('page.cancel') }}</Button>
@@ -188,7 +194,7 @@ export default {
         type: 'modal',
         maskClose: false,
         isShow: false,
-        width: 'small'
+        width: 'medium'
       }
     };
   },
@@ -224,13 +230,16 @@ export default {
     delParam: function(index) {
       this.myParamList.splice(index, 1);
     },
-    setConfig: function(config) {
+    setConfig(config) {
+      const paramComponent = this.$refs['paramComponent'];
+      if (paramComponent && paramComponent.valid && !paramComponent.valid()) {
+        return false;
+      }
       this.paramList.forEach(element => {
         if (element.name == this.currentParam.name) {
           element.config = {...element.config, ...this.$refs['paramComponent'].setConfig()};
         }
       });
-
       this.close();
     },
     configParam: function(param) {
diff --git a/src/views/pages/report/report/report-show.vue b/src/views/pages/report/report/report-show.vue
index 19490fd55f6edb4423390a28f3a22bfc75d65af0..86014ae0b029818ef824ab642a88fa5794d9d0b2 100644
--- a/src/views/pages/report/report/report-show.vue
+++ b/src/views/pages/report/report/report-show.vue
@@ -76,6 +76,7 @@
                   ref="form"
                   :validateList="param.validateList"
                   :config="param.config"
+                  :searchParam="searchParam"
                   @setParam="
                     val => {
                       setParam(param.name, val);