diff --git a/public/resource/example/datasource_example.xml b/public/resource/example/datasource_example.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ec4067f0267bd672fdcf94699b071d23450a6dc
--- /dev/null
+++ b/public/resource/example/datasource_example.xml
@@ -0,0 +1,23 @@
+<datasource>
+  <!--fields用于定义返回的字段列表-->
+  <fields>
+  <!--id代表唯一字段，支持多个id字段进行组合。普通字段用field定义，type是数据类型，目前只支持number、text、time、date、datetime五种，number类型系统最多只会保留4位小数。
+  如果需要聚合计算，可以使用aggregate属性，目前支持sum和count两种算法。配置了aggregate属性的field字段会根据id字段进行计数或累加计算。-->
+    <id column="id" label="id" type="number"/>
+    <field column="user_id" label="用户id" type="text"/>
+    <field column="user_name" label="用户名" type="text"/>
+    <field column="phone" label="电话" type="number"/>
+  </fields>
+  <!--params用于定义需要保存最大值的字段，例如每次执行完保留最大的id值，下次执行可以用这个id值作为过滤条件实现增量同步-->
+  <params>
+  <!--column是返回字段，返回字段的类型必须是数字型（如果需要保存时间可以先把时间转换成时间戳）。
+      在where条件中可以通过#{column值}使用，-->
+    <param column="id" label="最大id" default="0"/>
+  </params>
+  <!--select元素支持多个，但每个select语句返回的字段需要和fields中定义的一致。-->
+  <!--mongodb 仅支持aggregation pipeline,具体api 参考官方文档:https://www.mongodb.com/docs/manual/reference/operator/aggregation/ -->
+  <!--如: {aggregate: "INSPECT_REPORTS",pipeline: [{ '$match': { '_report_time': { $lte: ISODate("2022-11-05T00:00:00.0Z") }, '_inspect_result.status': { '$in': ['CRITICAL', 'WARN', 'FATAL'] } } }, { '$sort': {'_report_time': -1 } }, {$project: { resourceId: "$RESOURCE_ID",status: "$_inspect_result.status" }}}-->
+  <select>
+    select user_id,user_name,phone from `user` where id > #{id}
+  </select>
+</datasource>
\ No newline at end of file
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 734d87bf484f9ff72121831ec488b207d7569bba..e39e567504b2106c44947b839e21a9bc287b70b5 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -2,6 +2,7 @@ import { rspack, defineConfig } from '@rsbuild/core';
 import { pluginVue2 } from '@rsbuild/plugin-vue2';
 import { pluginLess } from '@rsbuild/plugin-less';
 let commercialModule = './src/commercial-module';
+let communityModule = './src/community-module';
 import path from 'path';
 import glob from 'glob';
 const { tenantName, urlPrefix } = require('./apiconfig.json');
@@ -12,7 +13,31 @@ let table_style = 'border';
 let imgModule = './public/resource';
 let copyPath = '';
 let faviconPath = './public/resource/img/common/tsfavicon.png';
-let importCustomConfig = glob.sync(`${commercialModule}/**/customconfig.js`) || [];
+
+let importCustomConfig = glob.sync(`${communityModule}/**/customconfig.js`) || [];
+importCustomConfig.forEach((filePath) => {
+  if (filePath) {
+    let {tableStyle, title, loginTitle, imgPath, publicPath, faviconIconPath} = require(filePath);
+    copyPath = publicPath;
+    if (loginTitle) {
+      login_Title = String(loginTitle);
+    }
+    if (tableStyle) {
+      table_style = String(tableStyle);
+    }
+    if (title) {
+      pageTitle = String(title);
+    }
+    if (imgPath) {
+      imgModule = imgPath;
+    }
+    if (faviconIconPath) {
+      faviconPath = faviconIconPath; 
+    }
+  }
+});
+
+importCustomConfig = glob.sync(`${commercialModule}/**/customconfig.js`) || [];
 importCustomConfig.forEach((filePath) => {
   if (filePath) {
     let {tableStyle, title, loginTitle, imgPath, publicPath, faviconIconPath} = require(filePath);
@@ -50,11 +75,13 @@ function getAllModuleList(modulePathList = []) {
 function getPages(pageList) {
   const pages = {};
   const pagePathList = glob.sync(src + '/views/pages/*/router.js');
-  const importModulePathList = glob.sync(`${commercialModule}/**/router.js`) || [];
+  const importCommercialModulePathList = glob.sync(`${commercialModule}/**/router.js`) || [];
+  const importCommunityModulePathList = glob.sync(`${communityModule}/**/router.js`) || [];
   const defaultModuleList = getAllModuleList(pagePathList);
   const commercialModuleList = [];
+  const communityModuleList = [];
 
-  importModulePathList.forEach(filePath => {
+  importCommercialModulePathList.forEach(filePath => {
     const moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
     if (!defaultModuleList.includes(getModuleName(moduleName))) {
       pagePathList.push(filePath);
@@ -62,14 +89,25 @@ function getPages(pageList) {
     }
   });
 
+  importCommunityModulePathList.forEach(filePath => {
+    const moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
+    if (!defaultModuleList.includes(getModuleName(moduleName))) {
+      pagePathList.push(filePath);
+      communityModuleList.push(getModuleName(moduleName));
+    }
+  });
+
   pagePathList.forEach(filePath => {
     const moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
     const filename = getModuleName(moduleName);
     const pageLogin = filename === 'login' ? pageTitle : `${pageTitle}-${filename}`;
-    const entry = commercialModuleList.includes(filename)
-      ? `${commercialModule}/${moduleName}/${filename}.js`
-      : `${src}/views/pages/${filename}/${filename}.js`;
 
+    let entry = `${src}/views/pages/${filename}/${filename}.js`;
+    if (communityModuleList.includes(filename)) {
+      entry = `${communityModule}/${moduleName}/${filename}.js`;
+    } else if (commercialModuleList.includes(filename)) {
+      entry = `${commercialModule}/${moduleName}/${filename}.js`;
+    } 
     pages[filename] = {
       entry,
       template: `public/index.html`,
@@ -193,14 +231,14 @@ export default defineConfig({
         changeOrigin: true,
         secure: false,
         pathRewrite: { [`/${tenantName}/tenant/check`]: '/neatlogic/tenant/check/' + tenantName },
-        headers: { Tenant: tenantName, Env: 'uat' }
+        headers: { Tenant: tenantName, 'Neatlogic-Rule-Env': 'sit', 'Neatlogic-Rule-Test': '1' }
       },
       [`/${tenantName}/login/`]: {
         target: urlPrefix,
         changeOrigin: true,
         secure: false,
         pathRewrite: { [`/${tenantName}/login/check`]: '/neatlogic/login/check/' + tenantName },
-        headers: { Tenant: tenantName, Env: 'uat' }
+        headers: { Tenant: tenantName, 'Neatlogic-Rule-Env': 'sit', 'Neatlogic-Rule-Test': '1' }
       }
     }
   },
diff --git a/src/resources/api/api.js b/src/resources/api/api.js
index 2186b413446840200a60ea533ff7ef6d7ad000d7..baf1dc8805c45ee9f9a448c1c1870fbc25ac1b83 100644
--- a/src/resources/api/api.js
+++ b/src/resources/api/api.js
@@ -13,9 +13,7 @@ import report from './report';
 import rdm from './rdm';
 import documentonline from './documentonline';
 
-let moduleApiConfig = {};
-let moduleList = ['autoexec', 'cmdb', 'common', 'dashboard', 'deploy', 'framework', 'globalsearch', 'inspect', 'knowledge', 'pbc', 'process', 'report', 'rdm', 'documentonline', 'alert']; // 用于自定义页面接口导入做浅拷贝
-let moduleConfig = {
+let moduleApiConfig = {
   autoexec: autoexec,
   cmdb: cmdb,
   common: common,
@@ -29,18 +27,48 @@ let moduleConfig = {
   process: process,
   report: report,
   rdm: rdm,
-  documentonline: documentonline,
-  alert: alert
+  documentonline: documentonline
 };
+/*let moduleList = ['autoexec', 'cmdb', 'common', 'dashboard', 'deploy', 'framework', 'globalsearch', 'inspect', 'knowledge', 'pbc', 'process', 'report', 'rdm', 'documentonline']; // 用于自定义页面接口导入做浅拷贝
+let moduleConfig = {
+  autoexec: autoexec,
+  cmdb: cmdb,
+  common: common,
+  dashboard: dashboard,
+  deploy: deploy,
+  framework: framework,
+  globalsearch: globalsearch,
+  inspect: inspect,
+  knowledge: knowledge,
+  pbc: pbc,
+  process: process,
+  report: report,
+  rdm: rdm,
+  documentonline: documentonline
+};*/
 try {
   // 导入自定义模块，获取导出接口地址
-  const apiConfig = require.context('@/commercial-module', true, /api.js$/);
+  let apiConfig = require.context('@/community-module', true, /api.js$/);
+  apiConfig.keys().forEach(apiPath => {
+    if (apiPath) {
+      const moduleName = apiPath.split('/')[1]?.split('-')?.pop() || apiPath.split('/')[1];
+      const exportValue = apiConfig(apiPath).default || {};
+      if (moduleApiConfig[moduleName]) {
+        moduleApiConfig[moduleName] = Object.assign(moduleApiConfig[moduleName], exportValue); //自定义页面接口导入，在现有模块基础上添加
+      } else {
+        moduleApiConfig[moduleName] = exportValue;
+      }
+    }
+  });
+
+  // 导入自定义模块，获取导出接口地址
+  apiConfig = require.context('@/commercial-module', true, /api.js$/);
   apiConfig.keys().forEach(apiPath => {
     if (apiPath) {
       const moduleName = apiPath.split('/')[1]?.split('-')?.pop() || apiPath.split('/')[1];
       const exportValue = apiConfig(apiPath).default || {};
-      if (moduleList.includes(moduleName)) {
-        moduleApiConfig[moduleName] = Object.assign(moduleConfig[moduleName], exportValue); //自定义页面接口导入，在现有模块基础上添加
+      if (moduleApiConfig[moduleName]) {
+        moduleApiConfig[moduleName] = Object.assign(moduleApiConfig[moduleName], exportValue); //自定义页面接口导入，在现有模块基础上添加
       } else {
         moduleApiConfig[moduleName] = exportValue;
       }
@@ -51,19 +79,19 @@ try {
 }
 
 export default {
-  autoexec,
-  common,
-  cmdb,
-  pbc,
-  dashboard,
-  framework,
-  deploy,
-  globalsearch,
-  inspect,
-  knowledge,
-  process,
-  report,
-  rdm,
-  documentonline,
+  // autoexec,
+  // common,
+  // cmdb,
+  // pbc,
+  // dashboard,
+  // framework,
+  // deploy,
+  // globalsearch,
+  // inspect,
+  // knowledge,
+  // process,
+  // report,
+  // rdm,
+  // documentonline,
   ...moduleApiConfig
 };
diff --git a/src/resources/api/deploy/application-config/env.js b/src/resources/api/deploy/application-config/env.js
index 71b0524a0d33e1e602b1c0ed773abc1ca5dd3643..44c74f0aa3cd59bfb113425ffa4aebbfb3c86398 100644
--- a/src/resources/api/deploy/application-config/env.js
+++ b/src/resources/api/deploy/application-config/env.js
@@ -43,6 +43,22 @@ const env = {
   getInstanceList(params) {
     // 实例列表
     return axios.post('/api/rest/deploy/app/module/env/auto/config/instance/search', params);
+  },
+  saveEnvDbResource(params) {
+    // 保存环境db资源
+    return axios.post('/api/rest/deploy/app/config/env/cientity/save', params);
+  },
+  saveEnvDbPublicAccount(params) {
+    // 保存发布应用配置DB公共账号 
+    return axios.post('/api/rest/deploy/app/config/env/db/publicaccount/save', params);
+  },
+  saveEnvDbPrivateaccount(params) {
+    // 保存发布应用配置DB私有账号 
+    return axios.post('/api/rest/deploy/app/config/env/db/privateaccount/save', params);
+  },
+  deleteEnvDbPrivateaccount(params) {
+    // 删除发布应用配置DB私有账号 
+    return axios.post('/api/rest/deploy/app/config/env/db/privateaccount/delete', params);
   }
 };
 
diff --git a/src/resources/api/framework/changelogaudit/changelogaudit.js b/src/resources/api/framework/changelogaudit/changelogaudit.js
new file mode 100644
index 0000000000000000000000000000000000000000..438c4ff95a4e6af65b2af7e12f84d74969743768
--- /dev/null
+++ b/src/resources/api/framework/changelogaudit/changelogaudit.js
@@ -0,0 +1,9 @@
+import axios from '../../http';
+
+const changelogaudit = {
+  searchChangelogAuditList(params) {
+    return axios.post('/api/rest/changelog/audit/search', params);
+  }
+};
+
+export default changelogaudit;
diff --git a/src/resources/api/framework/database/database.js b/src/resources/api/framework/database/database.js
new file mode 100644
index 0000000000000000000000000000000000000000..1340895db4ce964f03811a2750697a8e3fee84db
--- /dev/null
+++ b/src/resources/api/framework/database/database.js
@@ -0,0 +1,21 @@
+import axios from '../../http';
+
+const database = {
+  searchDatabaseList(params) {
+    return axios.post('/api/rest/database/search', params);
+  },
+  getDatabaseById(params) {
+    return axios.post('/api/rest/database/get', params);
+  },
+  deleteDatabaseById(params) {
+    return axios.post('/api/rest/database/delete', params);
+  },
+  saveDatabase(params) {
+    return axios.post('/api/rest/database/save', params);
+  },
+  testDatabaseById(params) {
+    return axios.post('/api/rest/database/test', params);
+  }
+};
+
+export default database;
diff --git a/src/resources/api/framework/datawarehouse/datawarehouse.js b/src/resources/api/framework/datawarehouse/datawarehouse.js
index 8dbe81a9fd947b3e29b3033645c60da7a4ce7646..a04551d165d6e3f7e291f03a096caa900c32e4a2 100644
--- a/src/resources/api/framework/datawarehouse/datawarehouse.js
+++ b/src/resources/api/framework/datawarehouse/datawarehouse.js
@@ -45,6 +45,13 @@ const datawarehouse = {
   },
   validXml(xml) {
     return axios.post('/api/rest/datawarehouse/datasource/validxml', {xml: xml});
+  },
+  getExample() {
+    return fetch('/resource/example/datasource_example.xml', {
+      method: 'get',
+      credentials: 'same-origin',
+      responseType: 'text'
+    }).then(res => res.text());
   }
 };
 
diff --git a/src/resources/api/framework/fulltextindex/fulltextindex.js b/src/resources/api/framework/fulltextindex/fulltextindex.js
index 2531b5ffbb5de762938d5c91dd8549131dc8ce9a..b7bdd1c27bf2dc7971b64619aea8bb9f8711c445 100644
--- a/src/resources/api/framework/fulltextindex/fulltextindex.js
+++ b/src/resources/api/framework/fulltextindex/fulltextindex.js
@@ -6,6 +6,18 @@ const fulltextindex = {
   },
   rebuildFullTextIndex(params) {
     return axios.post('/api/rest/fulltextindex/rebuild', params);
+  },
+  searchWord(params) {
+    return axios.post('/api/rest/fulltextindex/dictionary/word/search', params);
+  },
+  testSliceWord(content) {
+    return axios.post('/api/rest/fulltextindex/dictionary/word/test', { content: content });
+  },
+  deleteWordById(id) {
+    return axios.post('/api/rest/fulltextindex/dictionary/word/delete', { id: id });
+  },
+  addWord(params) {
+    return axios.post('/api/rest/fulltextindex/dictionary/word/insert', params);
   }
 };
 export default fulltextindex;
diff --git a/src/resources/api/framework/index.js b/src/resources/api/framework/index.js
index 305a2e79b99913795b8db4c974cfc644ab87b1d7..867bb4256a8ab8f4c20433cee1749e2d97a3cb22 100644
--- a/src/resources/api/framework/index.js
+++ b/src/resources/api/framework/index.js
@@ -22,6 +22,7 @@ import mq from './mq/mq';//消息队列
 import fulltextindex from './fulltextindex/fulltextindex';//全局检索
 import healthcheck from './healthcheck/healthcheck';//健康检查
 import datawarehouse from './datawarehouse/datawarehouse';//数据仓库
+import database from './database/database';//数据库
 import theme from './theme/theme';//主题定制
 import auditconfig from './auditconfig/auditconfig';//审计配置
 import file from './file/file';//附件管理
@@ -35,6 +36,7 @@ import wechat from './wechat/wechat';// 企业微信
 import extramenu from './extramenu/extramenu'; //附加菜单
 import region from './region/region';//地域管理
 import homepage from './homepage/homepage';//默认首页
+import changelogaudit from './changelogaudit/changelogaudit';//数据库变更记录
 export default {
   role,
   user,
@@ -60,6 +62,7 @@ export default {
   runner,
   healthcheck,
   datawarehouse,
+  database,
   auditconfig,
   file,
   module,
@@ -71,5 +74,6 @@ export default {
   wechat,
   extramenu,
   region,
-  homepage
+  homepage,
+  changelogaudit
 };
diff --git a/src/resources/api/framework/mq/mq.js b/src/resources/api/framework/mq/mq.js
index c505623f8eae8078aa8ef26162290b74472115de..a89715a43159203405289be48d3b2df58b6bc6de 100644
--- a/src/resources/api/framework/mq/mq.js
+++ b/src/resources/api/framework/mq/mq.js
@@ -39,6 +39,9 @@ const mq = {
   },
   testTopic(param) {
     return axios.post('/api/rest/mq/topic/test', param);
+  },
+  healthCheck(id) {
+    return axios.post('/api/rest/mq/subscribe/healthcheck', { id: id });
   }
 };
 export default mq;
diff --git a/src/resources/api/framework/tagent/runner.js b/src/resources/api/framework/tagent/runner.js
index 17efd657767cabbbcee2054329b0f136f5e28d6e..fe3e6b310438d61ce77e47ce92c368eee30d48f5 100644
--- a/src/resources/api/framework/tagent/runner.js
+++ b/src/resources/api/framework/tagent/runner.js
@@ -32,6 +32,9 @@ const runner = {
   delRunnerGroupRunner(id) {
     // 删除runner组里面的runner
     return axios.post('/api/rest/runnergroup/runner/delete', {id: id});
+  },
+  getRunnerStatus(params) {
+    return axios.post('/api/rest/runner/status/check', params);
   }
 };
 export default runner;
diff --git a/src/resources/api/framework/users/user.js b/src/resources/api/framework/users/user.js
index a93736171638de97912c1aee0b3f9e0c730dcd4a..ff966c90623b99edc03790eb9c40604ae1bed412 100644
--- a/src/resources/api/framework/users/user.js
+++ b/src/resources/api/framework/users/user.js
@@ -98,5 +98,9 @@ export default {
   },
   clearUserSessionCache() { //删除用户会话缓存
     return axios.post('/api/rest/user/session/cache/clear');
+  },
+  getUserForEdit(params) {
+    // 获取用户信息(编辑页面回显专用)
+    return axios.post('api/rest/user/get/foredit', params);
   }
 };
diff --git a/src/resources/api/http.js b/src/resources/api/http.js
index 218b8a57c556f18160dfc6963827a4acc6c4c21e..a4e7eb7445f316140d440bba26e342aed7dbd8cd 100644
--- a/src/resources/api/http.js
+++ b/src/resources/api/http.js
@@ -248,7 +248,8 @@ const errorHandle = res => {
     case 522:
       // 认证类型失败
       Vue.prototype.$utils.removeCookie('neatlogic_authorization');
-      toLogin(res.data && res.data.directUrl ? res.data.directUrl : null, status);
+      toLogin(res.data && res.data.DirectUrl ? res.data.DirectUrl : null, status);
+      // console.log(res.data.DirectUrl);
       break;
     case 523: // 没有资源权限
     case 526: // 对象不存在
@@ -274,7 +275,7 @@ const errorHandle = res => {
     case 527:
       //会话已超时或已被终止,重新登录
       Vue.prototype.$utils.removeCookie('neatlogic_authorization');
-      toLogin(res.data && res.data.directUrl ? res.data.directUrl : null);
+      toLogin(res.data && res.data.DirectUrl ? res.data.DirectUrl : null);
       break;
     case 530:
       //接口参数不符合规范
diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less
index c80cf3303248b126907e577605bd487505be5712..18036cd5e00e13c6ebfbd8d6e838328c4306164f 100644
--- a/src/resources/assets/css/common.less
+++ b/src/resources/assets/css/common.less
@@ -2072,6 +2072,7 @@ span {
 //slider组件，防止圆圈掉下来
 .ivu-tooltip-rel {
   display: -webkit-box;
+  display: flex; // 处理chrome 91版本浏览器，文案显示不全问题
 }
 
 .color-picker-transfer-class {
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index 1e11750b45e84ee48c75bae3c0f03fb5cf0f7ff9..4d5f11d6c636ca6a702b9a1440d16f8f19c21cf4 100644
--- a/src/resources/assets/css/theme.less
+++ b/src/resources/assets/css/theme.less
@@ -1577,7 +1577,7 @@
   .text-CRITICAL {
     //删除，警告
     color: @error-color;
-
+    fill: @error-color;
     &:before {
       color: @error-color;
     }
diff --git a/src/resources/assets/font/tsfonts/font/tsfont_woff2.json b/src/resources/assets/font/tsfonts/font/tsfont_woff2.json
new file mode 100644
index 0000000000000000000000000000000000000000..5ac0a938af91c12e3717ace4db0718a0cc819dab
--- /dev/null
+++ b/src/resources/assets/font/tsfonts/font/tsfont_woff2.json
@@ -0,0 +1,3 @@
+{
+  "woff2Base64": "d09GMgABAAAAAQ1sAAsAAAACMYAAAQ0aAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYADCHAqHzQyGigEBNgIkA5FAC4hiAAQgBYN+B7FGW87KkUXBxvA+BozQ0jndRAQ2/tZa1SQub8V0mwV3uxI8jQ87VLBtKfVuB3m/oBrP/v////8/P1nEsWb2mL09B1KgqvoPcskzHFHQUQ6zOvfILnYaxjzNntqz6JJjSYr2dbjWJW4ot3UcR1RsdjUlc5Xt6bupYTA6ROsONzfdLPfGbs2F4a04G7ybIbpjIecHJjjOp+EvMxLe5iM9WvvGR18WXMYfnMTuDtmivrnMwUrJEguSOIxodMQTgi4yI7slSOLF4SRBJFInt66IXBUVXaZsiCSsMl2J0leWvwSHxLO48uXf+LB4h2YZEl357VQtNR69Rh6+ZtkKoi3FPPlHXQ3j4w4NbhzigsnLJIwYIpekATV6z6zhyl7EBzQqbcAFbhUIo5J+J38PdKE7hH6OeV1mCpQaevEJf/1iVYf3jozteZy07JNxybrjUFKf3XyKF2EQuazAupAjYzMzL3imSqagtvzbA+3dydG+3bx/r7xNKGVsi6dk8zOnqjVrjF0DgtI9ZMmReuGfONn/b1u3WzIMvElkKbYu8IwiidYDyaq197t7YGeP3r0AaUKnUKiUj1ApH6VTHv4nAI7l/feqgjNw804aYYOOBjgeYAVQVADc/7fp78zcFSzcu0L0pCsEQqpATUkqHqlZpKryJabv21QGaG7dWDAGbCzIDRgb0WNBD9gaegkbUQs6REWijEIJIwFFRUAbRMFAibcS7X8LRLFAfQfYZQ9BtfvqAIxWN7Ia4P/7ptbf26W2z7m3qlvaje2h93iGF5ADBbIUkHgmjqOZaLKG/un6rfoVJHFowPYSJgsEBojvB9d6+1uVA4XQTFdMl7pWGKjmwoW7HaC5dYu6EYtmVdRYMUavGGyDsdGplJSUoIQSJoqoYGEUxiMY7xuvjfVv9ZuB/fq+dgDAbvqBa+Yy0Bd8gcvIRQ5cNuaba/6TZXGOPTY2l1JhDpzOKeOYEth9t6F5LaQk+AY/AaockFz5QNrky95BPY87duGJERACGIAcmQdZwsO+XwfmudIC6BP0/aY978nxtSzNSLZsz6zLtvf6vub9rVeU4AQGwA94YGA4DwMnDOYrNzX970+s03aSd/zdu2i5x10VWzQQCVGIKYABQNvKXzXN7zmmexEEBolt1ojApLVlGft1mzaRNUus8Fw0yU1KbvRvoRsA2E5Y9lJD/Wv4x+ee7b87oQwCSkiijgeb/9dcfffu5nubjTcoOEB3SargAI0DxoROdJzJUgnaHQzucGY6sG/Y2WamfkqfK+2npFvBxjRUUpVtop3L7oyNIVfYkCGiNZ1sL3RvQ8LXWQC2wPO2OkTOdb536n8zdu/9mLGdvHMk+xLnIpcf73JfBwIPEn7IS9av9DujEQQKkmVbSdw2RIVQgQW/uzt827tnJliEDY9Vgwl/a1gWb50szOYbfe4/jzZhRHM4WVjp+y3NSzoOQAuQG7zHU2jHmtY00dfs2ubh7cbBET4LQIO/FpVGYdR2O04087CklWUWElYJUEAxOZUALOp3WNIwCCNWLVP6/1tiDgmQLaOIDEkkQNobjWrVmjon5K51SuMcTvnsDP+hWYjQZZYCFETC2PNvqlVpFWWaVHfPY5vZkXqdtFa956R3QbLWZ2eie7mN6v9fAPF/VQH4VQCFAkgJBZBqFiCpUQVSQgGSBqTUbBCSKNdGrR6rWaPWrGkzzlQBpBpFSn0osltLSGNI9RpJ66S1rbO9xtvwjIvX2OyMC/ddkF2QdWfTF/ksnyCc8MJL4otceiqyxCK73e5+S3EEBLp3WDNrwJZ0HQWsUaxg6Yw9+9q9+koGRq8ObG69vjPLrzxtT3/Z/TcTQjBGGCGEeAhhTA73GWTOeqzYZccdttYqAgrK2BIkIZsE9O9H1va9odX/WkFvNCbHNmQcHp3W1xsUEEj/JXM1/Klfi3oveg07lkqoIWSTLfAmhSwe9QgOjUxNWzbnDredCNO3Ba/s5trKnNJ6nlBWocx6GHpnEAGOgsPyIt/3tlsAARGiP7oPhhf9f65JyT/4Jg6f8VuBfSATZIBsDRum1+RpvG9wYiPtQFuO4SuZjSuCI+N9fuCmDuDIet+kplNz+Q9jgX+JmxgXUlO6wWgyW2ysMmTKki1Hrjz5ChQqUqxEqTLlKlSqUq1GrTr1GjRq0hxsYwISi5pHVq997vsACMEIiuEESdEMy/GCKMmKqumGadmO6/lBGMVJmuVFWdVN2/XDOM3Luu3Hed3P+/kCIAQjKIYTJEUzLMcLoiQrqqYbpmU7rucHYRQn/79ZXpRV3bRdP4zTvKzbfpzX2/3xfAEgBCMohhMkRTMsxwuiJCuqphumZTuu5wdhFCdplhdlVTdt1w/jNC/rth/ndT9vtBGKRmcw2VjsHDhy4syFG64AIkwo40IqbazzIaZcauv6YZzmZd3243S+XG/3x/P1/nx/fwAQBIZAYXAEEoXGYHF4ApFEplBpdAaTxeZweXyBUCSWSGVyhVKl1mh1eoPRZLZYbXaH0+X2eH18AUAQGAKFwRFIFBqDxeEJRBKZQqXRGUwWm8Pl8QVCkVgilckVSpVao9XpDUaT2WK12R1OVzd3D08vABAEhkBhcAQShcZgcXgCkUSmUGl0BpPF5nB5fIFQJJZIZXKFUqXWaHX6YZzmZd32Xxdw8df+ZwgDffz0jwhflP/IcV738/4zl2RyhVJNpa5BoybNWrTRCiDChDIupNLGOh9iyqW2rh/GaV6iMgxEQcqnsdUNs8HBIJMBMSiGxLAYEaNiTIyLCTEppsS0mBGzYk7MiwWxKJbEslgRq2JNrIsNsSm2xLbYEbtiT+yLA3Eojoij4pg4Lk6Ik+KUOC3OiLPinDgvLoiL4pK4LK6Iq+KauC5uiJvilrgt7oi74p64Lx6Ih/EoHseTeBrP4nm8iJfxKl7Hm3gb7+J9fIiP8Sk+x5f4Gt/ie/yIn/Erfsef+FvNv2D+DGEowxjOCEYyitGMYSzjGM8EJjKJyUxhKtOYzgxmMovZzGEu85jPAhayiMUsYSnLWM4KVrKK1axhgLWsYz0b2MgmNrOFrWxjOzuwIzuxM7uwK7uxO3uwJ3uxN/uwL/uxPyseyCAGS+2KKQQkDMW9AibgAiGQAiXQAiOwAifwgiCIgiTIgiKogibogiGYgiXYgiO4gif4QiCEQiTEhLiQEJJCSkgLGSEr5IS8UBCKQkkoCxWhKtSEutAQmkJLaAsdoSv0hL4wEIbCSBgLE2EqzIS5sBCWhoBWYS1shK2wE/bCQTgKJ+EsXISrcBPuwkN4Ci/hLXyEr/AT/o7/Dzj+Q4iDDNV1AliACFABJugKcEFPQAj6goFgKCAFlGAkoAWMgBVwgrFgIpgKZoK5YCHgBYJgKVgJ1gJRsBFIAlmwFewEe8FBcBScBGfBRXAV3AR3gSJ4CFSBJtAFhuApeAnego/gK/gJ/gJTCBAChSCBJbAFjsAVeAJfEAhCIVgIEUKFMCFciBAihShBJIgFiSAVZIJciBZiBIWgFGKFOCFeSBAShSQhWUgRUgWVoBY0glZIE9KFDCFTyBKyhRwhV8gT8oUCoVAoEoqFEqFUKBPKhQqhUlgmVAnLhRXCSqFaWCXUCLVCnVAvNAiNQpPQLLQIq4U1wlphnbBe2CBsFDYJm4VWYYuwVWgT2oUOoVPYJmwXdgg7hV3CbmGPsFfYJ+wXuoRuoUc4IBwUeoVDwmHhiNAnHBX6hQFhUDgmHBdOCCeFU8Jp4YxwVhgWzhlWPpJyXrggjApjwkXhknBZuCKMC1eFa8KEMClMCdPCP8J14YZwU7gl3BbuCHeFe8J94YHwUHgkPBaeCDPCU+GZ8Fx4IbwUXgmvhTfCv8J/wlvhnfBe+GB4/xhmhTnhkzAvfBa+CAvCV+Gb8F34IfwUFoUl4Zdd0W8auTiYC7//yYPfz97kX+glAbIjhM6AULoHwsgXiHA6DCLoBZHkL6pGyxgZRHdALJ0EXeiHrvSh6EY/dadf4ui3ePojgf5KpH+S6L9kgEiBAEiFIEiDEEiHMMiACOgBUZAJMZAFcZANCSAHEkEuJIE8SAb5kAIKIBUUQhoognSKIYMSyKQUsugJ2fSCHHpDLn0gj76QTxkU0A8KKYciKqCYSiihCkqphjL6Qzk1UMEAqKQWqhgI1QyCGgZDLUOgjqFQzzBoYDg0UgdN1MfizyAwCkw2KGOhCe2ScRaWbO/vzyog+LJmvfnRLFCX7GsMJjcVM3BSHQY70rfdgFIQHytORONsGP6wVOMS9jsTgT0eVgl/KC6DrrOImFRI4xyOJnGozlTAdw/NPF14sR0Vbhu0XJ4mYdJWu2DhwHi0m1nofJj0QR/aUiySkB9lUKQVMzMWGjoa8hINo1vwd0+lXZuzdHu3zjcUX9PRznpkIklChTk9mNoB2yqjqPkIDSV0c1WNvqdecbzBLpLTibt0VOWQetGMhp8jG5FuTYFISd/bfjQXmz4mUlA80akW2zdSxFkDz8ywOhXWkqJXloCp1yIyutILVRdU6ual+Ax+FcECsoIphkAHcKaMgtPqMhD+qN3ly9OMJiZlsbQC+loXL+Jappk/6mJrxEOUqmjpRPacNWbRhu0JFAy4LzLBHCOVp4GRCzGn3eIk5ondMiLmS3dq+sP2q8RT7BBj7OtsvhKCoGi85EflGVFJ3b2qzWL02sSZ4dCwzUZlVC2tEQWUqjGigfJV4Djz0/r28TrRCb3+XCGSr9+OFyu6yCN2GLHFn/MuJYjM9vpAI3Q5xmqsT+Q8C5sBnAtJvpvT63f+VKWac7DRwQ73LW4DqZpomgWj5MriGBAbRbUaA2vIJEBCBkAAITdedZ8zt3oAMKR20OmHxreACYdbdNtgQSQAjIjIDIR7H0OMab4EErm79IjCWoidSLr0tnX9bNrnn7yamG1n03BEsYu3idfj9vWM4lYDBLAwVXRbazCJokE+XZPlz8TFq4hRzvCARE6EyW/yNOV8ipNKtaDKEAfDnh3AEu1fkrPlyv1ost8awyByUJjLBuSsEZsnB894lgDwidaohcgxqmjX90wXSiSEjmIzrlXn9aRDNjA+9cs7OY6gp+6e112v+sSYMwDk6XXzEOCuyDpjykRAJz3KCXMrDIArRhaQDjIKTc0Yvzmb8hNUY+UAVD8JRjE3l3Pc1hIjVGj1hiIX9m+HClY2TQwaW87f/gSFChPl7Bgrr8Zhmv4vxp8ZaEWAlOoEBxYzi9VhUzaBR+flbGZUgOClsgThXqEH7ojQdXXsmOt6cCA0ogbfvhMn7H7iWO4LoPa76HoAYGbjlMdbyQR+0DSqqLBIzvdn9h/7f5PtcapXS0U86Zn7yxEQu1EPeCJbnnNcTQPaJa8jG1a/yo/qG/KROAvKHroyVBUmCmACgVkwfVOLoOYEHplneOltPpuPm/Vh/zi4PAGEwFJVXBFVOMk0aZlvg5ljFmO+y236U+vrMa3m7vbsmX40CxolTN0GWaKfAp62tvrpZ9JmAwpx039Lt7m89uCON6w0UEm0Pvxzvds+vPY4ABkL9LDjCxGV800D2QaZEWabjudrfGOConQqEzn5XmOmXQsCLtxHkQLUA1A6gDrnfmiQ0PGl4cjgpfMgKFz2Cy07D9xhDY+Gx+MSsGZe5CQIL2FhjQ5oFS1XCMtZQCDLTkvfk5yTZ0H5Ra+CFT8ud8LSQJzD4iFClquggIMKEDC1Na/B9oZ1cLpnNfcRXdpHqDuMV7wwb4AAq4ycLgsnx++UTOKWqgs2a5mw9KwQAV1u9X7tJ29rkKquWYJGJi5CpLIMXLtRlFzLUl+wfze8Yh8WJelkDtb0LVufYmzNdSxjvKq2j7X+GHsPKdaTDaYXfT9ur67WRvoHAnVtM1yfzLuC56mmpjOeAATSas5PLPby3w/Njy//RQKNiJ5KncDQfg4a5/UwPjq1GV0ckjjXXvNQhdVogPpTcQ7hotBqj1/nrDqApEolu89W+0ce+ejJw3kY6u3wdoRJnnK4GOz1gl3mjBPkOxz81Z/Z48WphbLYp0SgSyPbgdsu/e9yaJU9bS2APJq7SdBQWcCeq7pXD9NQxaqqj4muRWqEIQIggm2J9R5WqYlzdLI3LjBeBFk9toVNM4muLzvPIs+Z3AEz8sTYb7kI/0gwr9WeffS59ZPB/7gHBH7T8CtQQi0soGmT7vyRod88THRq0yg6kYwAYC8QnGw3gGzJKhZF8BVTm//Xj/54UTCgQHoq1hpXK02N0DFnAvj6sWanCmCsZGRgla4Yq4lnDcFa790wDDCirjgIzo3KSKjGnJuEaZt3emvtwXSaO/LPoFekVaiJZbdqfz6ZmdCNh6qsmQgE0FBVQFGYuY+ehlBJJYWrjeW0LOkSiUROQphWK+ixOREiOJ/Sgf6p84IiZ3TI2ztw8JAOvftcu6N/5fm6c7ChHvhwn8PwrACobq/uHRd1/QQ1baUhhkUinirQ62YAXOFv7n0HVtvszjok1lsDFG7vAMg5padz6556m6e89mSV0RrgHMZn8qShH+bTjer7U/kmfNyYqYad/4/+WDIAaixoutE3Gfy8BwOatxrGpz1ZLOtG9no6m93Rix2lMPYL3aXN7NqxYz4NeJePK/deMNKWZZAluXjtREEPdeSSEslJfgvxGEQaGP4/IGkUAEvaWRLHzA45fx0/GMR8vHJ0MCA+wSW0p4QqFKoICVmQ89q6lfJtvavf2h6Djwudy5yOKPy4ogHgnYIQGFoSf1/LFnP3Ec1YCC1MYtDcr2IIkxmGU5Na7G5LsF/i1lv4IcU5AI6YGQwKIwDSwJgrxvNqqgh30zarMFid5Jlfalp0oQa/1NbaUepeUWry1zM90z/sBaKnr3/lPg4t0ZSSYOx68Wq6kyq1ZkXZBXfJaUzZsf9g1hv4aO0f4C+ZG97i3EKml58VJEbz5WiWEDa70lildDy2ZVOIllKO1geBfsN80nxYwcs8dx4ddGdxT84SjYCy5tYV6ObLX1FFgchrzAWVQAGozuS2FQBKH8kQQvQCa6CaybimnRMibADhWmyCKLdQFrah8Dt4PUvy8a/sAv3e/EK1kwysA4UDBc5ClvBafNp80HrkPL5tRSDuIZFVhvPOhHdF0eFSfXDKvnIr/wipkfwIDdiegqfKDe8rrJtVuu3FuPcZqnVahb+zT8bhjd3kKkChP77+5j48RDD639yqW493nO29VufX5tYuUeriELuGfCW8gJD+CIQyFl1uJrMJkx+XvseyOjWB7Tju/AiTRggU2dRHCTbeQZxDhRIp2a4YP2t6K2IAaqWPqiGEi17grepC7XyYDTZjhb4uE2U7/PYioCRRXZ6bvbuihPyUz8xcbaU+39ACajOnYUxN0ZIMD3voYpE2yGrUZPN0I7U5uV/ZL9+b/Hl6r9RRtLWJtEUGNHYGWxzN1XkuBLer1WJRD3X9F6aHIQv7FFylnvazrM9MWiK2y365B31XJw7AsiQwu3y0EbNUK7cw0toQBDSYE4hYSL1C0C/p9ZdDJYR3ZlAIoRcUiyDro2JOzwcBSKVPpn12IRy7S8NnpgvtbrET1+U9KRFfboec3cBmq5XlFx95vDvGta6uFDfPlb7cbud1l2BS8xHEmiH4QCBYJKFBc9EqF9ynEQGXDS2ES1UzbDO5VNgBt0SID1oATigtHADUpowGmPcbSsgYNXpChjEo0o2WJIvV2J7YFd0D7hraaEIswa93mFsD5nkU4SUd85oo9h7JtBBOYRvhTutqf0GV6WCQI6bvss/a7Cb4jPiTFVA5H2lakK+PmqU0tnGsVJMkv8RCpocuifkVGJVCXdfDAmNHh7GwyI1qQ1XFuExGtcDjhjDNJ2KBk0tCIPFciBJUHkWaFYQtqej/LhnWQ6HmBOxrq2h1GwcZgnZE6LlJ1cm/cUMmF00Jzv/h3/yTf1ujA8O1HqdbgodrT6z5/YiGmc6LmHM3lF2AoguTHF18NQVj1V0U0tnFejS2/fJS35V+p7+oFjlPh8VqQK170JbV6NWEoZmfC2igLeM4Hp0sxe4iCn42wP769xLH2+GtxMkmzUsdPqalIRZW7BYLefd9bZeqnabNqKJeAPUiIRPQQBCkk7D5Kaxi9jMIhgnWeJfhx7hEmrsEHDcdvXLADr7fz7CaMdlQL9Ta7eH55zox1TPbSq6eq786N1HWMEmKC1ItVkNBDzdYxY35hyfomHqq/lorCrlj39BlTytzdVr2DGGs7qwtj+6VyFr8ibCmyLTvCsSikBGLvXOwBvRTGjwK+vP4ONonLHQGjMN1XmMpdUxdAWOP4BZ4KNE26IHQw5rRSnAlM3pQ9KzLUt7MqCvWb4fewPXTIuvrgafmzfzZ0LPDrJ0iEEErTS32k5YsN12YiK9f2/7lt9CoyJc5cPhSS+0pHZ3Y6cYViOzoA5qwLBI83xx74uz/pD0bYk2aUH7RRKQZJG0qcZJ/SW0Ena/fVbl/W682isYXUfurdyTi3Pr5f77+euQ1nLpbu8hP6ZP2zCmzqYtwPPJHpX4PA6EpDQlt3YnsdrPDu/ir9bFitqBuDe5S4uKueQqwbR3k8bkX+mfxCqPTkRyNxiw8cYHyqakf5B5xVsxQGNFEyOPxFS0MJEeajQe0GXXmV62ZHT5QzBaCppIccxUEaVNv6IJhR/WQ7gVrqshsOuhvNFgb3rixicedUFFKocAaJy2j7GiS6ksp67iSQ2ZHAn1YzGAnjucBpXxOccSy5zac0QzzxmxodUkEG44MxRXEe2gvxqVmZNepzAPJawJVqCnN3cAuYKu0Ve/G/u8m3NmODTIiuhjyas6I8P0JOSeBbmjR8pHqMVUqlkrIiBJikQoJ4tBexo9lW03b2rbaU2T5fEDIaGeso2ZcXzzqQXt3XAOq5CkhH7NLMmUkl17DAKsoIPrQBBLPOsNjaauLbHj9+2U1ewmq1g3SoVm/b39XlBjb8BvpSYW9bxc5Vx+DGm6KVhNz7RFC1iS4vpDDLKwtgFQuruM8bt6AqV/auEQsI4M7UjMZDi26KwSyLWO/1XW14TvKYmeMO6XqDUBIXditV2xb7nP3GPTb7hbgYPaOQOi6kVbVmBqBL8Zek3f4/wnR0FthKz6PyXtq/dmeNKlr5OZMO/JoU1W0Mdffew5mN+NTaJu8dhaQQ0hvsQPK72v4mOcNwkDoCHm1Ht+mSsJ3MxvexFobbae0/bjAglFCFwkKXbzQmYuWeXHPxxw5PDHZNlVGl+5JMuSLxSqOkYl3rm3rDRR2f/w0e6u5R2IqHkaTNRQ2Ln/jz313rEIO2QYBL0jooK0gc6GMUi/cbsZzPZS8d9T1wXbXtJLulaQtLrSTVkcUBNwxV40TKaja1aBcUJuMZRNz3IEt/JH3CWS4YL/ixkkzm6AtL8Vjx2TOPJ9lT4vh3ThXpimVwdFbzw45pEA0Qqf7OU8FCq/GGSNT7j/uHywKztkMBdG2kOIY5zM5G5vZrfdRGlH7xzOsD8uKEjViz8AayeKPuyS+A/+ET97gwg2xeqQMZrJQCfaMnUlT4dY291LSEzD9UQYSrFpSY73j+bySbSBD3WDPEwdnwUxiJ9vA2mA70mA7zGJZsobUMFJrbn85FxmPHpfZcjDPSWS8X7+Gb2kMkl3Y+sZf1GQtNqIqVySYYXR2bg440vVaQqf7c03BGieTK0EsiBmqQLMA2ozqD383ulYV8f+YUbyNmPjJFxxjvBnPIBY0NJiVZkOgk9LlSsZVI4r45NG7NKs3zdHBwmZrIlFL80P+8OPls19NPbZmky6mUAq1bISVT3dSHdVXSeiyebkhfBZH6oJAXYRSXHocg3Ix/lZJ8wZIJKDw5Gz6lCAi1O2UIsKzBFwkAJ4QjH0k6mhTCE6A+gBDwOGYTQ+qEvWoA4pVXQoNaSb+1RbLzqSGL1C9kYTE+J1A+O6f7ZG2j0hrLVJ4MgH50mIDYhh8gvh5RxtH5LBd8e1NuIgVbboBkVKaK+Of3cCYC5g6AlAUPFzC7ilGw2esTcg4Ek91wCnnwDz5xDGM732CfWbOYkc/8dQJwO9/isOOQfX0UyVcl088SZ8uhGY8fQnYWjjzpMFonzqDTxpkcKf5fU8SwO7J951q5OTJp4s8eiMfIrkhszycKGDrulAg0cLOOIVdyBcv5zECtbKGMlzghS+WUBvMBdHFjwjXwHzQssupx+/05yXsaTwnMdEadAfnZJeGOKZUym+i2QjHV69hvzVfroIdtTO8MHwjs4PsnRIy0aItz1Cb3MfUE2uDc4NTvU93D+CELnCF1tCSCpbzmmoEmMKPg+o2iBGP3ZSBukVC7txrutt845HJmwPvVl7/DYV2PSDQaSK+OrLqHl8+3k62lT8sPXXjo5JZgaiCxFVfuvixw/ROK28+EfHljudCdy1an1uIXSFYulu05v7q8py0SwRAcAWbzpgXCO/jazH4e4GEfgDHAGxgyXDvI7uu9k8DV/v0pRpcfmTnRw699PlPbJ/uBkydWWjM88LOe7cnl4wopYY7aif1wdw3DLaOTPVOkW9Ojjw1OPf7Lev84UtkO53KqBQnr9/vu9B3ZWz9V6tlNl/OgEOcWKDvx3azmwcTSBcfwpKdm2kqHF/pemf6Lkw3kl7nHHh5+rVnbjg83PmR94Tb6x5MTk+dbJ3cklvS5LHFN8z05huHM1VKp1Pdl6xJnL/I2EiEbWExRNLbNZ01QhUSPQ1pL00pHWG14oPBSk+glVj1604EXIjQX0sePPVlLCslyLpae4fDD8iB2D6A8GN8xdKaIg2xGUspzsEro0t7SPNMDnFjacqYQKzyHIyYRzNdmGm2Q3+FtVG4S5qg8KoShLRExBxmJDefv9Ag5PgZwGJe+Mq4veGu3QxAGnM9RwIgXc2LuCCGALsNEFJCzWeal4hjRN1Zlhe6UoDiOVlMv7qiwBvzBo9WNTqxvyxLMJmNjQYr77svrTJcXZyN7QsfvIfs4OmRebWMUcNXfwnVElTcrTu89lizkiDu++lDzVjwyOunfDtfzv33FIaHO7QX5VztLsvK8muKPT5zyajI0T5Z5l3TKh9QBUaIxbq2b3HAGGoa/SZHzoO2bzR9ukxTp8wXbNN19S9lle894uyV1ym3xqNpwM4B8G/MjBwx8vW0NcpvTVCzMw+9u5YjDeV88Esxmo8Pw+8r7NU0+eMk38uAGhqNVUPe29mwtiyyhBab5a299r9fOLfvt/769HK96e1gZuKnQsMteG9t4TIL1ZOpBwR2yvUJ2w5yQjTzv970VPxP5+/l+ubSNHMuU+YGxo8EARMQrayx3hBUyVUYBJmt4MzP0gvV0+4fzfQuTl2KmvgbqGIzTrR+fde/5qWiydigtoLjKJhC5ilVqIqV5uoSXbKsLWuqF8PyjDUosZxlFEaCOB1XY033eOM39yLrKDDjUASd2VFnUhun44lH3RuO7QUYEY2n8E3r+SO1dDPlCsslnZlSLhRIlZBoW7fUJapVUnDSwU3vR7phetaZJosrM8tOXvIkrxjkZQNbAe93aAZUFG6Eu6cmVQKpDnl4ikItxxhKntn0xYEz47hTw6ySizV1Bo5PfXw3LayhLDwzLvjnhHEEnye8Ch0DfZfEtkSek99+hEMLUbZJfOwN8DK2BOSjLG9joKMZ1gHdYWhUtqigFGUZlekdzBOb2cEtHCfj/hq6GQ9QSLadVIy5kzPX8e3kuoUSvlBSncqIlmODcwVXUiqlBsmm6gtZuMC1C2VAu6LgtaIPp/HjLe62s3PgJzFFJtRjgrHfoFEhE6vz20VSucBCokM559YVX9gx8DmC512IQPApu4MPamWAa1HARR9evpmNz3IoovXZlBZ+NAbBwwQOYfZw9t1xrtfx0UO4fDJjbyzbrFoomfeUI/60seCqS+gcUWZoCWFJWhlcQU6mRZtMuNrrMrAxWSyqwRLUSLP3aZkzcM2SKwye4/hMLrFw4d9wgRf24TzRtyYGl//T4DxpLrNRg8d9fE+1phoWKSegLeOY2nZXzYGK8dnkFIyh5OQonRK3r7x2InA106tFkaWXOY6U8CFXfmNcOdMJy5a2X7tReDy/D3rs17N15Gr2wWyylhChFx1e/DsU0jBMsoeZW7CVzHDVEh7NKIHvSuQYJig8ch6TqOmDbte8Kv5q0KSn/ZARXCVO/YLBGigMYRn0MALGfE6lVyHv4iig16vL0POJZNzpfMEHhNt/kN02WJfXaPzgw3jzPfwAPQS0cap3Wpzpnzxff7tst/Jtgs2AR46H142ODYgUgWARCBnXD03BeevhO10Y9KaC48Ot5q+dNcGJdPkKX0JSzb5EVhvyhXFBc1u3n6wuGgZyVhsYkJGT8xtcN6SBh2NBKFFFAYUPT53MB1EGWIEEElEt5s82IlROy2VBUGDQ22Vwntogw1MfeIM5nHNIL52RtnmRW/7r0I51ttcv6JTFVSQ86L44xOFab7uEt3XKEeVlotX1xexCLLj/+Xt/gWu617zUWOK+eVrWwm9v7tZzDe6itvbWQwno6LNp+sO/KRbfcJaSF4/mnP5FNGWVukM9XDg+oJdONH769kMpUbzweNGSnqu6Sqbz4TpKyNILJFBzQLa8QBucyIdCJagDjFZ9PIzGQm1xu5Yb5wwoURYgepzHy8tF9FniCN5dP/wt89k5ba1sq3BnZ7lpzXT2VOdXFyjbu/L+jncMXHv+CH7xzb0dPafyDzHVvlj/3gSM9380kBr4kwog+xGk8Kly8/jetIPSorow1soI12KjwIPql7sXay9iZC+UjeyldlPE6Jgt9zqOTqDm4Dnek2etdB0VBzAIXEO+12pKs/BWq/jJ3VY8Heor5qIewu6kIXh1chXg5mjGHMsJWpaU23l8UuAYTWgRhRbkzPoZZhSIn6eWyKRrRy7FFqlcnv5aFmPR0fVkqBeXoq3BoJOsxAp1FMQyWHkqxfYcR6qNBlJ8NzkvR6PLbx2YIQUWaDlqohAWKiwMWUGvZEsON1pjQIUNnHOBcZrPB8PEhaABQE2BoM6GYxGQrE9yNChz7lEQXPKShVNsmxUwtmIUt3VWZxWUvBIj4cf1FcY11ONmrR3WRKidA5SJQKM0T8uaNf0ijgZ34FKIOb63Mrm5WSpny3eg543TjesZy5g9UXs7IGtvJ5gCm1d5UXFS6sQqrLCks2vH67GdnDoKJ8gJG52ULTa9cqiyFpPp6FLu28RinuUVLNhxooHdjMPaTxEG68P8xm58OVlQhFeQKN2UEpzjGgHCAA5yqorJTBkk6HoikvNXv2wdJDmJIGgzCkMVPVSsWMgYhHqZqZzD4WMrjpFcTUSHEgVQbf8+X5TCmazX/RsqWwLL0FFGigLgSlZG8FV6q0hhC6SyKZAyyPBou4Fm2Pj1u/XsQEueoatk2FbIDAUSQjGjuUUJxmyUBYdTQMekx8+qKv0KiuYR4bKf2wOE4ipvzseHRIOjX1AOP6k8fEbBCRJRxyQ2h0dGmLtLGOPWZ7dcbPvrY1f7ZdLSJ9bNjYMV+4b6b60+x1jYynfO4hbJagJtgI3jsTy5a3P8xQW1qIdSWaoG9tqrs2LVK+eJU3PrF7xDIHBBG+UFHtYZAU1RxhVWLviJdRpFamDw6ulW5yOm+cW0B3W1ca483KsNZJ+kv62j4Jbnob1/Px6EDuzILCDTMidxGwOh534jFasKehTi8Mc4NoGSoCnerKUBQ2UBrVdCj7Sg6wClUrDrQ3mAXZkdYdvk4NTCY0bSD9ODtKYkj2iG4oNbUth76UH2Oqaa818ubkXAnpFq+i3b4hmrGquNHiJgVB4G8+aVOYc+48APOfhT0ek5SA9IfghZtTxjpQeNHuBOEJA0hAZoSHiHUXn40turI8WepG7cO35r5AoUyhASV7ybT5HIbzuiLQlhsx7+IAicPP9j1E2kNXebr7a+d+vvzDyLBJDwl2sa8Zp5UNL8D+n1n95WaNYxik3DYUXSkBL9PRvG2ltw7EtJo9/2IMPUwECoXyVM4OkwIjo+uDtu4d0uJiVvzADvWVwqARy54mqe2ZVMReRMNBtOSoNCq+JzQ7DSPhHrktfgLYmhcgVgdxq29/cIU/mvAJK2gl3KZfNlroCFTH1AwAeLvSmYSOySMm9koSVQKs1UbZEW2HIWjfn5JAvHipv4MGyQa8TD5PS1S5VQS8eqCOexcZfr//EAtU1NJKCZ5lK71PjF5/0QqWqzh6YSHbwZZScO4OkluoaJJUvjG8O1X2MkSw4w3HQkXC+BHjPx+T+hz7uTdEupy/oCszWQoyAhE+p3O9228Uv68OCrC9UIBRLixjAUJEDvLjbb++9axSbUt0cHo8Fwrd9zw34BeV0Rf5RyKBEUId/vao9enxJH0i6w7O3SgASwfuwOvsa40cvfaokZfrXMswjTXH3D5WxPIEvIaA5VHJoN4+y5Km64zfiPXRkPba8rjxzetb/302fZm1u7gcFS85QlB8GC7Q4WsVvIihEZ+h8dN5cCTZcnv6YtOxNc8REVnBukN3RmIedDL0g2JDsfJF9wzrpmKjFSjfP1b0sIhZkGHJ9yAPjUMjmwwkPb7KJjHgPT2tuSohOj3gdRXfJ9Gna/U1qfL4FqaL5I4wArItosK3Nds7q8lAPz2pkzVp9ykv1xsvNdsiHCecE00lMZLt16vZ9DbVDhQM4S32l8zkbVsK7OkKcZUO8w7ChdO05s+2vDMksSyub1OYiwnFLT+WQjpwnlFS/QdXiO2A7vrgmPfopjUwafymzNZZ+hsK3Az2ZOxsIcA8yqFSlTJ85L8plMvQaP0gkQsHBAiWgmSMhB8I5TtGeHWSiVhWiHksw8OWjmE+KXhQAigD4YIMf/BFgZbXezoN/jgz8XaIK7snAJhIVa2mXJE6CfnbkwpdIC/Ogelbn0AgOKwLREiSyl2QAMhWyWhhxxCck6pDSbwBLRnBvr7LWQMSjooXvCB5FVGgSxhLaTwVxS7dWDFAnOvzEansBz7mAGe8LjtoxXgg5GI8UF3OEOfzaqgkOuHIvATHXGoKNMR4ezZD05QYI+phTT3dABfyKP2TOSQtCLRAno8NgqRK7uhV5h5Pv4uLcC5xRMAL7RLAW0HhRYgQgyoPOcaAky0kAbZP2mgIJADj4EOgFqFfRzT+2g7/sCiC8Reu88AIUAhnoKqT1DTlxY6cd8dCJdEuTaIK5GfB+pYYCvmvwgiDyaMQpeZDf0RJBPohUz29Ch4+Z4E2OhwsBLCXBzA2Jp8IPsddCHzGFohVVOTzJWgMQzqx5yxHPucSE8pg2hTKcQET7sQzdnjgP+jeOg3GAFCtLglXoisOSI7LD7F9W74pJUA9M0IYgImAuwAS7bHxR94oO2xQEONhoVMdsXPOgIfEoxKOeAMl3xhRZglGJY0ygOsE/ggkLHjDuh80vdcI7hChwpmjnc4QLOOYSb4BxGWN+wv8V8izY9Dud78OnDquIG504D5jCB58ZXHHveYgUAjGAXrGXHW4ENOHcdF/qrXfOLK/iH50cg3W2JCUD4O6V6EKaX2pPw3jML3XwSA/c0Q1NtElT55xcGAb/S1WXI8FspQ6wbd/TMzS5853mCA/koc9uVBhL+APCNzOWDxNlC1W6lVXbh6MACVvHIj3zFrpDKrEQcmbpNnMcd9R+dvYjyDITeFnzGgP5IH6Y1rFxQAl8lIMZ01AiRAuIdsAcvM//jaZ9kuZDVax39lDSEYIkoGa405dmWW36W/LvwGVQoPYgQGWoP5zXt0sy0RQH3hlaiCfYDmyEIHEBnIa+dVd8wuZDPlakCbnVIYJtqt5JBdUPRr1QX2we3SqmFCmbuF1bBiObmns7sJQU2bjhMqrZp1LrYR4M7J2m9BQw7rAUiv0pnpgBxMNMLajmP5XyejBbKHBGX+BwS8Hy6jHIVeAa9PfiAhVW8RaDwNyrf9s4WU+rKw7u2klZT3Fe8vumheQD5N33j6WWyd6rHoftA4roEPLnVLueV26ML6WkfgNNAlfG8mJAJDqtyeYB5ABEc3nBmXYwAw+xddI0Koc0EFOoQV4LYgANjrurMvywlPLILrWECXl2ecAjDwgLBfAaG5GpSopAvgopPUYjS4jI8w7hiG1ZzuakbJ1gM9khppTSIEcJ1/0r5RO7DpgZVSPSTyouDvdGlxBo40OPHBh5ZfebEyDrW4JK7IPfajrH44t8rtwnZ1WurJqs98dGF1//0FyJBMTzhrtpW8w1dMcCosYPbtMCFXFDqLrhrSR3sSxRNDl/c7y6kqJUXvb4yExD2nSBfTxNQIhkg+nPbvZny4lsNDnIWEkoCw/Qn3rAxUEKCULeeajX7Ac2oR87haCHK1IZHzC/Ejc55gDTCo03gzbhJaru//fPzFfX6aT7MRTnKE3IiXtM7UlN2Q7xGHZ7JGeyFW7ekqydOEL9Sdzg8XWtQmSScqlxN4Deu9dvOnZTNdy4V+7qEKrHGnK+7PaZpOKDfE2VUFwokD9yqgn/Ljn7M1nah1Xa0f/Jvf11a1XLFzP1pj+2yUNXYeItqI/veNfXn92VdjVQpAiUqNKlSoW0IjrFreYd4VRRfJlWdNWVArSCfcXMkN1bpDGwPLV1raFVDr2CkKA2GT2u5ryUdlgdwy8pvi8kpIuchcfDTS7OHFwYWaiv3H30+/Q1gYHGWQAm6zMgoz8EFKFRWAeViI0T/pbj/fkD5ldvh7v20WOc16QFeZ2B9tnngZ5zOKvwiuj5z+OYJQnN0BAAaIk5Qgpj4CGcKZ+KmKST9gUW9l293mI8II12d6HOfOEoP0eXYoVJgTIGQYgWLJsQWSGZmm1XYhvjA1JR8gkru4DHvbmw324xvWyyqAq4oBkO4bJKSVGuHW0ZOpgEYkBypIe1G+Yd+h+a1PTNsqFBw1moo2JcDeTERLOMkfVxUqcIqrqIPLVRgYSUwTNxSXm1wri1PogzjJzu2+62c19iuITx/xhyrHM+SMJXyMFcbpkMsEeUknMiT0Gn+bOcAjFu/hoKSRGpDYeEQWZzHU0KBYtqC7sd83fWNw18hXxTZz3K6+Ug0lfNiRii7rahlHOxMbr711MKfzGyCRqSPpDQoJhYzqCyJq88yh/1fnF1TVJ42WXkCcuFB/rmlVKrUC0UWhiWHhRTg4iQlhTeGD2qHiL46udkNhxMJnwhR6GCYFwMJqMxFmDQAlaoQH8E6CgMLIAGz3HspIRyGMliIIhdycMlkXy9wDRwbvE1nH7yY3YfcfjCDvw6VOiuoRQPAVQPmLyMafE4uqdQlE01mMBCpxAUfwTYVUCE8QJhwWZ+CRqo6zsK0EZKRALgH9YvDOOZgY1wIW/Ec0xxNk8USki8D7v+mDI4qXpCcnMh4hqVbcZKnPqkJhL4LcVOdEhnBTRZUVKqpCMhvpS4kVdE5lrTZ0Vw2lo00cYZEcjuyTNAqPJtX6R36H1DFNkg0QLgO5hkLW5sxY0DfM1OCSBdp2EdPkyQF1PASKHxegx27bWWh0e63/E5W6KMK5IkBjVXP55j1pP56RPX6Y76QJTkExsPziDi3iCSvcz2gJlfG0OKVDURnj1S2jJqf7cVNtpAXODxMDQTgU1qyHr6y5Njqcdmd72bu6wvro3uJKCVUfiE78Xlo3vGtmslr6TiYGpvDRbWoOIXP2hMoLDryD9/syYGIPLwuhZ17F/q7dyrp7DXNBxJxYKyNZbTcfYNldFmuY/nt9NN5Gv3TSXcAWkJJu7pu3U3dfFPzJvWD5aLpN8ZSfMuaOjIX1lSKw//RM/3y7SmMxMDABdd5D2EJw00nq4YtRBPoKCsKLsCM5RouYf7VRw8886VbYsaY/9iDWNURkC6dXuE92bd8cfXPOU94XPMVElRG+Ttv8AxhSRmJm8XOTd3S1nHcxxBgyzXpG29mc3WibLLijrFP4u9TtHVBzwnBDpIfZ6WNwj2/LDhDI3kRiIC3W4zdReEPjy6rJpiaDy45DUNCuySRYkwo43UdzNz9bDQq5zjys//ZE8voyeebxMBbX08ycXW9qgCJbX2sQAqLDEE/nkiB+0EtLkl4weB4ywgMNRIvCByZxNkhGo0SDb9oxOPKUP2fUFHZae5amjiz+wUzZKRzyOtbfAMLGhNyQoI5kA63EfAiVbjocFVbGwxuSoXrtxJDId41RuI76oB3+xObvX890hyY1J7d6Y2e4wS06CzziuX42FF8p9bvuYJ2Bu/b8HcH5COmduYit15965vD/r5/aVyQN9nzSfMUf906PqU6ChmGgBeTObSNZiCjbcfKOEK2+tyD6sDIIF52gFiscuU1KTdJg2lrgkCuZXUFjMpCRnRXFjgsnBAVgpbP98pOISpz5EtRYcg2Ct8oZJ8w9Q0zjsZ3oO+oGnzYly4ZFR9NJB37NPlnX51KyMn4jB3yV5XIu8WK5qRz5uTNvm46FNgrFsW73Cpy7hf6wDrOQe3cBcy7t3om8jkEplSuCsyO/Wcg4K5JTjynl8e4fmR2t/u5IfAcX5OIyHsetfi40+Npmc1jjlTe0otOINpRaqNzgUBrVFwUlpTpbrDmoLQrsTpEuC4ROSmhcwOf+ZHMNW+tG1/riYNhafbijI38SEos0hju9P8BfH/iW8ffO3cIA90dOJUTm8KHQB6dJ+df7OQ7wy9/ZuMtyD4cLUsUb3fMVUSweb0Cead/waOrpM8g4dgAhcCCioFdAl6kb48aAbCQXv4FYCRsEbKTiVr/auoGXxptxpNb7eRBOS21Epmd0OWxOJXfbMnByGsZS1cB3BceCB/Q/amcNnTIB0P7FP4WZgc20+BHnYGcYTigV9Ip7E5kjNMx35tMjLcP0PEoB7+bqn73dMeCPzy5dWTRJMf8soW6R0qTFphhKy1C8F0wV6a6BthIpv1QaW2v/Ri3kTDzVYI55gEZMsq8d97aTZDKWxqR7J3e2xuXIcGQNLexATUz7lNGL+zsknbAF50E7jEuuLKS4CucOj99n6DciiFQDZkw+h2jjEMXaImDclQ6H04HlSPQ3WoN+9Lk3FTTD0KhouQgkZuERTX4eee1B5kUm6THIYwKfUT7Ic52sUTkon6IKVZjR7GVOtA0VLl1VQV6ZrHhBlfjkdGThEPbslfGv5g1d8d0Gjaj8Z7mGyPPSYBzabQhft1K+YjW8Mgu4T5EUVM1R5esPU6ifVBeMXom6zzFsoinj5tv9Bw25cG/PKT2pz4/vOsE8FFrnKOQVZJ1Zak7GCvzQiIboP6sQvNyftxCsnSM1Ogk5QYXLcUFKyhkBO1qbBdkktbirmk5oPkpky35JBOGvDF/ZUOvIAq+DLLER6/WVScku/XBvG3u6UGD44DMEqEqP7qUpjr7vRfTBvRcaAqcAAItICux0BJoRnwWFqAvQtzHUaNeRHM5Mw6Zu5++fWvv93+/eO/2/Xrr4zXZQZvsS5tPXLqPZ8xntlF4cGrye9PamTK2f/nxVL2pWTs2SzWVHTVUo76yBhaZod1FIPBqbTBw9eHGEhT+hjESeRo1ewol+t5QOxb0pmWsF33Gas+QvGeYbithMhNfbGxkcGeFXr+L3Uhi670f3j0787ikZwjVHte7gNKbk6JRIMEHNFSOkQtTQ2NdhgqC0ieVg5nnCHiN9NMW5GLNWlWnhMerLgNhLnXWuiPgy4Y0Mr6zw3u7n7plRJf2v/DYddt2sGe7i581cgug/JXI0bsP5XoHJae2IfrtMRtg43xFvZbl0zsHK2bU7MC3flLmyR2zAnk4nN6B6FP+uBLGqpAtJ9v6qe2MGRf7IY5bTdXnPo4Uzi5DxiWLqOupSvWhDfRVTk036fV5M4DQU6C650pCOoel1Iwae5M8JjqHBZnoIAKrBuCFgBy/rEwrHgo9k6bx0gL2NcWhKZAP3edx5Ep92hmkcX75wpdWyu/3oaCkbLgZBy3DtFfG3BZimhxXHpVZQrba3XjKudXvHr70Ct3XhMvYpDQFlCIz19/N3JojExTCUHC+3enZMM6t8CtHF06zi+lRutMtw7n4gPwV4OwMOJ5nkzQ6LPHZDJoQeqOO55w9sMiU4iMGppQ/qtE5hwfPQTBEXAQAlpvA90/yqp5sCyhUGHGBEo295rdb7jb0vMaauz4AwoJ25YahvGa6OPldB2d6On2+W+6hhp7uqJ+6hYN5R9BFXc5j9Rr8b+KaaoUCN6S4ULXcxyg36f+BpBPDneQxOCvpTnMjO2G3wWIici0V1xcvMp0qlP0nfrsxCbh6XTMo5ReHA93vdYdu0OtvhOHk95KhKSKtk58SAqoNm189Bv9FFtJ7xWap3ynYEzVVUSnMZ8cVn3ij19SZWXCKuAD63CvTIEPRLkgB+mQIV3x4p29J+YFtv+goV24rS8dDnSE0YXePrfXMAgo1Du/UrcOkUUCoBmL20epmN1YCXJd2dJBdHi3/wfS77qrKBXa/By+gi7yKWMOw27MoFv6slmk+S3yfuQLPnYKby9HwswjemDelpnmiCTlGaAPswmAk24EiEE/cSyuPRj1Z3/VJsU5cH/QfNZigSQ7k65cVxYtW9JX0G2ElzKsM77D6zLjA1cQdaFlORFGCRnK88RkHyHJTsbu6K7JJVef1jYFJQ1iALw+LtgZGXww0+mFAqWpBtUeqOylEQOnikUXrslmLmm8Fx8ZiqWsVJVtU5derDL2oRBCTElxoFu8bVVVQGgQkG0FJXgvK2S9ATunixOrS2A5+9LP0bIOM1RwclAN6Uh48ItO+T3v48hgowN8+A/vZYa4etYdPq10g8RYdiI+U5HVRiGE+geRQh52jhJEfcDoy2xLpW+z/AJ1a6uhaQ/bPZQfO3ZNgUGrjT2qEq8kHD/zgy6Pzdjajtrs83432u1TYkzI5BhKVQwOPp4R6u/zHWH1iSA3ZKv45jsYVpTOOSlvJfr9795yIgTfT2QQgx4vM25GtR9Z0Uhi1w/el5snB4Z3TP45/GBovoP/xvv51N9pj94R13QowF9BY1YoYJsAvyB6kzkjSFw2pgogXUCSPLkdH1QdEhJe6wCKk2Wp1VESr/2TPFO8uP9dy0X40esBK4uT8c1PiX/tVIyQ/gIQUbdKR2nUpxFBUbMr0n5B9eannIUTsD93RZCa0N9BSIqCJICDxgI4GAe37AiOaKBH4JO77LOkTCuIxQ9ZXYXE/ZMkw5KlQ6ZP0caEmw4vyTRGCJoTRL0QhsCELgoeH775Z3y+BGnbySiba3fE7ssU1aky2kqedFrUtjA1r8uw3eHkFmcEOnqA+NTY0wVSfYcy6lvrGFyRK15SwMeyGUjVX+0pyTLjshA2bZew1d7dbBxIZ/aOZW1MMfnNu9cExwPtZ/9sdO6fMTae0PWOuTIeCtLoP1+2CrvdZrC5AYIT/VovGSHbrhalcIKHJfqFakinu77qNT0opiH/WPk/RONsxyLSC7edFm8zTwqWDI3kFtARjgCOBz+D2d4AbA830RHGUnT2Tp/GpWz9SPolVdOGfJ7rGauvQIsMKVmpuMV53prKkLgCFU7Z2Y7qDBUgcZ5V8EfH4J2SlNpZgioxMRRVrBVBJPZLiyqiFbB4FTEuMHwIrkzTNmrCfi5vQ13XRYMUNROAQcixnS+YaSe5/XGl9go/gNGmHHBtkJGCIHnJ7+4G52NgUMFtp2DHopMnS2qT4EIk2SouEVHGnMvOzpQF9/YJjVHOVaPYiTpwhxHNZOQppShUTZwuFobqTunEgatGxX9eto0B8IKVlbZlG2XjJ1et9mLqRV4VeD8dWKgXubJqAgTB2VlYrKLRe3/s3Z6ymu8k69KmGVfjVl5YSUXYLtX3q36WGU0+IRT4RH50/2kXZ7dL8KPFHXgYK9hBzeblNHNcDCsEcROM31nHx8DnKHaPa2GBJsk8og8U3vXAttlJyb0Czn+gLQ0Br06DvFg68jGrzCj53Dztxf8lHWKVchDx2Xv4ams5KsE0sSNOJjmr1A23RaOv6xEX+Ut8m+VmaGP8B5qFpUOrLP/QRfN+4uLODgEG9GzTIfjABrEwR8DZk46KsLHvdOQC1YguYmNQQnEOEDCdEbJpm4oYF6vHOAFlUSdBgpMAigtWwF5MNP26CG9iAl15e2oNDbWZcqwCROAschf86OwwhrBt3riQCkjakzjEtw3UcixDZ0H+iHmSHDcItVYZejwaQ3brx2L2rOfSKbrUJC+19ZCNUq6hhl3/8daWh2JncR9je3aaxlIRM1LE/TJMeOdZxcH2Dvysb1U7DV6ayW+r2UNckrhlBGSqtVOZ3z6he4yMD1aguuiDYiOFIOUD1azNeo3FGsRXsHoIPKQWmrdwjyGSL5kc11Xe42whNJ1jJCJBvnKMbX8W59JfnhF8EW+HtB5yXsmgRVAXL/WMzuHvI7k2uDL0ZHUZ2f+i/GPeCU+kTdzvpYRdiOGD4i3kvVFByi5agKAO8RWRqdivM9NVQGeZzZ3RPI+AsPgxnN18rLUQwqonUeoqM52m8wEqobY4njlc8D4UhtvHuMY5GmEzJchH6ZD23+36gRUpmtzLKhAeqwbIG/Dwt2gM194MDoq7+egTSBjpHtdrqBFnfDYvCttabpejzfGUu1ODJvHpeW2og447RQB1R4uPNkKXiXwOSsA2FGFoKTmMGxqUwAoMc+ep1DaFJyFKNf/oqGK3+q3Ka+Bx1oufOi6eagjG/aeItd4wm2hwWzZ1PNt4B4lb5hv4TldUkHC3SzYkDhMNkosSmqOxZLN7p2hpynujM/KocULl3UdeIzA/8K0DFPmP47uCzjiFUff3GOUZLqw3cbKFx8F0rAaPhH5bvjFwZspZ5HtZ2m/KHU6qKGah+bQ0FVtlWPjorSojQNP3962HjSz2lgL830gptTjyUYEK7B32zvfmJ9XfWzixx9Z9PLhy90T8PwW1ZJWTsPfeu0pCFej1ZP76BLQ5NlLXvxl66zqw2DdkGs+vUMyYVb3/f1OPhYZ7vlcLj5o3h7gk9oFGCBKW2OK7NxlkljBkZ3fWtE31XmLb8G64Hcr5nbMV6iSMHhVlAviJito7Vu9Q2QzpILGR122YFpsRpNYvqPLPsO7NpexIZU9O/Zeq9f3p+DoV0BiZ6/zZzR5e15fSZz1dC49A7R4aWzlBi9C0RyGLTatFUDaeCGRe1RliYjKKadZCFlGy2cFOpQ6phWm99T7xyqpF7HCZU+FakmdQ236hQtqXatx19ezd26PvWj1DRV7A9M1bH72Wem7VDqt09OdDlMJvmX+35v1yLrblxiVka4X7g9H0Pycmbx0DNFl+d9Fdciy/E2Q8gOP5hOLFOSt+Q/7Zg+z6inyaCfM4nJfZsLCwUBeYZ68xYzqyjqF9h9WR4PzBVLO9tJM0PBnlCbpqTvXODc/K8rYrVMuX4T53Il/O5Eqt0WEGZlXIx//DnDi29eK3f7iCczjb0Rc+/J8N6RLskYSeptsPyP83RIKI4u0olYxmRjO5qVjX0sljFvKNO/yN4BFV7R+Kl1a4dBfnwSjK6WfzDNvn9IJQzTh/P7wwLh/2gcBCl10bmA7r8Vr7u+jTKl8TLch7v1ERb6ow978qO+Vd+SLZa7vNt3TX4FwNK5yaq0LRIziH6NCDc9aYyFsIfHNI77/UI9c5pwTVU3R4MCUl8hUrTBP+JfCWVOrudrvKbcHAlcPAc1NimBW6Sx+ZCct6tI7hO84nmO3qoXLMj4x6JtDMSrMXXDvvnbF0P6K2T0brWD84L0O+jYG6/XGD6/bzNAvlWezrQPu+w+1NtwI2Z3u6WG3nTlNvH6x8oXk1tHhXcj8VKI7meD9sZofpk6+3XctLNE/BIBN8vPOYFVkguvVvt/RZso/Jgj1ONVVE/5PbJPVPaPJKnZbqX++X1/qJKdvuaki+BPzlCiOw0oVwoOXlSNdk52iWg4OVYBUp50afd9o2J/WjOPeKI+Yb9KH3s+NmlOnxGBn8YCVlYug0HAk6yxTR35kJitqgyNdJ1a0jyqtIhnRcxEdORRCxBGExKvRNhzPAthDA49PZNVrWgTJ9C9OpW4h87DaO6LgfCiPluPn7DUWwDe3bsZZ96FV1xrxpk6uznw81dm6ltSdwLj3jQbbYGDvcjg25WGtpBtym1zZYLhZX6lb1IY/pOpxmjRI/iuBzNAePoOfCtp1I/1mpbPUfsSaNPOXPGukY7KRNB3tATEeYYu/K/7HRlTt9qi+wfRRpvqEHkba/cjf/xD/b6QsPZIlFDl0IS937FNUMgRuW0nzbrT20TZQkRf40e4ouB2fDX1QwK5fpgmCMU/gUKdR4HB892tWtz1F2mVDWvzArr33j/gRIDvn7GDbg6r+BRbLY34DMTakBd0lLnc8WgncHom7anBFz2S+oiP/Eb/eHn4/mwEXh+Ha+DiJCxqieeGY+Yq4DSX0Wo5ve36+2fhShIvSslfO0RSuNI0num/x8v/Y8MLG+g9b3wLAxfGEDytbMMjGo1FvS85fEFyJCgbOJa3IF4BXNg9NtN/eW2AEPTzJj9Ex/hwEewPsJaiJH9gX3MpXzU7HpEgDaYMudpWeioHogRkDRAlyrDGZkjGnpEsA6wMYcMesHLZxWFKavyn/hnb+Q1rgTA16svbF1tZuDI/EU728OCm0lLc0dfo1+y2rI7OoIs92kl3EUHHsrJfVeXefnULMf9T85uE42V5qxH7IIK0tppZC1HMnyS8HKVKf4khppDwFBM9DfHYF+R95KzO8WtvTQw0taIqunQJx08Ce5NpZ7FqyX7G36z0cSE4TecQls2WQMjub/gez3wWX0ksPlQz/cX83wI2vXCY0zcjXpQx+6GYtzZ10jQB+YmKvc/twqYadolPqm5yZAxk+aBN3d9zlW5DNwBrpqF58ZdtuMBtRRRVq+78RIpm5AmZBMF9K841Bm84vRDoVQhjibCY1OxzQtDQCMvVV2kKbaYy4IHBRbHiIK5bA/wE1KAFnmGizrEJD66UOZKLmSBx7tik8axnHcLIlGX7GutCLwpcf45hsyXVkZxENEs0UyNqkaj3pUZ44DWCUgkCjAnuN1WnZQIkoRPpP85LAyZEhoJacj1vhjrKQb528UCGgBwi2uPCoOrQnBrJYYP+gE6vUtqEjlJcjI9gfbc6Hs00ughGuAlyyAv9VqO/B3eUPkpXlTY6d5JZm9j1ukv/lmj5d46e0jT6HsEdbrcPCLni1rrRC+QlhHtKH12RA/M1OtjY2n9lwluxu7GCUnHtaZkSbO9vSad80htGo1SzRrVjLlB9NOUHtYZexEzGmBv+yusVGX7ZSLAxH/LID9xcjBH7ITvg/UdXjU4fkk1nIpxT08nY3wv5K5ogtevTzQIeKGvQbiERgQzryhaYvXMx5oRyvvHZJbU0WgZqqgGM4dPKC9DYhdMj5a+sNQsJ6PkaUuy0O9gpvlAwGaMO67RudbxlYDSCDd/j80XB547wumL2kxN8y2wuaz9viGvR3mF/e6jy03/Uc2u//HgYL6l+fv+rsFqdy+1pWvyO1VR3/Dd+4mLXTAfuDSgmUg0tXL8AzogSscm6yu4h9ASi0h8a/OwQOFRLnuHxY8ewuscx7fe2ezDeuOxJx4/vghwltlh/vA+urLyydpVkfb9S6ZZK9D6jE2QRGIbsvUh2yalfRzvd+0qRsyIt4xkqjYPOs2UumcIU1X3iOquYfA07l9GmmOj+z4/IaFXcU3IBU3LxKSpyfH7rkmL74Qh4P9Bmz1k5Gb8NYktxWL3whT06VhEgjq44GUifl+fHzkQC+Oqg6Ubh5JwR44XfvSmxTf9ZdWkrGp28z9R6fugAScr3XooE9HO1+UDsCT12xAyM5O4yrc7zKKJKL4Qwv1qn9twdT05SsZzvHEXkcOL9heD/dt0LZTapgjw/6kbPNKYZiIZJDSN9R3UMJfSERLISq2krTt39IIC9i8KUrRAkSLKWxAiwf7Ozn7sKijLVDeNnXmBfdfxHUn+ajfM/gmZUBU9hxNVmITt2tYRTqxqMA7d30WDakNawbHn80FHEbAz+Zmgtw8Zfo47Wg6vg46u4taH7hANQzJHVxZI4UX7ssKHZ090iB1r/Q9SsN6yIPW4w3No0XyDhGUtSDQHaUSDPEUuufud+/wRK5ADn5QkH8zN53IHZ4/tTq30XYHeUVi7wEKdCQ7vqHdevMYR0TBWisXsLPrSQK7nqgWuE2tSjuahtR6Q+FY8DN59LEdht9MvdOjYe7G/y+9BeZTOiA9rd3qvGvV+e7hl5Dlxn7mOxfE04TV2pb+rWH2MsbN5x/FcyffZil7HWcIb/YI5fQ5vjAvOxTKdAzsBME/LXLAZfwHL7KF8r5yVGGva3hdmx6ujIy5gzykoVwX07JOS7mZH529VU6kUIGxW7B/EsT+Pn130fVIbuTuGwrDIheAejYzqW7JRO6OmYhPgsFRYetghcjegMIqcnWimGPg+BswphNpWXn/HgAeCtr4vgWScqP84WIHcCd7rKO/F7pXs5ogr9QNpT/lj8M9gs3zLrDB2apK1w4xecOjZGh2YN3wNjWjfJ/Mqppo360mpUmf99TQj+gEPY2kZn0xB7N6T8czuX5DbiRlkOLZ6MGnC+cSW1bNMWJ1Ci97b3twX1F5IBEnZO/zgU0R5snXm5uRe5SC6AZFQxeH46EKHXUjOo7NRB31htgQq6JSywLiIW5sDh5byJ2PC4gvIh76j0kayoRTIexfePqPvRs+qeQh56wZZbuGu3TxLCofiIaP350QCASA12OF70YFLL4DLo/mnd9S72MPYTPA8RirkXl0puko8KIhrtRgK+6kmgbHt2XoN0asbJfHM513zjtjUtPntfr8LjuxOpKAEa9cdpRpjWZrLUX1xhou3i6y9SvRzOAXAaR1NBFw11D25hnqUFYDjJLCVRtwVzhdQWOoZqkqXemVAFo7LONtM1rSDhNRkFUcqPUMJMJaMtkQ6yAZRrfLOZLJT29DzFRy1XCtVk35s8caB6MOo0AtvFwepWTzC87KNiMKFACVe2S9T4aOQxVO8Wy3WM6A8FpiJbzUWHG+ks0BRXcuyFlqpf+1eJrLz4AZ08C+LP/XSDJQTvagRBb+4r8Sfv0O2Wsrwm/f4++afnjHkmTezIX3C8pbT3flY4/8Hln8SNfJqiS64KBa6hZXeo2zWZnN7As4K1AadQKO089nx8ll7cmqNEHD3NENPj1cN/MpSEVn0pBr351UR4jGJlnqhNxf363HlXIK9PsY25DJIfaLUbh39h2EwhPRdsOtTEAquAgZ/twdlwIrWsMK2BnVPg7Z4BvDkfz7Izo7E1xWXDVUG5r+xSvTZhq+yDBZ+F/Ibho6NqsY+j6ADast4yWQ22ou94GDMoPnTw6R26ENaFDX5dgNsYu0hjwqzUXjMoU9cmVI/ZxzOwDe4cGYtxPfPSDxjS+pElND33l1+t7qXwD/OHi2a0Nc0+fD4JG+hcMrdm+fes/qEbp1saWEqpSnFDJYVgCJpRvv462fAJ6BvNjAyjbTJqh7PKR51g9+Fy47CpqZcX9RCDghj0WF2XNTAiSnIeJ50A9rBckupN1NL7ZxNZXYyFzX7vCti8Bp8fDRihc33cOeRthX6IsMPWkO3Y40X1xt2f/hr/Ycg3WNl4yh5yMOhkyZ3879dxHVdNrCAclMyhdp7IvIBPsctbGDQdt/Afg/D/6X6LCTGFirw3JPxw7YoVaV//SGmc4lXxTL53kRrlYr6TldXNs4Muxkf5r8tw2UidAYcmNSvtVgmMvj7z71QSmBfRk5L4houM8qAuu9T+4PgwZEKFngp9qeifxW1zYPad3xgn5GhL8BTkkknF/zXo324sDrDCgoji1LB015ft1dN+DGVRreT64g0e16r5DX1Zh4xjzN/1eN15Zqjb7XOHWIVTkkcZ/GSJWUhnBEm7yfj7OnKV7mSKfuAHTfvHSvtse5xneLvG0syIr5G82geHcLL34rEbuXMQTloGGn+K0WFtoxoxLMJOegl7d7c/efzL4wIa5xtd8SvQu5K7T+dpudaogLTrydTekC/E65VzBNObVbZzk2FsG3zn4BCUyNVJKruN/t3lI9xdYvIX4Ob8suulsnmulxq5Xha0G//rXuxtjnptp6uQbXPnNHG4HpDop/hIjuPYD8t/7xr7OlrTEEHfdeNVDnIUY/SAuktWmSpOYBZk79ns0KNMaF3cXPG/1fdGgWniEymgA0vKA0NrgIyUb4ASmhRYhdbyfIFuP9eryHWqdHBYnuMlu8oXBXPv71CyPoY56S+eIzZpYhnk6fUycpE5CiVZc7XRqnMiRs4XzlN5fd6VWA3ZUiSsXblp5Hi9iOrHHBRF4UEc3/wVUh7qUOrgfGVbhnH9pYb0NL1poajUXuv2VIRT6kiFx6c0vDyjW39PwD3zBBYbGaeL2XcEkZBRSKFttg1tjaywoCFuu+mtz1y9PlP3/ry/Xe/fufzF7+aLPqxZelLBYKL2wUsHYIOIV1dLq4cr76WHrY5PGCmqY3Ty0fsP4AyYEW4mFomR/XyMWAKvs3qC3yfcFvStbMW5UsTRf+oXAmv5LyxmeZJLy0LLfBBxrtFDb/lUaoGDl2hH7SCh6zLS2S1Wlhq+cONx3aUM+qGTp6vtUl8bPi6buvs1sA2mYRM2jImwpbVLcenqdOb/Vtg0UoebluI4MmAj4ntMW0rtL0wcCYt/qKZYTWj2UtsNYtzncVo19rzM6/I49fzQZLEgooyn35fJy7H/sP4dhLT0+mmdPB8C7Q3tq6vJ9vX7ozf5t/bb6gz9qs7amf/761+94julo2enEdauCiJ+KkkSwqemLPe8+XUfwqwZUaeHs7L8Jr0m0eylF6SH1T/K/rPCJT+1cZ3S2ZNX1tD7plpNFmkLHJ5k7cemkuThg6nsHv/bKePefOc/wPT85u0N3RmbijMe6R8q1Yo06mHxMTmbJw0b8rU/c4X6Kzhxkhw/4zHTeqUZI1rO9jdf+zlk/T1X/iPtV9ynaXuukbdLvUFQsRsBJtuPogtHl9I6+ydmQ/o9Qpj7WvXU2rT4NGmym1UiRoN95lNR+bdSfHo+jay9zqZMp4nr/7y/RnPf/u1pNaJqtU589jF37znX+ul7kM/XXoqUsde1W9uxRbHzCk+puaksdqddiNj9PgF1ulMk4E0SsgtCNn6wrvAbjo61KzUTvDAaP9NvWS9SFSPutLx/5kFkL9lrBFDH5lfVypdx+Ht1d8hrHhuq1c810lMLKKgl7qsWeY6o0x0Q714qv3mPk0oPz558nF0Y9z0pqe2jkz1DGcLCVSt/M03grERBBZD8DdFXqnbNTAfCqrISO0Xgq4AMuZfPZMZlwGOhAQD8P+DPyMzEaDw4XTVPQUoI2UNvxfZlzy92i1qOWF68MgS5WnjbegSQonDY6OOn14OMq/A628XHKpEcd0WtFsDRUgi24dnaoP2FJiznBoKDE5xVJ9l2JQuhpJzbCZRCApghOzUtwNTsxBe81fXLkA//oURohCD+DqbcIzAtmwImPdAHyI0Yh87LG1hEMgE+n42wAVwDB5MNirLnjEG4Rs9R41xlIswAaBYrWOzUXhC27SUVZQS+rRH+PjzgSTa9zUfigSsrSoiV1TwvXMgROTyZdwWdd3EekJlM9oWVSxUvijTjznXmHlkbLuZilC9GHgN3mFH6rqcEnS7YzId+yTZiD5rkKBBKaZ9Ov9GkPhKScN4Y0MJVA0DTHr70tiWftAv/CO3JZr9dwSVtSfsZM1X3HH8S8oNz6bsu7x9WzUH7TkfEsKswnNJq5g/we6G9jq9El40Ysyrx9aYfRP6RctywRL7yaPK7X3vmGy9mj+nwwnuG+2dtbiXVfPtwz4BWqBweTkj4W1Jn9GEwFbWVi0l0aoeXw9aPspU8p0fqlUS7u4xsUaamjEZoLV1piJnPYPjWytcrYpWwGxk/DVWNTC75GT7PYD2KfQ732slSPDvt+LxTZN6tfbnpr78zGM73L/R2G8kx2+BnynwTseOHr14m7X1RjjPOyoTNGOKYxzqeqIVAFu2ftwXApM04FF5FCj56Z2L4XqTckV2OWRN1qDov4Sn34l5Lb9HSKOSW9Kjli02NEPRlBkybXrAQ+OsmzsZWAU1pWHk2wzSqf2Eg86UGhQPUtlOkoMcjnKUFx9o7XhsNjzfuKkdkNge2ZkB2SsemGwWKMSCGnGAE2ujaPY5tkZPH1idpchQIWSSRJUmBZxQSwNkZKAtJHCD0wI8DQ7zpUm/wBZNSbZ7Iu4LOgi20/qECvNvE3liZXLn6EJKz1G44KqJ3FUkRyguoNmpTfn+B40/5zGw/6JEIiEjWRQWpuk+D8Sq/QNMKn7aigKkUmlh8ciZscZdMtrMJsZaXmpCzX8SxNDAa4uGjuI+3Py8af7Y+htg3mKhLR3vaan/wHdv5f/9YX/Xxa89P8kbVgMl5iO2YbUpfjuCrFAqcc2p2/3z6igaTV7tmhw8agTTqZ0qh1QiLbpyfGOIS2FQlGsvOn+qL8dYPf2a3mHb6XmFhW1YID7ZeuWWe1MAeNm7nrrxljI8TTsDYO698LVdIXWF6Sux5q8x+gs1fruvcF1t8Hpb92mwfC/oJSsrJVJBoQXfVtRFhCxkwkAify4TazVRwrl5g4D7osO0SFYU+K2XUQ7hyX8zjQisA24kZIp9Jo1TzvSpweqTsJUy0sqxoT7BCeki2RVBo4QbVuXw+c1rBLx+5elZSkL9CCopjchkuFdtgTfpmhlkqi7B9drdumJzSHBrsJ6Hhpi4GRz3cWLJtG0Bu65pA4JdnjcQxq/vgwlfubkbUO8zCBIykfoVRrBVDySAu4PZkwtG2+7ftaxutUVR08x9taseKRG6uz3qL7XkQ6mjNU71X4Sa2+7o8ZoKPFxvhq1AqrMNq0ebwufWxwy7NVaR9jHIAHlChONqMVGTGlWMgq/86DF+UMXo/nVV0Af6RIfQEzpUeEd3eUTD0taIn6fqPd1snda6bdzFq++1pLKZcHYowW80kON2j4HHyhsxAFscA5YGVWCwW0HhknGykoPoWz+ihq+Xs+qPuZ5GBK8WlTxdsM5MAtu5Cnr7Ps9vW/6j9BA2Ib8nSl9TEXICBKB3PAAt4rN3UwrlYNaiJA5ftJvJKUsbhtMwhA+f+KlrC/qOMPhLjuANnBNboWTvvJd/s/1+zJP0R+qGZd0MQ9hN3cD9Z9Vy/hSmDfQlhrT++dy5s88FAO5gtodfUU4uBvjeP7XwSQmWr1K4DhvigUp7NYXy+aDn61uIoHxGGVcPqWITXKFZrYfCNidjtUF9Qbr4JaRLRl0iwMxEy4bVUTDHmTuYo03yn6BRQkm2M0lYYk1VWL8NiKR9A+qdxvGV0TDR+qY1Fl2scNpRFamPsQwRcIORrmoi1QpouxL76BAZbcmA3bYajDmwqK4fiVypDcNfTN7T6irWRlbbvStQmYq7bW6LASy/l8xq4jNVWLYlNIG3El49I+DQ5VuArj2YmGdbCLoi8AcudRb6z9RDP4Ju1qX1noF+EBQRiFMyPV2dOK5iwyNuoLAAmIRIK+SXoGMBgfNSzEazyr3g2MzoynQ6G7hLpGXfH8opdOyQUG15gvw+RyM52cb4ysRarwvWmRIGAfjKRtmWRAZdRg6ouNOskKCyjzCtUkjVaPJgQbYxjvGx0Vqu++n1h4ALL5f0pdbETdChbGUJ+1mnB8Z+OBEZ/ZfjVAB+l8Yvd/Krx1K4I6ZuGmm3MxSKp14Xp95oHttqT2Z8N5lWR0KNaLZIc0Ff/xq91M7tTGYcHQ7f5uM/aXXhY75uXTKHJqxDCtwRe1BcO8Ph95nrTBulrYmcp7CRwi0OwKtWtvlsfnGrcwM4Mba7VNv+j5NTWaJaIPsA1EOwWfqtox2hdemDRVy2dXCtka6KaRjS2EPtDaI6WNcITo/umQ6V2AeuvHX5VSmw3s0JbffDjWQWTFNHAbOc4EOzv/krp7aHVvonQIeQxPrGV46GNghpk42ZwRdKMMzx478vf4Q93JwJ7QG0bfgsHSl9UosG9aik9lkeKI3ROoD2L43eoOb1YLOzECFbcq3H0vBmiotXka9eqxLXSYdHwZFPQ9+dz4GoIITGqfPGa9ePnPlQNOV0Stp38RpWo+zvgzeKWoztAJ2kLVZRJYO1vu2AbJPUTTeRDcOm6LQq5nPGvOvRYvSG0uO1L/jR93CedtqVz2r+mPr/JwRafjf7+tMsDXav6ZqeLVB2go22CeDwuCA52WDSDTVrcIDVOY+dsSIKyhrpNusM+gb/W4VmfKeepO9bbViXvTq1U7A5xhdSHQ0PiL2shk5y5UukbkHayp4V/anj+R6D8QzpUVscOFjeU7hnpzJJd5j1px7/j6FKb5DWqIstyAhqTtjuhzgKD1yAKnLZgD5Z+h0ggQCZk/+tAvkigdUoK/kx3CAXWHirfLwE98grwzQufpaxPWLPi641+K4X3uKCf2Fskly+A7hy0fG7aj8Xf228SN+55D78/Sarco2K4gAGbOyXdJA+XHO4uZGpCY2xPXyUsPfQW2+eP3yrPRpb6DJdKtqFEdt8AQ+Pwkl7MECwNrJP/U5dWCSo4odz7hj2bk5nbJ9991gpCWvMrerE7jkMwotrMtGaeKZ2n+eEV+yz5s3p6DBgbO+07jSOVDKodLYSrkETJE7F/7Jdu9KhgkaUkw0mQ9Vm1cFzMJAJzYiPjzfGjtGnLD+gyezzt0hNGc8czfHvUzk95lVOnH6axveJoO5ytViwFDcwqlHvFeapLLf8YR4u/ois1HTBUJ2NU4a3aXMsm1zsUtqam12IkTJd29r9I8KuX/J2NoMZjzW2Y/BctdMwVkzc345KVDVjrd9akxLyDrD9EJ1faFFrnE9xbmfzfuoqY6hktB5ZLPaRscrefr2uX9fULIxz/3NioOGClUAFJT3TXbf4kWRJ+TcYzdc5i2i8quGIdmlBytQx9OFtFihrnV619JjVk7TYMi/aDfOs3TbOWGe7vzBslY53umX6vQeh2XaoOAzG/bC78s1uSpaBPZltpdt95Nzne1KKMkztq4F/a3F9od18oYovj3zJ0L1njyL50DUZpwf1ZlFN4T/LOz3lt/r+1e965rVdjv1zE68TSd2rC7HVpD6vmWiUryvHkfusc01Q+8z/beYMVw7Y/9czCCVTar75pVECqBh8xY0Tuv/zT+9I651pb4kfxZ46y7Rk93vRae2pnWBxr37FUVnFujR2/mlybOX8dOq96rRrH/AIH8zlxncnQGjq/IxnJbX/paC2bcEYBP625flxi0ofOZscHnPIZ7YQeE5fegxHXDIfhFBIb6fjO7DLRRvChS81Iw+OwENJ+MsT3Xv3rCCDH0IbgzOjdZnuBjdSK9dANDVE/KDH6OsykFJOIAUqcAy06pGCspZZG8XZI0VpSUk+o8Zld67yCU8Tch3NIEHhIhaGzDiPtlUNz6IVnjec9NfK716EK/sBbWJHmgDhCYkT7RPAf6lo31HUdpzk+HP1mRn1i9iz4awHKMrDTk2Mf8W58ECn2mv+Qdtyk+PP1c8+TPiN9eu7EtmiTTfZ4Qp5/j65r8PJnfGVV83dpCBZS9hsvftRcWS70OprDYpqI3qKI2kLBGRL8SoA3qpJarHKBwxm/72cQ5iCLJQIKXrx10ozb94JVOpPgXE/YmFInA1uWKsxykqfXZloHzU+MHe7EI/ZnNCLJ7YsEY9DTZQPKqipftGMdfU/sxzzJR8ohL9J55D1/RrBo0poWYkRkahCGS8F8AGrPQ9KhO+yzxG1OMU/FeisDSryozZckeo04Ui/UhxJS2CELpUeVWsE2c3KLPk1dg0n8jfq2g1T+Qi9FYdgRLS9bVvSp3aNaCA2n5e+gCeiqOJ254NAkAQh/RpCYTZGTbpRFHxNVN43Xcl0ejDAFlMTLafCtJJEbyI7mzF9oxpOnR3H15mmkdfgT1wtcQxRMQKVjMuUzfXUb5ukFsQaCKgdurqFsFJ6X1aLTqFClsGWKkzHqgyP61gz+307quwF07wfaXd0tGPf9gGgefKC+/qy8ftIwiJiZ5cLXXjwmLIN+pkX+AWaOFv6l6qG1xC8wNGhMdslIrKLntMd4VcSf3nwWJ7i+SPFh1Xffjto9t9Flr4lu0qdC7vsm+wZ5h2Fkeh+mKp+ETBmlrQ2jPaREQdV2MoEc/x+ZZXoJb/H2Vj0PatkL7S7hqiBdzcOk1AwRzJC9qKki9dARNaQ8CJY+DM56ba9upiRMVeGl46SLNZcYrJPvRZ8h9wPkePOYz0KvPHMdOfCq4ZY6z72KxJ9OM8B1VOdj9ip8ZLlzuiPd+VkIw7pb+lJpYaNJixxVJr/hxP7qW2QuEmUZYSA5VpXcoK7SjZn8jrInT0ldcxCSwmOfGMyH8yvBWjIEHNscSlrzCD5AcwY09Mu/1PEaz4z4CRucwvwppI+eFsJWkPCTDUbnhc6hqJhr9sLpmDzmzzSCmCyK1lmgSmeOlkkwcc4YLXLnODyh7x6BlkEpXxLo8DXcZV6cYrzC5LoWVwyiT/sqRe+QCzkQURjNidS4M03MMaPd9bcDfOTOu1vThGH42suBD/CRxRpqrbe3f6iISVEu5JUb3yGWsEHeyUdu5JbOzMN+IRyPhlvdvv1p5xi47jvgBAwhytr6wgZLANd2kovyKRLDWwJvPog2d9sv7IxK275fKOoUnNx/Hx0uGewjr3ImkpHbCedi4rFDFfW/u7aBFe7WwMMKWFuh6vb/HzKlebzwbOb8P2W6lEqh2GpGUBZLD8DvDR4XrKbkGQUqRF3GB9p/Lw0GMKHjV/MITsWlb3u4vhXU2kWX1L3dztHMsdCSgIsiwBXV3klzpWNbuksOS+P2TpWkAoAJ29bKfSNv4AuzvCw2WqW1+q+fPpaxVQhDW+TFcce/4r7/swhMyCZ4ltaA2MyRqcFx46y9nWyBTLr43ndc0E6WBdrUlSXjpuqLY+N08Y/PNED2HqCSa30fUQdURz41OThYZ5G2drH+2RKY6Qtuaw2QdQScFxP0rV4dMWdEKBK4Ivv1n+vU7iIDdUosGH7LtHEHKWVUJuNiLnpa2CsDUmMscpr6gpjXUK6/HZA3SesSUXJMfoG8jqo7ezcCz9sp4+YJ86mZIFO8zkY+ghtoCMjZ0rgAKNv2nJWiDTmQnUw5oUJ1hJJzDl8BFPKOMpGkv9qcMFcTf9fSxoswMycynXoG+Uj/WNhjPI1hmBaK9U5pEm92MBzCuUFSCmiYwbZG/VYaa8mEZRtfErWIzRz1GTn68stbW98QP1dvNtQedlcj4wczJgz/ba4AqXkE8Bnopk7TEmZNvbvZmEC45FFuO3LxBFTmDDXkBE5WRUjtlM5Y5c3Klyg7t7xqJhagdsBRTaxF/gwgUBCbHjR4f2micoAdvzQxYtVn7dAocjdjBWeLSkVIpEajfbb1mZeTYHLj0ltqRH9yhM+Ix02OAJZFQTTKRa8aos+GeuSi5sGT4Ra3PSuDmlhtfdCX/ZuFfd6UOMFAJ/S+4sMyKE1DWKUTFowviQWDcyRo1UEMURUiIPx2zR8pEMG9gcyeuFiByX86i7JQmIjBmWOcN7CTsEddk1y27xA7ZZ91nmi3QQKgyTmTYUSw/oCXdwYv0apDXUSNqT8ptK6gOCg9k6+P/Zc39m7BwgAGpESzxfdefCP9495TXELipwUFJGLkng9X3MNPu0e7ZFM9pMI0HDpF3CU3+iLLw5eGVx7lsiOFS3O77g94GZRPYy+kHD6udQzxT0oCkjThXPRJp9kz32eyz6RNbzu6CnskMNZh16HQ8czxOZvuDwHfFX4AdWgN25D/TvAJHinicx/Xylm4/eqIMHLYAo3iSqRU8R5FEmuker08JDkeYjpAerIJwFhHMIUMYr4qXY8G88OsCskoy+u+LQjxEkVRxFL6LTdarRWG/ZeFgpJC2/C9Np1YmKN1EcR8Z6MKUW2qsRJSQ38ZT0KPGLFPCsvnDFvDQx2IabBOTUSMcM41BEkJs/hhhyHcKdt57mcEcL6pPVqfat2q0jAWZt0HAknk2YxrZgA6kN14fOef86pNWlBtyrX1B3bIJ0dMN91dIFGAM/MqCShVqvandh27O6j7qpTudu3D4GurVkTJI3wSEFmY35iOjBXcTBNx7ihXln/fGQDQI4HxtANyr8nHRqqr1tRXx8QGKh8kWApprNB2RD3Ki2zePNrBScLP2JYYlDibEkYZSU37KnYAxBzWKMuloAlh5LzLuOpveyTzP7p5E/L38BqDbLlMtd+/XgtaRWcB19lWmXGo636QnqxJ+GM5fqgGPIap+UtUgkyuyFQDudEYJVktd7FW3lK6R0B9cMUSby5c5ZiPpBRoKegivwo4hxxDqRCdOcGYPVnjWbCMmvcF7VL2msDy4RW4zGRpWmFQi3FnOup+a5ZfLpSNEAA8X0S6byclU44EzrMbjd4a0eUTqVR87l6wB1BHCXHHe6CImLHjcZ3P8R2YPUc5yhWLx5auadYLZoG9pf5sx/6BNa+Im9qy2BA0BWQ/wOiS27xILsAwIc7sSoETmn3P5uLzbJnrclRlDmk6jbf2bYsgnFm9Z+aV8qhN3JaB15MCMfjPYr8IvkMVpPUiivcXOSjClTVZOy0Aph6L147xVSTO+TYmp2Bv8oL/RKWadxV2GkeWZ35Kr8fB44TxPhaU+xDzW5ja+tAFxK9Nrs4CCNcNtYUgOSASavulvTce5up7cT9cfhH9NCZMlweeW+nue4LlOu5/mSA3XuiMKOTk4fVt3CZjYrSUyF0VaL9ySqjYgzAvmypq+sZklTqMnQrJWe4tnbaXEEyUJdHstQ7nwrSJkMIzwac0nA3baDBZ4yQ867oSlwGpRhNxmn/7Sgr2enskp0YVdjxbM8Og+0R1uHDJrRQr91yqI6Lh+FGmqsAlBeGG8JfhK8bHxAQDgr3Gg7yiQQhhGiZg5FwGBQKGG4gCBEgWH1H9rnmRkMBiIwybSssGQ8dOJj/ISF4ZXiPyOIUSlR8HB6i4BnSzXAhXAV0ak0rYCTm9fys1pG991NNfJI0dR25fW3L4aCMk4exo86XmdxQ9Qm3YnB8gxFVx2YjYqNi/xtDdAYEYI6FViamrNZN+jJzXRFToLNXBL823PF6N7kYE70oGlOSLZCiuBUWjQg6fFtORSK71BT+kE6jtmPJY0ubdu2037mrsm2MjG2n0sz1NzrRiHeid2AJI0Yafv1gz3U9g++N2IggWaQ+ChEZCFEtl8APlfLzp2rIy9ObwrghdJaDrojhtnwgyPl537WGnD6Rx4b4gu3weGRX79Kp8Wy1CxkP3161IV7EgiaGRPwOmQ6d/k3LAZ+ApSWIGZByQ0vu+DAFtDt1iGmHAy0tNZTEBBlcdqFI6jTYNfWrFdCoJKhuITbLFatzCDNcxTqh95h2GALKNgq/6PEnwdreuuQjYg60aoutYwgHg7kln9dzkdL59fXc4E4ho6491kp/FpS6lAVv+QT4f4wwWA3LRGB19mOOtLIO6X1Ad8FBWYbGbSLWt1hTomnhW/0ZLH6rso4e0wOvbm7d3vG59TO5MS3B9LqtSnwmzx4ix4Lg1ndAfXxrajBgG5ZkE2cUFPMvFn/JjuRHxmIzqGmyck2289Ottb1Zh9t0Sclp7Skrslg9Dvnw7w6sjQUhOD5pU3jffwthEIWuzoYf2PO7WTfZDgGtOqbjiiteIMQcaQ7UsSafGIF7sqflNmpkywaoXzOvlmcGpUwShgXE/roKPl5Ad9f7o/YM9tiSx5J/ifOZsGoQjqUa+yq0JbQYYsqGaaCVzs8sy/yVXmUaR8Su5pvLBbAymBZWDsPDmpDesEbkL9G9IVjHszUnco+4SGxnEYQwVEAH2S/qUDLBSo9Z4Cf91AHeFwr175SLHcVR7+97s+Ja35NZkCJlgAPI2CKs5+SLHdNHiSaMi5dvlXo2vGpOOWbrMXDqzCE3loeUEwfIcp0EqBz2vNl9+K/yzRATyKZJK+WKL9Xrf0YbQdeCAFcgHH7PyYTdQWZyMkY1YHfkhJsnl20Ai826uk6B7BiYA2ORgzHd8+XWY30hLPJCSN/gtrDnIkcb/M7wXeF44JxmsnI0kxOT7upJJyie2OLiRFDKtSBe8smUCRne3LcFNrkJhSeO31jSJHm6QCh0pwBeE89fUPIBnkmFSzccANJlr2E2SySaNCcTiVnsYSAEYjvMelwuFrFZB0mW9kD4un3lsEwktpu+RioRCKRStGksVSM37qV5dGkd+fZleQSTTKM1tXc2IVECob5+GcsIMZQRe9l2USjRxRbpjIgYizS4F5WVyYRrB0aA5qODMRkZdusxjj3wVa3kIaFQRA/pFa1OEUsoUo8rq4spFMFDdolzYzFFRoUleKQxVX5+EVP7BWE/9eae2pfAVP+53j8toL2amlLEPR6w8ughQ9ehmisXT0IvJd7hQ/5x6Q3tOFS0EnbF8NBk1mfGyp0FRvRVy0EqwqgKMBinDR6bzra8UDIvoAiMBRxOYVNwDjQgwE6WbaCydgoH7mE62XIg2GlQsy6Bz0wwMXOaMk0++bDJOdmc4hIiofxfjOiEuA3FQClRPKRbzAEF3F94Z/+drikOLksucJe+fRSmJshP0+Cntsp0yJV37K8wOuu57BzMd3hTMX91g55hCvyZDoDv/Zfl9ib7NhRYqEdLoF/H/gwOmoHXFdY6/NCetQvTZLDVLFU78D49Sc6F1xgymbOhVQdAPebCe4bcTSid22nHDVHwVHaNzwvPOeBGeEfjvqKrfNvf94SQ+qfE/BNrr80mo9xANKzvFZN4pQcKsu3Z+clpN/L6JxBSgVse4ehD5fdQoiZEHlW88ymLYJyXnw+/T8fJ5Bc0F+Bqcysbw4z5F9ldyeyNVMPl437jcGFyL4U3Efsq3JuERtKd9DIMYbBP7h5C6YPB4nz4CLne3FgFRw7dFxUfhrPBcYRzM9Un4gOEbe9A6KBwQiBtY8bfWd+yPRuHaIGFn+LaOELIY3BWTRLxpoih4XNb32kbG5KNx/YHOi2FLlNQZSrFX+L8wASqQvWP0DiRGqOC1SZW57IyAwKydDk6wQW3Y7k6INJZgYGZwuJAu4U0j7aOKgVlU1UsgW2n6JhMwb/f4eGUshRNAkRPwpFHeMDkdaZyOGdYmbANMYwJnauBn/WmwFANE6RYwNkZwM4KMwNOWRVKhHIjaWzghq9yWbjrskufgnatALyJEfFhQ1okQ0+kFNkXGerXaGQWMohJzMfOvwIigAgFvS2g25Et1AqxUaK22wnRtIF0x9UQIwsjDTW/sDkJBDdmJWX559qaJKEKTCTv9tHTp3f0nM98K8wr/JZ7nHlrO+H4WwgxuQZcVP1t/l2Dlk0bN92b5mpOrn6n59pS+9IltquFEUFl4SZDdbXBxA7MCgjICtQo01O0wNC8hQu3JCVevzZY6K4dM6s2Itby9wWOR272Z6+UD/0f6T+TGWbG8bn7w89y+WZcmI96pv3/ggKlp3Lx6XlvO3MBfr7vC1E2v8Aa3LmsnpAeFtdfnseFuEHQYwxpkfSQtG7tCl1cY/P+mTNF5vQ3WVl+c+YT2A8s5Lk680NnVVAOSouMaIsidudA0IDZ4I59oWi26IW/+PWTnQnPRlSqcpTZSXqDMUrlHePrMF8yGJP0ymx1LnxKNjzD1+EdA1TdnHtoXvqP9P5hRhbP+SfF9Lc9V77YL1xefP5t09vzfkmEF/xI8jW96CInjlOlV+sXIP1sQZJftl+zHlmjZX6yJaSTLRMLKVTMTs2QHE08h58e4IfPybHl3D3ehNJfmIPxGK6JPMF64t10gMdK5Jn8jXwlR3H5g6vBi0zhsOQTp1+EPKjHRi9CXgDPLYfSDkkNEonBIS6x1JejKwsPL2sNLt6Ilx7N2c1H/KTKoC5BLvDxJXKF2zYO6GNYGzJE16TTnAwlYvePJQAYABjQ4UNFbx6EmJbZDJyFh/6iDb5OQJ3L+sB/y4cY0fAhjSX9w8N1hjoaNdXxbLHh+9leclgyPfoeJRINYI7FbGNZt4FPsdvBOXDbDlVzGnk+nUY/0AujNhXx0PxpxTwMEaBX/1QQ2NE0SZUkP8NQ6Qnhw0mVhSRdEsgurObreFYbVKoaoQn3eLSn0U5DOBVAuwTSKklBhUGBgKmp4nbA6ggzSK+u9TQHPEoO7j1n8z/v/5kne1/my2avG3+ah9iT6ZOa58MUf6ryjtMwErQBgamA10gFDxehqSN3PutsFy/JJ+lXCWf530+O/m1ZBfOggk+hwGKdugozd04LC7VroI6c8y10Cw05hU7xBahVXUtFF8NItziMx6Qdc7EcqGyVGaVhEplEGgHJxQ6ZJLEUOsK6yFIIWSAkYizbE9vVIyl5V5godBl+KfLipRhEnGjdYtcA6rkC5+9EB+hvvltSWlVVZlb2Fp8rNVctr5rx7Q+IfrLuyOgb4Zs9I+WNInFf3507TV36zpHAPyv+c3hXeX3H/tuF1SyoHtg1/OB/dZdf3Vm9OU0bn1/uBI4Ia1iuCDdoH9DIbUWrlbow8TGPZDQU6hx56d6Hujlr+Xr4hgGPmtfvw33Xfn7OWeMozzz35l6IaTg8FSKjSeV0sVqCTtWV48X/fRfRfp37akAScHGVc6aORm+DfQtG8gz4iFyjw+vsMixWvLYTWc4bI3TWheFveb76HJC5beZjz5Wt7TwrM18OTu6FpBPoyJJCv+SxwKErfw4B7HVhra3LR04aem0JhpeP3I2qRiSZMC/k5c5s3x0vfbez9GXLTAGp+GmHy+q+8RTG4M1ALUlQKyTteqpe7Igdb+yGVXMTASBfaDVa2yGjZajsQrhaeBDWcAegdhQSh08SIShklIvmgfBVUyAjSgzUl9moKFAJkOUAJfC0OHsMkAOVImQv06HEMCJUuoQKHqE968Db4CLMo2ezAN0ZGlggza5ojNwsN0YVRxQWRBRHvYxkYUREIebyuvmCGn42MD+T69vk8ZVWscXzCzZvKmCK2LvgHN60Kc6KLa4qXnKsa0OaPznKT+UH+v2WN9vNy79EjS8Qlwdk9ZIhLC6IDWc/Fs1PE9lsEhMvBjViBk7hBtYoBmEDm5Q9582NX7cBMzAbH8BCKfD9IxQZRlIUF9k0TtKK0Rznv7GRTZw8TFhIAG7pFqfZKhRBjbMQjax3CHjdQULIg/P749MvOpv+c0siW0iOZmMxeGpep3G3+QHU4l+NTiK1HalwXb3Q7u3i08BD0ybZ3BH0bdVtxylNG0jXD+LfDFMaH+I+6S/lsLM96+P8zd59Fs03aYauuvmc+1azbKDbbbmUXOp5Nrnx2Lrq6ru8ouHf+bB3Ys66yChLsCJEEMKzk0b94GxCJXZ83zAvF2GSOHfHWvmXZMPRHGFO0knBydsnI09m33osePxotXVT6En+Y5QUtcFNhnqE47ltcOcCLyrzw+I+lol5Y4EDBcEl8RDwwWNiQ675RMPspteFZ53D54b1xyO38I/D+ahXN7AxvxijIEs5xRylNG8uJdiPvD+FdjwCuuHVH2tTUtGryDfN93V9LaiVfHwsOQSX5MLVDYk9Dk4pcFF++9W4doFC7k33OMvf/n6DoeLN+ScdYupy6Tkpaqwm4ThgiOnO7H670PO15+3Hnjc9L2DdqG4g5IgPYhZcB86BRxGvc73BU8+HLuKmpdOkxdDzcT8Wfy5C9k1X47XLYeEoe+aeA7NUpND5uCnPadK6UPKPH1t+bgGAGkEN3pT/qhfOkO29mxlI7Aiy1xU/Q498Ji8/7pU1lDYU5rVrDvEz4PoZCww9d3emdXWlOd0bKXd9zvvc8b5btDE5bgay3DBZp5tsKEfOEKVcu+JwL1+lMdkStOnRSZqcr+SAArExQefEFeFKYk5vapjsnuKyWdFRK3C2V8x43u6YGWUyG/eYc4ECIFOaJumaY9mdXxz7R+88IGBCo8Ocx2wBp5sOPAduwUypeMOx4B1MnQ/HAjQS5geYwDLMAwPmDug+fs6AcvkcRkif87uCuV2BuYI5r57HHUyWwNRjkkNGJ/qngOtR7Pf34tb9FupjUds7Ir2L1CLwpa40BWUsh7YN+VxOwZqiA3XCQnEFwomIWhU4erj/3KDJAt/OU12uOiPHjFA3fjwPvA/RTv2NGDp9/Zlfc2sxuu5QmjVt6JJx0GB8cMDW93KXJeyLR+iaB/2z3ZFrCb/mFmKsF/Rvs3nFTWgDJ4VhW3PFjlGlAZmQy9GIL6aPOTvTX/j60/Iaw9X/WS5Bgjf3hI4ZjN98fG3sG1yJu4nVS4QKUXhD57/qw+lQUAqFSJ0ue+ienxfGCKfjT//uDGZfiG57Xr3NSBKuF4IJA15iX69ftTJIdL3vw6EDvzyjnxi9XrdqRVAUYXv1GADyyn9zTjts92z1grW+leoQW98R9tYxgmcHc+s4p/RKrzdeWXNUgC1SVE1lpI19HzspqKdFxQPoGjahPwNw4u2aOHuFqKnJbuUWOKOwSLEzCrs48YTiwzUv6mmgTs1L8Irz94wLSLzjlejcdM9ETS4kt3GsuFjDps14IN00d7wh8RQTh7bYSpyrvTYYUAgBwVP3glnHkktXkTTv+Hdsw8YXt1c9q/MdvFcFBArF6eLrsVtCt7bk4n48O++Gzfv/oZJpNDBDbjbBzDVv2/kKO8gsTkx/9j1hufFQntLt5Q9/X7P8Fg3hwmufj4cJTGynbS8WeWmdBwpj1n1JH9Nr24lhEq6HPCP8TcCMbt8+CmidfroZvkptdBotQZVdneyTGOCVoE2pzqInKGOTfJSBGagL/7B27cqGJvjGBXjHBSYAfU//2TojzfD2RdCLGKtNZZT5gAeDIyYuBwYByNiKkKs8536U2/XlMzKRFy+gX8Zab15G+Rz4cPXNjT6TdX2u8ztcRnERF7bPyDIc+2oAvbRbb65KPNOHQ60/6lUMN+VumdC/HYwfBThGvCbjPb+h2U75FRV+SsCfZp21m8J3BG4FHOm2IkGE3ifZN1rADoqThyNyKn6NsHxyPgVxbVGFwWxsbhc1ZEqi92fjNkXKaj8zBenUPQnmRw1Nfn4rlD3NyssRYF68c9G7zaxtzHur2u/QYqjbbsput9BtS87qJSqTfP6rlZWydeq6wFPfOjI6rOJLVt9f3dae0e7us58WeOoMpuDxjikkx1R2HDZQDAkaKXruG6rWgCJAlK7/gysB0Lt+q4WWnLWnfOmEqfxoE341Od/u6eUb7rTX1TVB665k5P8ocTwUaILSLfFRvV+9+la7OEKY1HkTKJraFPqYn1XMWq/Nr3Mp5oP2MDUWnVZGcDuv3M6yWw+2XZMCoVcfUhpIdu24jTp+BIAVRajMaK3LaEczU1lx06QR2rK+4U6Le/aJ9hRAga0HDP0Nx0Iu2vM7eNWcIPCP0Xp6C7222mGDiaEk2+T6DA+j3Zgm2yZyB6nDb1QHnyIM6QGY4ZELX+msN0UYhhe9Veed72LO4acJQ+hhGQcxRBxeU2tDfzGIYBzKsmW6GBvN+x2c3jBODgEBicRhtBqiBaDYMHAWTE6icAsZH0S2d420V8ZT0imvYQOYipuSTlvhqU2X9sRr0tOnjMjFwBTw32O4lSN9Ip15mALAOGhTM6jGIki2bjpY5xpQNAHIhO4k98NewydYSl+dcOV95cYR++HdTL2VFYEvGMy32MF9+naOvg9WRaPOzs1ArJApKztmYMpETRCDXWEZ/m8+6Mzk1UOosF3/OTnZ6R8c1b8fY/EirGIGgrl72N48hDIz0KQ0sUl5cLw0wD0+if4JcSb0PpXEvb54tmsJUJ0gKrll2ABp3BvYS9NZQ54lWxkj1k+jv42vA7iOUPKE4I18TH6cRhnzwz70uefjfC84l7s+wA4/jjEsrKuLw0lNSRxIi6HLFVS5KuYvcYYFHdX/ER5Em7Uqh5WV93Hi0oAcnQ7YAa2VHz9yOAcPpqWtux+Gj558LnuURXlZ+64X2hHt4t9pYHDGzMzczlUi0dzTXDu6HTYP+F66LxINDLLZYtGnT8D5A3puZeXwOTZnPUZvWrteO3efPKkqKTHJY/sWt+/uugBtkmipRxLwqRvOg/gY0mE2Z8656MTMZO/krOxoarjYhe8LhviDZWD7SE+6V7DJm9uayilcIDTnr0PScXbhxNiZXJ6q8ksO8E4OUr0U53CO97P6eyNebNauZnJbWuwU4vhzCosU+5Ur7OLFUwqwWhq3OF2qSVsJMfFMfOCeOJ84wzMx4KmQyfVRJVDXAv0K2UlqYWj1K+Sie78yB+jWPgsIkSN+DptT8nXuRI8ca1rYCnfrkAJTyvJniANwD1sP4DoRBNazTgsrenDEfUMmMac7yHD4YuwcthKFqUz/ibgBCz31kAeHgwcX6p187NutEu5dnSWJYJbnK5L4yeIbaE/0uFiQTF6OK+IW4ebYIt+zaH8WuLUrVGiEBaKmFiF2OQaazSKyigALjaSIiCO+iWWErO1oNiuBTxCJEiGNkMVpgfC4BXyD3QHOgS3Ye+AO7AwivuX5qef5z08idzQGCPn2vbus2euZnNOvclfZovQ1ZUa3pQe7UFDqXqGakaVIIwln5xCyfCxUBKXxSHU/2NgF3x8fd6LeAnwHEUszvZgwEr92HS1hTTRrb/S3VdQa3XxoEI0qi6eqcxQDBehM8FD/dekhEw5S2bs/9xTT+XIYxLHE7/dv7KZPTnoGdgZw+KfqMdy9BViOhwPXfLrn8/HaQo6m44wDab8sWu65SlT488TPnhK1yhTiSOWtNvhVuGrjvDkMpoNC6Op+qqZuxF1ZgGWbOlrI6op7Pp+oLaQXC7Rn3bBxv6+XyVLO2GuiteHR4XJggZnzebeL5D/jA6o/FtyEqvlvoOx/aQDMttLbl0Kjo+nFxhXgUp2MILGC7xw0j2XEXt4bKZPT843LDWSern+LB0W7cYTXG0E6lWu+RLlGQ+ICDPe62RMFyb1uYT6uYWniHIrlsuvHXDxowcn9RfFtMCQmmnZ3Ho6m9lPFmurT49pIAUA/HQ84HDDG/gS5vaHZJ8Z4OKIZRmM+qjWMTeySbFQHjHG/yNYmkheCF0uJxLbbddh32LVLQABXYIA31FXZ1Fz0DMFZ5npbYQrlDiA5BvVDV99u07CtGd4KrYae2a03ueZd21VviDCFLtHANbgWPuxRio+/CM+CSsl6wmgxPsorddGbxE/qKyXHyeJn7HoEMCMOy4YIeBLmaq8PMbCGWhtCiPDD23TJUMvD0MMsKLDYZzg5ecp2qs3Duw+uymVl5p8zuYFcc/vouTodwbY6Pl1BlytpcpXigrg8cSJNobpB4sDzsY0OVyPad5/zcKF6A3mZbLZIxGaDA0BtVVu5hfu4hn+GnE/pZnVdF6Z0ZgRmhDAzwoyDql7cA9iw/GjCO52LFSgtsSWSJWN0NLMvXZVCMgCEdUje1nIYt47YqVJspYtbKFZjYImc1A1bmkd0PIFGXdZLrYAJV2If294qPzTEeRjQB2BOU6C8esdYBFQD/UaSv6HREFjk0Eg1U22HiJ0QLUTWQtTHilD7q3Vm4DN/FGQkg+lIIGA5GLLdqQP2fBd1bEAyHbRO7o937S+aLYZL5j5TIzcjipG7NVBa+9ZUBXxKvvIB4RFuEeAPC8VNkUpRILNmyQxWHhaHrVCRF0qwMZ/TqKWPRwrQ6p7XOmrakzRsiWBBjQY8uCDzajLdiWZ+9MKbX9xc6+GgoaDhwKmsQHO6I51c/aOr6Ne3/rVEDnuTnhCnfJG9FCQJr9UN0cIFkSWVgrVwNr4oZ0JSgRLaRGkiedceuUaYqVRFU9CK+UErm5DLaTF6/Fp4pSCyFC7Q6sa4hl8+0OX56IVCgNusB7Rw4HFJtKR0+KtpijhFbSy018UtiwloayRGj8Fmb7BOI/AhG79VAALf9fLmPAtSS0TE8vCqnupcFCM6pbszD+7VL1VjK7oJjXUAc5+eizFWSzS2ZdpzRm8QgMW8iLQvSyEHtlX1uHgbIOakF3A4GI55AQszg5JYp4Sg29lQXXsbNlfiVITCwTppWKgZVFXwKhYKh9iwbyRzR/mqMkxwCBz9HJ4cjg3dAcC1pO0uxgcHgrE9U+DiHumn6D5pX/gzR9n3rgV0I6kR3SPNKaYRPR6mjJVlfdlrHJ9FYT/J4VIQZfpM99KyE8kA/0dx74wK3tf/jmUFlugmkpXjuyvejeWQIaMKzANzUaryt5G3QBhg8ni0j9qv050VLTMg8PUO0K5pkm16cfTVpe9ydFrNTS0JCjJ5uQdFONXIVxH1BhGmRrDzVbTArsXbOGSrVIVGZ7FRk+eic4Sk7FZj4vo8DcKwZZJ9Q43mKVoSV5XSe26WKfH1leg0COSC/da+BCM9hAno4Zn/S6FEPfUtIx3am9/+K7qLM61qz0xl8oMGdAOkbf1sd2iVhaUHFS/TKwjkw1GU5OADDt1MyIsduOWbaDYjHHtqZ9jI/Vvz760hGicHbG/gbcHoYb+TNXA9pm05hQB4BtjOdq8R+U+iNxoO1zVNuvm5CCQ6gYA5Aynno8GF+XplIDwjfF3nvAcgPXgj1dg8AZL8NpB26fkakhHxwNf4olZWIdyoHfFDCcO5HF21XwnwUr6lh0waw0lly/zurxy7ini59v+Ar6do6OVLAEC+D6dH0Em8Z2N7b2bzyfDH3+m62jclW58CgGrol7Eh6t8NVt9TgnSxrSMcmXyLB4oFw0wNVsb1Iv811zrXSRUXXqE90dscXKuNGp9l8JWr9j/1cJrLjT2A0zO5ehq/qUvhtPta+/lrROKmF31T2cdrk5sWAZaDde8ApM7/q/zDLmmU4MPGmNy+s3cGZ36b0dWpQPFfDxCNjHfoXQ57W5ljZlx4oeXNQTamc//DFuL5iYeAcomOLX1rDoZ2aizvz96XiKtj/jG1y8422eih6slKEghajCRgX3e86j+K09lwEmEDkW31eQ32QAtVlSiLRKTXiyQ7JG0S6yXBErHPJ0kX3rj66WlBCjoeBDPrmASPeuYi1lUPF+Hl0MZrZtEnu8hEZNUzJcwuJrOdWGN5mLsBhAAxcANeDtRf55s7GAhQSVyzRsO8kPwbn7VUbZgWGr1vhG/pVfsyCwlCZmFHL0t+x2iaSVrwGG+V69NN0/8N5iO9Rm1ZhodcKiu1WC1VcVq8031oBF4ieC1pq3KXJ+0JSDgwMAsMOd7xOouZlW2pAF/G2Vt3X1a81TC6+2zT2BdoKycZ52I6fRe5mIGlG1NgqX1aQS72RQukIK8Acw4jG/UXPLhqC9W8p9lL4fHJMOcxNBffRZhO49zKSQu0wEeVqbqcCedQN1fRU3rMQx87ZmvAvSfVqcKUN1WnV2PucmMJV4lTPlz1JHVPCrJqPX43Xwlzc4VHxWYmd5Zglv5uTBj/xjuYxySNO9nv7Lm/J+4xYZigwlXziFuIKvpI9oTLIDyt+zd/AO/v4zax6HgynxyMCcaS/xz4TVXwRwWjKVcuUAHthHbA2B62oonQ5aEAc8KuNDQVryV8KsSo8H8X2mXrXSuphRS0wpU0zMXb6ImeVskooGEKaZUebEXT8WXMRFwK/nkO2g2XBR/3Rr/yLDGpsFrip0LsePlSk1OZbmGqtMSowmiJ8xlOJWSOaGCDCqP5E+hdFYRSA3Afmks5jDPNrVpzPHlgB8bW3uaDEubicFWIE9lubju5l/Q6NJRnIuOnUqxzjHgsB2/tEvnQMN7lOsd4QA4ahFrYurqkXHvWz3Y87+Lwx1Z2z1DZUhsYafOX1K0mrBbhL7vA05MWZosPhnATDzu++TVulDnq70FQ6wz/bQ7zvRJTOsGJ5opA3VrNpSwpN3VbxDQLOKeuxDgvYUf0NoE6KS54SJlS18blRc+Noij8bEBn073H4uxOW6etspTiRYMstIy16xvhXvegz6z+1LcsthLWXCC0bnPDS6XOcOX+qAiu0CAR3fJoFejM3P5gAh3PpDs9Zl5gXQi9EbBtdddpPKF72xsCpuHAcZjRYfwF5gXg0oawW58QOjHHIFwwB8IDH0vWcR17zLQ7/y17b44TX+oo8ATzIGylZlnGSkMFzNNxdHIURDg656yDMCABXsO+6Y2CDNYDHDaw9b/ZYODAmyvuDnbkSbX5Wt9FF1t1CUuQ0QjJ2AsxbC7DeN7qyX4cPKd7vNUmiTOEQtGhuaHduSIkyU37NSIQzAOs4xfgm3talB9J0keVdFnvMJHuZTaoWEvpHQGnEtr8M+ZwTxxlJwrD1j2/YcKdz0sOdNlSLd8pqbN5bgIZ3QIAlqvotfZz2dkLzus43LU3zVkQUBgUJdogO227LUYNeO3Unxt6K5sjAeRPM5cklDY7R3o1tnWdPpEBwKjYgJgDvxLJgjky59V1iXVDLkvqpUSw5+l/2W7MJm//csyXlazH5S1YEzxoOhi856Yx3vjWTPKU1xTZTtCArYYwDEpMf1/4CjWAblyntLNjtkO2/xSTtbs3d7bizuqXcj6SSeQogQ25XSL8yveI3kNGkwHYh5y/NKPzIMP+0TyC8B07SSJgp4jfccNYAm5o2fewCwucW06ewXzsvaM38xZy5PjpaJ3q8c4XYlKo56tbjpusdEOs2W2AT1SiQ5Q4hxk7/tupG3gf0Ksu9z+dmZV5K7PkaTfo0owgx1l6s2Duy6FPlJ+UX0wBThkBXxep+PJCFdwCfHRBIR2OFJNbhUAjUPqp9OkNE8I3Gu+cj/82fm18wtWdSHqTbdt3LayJfjtvEn9BV8B3goaX42g1NEAOoVU/8bD4Nsjzn9JwBFCWAaja9vk/eLD5YNMaSpPznriaOtDkcHV5oWWlnrQL8OSa5BJyjJBMhyza1zdG5siEI24iJgO1ahuBVSMS6OzM31HAciHzqbicq1Q9FZeTn8/msnMCuaXWiFRHjrQ6D8u9QO6hKsRKT8lKjXaHmJFRoZZUm/wbZa6YHhkmrmATIPFOEqnISo1QxcOTgfThzMw556cL5j/taUsz792TatbdX1i4dxVYH8cxmz35PPpaVdWM4/SszieOMyxL9x/cM2c4nJkLXD59jMZbqavyzPOTN0v8S06fvO9KXW3NKshh2XOkWxwjgeZ6/6LAkAKVxsG7xUcjlWpCVmjPuI+6H7E1rHAQA97OG1VnSloYL+MkfXVUbdZ4fkvFmfyVfJQMbRS7NfVW7g9Wv46YCEruowaTgvblf+FCpDZFW9gZUFAHX2jmTnYttt48YKD4iGAP1old2c/GAaF8/c01B22kcK5bIzjVBsTaRi1CAGqi3/q1Y4kL4gkYXLL0vRSx+gT0QdzszmwJMT3vH/KzBj2+KcvPrO4JTW8SBa5ozF6CbIH862bcfRRu6ZH8F0xNpOawTdTMXTxLyrmkQcpg2mWPP7K5Kqtm/3JqWxAdwMeUMo5T61zZMnYRBqPKV6tIX2kkzOifmc2sqo2T+QsiSFPkSvIUaRlrzNigMjUzLYR8S8OWir6q0eq2lmLTPsewtW17+qePQ4FWD6T3Lv3vGh3aPIq+nbxEvkuej4i9vfBpwHJudHb0/NcHPh5MuJmVHfg1MDtrPmk/cRlxPynxxhl4umUlrMaYrLIkHbuS51YcmBcbtXGjzCqkW5HaN48b8mV3dyhhbmZUcEKC6BIBNViez5XThQnHx2LN41CozTcqN1EOIRR76fv2J46PRTO+izrtAFiMSfB4MXTT0RXwFFsXCnqgM8YdlqoiwRE9StbOBWBpmilKM3gr81Xv3OhPDEBfdPW6Gpafs1bxqAD2cgZZGZEfHaMdpTEw60dBAYNBAgUyRzVQ7jGoA2Jap0ZPR5lCnW0UNWBbQkD2zqgwo1VxXCCCa8B6HgoAQolA+NMGKIIPzLtQ4GaR6Bhk00dBkxpWu+ATkkKk0qu8bppbsQuTSff6i1Fw/cU7ttLkegWtmw9xfqpDLvDaSmAMt6Y9rOsaJ4bNR8ZbELeaRRFF5Kxy/380YVpOCxbD7kOsyVMHy4R8XIxKrNGqO0b0mTleJT6BjklSRBMGtUqyCaELQmCnF/R+jFu3DvZiT6gAjFWLuroClbAE9FYLc0ydaJSRRmtzYd2RKrHiel7zSi/WwM4dUKcJGjtY+XJtRrmHEGtl2iVtau4FRmr8w82Talp2CXHd5/Kggq3QVTEBBbkR9JoKwyAXPR4XvfoIlCp1lpshWc0QZCHIrRdlsb72KpyGFotjVdtWLMLkuKEb1CqXlHLcUUaJhMByRkLrmo5iSmoY94tN3QaJjW37331QsP6t93/8hkIo7twzYxQuECUZPEQuSy8nK8UTlTlChRX49Ic+0dfzK+RL2jiARRxJubgbbw8/1n2wlEvC8XlxnkTqXyXwTVXi/tk/vi/0WK3u6AZnaqOmM0hdkt2IemnZx848QIIkxB85o2SkuaKqsZ33/fPyKl3a3NOOCWWMPZrVOCuklA2agexy/3YBkSBlghHUoeXXjtMkWD7DkD1ensTqB9eepyj8a+8PRAarko4Qc9bKXfrDnxBR1kw1nqRLK+ReU51k28YUgZfk2pRcnP6JxebU4SBB2vVbEWaE85Gro44la8JaR1M181W5wyUlqgaEf3xuWBZjwhpHr5OaB4P54DVPg7vHxdSh6BHoBiBBGUOXmutYU7dVIYYjBYsYaFabQLHxWGkQDtUukgsoEK1eeQIYiolyt61lTEcyoulYUx1TRz9s+UDTg9eqvbqMI1IcZ3VfVZXBmR/mIEWw5arCq9qAY2y5A5LaMYUf/gjMiPo/xWpkrs6r78gtRQW49te/3HgyXphNbzD0Rk3LtYjVR/yPXAtMD8srCNsV6hu6ywsVnpeu/dM0Pz3lmVGj9xSY8vUa49O01JNhjAWocRpqAdzAv0xd9qBsZUFxke642ld9HNx2CtXaNq+PlPlGBRsbDJJ9DHbSGORr+daa3J5Szz7MY9eXEbhCZMfuCm9TjTSQkicV3ppbv/VQXcDBgCXZGdLjk4KG/hwKSrns6ZbsqaLPpCWgd+NGp/TiQ9HTEFMR09CABmZBn0YVijGNB4rhjeBsogldKEadRv/I4coJOL/lKnPl4tGpTJSZ4oTcQ/YvlT+y7lk3Y+wvsu7Jj1zizU+3TuMr74aHXpFiJOqvneZntDpMdigVmoBvhbrmAdw94GrpRUxzJReS6ETpm89IbArrz4ybizucubeeGzlYEWOdh4FiFXdlon2mrPl3dfExKenbmGqScLesSD/gSgV8TLt+b5dgriPuxWrB5nU7rk41k4GIqbIMc638RQGAHz1+QNKRinB9TvryWjPbKzbnBHZH4uzEI5vlR+lVB2y++fTP7kO9ARN/uu9LdPicWPyLTlx6Z7jVt08zVuyoXEr//cSo5Uzxk2Fr+uyMeBRQCaR14b/f2N+2wbUf+Jzlcn0e8iuy5Tm2DDshd/92rwtADqjrxLh1O9L//B9r/s18FL3jM5OlZxj+2l6+oyHHaMQWMKJ2mINqpwj37Hm3VLCvFH/evwwvCw0fqDrVOroyJNovAu3WuiEFRxgOWjRStnB3/UIcdaxxGNyolRL5R8MovoGWuX6nWHCDpCu/AZnbP3s1/4e9/sx3j84zdRuv8BZKdIH5e4oGi66JdE1+u1MF7P48Q5PSrq1d8QSulfpDozF+Ql5c2a7RbJnAbaOhmmXG02QKffwR3xM15toALHTf9pfjrbUQVi0AhpMfMRN318O6gF/E3HWy6uout9C4D/ciZBWUYD3EwfW64EkmZsOGGMyNnrIxholgsqeyckPPWAU+bCmyzxykKL9//X70FJbl1/TAv3h+Ob/UZapKQY3juW3iMOfMJFioWLai0BGgshUKRIL2ZSE0vPr/MHr4vwhpS4ZaupamwZP8hxvOpKBR43XFOjOvj/zodQVdcL0gBboxbNiR01LFB2NBreinZVzbUuIf9VpJSc4IP167gRsEHH2MyrcTBHevaWAA+aGoTraNEcg6amXkGBHgeznOesgaCzGq78Qlkoo7RqPCRZ2lThinBr+LcJLY+YOAYJRD9sPl28EyN8C0hpsIzmITEXNgov5TTM4kqq6WjFkvkCQFz0gC5BwQjdHNaUL2QWYLnqouykV0LnqBsG9HnqAlL+mXm+EzFE5Oz3kW3OutXpKoTtyqfr7lJkhDoKx20h+ljsYL0dLrncUuEZjOrj6IJH2DmlhXTem1Xm5vo59ls6a0uFTCrWY0CgycJ349//hUP9e/UgDICM5WdIJNY1WlMRTda90LzHpMYNDkZoLLxBtuzwDPugP0h+9pbsX1sO4pLebbQdEHiTLuQRonqElTWlL6L8B/hYBASj7WK8CEcv96Ytsyx7TvATc7fB3LZ2mpuGG12ppo3b+gP0MuuzujxZW2a5rxDAiE8qiIaUw2YgocIiS7XrN7fjr9tWrjCcQUSeMQaTFaJ0lPg+VV45AO0oXQ9qp9mtgmBtRxBgOEfJToz2BPgk8RvOPw/ABj/1XiMDH/lIyl+T9Yyd6/JHH/bgndvc/CwX8cwYN6Q+SQAwjZoXr6A9e/8Y5GDPQPOWDXWxJaNYRsBDjxjup2aYU4/kyBSEezgkwoPpKmBnFidX52vKdSTVdq4m+IM7e5J3nwp5Oh9OckqKFmAKc02LP2e21qlq7ZIgxe6bw+QWVJxtJqpYBPNUXiWz5h+l807QsOQ/c8fUl/xyTPotwYO7mwtp4cLVIeT87cPk5uGyMaU1ycvIRkRkhF6qn+11avaisVSrV5e9lCymjw4cY71+aWg+o1Xfuy/urWXpmhem4HiiZqtm+v4VaP0j5uzegTH0H0Wt4OMNept9FoJ+m0bXT6SdqTJs7WsP1hf4QNc4Bz97aZBYEUhGlPpnGGhx/wx4WtUz943S7gMNJhnSFexRoIWVZ+oHtwsvPPSveW4u8EMDSRk3wWpqC+qlGc3sKqnsKJ4tkgcS7x6T4xPlarT02Ac/C2ePlE+VohyWB8IjeGY6utsbL1uFF5YdDR7mWh0i+p7EC5Z0IIwEsWla+GpmKMxu83siw61Hs4KhKrI9Zho2Qn5Khv+FPqSnR0KQnIOTx3A8Igl2n4EF+4QWtvGLy5u2gVsfiHsXld/YHW2s3rN7G+As5SO/OU/rP/ZQjijy098Z1tujrRyN5aVMk88+DMvZ4ILNULBoEAXMKj4w9JUAs95L1YQaMj0eLiW21BUd+eeVR1M/Ep/GPO9WQkiKCaKWLeAZXHYkjPa8f3JRcHed2oz6IjdAR9rXBGXq0U6gLEe3VJzpyt3XMEH7oiNLb9Uk5KC3c0uoVs6fBK5XEraw9Czrnc4ac916NkFoaAOlkBISvi+IFiTUkLbU/B2S7avuUnnn1DE3s78QV7TfWIMLpevD48/AGkuPVvq3AnGlagXJy/86ABHFo92yJz4dK2CTRJybUaZ4EwDom2Oo1kIUeCtH9zR50dZFqtJ21S/miJaGHPEDn/+dU90qD7R47mWnQW/momPB6OFpUvyllzH7UuaNVl/Zr+12FUP2iALySePa2sguQtRRoJwVDPAuXOKm47VR93avX40wTl/grt/a2eJaos7WrhyYie5r/EFVU7R00MF+iMdXmJyCGvkPX5V5Ftu2YLK9c6lzs71pIJEYk5a+a7mC7aJ3hXJQu2clXSMA92H+6CQHo63KPhBC5SYthzbd8C5+Uqk8aILcrh9xsMwKa4xRij6zPoJayIz2do3DECDeo/mV7WWaWbqaew1JFrBLLJ5vJeElyf78Z8uTJdGryy0zx2zbKWJrMshEIquXkzBCp+Ps/5UfB639FJx4g1z2aGFSsIxMl2W7cpvf5eAAmLTDm2gNKa89IJl8vjgfbjTfNG4+LguIopAWVdW0zeOmUHsMWoe199tO4Vc4dp3mrhs2IoiHQVCZw0Pl4MqwGNql9oSUZkAAh+0L0WjIRyOGdggZ7Eo8sEe0gAqZ6xemuVbSLOl13f/bUbCGv72vK2RcsqWLPT5oSi0kpXzCzaub71UXOcE7CQwAssnoyMilj04mwlsPTBvLIyXnBAvjqnPOYaEFzP45UFs69v03C/RYUjizIA+uVwjaem77emVfOruXDaBd42M1LVGT9Q+tNXsIHL1AT7axrFOVxedC3TNqSYonh+sXaSKxWsT7OUZ3Lge3YLAQe08zcSCSyAFNhgb237Of5tfNni35RJP+BZgagQoP2W6qiCzEW5Dm62TOQg5a2jFilQcymWhgz9ZVjYymuaR+Gt+J8EJLh80U38WUEVzqZESAXiFhCj/Hib3hSmD6VfbOjJ10WtRd+O1UqVGuECV20qUhb5FXUVAR74j4Y4AmckTheuxrZgHERlzmWbTS3O/zqWaXaohZKi0FTnuaf6Jq1t1uITIdu2pddlRUpLXyZt1GioKMCaqNPsYkSNDbYx4thxcH626GqMsY0VA74PDrtav4vA9P+hsry4viFeoV7hFLCKtodl61vvwsdpowhtlMrEvzszGjgoTIUmyn1flEjivZT+djOQWv//79YdV/Jh2HiOr/EKb81HkKFSJyAnNgHgQhU6YbCUMlYGL+9z23IE3zZ9Gocs8vJwc8eaeip3ad/MeW6eAdltvv4G0Li/8etxc/ikgW8Y+1/uJ4Ly3xm5BLrwZ/mwRHt+OoV4R3iFyYK9uArWG0QdCgZa0LisIFsg+Mvb5nn5rPQmsY6egc3OnPyGQgHPl6MWo2cZv+qW7HqKm8IY6GnoWcYIlEcrPDEZXio2Y7gxvnGYoQGiYxgxZ+k0sExrSOkoM6OnRxlnKO9LZ3eOcaK7Q5zIiHG3z7e7xzAWTi2cZ+tlbksGukri6OkDJT2nmfG+NYYec5ZGzcvocWiaxDrSy7sju58Tzwq5bYw+doZOVHnRU2bQZ4wsE3b/W01vVXWO0keNuhnDvdm1tMTxznC0CdqkM+s/FQDySE1/Vf+qfsXzVS6sYstErbXRzCk37KnybnXo/I5E07DbeI43bfTU3i1wUeVVll9cG7pxU7orQT5rCn3IK5NR27x0llAOXCgOY6743+hyk4A20/0grjXGcdWRWsB/rkOandZSkZYbjj1LjD5UcfuJPYSLJg5hPSXj39tPnc4N3PL9F+A5T6fQiOOBl8bnjzz6hfHhw0EtACTq4Z+HOXwy114PwM/olp2U/eX+SHf/Ap5bAT/dh2xeNvf+ncGiwpTNQyLlch9c+u73/9YPdL3P5mZ7zj/4o1dys7lIonp+5hEgBkZKB+YtoGzZG8MXkV0/zSXyFHkLpf33tR8TwLF5uaLG+cuSEs8lzv75TGezCORS1WmcZK1bdu5fMoaoOlf4o5gAjr86in2Hy3ePRuVL/eiVRELizjXIEj/id1vWGyMJuMGKqtmOomNFgPfoysgLh44sj7qw/qLbKssXrdEfMfbu4ffVXH3RUqea+ZL54cTybhv/2KWLkY69tzlS6dkcmu2bEcBd2YEZfrY74psZwr2WtkI/ofthaPAVWhj2H7X6d9NQ2ZEtYWV31afVhnG239cr1CsrPvIR8WFOpO+yTTvmf0VssVgQOr+A1azXDPnBFLswtq8hBwKOx0S4PWBDYftEe+HE4bCHKz+EgijRbc3tyCiB4Nq11tMTFnfRqKhgcZToQMWSZol6JaI+aTxDpuDFmgQ0xrhTD0FISyTo5M08znlmaMjIzumFMsLafOudSzuJrcsiUZEPu+1dkYCnSgTOgEmIJyDjxoBtJowWGAbwcWhh6M8AbQgzPcydJPsVSzSTi5uK6UKIZ7Svsyrmn94sEJYr9BJ4OgoTwLnI2Wa2qWSbjbOr1Edkps6AEwgzVdzGHQ6SO9M2nkRME25KmwJXnXyS9MnHGhtccSt4vpVfuO7AMF9/dGgSOrJBlcsCiQOWrVY3/8x+uMygGVkoCdYxdWfIt4rP1BqSIRf2DrXc/x10mj0vJj6UTSohu15h1p3gjPJlUgh1wja++awMZWxsP+3pn5PJ8AqeZoy1xGdYBD+QeGHoVtbMUG458zVH3WAGDgvvXupvqiZ/Nebt/jSdw5qhi8NHXSjgc3iRPzywoCC3+0BejrMlhDNusKAt+SLl23aQAttZd5U1mrOvp/8lfNYHH3BJGjbOzbBi2vWJN9SZFyRKV9eU3uHpvXp1FgREBr71Cu5lzv91b+wJ5QVKz/L+9q5N8+DK09bSP5kmpb680HX/Pv0EBKIEIyf0pjBbatSmeNfHbEs/aHpTYHoQx2D8dIhDzXRir7XeZKTR3p4Ta8812FNf/n38b8OGNGWsYWwtB55XPiLnclHg+QcQSCKFtRvKPLtWxgkJWSZDmBcgX8uwu8JnffxhyrOGIkN5Jg6eRNZ1SFOJJeSiC4tHjr5yD3PWc0w53a9I6mMkWSjHSWTyYTw0J8KHJEREVoYsg0WelyxFbso5xbhxv3wEzF6LzX28a4QN6Timm1fZTmGGNHAgNUdPN0QA4ci1MWwIz5g9q5kkREauCqlJtjr6Cp473ffVk3gKGgzb9bxn5NiFrc03c1cf9rZf17OgAIFCJIAE6QZmn+vZYaec3XIqTH1iPIdnEvDDTt1gQJVzFKwKKw04LATmKBYoEpGMWhkykYS81+c9701+0L75TzuAw9pg+oWURhTYHfes19lGGBQPlQ4QucSoyXgzQjjLHHnDWMu4yz1XtgAqDY7ovtYdi6M93jToTsKV4gRsAWj8fHeCsZgIVt7HxzHrmTmYVPemK4smXBsZqqsZeZ4RzpiwB9c77unVDPGihnTcrhN4XHpVL9aYll69wP13TWhsjurc2xlF4HdGdWLOY8c5cEeMXB+499XejffCpD52qEWjgS0+rzB3wN0hOob5RwWuNBYC/L2YlNR7pRNkE4KAqv3G2ra9v9WvHem1AjD7+FvAWWwbOAcOg0/BNuxMQt4b8putKQd9WIE+41CYE4Hn97Q88cF/7QGmW2bOjGZVXyCLRlaC4092oQ3kxrsEWD3hV+nmfzMsb/dbNn7fm+m1dkoeYC/CqF42HI7C3U0ELEAEWofiHjpa8s37dZoe+nA/7FBjsBSD7rW66V33TFUJv514cKF3anZ2WmpA5yzqf5NjgapI6IJTyTbkCS/N7+bDeeRkQjO8CZ6JLcR6XXiz/2rErrwy/lQcanMsyYh3QHUQM1KITi5E5UCcUCtmb0bKi9iu/v4K3rKzUEyUw/t7eOmVfZTmJ3YNlTijQ5miqrBQnoUdGN95SKC1Y/zq8uAkpiusulsTBdcrDAO3V/g0x1xW9XSvPBcw41ZocX5Xi8UIBF7ccAU7gD941neWgP2LNEy4QNNOoeR6Cd33PfB2aXRly8w981OEYa4i1NweHM3jaBtZe0GOP1I8Ni/7RQEURhBPVsmEPDwOv8ZxWJ2qyVvxwcp5cYiV63BBy5AwEcVtTY47Twb99/JbTugHl2Ocw6EPZbt8w6get1Z6br/pb18mE8NiuVCitqmsMPRK3jsBF8vGX1Rwf1ZDPQISfvfwKF7DmtlpogsV8Qp/peKVV+5GKm3ycTY5DOA9Cis7F5REXUJNCjpjdG96R72KfAvu5emFuOIpM0Yr+crGZXfjcI5i9HyoTm+qAuDkRxlr9BGVEENPP/oMCuyFOYvxROK1SM9Pa4SpttY0eGVr79aEWq79M1c4hxmG7xZ048Nu5czbfuH3IMpPHzJvvZM/+dq8/CzM7sRWmW9MjC9Q5429i80A7xHLWzAD+wbc+z7g1HKKfI70gXSOnGE7x3CSZpv3/CXNGKX2tZ4bH0PLTpVz3CnyuAAgCCLvj9x/hsbLa/6d/0n8RGnmlaPcoGi5V3XusmM+/OMn7SeRagSv8KYBSQ8+rXjAl74fX1o34Cf/U4fQkD7qS36Cl/y2ET1CacNoCARv5+tcdA+iHL0DhwSpxTrFRbzhAG9HASrO0o8thQYdc8a1Jjfpuus25Wz5jHUcZEPMOEG6B//WW6NiS8SkZLfmznfpdUNZEskQGTAh+kZh9bCerd5wqyfQv2RAgDKKb/wqksn8hvntjgnqu4HX3SjY6MmG/MT8dsME9t30ubkjHENZRH8LcFE8hPKNvwiZkYt+RtQCR256hyzGdgR/WOCXyUwrKroN3fja7YJMcNjodUpQLduazxXMQ/f8txJiTx+4ZGG3OEZQF82HU0l7QW8rKXghkHBy3snk49Krnc8eWZnRA+b7R0jQL8EuAQJ8o0vM3Kg5Am4BHo55C1dMxqXTXeM6XRIlqZ5YH66bJ6u2p/feJd0F0+3TClrDdVMpU5NJ9Trdi2rZ43TwHuktmP54rwCt0xWBqFOZYSadbp5fbUw6GN3QGxc6p36eMkk+T0lyE89r/C5nYO7yg2tqfotGrb/8aP0r8Nudu74heD0q/PuZY41Frw/1f9l9f7t8vdRaXYPZE/ig/qEhA7f696+d9dfFG4F71FSvb19vQwE9dEXEFSp7kraBSV2X5PNRlaxkMxu09UH1TNeegUT5US4x1+ozrC2kdWnrmcd4rdHeCPCIT9I6qsZZdjOpV01epUp9okrvnyawjAhCRFdiRKrwaOoYL+Qwe8GCvf1+ZG4OtuoFj5zTEJYVuiChwydQk50doA3VZmoCslAIPCDXQRZurPi2S7wGW5KyDjq48Cwf3oGRWWDbMK4TdMCdbgHvgNvjE1i5eau5sD+32ToNrsvM5LW3TwdeAMqnCceWl2EKCoow+3X+xMreXkRWaf/LAf55h5uawt/bnhoA5t1/lBMv3HLVPG5tJyhhqMXTY8dLwLMXceoo0rCzxBJGmYXAx2U1vLjwk7kMn3hwLXJy63bgSCYSVbLJVq4fRwpR0EVhAjjKGR7Sv/GU3/OMABUcC0uCS6qB0GMglljp+vdVAlqX29Xff0bImFS/9nLzNbcjGDglYsth6pUNZfeudMC6PK64BFTtK6TNCaUBQUNsZcdu1cZeF3yKEkVOcbd+zrwMC3dSLQGhetgN/vF1nAcE2EL9x/GIgSuTVXYmKemvnZhS2I6sZaP5dL9olFK1RTTl372JoHg/CT+4nMygwVzdvP2PUE1z1maRnNjDgBplxzyKBZGLiTgh5ZFg/+kDMu/UvYsL1q9afS7+3oTyZ51jPYwGbWQ9oh6D2bhH9QBM3EmN/Xi2A9YwvGEUc2X7HUWHO21enICAh8Hw/T9Y19yTYraxtol0UABxWl7ofQxVgoz9M9UFCoFt7J18jwhchm1JuFg1RxRmBKEXYckYuAQGGZ3HLDm6efBlFKLUP+ro+uzvqGjfNBUvBaMVel4J0aKU4eYMWK8C6jJQKt+3pEAWeKego+D2PrT1zdzk0k1X/LHASXa8cfOtxJTFVbOQT7nXjyakQlYd9GGY5uPjoWqYG/b3Xwv0quKvyR0vKy1uaC6yzDeAiObgQVQiGq6A4z0Z3qNo38UpUQQSiYiBo8zKnn/hrgBhS/bS7CVNS0+XcIfL0nlU9kDQcNBg0ABTyy5sbg/poUymiAf4fAwA1kar26MLlx6p/MEvf/1Pu+HP1RG1oiJVkjIhWZ6ivKRwkvzv+VYlFYm0RK5uPGLai/t+5u9T7oeZmLlFc/R2WcQ4VhXnoWMavexSg1hnFEeI14Lz+ZbopAa7F9PooVPFYX9XRIZHF3Mi/JrGrglsyV9Lpv3NB7JAZnRQlutRYWhagKLR4POmwDr6oaeQSdKk2IBsZJLk9//zf/ZDIUmSgBhMriQpRgvfVRSatGll08LYhl1OrIDrrIJZT59IdBH4iF7/5PIjJVjdnc/Y0nT/FJUqxT+9NEKW4ZWYWKm1hkfMSSL+KsQXvjtXbA4xhMT8kNuS5mY1d8OkzCnNvyQ53uwZIZFEeJrj+aIci3fES6XeYE2eeJ8LqdBZ8yQxnrGqeE+zJCJCYvb0Uwh8RiOP+ggAofdR81FvYBMze1n2sFZyNLOhvTi2rkkSI9YLdTqhXjwozk0KdWJ9TAjLRtP5WIN/Mf0uXgxi/gq+z5WmY9mAlm+kFFHsJ+unWFHPM5EqSm1VWZVPFrilhBYUwiLDuiGpvkKV6KBIJaSIWCmgAPy1t7Q7DjbARRwHNA8qzRb/5pfd3g5qL2jTLUmxVMsOMg6XwgQLwZ3QvMVSDfcM3h0aK2zqOdTIyEXoF2tApiomA2NZEYkqjWY5sHbsgw8hA1iRi53tNxiy0eNLpLlqtr91c3Nhc/BbI6x04uDbbF4eMatmz9ZzSSOELeItBLT84f4ixgPwIHKZdcyqrYw8OsLKcfLAYEWHhmK6yEVR4928md5lR9D7kLxjtJPx703dEWz/lulhBTlzULbo5Tm1sWXT/dkR3ab3xn9PfjUj96HJeu/HD1h8fcU0Q3yuLWpOrjGkPcPESeiOGCtOPkUYHYwKmLe3+2y/pb1lG2+PGt/1vOuFDdyQ3uUfGwwszK38+N3n+yNwPPDclxPXgLUAfHvw/XZocAA0AOof3EwH/wBXvvynezes24P2czJhcQVB5jhkJuD1gRCfJJKqSVm4r9+i8U8ONs2oF60QU37QUr8mSOC+4xICljsJfNxkHXibWmhg4C0osNIEpwb6ptYpnudTytmpDr7SxwQWkjRMguMVByOwZupFGHDMwjwuBbExe01pM/7IcYi05b42LYM+fy80cKaYt7cR2z/kVAzTRAeCoD8VjSn+o+K3t2+v2P42M/PgnMbUxnsHlQcBZocNvAduvpG+7n9s3k4ik7a70ld1L22s/q5SORzmtzk/OAf8lzd1xvQ5UqfmPaikOxX21ehA4I7tv3z+AhXVpPMNPKyXnr/p2AB0zm+5hyWHfsshPcrCmCBnW8vrRv3Jv46MJCc9zA6dgp+7LfNwwIUDRzN/y7lyyNZdt+X8OYMpR7292l+H+jP1QGJ8DLi20wKHRxJHcq7/eTQL8hNDWuRLpoJXduEd6aBHx2PuNHRhWyLw4FW2uSBZ2cWvvwD59X8uE+WRkIEisWH1wYMANklE0f8Ebs5WpqSOJNO2nerzgFM/XY07MjJlZFdynAJXTYT5DcLho+XDnD3+tgzj8Jq7Ryc23B4yliU7XnvwXHpnAtoqobhGDHiOxUGdRhQ6AQXZCc6BXEvynfhK/Y+bHcdWSx4ebNM8E9/wGtkUjfEj2h3hwckeT6xRB6rJPiwZLkUbFkgNJaDL8jaUMHhJPKH9lFjfH7eHG7jJkDPrD5uYW5jGbbE1603FLHztRiN8RRgtFG6WjyDv2r9RmyBYw/OaYDEksI/z68uQVsG1SRgjNMxo948TXJtRF2wIIu2+IQg/kKKKUtF0JILjPeAVqiFv6uL6JP5PZ4uJkqsOAcU+/oLCQ30If0Tm004mC2gtT4Wa3rLclqHfxPYcvoAcqqOTNpzAuT4HjMlN30YCc7Pj7Gs8BUjFIuUqN3RgDSat+ZQL6+3v4NO17CXXKn1+A3g5gSxycBaRuStkMZvYnsCkJYc7hnzTRV6SwPQ9UOYciP8c/hhrGkTVxIj3cEGmscYErQp1UtJBb8PY7+w2Nu+t8W2S7znbCY1phaxij7FS2iG1rDE5PUOZTE+OZY2V8qL//3hEaA6NuOHq8q3jf/r9ZDgqxlAkirJKvdrVKOj4+LRZu0+5st4+Fe8Q8OtE7jjg84adXpIiMlK5ULn3mpvZPrf4c9iFNcOe1b+bTKVij05eXhCltl/77xr52na9DT+iODgfonOSV6Bvj1hgdZEzfhK1yYJrd1iiQZFU7VThtEYtWcFnx+QGEJVleRX55XkxDMmzMH4FrcSQ+KiHX5TPQvof/8XwaeVfhP5D6fllQ8thaZpUQ+cFW4MMgdFeOFjio5yo6+kAz8vOYwlH41KaXnCzrcxmUJvEOvq37u+jbNKWG2rW89xGfG2i+ABbIrSVmxiZsMNHP2ZatUoYkqRLF/qa6EEYnh6cxKQwL4de0R4PuXz/EaQpfqrz782hgMpuCK5kV+pb2EPX7iqsSqt3VFF0hbcmDgHvIxtZVMmuP/Y53sxefQ38bvR8mNDyLTrbKhEi/MVYYu5uhU8gOyO9YFzU6aH6e1XSqsPXYbX9lv8Pe0rwZPbkbMGV/E8HC8pDWZTgJadIjAsfwi/xXBJnivzo0bbCr+0iuldTUtxxOpRW1FZOX0wtbs+hHxmzGpuT064K0PtEsMbMNK8QL7ILz9d08AiypdnYY+zYtOtz4hB60CB7MIh+JngOhAk3blQ30V+z2WO/Br/Tp1/Bc/IMasRQt/3F9ThER7JcpDT3w6SGxcZRzg/bD46TnfKFEBm54aOCsFGMxw0uVpd3C0I4EI+YQGUMhBkTlFj0IrRqba4TGRf1FyAct4hxg5wec9MiES3OgVZWJev743gRvUCZRc/STKLPGkuneYd4k6r1lyEddSHa6q8PYi6BixK4yJjEh/QFFTDPR/FCpH38O5Ud5dmYnvftU98AWM+EvDThtSQWyvojQMkR5yQeWQZDTi/wyaUt2zr+Bjgq1kkEFF47zBzlBH9tIwngevqyEF6de/hW2skOwfOvZQyqzeSRA7AQvjqvDBc3VN7mb07rsKahLhe6jz0e68Ne0r/GtgDht1gAUZmRl1UYkxeDh+ELSTBoO0Qu4uirXrarU+lcDSLK2wglRzmJu+FCxUbOJGwul8mV8WSTeJM6sSBLtu1kOUkyyu/7dLJzGqz8e3vK9qEaUCKxSQ88nzwA6fRKfskKyA65gvX+qR5LPoBPjTDIaqyPJriWzzb/LvjdzOaHK+wA3v1Kij52Ozibb11e8a2JgsSE1rRUG6RUsPdHEGL+KGAFGudVsShNJHbfW8ya/3y8IMXL0kEK2KFRBOFlmJ4X9N1f8LMCjAGUPny3M1HhVWj8tjl9gHCT1zXhYrb/or10iNmPcIjWyUGVuluudLfJzQ8hOorYB+FTxCVGYcgI9B2czMIaU/YGt7MGg+k8Es74w0ymlRHcpJ6jHJNGFK8yEsXXOWgnxCHhy2+QXx8PH/jt/EGYsjxVcE2QXY5Q8SvyyEnpt+rhvNShPzMFCjJpPNfFrm2Ena4hzIUekunddx6Rut1fNfHgmLUEJir4vh/CO+h9GMy6yXe7ZJSX0UnUlnpKX+dVkX+qv8hx9R2m18WDjbVuy6OyesTENBOB/EsnYrRg2ZUUeUKmfUKvSDzVmxW+JAGpIMxfV9YeBs+S7hDvQs+5beWwmdTtw7cLF2IhfKxrauCr5EiMa89SNyySyMf4uClSbEwK4Ab6ssjIbEpB7Xra3pmJXhuaGRQ/H0Pwoxreuck0un/h3GDkLzY3lORDCRpOvx6MStbtIbl+uYhBEDzEzLgxe55CK8ct3svyJVt9VT4ErAc2NeMV3rtSAxTv/vTBSeH/QbwwmExvGYtzT6mY5W/GdFS3UySjvDw0LyjkPV3FV/bHT9z57kYFEfyFa9Duzu35Y1ljDX+S4uA9ZYKzpGDw9S0AoxFAUmFYzSzqsaTmW803b15g2gV3TgyE9EVj72KHwafYrwgJ2ObtFCplu1QMOtnhXtpY40JSBKj2dflELY8J+zpPAycIAbsm/ChWhso71R7OcBwNx3r8x33TkopBsQatt+0KIOwGri05SKhLKp/92S6TJmpm607HivC+2XTsZhFNlPn58Ebz9sifMNB/+Gh/dp24ycNW4Tqa2l8B2XyAgeRecj6HyHTbmdoH5EGGXYAvux+AV68Mr2uEbF1tYb7sO3dDW4+OQEf6mZXRKYZ7qZojO0JRxpF53002XiJcig/7e5/SJHDzoahlwZ4LzSQTLptiw8qz5x5yJ7UdgyQMPYiZ/1c6HD4H+2zuy0+gjmAkH7I8ew5crItmcadur/snP7g7iJolIzNfJbMMgMv30k8jPIUoghZU8TdyyTOvYXs6wZPR0HUR/dXJtR35qEQomKFQuHMUz8H50fpIG0+Ki2kxWmjUxKoth1+71pJplfmf0/OTAqLdLLxowQ3o3HqPpBgOB0YK2bLpzEEIM1YmKy/EbbyVw8qPvwGaxX7zhkbqAnBTynbFuqwbUKoGep6dQmL1GBPYx4/0wUOIMEjk5qt1a8n0hqZ6v3U4j96jqDI3RyjmEv6x3rkhiZvH+O81pyih8Ac4JaWr3oqNth3c6z6nsfj5uyrjChVIpJsieYueYCS6hjiGnub/ntRM/Wse5L2bGiJv9sX6IdixiRXdP8/3szYep7ByuPXBT87q9h07c6LcCNS6bSy5pqa4HgQqunvg3+/loVH5bxet1FBw2oG4FoWtUuztLypetdHXp/yaKVl8/PfoeqfmiC9z6VWWq3OgsWzS1TXLnR3gfr+S1sksYjyKF56/oCTuvk8IO/k/Y3uY/5Hh3c5biu74FDNXCo+fOA2EHuZ4/dTLNwadpH7XZqqaOFN6KRqT/01PI3vIdftzItx52awrgQk9wnBsAUk+qevsAOsVNwZtQojyQ6w8PcAnmoDgWO7CLBn4xv27kFzEjQSfkAVuxfPybmc2NbQcn2KEMjiOc5V3Byn7RzGorZm5RRVPrXOVHBnJlKNgFfPtsedf3EvCq+4Qm+LQXQpBRs0YdZXAtiGCgdp1GrK/W7hGaFN31s16cvkoG8D2SW4Qfl9n7u5MJPwfrKfiOmSLKyYNGRrB9+7cnmhref6X5WomxYBAH/ma2Pan9DTh+g/EfDBzhSpbkg3XqXcV3KM57s9L/AQFa0FvvMXs4ZutKaaKqKIgvqUqPMiOY8dx320c2CLQnZdCfekz99EM6uHyXfSE5vM7OCEwDiyeuIvJbsVCcAgezbhE6W8Rs/5zrnskQqw7YGF7s/z9yj+OGpyBdTAjPE/N8zDy1Y2LgNimKY4oRxXNaxY0ARczQsuy08l6iKMus7Bri33/WSdPtfn7U2zDFF0ivGpqols8BHLyF5k/7h4BaVMVFzIM3VC2m7vvXIZuUtEMtRmCjDJ66Bj3M4emrU/TUVzY4W/VZPwPcZD1dnoW4wLKzUGOmwrxL12swidVZ/MXB35d2mEJJvXioszydQbZEqvvgjWFMJu1Q2FYq78QMy0/Z4garJjkPLs/cktXoSAxNmdlVtbzDmPvaEg0OcK5AeeApNT1aa9BaaY/eIl9XUuWyBSqng+XMxWyJWnBawtgSl7cPoqhi7nHVl8v4J/dot6wbCZegDv25cUc129cXd5hmqiv6Vgim0qt81nWXp2EVy0uR7U4nXPy8k5+OVYSN9FWyR1dhYxM2hyes6Z+Qtlf6g85WHPFXe1mdVO7X3EzMS8mIgrHSFQnMHCB6HQkILkxtGvlpveDs+AGxP3wk7BiiPLG542TQ/xA+DBmcLzx+IcCo7xj3LkBuIb6QwVJyrh6E00pEwvV4D0wEHwLqqPMjQ3m3kazg1Hi/wYYMYhsVawyxuETLwNaQRAEiiHC6PZo34GUGv3ChudRnjenl4f2uz1y61fqJb6/9R0LvVn5T2t+v9t9952aJvyVZ9Z45e7Ph/astaZMTs2u4VMo96i4FeUaBAzTIlCcufXYvoJuik+/FoxAUw/FLWSQgI+qAKSeXTqvP7ZRz/qibfHqcOiONq7AUAN8R3CnQdujH+cTQpzHeUSPbksEe+cmRUwYL+aoP1biCURLEsvm34PIsx/Vs/XO44vp4k+xgD/wHyVa8yOYGLv/EemkRp2W5q8JJmZqSokmZ0WEs4SwaxCDifY/HpNPavxDmgoadZoJUe6VDBPKslzPB/qC+d61k3gG1++a3ckbzgSvH9CvYBQoc9Mi46Ly8cEtLrgP7+qCRn3g59zLJr0ml4lzLSvoSbRkGg2g01lD1crpc9251Xl5QN8O9PuXwHvmVyW4uWMX5xyeSGaPXZp1fEIEV+LmPn2dk3rTDrOfv8kNl26vXHnrliSn/t/6JtzUMUVUyJzDjGTOEvyPNQM3owF8xku3Vq64dXv2dBgSsnPHL82s01xpCXnqOG0fFTIDKI8DUiKX1J4arS9vraf6rYVx+UP+XtDJrfehHMcIjyuf+Q5vXCvQoyc2rsR8psRxCRJGUZMhvRQQJAlvbEoSCUDJzVK6uh0XafeXWT3SGLTbZ5lUBaZFmA5LT5kWKMPJhIZUkM5MjSsplmpA2h8TdKY5pjBZdQAEjDiJpEIp6ppsUWP8qaCYg1YY8cw4MH/fQhxxffxJa/ShbHQkesg69egt5ACJTp5h0Vp6MwKTFBM6zQImBEKKQ0CtSyc64FDm7DlGD3IhcPiveAdA5l25aaz9dy2nQUlJ8cnbGnpPAheQc6+fcTvz1PWs29mnTiPLeOYUa4AlYPewTj3t5zKNZ+8A1jsFLFyzZB4JOsIMssdIjBs2sFwWu9wH+FivPphpHHyE0isTyO8SYPt4bP6IBQ83wpzBAfm5IWtaqcH52pBcBtwEn5nP/H4eT41kJSwtilvIVSIM+nC1EtngkAuQXeQ3yHrnN3TilNfi8iq5BF0EJc6CebXxOWynQMufS9q+wZehSMiBnETWYkoPOxk9gLLBWaDkYr0wKyr9g7g1hm8zT0+ONEa6GT2MqY1TZHOc5Q4BdjGeIxiyEGCmGerUFuS0DvRc8T608wgLfIOFqWBGuczhkL8/Ro3zVdjZMDXc+fjjWWj6k1rHh7DkjEzZn9SeVYWrDyUC0i6pSBOX6rFvkCHWONcBMznkO553yPPuZjNOV0lwPs044BNHvkMmLuelkqQ1XmcoM7D3yHddsZm2xWLDJD/Esd/nO2Oz4j1gJav4EgiUY7ZWz0pMyPOeL09KtJOyLL+DGPCTabNoCPvR9n3nH5zfxeA/y1/mnZ1pUDiJnD9Ca4ZyM8O+KTWKK58H9MYOzugZw/lU5EGgkeIOhOURtwuZZBc+E3HB7QjLNUwqMougwP4bT4I/35zERYlhdbjwuBYadd+KS5inKEIIHcTqBqOW7Pcox0qS3nqskez0uDvYKNPFi1cA4y2ZthAsY+tpDziW4AdrUjfB/AguMI/TWy2wIbbMlnFIrhpy9cTw/4tD4t7gA1tOXIVkqSAJrg2O/kRhLh3RwZ6AZCXQjnk6Yng5w6P0pOshcAasRDbY/o5r2VXG1VJXEeks8cy4ekhQ4m2StqObeJZ0zC1jN/1Ehusx0llgIn2xBjoCuNhPfC0Avstdz7dcpjDyOmvRIAqG7qjLZ+Q+3MaoMy76DjCfQGIY7xZJRz8nL/qHnvU5BPi+yVh3vuUKmZHf2YEyQXXU1dJzP6zQvCR9mIdRQCbmXV+ElH8ctnBsWLaEWwyrlbQytVpmq6QWVsxdkls8tqhXjjlMhuHax+pzukKZgPZICxOwMlneqeu+jHhUPpc/ricvTt1xs/rxp3Fp4YeQwgHugv2mNXgMGc0HPT3jzdqM88ErDyQzsdfDfHBJBNEAF5dsnrH29x8K1gHrm7PmQFFOhGnZZtynrTiYwvrx1OqJBl8jahyH883w/qIrn+rDyYsHo2/iqh/Dxk2FH2ISBsJ796MsRayxM39xENLOzuDl9aeffXwErA/8AlnsZ/nibOtYGjBXpLZ2huxktJqiiQPiASJAIGnbSqmhHgNjiEsBicvaA5L5RnPv6e7q7+ru1TUi0W2QkWHIyXm8cyDSXF7nz/+2mLiyoPCN19u9p3YUzi/kekrved3dMBU7A/I1WZxz4WcbbDbtPc3Zr9vPCTOIw56695wOsf18ZVlJaGFISGFoyRdx5vb/lFISOo17gMMsY3LPclIjaozGmoiK0MyQtEL/Eg3AX53dnC3TloCgbkszk4G2LOUD01Iehc4sCrKvf7rxtevjg7UTYP4uiU4Pq6je9PSnpNgFkiFawmzPPO+S0lLHFwLmic3+k4yL0qY4hYLY1IqOfi7PiqrswK2rmbxV/FOzHaPuh+XYfvQZFbzoQP9VOpHT5B3p6RXpLRWa/qt5nWsLTROGE5C+RmYdiy5eZGQWMxnihVZfkQlgfozeM5q56f9DfhUrdEGaaPryqFV+9deX7Sat9Kjy0678q7sO1a6bgcSRvE9sb8uiZ+3alRWY8bbswKSzZ4JyA7U5Qd5c+11FjJlfm1xLjFTGxE8hJkVKSolTIpPiQ4VGyeLjQcJ+Lb5Js7jZVpoHvHcvWmLRlxXlVKcldAYK+LjILNJaTXjohcdChLKAyD/2GAxao1bxx36VyoQhxwTgDtJO++N6p/S61PJSUDH5G1to3/YS+xP7ki+bNw2INktI9XzRf6AhavulriLxFJFebzSsUL5OVymqEbsJy3QGztxe2GqJa9y7yXUshWt0oJJbobjZXtETQpkuvkf2Za4PVHICXaNVfsYGyixA27g/0jK2fBvOqD1HdbUWNhHwAV+ZkcAnGEjHars0KTIw2SOefoEkkylky1daJNPjSRd8ZX4Ke2Bfi9cQah+AlHI61xCd90+ETpTDtYGq0ABVmBZdPjEBqC5Hwx+hDlfJQjcRK7T7rT324D70cNUTCCsrKCirVamSQBakdbZwViu+3EqDLjEQFxdYkcyHB0/0Yo34OAEWMQ0mIqYcJtizDkMOhxx65/luwcr34EMLvfAAjMZFFQWH0Mdzs1tgOoj06sShIIyMIP8NVL0o+ayPeYdJYHF37xqHg+3zX0bUi1niiq/AxBHDzgFAWvglBe7EFztzqXpO9nyjc0ErvGW2vqM9T+9UgHHkiZ3YVF197fdEyzKt1ybN/v1JBHpHp0EC8erd1dyPHNdQb5ewFHF+z5HrN9t0OpqGNk+PFGrN6QyShZbzjbjmydW3ukX8MXFkhBwB3Jd5xmOkelWJfdqZCc1EGn22sHPvQ/Spq1nBXxjGx0tzEw+ipaXWpD43kVaTlgZwjNEfZjGOltg+zjpSYu4O2FDAkFcstN9cGMX1Nz7Echp/lSL4ogL+IVzUMrQKPYAiogdRKtTAMhy6Gy06oAbQmCoFjI8aUIuD4zNgDZKL9jPDAkpf7b5yMpTl4Sto4KEGYJsJA8xKqI+g21GszOLSb3n6KFthAAXn6QGA0wF+PRW1BZ3H8FkxkDfD2lBQlBeQd9nL6J5pEPS0MPEJd/9FLpoHfr6e5QCug0zDRFFlUclYJ2hiSWJu5rYmCDHlxA4Rgfsh2dZ5a6HflNSLaphzsDgYyQLTsr3G8omhqd2n3nmyKrFEnrnnQP9FAhWaOJCQHd+jP66MI6Q0hf4FgQzyf+59CjERMS4AzwMBQu03v6n4g0Rg66vQ6P6IfStTRiEbKFGbSJZ+Yowb8QLbmkR8HeESv2VUy9ItfJ9vhw9dONv4WXYJk2QRsqz3r4FEBQQBnE5KlbooPOg5rhFRNTrtXpdW4FqVR8vkN311Jhhfnrhgzb1BU0w+g05lIZRrxx2He3cz7a80pnIIFj1RDZnb/62VigApjOIcAhKGuwK4WBJLJC6yUnWNYBDLkrfrp84TCc5hELqdW3O6oICKWw0+LtGoeB21kNeI16ZN43vBA1yuvCyet4y3pm5ZH3RVIgB1/m8ECRp5uEYOfJME7TVgtK4IteXu8I9GdUbm19Ci/LNohvgZ1jBAeCUmyv6AE9NRXGXbyeOpi5lqrDC7GKm8iZ0r/tj3exy2o5gT8yAsKuxy1Mf1hP1eQK7QovJrOiOjUf6vjEZ6+qHvSVbp9+2Rvi2IjsQRJBUJcAU2rhEZbSab2qYCyoPcQjzkL1GRIDjmLuMkuq+KmJpqyXdnMBcY65k6N8DNgxm1ocTKxFrcE9mJ7n5hK4Mz2vAeQSm6HKaPG6DtsIN3wFGUBMzpdma/sN/8GrwLZoGEggEzlfSHlGAZeJe3wuTPvwNm42xXM1NI++GSDEv3A6Z9RrRsWa0o7RXb5F++4AbOWISLOHkPonCWiSVGo1T6ijvlKfeBHw+gDTQBpshKy7CLl/M+PDZJKjUZpeLXnJwv3Pu+8lthQ46hD+43Y/1SX7Pz/A6nhlCASlzk9RU35XcCCIPtt9USDwALFeokpTJRXbv0f9iotwwymOTtV9cPmzb/Jc3mRx9h1W4VdGxiqRWJSUrVkrrhnZ8Ts04/s235vQ2fFFlUCdM0OHzuIXEGjNlqZVKSctJMmZLU7Lq6mTXTx+NkC+sXxM0yLSpqmqUMKe935Cnsiry4JSr2jEvxsWYaJi6kTPDu7LzPpIiPI/cQUkvUtGlRqI/JZdU6EIzf789rgirJN4ll5DMkDbAZ78Q34DSkM+Qy0m3i9H0K3KgKvDlsD8pIryjVchdSAen1+I8tymsSoOUFHDAIPhyBFrKymQneTu/bb3urkmg65Ib87qJCTRW2d2mN3kpXpzyVkqNclf9UB/OrakKamU/0rjEJL17P9HPSc7bPC5gehRdwv6TL3+hDZ2clasY5x+VrpuXswJ/kZvN84hdTPC1lo+9HlWoTvArl4EwWuk4VLGI/UI/mQSBAJESy08C6UFO0JiB3Kxq26xMqclEVNKoWQvfOvxC4mjkh4PUUVvc+/MMEgELlC+TcPepY/n7JvooVBQmITdy4x4uaiwqUF7kn+vwBmFxeXbRDgbrgdN2ZnJYFvZ8XCIVAWvVXkYEvrsxnnsZMUm6ip7AbQOhFpBopW7OD1xPydOuF3fLYVZyBkO1FSLVukO/2gdCPxrHEmu6R7dwDIUekSGCDm/TIxaHhyNZNxNiNgoOC7amGamTR9rP5bn6sx+4bW+/1WHbw1khRA342VQhDnMBDo6sFZwjNnvBVGvHfEGwzGdr9VS78dmSD151Z/pv9cxe9JPOK7u51XdEcVN2eAyi5RtkOax9LmAapOjwYtoMdS+y/sXXilGhNwLJEJPAxLrhSKKwM5iyxgg4QklXJcolMFOsukafMGjCFd7bYMP4W3n9BLDalI8rhEUDs2bK5dYgYHBX3S3ZDJrXs3by5I5gUZh9NjltGXakyEeeC5PRzNkPatMfdov6NvuMGNemW6pwky1UGlxbPET0mThVph8iA5btNAmMmh7Y/00Zkm+QrFFpNSqDaXBuwXNZo+cZuIHTIWz3Ppn7yaXkF3R8M0mviisQhtaxCgBQflbonp5aNtNmjvysnxz6MfRW7uMvC3qP3CA2O1FddmLyzF7FDWO0M38iIr0daiyK8xKOlBzcC274ulhedmnV3K7u3vsnr/ZKF/JSJ906Co1WEzTAdC/13AjHaQNXUDwfcLM0KXTs6pSi+Am+Kwjh5HDwDMrqPAdtt/qlaZxdFiyoe3QdzhJAOHysavYjvoA+u0F72/JCyhgWg4UCtU/flNXeZXH64QdEV0uP3QXnl8kao7km+CTVukQ5Re207S7dUbaKz83qE9Xj0ZmidkQfX1PxLvr9vyrXoM+IfF7PxmmVntCSX0w3cdVTdMtvI0NaBS6T9JbJeu0ymnj375wT98uNBaLixRHjLka96dWSOC4ETVpfm2RZiCElhnWj6+O+KgKwUp1hFK8mTVj3oWTv1BnBBWe10aPk4CV+9w8yjLiWnelX/G79gNZy1G1T9gL0q6YHSX2hYWx0V4Y5udCAvM2PP30pYmP5t13/FoSUNjOImkOKavT7qwcbGGB17+aoUYzHZNDrH4/iQ5HP/ha0Iw6CGfZYb6zgAeUyvuHtrqqq9fhjwq8i7+FVsskv4a1tdInxi1amctVxuBsuESw1OEnguvqPs9bheixozwPYAKBXfTY72t/9p7x8wNv/ntRlo244rOw1wjfbxLyCHcb9h/FBUzEza1KvXEDaxCkNqi8Q1cYBdHTyz0brIpOVJyefmnLX06HXXFHRmkDLXJRP9jzsgrZN2Wmw7Y0FJiltHHvMOPrOoKVeh96A+q1P/shKdYZTSRsnhIXPpbn8sJEzHqhncCASOiRBz4CBKEexttihiesWpj/SPnznVvz2O0X4Ff2QCn9xvD1/8fOYz4grY1J+UUAOjanxABT4uPrBLB4dcjLKVp3XXSxMQMOh/4TTebGfuNcx6uj3i/gAcfXOdDLHtXn3nu2Bg2ODf2n9oNyCu15siMPBkUhdER6ABHF6cKeJ4plM95BqIk6yshAEc3l/cCHcStbjbODafuBEAuvPdpJ7m9QNIcZS7lXA5d4LNKA0LhsKJUbyYqWq/ZK1PSpD6pTiHc3yeXkryY5xl0vJFpvFVCcrUsx/4irCPNOCc7aEjXNaOcgnzVujPNE0d3l5RWVsWHM63xYgxdZ8CMTsYUyNquIKHZbmJi2PbYo+ZC8lNGF6Ga4879A4lJQ8lJ5/9w46NqzDedMnQuuGA3VBcHMjtsNNwdtZQVnbTniNDsbFDvfb2vUPAv6UlRiW0e4WYR5ij6EcEzdfXU/yTguILPLUBn9O8Vf5bC0m6xxxy4P5rttxYYRMFsh02OUaUJtslCjfUO0RLlcfFmctsgm2K6K6irS6ZLy4/w2bEgNUjW0HKsnrxMl2mwdZps917ZktdrkzdZSk1Tt45z70vai8+XzsPVFx8GmdPLRC2/P8LthGXBbos/BldAZ61/PryZePjdxSbRlMX5ZJCy2KOJNGygFOSKC6wPMpBbxjSYmYI04RzWOCTmy/cN8O8ebPgEZjL6bpxo4syQ+EQdZaef450S4DEzHrIxRMfsmxPzbxee/q/V9ugmjUW+oMK0Ud3gT4WW76iJN/UdjvdK+3Gp22UZHbbJ7MeAiH3c47XH/eUir+Pf6GsLMqyYnr7jvb1cdjZZvtHDmRhDvu7BsDH90gvZMN1Th6LlVcnzqE63ljHZW66a7EuiSL2jYp1E/uNBBe6W5Sf+JDQFmlN0pW43H/rbGD4k713Kx8l33LtdXa21/OdnloTgHfl3G13tjE/HGLCCCMfaOQ7u+2vzl8Eyyy9cV5OtA5TCfBCPzmCt157jXSt7XhQEy26vXK7/fjeiQu2SX40Xcj0RsTK97J8ucEi2lrvP14tKbk634NqhWuxH6XEmwaKAhb2dqLYIq0slBigsqttvBLXeUELS9wTVqOXoycwI5gJNLqq1pdGKUR4y1+RjTo/UqsDNRmeRJ25zBtT3Ys+C2HyJqoBZt91O7Cm2f3KZ+DMakuwWX0Vz4DPlPv13qMJ7XQ2Z6Si1po2q4nNQjBV63aMH6rEAFu+99S81IYSVBBmeyuMrldcm3yp5WLL54tOlzybdZC2aJMSIzYIF5D5n2Bznz5Ae5QXnPpqR0ZyZnxtpukuTeOZ58POK20Auz5R4Z6JebMZhXsK85DxnseP5x0jnEflmlcIhLVlfRr61L3BPmRfPcBP+1/EUAwQVGPHnANHwSlMKrnUCkfaRZ+LDbsmKk1v+2fLabTMu/1zpv3e95sS7vXPZtJo5W/6nyYYQ+qqHLduGijQelldbibbNp4Q4ICOGKcq7I/cbEifJszIY5dn8Y4oUH7aZDxITg/+XZPBPwFBE60QCB5Z/P+fwdNXGBg8Gpy5dnrNeW2M3FMaESGNS85hT/nT/Oea06cBxlhHzdLi0jabrW2Utu3VcWAJIExGMsye8CUnBIdLDTB4qyH4ujTjSBOCtYjcSZSX1FmyuOHQ+nj1TFXUHkGUaWq8qtZ4DRImq2uBLV9a713w6+9BRyUnYi2R/gb6vajvdPGTKy1BX/uZkUCdN2c/xwerxfljhPzvRUXf6EuGe3mm3jcIYME+rNpni9HJjhWKfUkckjRoz5s0ofpTeqhCHZPpE6LJlUSEWG6cdRV6PuAQtw8G7b61K5z3+zF0SLjC+VULV+FaWy0WgK402dCT5yQLEwQdHYJ4YXJOawebpwXEMHJ7dlTs+f2VZa4dFRXu+wP0y+R1wrFwO2CDgpJCyaekUsjSU0+lVC43aeWBl/9HNLh8ChBT8k2HY3amj/YK/0pZE6B/aCEkkuYuvXlDq44vcIt3c6TQzg2UfXssoJQ+meJ7qvKOCKvEoVxGLLjFJ59eZC2ZwvOrn0Q1u9q3xbzAoQRbJ10fWn+sJxo+S2BwHzcseteTVLY2Krn0HwZrzQq/DP4PJCZSFLI3kfH6ySStJx5QwzBdScfoWcvCDIBro0nnSKe1yR1bbhmrGAEQv11kcD+oiirPR7iQgiUBXFh7wXaJXOpg8wG0PzMu6Qig9EKtXEdZCOrP8uI7Y1T6IkeFF2KpapHlq+BrXwb39LCaN8RUxiL+6J3y4vgvpzzfVTp6oSYBHcYl95L0yDdjy+k9fxiX3j8l7IWaEdzx5UWFwXb6oizllZqSRZaVISvH5bF97e2N3vRF9uDE8iIOTkBbAGXtuW9cus+8GVj5/F6yAfUmBd8ftqh/cuUsiJXsGIdC+1k6+e4JJa3POcNGXpI/MwItRY/G74zQvp/CRtoi5Ym7pZMT/n3xXcuVObMg+ZMX/73uMu4x/9DMiO1rXu0R0vqy7UVlk90BPnXMvOq8P4YtOgtcogzErMh7c/r/eMag5b2ypmwzJLjngCuwDPIcdzZy9ZZ/Cgd1H3O+zuLuLwWxBFDLspoy5XsLY9AmXLcLgRqISVMCm0+wzNGIRTirXsJm8NZFNkTNar/KRjAj1qN+UtjksMVdDZvAX0/5r36Sj2zy/Xar7vFMcMj5SwYWzE4tY7JPw2jDyEwIj/i8No4qoQYJbEpZBNut9mO+ZvQAd5z7rfshaAXbnKX6e7UhM/RvbaDxozCANFtZ7fsC/+1EWyFi40nn037phFX9p7N7GzaM6qeJOjEU7LpJhwbq3q4hRfpF2ORp9TIOPxw4UbdpRr0ArkOIFnw3NZ6pX3spjpxOzVcYDCbjvpvOvgWZI/7B+RzfPsjMqi8Pwzvf6vmN+br9n/MB4t1OZedoClVnpd7nzfhDqdf+SRtNu3/tfupoKujdmdZpH9k4K23Fzm3nKux48wv4RqMbMMh+ZRELMxPsoQUj81WNLgrcwaUwg25iGtYVC3VBbSQvcMN2TqLMp1hYbcejIj8NG+qODsFX4QWmtqNOSC7w1+/1CCcMLOvvK3qYmwJf5sPxSBFP8LCV8fWYRDz/2tc2HiPahUuul/hQ0FwHvxMJr7++ofIvPBSBhOPyM5kDywg4FVvlgtNVymd50pxQqBiB1h7vIoiaGga8XDx68bwzorh+jiv1aCKvsYsuJlyluv4rcYCiEzCXLa7GIWz8otH2NhRhkFUS5UPFFnE5PgS6K+yP6tHx2k4iWLYkMcmVXsP+ineB8yGYerQm4oDKNURkWeAZh2NJXNhT11QS+CMTggkTndPbLI52owDUmoDvN5dubDsQujkMkLd7GQOmFjhaPKZxc+NVjfCO4BoNxMKtqePa2TZIPCwCboSb4IBe2Zie06QyRuvEV63t5Hp1sr8qrUydyerJkDPpad1PCbzLstnDT6gi8AiIP9yJibTlF5M6QH2sRQI3ItR26gg+GWKAxmE00YOSF62tHHfIB9hFzmANzpdNdppVJtFtD50KTop8d7OLe7ik836A0+DNd0mRYK9kmR5Pfx8fI3lIEvdlkbrPGmVqsSTBJ+AOqOD5j0dwMY3JHaSiUuCj/3ka3EXk6fAb7ODEYYjwPTJFqZSl4gPcHw0aISEnNaa4xUoMI0Eb9+HDz9fm+TnXmzli52CjRicDu3VcX7bYX5xUPG+uycQBzrmzTiKyepKRggNJG9ZiUXJWj0SsuzMHaqUB8YxPkWFrDeAW0oU6F1FYStxTsOPIG/qv18T0EdnoTfA7lw9NeBFTYYzSuW/WeYhMLUWt9AVT/zAiRClZmjB3NuSb8hu2xYAxhqzFzgJPJ0GCk9CdskinzgQnwR61klOfSX3il92PKw4opuxDKi1eqrw7GopNN/lmA0NxB6XdquPOPZOlz9arU1d8EZuMBetQz1FhGLuQ23LRtpxNJkWf0LdiF2fGZ6D4YrHJpvR6b2WILSAUAFf2HwvGB26RXgM2bJ5OcSw5/i6F0ZnxBlde+EPpHrtEPavT0sNzPuXGjZOtN25+CeHeGdic6JKgRNVoHHX+enP2bG74RpTyEnIwGJt0c+GP8Y1hj1kM9Nb1Q0bRvwxVldi1xc/Nhda2ZGOCb26TnG1jNMBsyuDWwJ9CTPXDu+9g5PuRmN9z44yBmmOWGPTtk13yay5VZFjBbSuAuBPinRuYCfM+0j/8GaLs2s9+1xYBpsZuxELvYgFmUOWjG+mM2vndVPRc3f+8xsTYDrrM/98OxRsnhE0FvsCSk9vaZjNE/ZKSp85zK1ckJwkFQuHY2Pz8eKoKhQJBcvKOHZ+cAP+dRtr52n+/Hu9d+odkVJD97qAbnlx641fQlmnrrW6mPGtVNXRieLOnHeuuO0fuEJX5xTHm435SiiQ00tMqNyBAzecFhknp7Rb5BuRUT70l0Uv+IqEAZRdDCX/hCQyH5fjvEt7eyJYa15b6KckbnpAW3kY29uyWyQhd6A5QSSf9q2AYyb4vSXdLr3CAEx+9UkNX+ASJA4RMBSOy1zzKQ+kvDJMkuaWqVlz4fFfSd8snL/BQk30o3mJ/9bvTWGQqm6+TuD7x0u7vPC8LLitSw9aFxzhrFL0fySQBn7+5hU8i775DRpNBRhKwxQvXJgzZRshz47Z770RxFOKFBFsAGHhchpjZseEmu5eVlyp01SdXci2TvzCqZxwibQwPWKy1+59UVHhXNHiXL2AjwHRes/scwts8b08Ku/vxQxo3zcw0zZT24cPM8e8DgWMQPYReRBGyTlfZ7mxAGR6LcuYhZi/zLBPQQz09WPmtM+6c8Ux5vFdz/q6a+PKGw4ftjg3Wy52EnvwIinsZ9nzuFg4LjyoPby/tnSsVWIZyxEkit7y6ATixBljgxubCySfCj+4GQp+x3a4Rhjl1Byq/FMUdn6pNzva+cB1eYHw8xh0UEp53eg7nPbrNFN48ERIckB/18OTo2fYk4J93s52StCzJpB34FoaRR+5F1t3MOpUIdDfiT3bmirxNAB2NY/ybZQ48E21tjt7tFs6PM7UXCMAdj+tdxfkhyWkBUKFZEPsvW1ZCCVhuIVOLVcEH5NuybB4piXrwHHOfRfvvrm8mTEarKhHNqgKv7dJ0E1ihfWj/njvgDNYX9qqJCbEe0nEkjXcjlHn303rFv6dYwsmPaixvqjOnnH3uEHgxKji3ELj08FlSdSPbxdXZz8bPUNrOjHvZ3wNPAfGfmqLui3mMdFFN3bFgJ4qm8PfkMr9WSpumVdPGHNsnf2s0FGBg9ci6j8Znd92hc5XrAFcHlR36dZGT9pGNsfsWzRYt1larXbE7bDqxDwk0Tfb+a9vS2KRouqZfM9FKD2pdHHsh2EcGUgeMBwYVg/qDqYPbjOv1Vfr1Kd6KfIRK6a3vrSzQVyuBrws0sfYKYVOTrUIce0ZE2NyQaHslQQcJGxUXJ8Y2Tmy24tfUoCeyJ1J7fsoRmwT/uzwY7EjCEctV01vGyVz+19W/ArDPtvkp5IqMmNVxW+IZViDj8Ba9BniwRaqVJGU7aB0akKPWnuaY6MZHE+lrslgRLcY29JFxI4YkgXKANk10CW78oFreOYkmNxr6JGU5amMtYR/bRhTtuOwAPUzTJFAYkRPZI3qxQxppIzqwuHpxUSBcWmRnoVbxaIua4y1nrhgpz8rkcmdsBifCyYfDcRG494WZWVzuunWKjxe1tUpmvPy+xUWhcHHpGAQzNzYxU1Hh8vtYusq4INq1Syj4D15GKNh13V14wCcvsQPV68ZDvXCXIdvdZKh3bme2mdz/+8ab7xA51A6qgZiKtSlU47/tnzMAMlwb9BgNQUJi2Fm/IVaYnbwjuOV0Ix6Lx0FfQ1Njk1qWGhPb6pQy4tC6VIfEdw8WzUz9chpUg5t+/bdQYArfBRRdVgCpeX/5ywdRY0fnDm5JX0opsLMryF1KHxgAPi7ohjNrus+5orErznkE5At1SBCzdzMg9ug/mWgwBEKC2My2gL0wn9UYsGfkZCUjRkmLUSsvifOJk2lK9S3h7qcnnbKstfBelGSaxeD4RKmbAw9wk9vbZDOSqFGlLSut8y3l2wDrPnjHa7oT5dAWl/CaoLa3xhz0OGhJ//XY188hLUqoDQxVvCs0U1Lg6vLVX+YlJg0lDLEJ7cQXeqL7dfAwbD9dF+3IFycXSE8V1pbAUohSpCe45Pa1OoHI4BKsMS9cqI4TX5ScUGK+uUSHQQQWBAFhrmIUDx/BPm3pdbj9sJfl6d2A5yF2DzNkQgMzQgMymsU5VMW9BBSGsl0PJeg8cAsaCUI+gMoOsbXybVZ+5fxYybFh9RNFxKtWOBspz1EG85uzUSn82TPFydJUaJ5b/nVCsalndzVNlaxQJ2lSoJNc8oskGeLUuT1pgqizb8wOqak0ma1J6sjTpKnVqWXqNHeWpapJ2eo/BzjKvU2j6gbabapTpLQgXZws7OoSJlejQ+3+o39/YVxR0f1rAAimXqqmAlS9kQqhuVLxVFcazqMCVDfYocV1oRS8C97GH5lefVQA8Gbs3PmmukoofAfmL9gJVuZhPvs1gUAwXwnFRLmVMIsY+dPXpcgzlCXIKmSxZ7508SpeEb/Urdq1KCBVk7S1rogwm9amvLo9J61nV5VPIyUZt7AoYxkYg81mpnkkNs0iABKyXDQEFTtFSvLnmEfTldh4bZD8w+7C/tMlGcLb3RntzfGXDmZ2HjoY35U2qGmtueKjG/B4XwEgYVg+YlUW641gCInN41WJ7ieSTgD9viOzIwfDaG5TWGJ4VXhShcOXLfWc5bmT8JkRS0DSGGNpUxy6IO/bYpva2ZPsGv71CVZNxSbA1ymfCeJPERjkOpw1FlETAVSMuwh9X7szIxTWQ81R1sIddixhHznf+TAWupEbI/PTOc8Q+q7gi1HrpJZjbWMeB+7jHWxJyvc+v86DoGWogDitj3ukiMYKyIAMsDOVkdDzvMKAJHeV0ZtclK1FXtZgYMus4tQH+0JvmxEQsdA/0T0F9VJ5CchiRtSRiLapqCLTaIu+0EDuSAPn3hD9wz5WdjmG6gNhrVetj74Ouv0bEyKBiPn+Vt+su6z6xgJv7WBvs91z99uiayehGm994RBn0hXnY7gnke6ruvz0CZmJHnq6YCPwjg1dxOB8w7yGXTOV2XA8m19s3OBKItfnPq6HSiFeWVrJquceqrvUM/XHEToUUBvjWt1CPJ1DfPPLWHiTW2sWJ7cNBuMUKaoizpvNnIOtzjo0dBP6zTOib8Y0YjbhnF4/w7QZtaLLgTK9LtIQCUMigYonAuHi4rp1AucKVu44fNjSEpnFJrV6rowte1S1dnR06ccFuADv90DoZzh/K3jjmD8lbV2ddlnSGEPteV01awFXUf7fU6LxTtUwE8KSEYVOfWccQn2z4XqAwEaFksoEF/7xslMFINzHM6rC+LAUeCGFAi48rvLQ+HwvbUDwyBd8bYq70Oad0Ur67MDa6jqOryaAfdxid8W6+SA3s2I7QlyyY9hXrYTXRbug3Oa3LDC8NN45J7AGHGYdcUvj2Re4C8g1QqHm43qoageA4D58Nqa8yWFVr9SZj+xMfaE2DjOckVHFZ3zCtG4Rph4dkRCwHtoaaC0GoVQoXYYj2Tsjv1htDr8FcN6mDCrUCqUCN3Mp8BQDAnLvtsfg9E2zVYnKhCRfZUgmKltvPI4t4smMMolpYdOW0PDI68wbXmKjjO+U3mYvnlUtJymEY2XcEzq3U5ghSB237DKZI027Lcf2hJqNxgjLHiCFg9bVsZnW0qmRXCs/blKqf7JKleyfekGcNyWrUv0vCA3UqZOEXP6jnz9/fe0Hu3H1vgRy1TiLy82Nnp8TrVaMVUVNfPrjxfWDGWz4MVi4UZCUjqWawvUkvYnaKl7Ec4YaHZwQA9zsJtLyIlD2RksTKpZn0hZmH1eAcnb9ATinlN98f6VOFGRt/VVkRePSVyi6sb34yJ6yBIgR3gzXWaA6itGCLk743rFtlvaL1Ik3t4R+Oly6O4zt7H6xkWGAj2xK+21K93DJw5Vtke6FckI3GN9Q0HUh/KF922wVs5tPhKZqToS/ajt+6IlLYSdaVp8Ivazw6tUfcqq2kT5Nb5J66jRHb0/r0wfJqljdOLN4Hfw9+qQaHFg2pzK2Mt74rDB1F6NwLvyOa8/qTClK2l56DO8QoD3kXGFbbkhOSBvw/QeuUSOjRCPSXBVhbSzxXcJTMQgbsCErJW29vzitPWTkWQTHwfg3MaXW5wvs8z4z4w2tRIGt9AubdPG2Adec64IpYhSeNqSb0w35whU4suplNUGhnbPrOb9spe22sp96rp20+OHTqjQ5zZl0FwIMPGsE32AfzjHeNOc4BWeZhjH+3lrAzPuKzt/basRQsHexfeDT8AvFAt8AMYVdn/oMP2gLdaljgqth6LlJRbejx7R63kfJ9k+RJ8l9yaPqMBU63E4uEOzOIBCUd7G3kV93StkOhTa3EC/6p20/WIXJRANifrnQ9t3mAma2ofQQUZ4LvWR2uTPZb3oRAGUd59h+mFIZBgX1yjn4w4XEj/5sB+5FPyB3IBDd87EkeDJDda/F96X6ixrD9VDkJcrHf8YPp19fXgdJ15aWHwH2WusFBiCk/OfbU2SjS64qtoELwJ5rPSFywC9HZsixLHMzHi1hNsoLKuN/vKc9p31mVRP1N7sHBXfOecRx2ntaiblp3tPkqeyZzzPZ0+wWfJTL4vqvdvyTb7EanJlVgc+eQ3DnB/Xvz3IubBVQZuGJsZGLiXTkwWefwRMBoSM7DIs3c6UCuNbbbhJkxehoFPcDpS9u2wcSvYV7hxMdUhlatsH1z71H7BPA/BD8Ey8lZ/Mb7JdRXiPDRI7XANZGy5o07RrIarh2tQFd9JE+oZ74yEiQRXlTwlnw/ruKegX5C1qX5EZarag706fQHfAjhmEeofsotDK44NpgjY+pjpmoToZQYzZXDjiOAYJ4o/4U1kN/BpxGU/W78d48C+qnbP/uq9tzK0RMxd6KFH2u6lO3RwXRKfbNI+4cQJzcO1+iJWkJpcSy3Sc1IC0AfLBqADIRi5gCKcCms2dY/to3MdOgH+IJ6M4as0U01vUvDMh7MdL+afAt2ZHfYcB+CpSGxhaThO+iY0jFuIEc/fbtAwzKt0ZwbaeUd88TyV5ygSyVk4fku9d/eUDaV9XtOPZjOCQNHI54FDAqLZ2CmMGUq/Byw8t5SkCaru2qQc+ScAbuCe/uefGXTEwt6YKHLIRW7xPw/bWuRrteBpZ0xwHvR11AEe6XLkmuXBJLBu47jPBtVehB1VT9ORUXvr2y7SZKWjZc4neoj/eubPL/X1blaxhrCKiAnb/1U3dM/7wSb8zBRbu/M8C1SpdliAxonkOqAKEOJigxYfAoKBfimrNMaDWW5u+VEKxuXLzvNEtlZSIeR8Podch3E9gJTYzpvo/BX9Pl/u5fZVtRpT8yntspPI0x89rhTYdu9dfHIv+2DZtnsQ1bLaZO1BoqyBmydV/7l0rXqBhxwQ8ZnL8GyfJOgMoJwRR133546n57wQa5c7ZdhgsjCLhs9suuAWb6nKH588XpLwc+PZGGZorczx4QNsY26cP5ipaBfBWHYetgGlt25iISC2J2zRdo/XYbqpH2c4G3Fp5mcRs4Oi/jT8+4EHtMjz08RL14s7QiYt85GOA1xjUdWloEpubtUirsu7sMTngQ6FmqPbt1QFpc6a/Lphai85NW6SfpAwPDhvvW2sVU9pokQLWu6aevPketnYN8eG4y3T2DRZwbJ1su/YX2G5z0wLOgT39FdWGWgNPHYNPU1T6F3AjgalUpaGXcNfzDwIvZAP+25/UF42rGClBxJXCZG14BzCxB3OZFOUUOccDC7I0YoGHeTwBzzARFi6mpvd6JmYkOTG7iAQDcMYiaQOADgHE6fSWoZNl43yX3FxqPCi+G2jp78FtuRIDfFO83PO658Afu8zycvfjTfBXFaI4OmaC0W+a2mi2SJnqIW7crt+e1lgrj7fhGp1X5po26C2U1FFNwE2ehcpE9iHRGnHw2O5/j46FK5GehOSlpy3x5C34puTkgzLDLdp1tRHZWLDgtO3b6fKu/9Ma0w2CVs+o5HOK7F8TFXRcC2Aih5Skq0Ro+NQdTTvuQTRdD4qhZeSm6HSnhWoyyOLiV316RrKRB/BU2IuHf8j7T6tfVTyLcXzMN1DrUT/Oi5OXujdasKtm1xLTAg5dCrwh2RbP9MA6exSBfH1+6oe0VtrIYErM+FlaMxCVnb2Nvbe1yLYnIbsDDlja450V16+AlKx/9hEY8QOoVTmw0x0+HiUOG3g4a/OwJ2w05WIq3UYQmsgX/p6h2XywQUr0HnAFbDXUjOMs4TOJ/OI/4mvhHIRx/nZLLC/iV5kiP/zpmtcYCJZowjRcBzAVC9q1dy9/M3YZsg1wYt8cAOdDOizPvIJ2Q1z8Ld1645h0VB42buoi/hbsNdRy6fxwIcM4ZG+P78wsLbNHbBge2nGlufmvAFSNMv0yIOpzh7dNrB3zJBTREm6JBg/d3uPjMY2mbLZrL1ae7dtH2naNPReAq8nyCI+GJ9k++ZC99i9d2z0p5mU9pSgJEn4Ka7VKI3YW3woSzvKMRlWg76jCpCEWCXH3H3y3b6VUiK/BuST1vueD0sXmYz7Ohz4Pv34QAcB5SlJcngqF2IkCJ6SNCSQHuLVJEFMvzIggoo5hren8JJFRGYOKBNytIbS7YlozilRyjPofJo7eZ2ugm2uFlF2gmd8eR++HmFZZUIva6nXPJAQyj2qQuTUV/wzC2UptUppvfeCEQ8NFJYb06ZNkbDr1igQui+PzExHmUykIkT5CbcSL/D+QPpvcTHybOMZTOQNCa2wdItDZ+Nb+NZvgNA/HW7QOPw4zw3ds1MP4Az1hp00qL06EMlUHDbpMSwNexxMAH+Pj0Bb8EHP4EVNWKGcKY3ZztvVNzHOds3Hha2I0nze3p9vPbz+/Ck8YBu0+mQFNhAWUKtYFAk4popsBYkiAXFJBhsqMBRz/1b1CqlId3kDJYD2T4ANSHAHQ5REkOrZEybjjnXuypDeye5MJd93avqAyp7HlOqUivLEjW92w4FesV/n9fnytlBYvqm/h7J6Xz90SWhBVK8WNDqNmR4p6rPTUluJLBnZetWEjNTmMCTMXJx/qcFJthaxNV3STK0mqKdxlirwNuh+lIQKYGSPPYvQgIzPMm3FBVOmVgDxFA1ZUGBnjHAwehwusHzyUUDQNhmbAoj62pVU3ibfjt+MVd3MdhwFFic8CBKCTa0AOJMXyV6CyUCsyOQq9eNeBLnQSewkQBm5Wby6oZnC3s4dgeiBzignY9FvdBDUYXzdGjW4/m6dqwHXW9XeuDvAcjx6udvGoKDG0MzcA88G6c3MwQnbzHC8IAJ4IZEOYVQO3Dfg3+mkmeiJxgsdYFrxsMHlwfvN52u/sV85WeHBmL5CGZKB4SpkMxkTyAURlnecHFz+BCEFyqXISGKpTyRCcNbY6Ob84wewxKEI8xWZfr/7SBoqoceJE2JcFguIFfCV8o4U1DwYi7T+2PM5vU8ESL+6reTTQ8KXLkRlE1VjBGp2xkso5LVkL20hHhkZrLsOz6cBrR5nICYPTk2zEoF6D4FqIXvIGeQt8Ae0m8ky6nH/UsdCF4/CHCIfPZu5sYPMY/NLil/Aa38yzO5Hgj7UJfOipEKDvJZTnJBwaWY0jbduojoHJoN9rOqjLe0kc/RPLEKU6kC5bqBL9O8rVno+wDGw5C+Xpyt41zsIzBf3uA142jYDx4NAjFRfkRPPAeBJNr690ZqAUUD9dioLL8LDss/Vf6WbVb+be049nw/plelpzVKxR0WHUAV6/W13jOxXuPb1vjWBSuOu7xiwXI3Kx47qbA5i8C820fP6XzbrLTnxA4PZXzVjEB/xBEbP2vGxX0D/FWoD0Cfj1ZSODwY+XVz/2Gt9l1auLtleLmZgo7W24XKwGHXTDvSpFSm4tVVV+TyUGq5+J84hwfVdBbwR7wqbpJjGwojySK+f3RXBSv95l1GC8qLUXUFxoItIFwRBtwNiPekaIYVb+tCV0TEeJVq02r9dyEnLRiz9qQiG89nU9G66IlztunBv76Trj9HVwWIInrOe1Y4QKmgyPhui7w1bQOueMN4fo64S66VjDXYPiejS46LQqeRUZLR7lMfOp2oGeiSavjJcFciEsmge7hwRoyMTg2qDZ13uCO6/eUKB5KaZM9VFpCPnjHfRMACzElqX7JAT7Jlb0DyfvoqUHvhR5d6a7LhkGXn8ghEOcDZjfDiAqHrz8XUDxLnvsC0s77ppt1L8vyx6YSCOt/irxaGSy9mLtYLkXkFNDRTbiOk7+vRMronrJj6wMjEl2oTLVuSw/P0yFKxqBGJ9ImtvAHlBiz0udqEn7HBJ5gnfQs6BLuZqX2gYDWdfwuD+12iIfRMtC8CicMi8Axa7rrfl2aiFW2qw6ofAqqw/+QBBAL/m26w8PgtXjeVjc0b76gpEV72/b8wKwsek6vzgugcv+SIdoCbWgnhM3nPQhs0zM1/jGBsjyqRjknzmEf2dOpMDqmXeS1tfa1b89vtdq28OW0YIUgwTHaayrDMunmEg//cecnOEV7anV7/PxK4z26dBCKpppUQ7RhFYoFZfACaNpuQ5jk2wGuQ20xoFIlK3ykQdEAPU4tLO2p6ckSrkfxkHPuPNQEQnaFri8F8XmSUKW5UVwpo0EfRtCJZgLAVPOR6W5wScpEQ9A2SF/JSBYKJqnjCinS6LGQEwP7k4XmEIie4PM1O+723GQmSEJn621q7WtSNyNvEYF1R8v1y7PCpVa5cWXkFbRXPLz9hp1SUyu6cub06pMdacW3ngbubVihOX3RLgDQ2XGwnLtlZjnHkJsZdeqibsSpFq3aqOhSmeolv6p125iUCZReWb/zOxPAPgge5vvOHv4X/fyR3av7aIdASmD+RE/WlxPiQNcZ1I+yNk4OWrv1gfIXlk1+6wHaEolsX/UJQTJPQwf37aLD3gDIZiSQg2RUNf/hGnDLttJvGNUpdL1ftrkVgBULWA5brZv//gDtaRq6ELtxf1nrclqSzckGjkpkSUeVj0oXaQdfLHccH+AeaUfXUa56JbLFK8X1XQIus0uSXFouu4AuFzcNUKf5PZGNh9H9KQ509BTnJPDHPDhCeDm5MDKWDCNd3ybiCu9FNrj8MnbXiSMuPBfOTvBrNCI2tpldaOW34qvSjUg79LhCE+BpcIFvACYcCQmz1IGu9CbxrOytbAMLsthKcVd5/n4AbYlLZLthVylkKQALrQfytXlklyRLF6iwaXRWWC/QdQD4IetiGuz63/miSDRYgCtXwSUaz5CPD3bwQkMZDIfp3d+Jbz8jwoVx8HFCvVQpyd3V//pUDkAqCDirdXHDOPhquvpqGG6KBGtR3ceucx7bJtXxmVgHx4OPqQnp98aUE3X8SaxTDvcPZCzY8TskLmo3EckMAO1BZpBBPOkuqoaB4bODpT0sm5x69udGgIg3KQIb0W/8M8hQC049YRAUBsKUdh5gnR9ek3cW/oAuF8LK80BpYJ4eIg6gerCWB2HlCoEgxPTtlCxKPX+szsfATmmngCHa0rY4sdoqN0rxTWjnbmdCpKJjj1Uxp5jdg25EOznd4CUETrwRbeUxvYi0FhpzDalbDVjxc0m3rNvmdn9MXLInvS5OcwWJ2D04AvEeNy7Z0JNceGDfJbcVnnkCsvtA1H4QOh2qX9Pp+PQ0dC1+HfvRyIIOowyYkja/goBOJ8Isf2izyRUAzYOBdXEP/5xT53y6bQYQtAKN68UuIX92HO8QiaWSAstcjxxm5vT0WBYwc8mBu4DYwcxzksajGXQP0pAYF2lw2VtWjxtxLyLqBYjpejYqqjfsTC4SUKzda0Yyu49SOHvUsMBwbuJn4n3ut0Qid2g9amBk4GAAqgaMg4Dyp9J1QQaAi5UBQIODsJsGToD6QuCGDR1WfPbBl7mvKDZuXlfTqnMWPty1Zk3jMOQstLV9XbNx8csfhyGvH4MPk0tAAzBgSL/pJ28a9+aieRN0dO4UI567fD4vDyV7LkeNwHzcm2dNGc82Id2Ip0jiKZ27lKM9qWOO7fQp8Xv70060sXX2lF/DU3NK+MWcITkXeUmOS4Mf7xHoQ1kdm8bwxkiYsz8KY+AN4mHvNrxSMFr6U/+6ds7wp5m03bOyCX4z8x9cevr+ou/xz7x93/7l88hzp/8D/itVOf69BZ6hyhf9WDoBGolqdKoQPirh/CO465RGGXvn6Kjqahih2lkgb3GsfFtOHHWmi9FctN2uoZmklH+LLbmfIiTUk1NkwR5R/MfB8wmw96JgmAhyiSZMCdh15hS67pWVkR7ETM31bRkAdtGOGkng7LGS+6aBgTbMDPkOaRApkTdbpjmgNPdGizNI3ZndU34E3BVHa2XBIw7VdSLT9DAbjOAQhVw9U3ITBOxj9z9pi794eReD2ZvvKpno1gQiEkzmQRx3pISXm2RN8cPNxNpboPI2ytk57zbsbeMK2DBw/cxCZmSEuuEvUwm8732WjabqU+51bnboiv81iHJndciteEeqWo++9VcTMeA171+VauRp9coNWUcfrpZm297Ekb16uujsRC2C5svAZx21LGDZ/gpWxM0Fe9OrG/NOq1r4MqquTk1EZGslJAdJkiTVqUYrT3C0DF3ni/K09Ofx6305W2M93hMQHqFvg/vYlx0411qJod6g2QQlIWhABPzXAn5BosTZFw1IOe0WWuE2Qeml6OyTqE6hmUrZVitnpPNzNxZ601vSFHhMUMvV6VhxTZW9+0iyzFTr/gE+b3TAjLS3ZcSclEjI/WgFdF926RY0rVuls3m8MMuGVOXsBwVrAiKL7KhDUUQ9WtnqCvZIw0OiaiMMR42/aEalSIV53UEvy/YipJNMopFM1ZV0Igv8J4HvueAYgcjk4tbiOepwAJUTHnH+Uy+SCMjAm/1qhyT87FEPq496siRJQa0WFxm4FU/GSRn8iShPq1iEPpoKjqE11nnZY4vziN7QiJwVKBZE7Xl1MIhDSzLtyKRobh5Mbd505faRZlOn/zK8sm60Xo4gPy4ap6Szv6i8zYb2+YhNiSANO5K9mv1nSdREKKUR0mFeVKNXZTst6CHQGkWQFMGRIcEne9wThoQwviOSogSxRoR6TBoH6tjtYXUFfPZaBwQCXyeyAvUIebOX3UGYBLMzZHDoChitY0h0eb1re+ZaS4bFK8KZqvAljCdfHWnUXgRIRZNOU81chAgkU+aaRa7tncet6cFHghBSk5Q2ESmqoEhoq16ZvyceK7H/Z6PO65cFQlxBkE4C0Z3Sowbitzc+5hMgzPL/rPr0bUcGZfRXja5SH3WglNUYoh3RyA3p0Ee6WvSNuroIcfZeszsrCs5kAt7tPAN0st5qJbbdM8PlcngT9z9ZGRW+uacatmd8VTuFk5X3l2W7NZCSVm07SgMpikh3uymR0SiOrvQjUQQ+VOIhutXWH4BvqippkSYC75mGK1jSRjjyM0F0TCsRXhzU0JAVaccwnxWMo5KCg66KKbnoZ4Y1KuVbMZqZUpTabC1076Tf/ba2KdMjD6oMrXYBtFsVGmlup7TU0/6SDSnzJPuGQvpm2lKP5MdZgu54zl6ON3qhbKmStbMZZbeiA3QGFXLQmLKSpib71IPG7mPJqzNgaqWuIkJiJerZICLXI83m1N7qTe5wxnXJYzvySLR4wnBl145p7W8kOvhl2UUH2pRoQO/bZ61cyJanrZFBf2YaOOusJowN6n/bPo37qumRLMrLkWgsS2NnnaIWubBdrdoRKsuxtYw/qSNc/c8a1cx6QwjqDmaUKOfSkcvfjHRkSidq3FKKoXcnYqIjlUe47CL3g73RESnFnOZKkaqZrJmhO/lLbnysQelI5lX1Embgna6KN3lzt2wnayAuqyHdhdouM3RnrhC5rZSpXQJBvTPU2IqRtjBVrrZvRXjUg+8yzzZrWtGSFYRl1y0jVIMQQczUKOqKIu76DC/yvLdeo+oOSCr3K3NagURkjbqZWriVC/GKJllkj7NhuBLgwF1ApXeaovQw+9qqiBWK1LuY4dKBR6DQfL5zhs83l3vTEhmUU67ZtZgrijiJLIoznR5IkibAu89IG7zTLvaoBfXbVbZUO8pwra9ILcTPMfLx22UUKIX+rtELOVKskCgZsEuyVC+KDOTYQw8+s7SlP9/CId+eTXlXnNVjpye2V0p1D15WRBZFOycBcdwKZlvjWOqRJSs7ATdWfb17BOW1HXgX8j2TpjPbZrfjslGXfkrf14A7fvJgmeAXqdbAF54JE9+NnjeTutZfMN9G+vhwGQ/fju+HWabHUaV7eQnHf5tF9/odx11YETyfjLX+nlxl3H/ww234gy1/9Xfz/tDg0S45/3lcBBt+J4Lu8bXOt39BXbT8hqfDXLH/LRf/XWbEbvn6z+n9y2+ptkI0OGWc8AhSLtP0AuP8SVeSAFmMbuQH8NqcrK6vPGU/5JeeoAV41f8DV6hI1JNj2oUmo+M4Gd0psLjReH62awYMwwlo8n4jiw9m8ll5+hIOHEfS0rfBE/zcGJ0H9P+tisBDf/q4GslrOeLRRH+9IPPYrqfLF8dvfngh9W4zj3/gwzHeVMMWhPv2NeGJ+dZ4m8LFWz0l1fl6PgfaT/HJcn9RBB7608fVSLRhnvrXSwlk9aG36+mSyH4TRoZbk3qnmgfKxx5v3NSwaVg03B3pazHVNyPL26TXK97qKRXQ5+sZVgtZEyfLhb8CC8KwK/1fpQYY/iRev3l+7K7/VIbEouaR1Wuf+z4AQjCCYjhBUjTDcrwgSrKiarphWrbjen4QRnGSZnlRVnXTdv0wTvOybvtxXvfzfr4ACMEIiuEESdEMy/GCKMmKqumGadmO6/lBGMVJmuVFWdVN2/XDOM3Luu3Heb3dH88XAEIwgmI4QVI0w3K8IEqyomq6YVq243p+EEZxkmZ5UVZ103b9ME7zsm77cV7383YwUIi/XpOsqJpumJbtuB4AQjCCYjhBUjTDcrwgSrKiajq9wWgyW6w2+2gTZn0XgRjRDDlVIfaBopPwhL3ecf8cKUF11JlSihtwxskZRHsOGGQIb3HIYxxhV7RmqFGBD8zce8rIfiJ6TlQoFmnpO/Fn46IWeuD+rw1+hoA5QaFKnB3o7R0mQlrmQvy1vW9cQN49zbb2zOg4UIW44Ylq7c14wQuKU4RO4M77IbXvpCqPYEUZNTRc/UdokFDe/Kz0O3mwC1MtvqDExZNh1TO5l6fvyD5LtZSW5thR881ykBM97GQg9eYaGUcDshAkmglnKlZvNS1k/pbwuFW3qQik108FbTrE64u8avR2g8FSAk+4Z11HW2TasmdHhjIMTp0hrjZbJN5mBCsRBqeWfTeyIq/tkL5TccGMqpRkdcrtvKMm1EClXF1HWxC0Nyqyj2iSh6FeTbOt9bvDZKEgJ9CzfWYlIjvqYIHvYL3FcschDHCn2CWlTuu4ACo/l5AE2OCzHVMP6EGY3X4DepU3t1LQn//40JixXIZEaBl/yhOrtIopSmk7v4aHJgTfoTI+rhHjxZXs/U9o9NkoDRltX1DL75+Eb05cypHd7x+qkhXNOCkC3ee9XjHkMxTANzxeXx86gjvqT2WrpS1LwfBGh3irvY8rVUha/J4+RNPjs8NoN4y3wOR6nGXZK0Vu3mcDxV4TZjS7QuadpcAvlkZLCejWriTztSGXVgYIj8vJD8OC0SdLGgsGHhTyipVWHqiDAwfa0Z/Eooy2iGEggAIBRLj17ElLM0cNXRJ+8+0IWf0BiuMX2tkE98lKKVANByv7LjziTAXFWdGFkT1S45Xyl7WYMbroOGBS8AJF6vXywMAeBs/8elwdcH70++9YJl+Q7XacIw6CusPJwXF2S2gQHtzczPbilpPs//Eh4dJy57CUEbrdXCrR7hQxv0AbZwz0gJltcBJvnOLi3eIOTo+4ZXAKq1uHzfniVGqgbgiYPd75wIarn9HaI4yvHld9c42eBJxj47i1wSfy7kF8tq++gDlFQ9C49X6vfpy8wOyfEUsZNqN/VuA0gUGiHjDYqdEfuKZkXsK/v4Q1dgtxTm3jVfsQ2ze7KUR7kMftHKhg6K04XVyMjGrB6XWQowYebBA0Kj6glB5kzF9D2WwHb1SSIgc00FKKydYBrm+RkiY0Kj77ebiSbQa4B2EPoC8cguhC6R3X3SNYhISFzIMfNh0MO8W22URcm09OfyG+yTean3lBr/jh+hgp+va1x8GZtF1LHJ8OivDsxWnHMSjiYukcWikWfdPwENqjfVIXRVK/HSWHBAnx2qVeTyfQJO5KwuXezJjIXPTokuz4PYnSF/ocShDDyh8hXD5fltbj/fX4hqt/e0KzBLDRzF9SlbNs8EA65WU/ZbIx75AxoCf957xn/mRyIRcy2/w+F827aPDQNGROyPh9Vgm8DB2ZLE13ekbAgQ2cQO1sKhWXAaBoVptmWN0cOOIl45gV6CCijqMy+phrGClAMrx8YHSmLoQLgQzZoVAcfvx/SO26AnfoyyJmawJ0Py6FYKd9rNZYKG7IeSgkvs11xYTH0pgq6qn+D32FVczPJOePRoLM+EKzmStihUJ3HBssWAJ6oncNzJ87D1TYO6T1DOFDDzk1vKa+EbdnV/fJfzZqhYDzivxsjvm1CaSltHto2O3cJG6ewcnFg526BXT4VL82aUk4G8hOIPnrnlrjoQOVwBcwSBBS4K/X4jWyWGPGFhky6tRBb4FKmTvuEeKGqe9oYh8ZM8iYjndMYyduBhG5Hlf+8EC+/KHvwYDjZXu9yRa7dk/X8ipYRMKRgpsljuT5eqN/4o2R1lT8okpuSb4XOKYIvHfFPMi5l4lF3NLJYqLLHSyr/7ppcr6xek+Ol4SAgmvrLvsavQxbAp8FCPcCoqZaoU8/mxffWB6s3rgvptxLpQBLuyI8o4SdAag5h0GSWsERg5Qm4SxpIUZy0Uu30qyGekft++H1TAMvNni0ocwO9RLe+5GJn/14aDNDEvaWw98/s3Cg5pv0g3HfXaSMozkwPd94XcNak525Il8aEt+5zquytUB6D7nuqE4RypkVYsGAxMEV5iueXsh8cnYiBj3ObIee4wvbyM0Tss/EpRBjwDihoDvehLbX84ADAoOvE+lro2u8+N23acO4gRg3d56oO5mRcD83YTzNrc5OwovOeaGPQtvRMAscgfEydMBLtUwMBKMCcB0uaJaCDK03O01J3RT18xTzrGifpZ8qz6OfrVgJH9xcOE9w+CZ8/t/QFmOZ+zxM7pPAspDvn4Ng2sB7fI5ko+CqaNskuBMn1FmwliNQKb2DB6SK+qdqxBmz5qBOblhbke8iEmiTneIi9Em20QcB/176qsQ2aR90tA2EI2xs0SBSMKDDg68iDo5bNIicojnqSRr/QdonMQsaMWc/cD42tsfTAe7YIyLjgKhU/Xo6EMLCli4+OHji8AIwOuwBaNCU/OiAnEagw8r5z9iA88NERMKR5qsR+j0aoOXk7dWpfbRb8yY7cXhFY/9p+KJPApalvLptRIH3a+C0hnqniCdInSDqKxiy0VkIOTywoEIkzj3p1duwVRngkPGCIhp+fRFmL5OgrJ0DYzvVxiGikHEi2KL6RPfhajPTAccChmeFZRV9iKZJ4YbTVf+iYLdggSOW0YvzrSPkar2uimrCAWdf0aAIe0CHS66KHJH9MgxCneaX2NMDthR0nE4WNXrdcMc3JZhI+YHIwqNSvKEzSdGOvYUVunnBQWWP4J2KFOBYZVIFtp18tPttCyyDfA0UcdD2xCSdHnU4LV6IU7c4ibdllZLGdVBefBQBvJ0hp5dVh++g9calGTkew7JrGQ95kSCdj0wWh/5Vxv17H94/1fUY8RYj4fdt6MGCEXfZ4Z/aKaWC1zNQqW87qTcoO8SNGGXfiCVf9v1Ntz1AcfNEunkXx8B/BstEadL0YCsY9CQs0toRnn1vw8Q58MYJ04FLkUxxnhdY3VDxd/+AjwOpQzifLm2n7jQcGDfwsU62O4iTPOx6hId1A7+/NyYgDkUZlW25V74+yMkDdT7y7x9tvBuY89Ej5R5C8Y9H4weSbeHz5wlTl6DRrf0MUWNtNxPtw481vj8pbsCW0PYV3sr5SUlmuTUYn6TIjzY/RW6IFXUknhMmn9cZK0UU7pJQXkdi4O0y9AJ/Pen4OZXu4BgcOARI04ijKuWMOh64bCK3/qDk2zwQvCJnMUTyAssJd+47asYrIysG6lacd15O5PHGrpoCf3fSPMs4MGN/ONCVP/b9NboqLt3NF9Zhgop8hRRKgXUd3FNB9VmcsgNXuzQyB9r8vgeq+yuGs2bcEtYix/t30oFti4CmUGS52PHVQD687Mje9ZDr3ANHl9psowiiDhDYBpQZvCmOA/XPpxlRiRm1U8j2KmDhrwLpu60MdUsXB8y/dN3yfCrfa79KfV/424w0hDS8bGbh5MEnlfqi1k8wxzdKNyrcIqULOoGxOH1HhIJBJfBzfWIo41NkD5mn9RTcfAJDtU38FwA="
+}
\ No newline at end of file
diff --git a/src/resources/assets/js/state.js b/src/resources/assets/js/state.js
new file mode 100644
index 0000000000000000000000000000000000000000..7a93368492cb9204ab7a6471b68c9ce71750021a
--- /dev/null
+++ b/src/resources/assets/js/state.js
@@ -0,0 +1,55 @@
+import Vue from 'vue';
+class State {
+  constructor(module) {
+    this.store = Vue.observable({
+      /**
+       * Vue.observable 只有在对象初始化时定义的属性，才会被 Vue 2 的响应式系统处理。
+       * 勿删data，主要目的就是让state.data是响应式，computed才可以监听其值的变化。
+       */
+      data: {}
+    });
+    this.module = module;
+  }
+  /**
+   * 使用方法：
+   * computed: {
+   *    getState() {
+   *      return this.$state.get(key); // key为set时的key值
+   *   }
+   * },
+   * watch: {
+   *   getState(val) {
+   *      // 处理逻辑
+   *   }
+   * }
+   */
+  get(key, type) {
+    if (key) {
+      let finalKey = '';
+      if (type) {
+        finalKey = `${this.module}_${type}_${key}`;
+      } else {
+        finalKey = `${this.module}_${key}`;
+      }
+      return this.store.data[finalKey];
+    }
+  }
+
+  /**
+   * 使用方法：
+   * this.$state.set(key, value);
+   */
+  set(key, value, type) {
+    if (key && value != null && typeof value != 'undefined') {
+      let valueKey = '';
+      if (type) {
+        valueKey = `${this.module}_${type}_${key}`;
+      } else {
+        valueKey = `${this.module}_${key}`;
+      }
+      Vue.set(this.store.data, valueKey, value);
+    }
+  }
+}
+
+export default State;
diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index a17a35c3f810d8521214a54b6f7eb1b4d5f2b1d3..a13b5964f7b9555c93653f09de65b5ef39523045 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -5,35 +5,80 @@ removeCookie(name)                           清除cookie为name的值
 deepClone(data)                              复制数据（不改动原数据）
 setUuid()                                    生成32位随机uuid
 getCurrenttime(format)                       根据指定格式格式化当前时间输出格式
-sortNumber()                                 数字排序
 getDateByFormat(value, format, styleType)    通过时间戳获取指定格式的日期
+sortNumber()                                 数字排序
+concatArr(arr1, arr2)                        两个数组合并，且非数组对象去重
+validForm($el,$scroll)                       整体表单控件校验,并且滚动到报错地方 可以传dom对象，也可以传选择器字符串
 toggleClass(el, classname, type)             修改class 1、el:目标元素  2、cls:需要操作的class  3、type:"add"代表添加对应的class  "remove"代码删除对应的class 如果不传则有则删除，没有则添加
 getValueByPath(value, path, isArrary)        值的为空判断 如果是数组，数组的长度判断 //1、value：[Nothing]需要做判断的值, 2、path：[String]需要层层遍历的  3、isArrary:[Boolean]最终获取的值是数组，而且数组的长度大于0
 checkType(value, type)                       检查value类型，如果type为空则返回值的类型
-validForm($el,$scroll)                       整体表单控件校验,并且滚动到报错地方 可以传dom对象，也可以传选择器字符串
-isSame(str1, str2)                           判断str1和str2是否相等
-translateNumber(values, codeType)            将阿拉伯数字转为对应需要的格式（中文一二三或者英文ABCD）
+checkStringNotEmpty(value)                   检查数据类型不为空
+equalStr(str1, str2)                         检查两个字符串是否相等，
+isEmpty(val)                                 判断数据是否为空：null undefined '' []  {} 五中情况情况中的任何一种则为true
+isSame(str1, str2)                           判断str1和str2是否相等，主要是为了对 0 和 '0'需要判断相同的情况下面
+toChinese(values)                            将数字转为中文。例如toChinese(123) => 一二三
+toEnglish(values)                            将数字转为英文。例如toEnglish(123) => ABC
+translateNumber(values, codeType)            将阿拉伯数字转为对应需要的格式（中文一二三或者英文ABCD)
+gotoHref(href, that)                         通过链接跳转时，需要做路由拦截等操作
+disabledRepeatSubmit(obj,key,trueval,falseval) 全局处理禁止短时间内反复提交,obj：对应需要改变的数据，key:更新的值的key,trueval:正常的往下走的值（比如放开按钮的disable）,falseval:需要停止正常操作的值（比如禁用按钮）
+jumpDialog(config, to, from, next, url)      // 下榻页面返回提示：您有未保存数据，是否保存当前修改并跳转新页面？
+hexToRgb(str)                                十六进制hex转为rgb,如果是3位的先补齐6位
+rgbToHex(a,b,c)                              rgb转为十六进制hex
+convertHexToRGBA(hexCode, opacity = 1)       转换Hex颜色编码为RGBA
 getLightColor(colors, level, noOpacity)      将十六进制hex的colors按减淡level（小数点数字）后得到的颜色值，当noOpacity为true时为十六进制hex，默认是按百分比透明度处理
+checkHasSomeitem(arr1, arr2)                返回arr1里是否有跟arr2重复的数据（item不支持数组和对象）,arr2可以是一个item
 isEmptyObj(obj)                              判断对象是否为空
-goBack(fromPath, url)                        返回上一步
-isEmpty(val)                                 判断数据是否为空：null undefined '' []  {} 五中情况情况中的任何一种则为true
+mergeObj()                                   合并对象
+goBack(fromPath, url, _this)                 返回上一步
+download(that, url, data, typeHttp)          下载文件
+formatFileSize(bytes, decimalPoint, type)    格式化文件大小
+ipVerification(ip)                           验证ip合法性
+portVerfication(port)                        验证端口合法性
+getProtocolDataList(nodeList)                处理连接协议默认值的数据结构
+getAccountNodeList(nodeList)                 账号下拉列表展示数据
+getRunnerGroupList(list)                     获取runner分组列表数据
+getRunnerGroupTagList(list)                  获取runner分组标签列表数据
+getAppForselect(nodeList)                    获取系统和模块下拉数据（资源中心）
+getToolClassificationList(list)              获取工具分类下拉列表数据（自动化）
+getRoundCountList()                          获取分批数量下拉列表数据（自动化，自动发布）
+getAbbrNameAndName(obj)                      获取简称(名称)
 uniqueArr(list)                              数组对象去重，返回去重后的数组
 uniqueByField(arr,filterField)               根据某个字段，数组去重，返回去重后的数组，filterField需要去重的字段
 matrixDataSourceRedirect(dataSourceId,dataSourceJson) 根据矩阵不同数据源，跳转不同页面
+handleInvalidDate(timeValue, format, styleType) 处理时间格式错误问题
+timestampCalculation(unit = null, value = 0, timstamp = null, format = '', styleType = '-') 时间戳计算
+isUserHasAuth(str)                           判断用户是否有某个权限     
+calculateDate(unit = '', value = 0, timstamp = null)   根据 hour/day/month/year 计算时间
+mergeObj(obj1, obj2)                         两个对象合并成一个对象
+substr(name, len)                            字符串截取
+jumpTo(id, behavior, parent, block)          跳转指定的位置
+scrollTo(parentId, childId, behavior)        滚动到指定的位置
 copyText(id)                                 点击复制内容，id表示需要复制元素的id，使用方法：this.$utils.copyText('#codeContent')
-mapArray(array, key)                         //从数组对象中挑出一个key，将其值作为数组返回
-intersectionArr                              // 返回一个包含所有传入数组交集元素的新数组。
-getComposedPath(e)                           // 返回事件流中元素的事件路径
-removeHTMLTag(str)                           //去除html标签
-evalWithLineNumber(e, code)                  //利用eval解析时，具体报错信息和行号
-isImage(filename)                            //判断是否是图片
-getUnicodeByClassName(className)             //获取className的unicode编码
+nameRegularValidate(name)                    名称校验：仅支持汉字、字母、数字和特殊字符(._-)
+mapArray(array, key)                         从数组对象中挑出一个key，将其值作为数组返回
+intersectionArr                              返回一个包含所有传入数组交集元素的新数组。
+validParamValue(val, validateList)           参数校验规则：判断值是否满足正则规则
+getComposedPath(e)                           返回事件流中元素的事件路径
+removeHTMLTag(str)                           去除html标签
+handleTopoImagePath(nodesString)             处理topo图中的图片路径
+cleanObject(obj)                             递归清理对象，移除对象中的null或者undefined属性
+getTextWidth({ text, fontSize = 12, isBold = false }) 获取文本宽度
+merge(obj1, obj2)                            对象合并
+evalWithLineNumber(e, code)                  利用eval解析时，具体报错信息和行号
+getFileExtension(fileName)                   获取文件后缀名
+isImage(filename)                            判断是否是图片
+isVideo(fileName)                            判断是否是视频
+setInterval(callback, delay, alwaysRun = false)  定时器
+sortByObj(obj)                               对象的属性按首字母排序
+getUnicodeByClassName(className)             获取className的unicode编码
+convertWoff2ToBase64                         将woff2文件转换为base64
 */
 import _ from 'lodash';
 import store from '@/resources/store';
 import ViewUI from 'neatlogic-ui/iview/index.js';
 import { $t } from '@/resources/init.js';
 const FONT_UNICODE_LIST = require('@/resources/assets/font/tsfonts/codes.json');
+const FONT_WOFF2_BASE64  = require('@/resources/assets/font/tsfonts/font/tsfont_woff2.json')
 const methods = {
   getCookie: function (name) {
     if (name) {
@@ -312,6 +357,7 @@ const methods = {
     return isEqual;
   },
   toChinese(values) {
+    // 将数字转为中文。例如toChinese(123) => 一二三
     let arr = [];
     let val = typeof values == 'number' ? values.toString() : values;
     let len = val.length; //统计出长度
@@ -328,6 +374,7 @@ const methods = {
     return arr.join('');
   },
   toEnglish(values) {
+    // 将数字转为英文。例如toEnglish(123) => ABC
     let arr = [];
     let val = typeof values == 'number' ? values : parseInt(values);
     val = val - 1;
@@ -1166,6 +1213,18 @@ const methods = {
     }
     const matchedItem = FONT_UNICODE_LIST.find(item => item.css === className);
     return matchedItem && String.fromCharCode(matchedItem.hexCodepoint);
+  },
+  convertWoff2ToBase64() {
+    // 将woff2文件转换为base64
+    const fontWoff2Base64 = FONT_WOFF2_BASE64.woff2Base64;
+    return `@font-face {
+        font-family: 'tsfont';
+        src: url('data:font/woff2;charset=utf-8;base64,${fontWoff2Base64}') format('woff2');
+        font-weight: normal;
+        font-style: normal;
+        font-display: swap;
+        max-width: 16px;
+      }`;
   }
 };
 export default methods;
diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index 700c5718d0c4e1fc67e0758a2abaca19c21c6f25..e86bb39eaf6685d2f844a083f56bdc208f26be91 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1057,13 +1057,24 @@
   "copyerrorinfo": "Copy error message",
   "loadingfailed": "Load Fail",
   "topo": "Topology Map",
-  "movetothetop": "Move to the top level",
-  "movetothebottom": "Move to the bottom layer",
   "pastehere": "Paste here",
   "dragthecanvas": "Drag and drop canvas",
   "rubberband": "Frame Select",
   "actualpath": "actual path",
   "currentjob": "Current Job",
   "incompleteinformation": "incomplete information",
-  "requiredparameterhasnullvalue": "The required parameter field has a null value"
+  "requiredparameterhasnullvalue": "The required parameter field has a null value",
+  "executeall": "Execute all",
+  "cache": "Cache",
+  "connectionsuccessful": "Connection successful",
+  "driverjar": "Driver jar package",
+  "ignored": "Neglected",
+  "loaded": "Loaded",
+  "dictionary": "dictionary",
+  "healthcheckresult": "Inspection results",
+  "autoexecparallpolicy": "Concurrency Strategy",
+  "autoexecbatchround": "in batches",
+  "autoexecparall": "Concurrency",
+  "autoexecparallel": "Concurrent settings",
+  "paramkeyword": "Participate in search"
 }
\ 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 0afc7d675e80d033b282f7eca51fe64f717a5238..fe13d332d3b55176dbe5a742736691b035b07285 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -961,7 +961,7 @@
   "existiscoverimport": "{type}【{target}】已存在，是否继续导入并覆盖",
   "userauthfailedpleaselogin": "认证失败，请重新登录",
   "partial": "局部",
-  "rolerule": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写)，如果表达式执行后的值为true则该角色生效，false和语法异常都不生效 。 如：\"${DATA.env}\"==\"sit\"&&(\"${DATA.test}\"==\"1\"||\"${DATA.test2}\"==\"aaa\")",
+  "rolerule": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写，且前缀必须为{prefix})，如果表达式执行后的值为true则该角色生效，false和语法异常都不生效 。 如：",
   "datasources": "数据来源",
   "formcomponents": "表单组件",
   "agree": "同意",
@@ -1059,13 +1059,24 @@
   "copyerrorinfo": "复制错误信息",
   "loadingfailed": "加载失败",
   "topo": "拓扑图",
-  "movetothetop": "移至顶层",
-  "movetothebottom": "移至底层",
   "pastehere": "在此粘贴",
   "dragthecanvas": "拖拽画布",
   "rubberband": "框选",
   "actualpath": "实际路径",
   "currentjob": "当前作业",
   "incompleteinformation": "信息不完整",
-  "requiredparameterhasnullvalue": "必填参数项存在空值"
+  "requiredparameterhasnullvalue": "必填参数项存在空值",
+  "executeall": "执行所有",
+  "cache": "缓存",
+  "connectionsuccessful": "连接成功",
+  "driverjar": "驱动jar包",
+  "ignored": "已忽略",
+  "loaded": "已加载",
+  "dictionary": "字典",
+  "healthcheckresult": "检查结果",
+  "autoexecparallpolicy": "并发策略",
+  "autoexecbatchround": "分批",
+  "autoexecparall": "并发",
+  "autoexecparallel": "并发设置",
+  "paramkeyword": "入参搜索"
 }
\ 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 e1861089fc71caa8a80291d29566b209e7485bc8..cc1a64b3e6c1eb0c88356121b1dc06275f4d2da3 100644
--- a/src/resources/assets/languages/router/en.json
+++ b/src/resources/assets/languages/router/en.json
@@ -130,6 +130,7 @@
     "formmanage": "Forms",
     "integrationmanage": "Integration",
     "datawarehousemanage": "Data Warehouse",
+    "datasource": "Data source",
     "historymanage": "Messages",
     "subscriptionsetting": "Subscribe",
     "noticemanage": "Notice",
@@ -168,7 +169,8 @@
     "healthcheck": "Health Check",
     "license": "License Management",
     "extramenu": "Menu management",
-    "homepage": "default page "
+    "homepage": "default page ",
+    "changelogaudit": "Database Change Log"
   },
   "knowledge": {
     "knowledgedetail": "entry details",
diff --git a/src/resources/assets/languages/router/zh.json b/src/resources/assets/languages/router/zh.json
index 81c58e9a7b3ed4a74dba21a513de8b9918269563..9d4626d540198177c65f3a64000b27728f8bc0b9 100644
--- a/src/resources/assets/languages/router/zh.json
+++ b/src/resources/assets/languages/router/zh.json
@@ -118,7 +118,7 @@
     "teammanage": "分组管理",
     "authmanage": "权限管理",
     "useraddview": "编辑用户",
-    "worktimemanage": "服务窗口管理",
+    "worktimemanage": "服务时间管理",
     "usersetting": "个人设置",
     "roleaddview": "编辑角色",
     "authadduser": "编辑授权",
@@ -130,6 +130,7 @@
     "formmanage": "表单管理",
     "integrationmanage": "集成管理",
     "datawarehousemanage": "数据仓库",
+    "datasource": "数据源",
     "historymanage": "历史消息",
     "subscriptionsetting": "订阅设置",
     "noticemanage": "系统公告",
@@ -168,7 +169,8 @@
     "healthcheck": "健康检查",
     "license": "许可管理",
     "extramenu": "菜单管理",
-    "homepage": "默认首页"
+    "homepage": "默认首页",
+    "changelogaudit": "数据库变更记录"
   },
   "knowledge": {
     "knowledgedetail": "词条详情",
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index d1014a2826d84d21109f6c18b1da3c26782d91f7..cb1cf8604cfc46b6de0cf6ae92c0e2cb95380cfc 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -628,7 +628,9 @@
     "thirdpartyapi": "Third party callback interface",
     "reactivatestep": "Reactivation steps",
     "seeprocessconfig": "View the current work order process configuration",
-    "editprocessconfig": "Edit the current work order process configuration"
+    "editprocessconfig": "Edit the current work order process configuration",
+    "stepishandledby": "Step Handling Human",
+    "sercalendar": "Service Calendar"
   },
   "autoexec": {
     "addrootdirectory": "Add root directory",
@@ -903,7 +905,12 @@
     "setinputloopoperations": "Settings: Please enter at least one tool",
     "runnergrouptagprocesstips": "If form assignment is required, please set the executor group to the \"Job Parameters\" type in the combination tool",
     "runnergroupprocesstips": "If form assignment is required, please set the \"Executor Group\" to the \"Job Parameter\" type in the combination tool",
-    "resetrunnerphase": "Reset phase or not"
+    "resetrunnerphase": "Reset phase or not",
+    "runnerGroupTooltip": "If the actuator group is not filled in here, the current stage will inherit the combination tool actuator group by default. If the actuator group is filled in here, the current stage will use the one filled in here; During execution, the executor group of the stage cannot be modified",
+    "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."
   },
   "framework": {
     "roleauth": "Authorize immediately after creating the role",
@@ -1343,7 +1350,10 @@
     "tagentupgrade": "Upgrade Package Management",
     "tagentupgradepkg": "Upgrade Package",
     "selecttagentupgradepkg": "Select an existing upgrade package",
-    "tagentuploadupgradepkg": "Upload upgrade package"
+    "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:"
   },
   "knowledge": {
     "document": "Document",
@@ -2143,7 +2153,10 @@
     "buildnopending": "To be built",
     "actuatorgrouptag": "Actuator group label",
     "blueset": "Blue green setting",
-    "blueSet": "Blue Green"
+    "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"
   },
   "inspect": {
     "alarmprompt": "Alarm Prompt",
@@ -2840,5 +2853,8 @@
     "isnormalattr": "As a regular attribute display",
     "closesuccess": "Close successfully",
     "istop": "topped"
+  },
+  "runnergroup": {
+    "ruletips": "The request for login authentication needs to carry a header as a rule expression (note that the header parameter in the expression is all lowercase). 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: ${env}==\\ bit \\&&(${test}==\\ 1 \\ | | ${test2}==\\ aaa \\)"
   }
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 438ae42af3a0ad03896005c3cdf102f6443e2bdc..63b7cdb88dfe5196026bddce4e7b2c6404f1d70a 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -296,7 +296,7 @@
     "workflow": "工作流",
     "showpriority": "显示优先级",
     "defaultpriority": "默认优先级",
-    "serwindow": "服务窗口",
+    "serwindow": "服务时间",
     "sertype": "服务类型",
     "reporauth": "上报授权",
     "tranferreport": "转报",
@@ -628,7 +628,9 @@
     "thirdpartyapi": "第三方回调接口",
     "reactivatestep": "重新激活步骤",
     "seeprocessconfig": "查看当前工单流程配置",
-    "editprocessconfig": "编辑当前工单流程配置"
+    "editprocessconfig": "编辑当前工单流程配置",
+    "stepishandledby": "步骤处理人为",
+    "sercalendar": "服务日历"
   },
   "autoexec": {
     "addrootdirectory": "添加根目录",
@@ -707,7 +709,7 @@
     "associateacustomtool": "关联自定义工具",
     "disassociatecandeletecatalog": "当前目录或其子目录已关联自定义工具，解除关联后，才可删除此目录",
     "bysubcatalogalldeletetips": "删除当前目录时，其所有子目录将同时被删除",
-    "ipformattip": "主机类目标输入格式为 IP，服务类目标输入格式为IP:PORT，数据库类目标格式为IP:PORT/SID，一行一个目标",
+    "ipformattip": "主机类目标输入格式为 IP，服务类目标输入格式为IP:PORT，数据库类目标格式为IP:PORT/SID，一行一个目标,最多支持输入1000个目标",
     "viewalltarget": "查看更多{target}个目标",
     "choosetagasnodetip": "选择标签过滤节点，作为执行目标",
     "jobparamnosettingtip": "作业参数中未设置【节点信息】参数",
@@ -877,7 +879,7 @@
     "pleaseselectdirectoryname": "请选择目录名称",
     "pleaseselectuploadfile": "脚本内容：请上传附件",
     "supportonlytarfile": "仅支持tar文件",
-    "scriptcontenttips": "帮助：\n 工具执行是通过标准的命令行参数来传参。\n 输入参数：\n 1）具备参数名的参数：\n   option名称就是参数名，option值就是参数值。\n 2）没有参数名的参数：\n   对应工具的自由参数，通过参数序号来获取参数。\n 不同的编程语言如何处理命令行参数，具体请查看相关的demo。\n 输出参数：\n 通过把输出参数写入当前作业工作目录下的json文件ouput.json进行参数的输出。\n 平台提供的不同语言的输出封装，具体请查看相关的demo，例如：\n Python：\n from lib import AutoExecUtils\n out = {}\n out['outtext'] = 'this is the text out value'\n AutoExecUtils.saveOutput(out) \n Perl：\n use AutoExecUtils;\n my $out = {};\n $out->{outtext}     = 'this is the text out value';\n AutoExecUtils::saveOutput($out); \n Bash：\n outtext='this is the text out value'\n if [ ! -z '$OUTPUT_PATH' ]; then\n     cat <<EOF >'$OUTPUT_PATH'\n {\n     'outtext':'$outtext'\n }\n EOF\n fi\n 退出码标识：\n 只要ExitCode不等于0则代表异常退出。\n注意：\n 如果需发起子进程，执行完毕后请注意关闭标准输出和错误输出，否则父进程可能无法正常退出。",
+    "scriptcontenttips": "帮助：\n 工具执行是通过标准的命令行参数来传参。\n 输入参数：\n 1）具备参数名的参数：\n   option名称就是参数名，option值就是参数值。\n 2）没有参数名的参数：\n   对应工具的自由参数，通过参数序号来获取参数。\n 不同的编程语言如何处理命令行参数，具体请查看相关的demo。\n 输出参数：\n 通过把输出参数写入当前作业工作目录下的json文件ouput.json进行参数的输出。\n 平台提供的不同语言的输出封装，具体请查看相关的demo，例如：\n Python： \n #runner类型工具\n #import AutoExecUtils\n #target类型工具\n from lib import AutoExecUtils\n out = {}\n out['outtext'] = 'this is the text out value'\n AutoExecUtils.saveOutput(out) \n Perl：\n use AutoExecUtils;\n my $out = {};\n $out->{outtext}     = 'this is the text out value';\n AutoExecUtils::saveOutput($out); \n Bash：\n outtext='this is the text out value'\n if [ ! -z '$OUTPUT_PATH' ]; then\n     cat <<EOF >'$OUTPUT_PATH'\n {\n     'outtext':'$outtext'\n }\n EOF\n fi\n 退出码标识：\n 只要ExitCode不等于0则代表异常退出。\n注意：\n 如果需发起子进程，执行完毕后请注意关闭标准输出和错误输出，否则父进程可能无法正常退出。",
     "speedlevel": "速度级别",
     "workthread": "工作线程",
     "loadedjob": "已加载作业",
@@ -891,7 +893,7 @@
     "toolparamstooltip": "工具参数是已关联的工具的参数集合。来源于自定义工具库的参数可增加、删除和修改，来源于工具库的参数无法增加、删除和修改。",
     "combophasexpired": "组合工具已失效",
     "pleasereedit": "请重新编辑后，提交审核",
-    "abortjob": "终止作业",
+    "abortjob": "中止作业",
     "runnergroupdeprecatedtips": "作业执行器组参数已失效，请重新点击确认并保存流程",
     "loopitem": "循环项",
     "loopoperation": "循环执行",
@@ -903,7 +905,12 @@
     "setinputloopoperations": "设置：请输入至少一个工具",
     "runnergrouptagprocesstips": "如果需要表单赋值，请在组合工具设置“执行器组标签”为“作业参数”类型",
     "runnergroupprocesstips": "如果需要表单赋值，请在组合工具设置“执行器组”为“作业参数”类型",
-    "resetrunnerphase": "是否重置阶段"
+    "resetrunnerphase": "是否重置阶段",
+    "runnerGroupTooltip": "若此处不填写执行器组，当前阶段默认继承组合工具执行器组，若此处填写执行器组，当前阶段将采用此处填写的；执行时，不可修改阶段的执行器组",
+    "isfirenext": "是否激活下一个组",
+    "inputnodelimit": "数量不能大于1000",
+    "parall": "并发数量",
+    "paralldesc": "将执行目标按并发数量先后执行。"
   },
   "framework": {
     "roleauth": "创建完角色立即授权",
@@ -1343,7 +1350,10 @@
     "tagentupgrade": "升级包管理",
     "tagentupgradepkg": "升级包",
     "selecttagentupgradepkg": "选择已有的升级包",
-    "tagentuploadupgradepkg": "上传升级包"
+    "tagentuploadupgradepkg": "上传升级包",
+    "versionremarks": "版本备注",
+    "heartbeaturl": "后端服务器地址",
+    "runnergrouptips": "登录认证的请求需要携带Header做规则表达式(注意表达式中header参数全小写，且前缀必须为{prefix})，如果表达式执行后的值为true则该执行器组生效，false和语法异常都不生效。如:"
   },
   "knowledge": {
     "document": "文档",
@@ -2140,7 +2150,10 @@
     "buildnopending": "待构建",
     "actuatorgrouptag": "执行器组标签",
     "blueset": "蓝绿设置",
-    "blueSet": "蓝绿"
+    "blueSet": "蓝绿",
+    "ismodified": "已修改",
+    "presetrunnergroup": "预设执行器组",
+    "testrunnerdesc": "如果不指定则会通过ip根据网段匹配执行器组自动分配执行器"
   },
   "inspect": {
     "alarmprompt": "告警提示",
diff --git a/src/resources/base.md b/src/resources/base.md
index b1c56a5baab7d7ba5c470ca6839b7fcf1fdaaed9..ba9daae2edb765e912b682f364224b7e264334af 100644
--- a/src/resources/base.md
+++ b/src/resources/base.md
@@ -2,111 +2,120 @@
 
 ## 样式传透
 
-rsbuild升级到v1版本之后，内置的less从v3升级到v4，导致`/deep/`样式的传透失效，所以后续需要使用`::v-deep`来实现样式的传透。
+rsbuild 升级到 v1 版本之后，内置的 less 从 v3 升级到 v4，导致`/deep/`样式的传透失效，所以后续需要使用`::v-deep`来实现样式的传透。
 
+## 常用 js 工具方法
+
+|     文件      |      说明      |
+| :-----------: | :------------: |
+|  authUtil.js  |   权限方法库   |
+| localStore.js | 本地缓存方法库 |
+|   state.js    | 状态管理工具库 |
+|    util.js    | 常用工具方法库 |
 
 ## 全局通用样式
 
 > > > 页面栅格布局说明:(sm:800px,md:1024px,lg:1280px,xl:1400px,xxl:1920px)
 
-#### 通用类样式class
+#### 通用类样式 class
 
-|    class名     |            用途            | 说明               |
+|    class 名    |            用途            | 说明               |
 | :------------: | :------------------------: | :----------------- |
-|       h1       |    特大标题(登录页系统)    | 字号28行高36       |
-|       h2       |     弹窗对话框标题文字     | 字号18行高26       |
-|       h3       | 大屏展示统计图标题、大标题 | 字号16行高24       |
-|       h4       |         一二级菜单         | 字号14行高22       |
-|      fz10      |         提示类文字         | 字号10（待调整）   |
-|      fz16      |             无             | 字号16             |
-|      fz18      |             无             | 字号18             |
-|      fz20      |             无             | 字号20             |
-|      text      |       正文、基本字号       | 字号13行高21       |
-|      tips      |     表格头部、错误提示     | 字号12行高20       |
+|       h1       |    特大标题(登录页系统)    | 字号 28 行高 36    |
+|       h2       |     弹窗对话框标题文字     | 字号 18 行高 26    |
+|       h3       | 大屏展示统计图标题、大标题 | 字号 16 行高 24    |
+|       h4       |         一二级菜单         | 字号 14 行高 22    |
+|      fz10      |         提示类文字         | 字号 10（待调整）  |
+|      fz16      |             无             | 字号 16            |
+|      fz18      |             无             | 字号 18            |
+|      fz20      |             无             | 字号 20            |
+|      text      |       正文、基本字号       | 字号 13 行高 21    |
+|      tips      |     表格头部、错误提示     | 字号 12 行高 20    |
 | cursor-pointer |  鼠标上移显示可点击的手型  | 悬浮于连接上时，手 |
 
-#### 通用类颜色样式class
-
-|     class名     |                                     用途                                     | 说明                                                           |
-| :-------------: | :--------------------------------------------------------------------------: | :------------------------------------------------------------- |
-|   text-title    |                                   标题字体                                   | 颜色为标题色，比正文字体颜色深                                 |
-|   text-action   |                                 可操作类文字                                 | 默认正文颜色，移上去变可点击的蓝色+pointer                     |
-|    text-href    |                                  跳转类文字                                  | 字体颜色可点击颜色+移上去pointer                               |
-|   text-white    |                                   白色文字                                   | 不会随主题色发生改变的白色，目前是#fff                         |
-|     text-op     |                                    相反色                                    | 适用于需要根据主题色改变的反色                                 |
-|  text-disabled  |                                 不可操作文字                                 | 移上去鼠标显示不可操作+0.6透明度                               |
-|    text-info    |                                 info颜色字体                                 | -                                                              |
-|  text-primary   |                                  主题色字体                                  | -                                                              |
-|  text-success   |                                绿色成功色字体                                | -                                                              |
-|   text-danger   |                                红色告警色字体                                | -                                                              |
-|  text-warning   |                                橙色告警色字体                                | -                                                              |
-|   text-error    |                                红色错误色字体                                | -                                                              |
-|  border-error   |                                   红色边框                                   | -                                                              |
-| border-primary  |                                  主题色边框                                  | -                                                              |
-|    text-tip     |                             提示类文字，颜色浅色                             | 跟着主题走                                                     |
-|    text-grey    |                                  提示类文字                                  | 此class尽量少用，早期class，用text-tip                         |
-| text-tip-active | 提示类文字，颜色浅色，移上去后显示主题色移上去交互，提供提示类问题可激活样式 | 跟着主题走                                                     |
-|  require-label  |   必填的文字（会在左边带一个\*必填的提示），后期调整ui把提示的红色字体去掉   | 跟着主题走                                                     |
-|     bg-grey     |                                  背景色灰色                                  | -                                                              |
-|   bg-tip-grey   |                             提示灰色背景（弱化）                             | -                                                              |
-|  bg-hover-grey  |                              移上去背景色为灰色                              | -                                                              |
-|      bg-op      |           背景色与字体颜色相反（浅色主题为白色，深色主题为墨蓝色）           | -                                                              |
-|    bg-block     |                  主体区域的块状元素的背景色（目前是浅灰色）                  | -                                                              |
-|     bg-info     |                                   蓝色背景                                   | -                                                              |
-|  bg-info-grey   |                                  浅蓝色背景                                  | 用于蓝色背景（弱化）                                           |
-|   bg-success    |                                   绿色背景                                   | -                                                              |
-| bg-success-grey |                                  浅绿色背景                                  | 用于绿色背景（弱化）                                           |
-|   bg-warning    |                                  橙色色背景                                  | -                                                              |
-| bg-warning-grey |                                  浅橙色背景                                  | 用于橙色背景（弱化）                                           |
-|    bg-error     |                                   红色背景                                   | -                                                              |
-|  bg-error-grey  |                                  浅红色背景                                  | 用于红色背景（弱化）                                           |
-|     bg-code     |                               代码片段的背景色                               | -                                                              |
-|   bg-selected   |                        选中的带浅色主题色背景色的样式                        | 适用于部分场景选中只需要背景色                                 |
-|  item-selected  |                    选中的主题色字体颜色带浅色背景色的样式                    | 适用于部分场景选中需要背景色+字体颜色                          |
-|    bg-modal     |                                 模态窗背景色                                 | 非白的，浅浅灰                                                 |
-|  bg-footer-btn  |                           卡片式的底部操作栏背景色                           | 前期为白色后期调整为浅灰色                                     |
-|      lh-2       |                                 行高2倍字号                                  | 用于有时候需要文字行高比一般的高一些（比如空数据提示等）       |
-|  input-border   |                               输入框需要带边框                               | 不推荐使用（早期风格为整体底框时专门处理需要四边框的输入框用） |
-
-#### 场景类样式class
+#### 通用类颜色样式 class
+
+|    class 名     |           用途           | 说明                                                           |
+| :-------------: | :----------------------: | :------------------------------------------------------------- |
+|   text-title    |         标题字体         | 颜色为标题色，比正文字体颜色深                                 |
+|   text-action   |       可操作类文字       | 默认正文颜色，移上去变可点击的蓝色+pointer                     |
+|    text-href    |        跳转类文字        | 字体颜色可点击颜色+移上去 pointer                              |
+|   text-white    |         白色文字         | 不会随主题色发生改变的白色，目前是#fff                         |
+|     text-op     |          相反色          | 适用于需要根据主题色改变的反色                                 |
+|  text-disabled  |       不可操作文字       | 移上去鼠标显示不可操作+0.6 透明度                              |
+|    text-info    |      info 颜色字体       | -                                                              |
+|  text-primary   |        主题色字体        | -                                                              |
+|  text-success   |      绿色成功色字体      | -                                                              |
+|   text-danger   |      红色告警色字体      | -                                                              |
+|  text-warning   |      橙色告警色字体      | -                                                              |
+|   text-error    |      红色错误色字体      | -                                                              |
+|  border-error   |         红色边框         | -                                                              |
+| border-primary  |        主题色边框        | -                                                              |
+|    text-tip     |   提示类文字，颜色浅色   | 跟着主题走                                                     |
+|    text-grey    |        提示类文字        | 此 class 尽量少用，早期 class，用 text-tip                     |
+| text-tip-active |   提示类文字，颜色浅色   | 鼠标上移提示类颜色变色                                         |
+|  require-label  |        必填的文字        | \*号必填样式红色                                               |
+|     bg-grey     |        背景色灰色        | -                                                              |
+|   bg-tip-grey   |   提示灰色背景（弱化）   | -                                                              |
+|  bg-hover-grey  |    移上去背景色为灰色    | -                                                              |
+|      bg-op      |   背景色与字体颜色相反   | （浅色主题为白色，深色主题为墨蓝色）                           |
+|    bg-block     |      块状元素背景色      | （目前是浅灰色）                                               |
+|     bg-info     |         蓝色背景         | -                                                              |
+|  bg-info-grey   |        浅蓝色背景        | 用于蓝色背景（弱化）                                           |
+|   bg-success    |         绿色背景         | -                                                              |
+| bg-success-grey |        浅绿色背景        | 用于绿色背景（弱化）                                           |
+|   bg-warning    |        橙色色背景        | -                                                              |
+| bg-warning-grey |        浅橙色背景        | 用于橙色背景（弱化）                                           |
+|    bg-error     |         红色背景         | -                                                              |
+|  bg-error-grey  |        浅红色背景        | 用于红色背景（弱化）                                           |
+|     bg-code     |     代码片段的背景色     | -                                                              |
+|   bg-selected   |        选中背景色        | 选中的带浅色主题色背景色的样式                                 |
+|  item-selected  |       选中的主题色       | 字体颜色带浅色背景色的样式                                     |
+|    bg-modal     |       模态窗背景色       | 非白的，浅浅灰                                                 |
+|  bg-footer-btn  | 卡片式的底部操作栏背景色 | 前期为白色后期调整为浅灰色                                     |
+|    bg-stripe    |        条纹背景色        | 用户折叠展开<Collapse>组件的 header                            |
+|      lh-2       |      行高 2 倍字号       | 用于有时候需要文字行高比一般的高一些（比如空数据提示等）       |
+|  input-border   |     输入框需要带边框     | 不推荐使用（早期风格为整体底框时专门处理需要四边框的输入框用） |
+
+#### 场景类样式 class
 
 ##### 页面排版涉及到圆角弧度,边框，阴影
 
-|   class名    |                       用途                       | 说明 |
-| :----------: | :----------------------------------------------: | :--- |
-|  radius-lg   |             圆角10px,用于大块的元素              |
-|  radius-md   |         圆角8px,一般用于table，卡片等等          |
-|  radius-sm   | 圆角6px,一般用于条状元素，比如操作栏、输入框等等 |
-|  radius-mi   |               圆角4px,一般用于按钮               |
-| block-border |                   块状元素边框                   | -    |
-|    shadow    |                   块状元素阴影                   | -    |
+|   class 名   |     用途     | 说明                                     |
+| :----------: | :----------: | :--------------------------------------- |
+|  radius-lg   |  圆角 10px   | 用于大块的元素                           |
+|  radius-md   |   圆角 8px   | 一般用于 table，卡片等等                 |
+|  radius-sm   |   圆角 6px   | 一般用于条状元素，比如操作栏、输入框等等 |
+|  radius-mi   |   圆角 4px   | 一般用于按钮                             |
+| block-border | 块状元素边框 | -                                        |
+|    shadow    | 块状元素阴影 | -                                        |
 
 ##### 超过内容区域显示处理
 
-|      class名       |         用途         | 说明                   |
+|      class 名      |         用途         | 说明                   |
 | :----------------: | :------------------: | :--------------------- |
 |      overflow      |  超过宽度显示省略号  | -                      |
-|       line-2       |  超过2行显示省略号   | 以2倍行高为标准        |
-|       line-3       |  超过3行显示省略号   | 以3倍行高为标准        |
+|       line-2       | 超过 2 行显示省略号  | 以 2 倍行高为标准      |
+|       line-3       | 超过 3 行显示省略号  | 以 3 倍行高为标准      |
 |     block-add      |   添加按钮块状样式   | 需要独占一行的         |
 | tsscroll-container | 如果溢出则出现滚动条 | 该样式处理了滚动条样式 |
 
 ##### 对齐方式
 
-|   class名    |                                   用途                                   | 说明                                                      |
-| :----------: | :----------------------------------------------------------------------: | :-------------------------------------------------------- |
-|   clearfix   |                        清除子级浮动造成的样式问题                        | -                                                         |
-|  float-left  |                                元素左浮动                                | 父级元素需加上清除浮动的样式，比如加上clearfix的classname |
-| float-right  |                                元素右浮动                                | 父级元素需加上清除浮动的样式，比如加上clearfix的classname |
-| text-center  |                       元素水平方向（横轴）居中对齐                       | -                                                         |
-|  text-left   |                        元素水平方向（横轴）左对齐                        | -                                                         |
-|  text-right  |                        元素水平方向（横轴）右对齐                        | -                                                         |
-|  flex-start  |                flex布局下水平方向（横轴）元素开始方向对齐                | -                                                         |
-|   flex-end   |                flex布局下水平方向（横轴）元素结束方向对齐                | -                                                         |
-| flex-center  |                  flex布局下水平方向（横轴）元素中心对齐                  | -                                                         |
-| flex-between |        flex布局下水平方向（横轴）项目位于各行之间留有空白的容器内        | -                                                         |
-| flex-around  | flex布局下水平方向（横轴）项目位于各行之前、之间、之后都留有空白的容器内 | -                                                         |
-| align-start  |             flex布局下垂直方向（竖轴）顶对齐（开始方向对齐）             | -                                                         |
+|   class 名   |     用途     | 说明                                                         |
+| :----------: | :----------: | :----------------------------------------------------------- |
+|   clearfix   |   清除浮动   | 子级浮动造成的样式问题-                                      |
+|  float-left  |  元素左浮动  | 父级元素需加上清除浮动的样式，比如加上 clearfix 的 classname |
+| float-right  |  元素右浮动  | 父级元素需加上清除浮动的样式，比如加上 clearfix 的 classname |
+| text-center  |   居中对齐   | 元素水平方向（横轴）                                         |
+|  text-left   |    左对齐    | 元素水平方向（横轴）                                         |
+|  text-right  |    右对齐    | 元素水平方向（横轴）                                         |
+|  flex-start  |    左对齐    | flex 布局横轴元素开始方向对齐                                |
+|   flex-end   |    右对齐    | flex 布局横轴元素结束方向对齐                                |
+| flex-center  |   中心对齐   | flex 布局横轴元素                                            |
+| flex-between |   两端对齐   | flex 布局横轴项目位于各行之间留有空白的容器内                |
+| flex-around  | 项目两侧等距 | flex 布局横轴项目位于各行之前、之间、之后都留有空白的容器内  |
+| align-start  |  交叉轴对齐  | flex 布局竖轴顶对齐（开始方向对齐）                          |
 
 ##### 间隙
 
@@ -114,7 +123,7 @@ rsbuild升级到v1版本之后，内置的less从v3升级到v4，导致`/deep/`
 
 > m 前缀的表示 margin，t/r/b/l 分别表示 top/right/bottom/left (上右下左) 四个方向的边距
 
-> 其中lg 表示 24像素，nm表示16像素，md表示12像素，sm表示10像素， xs表示6像素
+> 其中 lg 表示 24 像素，nm 表示 16 像素，md 表示 12 像素，sm 表示 10 像素， xs 表示 6 像素
 
 | 内边距类名 |       用途       | 说明                                   |
 | :--------: | :--------------: | :------------------------------------- |
@@ -123,22 +132,22 @@ rsbuild升级到v1版本之后，内置的less从v3升级到v4，导致`/deep/`
 | padding-md |  内间隙普通尺寸  | padding: 12px                          |
 | padding-sm |   内间隙小尺寸   | padding: 10px，一般用于文字间隙        |
 | padding-xs |    内间隙较小    | padding: 6px; 比如分页的页数之间的间隙 |
-|   pt-nm    |   上内间隙16px   | padding-top: 16px;                     |
-|   pb-nm    |   下内间隙16px   | padding-bottom: 16px;                  |
-|   pl-nm    |   左内间隙16px   | padding-left: 16px;                    |
-|   pr-nm    |   右内间隙16px   | padding-right: 16px;                   |
+|   pt-nm    |  上内间隙 16px   | padding-top: 16px;                     |
+|   pb-nm    |  下内间隙 16px   | padding-bottom: 16px;                  |
+|   pl-nm    |  左内间隙 16px   | padding-left: 16px;                    |
+|   pr-nm    |  右内间隙 16px   | padding-right: 16px;                   |
 |   pr-md    | 右内间隙普通尺寸 | padding-right: 12px;                   |
 |   pl-md    | 左内间隙普通尺寸 | padding-left: 12px;                    |
 |   pt-md    | 右内间隙普通尺寸 | padding-top: 12px;                     |
 |   pb-md    | 左内间隙普通尺寸 | padding-bottom: 12px;                  |
-|   pt-sm    |   上内间隙10px   | padding-top: 10px;                     |
-|   pb-sm    |   下内间隙10px   | padding-bottom: 10px;                  |
-|   pl-sm    |   左内间隙10px   | padding-left: 10px;                    |
-|   pr-sm    |   右内间隙10px   | padding-right: 10px;                   |
-|   pt-xs    |   上内间隙6px    | padding-top: 6px;                      |
-|   pb-xs    |   下内间隙6px    | padding-bottom: 6px;                   |
-|   pl-xs    |   左内间隙6px    | padding-left: 6px;                     |
-|   pr-xs    |   右内间隙6px    | padding-right: 6px;                    |
+|   pt-sm    |  上内间隙 10px   | padding-top: 10px;                     |
+|   pb-sm    |  下内间隙 10px   | padding-bottom: 10px;                  |
+|   pl-sm    |  左内间隙 10px   | padding-left: 10px;                    |
+|   pr-sm    |  右内间隙 10px   | padding-right: 10px;                   |
+|   pt-xs    |   上内间隙 6px   | padding-top: 6px;                      |
+|   pb-xs    |   下内间隙 6px   | padding-bottom: 6px;                   |
+|   pl-xs    |   左内间隙 6px   | padding-left: 6px;                     |
+|   pr-xs    |   右内间隙 6px   | padding-right: 6px;                    |
 
 | 外边距类名 | 说明                |
 | :--------: | :------------------ |
@@ -164,99 +173,112 @@ rsbuild升级到v1版本之后，内置的less从v3升级到v4，导致`/deep/`
 
 ##### 图标文字间隙
 
-|  class名   |           用途           | 说明            |
-| :--------: | :----------------------: | :-------------- |
-| icon-right | 字体图标到右侧文案的间隙 | 间隙大小为4像素 |
+|  class 名  |           用途           | 说明              |
+| :--------: | :----------------------: | :---------------- |
+| icon-right | 字体图标到右侧文案的间隙 | 间隙大小为 4 像素 |
 
 ##### 操作栏
 
-|                 class名                 |                用途                | 说明                             |
-| :-------------------------------------: | :--------------------------------: | :------------------------------- |
-| .action-group>.action-item\*n(.disable) | 操作分类组，常用于各种多个操作并列 | 禁用时action-item添加disable类名 |
+|                class 名                 |                用途                | 说明                                 |
+| :-------------------------------------: | :--------------------------------: | :----------------------------------- |
+| .action-group>.action-item\*n(.disable) | 操作分类组，常用于各种多个操作并列 | 禁用时 action-item 添加 disable 类名 |
 
 ##### 动画
 
 > 调用：直接动画里加上动画名字，其他参数按照实际（比如：animation: water-wave linear infinite;）
 
-|   动画名   |                用途                | 说明                                                                 |
-| :--------: | :--------------------------------: | :------------------------------------------------------------------- |
-|    fade    |            渐明减暗效果            | 透明度从0.6到1的轮播，一般css这么写:animation: fade linear infinite; |
-|  rocking   |              晃铃效果              | 一般css这么写:animation: rocking 2s;                                 |
-| water-wave |             水波纹效果             | 一般css这么写:animation: fade linear infinite;                       |
-| rubberBand | animatecss的rubberBand弹橡皮筋动画 | 一般css这么写:animation: rubberBand 1s;                              |
+|   动画名   |                 用途                  | 说明                                                             |
+| :--------: | :-----------------------------------: | :--------------------------------------------------------------- |
+|    fade    |             渐明减暗效果              | 透明度从 0.6 到 1 的轮播，用法：animation: fade linear infinite; |
+|  rocking   |               晃铃效果                | 用法：animation: rocking 2s;                                     |
+| water-wave |              水波纹效果               | 用法：animation: fade linear infinite;                           |
+| rubberBand | animatecss 的 rubberBand 弹橡皮筋动画 | 用法：animation: rubberBand 1s;                                  |
 
 ##### 兼容老的样式的表单布局
 
-|                class名                 |                     用途                     | 说明       |
-| :------------------------------------: | :------------------------------------------: | :--------- |
-| .form-block>(.block-left+.block-right) | 左侧label（宽度120px）右侧表单或者文字的布局 | 不推荐使用 |
+|                class 名                |                      用途                      | 说明       |
+| :------------------------------------: | :--------------------------------------------: | :--------- |
+| .form-block>(.block-left+.block-right) | 左侧 label（宽度 120px）右侧表单或者文字的布局 | 不推荐使用 |
 
 ## 全局方法
 
 #### 全局变量
 
-|     名称      |             用途             |                                          说明                                           | 其他                                                                                       |
-| :-----------: | :--------------------------: | :-------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------- |
-|    TENANT     |         获取当前租户         |                           通过当前浏览器的TENANT变量可以获取                            | -                                                                                          |
-|     HOME      |    获取当前访问地址的前缀    |                     目前是‘/租户’，主要用于写地址跳转时拼接路径前缀                     | -                                                                                          |
-| BASEURLPREFIX |       获取默认接口前缀       |                   目前是‘/租户’，api调用路径只需要从租户后的路径开始                    | 例如：调用‘/租户/api/rest/auth/module/get’时，api入口的路径为：‘/api/rest/auth/module/get’ |
-| BASELANGUAGES |      获取当前页面的语言      |                                  目前支持中英文，zh/en                                  |
-|   MODULEID    |       获取当前模块的id       |        需要跟rest/auth/module/get的接口返回的对应当前模块的数据的group的值对应上        | 模块的英文键名                                                                             |
-|   MENUTYPE    | 获取当前的菜单的分类类型映射 | 为{key:分类名字,...}对象数据，需要跟左侧菜单的分类类型对应上，对应体现在路由的meta.type |
+|     名称      |          用途          |                        说明                         |
+| :-----------: | :--------------------: | :-------------------------------------------------: |
+|    TENANT     |      获取当前租户      |             通过获取地址栏上的租户名称              |
+|     HOME      | 获取当前访问地址的前缀 |    目前是"/租户"，用户打开新标签页时拼接路径前缀    |
+| BASEURLPREFIX |    获取默认接口前缀    | 目前是"/租户"，api 调用路径只需要从租户后的路径开始 |
+| BASELANGUAGES |   获取当前页面的语言   |                目前支持中英文，zh/en                |
+|   MODULEID    |      获取模块名称      |                     模块的名称                      |
+|   MENUTYPE    |    获取菜单分类名称    |                 左侧菜单大分类名称                  |
 
 #### utils
 
 > > > 模版调用方法：
 
-```javascript
+````javascript
+// 查看所有方法的地址：/src/resources/assets/js/util.js
 this.$utils.***
-```
+```                                                                                                                                                                                                                          |
 
-##### 方法
-
-名称|用途|说明|其他
-:---:|:---:|:---:|:---|
-getCookie|获取cookie为name的值|this.$utils.getCookie(name)|-|
-setCookie|设置cookie为name的值为value，期限是time(如果是数字，单位为天；如果是字符串，直接赋值结束时间)|this.$utils.setCookie(name, value, time) |-|
-removeCookie|清除cookie为name的值|this.$utils.removeCookie(name) |-|
-deepClone|深拷贝，复制数据（不改动原数据）|this.$utils.deepClone(data) |-|
-setUuid|生成32位随机uuid|this.$utils.setUuid() |-|
-getCurrenttime|根据指定格式格式化当前时间输出格式|this.$utils.getCurrenttime(format)|参数默认格式：年月日 时:分:秒，其他选项：["HH:mm:ss","yyyy-MM-dd","HH:mm")]|
-getDateByFormat|通过时间戳获取指定格式的日期|this.$utils.getDateByFormat(value, format, styleType)|format同上，styleType为链接付，默认'-'|
-validForm|校验$el的表单控件，如有错误的触发$scroll的滚动到错误位置|this.$utils.validForm($el,$scroll) |可以传dom对象，也可以传选择器字符串|
-toggleClass|修改classname|this.$utils.toggleClass(el, classname, type)  |1、el:目标元素  2、cls:需要操作的class  3、type:"add"代表添加对应的class  "remove"代码删除对应的class 如果不传则有则删除，没有则添加|
-checkType|检查value类型是否为type类型，如果type为空则返回值的类型|this.$utils.checkType(value, type)  |type可以是类型的字符串和多个类型的array|
-checkStringNotEmpty|检查value类是否为空|this.$utils.checkStringNotEmpty(value) |包含null和undefined和空三种|
-isSame|检查2个数组是否一样（类型和值）|this.$utils.isSame(str1, str2) |-|
-translateNumber|将阿拉伯数字转为对应需要的格式（中文一二三或者英文ABCD）|this.$utils.translateNumber(values, codeType) |values为1、2、3这种数字（一般是下标），codeType：不填或者'en'|
-getLightColor|获取十六进度hex色值转化为按指定百分比减淡的颜色|this.$utils.getLightColor('#333333', 0.2) |getLightColor(colors, level, noOpacity),color:十六进制hex,level:减淡到的百分比，用小数点形式,noOpacity:是否用透明度，默认否，如需要去掉透明度则会转为十六进制hex（部分浏览器如果对某些色值透明度处理有问题需要转为十六进制hex）|
-gotoHref|全局的通过链接跳转时，需要做路由拦截等操作|this.$utils.gotoHref(href, this) |href为对应跳转地址，this为当前模版的this变量|
-jumpDialog|返回提示统一操作，目的统一文案，和统一按钮交互方式，需要在每个路由的beforeRouteLeave里处理 | 如下示例|-|
 ```javascript
-this.$utils.jumpDialog.call(this, {
-  save: {
-    fn: async(vnode) => {
-      return await _this.saveAction();
+this.$utils.jumpDialog.call(
+  this,
+  {
+    save: {
+      fn: async vnode => {
+        return await _this.saveAction();
+      }
     }
-  }
-}, to, from, next, url);
-```
+  },
+  to,
+  from,
+  next,
+  url
+);
+````
 
 ## 全局指令
 
 > download（点击从指定地址下载文件）
 
-```javascript
-<i v-download=”downurl”  v-download:success="downloadok" v-download:error="downloaderror"></i>
+```vue
+<template>
+  <i v-download="downLoadUrl(id)" v-download:success="downloadok" v-download:error="downloaderror"></i>
+</template>
+<script>
+export default {
+  computed: {
+    downLoadUrl() {
+      return id => {
+        // 例如这样
+        let params = {
+          id: id
+        };
+        return {
+          url: '/api/binary/file/download',
+          params: params,
+          changeStatus: status => {
+            if (status == 'start') {
+              // 下载开始的处理逻辑，可以根据自己的业务需求进行处理
+            } else if (status == 'success' || status == 'error') {
+              // 下载完成的处理逻辑，可以根据自己的业务需求进行处理
+            }
+          }
+        };
+      };
+    }
+  }
+};
+</script>
 ```
 
-参数|用途|使用|其他
-:---:|:---:|:---:|:---|
-downurl|设置下载的参数和地址|单纯url和{url:地址，method:'post',params:{参数},changeStatus(status)=>{//do something with status}}|url为必传，method、changeStatus、params均为非必传|
-downloadok|下载接口回调成功回调事件|-|-|
-downloaderror|下载接口回调失败回调事件|-|-|
-
-
+|     参数      |           用途           |
+| :-----------: | :----------------------: |
+|    downurl    |   设置下载的参数和地址   |
+|  downloadok   | 下载接口回调成功回调事件 |
+| downloaderror | 下载接口回调失败回调事件 |
 
 > clipboard（点击复制指定内容到剪切板供其他地方粘贴复制用）
 
@@ -279,7 +301,7 @@ downloaderror|下载接口回调失败回调事件|-|-|
 | 参数 | 用途 | 使用 | 其他 |
 | :--: | :--: | :--: | :--- |
 
-> scroll-hidden（容器滚动时隐藏drop的内容，指令使用在滚动的容器里面，监听滚动事件）
+> scroll-hidden（容器滚动时隐藏 drop 的内容，指令使用在滚动的容器里面，监听滚动事件）
 
 ```javascript
 <div v-scrollHidden></div>
@@ -300,11 +322,11 @@ downloaderror|下载接口回调失败回调事件|-|-|
 
 ## 全局过滤器
 
-参数|用途|使用|其他
-:---:|:---:|:---:|:---|
-formatDate|时间格式处理|{{ 时间戳 \| formatDate(指定格式) }}|指定格式可不传,默认yyyy-mm-dd hh:mm:ss|
-formatTimeCost|处理耗时|{{ timeCost\|formatTimeCost({textUnit:’second’,valueUnit:’second’,unitType:’en’}) }}|通用场景：timecost为精确到毫秒的时间戳转化为标准时间格式，后面参数为非必填（默认显示文案单位textUnit为秒second、值的单位valueUnit为毫秒millisecond,单位语言类型默认为中文zh）更多设置：textUnit和valueUnit可供设置的有：{'day': '天','hour': '小时','minute': '分钟','second': '秒','millisecond': '毫秒'},unitType目前只支持中文zh和英文en|
-unescapeHtml|转义特殊字符为html|{{ 字符串 \| unescapeHtml}}|-|
+|      参数      |        用途         |   使用    | 其他                    |
+| :------------: | :-----------------: | :-------: | :---------------------- | --------------------------------------- |
+|   formatDate   |    时间格式处理     | {{ 时间戳 | formatDate(指定格式) }} | 指定格式可不传,默认 yyyy-mm-dd hh:mm:ss |
+| formatTimeCost |      处理耗时       |           |                         |
+|  unescapeHtml  | 转义特殊字符为 html | {{ 字符串 | unescapeHtml}}          | -                                       |
 
 ## 全局状态管理
 
@@ -318,29 +340,29 @@ unescapeHtml|转义特殊字符为html|{{ 字符串 \| unescapeHtml}}|-|
 
 #### 基础组件
 
-|   名称    |          用途          |        说明        | 其他                   |
-| :-------: | :--------------------: | :----------------: | :--------------------- |
-| TsContain | 基本排版（页面最外层） | 见TsContain组件api | 全局组件，直接调用即可 |
-|  Button   |          按钮          |    iview的组件     | 全局组件，直接调用即可 |
-|   Tabs    |         标签页         |    iview的组件     | 全局组件，直接调用即可 |
-| Dropdown  |        下拉菜单        |    iview的组件     | 全局组件，直接调用即可 |
-|   Badge   |         徽标数         |    iview的组件     | 全局组件，直接调用即可 |
-|  Loading  |       加载中组件       |    封装过的组件    | 全局组件，直接调用即可 |
-|  NoData   |     无数据提示组件     |    封装过的组件    | 全局组件，直接调用即可 |
+|   名称    |          用途          |         说明          | 其他                   |
+| :-------: | :--------------------: | :-------------------: | :--------------------- |
+| TsContain | 基本排版（页面最外层） | 见 TsContain 组件 api | 全局组件，直接调用即可 |
+|  Button   |          按钮          |     iview 的组件      | 全局组件，直接调用即可 |
+|   Tabs    |         标签页         |     iview 的组件      | 全局组件，直接调用即可 |
+| Dropdown  |        下拉菜单        |     iview 的组件      | 全局组件，直接调用即可 |
+|   Badge   |         徽标数         |     iview 的组件      | 全局组件，直接调用即可 |
+|  Loading  |       加载中组件       |     封装过的组件      | 全局组件，直接调用即可 |
+|  NoData   |     无数据提示组件     |     封装过的组件      | 全局组件，直接调用即可 |
 
 #### 拓展定制组件
 
-|  名称  |   用途   |      说明       | 其他         |
-| :----: | :------: | :-------------: | :----------- |
-| TsForm | 表单组件 | 见TsForm组件api | 需要注册组件 |
+|  名称  |   用途   |        说明        | 其他         |
+| :----: | :------: | :----------------: | :----------- |
+| TsForm | 表单组件 | 见 TsForm 组件 api | 需要注册组件 |
 
 #### 表单搜索、选择类组件
 
-|      名称       |      用途      |           说明           | 其他                                                 |
-| :-------------: | :------------: | :----------------------: | :--------------------------------------------------- |
-| CombineSearcher |  组合下拉搜索  | 见CombineSearcher组件api | 需要注册组件                                         |
-|  PoptipSelect   |   下拉选择器   |  见PoptipSelect组件api   | 一般用于固定选项下拉展开后有描述等内容，需要注册组件 |
-|   TimeSelect    | 时间下拉选择器 |   见TimeSelect组件api    | 一般用于选择固定时间范围和具体时间范围，需要注册组件 |
+|      名称       |      用途      |            说明             | 其他                                                 |
+| :-------------: | :------------: | :-------------------------: | :--------------------------------------------------- |
+| CombineSearcher |  组合下拉搜索  | 见 CombineSearcher 组件 api | 需要注册组件                                         |
+|  PoptipSelect   |   下拉选择器   |  见 PoptipSelect 组件 api   | 一般用于固定选项下拉展开后有描述等内容，需要注册组件 |
+|   TimeSelect    | 时间下拉选择器 |   见 TimeSelect 组件 api    | 一般用于选择固定时间范围和具体时间范围，需要注册组件 |
 
 #### 表格的类
 
diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index 0ba61ab66e858772126f7363bc331b8a21e54266..75b947c8dc18694a23be5b3bc40d457547ec7ae5 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -52,7 +52,7 @@
             :class="{seachable:search,clearable:clearable && totalText && Object.keys(totalText).length,'form-target':!border}"
             @click="clickItem"
           >
-            <span class="search-box tsfont-search" @click="handleSearch"></span>
+            <span class="search-box tsfont-search" @click.stop="handleSearch"></span>
             <div ref="tagItem" class="search-main">
               <span v-if="(totalText && Object.keys(totalText).length) ||$slots.textItem" class="tag-item">
                 <slot
@@ -270,6 +270,9 @@ export default {
       //如果是带搜索的点击空白处聚焦搜索输入框，如果是纯下拉的点击空白处展开收起下拉
       if (this.search) {
         this.$refs.input && this.$refs.input.focus();
+      } else {
+        // 如果是不带搜索的点击空白处展开收起下拉
+        this.handleToggleOpen();
       }
     },
     handleToggleOpen() {
diff --git a/src/resources/components/Condition/components/ex-worktime-condition-handler.vue b/src/resources/components/Condition/components/ex-worktime-condition-handler.vue
new file mode 100644
index 0000000000000000000000000000000000000000..922ef27737eec5cd502ba5428152a7fd5fe1cd5f
--- /dev/null
+++ b/src/resources/components/Condition/components/ex-worktime-condition-handler.vue
@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <TsFormSelect
+      dynamicUrl="/api/rest/worktime/search/forselect"
+      transfer
+      :value="value"
+      :disabled="disabled"
+      :params="{ isActive: 1 }"
+      rootName="list"
+      border="border"
+      @on-change="changeValue"
+    ></TsFormSelect>
+  </div>
+</template>
+<script>
+import { ConditionHandlerBase } from '@/resources/components/Condition/components/base-condition-handler.js';
+export default {
+  name: '',
+  components: {
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+  },
+  extends: ConditionHandlerBase,
+  inheritAttrs: false,
+  props: {
+    disabled: { type: Boolean }
+  },
+  data() {
+    return {};
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {},
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/resources/components/Condition/components/index.js b/src/resources/components/Condition/components/index.js
index dabebae3034c9eb77d7c79a6f92e8114ca023e47..65e23d827667567de7ceabd0cb50365b87d7bac2 100644
--- a/src/resources/components/Condition/components/index.js
+++ b/src/resources/components/Condition/components/index.js
@@ -1,6 +1,10 @@
+//通用组件
 export { default as textConditionHandler } from '@/resources/components/Condition/components/text-condition-handler.vue';
 export { default as numberConditionHandler } from '@/resources/components/Condition/components/number-condition-handler.vue';
 export { default as datetimeConditionHandler } from '@/resources/components/Condition/components/datetime-condition-handler.vue';
 export { default as selectConditionHandler } from '@/resources/components/Condition/components/select-condition-handler.vue';
 export { default as userselectConditionHandler } from '@/resources/components/Condition/components/user-condition-handler.vue';
 export { default as enumConditionHandler } from '@/resources/components/Condition/components/enum-condition-handler.vue';
+//特定表达式组件
+export { default as ex_inworktime_ConditionHandler } from '@/resources/components/Condition/components/ex-worktime-condition-handler.vue';
+export { default as ex_outworktime_ConditionHandler } from '@/resources/components/Condition/components/ex-worktime-condition-handler.vue';
diff --git a/src/resources/components/Condition/condition-group.vue b/src/resources/components/Condition/condition-group.vue
index 198faa77e7c59d60ad3e3cfa607c7e41a841bc37..483d255940300f7b9c8248e34b68042f863624bc 100644
--- a/src/resources/components/Condition/condition-group.vue
+++ b/src/resources/components/Condition/condition-group.vue
@@ -25,6 +25,7 @@
                   :disabled="readonly"
                   :value="conItem.name"
                   :transfer="true"
+                  border="border"
                   valueName="name"
                   textName="label"
                   :validateList="[{ name: 'required', message: ' ' }]"
@@ -43,6 +44,7 @@
                   :value="conItem.expression"
                   :dataList="getExpressionList(conItem)"
                   :transfer="true"
+                  border="border"
                   :validateList="[{ name: 'required', message: ' ' }]"
                   @change="
                     (value, option) => {
@@ -57,7 +59,9 @@
                 v-if="getAttr(conItem)"
                 :readonly="readonly"
                 :value="conItem.valueList"
+                :expression="conItem.expression"
                 :conditionItem="getAttr(conItem)"
+                :conditionItemData="conItem"
                 @change="
                   val => {
                     setAttrValue(conItem, val);
@@ -154,7 +158,9 @@ export default {
         gte: '大于等于',
         lte: '小于等于',
         'is-null': '为空',
-        'is-not-null': '不为空'
+        'is-not-null': '不为空',
+        inworktime: '在服务时间内',
+        outworktime: '在服务时间外'
       },
       joinTypeList: [
         {
diff --git a/src/resources/components/Condition/condition-item.vue b/src/resources/components/Condition/condition-item.vue
index 596134640cdcc9915e4675938512808db00bbe83..2ad59c79a6c30b2a8d5afbdc043a83326660e791 100644
--- a/src/resources/components/Condition/condition-item.vue
+++ b/src/resources/components/Condition/condition-item.vue
@@ -1,5 +1,14 @@
 <template>
-  <div>
+  <div v-if="expression && itemMap['ex_' + expression + '_ConditionHandler']">
+    <component
+      :is="itemMap['ex_' + expression + '_ConditionHandler']"
+      :disabled="readonly"
+      v-bind="conditionItem.config"
+      :value="finalValue"
+      @change="changeValue"
+    ></component>
+  </div>
+  <div v-else>
     <component
       :is="itemMap[conditionItem.type + 'ConditionHandler']"
       :disabled="readonly"
@@ -20,6 +29,8 @@ export default {
   props: {
     readonly: { type: Boolean, default: false },
     conditionItem: { type: Object },
+    conditionItemData: { type: Object }, //条件数据
+    expression: { type: String }, //表达式，某些表达式可能需要特殊的组件
     value: { type: [String, Array] }
   },
   data() {
@@ -50,9 +61,26 @@ export default {
       } else {
         return this.value;
       }
+    },
+    usingPlugin() {
+      //计算当前条件插件在用什么插件，在插件发生切换时需要清空value
+      if (this.expression && this.itemMap['ex_' + this.expression + '_ConditionHandler']) {
+        return 'ex_' + this.expression;
+      } else {
+        return this.conditionItem.type;
+      }
     }
   },
-  watch: {}
+  watch: {
+    usingPlugin: {
+      handler: function(val) {
+        //当条件发生切换时，清空value值，避免不同插件对value值不适配
+        console.log('change', val);
+        this.$set(this.conditionItemData, 'valueList', null);
+      },
+      deep: true
+    }
+  }
 };
 </script>
 <style lang="less"></style>
diff --git a/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-dialog.vue b/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-dialog.vue
index ac7b381246fdb65841e1c18fea4bdf01f834a28b..49a812f9624a32494e18b53a52302d98aa0b1216 100644
--- a/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-dialog.vue
+++ b/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-dialog.vue
@@ -347,7 +347,7 @@ export default {
   }
   .input-show {
     padding: 16px;
-    height: calc(100vh - 160px);
+    height: calc(100vh - 150px);
     overflow-y: auto;
     .tip-input {
       position: relative;
@@ -363,7 +363,7 @@ export default {
   .node-show {
     padding: 16px;
     width: 100%;
-    height: calc(100vh - 160px);
+    height: calc(100vh - 150px);
     overflow-y: auto;
     .clear-btn {
       text-align: right;
diff --git a/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-nomarl.vue b/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-nomarl.vue
index e1033e0f8580c0a006423c4277a1f82234d7efeb..d0d720be441ba2c64698271e30ddc0775b6ef128 100644
--- a/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-nomarl.vue
+++ b/src/resources/components/FormMaker/formedit/view/resourceinput/resourceinput-nomarl.vue
@@ -329,7 +329,7 @@ export default {
 }
 .input-show{
   padding: 16px;
-  height: 300px;
+  height: 330px;
   .tip-input {
     position: relative;
     padding-left: 16px;
@@ -344,7 +344,7 @@ export default {
 .node-show{
   padding:0 16px;
   width: 100%;
-  height: 300px;
+  height: 330px;
   .clear-btn{
     text-align: right;
     margin-bottom: 8px;
diff --git a/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/filter-search.vue b/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/filter-search.vue
index 07203c91a39c9d7a99818f1aac5c8472a5aee666..753fcfc2947b61fa68c8ab63ce67f037faa40a22 100644
--- a/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/filter-search.vue
+++ b/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/filter-search.vue
@@ -144,7 +144,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false},
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
diff --git a/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/resource-input.vue b/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/resource-input.vue
index 8825266eb4089a562419ae549d37a5936dad2aa5..77a5637940457587741734d346c669317ad5e3c9 100644
--- a/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/resource-input.vue
+++ b/src/resources/components/FormMaker/formedit/view/resoureces/addtarget/resource-input.vue
@@ -325,7 +325,7 @@ export default {
 }
 .input-show{
   padding: 16px;
-  height: 300px;
+  height: 330px;
   .tip-input {
     position: relative;
     padding-left: 16px;
@@ -340,7 +340,7 @@ export default {
 .node-show{
   padding: 8px 16px;
   width: 100%;
-  height: 300px;
+  height: 330px;
   .clear-btn{
     text-align: right;
     margin-bottom: 8px;
diff --git a/src/resources/components/ProcessTaskSearcher/handlers/channelselect.vue b/src/resources/components/ProcessTaskSearcher/handlers/channelselect.vue
index bf31b5c1cad56df72245e3dccd0e4ceb85ca389f..ad7da395241ba02faed62b7a6c99acc8aa24b342 100644
--- a/src/resources/components/ProcessTaskSearcher/handlers/channelselect.vue
+++ b/src/resources/components/ProcessTaskSearcher/handlers/channelselect.vue
@@ -256,7 +256,16 @@ export default {
               } catch (e) {
                 console.error(e);
               }
-              this.formConditionList.push(newD);
+              //如果有相同的属性，就不添加了，避免重复添加
+              let findItem = this.formConditionList.find(f => f.handler === newD.handler);
+              if (findItem) {
+                if (findItem.formHandler === newD.formHandler && !this.$utils.isEmpty(newD.config)) {
+                  let newConfig = Object.assign({}, findItem.config || {}, newD.config);
+                  this.$set(findItem, 'config', newConfig);
+                }
+              } else {
+                this.formConditionList.push(newD);
+              }
             });
           }
         });
diff --git a/src/resources/components/TsContain/TsContain.vue b/src/resources/components/TsContain/TsContain.vue
index c9bf66f3268eec133b7508f37b93707584cdfaae..6d62e22eb9c70ff2964f66fcf7e91798b0f51fc2 100644
--- a/src/resources/components/TsContain/TsContain.vue
+++ b/src/resources/components/TsContain/TsContain.vue
@@ -5,7 +5,7 @@
     class="bg-grey"
     :style="{height: containHeight}"
   >
-    <div v-if="!hideHeader" :class="[{ 'pl-nm': true, 'pr-nm': true }, { 'tscontain-header': isBackgroung == true, 'tscontain-headerBg padding-lr': isBackgroung == false }, { 'input-border': border == 'border' }, { 'tsForm-border-none': border == 'none' }, { 'tscontain-headerbottom': navHeaderBottom == 'none' }]">
+    <div v-if="!hideHeader" :class="getHeaderClassName">
       <div :style="getCollapseStyle" style="display: grid">
         <div v-if="hasNavigation" style="white-space: nowrap">
           <slot name="navigation"></slot>
@@ -21,7 +21,7 @@
               });
             "
           ></span>
-          <Divider v-if="siderHide && $slots.topLeft" type="vertical" />
+          <Divider v-if="$slots.topLeft" type="vertical" />
         </div>
         <div ref="containTopRight">
           <slot name="top">
@@ -111,7 +111,10 @@ export default {
     clearStyle: { type: Boolean, default: false }, //是否需要清除侧边栏的样式（背景色、圆角，不包含右侧固定高度）
     rightWidth: { type: Number, default: 200 },
     mode: { type: String, default: 'window' }, //显示模式，有window和dialog两种，如果是dialog模式，高度强制变成100%
-    rightBtn: { type: Boolean, default: false } //右侧收起展开按钮
+    rightBtn: { type: Boolean, default: false }, //右侧收起展开按钮
+    topLeftWidth: { type: String, default: '' }, //左侧宽度
+    topCenterWidth: { type: String, default: '' }, //中间宽度
+    topRightWidth: { type: String, default: '' } //右侧宽度
   },
   data() {
     return {
@@ -225,27 +228,36 @@ export default {
       }
     },
     getTopStyle() {
-      if (this.$slots.topLeft && this.$slots.topCenter && this.$slots.topRight) {
+      const hasLeft = !!this.$slots.topLeft;
+      const hasCenter = !!this.$slots.topCenter;
+      const hasRight = !!this.$slots.topRight;
+
+      // 提取重复的宽度计算逻辑
+      const getDefaultWidth = (width, defaultValue) => width || defaultValue;
+      const threeEqualWidths = `${getDefaultWidth(this.topLeftWidth, '33.33%')} ${getDefaultWidth(this.topCenterWidth, '33.33%')} ${getDefaultWidth(this.topRightWidth, '33.33%')}`;
+      const twoEqualWidths = `${getDefaultWidth(this.topLeftWidth, '50%')} 0px ${getDefaultWidth(this.topRightWidth, '50%')}`;
+
+      if (hasLeft && hasCenter && hasRight) {
         //左中右
-        return { 'grid-template-columns': '33.33% 33.33% 33.33%' };
-      } else if (this.$slots.topLeft && this.$slots.topCenter && !this.$slots.topRight) {
+        return { 'grid-template-columns': threeEqualWidths };
+      } else if (hasLeft && hasCenter && !hasRight) {
         //左中
-        return { 'grid-template-columns': '33.33% 33.33% 33.33%' };
-      } else if (this.$slots.topLeft && !this.$slots.topCenter && !this.$slots.topRight) {
+        return { 'grid-template-columns': threeEqualWidths };
+      } else if (hasLeft && !hasCenter && !hasRight) {
         //左
-        return { 'grid-template-columns': 'auto 0px 0px' };
-      } else if (this.$slots.topLeft && !this.$slots.topCenter && this.$slots.topRight) {
+        return { 'grid-template-columns': `${getDefaultWidth(this.topLeftWidth, 'auto')} 0px 0px` };
+      } else if (hasLeft && !hasCenter && hasRight) {
         //左右
-        return { 'grid-template-columns': '50% 0px 50%' };
-      } else if (!this.$slots.topLeft && !this.$slots.topCenter && this.$slots.topRight) {
+        return { 'grid-template-columns': twoEqualWidths };
+      } else if (!hasLeft && !hasCenter && hasRight) {
         //右
-        return { 'grid-template-columns': '50% 0px 50%' };
-      } else if (!this.$slots.topLeft && this.$slots.topCenter && this.$slots.topRight) {
+        return { 'grid-template-columns': twoEqualWidths };
+      } else if (!hasLeft && hasCenter && hasRight) {
         //中右
-        return { 'grid-template-columns': '33.33% 33.33% 33.33%' };
-      } else if (!this.$slots.topLeft && this.$slots.topCenter && !this.$slots.topRight) {
+        return { 'grid-template-columns': threeEqualWidths };
+      } else if (!hasLeft && hasCenter && !hasRight) {
         //中
-        return { 'grid-template-columns': '33.33% 33.33% 33.33%' };
+        return { 'grid-template-columns': threeEqualWidths };
       }
       return {};
     },
@@ -261,14 +273,14 @@ export default {
         if (this.siderHide) {
           return { 'grid-template-columns': 'min-content min-content auto' };
         } else {
-          return { 'grid-template-columns': 'min-content auto calc(100% - ' + this.siderWidth + 'px)' };
+          return { 'grid-template-columns': 'min-content min-content auto' };
         }
       } else if (!this.hasNavigation && this.hasCollapse && this.hasTop) {
         //只有收起栏和内容
         if (this.siderHide) {
           return { 'grid-template-columns': 'min-content auto' };
         } else {
-          return { 'grid-template-columns': 'auto calc(100% - ' + this.siderWidth + 'px)' };
+          return { 'grid-template-columns': 'min-content auto' };
         }
       } else if (!this.hasNavigation && !this.hasCollapse && this.hasTop) {
         //只有内容
@@ -293,6 +305,15 @@ export default {
     },
     hasNavigation() {
       return !!this.$slots.navigation;
+    },
+    getHeaderClassName() {
+      return [
+        { 'pl-nm': true, 'pr-nm': true },
+        { 'tscontain-header': this.isBackgroung == true, 'tscontain-headerBg padding-lr': this.isBackgroung == false },
+        { 'input-border': this.border == 'border' },
+        { 'tsForm-border-none': this.border == 'none' },
+        { 'tscontain-headerbottom': this.navHeaderBottom == 'none' }
+      ];
     }
   },
   watch: {
diff --git a/src/resources/components/UploadDialog/UploadDialog.vue b/src/resources/components/UploadDialog/UploadDialog.vue
index c49b6978734a2f6965f557f8b4734a45fe10ded1..1a568bdaedfb1720929cf44c03ddf3184e6f7b00 100644
--- a/src/resources/components/UploadDialog/UploadDialog.vue
+++ b/src/resources/components/UploadDialog/UploadDialog.vue
@@ -355,11 +355,11 @@ export default {
       if ((file.Status = 'ERROR')) {
         this.$Notice.error({
           title: this.$t('message.importfailed'),
-          desc: response.Message
+          desc: response?.Message
         });
         let findFileItem = this.fileList.find(item => item.file.name === file.name);
         if (findFileItem) {
-          findFileItem.Status = response.Status;
+          findFileItem.Status = response?.Status;
         }
       }
     },
diff --git a/src/resources/components/UserSelect/UserSelect.vue b/src/resources/components/UserSelect/UserSelect.vue
index ec799217695a6202ea95a9c400c5c10c17653e01..dc7ab78b418e96a323a22b10f325ed4795e3c1df 100644
--- a/src/resources/components/UserSelect/UserSelect.vue
+++ b/src/resources/components/UserSelect/UserSelect.vue
@@ -93,6 +93,7 @@
                     :key="gindex + '_' + uindex"
                     placement="right"
                     theme="light"
+                    :disabled="$utils.isEmpty(user.parentPathList)"
                     transfer
                   >
                     <slot name="option" :row="user" :group="group">
@@ -111,8 +112,12 @@
                       :row="user"
                       :group="group"
                     >
-                      <!-- {{ user.text }} -->
-                      <Tooltip theme="light" placement="right" transfer>
+                      <Tooltip
+                        theme="light"
+                        placement="right"
+                        :disabled="(group.value === 'user' && $utils.isEmpty(user.team)) || $utils.isEmpty(user.text)"
+                        transfer
+                      >
                         <div class="overflow team-text">{{ user.text }}</div>
                         <div slot="content" class="team-tip">
                           <span v-if="group.value == 'user'" class="span-tip">{{ user.team }}</span>
diff --git a/src/resources/directives/img-viewer.js b/src/resources/directives/img-viewer.js
index 5179c8ac6be7ac4e72c1ed38a3e09c9cefe2eb79..045927e77f88bef03aad1d2b7c51b02422a3bf54 100644
--- a/src/resources/directives/img-viewer.js
+++ b/src/resources/directives/img-viewer.js
@@ -238,7 +238,7 @@ function createImgeDiv(imgList, currentIndex) { //创建轮播的vue对象
       }
     },
     template: `<div v-show="invisible"  ref="caroselImg" class="carosel-img bg-mongolia" style="padding-top: 55px;" :style="{'z-index':zIndex}"  @click="handlerClose">
-                 <div class="text-title img-tool" @click.stop><div class="img-btn" @click="handlerClose"><span class="tsfont-close" ></span></div></div>
+                 <div class="text-title img-tool" @click.stop><div class="img-btn" @click="handlerClose"><span class="text-white tsfont-close" ></span></div></div>
                 <Carousel v-model="currentIndex"  :height="height-55" easing="none" dots="none" @on-change="onChange">
                     <CarouselItem v-for="(img,index) in imgList" :key="index">
                         <div class="demo-carousel">
diff --git a/src/resources/directives/img-viewer.less b/src/resources/directives/img-viewer.less
index 393b3870c3071ec9bdc10f0f605d1d4387e508b7..c56afd0ffe90e33dadcd77e08f9eec4bbe60e715 100644
--- a/src/resources/directives/img-viewer.less
+++ b/src/resources/directives/img-viewer.less
@@ -1,51 +1,52 @@
-.carosel-img{
+.carosel-img {
   position: fixed;
   width: 100%;
   height: 100%;
   z-index: 200;
   top: 0;
   left: 0;
-  .img-tool{
+  .img-tool {
     position: absolute;
     top: 0;
     opacity: 0.8;
     font-size: 18px;
     width: 100%;
-    .img-btn{
+    .img-btn {
       float: right;
       padding: 3px 16px;
       cursor: pointer;
-      .tsfont-close{
+      .tsfont-close {
         padding: 10px 0px;
-      
       }
     }
   }
-  .demo-carousel{
+  .demo-carousel {
     text-align: center;
+    width: 100%; // 解决预览时，图片显示不完整问题
+    height: 100%;
     position: relative;
     top: 50%;
     transform: translate(0, -50%);
-    img{
+    img {
       user-select: none;
       max-width: 90%;
       max-height: 100%;
       cursor: zoom-in;
-      &[isMax='1']{
+      &[isMax='1'] {
         cursor: zoom-out;
       }
     }
   }
-  .ivu-carousel-arrow>*{
+  .ivu-carousel-arrow > * {
     font-size: 25px;
     vertical-align: middle;
   }
 }
-.img-viewer{
-  img{
-    cursor:zoom-in;
+.img-viewer {
+  img {
+    cursor: zoom-in;
   }
   .image > img {
     max-width: 100%;
   }
-}
\ No newline at end of file
+}
diff --git a/src/resources/import/component-manager.js b/src/resources/import/component-manager.js
index dc562130dd7fc2038f0345488be09305dde7d1da..c1da3eb4da2082c6672cfaf8545a7d0c81d47612 100644
--- a/src/resources/import/component-manager.js
+++ b/src/resources/import/component-manager.js
@@ -1,8 +1,14 @@
 /**
  * 组件管理器
+ * // 老写法：
  * 基于categoryList动态注册和获取组件
+ * Category来自categoryList，首字母大写
  * 注册方法：registerCategoryComponent(component)
- * 获取方法：getCategoryComponent() // Category来自categoryList，首字母大写
+ * 获取方法：getCategoryComponent()
+ * // 新写法：
+ * 如果是用新写法，获取老写法的组件，category就是categoryList中的分类名称
+ * registerComponent(category, component)
+ * getComponent(category, moduleName) // moduleName为模块名称，category为分类名称, category 为router时，才需要传入moduleName(需要获取指定模块的路由列表)，其他情况不需要传入moduleName
  *
  * 分类说明：
  * timeLine 时间线
@@ -35,7 +41,7 @@
  */
 class ComponentManager {
   static categoryList = ['timeLine', 'taskDetail', 'stepLog', 'flowNode', 'flowElement', 'dispatcher', 'dispatcherValid', 'workCenterColumn', 'formDefine', 'formConfig', 'formComponent', 'deployAppConfigEnvTab', 'mqTopicConfig', 'mqSubscribeConfig', 'loginPage', 'formVersionList', 'router', 'deployAppConfigModule', 'diagramWidget', 'diagramWidgetConfig', 'diagramWidgetCustomConfig', 'alertEventHandlerEdit', 'alertEventHandlerView', 'alertEventHandlerConfig'];
-  static categoryConfig = {};
+  static categoryConfig = {_template: {}};
   static generateMethods() {
     this.categoryList.forEach(category => {
       const categoryName = category.charAt(0).toUpperCase() + category.slice(1);
@@ -69,6 +75,49 @@ class ComponentManager {
         }
       };
     });
+    //用于注册vue模板
+    this['registerVueTemplate'] = (name, template) => {
+      this.categoryConfig['_template'][name] = template;
+    };
+    this['getVueTemplate'] = (name, template) => {
+      return this.categoryConfig['_template'][name];
+    };
+  }
+  /**
+   * 新注册组件方法
+   * @param {string} name 分类名称，如：timeLine、taskDetail、stepLog等
+   * @param {object/array}  component 组件，如：{timeLine: {component: component}}
+   */ 
+  static registerComponent(name, component) {
+    const existing = this.categoryConfig[name];
+    if (!existing) {
+      this.categoryConfig[name] = component;
+      return;
+    }
+    if (Array.isArray(component)) {
+      this.categoryConfig[name].push(...component);
+    } else {
+      for (let key in component) {
+        if (this.categoryConfig[name].hasOwnProperty(key) && Array.isArray(component[key]) && component[key].length > 0) {
+          this.categoryConfig[name][key].push(...component[key]);
+        } else {
+          this.categoryConfig[name][key] = component[key];
+        }
+      }
+    }
+  }
+  /**
+   * 新获取组件方法
+   * @param {string} name 分类名称，如：timeLine、taskDetail、stepLog等
+   * @param {string} moduleName 模块名称，如：process、cmdb等。模块名称是路由(router)时必填，其他时候可以不传。
+   * 
+   */ 
+  static getComponent(name, moduleName) {
+    if (name && moduleName) {
+      return this.categoryConfig[name] ? this.categoryConfig[name][moduleName] : '';
+    } else {
+      return this.categoryConfig[name];
+    }
   }
 }
 ComponentManager.generateMethods();
diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js
index 5dd33766dd1ef04bd30610795c654061b10b24e7..c00deb1a0fcdcb01996b2315c82708af08e886e3 100644
--- a/src/resources/mixins/formMixins.js
+++ b/src/resources/mixins/formMixins.js
@@ -50,6 +50,11 @@ export default {
       // 是否自定义值，单个字符串(value:1)可以自定义返回{text:1,value:1}，数组[1]可以自定义返回[{text:1,value:1}]
       type: Boolean,
       default: false
+    },
+    historyValue: {
+      // 历史值(Object包含text,value)存在时，用历史值回显数据（在dynamicUrl初始化时，不调用接口）
+      type: [String, Array, Object],
+      default: null
     }
   },
   methods: {
@@ -280,6 +285,40 @@ export default {
         }
         return value;
       };
+    },
+    handleHistoryValue() {
+      return historyData => {
+        let selectedList = [];
+        let historyValueList = Array.isArray(historyData) ? historyData : [historyData];
+        historyValueList.forEach(item => {
+          if (!this.$utils.isEmpty(item)) {
+            let obj = {};
+            if (typeof item === 'object') {
+              obj[this.valueName] = item.value;
+              obj[this.textName] = item.text;
+            } else {
+              obj[this.valueName] = obj[this.textName] = item;
+            }
+            selectedList.push(obj);
+          }
+        });
+        return selectedList;
+      };
+    },
+    getSelectedText() {
+      return (val) => {
+        const getNodeText = (node) => node && node[this.textName] ? node[this.textName] : '-';
+        let node = this.nodeList.find(item => item[this.valueName] == val);
+        if (node) {
+          return getNodeText(node);
+        } else if (!this.$utils.isEmpty(this.historyValue)) {
+          const nodeList = this.handleHistoryValue(this.historyValue);
+          const nodeItem = nodeList.find(item => item[this.valueName] == val);
+          return getNodeText(nodeItem);
+        } else {
+          return '-';
+        }
+      };
     }
   },
 
diff --git a/src/resources/plugins/TsForm/TsFormCheckbox.vue b/src/resources/plugins/TsForm/TsFormCheckbox.vue
index 12b0d1467b8b4b2ec178850d95de375e18d92b0f..442d4e9f6d125d04b3c8ee0b1601b462b6831cee 100755
--- a/src/resources/plugins/TsForm/TsFormCheckbox.vue
+++ b/src/resources/plugins/TsForm/TsFormCheckbox.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="form-li">
     <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]">
-      <template v-if="nodeList && nodeList.length > 0">
+      <template v-if="currentValue && currentValue.length > 0">
         <span
-          v-for="(val, dindex) in currentValue"
+          v-for="(item, dindex) in currentValue"
           :key="dindex"
           style="display:flex;"
         >
-          {{ getText(val) }}
+          {{ getSelectedText(item) }}
           <span v-if="dindex < currentValue.length - 1" class="text-grey tsform-readonly-sperate">{{ sperateText }}</span>
         </span>
       </template>
@@ -133,8 +133,12 @@ export default {
     test() {
       return false;
     },
-    initDataListByUrl: function() {
+    initDataListByUrl() {
       let _this = this;
+      if (this.readonly && !this.$utils.isEmpty(this.historyValue)) {
+        // 只读模式下不需要调接口获取数据
+        return false;
+      }
       if (_this.url) {
         _this.nodeList = [];
         let params = { pageSize: 100 };
@@ -169,22 +173,31 @@ export default {
         // }
       }
     },
-    handleEchoFailedDefaultValue() {
-      // 处理回显失败默认值，回显失败清空默认值
-      if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
-        let selectedList = [];
-        let valueList = this.currentValue instanceof Array ? this.currentValue : [this.currentValue];
-        valueList.forEach((item, index) => {
-          if (item && !this.nodeList.find((n) => n[this.valueName] == item)) {
-            selectedList.push(item[this.valueName]);
-            this.currentValue.splice(index, 1);
-          }
-        });
-        if (!this.$utils.isEmpty(selectedList)) {
-          this.onChangeValue();
+    handleDisabledNodeList() {
+      if (this.disabled && !this.$utils.isEmpty(this.historyValue)) {
+        const nodeValueSet = new Set(this.nodeList.map(item => item[this.valueName]));
+        const newItems = this.historyValue.filter(item => !nodeValueSet.has(item[this.valueName]));
+        if (Array.isArray(this.nodeList) && newItems.length > 0) {
+          this.nodeList.unshift(...newItems);
         }
       }
     },
+    handleEchoFailedDefaultValue() {
+      // 处理回显失败默认值，回显失败清空默认值
+      // if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
+      //   let selectedList = [];
+      //   let valueList = this.currentValue instanceof Array ? this.currentValue : [this.currentValue];
+      //   valueList.forEach((item, index) => {
+      //     if (item && !this.nodeList.find((n) => n[this.valueName] == item)) {
+      //       selectedList.push(item[this.valueName]);
+      //       this.currentValue.splice(index, 1);
+      //     }
+      //   });
+      //   if (!this.$utils.isEmpty(selectedList)) {
+      //     this.onChangeValue();
+      //   }
+      // }
+    },
     onChangeValue(val, item) {
       let isSame = JSON.stringify(this.value) == JSON.stringify(this.currentValue);
       let value = this.$utils.deepClone(this.currentValue);
@@ -251,12 +264,6 @@ export default {
       let reslutClass = { 'ivu-checkbox-group-vertical': this.vertical };
       this.className && (reslutClass[this.className] = true);
       return reslutClass;
-    },
-    getText() {
-      return (val) => {
-        let node = this.nodeList.find(item => item[this.valueName] == val);
-        return node && node[this.textName] ? node[this.textName] : '-';
-      };
     }
   },
   watch: {
@@ -274,7 +281,8 @@ export default {
     dataList: {
       handler(newValue) {
         if (!this.url) {
-          this.$set(this, 'nodeList', newValue);
+          this.$set(this, 'nodeList', this.$utils.deepClone(newValue) || []);
+          this.handleDisabledNodeList();
           this.setSelectList();
         }
       },
diff --git a/src/resources/plugins/TsForm/TsFormHandler.vue b/src/resources/plugins/TsForm/TsFormHandler.vue
index 5aa6b9b1c853efb809e49d3d0428ce7aa7675a11..d42ad452cb53025399128acacdeb39c694702f8a 100644
--- a/src/resources/plugins/TsForm/TsFormHandler.vue
+++ b/src/resources/plugins/TsForm/TsFormHandler.vue
@@ -62,12 +62,13 @@ export default {
   },
   computed: {},
   watch: {
-    /*valueLocal: {
-      handler() {
-        this.$emit('on-change', this.valueLocal);
+    value: {
+      handler(newValue) {
+        // 处理自定义数据，删除单选框值的时候，组件值没有被清空的问题
+        this.valueLocal = this.$utils.deepClone(newValue);
       },
       deep: true
-    }*/
+    }
   },
   render(h, cx) {
     let $handler;
diff --git a/src/resources/plugins/TsForm/TsFormRadio.vue b/src/resources/plugins/TsForm/TsFormRadio.vue
index 059d32e1435f34c522f29c891740271d6f18550c..d8f807c214103aa3ef3e8d6997e5ebbf29a845ae 100755
--- a/src/resources/plugins/TsForm/TsFormRadio.vue
+++ b/src/resources/plugins/TsForm/TsFormRadio.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="form-li">
-    <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]">{{ getText }}</span>
+    <span v-if="readonly" :class="[readonlyClass, readonlyTextHighlightClass]">{{ getSelectedText(currentValue) }}</span>
     <div v-else :style="getStyle">
       <RadioGroup
         v-model="currentValue"
@@ -137,8 +137,12 @@ export default {
     this.cancelAxios && this.cancelAxios.cancel();
   },
   methods: {
-    initDataListByUrl: function() {
+    initDataListByUrl() {
       let _this = this;
+      if (this.readonly && !this.$utils.isEmpty(this.historyValue)) {
+        // 只读模式下不需要调接口获取数据
+        return false;
+      }
       if (_this.url) {
         let params = { pageSize: 100 };
         typeof _this.params == 'object' && (params = Object.assign(params, _this.params));
@@ -170,25 +174,41 @@ export default {
             _this.onChangeValue();
           } 
         }
-        
+        this.handleDisableNodeList();
         this.handleEchoFailedDefaultValue();
       }
     },
-    handleEchoFailedDefaultValue() {
-      // 处理回显失败默认值，回显失败清空默认值
-      if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
-        let selectedList = [];
-        if (this.currentValue) {
-          let selectedItem = this.nodeList.find((item) => item[this.valueName] == this.currentValue);
-          if (!selectedItem) {
-            this.currentValue = null;
+    handleDisableNodeList() {
+      if (this.disabled && !this.$utils.isEmpty(this.historyValue)) {
+        const findItem = this.nodeList.find(item => item[this.valueName] == this.historyValue[this.valueName]);
+        const newItem = {
+          [this.textName]: this.historyValue[this.textName],
+          [this.valueName]: this.historyValue[this.valueName]
+        };
+        if (!findItem) {
+          if (Array.isArray(this.nodeList)) {
+            this.nodeList.unshift(newItem);
+          } else {
+            this.nodeList = [newItem];
           }
         }
-        if (!this.$utils.isEmpty(selectedList)) {
-          this.onChangeValue();
-        }
       }
     },
+    handleEchoFailedDefaultValue() {
+      // 处理回显失败默认值，回显失败清空默认值
+      // if (this.isClearEchoFailedDefaultValue && !this.$utils.isEmpty(this.nodeList)) {
+      //   let selectedList = [];
+      //   if (this.currentValue) {
+      //     let selectedItem = this.nodeList.find((item) => item[this.valueName] == this.currentValue);
+      //     if (!selectedItem) {
+      //       this.currentValue = null;
+      //     }
+      //   }
+      //   if (!this.$utils.isEmpty(selectedList)) {
+      //     this.onChangeValue();
+      //   }
+      // }
+    },
     onChangeValue() {
       let isSame = this.$utils.isSame(this.value, this.currentValue); // 使用isSame比较两个字符串是否一致，避免 '' == 0 为true情况，导致没有emit on-change方法，form表单获取不到值问题
       let value = this.currentValue;
@@ -240,9 +260,7 @@ export default {
       }
       if (this.allowToggle && this.currentValue == label) {
         this.currentValue = null;
-        this.$emit('update:value', this.currentValue);
-        this.$emit('change', this.currentValue);
-        this.$emit('on-change', this.currentValue);
+        this.onChangeValue();
       }
     }
   },
@@ -251,10 +269,6 @@ export default {
       let reslutClass = {};
       this.className && (reslutClass[this.className] = true);
       return reslutClass;
-    },
-    getText() {
-      let node = this.nodeList.find(item => item[this.valueName] == this.currentValue);
-      return node && node[this.textName] ? node[this.textName] : '-';
     }
   },
   watch: {
@@ -270,7 +284,8 @@ export default {
     dataList: {
       handler(newValue) {
         if (!this.url) {
-          this.$set(this, 'nodeList', newValue);
+          this.$set(this, 'nodeList', this.$utils.deepClone(newValue) || []);
+          this.handleDisableNodeList();
           this.setSelectList();
           this.handleEchoFailedDefaultValue();
         }
diff --git a/src/resources/plugins/TsForm/TsFormSelect.vue b/src/resources/plugins/TsForm/TsFormSelect.vue
index f6d99b3424c2c1dfc5f7d226a87ab45ee9e992dd..c5fb71838bd54e2d913aaec7cd9bc5603fa30ded 100755
--- a/src/resources/plugins/TsForm/TsFormSelect.vue
+++ b/src/resources/plugins/TsForm/TsFormSelect.vue
@@ -495,11 +495,6 @@ export default {
       //是否自动选中唯一值
       type: Boolean,
       default: false
-    },
-    historyValue: {
-      // 历史值(Object包含text,value)存在时，用历史值回显数据（在dynamicUrl初始化时，不调用接口）
-      type: [String, Array, Object],
-      default: null
     }
   },
   data() {
@@ -899,19 +894,7 @@ export default {
         return;
       } else if (!this.$utils.isEmpty(this.historyValue)) {
         //历史值回显
-        let historyValueList = Array.isArray(this.historyValue) ? this.historyValue : [this.historyValue];
-        historyValueList.forEach(item => {
-          if (!this.$utils.isEmpty(item)) {
-            let obj = {};
-            if (typeof item === 'object') {
-              obj[this.valueName] = item.value;
-              obj[this.textName] = item.text;
-            } else {
-              obj[this.valueName] = obj[this.textName] = item;
-            }
-            this.selectedList.push(obj);
-          }
-        });
+        this.selectedList = this.handleHistoryValue(this.historyValue);
         return;
       }
       let params = { defaultValue: this.dynamicDefaultValue };
diff --git a/src/resources/plugins/TsForm/TsValidtor.js b/src/resources/plugins/TsForm/TsValidtor.js
index cef7a5cf4a7c512bf35383b86feb61ed592fafba..614291c45e2c8a38c4e3f2fea80b7ec7bacee8e2 100755
--- a/src/resources/plugins/TsForm/TsValidtor.js
+++ b/src/resources/plugins/TsForm/TsValidtor.js
@@ -1,12 +1,12 @@
 //true 代表校验通过，  false代表校验不通过
 import axios from '@/resources/api/http.js';
 import utils from '@/resources/assets/js/util.js';
-import {$t} from '@/resources/init.js';
+import { $t } from '@/resources/init.js';
 
 let validtor = {
   required: {
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('page.content')}),
+    message: $t('form.placeholder.pleaseinput', { target: $t('page.content') }),
     validator: function(rule, value) {
       if (typeof value == 'string') {
         return value.trim() != '';
@@ -26,18 +26,18 @@ let validtor = {
       return /^[0-9]\d*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.intgreaterthan0')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.intgreaterthan0') })
   },
   float: {
     validator: function(rule, value) {
       if (value == '') {
         return true;
       }
-      
+
       return /^-?\d+(\.\d+)?$/.test(value + '');
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.floatpointnumber')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.floatpointnumber') })
   },
   mail: {
     validator: function(rule, value) {
@@ -47,21 +47,21 @@ let validtor = {
       return /^[_a-zA-Z0-9-]{1}([\._a-zA-Z0-9-]+)(\.[_a-zA-Z0-9-]+)*@[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+){1,3}$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('page.emailaddress')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('page.emailaddress') })
   },
   char: {
     validator: function(rule, value) {
       return /^[a-zA-Z]*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('page.alphabet')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('page.alphabet') })
   },
   chinese: {
     validator: function(rule, value) {
       return /^[\u4e00-\u9fff]$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('page.chinesecharacter')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('page.chinesecharacter') })
   },
   dbindex: {
     validator: function(rule, value) {
@@ -75,21 +75,21 @@ let validtor = {
       return /^smtp\.[a-zA-Z0-9]+(\.[a-zA-Z0-9]+){1,3}(\:[0-9]+){0,1}$/.test(value);
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.smtpserver')})
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.smtpserver') })
   },
   pop: {
     validator: function(rule, value) {
       return /^pop\.[a-zA-Z0-9]+(\.[a-zA-Z0-9]+){1,3}(\:[0-9]+){0,1}$/.test(value);
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.popserver')})
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.popserver') })
   },
   imap: {
     validator: function(rule, value) {
       return /^imap\.[a-zA-Z0-9]+(\.[a-zA-Z0-9]+){1,3}(\:[0-9]+){0,1}$/.test(value);
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.imapserver')})
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.imapserver') })
   },
   ip: {
     validator: function(rule, value) {
@@ -100,7 +100,20 @@ let validtor = {
       }
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('page.ipaddress')})
+    message: $t('message.pleaseentertruetarget', { target: $t('page.ipaddress') })
+  },
+  domainOrIP: {
+    validator: function(rule, value) {
+      // 校验域名或者IP是否合法
+      if (!utils.isEmpty(value)) {
+        const hostRegex = /^((([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,})|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.|$)){4})$/;
+        return hostRegex.test(value);
+      } else {
+        return true;
+      }
+    },
+    trigger: 'change',
+    message: $t('message.pleaseentertruetarget', { target: $t('page.domain') + $t('page.or') + 'IP' })
   },
   ipAndPort: {
     validator: function(rule, value) {
@@ -124,7 +137,7 @@ let validtor = {
       }
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.ipadressandport')})
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.ipadressandport') })
   },
   cidr: {
     validator: function(rule, value) {
@@ -135,7 +148,7 @@ let validtor = {
       }
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('page.cidradress')})
+    message: $t('message.pleaseentertruetarget', { target: $t('page.cidradress') })
   },
   url: {
     validator: function(rule, value) {
@@ -146,7 +159,7 @@ let validtor = {
       }
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: 'URL'})
+    message: $t('message.pleaseentertruetarget', { target: 'URL' })
   },
   phone: {
     validator: function(rule, value) {
@@ -157,14 +170,14 @@ let validtor = {
       }
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('page.phonenumber')})
+    message: $t('message.pleaseentertruetarget', { target: $t('page.phonenumber') })
   },
   maxNum: {
     validator: function(rule, value) {
       return /^[0-9]\d*|(\-1)$/.test(value);
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.positivenumberor-1')})
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.positivenumberor-1') })
   },
   PeriodOfTime: {
     validator: function(rule, value) {
@@ -194,8 +207,7 @@ let validtor = {
       return false;
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.adress')})
-
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.adress') })
   },
   port: {
     validator: function(rule, value) {
@@ -216,7 +228,7 @@ let validtor = {
       return true;
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.65535')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.65535') })
   },
   mask: {
     validator: function(rule, value) {
@@ -237,8 +249,7 @@ let validtor = {
       return true;
     },
     trigger: 'change',
-    message: $t('message.pleaseentertruetarget', {target: $t('term.plugin.mask')})
-
+    message: $t('message.pleaseentertruetarget', { target: $t('term.plugin.mask') })
   },
   integer_p: {
     validator: function(rule, value) {
@@ -249,8 +260,7 @@ let validtor = {
       return true;
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('page.positiveinteger')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('page.positiveinteger') })
   },
   integer_natural: {
     validator: function(rule, value) {
@@ -261,8 +271,7 @@ let validtor = {
       return true;
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.nonnegativeint')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.nonnegativeint') })
   },
   integer: {
     validator: function(rule, value) {
@@ -271,7 +280,7 @@ let validtor = {
       return true;
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.int')})
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.int') })
   },
   range: {
     validator: function(rule, value) {
@@ -330,11 +339,10 @@ let validtor = {
   },
   enchar: {
     validator: function(rule, value) {
-      return /^[a-zA-Z\d]*$/.test(value);
+      return /^[a-zA-Z\d_\-]*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.alphabetornumber')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.alphabetornumber') })
   },
   enchar_space: {
     name: 'enchar_space',
@@ -342,8 +350,7 @@ let validtor = {
       return /^[a-zA-Z\d\.\ \_]*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.alphabetnumberempty')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.alphabetnumberempty') })
   },
   unique_ident: {
     name: 'unique_ident',
@@ -351,8 +358,7 @@ let validtor = {
       return /^[a-zA-Z_]*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('page.alphabet')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('page.alphabet') })
   },
   uppercase: {
     name: 'uppercase',
@@ -360,8 +366,7 @@ let validtor = {
       return /^[A-Z]*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.capalphabet')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.capalphabet') })
   },
   lowercase: {
     name: 'lowercase',
@@ -369,8 +374,7 @@ let validtor = {
       return /^[a-z]*$/.test(value);
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.loweralphabet')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.loweralphabet') })
   },
   parameter: {
     validator: function(rule, value) {
@@ -393,8 +397,7 @@ let validtor = {
       return true;
     },
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.1to12')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.1to12') })
   },
   check: {
     validator: function(rule, value) {
@@ -455,22 +458,22 @@ let validtor = {
     },
     pattern: '', //  ^ [a - z] + $ 正则表达式
     trigger: 'change',
-    message: $t('form.placeholder.pleaseinput', {target: $t('term.plugin.properlyformattestring')})
-
+    message: $t('form.placeholder.pleaseinput', { target: $t('term.plugin.properlyformattestring') })
   },
-  searchUrl: {  
+  searchUrl: {
     validator: function(rule, value, vueNode) {
       rule = rule || this;
       let _this = this;
       this.searchTime && clearTimeout(this.searchTime);
-      if (utils.isEmpty(value)) { //值为空时不进行调用接口，校验通过
+      if (utils.isEmpty(value)) {
+        //值为空时不进行调用接口，校验通过
         _this.searchTime = null;
         _this.cancelAxios = null;
         _this.isValid = true;
         vueNode.$set(vueNode, 'validMesage', '');
         return true;
       }
-   
+
       this.searchTime = setTimeout(function() {
         //调用接口的预处理
         let cancel = _this.cancelAxios;
@@ -478,45 +481,49 @@ let validtor = {
         const CancelToken = axios.CancelToken;
         _this.cancelAxios = CancelToken.source();
         let params = typeof rule.params === 'function' ? rule.params(value, rule) || {} : rule.params || {};
-        let headers = {unConsole: 1 };
+        let headers = { unConsole: 1 };
         let key = rule.key || vueNode.name;
         if (key) {
           params[key] = value;
           headers['neatlogic-validfield'] = key;
         }
         let errorMessage = '';
-        axios.post(rule.url, params, { cancelToken: _this.cancelAxios.token, headers: headers}).then(res => {
-          _this.isValid = true;
-          if (res.Status == 'OK') {
-            if (!res.Return) {
-              vueNode.validMesage == _this.errorMessage ? errorMessage = '' : errorMessage = vueNode.validMesage;
-              _this.isValid = true;
+        axios
+          .post(rule.url, params, { cancelToken: _this.cancelAxios.token, headers: headers })
+          .then(res => {
+            _this.isValid = true;
+            if (res.Status == 'OK') {
+              if (!res.Return) {
+                vueNode.validMesage == _this.errorMessage ? (errorMessage = '') : (errorMessage = vueNode.validMesage);
+                _this.isValid = true;
+              } else {
+                _this.errorMessage = errorMessage = rule.message || res.Message;
+                _this.isValid = false;
+              }
             } else {
               _this.errorMessage = errorMessage = rule.message || res.Message;
               _this.isValid = false;
             }
-          } else {
-            _this.errorMessage = errorMessage = rule.message || res.Message;
-            _this.isValid = false;
-          }
-        }).catch(res => {
-          if (res.response.status == 530) {
-            //翻译处理
-            let text = res.response.data.Message;
-            let arr = text.split('.');
-            let text1 = vueNode.$i18n.t(text, res.response.data.Param);
-            if (!(arr.length < 1 || text1 == text)) {
-              text = text1;
-            } 
-            _this.errorMessage = errorMessage = _this.message || text;
-            _this.isValid = false;
-          }
-        }).finally(() => {
-          _this.searchTime = null;
-          _this.cancelAxios = null;
-          vueNode.$set(vueNode, 'validMesage', errorMessage);
-          rule.validSearchUrl && rule.validSearchUrl(_this.isValid, errorMessage);
-        });
+          })
+          .catch(res => {
+            if (res.response.status == 530) {
+              //翻译处理
+              let text = res.response.data.Message;
+              let arr = text.split('.');
+              let text1 = vueNode.$i18n.t(text, res.response.data.Param);
+              if (!(arr.length < 1 || text1 == text)) {
+                text = text1;
+              }
+              _this.errorMessage = errorMessage = _this.message || text;
+              _this.isValid = false;
+            }
+          })
+          .finally(() => {
+            _this.searchTime = null;
+            _this.cancelAxios = null;
+            vueNode.$set(vueNode, 'validMesage', errorMessage);
+            rule.validSearchUrl && rule.validSearchUrl(_this.isValid, errorMessage);
+          });
       }, 500);
       return true;
     },
diff --git a/src/resources/plugins/TsQuartz/TsQuartz.vue b/src/resources/plugins/TsQuartz/TsQuartz.vue
index b114325feff0184fb025df4b61fc18c83da47a51..e83268bf66647ba308bf5b8540596b25e8da40fe 100644
--- a/src/resources/plugins/TsQuartz/TsQuartz.vue
+++ b/src/resources/plugins/TsQuartz/TsQuartz.vue
@@ -67,6 +67,7 @@ export default {
     return {
       datasourceVisibleMap: {
         controller: false,
+        second: false,
         hour: false,
         minute: false,
         month: false,
@@ -132,13 +133,15 @@ export default {
         this.tmpCronType = item;
         for (let key in this.cronData) {
           //秒需要保持是0
-          if (key != 'second' && !this.Setting.controllerList[item].find(d => d.datasource && d.datasource === key)) {
+          if (key != 'second' && key != 'minute' && !this.Setting.controllerList[item].find(d => d.datasource && d.datasource === key)) {
             this.$set(this.cronData, key, '*');
             if (key === 'dayofweek') {
               this.$set(this.cronData, 'dayofmonth', '?');
             } else if (key === 'dayofmonth') {
               this.$set(this.cronData, 'dayofweek', '?');
             }
+          } else if (key === 'second' || key === 'minute') {
+            this.$set(this.cronData, key, '0');
           }
         }
         this.datasourceVisibleMap[controller.datasource] = false;
@@ -157,7 +160,11 @@ export default {
           if (vList.length > 0) {
             v = vList.join(',');
           } else {
-            v = '*';
+            if (controller.datasource === 'second') {
+              v = '0';
+            } else {
+              v = '*';
+            }
           }
         }
 
@@ -240,8 +247,10 @@ export default {
         return 'dayofmonth';
       } else if (this.cronData.minute != '*') {
         return 'hour';
-      } else {
+      } else if (this.cronData.second != '*') {
         return 'minute';
+      } else {
+        return 'second';
       }
     }
   },
diff --git a/src/resources/plugins/TsQuartz/quartz-setting.js b/src/resources/plugins/TsQuartz/quartz-setting.js
index be885c7ca30ceb0d61cae7a900739b3528478c85..82d0900fb33dee093c3989126cd8d2d6c4834078 100644
--- a/src/resources/plugins/TsQuartz/quartz-setting.js
+++ b/src/resources/plugins/TsQuartz/quartz-setting.js
@@ -2,13 +2,14 @@ import {$t} from '@/resources/init.js';
 
 export default {
   controller: ['minute', 'hour', 'dayofmonth', 'dayofweek', 'month', 'year'],
-  second: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '32', '33', '34', '35', '36', '37', '38', '39', '40', '41', '42', '43', '44', '45', '46', '47', '48', '49', '50', '51', '52', '53', '54', '55', '56', '57', '58', '59'],
+  second: ['0', '10', '20', '30', '40', '50'],
   minute: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '32', '33', '34', '35', '36', '37', '38', '39', '40', '41', '42', '43', '44', '45', '46', '47', '48', '49', '50', '51', '52', '53', '54', '55', '56', '57', '58', '59'],
   hour: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'],
   dayofmonth: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'],
   month: ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'],
   dayofweek: ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'],
   dict: {
+    second: $t('page.second'),
     minute: $t('page.minute'),
     hour: $t('page.hour'),
     dayofmonth: $t('page.day'),
@@ -48,6 +49,21 @@ export default {
         get: 'type',
         datasource: 'controller',
         width: 'auto'
+      },
+      {
+        type: 'label',
+        text: ':'
+      },
+      {
+        type: 'controller',
+        get: 'value',
+        datasource: 'second',
+        target: 'SECOND',
+        width: 380
+      },
+      {
+        type: 'label',
+        text: $t('page.second')
       }
     ],
     hour: [
diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index 0935d65686ea805b6c20fa34a963a1162abae9fe..4068f56712f32215fa42cdf2f0ba7021cf9cee67 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -316,6 +316,7 @@
                   :formExtendData="formExtendData"
                   :isClearSpecifiedAttr="isClearSpecifiedAttr"
                   :externalData="externalData"
+                  :extendConfigList="extendConfigList"
                   :rowUuid="rowUuid"
                   class="padding-xs"
                   @changeConfig="addHistory()"
@@ -517,7 +518,12 @@ export default {
       type: Object,
       default: () => {}
     },
-    rowUuid: String //表单子组件行uuid
+    rowUuid: String, //表单子组件行uuid
+    defaultExtendConfigList: {
+      // 扩展配置列表
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
@@ -561,7 +567,8 @@ export default {
       currentEventItem: null, //当前单元格获取的新组件
       actionType: '', //当前操作类型,'add'新增组件，'copy'复制组件
       windowKeypressHandler: null, // 用于存储事件处理函数的引用
-      formStyleData: {} //表单样式设置
+      formStyleData: {}, //表单样式设置
+      extendConfigList: this.defaultExtendConfigList || [] //扩展配置列表
     };
   },
   beforeCreate() {
@@ -702,6 +709,9 @@ export default {
     //初始化表格
     initSheet() {
       this.hideComponentList = this.value?.hideComponentList || [];
+      if (this.value && this.value.formCustomExtendConfig && !this.$utils.isEmpty(this.value.formCustomExtendConfig.extendConfigList)) {
+        this.extendConfigList = this.value.formCustomExtendConfig.extendConfigList;
+      }
       if (this.value && this.value.lefterList && this.value.headerList && this.value.tableList) {
         /**
          * 编辑模式下，直接将外部数据赋值给config，这样在外部对数据做了修改，也能触发表格控件发生变化。
diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue
index 1947328399070d8707dc6a5a98f54d06716df2e5..c1df61859ade569de6286614ad00175210916281 100644
--- a/src/resources/plugins/TsSheet/form-edit.vue
+++ b/src/resources/plugins/TsSheet/form-edit.vue
@@ -148,10 +148,15 @@
                 </Dropdown>
               </div>
               <div v-if="!processTaskId" class="action-item">
-                <Button type="primary" ghost @click.stop="saveForm('saveother')">{{ $t('term.framework.saveothernewversion') }}</Button>
+                <Button
+                  :loading="isSaving"
+                  type="primary"
+                  ghost
+                  @click.stop="saveForm('saveother')"
+                >{{ $t('term.framework.saveothernewversion') }}</Button>
               </div>
               <div v-if="!processTaskId" class="action-item last">
-                <Button type="primary" @click.stop="handleSaveForm()">{{ $t('page.save') }}</Button>
+                <Button type="primary" :loading="isSaving" @click.stop="handleSaveForm()">{{ $t('page.save') }}</Button>
               </div>
             </template>
             <template v-else>
@@ -259,6 +264,7 @@
             ref="sheet"
             v-model="formData.formConfig"
             :readonly="readOnly"
+            :defaultExtendConfigList="extendConfigList"
             @selectCell="selectCell"
             @removeComponent="removeComponent"
             @updateResize="updateResize"
@@ -269,6 +275,7 @@
             :formItem="currentFormItem"
             :formItemList="cellFormItemList"
             :error="currentFormItemError"
+            :extendConfigList="extendConfigList"
             class="form-item-config bg-grey border-base-left"
             @close="currentFormItem = null"
             @editSubForm="editSubForm"
@@ -413,7 +420,8 @@ export default {
       readOnly: false, //设置全局只读
       isShowExtendConfigDialog: false,
       extendConfigList: [],
-      processTaskId: null //工单id
+      processTaskId: null, //工单id
+      isSaving: false
     };
   },
   beforeCreate() {},
@@ -639,7 +647,7 @@ export default {
           extendConfigList: this.extendConfigList
         });
         this.$set(data, 'formConfig', formConfig);
-
+        this.isSaving = true;
         await this.$api.framework.form.saveForm(data).then(res => {
           if (res.Status == 'OK') {
             isSuccess = true;
@@ -679,6 +687,8 @@ export default {
               });
             }
           }
+        }).finally(() => {
+          this.isSaving = false;
         });
       } else if (!this.$utils.isEmpty(this.errorData)) {
         this.isShowValidList = true;
@@ -687,8 +697,11 @@ export default {
     },
     previewForm() {
       const sheet = this.$refs['sheet'];
-      const data = sheet.getFormConfig();
+      let data = sheet.getFormConfig();
       this.$set(data, 'readOnly', this.readOnly);
+      this.$set(data, 'formCustomExtendConfig', {
+        extendConfigList: this.extendConfigList
+      });
       this.previewFormData = data;
       this.isPreviewShow = true;
     },
diff --git a/src/resources/plugins/TsSheet/form-item-config.vue b/src/resources/plugins/TsSheet/form-item-config.vue
index 4ca9df69bcb45156ab14eaf1fc2588692ed3c8a5..fb7ee04c03bf23b6f7f9e7ffc8ed3aebd059e5d9 100644
--- a/src/resources/plugins/TsSheet/form-item-config.vue
+++ b/src/resources/plugins/TsSheet/form-item-config.vue
@@ -30,6 +30,7 @@
               :disabled="!!formItem.inherit || disabled"
               :initFormItemList="initFormItemList"
               :source="source"
+              :extendConfigList="extendConfigList"
               class="mb-sm"
               @editSubForm="editSubForm"
               @setValue="(value)=> updateComponentConfig(formItem.handler, value)"
@@ -125,7 +126,11 @@ export default {
       type: Array,
       default: () => []
     },
-    source: { type: String, default: '' } //表单组件配置来源：scene(场景)
+    source: { type: String, default: '' }, //表单组件配置来源：scene(场景)
+    extendConfigList: { //扩展的表单组件列表
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     const _this = this;
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index c48f59ce1879df907bb4556d9780297c0a69060a..f76674e0c5644f71134a93337e2ea6983c6aa9b7 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -71,6 +71,7 @@
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
         :rowUuid="rowUuid"
+        :extendConfigList="extendConfigList"
         @setValue="setValue"
         @resize="$emit('resize')"
         @select="selectFormItem"
@@ -97,6 +98,7 @@
         :isCustomValue="isCustomValue"
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
+        :historyValue="isCustomValue ? formItemValue : ''"
         @setValue="setValue"
         @resize="$emit('resize')"
         @select="selectFormItem"
@@ -199,7 +201,11 @@ export default {
       type: Object,
       default: () => {}
     },
-    rowUuid: { type: String } //行uuid，表格组件引用时需要
+    rowUuid: { type: String }, //行uuid，表格组件引用时需要
+    extendConfigList: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
diff --git a/src/resources/plugins/TsSheet/form/component/base.vue b/src/resources/plugins/TsSheet/form/component/base.vue
index 115ebbd6ba5731f3a017973cf62f8299c3e5362b..b203d8ddccebf53ba7affb12927db1c8731368a5 100644
--- a/src/resources/plugins/TsSheet/form/component/base.vue
+++ b/src/resources/plugins/TsSheet/form/component/base.vue
@@ -33,6 +33,11 @@ export default {
       // 外部数据，非表单数据，例如工单上报人数据等
       type: Object,
       default: () => {}
+    },
+    extendConfigList: {
+      // 扩展配置列表
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/src/resources/plugins/TsSheet/form/component/common/validate-mixin.js b/src/resources/plugins/TsSheet/form/component/common/validate-mixin.js
index e2ffe36f323229e4ce8a7e6b3c0e7a28d7ce826d..a2590e4208014b547ddaf95317716dcaa9b39bc4 100644
--- a/src/resources/plugins/TsSheet/form/component/common/validate-mixin.js
+++ b/src/resources/plugins/TsSheet/form/component/common/validate-mixin.js
@@ -68,6 +68,16 @@ export default {
             }
           }
         }
+      } else if (this.config.dataSource === 'tag') {
+        if (!this.config.tagKey) {
+          errorList.push({field: 'tagKey', error: $t('form.placeholder.pleaseselect', {'target': $t('page.tag')})});
+        }
+        if (!this.config.tableKey) {
+          errorList.push({field: 'tableKey', error: $t('form.placeholder.pleaseselect', {'target': $t('term.framework.tablecomponent')})});
+        }
+        if (!this.config.mapping.value || !this.config.mapping.text) {
+          errorList.push({field: 'mapping', error: $t('form.placeholder.pleaseselect', {'target': $t('page.fieldmapping')})});
+        }
       }
       return errorList;
     }
diff --git a/src/resources/plugins/TsSheet/form/component/formcheckbox.vue b/src/resources/plugins/TsSheet/form/component/formcheckbox.vue
index 83b400162cfd38e92ef4be49090728dfa4746534..881570f1de58c1091a57c4506bf263668dbbdf12 100644
--- a/src/resources/plugins/TsSheet/form/component/formcheckbox.vue
+++ b/src/resources/plugins/TsSheet/form/component/formcheckbox.vue
@@ -11,6 +11,7 @@
       :readonlyTextIsHighlight="readonlyTextIsHighlight"
       :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
       :isCustomValue="isCustomValue"
+      :historyValue="value"
       @change="
         val => {
           setValue(val);
diff --git a/src/resources/plugins/TsSheet/form/component/formradio.vue b/src/resources/plugins/TsSheet/form/component/formradio.vue
index b7863676add3b4f3d9c673fb6f1bb3ac350c185e..e3cabc23214758b1cd981a05c1428f324f11cb60 100644
--- a/src/resources/plugins/TsSheet/form/component/formradio.vue
+++ b/src/resources/plugins/TsSheet/form/component/formradio.vue
@@ -12,6 +12,7 @@
       :readonlyTextIsHighlight="readonlyTextIsHighlight"
       :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
       :isCustomValue="isCustomValue"
+      :historyValue="value"
       @change="
         val => {
           setValue(val);
diff --git a/src/resources/plugins/TsSheet/form/component/formselect.vue b/src/resources/plugins/TsSheet/form/component/formselect.vue
index 17d5ae16d64a22b215c050c889465d2536a62570..e65a1c6c5351f24d186e2286e5d3c7517a4262e4 100644
--- a/src/resources/plugins/TsSheet/form/component/formselect.vue
+++ b/src/resources/plugins/TsSheet/form/component/formselect.vue
@@ -11,6 +11,7 @@
       :readonlyTextIsHighlight="readonlyTextIsHighlight"
       :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
       :isCustomValue="isCustomValue"
+      :historyValue="value"
       border="border"
       search
       @first="addRow"
@@ -101,6 +102,66 @@ export default {
       } else {   
         return value;  
       }
+    },
+    getFormData(formData) {
+      const formItemList = [];
+      for (let key in formData) {
+        const formitem = this.formItemList.find(d => d.uuid === key);
+        if (formitem) {
+          formItemList.push({
+            attributeUuid: key,
+            key: formitem.key,
+            handler: formitem.handler,
+            dataList: formData[key]
+          });
+        }
+      }
+      return formItemList;
+    },
+    getFormCustomexend(formData) { // 自定义扩展
+      let list = [];
+      let currentData = this.getFormData(formData);
+      if (!this.$utils.isEmpty(this.extendConfigList)) {
+        this.extendConfigList.forEach(item => {
+          this.$ = {};
+          try {
+            if (item.extendMethods) {
+              // eslint-disable-next-line no-eval
+              const dataMethods = eval('(' + item.extendMethods + ')');
+              Object.keys(dataMethods).forEach(methodsName => {
+                if (typeof dataMethods[methodsName] === 'function' && !this.$.methodsName) {
+                  this.$[methodsName] = dataMethods[methodsName].bind(this);
+                }
+              });
+              if (currentData) {
+                let outinpuData = this.$.main(item.attributeList, currentData);
+                list.push(...outinpuData);
+              }
+            }
+          } catch (e) {
+            console.error(e);
+          }
+        });
+      }
+      return list;
+    },
+    getTagDataList(formData) { //自定义标签扩展数据值
+      let list = this.getFormCustomexend(formData);
+      let dataList = [];
+      if (!this.$utils.isEmpty(list)) {
+        let findItem = list.find(item => item.tag === this.config.tagKey && item.key === this.config.tableKey);
+        if (findItem) {
+          findItem.dataList.forEach(item => {
+            if (item[this.config.mapping.value] && !dataList.find(d => d.value === item[this.config.mapping.value])) {
+              dataList.push({
+                value: item[this.config.mapping.value],
+                text: item[this.config.mapping.text]
+              });
+            }
+          });
+        }
+      }
+      return dataList;
     }
   },
   filter: {},
@@ -230,6 +291,8 @@ export default {
             }
           }
         }
+      } else if (this.config.dataSource === 'tag') {
+        setting.dataList = this.getTagDataList(this.formData);
       } else {
         setting.showName = 'text';
         setting.dataList = this.validatedDataList;
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index 6d9cc571e4990f4bcff34cb29ea989bf789adced..50bd6d0f2f69451aa330d3428f53537aed71a139 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -84,6 +84,7 @@
               :isClearSpecifiedAttr="isClearSpecifiedAttr"
               :externalData="externalData"
               :rowUuid="row.uuid"
+              :extendConfigList="extendConfigList"
               style="min-width: 130px"
               @change="val => changeRow(val, extra.uuid, row)"
               @updateCurrentRow="
diff --git a/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js b/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
index b823fdfd4d4e3978d3499e6a8dfe730000ca461c..f308e4fb2d6cc4806467d6019cc811b4c638fe89 100644
--- a/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
+++ b/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
@@ -28,7 +28,7 @@ export default (currentValue, oldValue, condition) => {
     } else if ((typeof currentValue == 'string' || typeof currentValue == 'number') && currentValue.indexOf(conditionValue) == -1) {
       isExclude = true;
     } else if (typeof currentValue === 'object') {
-      if (currentValue[uuid].indexOf(conditionValueList) === -1) {
+      if (currentValue[uuid] && (currentValue[uuid].indexOf(conditionValueList) === -1)) {
         isExclude = true;
       }
     } 
diff --git a/src/resources/plugins/TsSheet/form/config/base-config.vue b/src/resources/plugins/TsSheet/form/config/base-config.vue
index 868e148ac450fae6f96495eefc3d6bd79ef2a487..46fb5b7e573ce55222ccaecb058ab339847c9f23 100644
--- a/src/resources/plugins/TsSheet/form/config/base-config.vue
+++ b/src/resources/plugins/TsSheet/form/config/base-config.vue
@@ -9,7 +9,11 @@ export default {
       type: Array,
       default: () => []
     },
-    source: { type: String, default: '' } //表单组件配置来源：scene(场景)
+    source: { type: String, default: '' }, //表单组件配置来源：scene(场景)
+    extendConfigList: { //扩展数据标签配置列表
+      type: Array,
+      default: () => []
+    }
   },
   methods: {
     //设置属性值
diff --git a/src/resources/plugins/TsSheet/form/config/common/tag-source-setting.vue b/src/resources/plugins/TsSheet/form/config/common/tag-source-setting.vue
new file mode 100644
index 0000000000000000000000000000000000000000..aa8f4e114511fd8083b93f483658b776946b8f3d
--- /dev/null
+++ b/src/resources/plugins/TsSheet/form/config/common/tag-source-setting.vue
@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <TsFormItem :label="$t('page.tag')" :labelPosition="labelPosition" required>
+      <div class="radius-sm padding-md" :class="validClass('tagKey')">
+        <TsFormSelect
+          ref="tagKey"
+          v-model="config.tagKey"
+          :dataList="tagList"
+          transfer
+          :validateList="validateList"
+        ></TsFormSelect>
+      </div>
+    </TsFormItem>
+    <TsFormItem :label="$t('term.framework.tablecomponent')" :labelPosition="labelPosition" required>
+      <div class="radius-sm padding-md" :class="validClass('tableKey')">
+        <TsFormSelect
+          ref="tableKey"
+          v-model="config.tableKey"
+          :dataList="getTableList(config.tagKey)"
+          valueName="key"
+          textName="label"
+          :disabled="disabled"
+          :validateList="validateList"
+        ></TsFormSelect>
+      </div>
+    </TsFormItem>
+    <TsFormItem :label="$t('page.fieldmapping')" :labelPosition="labelPosition" required>
+      <div class="radius-sm padding-md" :class="validClass('mapping')">
+        <TsRow :gutter="10">
+          <Col span="12">
+            <label class="text-grey require-label">{{ $t('page.value') }}</label>
+            <div class="formsetting-text">
+              <TsFormSelect
+                ref="mappingValue"
+                v-model="config.mapping.value"
+                :dataList="getTableThList(config.tagKey, config.tableKey)"
+                :transfer="true"
+                :disabled="disabled"
+                :validateList="validateList"
+                @on-change="changeMappingValue()"
+              ></TsFormSelect>
+            </div>
+          </Col>
+          <Col span="12">
+            <label class="text-grey require-label">{{ $t('page.displaytext') }}</label>
+            <div class="formsetting-text">
+              <TsFormSelect
+                ref="mappingText"
+                v-model="config.mapping.text"
+                :dataList="getTableThList(config.tagKey, config.tableKey)"
+                :transfer="true"
+                :disabled="disabled"
+                :validateList="validateList"
+                @on-change="changeMappingValue()"
+              ></TsFormSelect>
+            </div>
+          </Col>
+        </TsRow>
+      </div>
+    </TsFormItem>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+  },
+  props: {
+    labelPosition: {
+      type: String,
+      default: 'top' 
+    },
+    config: { type: Object},
+    disabled: {
+      type: Boolean,
+      default: false 
+    },
+    extendConfigList: {
+      type: Array,
+      default: () => [] 
+    },
+    error: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      validateList: [{ name: 'required', message: ' ' }]
+    };
+  },
+  beforeCreate() {},
+  created() {
+   
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeMappingValue() {
+      this.$set(this.config, 'defaultValue', null);
+    },
+    valid() {
+      let isValid = true;
+      let refs = this.$refs;
+      for (let key in refs) {
+        if (refs.hasOwnProperty(key)) {
+          let ref = refs[key];
+          if (ref && ref.valid) {
+            let valid = ref.valid();
+            if (!valid) {
+              isValid = false;
+            }
+          }
+        }
+      }
+      return isValid;
+    },
+    //判断属性是否有异常
+    hasError(attrName) {
+      if (this.error && this.error.length > 0) {
+        if (this.error.find(d => d.field === attrName)) {
+          return true;
+        }
+      }
+      return false;
+    },
+    //验证后的样式
+    validClass(attrName) {
+      const c = { 'bg-error-grey': this.hasError(attrName), 'bg-op': !this.hasError(attrName) };
+      return c;
+    }
+  },
+  filter: {},
+  computed: {
+    tagList() {
+      if (!this.$utils.isEmpty(this.extendConfigList)) {
+        const list = this.extendConfigList.map(i => {
+          return {
+            value: i.tag,
+            text: i.tag
+          };
+        });
+        return list;
+      }
+      return [];
+    },
+    getTableList() {
+      return (val) => {
+        let list = [];
+        if (val) {
+          let findItem = this.extendConfigList.find(item => item.tag == val);
+          if (findItem) {
+            list = findItem.attributeList.filter(item => item.config && item.config.dataConfig);
+          }
+        }
+        return list;
+      };
+    },
+    getTableThList() {
+      return (tagKey, tableKey) => {
+        let tableList = this.getTableList(tagKey);
+        if (tableKey) {
+          let findItem = tableList.find(item => item.key == tableKey);
+          if (findItem && findItem.config && findItem.config.dataConfig) {
+            return findItem.config.dataConfig.map(item => {
+              return {
+                text: item.label,
+                value: item.uuid
+              };
+            }); 
+          }
+        } 
+        return [];
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue
index eaac3a7132525b9ed03eb68a914de11cdb1c1897..b8a3da7e469a3baa5d7e9ecb73c5510dbcc7d340 100644
--- a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue
+++ b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue
@@ -161,6 +161,15 @@
         ></DataSourceFilter>
       </div>
     </TsFormItem>
+    <template v-if="config.dataSource === 'tag'">
+      <TagSourceSetting
+        :config="config"
+        :disabled="disabled"
+        :extendConfigList="extendConfigList"
+        :error="error"
+        class="mb-nm"
+      ></TagSourceSetting>
+    </template>
     <!--<TsFormItem v-if="(config.dataSource === 'matrix' && config.matrixUuid) || (config.dataSource === 'static' && validatedDataList.length > 0)" label="默认值" labelPosition="top">
       <TsFormSelect
         v-model="config.defaultValue"
@@ -186,7 +195,8 @@ export default {
     TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     StaticDataEditor: () => import('./common/static-data-editor.vue'),
-    DataSourceFilter: () => import('./common/data-source-filter.vue')
+    DataSourceFilter: () => import('./common/data-source-filter.vue'),
+    TagSourceSetting: () => import('./common/tag-source-setting.vue')
   },
   extends: base,
   props: {},
@@ -194,7 +204,8 @@ export default {
     return {
       dataSourceList: [
         { value: 'static', text: this.$t('page.staticdatasource') },
-        { value: 'matrix', text: this.$t('page.matrix') }
+        { value: 'matrix', text: this.$t('page.matrix') },
+        { value: 'tag', text: this.$t('page.tag'), description: '数据来源为扩展数据'}
       ],
       defaultValueTypeList: [
         { value: 'self', text: this.$t('page.custom') },
@@ -250,6 +261,8 @@ export default {
     },
     clearConfigData() {
       this.$set(this.config, 'dataList', []);
+      this.$set(this.config, 'tagKey', '');
+      this.$set(this.config, 'tableKey', '');
       this.$set(this.config.mapping, 'value', '');
       this.$set(this.config.mapping, 'text', '');
       this.$set(this.config, 'sourceColumnList', []);
diff --git a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue
index c2752cca26c2f77cc0d134a2af077e77e88f5e40..48cdf651af2c7e6111267a789040ac48dababd63 100644
--- a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue
+++ b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formtableinputer-attr-config-dialog.vue
@@ -246,6 +246,15 @@
                 :formItemList="formItemList"
               ></FormtableinputDataSource>
             </template>
+            <template v-else-if="propertyLocal.config.dataSource === 'tag'">
+              <TagSourceSetting
+                ref="formitem_tag"
+                :config="propertyLocal.config"
+                :extendConfigList="extendConfigList"
+                labelPosition="right"
+                class="mb-nm"
+              ></TagSourceSetting>
+            </template>
             <TsFormItem v-if="propertyLocal.handler === 'formselect'" :label="$t('page.inputtip')">
               <TsFormInput v-model="propertyLocal.config.placeholder" :maxlength="50"></TsFormInput>
             </TsFormItem>
@@ -329,6 +338,9 @@
               ></ExpressionSetting>
             </TsFormItem>
           </template>
+          <template v-else-if="propertyLocal.handler === 'formuserselect'" v-slot:config>
+            <FormuserselectSetting ref="formitem_userselectSetting" :propertyLocal="propertyLocal"></FormuserselectSetting>
+          </template>
           <template v-slot:reaction>
             <Tabs v-if="propertyLocal.reaction && isReady">
               <TabPane
@@ -457,7 +469,9 @@ export default {
     ReactionFilter: () => import('@/resources/plugins/TsSheet/form/config/common/reaction-filter.vue'),
     FormtableinputDataSource: () => import('./formtableinput-data-source.vue'),
     ExpressionSetting: () => import('@/resources/plugins/TsSheet/form/config/common/expression-setting.vue'),
-    ReactionSetValueOtherSetting: () => import('@/resources/plugins/TsSheet/form-item-reaction-setvalueother-setting.vue')
+    ReactionSetValueOtherSetting: () => import('@/resources/plugins/TsSheet/form-item-reaction-setvalueother-setting.vue'),
+    TagSourceSetting: () => import('../common/tag-source-setting.vue'),
+    FormuserselectSetting: () => import('./formuserselect-setting.vue')
   },
   props: {
     formItemConfig: { type: Object }, //表单组件配置
@@ -475,7 +489,11 @@ export default {
       default: () => []
     },
     formItemUuid: String,
-    source: { type: String, default: '' } //表单组件配置来源：scene(场景)
+    source: { type: String, default: '' }, //表单组件配置来源：scene(场景)
+    extendConfigList: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
@@ -518,7 +536,8 @@ export default {
       dataSourceList: [
         { value: 'static', text: this.$t('page.staticdatasource') },
         { value: 'matrix', text: this.$t('page.matrix') },
-        { value: 'formtableinputer', text: this.$t('term.framework.formtableinputercomponent') }
+        { value: 'formtableinputer', text: this.$t('term.framework.formtableinputercomponent') },
+        { value: 'tag', text: this.$t('page.tag')}
       ],
       formConfig: [
         {
@@ -558,6 +577,7 @@ export default {
             { text: this.$t('page.checkbox'), value: 'formcheckbox' },
             { text: this.$t('page.date'), value: 'formdate' },
             { text: this.$t('page.time'), value: 'formtime' },
+            { text: this.$t('term.framework.userselect'), value: 'formuserselect' },
             { text: this.$t('page.uploadattachment'), value: 'formupload' },
             { text: this.$t('term.cmdb.expression'), value: 'formexpression' }
           ],
@@ -871,6 +891,9 @@ export default {
           this.$delete(this.reactionName, 'setvalue');
           this.$delete(this.propertyLocal.reaction, 'setvalue');
         }
+        if (val === 'formuserselect') {
+          this.$set(this.propertyLocal.config, 'isMultiple', false);
+        }
         this.isReady = false;
         this.$nextTick(() => {
           this.isReady = true;
@@ -930,6 +953,7 @@ export default {
     reactionValid(key, isValid) {
       this.$set(this.reactionError, key, !isValid);
     }
+    
   },
   filter: {},
   computed: {
diff --git a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formuserselect-setting.vue b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formuserselect-setting.vue
new file mode 100644
index 0000000000000000000000000000000000000000..05bfc433a6df70c3abf09931614576767b39186f
--- /dev/null
+++ b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/formuserselect-setting.vue
@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <TsFormItem :label="$t('page.multipleselection')">
+      <TsFormSwitch v-model="propertyLocal.config.isMultiple" :trueValue="true" :falseValue="false"></TsFormSwitch>
+    </TsFormItem>
+    <TsFormItem :label="$t('page.group')" required>
+      <TsFormSelect
+        ref="groupList"
+        :value="propertyLocal.config.groupList"
+        v-bind="groupConfig"
+        @on-change="val => {
+          changeGroupList(val);
+        }"
+      ></TsFormSelect>
+    </TsFormItem>
+    <TsFormItem :label="$t('page.inputtip')">
+      <TsFormInput v-model="propertyLocal.config.placeholder" :maxlength="50"></TsFormInput>
+    </TsFormItem>
+    <TsFormItem :label="$t('page.defaultvalue')">
+      <UserSelect
+        v-model="propertyLocal.config.defaultValue"
+        :multiple="propertyLocal.config.isMultiple"
+        :groupList="getGroup(propertyLocal.config.groupList)"
+        :excludeList="getexcludeList(propertyLocal.config.groupList)"
+        :includeList="getincludeList(propertyLocal.config.groupList)"
+        transfer
+      ></UserSelect>
+    </TsFormItem>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    UserSelect: () => import('@/resources/components/UserSelect/UserSelect.vue'),
+    TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
+    TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput')
+  },
+  props: {
+    propertyLocal: Object
+  },
+  data() {
+    return {
+      groupConfig: {
+        placeholder: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.group')}),
+        url: '/api/rest/groupsearch/list',
+        dealDataByUrl: this.dealGroupConfigDataList,
+        multiple: true,
+        border: 'border',
+        validateList: ['required'],
+        transfer: true
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {
+    
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    dealGroupConfigDataList(dataList) {
+      return dataList && dataList.filter(data => data.value != 'common');
+    },
+    changeGroupList(val) {
+      this.$set(this.propertyLocal.config, 'groupList', val);
+      this.$set(this.propertyLocal.config, 'defaultValue', null);
+    },
+   
+    valid() {
+      let isValid = true;
+      if (this.$refs.groupList) {
+        isValid = this.$refs.groupList.valid();
+      }
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {
+    getGroup() {
+      //需求用户选择器选择用户需支持当前登录人、上报人，选择组需支持当前用户所在组
+      return (group) => {
+        let list = group || [];
+        if (group && group.length > 0) {
+          if (group.indexOf('user') > -1) {
+            //当前登录人、上报人（后台确定要分2个类型获取，不在common做处理）
+            // list = this.$utils.concatArr(list, ['common', 'processUserType']);
+            list = this.$utils.concatArr(list, ['common']);
+          }
+          if (group.indexOf('team') > -1) {
+            //当前用户所在组
+            list = this.$utils.concatArr(list, ['common']);
+          }
+        }
+        return list;
+      };
+    },
+    getincludeList() {
+      //需求用户选择器选择用户需支持当前登录人、上报人，选择组需支持当前用户所在组
+      return (group) => {
+        let list = [];
+        if (group && group.length > 0) {
+          if (group.indexOf('user') > -1) {
+            //当前登录人、上报人（后台确定要分2个类型获取，不在common做处理）
+            // list = list.concat(['common#loginuser', 'processUserType#owner']);
+            list = list.concat(['common#loginuser']);
+          }
+          if (group.indexOf('team') > -1) {
+            //当前用户所在组
+            list = list.concat(['common#loginteam']);
+          }
+        }
+        return list;
+      };
+    },
+    getexcludeList() {
+      //需求用户选择器选择用户需支持当前登录人、上报人，选择组需支持当前用户所在组
+      return (group) => {
+        let list = [];
+        if (group && group.length > 0) {
+          if (group.indexOf('user') > -1) {
+            //过滤掉工单用户除了上报人外的字段（后台确定字段数组接口写死，需前端单独过滤）
+            list = this.$utils.concatArr(list, ['processUserType#major', 'processUserType#minor', 'processUserType#agent', 'processUserType#reporter', 'processUserType#worker']);
+          }
+          if (group.indexOf('common') < 0) {
+            //没有选择common
+            list = this.$utils.concatArr(list, ['common#alluser']);
+          }
+        }
+        return list;
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/index.vue b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/index.vue
index 44ff331dc4e5030994a9abbafbf55b3c1d8bb58a..24440703706c9d35fcd3d95a2e299ceb27acc00d 100644
--- a/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/index.vue
+++ b/src/resources/plugins/TsSheet/form/config/formtableinputer-conf/index.vue
@@ -158,6 +158,7 @@
       :formItemList="formItemList"
       :formItemUuid="formItem.uuid"
       :source="source"
+      :extendConfigList="extendConfigList"
       @close="closeAttrConfigDialog"
     ></AttrConfigDialog>
   </div>
diff --git a/src/resources/plugins/TsSheet/form/config/formuserselect-conf.vue b/src/resources/plugins/TsSheet/form/config/formuserselect-conf.vue
index a1a78d7d604b72bd920447ef8a66481d40594c25..c7871b86eba95272fb241e5187f18b0c4f70a31e 100644
--- a/src/resources/plugins/TsSheet/form/config/formuserselect-conf.vue
+++ b/src/resources/plugins/TsSheet/form/config/formuserselect-conf.vue
@@ -15,6 +15,7 @@
         :disabled="disabled"
         @on-change="val => {
           setConfig('groupList', val);
+          setConfig('defaultValue', null);
         }"
       ></TsFormSelect>
     </TsFormItem>
diff --git a/src/resources/plugins/TsSheet/form/define/formradio.js b/src/resources/plugins/TsSheet/form/define/formradio.js
index b74b5a65590e2585a3ae614d0e681c81f11e1afe..cfd6e11be9a6fd6dd0f6b265cc14be792f60ea56 100644
--- a/src/resources/plugins/TsSheet/form/define/formradio.js
+++ b/src/resources/plugins/TsSheet/form/define/formradio.js
@@ -33,6 +33,7 @@ export default {
     disable: {},
     setvalue: {},
     filter: {},
-    required: {}
+    required: {},
+    clearValue: {}
   }
 };
diff --git a/src/resources/plugins/TsSheet/form/reaction/clearValue.js b/src/resources/plugins/TsSheet/form/reaction/clearValue.js
index 505e8e249ef0773888d0b7f304cdcca68ce4854a..bb804dafa3e3b5c47630e7b888795f791486f5ee 100644
--- a/src/resources/plugins/TsSheet/form/reaction/clearValue.js
+++ b/src/resources/plugins/TsSheet/form/reaction/clearValue.js
@@ -1,5 +1,5 @@
-export default ({result, view}) => {
-  if (result && !view.$utils.isEmpty(view.formData[view.formItem.uuid])) {
+export default ({ result, view}) => {
+  if (result && !view.isFirstLoad && !view.$utils.isEmpty(view.formData[view.formItem.uuid])) {
     //清空当前组件数据
     view.setValue(null);
   }
diff --git a/src/resources/plugins/TsSheet/form/reaction/setvalue.js b/src/resources/plugins/TsSheet/form/reaction/setvalue.js
index b4bccf956dd19c112cf8f24729705d1b0200b567..92e7b7a0a9f2c3325c3b5cc3ab1cda6cdd80ad98 100644
--- a/src/resources/plugins/TsSheet/form/reaction/setvalue.js
+++ b/src/resources/plugins/TsSheet/form/reaction/setvalue.js
@@ -26,7 +26,7 @@ export default ({ reaction, result, view }) => {
         value = list.join(',');
       }
     }
-    if ((!reaction.isFirstLoad && (!view.formData.hasOwnProperty(view.formItem.uuid) || !view.formData[view.formItem.uuid]) || (view.formData[view.formItem.uuid] && !view.$utils.isSame(value, view.formData[view.formItem.uuid]))) || (reaction.isFirstLoad && !view.executeCount['setvalue'])) {
+    if ((!view.isFirstLoad && (!view.formData.hasOwnProperty(view.formItem.uuid) || !view.formData[view.formItem.uuid]) || (view.formData[view.formItem.uuid] && !view.$utils.isSame(value, view.formData[view.formItem.uuid]))) || (view.isFirstLoad && !view.executeCount['setvalue'])) {
       view.addExecuteCount('setvalue');
       view.setValue(value);
       view.$emit('change', value);
diff --git a/src/resources/store/modules/topMenu.js b/src/resources/store/modules/topMenu.js
index 8da29ab26f4516a69190deed0ba259a5ba5ff1d3..aa301f05dd3286a1799b4ce914981834ca3e61a6 100644
--- a/src/resources/store/modules/topMenu.js
+++ b/src/resources/store/modules/topMenu.js
@@ -315,6 +315,7 @@ function getCommercialRouter() {
   let routerPathList = [];
   try {
     routerPathList.push(require.context('@/commercial-module', true, /router.js$/));
+    routerPathList.push(require.context('@/community-module', true, /router.js$/));
   } catch {
     // 模块找不到
   }
@@ -337,6 +338,7 @@ function getAllMenuTypeList() {
   const configPathList = [require.context('@/views/pages', true, /config.js$/)];
   try {
     configPathList.push(require.context('@/commercial-module', true, /config.js$/));
+    configPathList.push(require.context('@/community-module', true, /config.js$/));
   } catch (error) {
     //
   }
diff --git a/src/views/components/auditconfig/auditconfig.vue b/src/views/components/auditconfig/auditconfig.vue
index 1843c4f7252126bcb25b55a8dea3d7ee18f3642c..974406e4a9f52597976132b87e1618817b13a33a 100644
--- a/src/views/components/auditconfig/auditconfig.vue
+++ b/src/views/components/auditconfig/auditconfig.vue
@@ -3,7 +3,7 @@
     v-model="isSettingVisible"
     width="250"
     popper-class="auditconfig-wap"
-    style="text-align:left"
+    style="text-align: left"
     :transfer="true"
   >
     <span class="tsfont-setting text-action">{{ buttonName }}</span>
@@ -15,8 +15,13 @@
         clearable
         v-bind="timeSelectConfig"
       ></TimeSelect>
-      <div class="mt-nm text-grey">{{ $t('message.autoexec.savedeadlinenolimit') }}</div>
-      <div class="mt-nm text-right"><Button type="primary" size="small" @click="saveAuditConfig()">{{ $t('page.save') }}</Button></div>
+      <div v-if="!help" class="mt-nm text-grey">{{ $t('message.autoexec.savedeadlinenolimit') }}</div>
+      <div v-else style="white-space: normal; work-break: break-all" class="mt-nm text-grey">
+        {{ help }}
+      </div>
+      <div class="mt-nm text-right">
+        <Button type="primary" size="small" @click="saveAuditConfig()">{{ $t('page.save') }}</Button>
+      </div>
     </div>
   </Poptip>
 </template>
@@ -27,15 +32,27 @@ export default {
     TimeSelect: () => import('@/resources/components/TimeSelect/TimeSelect')
   },
   props: {
-    auditName: {type: String},
-    buttonName: {type: String, default() { return this.$t('page.setting'); }},
-    title: {type: String, default() { return this.$t('dialog.title.logsavedeadline'); } }
+    help: { type: String },
+    auditName: { type: String },
+    buttonName: {
+      type: String,
+      default() {
+        return this.$t('page.setting');
+      }
+    },
+    title: {
+      type: String,
+      default() {
+        return this.$t('dialog.title.logsavedeadline');
+      }
+    }
   },
   data() {
     return {
       isSettingVisible: false,
       auditConfig: null,
-      timeSelectConfig: {//时间选择器的数据
+      timeSelectConfig: {
+        //时间选择器的数据
         border: 'border',
         placement: 'bottom-start',
         clearable: false,
@@ -50,7 +67,9 @@ export default {
     };
   },
   beforeCreate() {},
-  created() { this.getAuditConfig(); },
+  created() {
+    this.getAuditConfig();
+  },
   beforeMount() {},
   mounted() {},
   beforeUpdate() {},
@@ -68,13 +87,16 @@ export default {
       });
     },
     saveAuditConfig() {
-      this.$api.framework.auditconfig.saveApiConfig({name: this.auditName.toUpperCase(), config: this.auditConfig}).then(res => {
-        if (res.Status == 'OK') {
-          this.$Message.success(this.$t('message.savesuccess'));
-        }
-      }).finally(() => {
-        this.isSettingVisible = false;
-      });
+      this.$api.framework.auditconfig
+        .saveApiConfig({ name: this.auditName.toUpperCase(), config: this.auditConfig })
+        .then(res => {
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.savesuccess'));
+          }
+        })
+        .finally(() => {
+          this.isSettingVisible = false;
+        });
     }
   },
   filter: {},
diff --git a/src/views/components/import-component.js b/src/views/components/import-component.js
index f3e6212b8529527f313e94f674de664cf59f85bb..ca116b8f8f54c00f5519d6857e8b34b61105dcd9 100644
--- a/src/views/components/import-component.js
+++ b/src/views/components/import-component.js
@@ -3,8 +3,24 @@ let importComponentConfig = {};
 let exportComponentConfig = {};
 try {
   // 导入自定义组件
-  const componentConfig = require.context('@/commercial-module', true, /component.js$/);
-  const moduleComponentPathList = componentConfig.keys();
+  let componentConfig = require.context('@/community-module', true, /component.js$/);
+  let moduleComponentPathList = componentConfig.keys();
+  moduleComponentPathList.forEach(routerPath => {
+    const moduleNames = routerPath.split('/')[1];
+    const lastValue = moduleNames.split('-');
+    const moduleName = lastValue?.pop() || moduleNames;
+    const exportValue = componentConfig(routerPath).default || {};
+    importComponentConfig[moduleName] = exportValue;
+  });
+  for (let key in importComponentConfig) {
+    if (key && importComponentConfig[key]) {
+      exportComponentConfig = Object.assign(exportComponentConfig, importComponentConfig[key]);
+    }
+  }
+
+  // 导入自定义组件
+  componentConfig = require.context('@/commercial-module', true, /component.js$/);
+  moduleComponentPathList = componentConfig.keys();
   moduleComponentPathList.forEach(routerPath => {
     const moduleNames = routerPath.split('/')[1];
     const lastValue = moduleNames.split('-');
diff --git a/src/views/pages/autoexec/autoexec.js b/src/views/pages/autoexec/autoexec.js
index 432580f688d798787e36eb09cb91a82f6ce75615..2dfc6b50defe9ad5b737e5893ac16806242287fb 100644
--- a/src/views/pages/autoexec/autoexec.js
+++ b/src/views/pages/autoexec/autoexec.js
@@ -8,6 +8,7 @@ import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import toolCatalogUtils from './utils/tools-catalog';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -29,6 +30,7 @@ Vue.prototype.$api = api;
 Vue.prototype.$tsrouter = router;
 Vue.prototype.$toolCatalogUtils = toolCatalogUtils;
 Vue.prototype.$localStore = new LocalStore('autoexec', router);
+Vue.prototype.$state = new State('autoexec');
 
 //注入实例
 new Vue({
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-input.vue b/src/views/pages/autoexec/components/common/addTarget/add-input.vue
index 0055bda3811abe8a9378f63c718d7b1e3ddcf96f..329598a5bc37beff99e087342d73dda5fa35bef8 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-input.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-input.vue
@@ -5,7 +5,7 @@
         <Row v-if="canEdit" class="input-border" :gutter="4">
           <Col :span="11">
             <div class="bg-op input-show radius-sm" :class="!isValid?'border-error':''">
-              <div class="text-tip fz10 tip-input line-2 mb-md" :title="$t('term.autoexec.ipformattip')">
+              <div class="text-tip fz10 tip-input line-3 mb-md" :title="$t('term.autoexec.ipformattip')">
                 <span class="tsfont-question-o input-dec"></span>
                 {{ $t('term.autoexec.ipformattip') }}
               </div>
@@ -16,7 +16,12 @@
                 :placeholder="inputPlaceholder"
               ></Input>
               <div class="footer-btn">
-                <Button type="primary" ghost @click="addTarget">{{ $t('term.autoexec.addtotarget') }}</Button>
+                <Button
+                  type="primary"
+                  ghost
+                  :loading="isLoading"
+                  @click="addTarget"
+                >{{ $t('term.autoexec.addtotarget') }}</Button>
                 <div class="input-valid" :class="messageConfig.error+messageConfig.info? 'text-href':'text-primary'">
                   <Tooltip max-width="320" theme="light" transfer>
                     <div class="valid-text overflow tips">
@@ -79,7 +84,7 @@ import {mutations} from '@/views/pages/autoexec/detail/actionDetail/actionState.
 export default {
   name: '',
   components: {
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue'),
+    MoreTarget: () => import('./more-target.vue'),
     NodeView: () => import('../targetView/node-view')
   },
   filtes: {},
@@ -101,7 +106,8 @@ export default {
       inputPlaceholder: `192.168.0.33
 192.168.0.1:22
 192.168.0.1:3306/instance_name`,
-      nonExistList: []
+      nonExistList: [],
+      isLoading: false
     };
   },
   beforeCreate() {},
@@ -117,7 +123,7 @@ export default {
   methods: {
     async addTarget() {
       let addList = [];
-      this.messageConfig = { error: '', info: '', succee: 0};
+      this.messageConfig = { error: '', info: '', succee: ''};
       if (!this.value.trim()) {
         return false;
       }
@@ -167,6 +173,10 @@ export default {
         }
       });
       if (addList.length > 0) {
+        if (addList.length > 1000) {
+          this.messageConfig.error = this.$t('term.autoexec.inputnodelimit');
+          return;
+        }
         //接口校验
         await this.validinputnodelist(addList);
       }
@@ -203,6 +213,7 @@ export default {
         inputNodeList: list,
         cmdbGroupType: this.opType
       };
+      this.isLoading = true;
       return this.$api.autoexec.action.validinputnodelist(data).then(res => {
         if (res.Status == 'OK') {
           let existList = res.Return.existList || [];
@@ -212,6 +223,8 @@ export default {
           }
           this.messageConfig.succee = this.$t('term.autoexec.importsuccesstarget', {target: existList.length});
         }
+      }).finally(() => {
+        this.isLoading = false;
       });
     },
     getNonExistListText() {
@@ -312,7 +325,7 @@ export default {
 }
 .input-show{
   padding: 16px;
-  height: 310px;
+  height: 330px;
   .tip-input {
     position: relative;
     padding-left: 16px;
@@ -326,7 +339,7 @@ export default {
 }
 .node-show{
   padding: 16px;
-  height: 310px;
+  height: 330px;
   .clear-btn{
     text-align: right;
     margin-bottom: 12px;
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-node.vue b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
index 7cd141bbdb945c865e540eee1f00663efdc9cbaf..7d7e65946a8293b654c66e5d4a9ce497a97d803f 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-node.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
@@ -87,7 +87,7 @@ export default {
   components: {
     FilterSearch,
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue'),
+    MoreTarget: () => import('./more-target.vue'),
     NodeView: () => import('../targetView/node-view')
   },
   filtes: {},
diff --git a/src/views/pages/autoexec/components/common/addTarget/more-target.vue b/src/views/pages/autoexec/components/common/addTarget/more-target.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1738be63ecd641fb83b12baf63a879ab9677b088
--- /dev/null
+++ b/src/views/pages/autoexec/components/common/addTarget/more-target.vue
@@ -0,0 +1,182 @@
+<template>
+  <TsDialog
+    type="modal"
+    :isShow="visible"
+    v-bind="dialogConfig"
+    height="400px"
+    :hasMask="hasMask"
+    @on-close="close()"
+  >
+    <div class="input-border" style="text-align: right;">
+      <Input
+        v-model="keyword"
+        style="width:240px"
+        search
+        :placeholder="$t('form.placeholder.pleaseinput',{'target':'ip'})"
+        @on-search="filterData"
+      />
+    </div>
+    <div style="padding-top:16px">
+      <TsRow :gutter="10">
+        <template v-for="(data,index) in currentDataList">
+          <Col
+            v-if="!data._isHidden"
+            :key="index"
+            :span="8"
+          >
+            <div class="item bg-op border-color overflow" :title="targetText(data)">
+              {{ targetText(data) }} 
+              <i v-if="!isReadonly" class="remove tsfont-close text-grey" @click="removeItem(index)"></i>
+            </div>
+          </Col>
+        </template>  
+      </TsRow>
+      <NoData v-if="searchList.length == 0"></NoData>
+    </div>
+    <template v-slot:footer>
+      <template v-if="!isReadonly">
+        <Button type="primary" ghost @click.native="onOk('removeAll')">{{ $t('page.clear') }}</Button>
+        <Button type="primary" @click="onOk('save')">{{ $t('page.confirm') }}</Button>
+      </template>
+    </template>
+  </TsDialog>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+  },
+  model: {
+    prop: 'visible',
+    event: 'change'
+  },
+  filtes: {},
+  props: {
+    isReadonly: {
+      type: Boolean,
+      default: false
+    },
+    visible: {
+      default: false
+    },
+    dataList: {
+      type: Array
+    },
+    hasMask: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    let _this = this;
+    return {
+      dialogConfig: {
+        title: this.$t('page.viewall'),
+        hasFooter: !_this.isReadonly,
+        maskClose: _this.isReadonly
+      },
+      keyword: '',
+      checkAll: false,
+      showDialog: true,
+      currentDataList: [],
+      searchList: []
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.searchList = this.dataList;
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    onOk(type) {
+      this.keyword = '';
+      if (type) {
+        if (type == 'removeAll') { //清空所有
+          this.$emit('on-ok', []);
+        } else if ('save') { //保存
+          let list = this.currentDataList.filter(item => delete item._isHidden);
+          this.$emit('on-ok', list);
+        }
+      }
+    },
+    removeItem(index) {
+      this.currentDataList.splice(index, 1);
+    },
+    batchRemove() {
+      this.currentDataList = this.currentDataList.filter(item => {
+        return !item._isSelect;
+      });
+    },
+    filterData() {
+      let searchList = [];
+      let _this = this;
+      this.currentDataList.forEach(item => {
+        let nameStr = _this.targetText(item);
+        this.$set(item, '_isHidden', _this.keyword ? !nameStr.includes(_this.keyword) : false);
+        if (nameStr.includes(_this.keyword)) {
+          searchList.push(item);
+        }
+      });
+      this.searchList = searchList;
+    },
+    close() {
+      this.$emit('on-ok');
+    }
+  },
+  computed: {
+    targetText() {
+      return data => {
+        return data.port && data.name ? data.ip + ':' + data.port + '/' + data.name : data.port && !data.name ? data.ip + ':' + data.port : data.ip;
+      };
+    }
+  },
+  watch: {
+    dataList: {
+      handler(val) {
+        this.currentDataList = [].concat(val || []);
+      },
+      immediate: true,
+      deep: true
+    }
+  }
+};
+</script>
+<style lang='less' scoped>
+.item{
+  width: 100%;
+  margin-bottom: 10px;
+  display: inline-block;
+  position: relative;
+  height: 32px;
+  line-height: 30px;
+  padding: 0 4px;
+  border: 1px solid;
+  text-align: center;
+  border-radius: 4px;
+  .remove {
+    position: absolute;
+    right: 0px;
+    top: 0px;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    display: none;
+    cursor: pointer;
+  }
+  &:hover{
+    .remove {
+      display: block;
+    }
+  }
+}
+.batchRemove{
+  // margin-left: 16px;
+}
+</style>
diff --git a/src/views/pages/autoexec/components/common/filter-search.vue b/src/views/pages/autoexec/components/common/filter-search.vue
index 5aa54e77e47f87041d1de23e1c79dabeb5728ab1..90af3f47e0b885f9ae85f4b62a7de8a7361f69a7 100644
--- a/src/views/pages/autoexec/components/common/filter-search.vue
+++ b/src/views/pages/autoexec/components/common/filter-search.vue
@@ -184,7 +184,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false},
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
@@ -281,17 +281,15 @@ export default {
           type: 'select',
           label: this.$t('term.autoexec.assetstatus'),
           search: true,
-          textName: 'description',
           transfer: true,
-          valueName: 'id',
           defaultValue: [],
-          rootName: 'tbodyList',
           multiple: true,
           className: 'block-span',
-          params: {
-            'needPage': false
-          },
           url: '/api/rest/resourcecenter/state/list/forselect',
+          params: { needPage: false },
+          rootName: 'tbodyList',
+          textName: 'name',
+          valueName: 'id',
           validateList: [{name: 'required', message: ''}]
         },
         {
diff --git a/src/views/pages/autoexec/components/common/targetView/node-view.vue b/src/views/pages/autoexec/components/common/targetView/node-view.vue
index 5ccff212e76bba947a2e17af6e89d6a2447253ed..afdde2bfe3a937db7d2ff221246acce03c20609b 100644
--- a/src/views/pages/autoexec/components/common/targetView/node-view.vue
+++ b/src/views/pages/autoexec/components/common/targetView/node-view.vue
@@ -27,7 +27,7 @@
 export default {
   name: '',
   components: {
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
+    MoreTarget: () => import('@/views/pages/autoexec/components/common/addTarget/more-target.vue')
   },
   filters: {
   },
diff --git a/src/views/pages/autoexec/components/param/edit/node/node-dialog.vue b/src/views/pages/autoexec/components/param/edit/node/node-dialog.vue
index 949a47a3651cc99f684336b61501b5e3d2e7d1e3..30ef27b309953be6743493094f2ca59c4e9ede2d 100644
--- a/src/views/pages/autoexec/components/param/edit/node/node-dialog.vue
+++ b/src/views/pages/autoexec/components/param/edit/node/node-dialog.vue
@@ -105,7 +105,7 @@ export default {
     FilterSearch: () => import('@/views/pages/autoexec/components/common/filter-search.vue'),
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     PoptipSelect: () => import('@/resources/components/PoptipSelect/PoptipSelect.vue'),
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
+    MoreTarget: () => import('@/views/pages/autoexec/components/common/addTarget/more-target.vue')
 
   },
   model: {
diff --git a/src/views/pages/autoexec/components/param/readonly/node.vue b/src/views/pages/autoexec/components/param/readonly/node.vue
index 7b8eeeef27c31fb685b2866f7ffd8ac6272c4014..c96fc8a20b3f72b244487f0a669b8e075ff3658d 100644
--- a/src/views/pages/autoexec/components/param/readonly/node.vue
+++ b/src/views/pages/autoexec/components/param/readonly/node.vue
@@ -27,7 +27,7 @@
 export default {
   name: '',
   components: {
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
+    MoreTarget: () => import('@/views/pages/autoexec/components/common/addTarget/more-target.vue')
   },
   props: {
     value: Array
diff --git a/src/views/pages/autoexec/components/param/view/node.vue b/src/views/pages/autoexec/components/param/view/node.vue
index eb5736361a2e73f2b187053bbf8d8d73fbf6b0a6..67675820160366a4960a90eac5317c5b67a61c85 100644
--- a/src/views/pages/autoexec/components/param/view/node.vue
+++ b/src/views/pages/autoexec/components/param/view/node.vue
@@ -57,7 +57,7 @@ export default {
   components: {
     AddNode,
     // AddNode: () => import('@/views/pages/autoexec/components/param/edit/node/add-node.vue'),
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
+    MoreTarget: () => import('@/views/pages/autoexec/components/common/addTarget/more-target.vue')
   },
   filters: {},
   mixins: [viewmixin],
diff --git a/src/views/pages/autoexec/components/script/script-list.vue b/src/views/pages/autoexec/components/script/script-list.vue
index d46b7c850f3bb9dbd1c9e20ad56e6c7e4525ab33..cfc58332f7c41ef121d242601e68ddb9ae61c39e 100644
--- a/src/views/pages/autoexec/components/script/script-list.vue
+++ b/src/views/pages/autoexec/components/script/script-list.vue
@@ -284,7 +284,6 @@ export default {
       let _this = this;
       _this.list.forEach(l => {
         if (l.uuid == id) {
-          console.log(config);
           Object.assign(l, config);
         }
       });
@@ -314,7 +313,7 @@ export default {
           childrendom.forEach(children => {
             if (children.__vue__ && children.__vue__.valid) {
               if (!children.__vue__.valid()) {
-                children.__vue__.$options.parent.step.isShow = true;
+                this.setShowStep(children.__vue__.$options.parent);
                 isValid = false;
               }
             }
@@ -323,6 +322,17 @@ export default {
         return isValid;
       }
     },
+    setShowStep(parent) { //设置父级的显示
+      if (parent) {
+        if (parent.step) {
+          parent.step.isShow = true;
+        } else {
+          if (parent.$options.parent) {
+            this.setShowStep(parent.$options.parent);
+          }
+        }
+      }
+    },
     refreshProfile() {
       if (this.phaseOperationList && this.phaseOperationList.length) {
         this.phaseOperationList.forEach(item => {
diff --git a/src/views/pages/autoexec/detail/action-detail.vue b/src/views/pages/autoexec/detail/action-detail.vue
index f9c641668ce0459fb09c58ae366bd20c60a8d01c..9fee20c30d7c15a7ba9faaebf9b41a3ae15245ae 100644
--- a/src/views/pages/autoexec/detail/action-detail.vue
+++ b/src/views/pages/autoexec/detail/action-detail.vue
@@ -1256,7 +1256,7 @@ export default {
         if (p.operationName == 'native/IF-Block') {
           if (p.config) {
             !p.config.condition && validList.push({
-              text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputcondition'),
+              text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputcondition'),
               type: 'error',
               config: {
                 stepName: step.name,
@@ -1264,6 +1264,17 @@ export default {
                 stepUuid: step.uuid
               }
             });
+            if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) {
+              validList.push({
+                text: this.$t('page.phase') + step.name + '【' + p.operationName + '】：' + this.$t('term.deploy.chooseatleastonetool'),
+                type: 'error',
+                config: {
+                  stepName: step.name,
+                  validComponent: 'operation',
+                  stepUuid: step.uuid
+                }
+              });
+            }
             if (p.config.ifList && p.config.ifList.length) {
               let validIfList = this.validPhaseOperationList(step, p.config.ifList);
               validIfList.length && validList.push(...validIfList);
@@ -1276,7 +1287,7 @@ export default {
         } else if (p.operationName == 'native/LOOP-Block') {
           if (p.config) {
             !p.config.loopItems && validList.push({
-              text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopitems'),
+              text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopitems'),
               type: 'error',
               config: {
                 stepName: step.name,
@@ -1285,7 +1296,7 @@ export default {
               }
             });
             !p.config.loopItemVar && validList.push({
-              text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopitemvar'),
+              text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopitemvar'),
               type: 'error',
               config: {
                 stepName: step.name,
@@ -1294,7 +1305,7 @@ export default {
               }
             });
             (!p.config.operations || p.config.operations.length == 0) && validList.push({
-              text: this.$t('page.phase') + step.name + this.$t('term.autoexec.setinputloopoperations'),
+              text: this.$t('page.phase') + step.name + '【' + p.operationName + '】' + this.$t('term.autoexec.setinputloopoperations'),
               type: 'error',
               config: {
                 stepName: step.name,
diff --git a/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue b/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue
index ca840516e7d5ab32d8652b53e22ea8a5c196596c..e7c6c912e602f40d19f30173b0d1dee1693c1ae7 100644
--- a/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/execute-setting.vue
@@ -165,9 +165,31 @@ export default {
           label: this.$t('page.autoexeccomboprunnergrouplabel'),
           labelWidth: '113'
         },
+        parallelPolicy: {
+          type: 'radio',
+          labelWidth: '113',
+          disabled: !_this.isEditSetting,
+          label: this.$t('page.autoexecparallpolicy'),
+          dataList: [
+            {
+              text: this.$t('page.autoexecparall'),
+              value: 'parallel'
+            },
+            {
+              text: this.$t('page.autoexecbatchround'),
+              value: 'roundCount'
+            }
+          ],
+          allowToggle: true,
+          transfer: true,
+          onChange: (val) => {
+            this.changeParallelPolicy(val);
+          }
+        },
         roundCount: {
           type: 'select',
           value: null,
+          isHidden: true,
           transfer: true,
           disabled: !_this.isEditSetting,
           label: this.$t('term.autoexec.batchquantity'),
@@ -175,6 +197,16 @@ export default {
           dataList: this.$utils.getRoundCountList(),
           labelWidth: '113'
         },
+        parallelCount: {
+          type: 'select',
+          value: null,
+          transfer: true,
+          disabled: !_this.isEditSetting,
+          label: this.$t('term.autoexec.parall'),
+          desc: this.$t('term.autoexec.paralldesc'),
+          dataList: this.$utils.getRoundCountList(),
+          labelWidth: '113'
+        },
         whenToSpecify: {
           type: 'radio',
           label: this.$t('term.autoexec.choosethetime'),
@@ -193,7 +225,9 @@ export default {
         executeUser: null,
         runnerGroup: null,
         runnerGroupTag: null,
+        parallelPolicy: null,
         roundCount: null,
+        parallelCount: null,
         whenToSpecify: 'runtime',
         executeNodeConfig: {}
       },
@@ -219,14 +253,20 @@ export default {
   destroyed() {},
   methods: {
     getExecuteConfig() {
-      let _this = this;
-      if (_this.executeConfig) {
-        Object.keys(_this.executeConfig).forEach(key => {
-          if (_this.settingConfig.hasOwnProperty(key)) {
-            _this.settingConfig[key] = _this.executeConfig[key];
+      if (this.executeConfig) {
+        Object.keys(this.executeConfig).forEach(key => {
+          if (this.settingConfig.hasOwnProperty(key)) {
+            this.settingConfig[key] = this.executeConfig[key];
+          }
+          this.$set(this.form.roundCount, 'isHidden', true);
+          this.$set(this.form.parallelCount, 'isHidden', true);
+          if (this.executeConfig.parallelPolicy && this.executeConfig.parallelPolicy == 'roundCount') {
+            this.$set(this.form.roundCount, 'isHidden', false);
+          } else if (this.executeConfig.parallelPolicy && this.executeConfig.parallelPolicy == 'parallel') {
+            this.$set(this.form.parallelCount, 'isHidden', false);
           }
         });
-        if (_this.settingConfig.whenToSpecify == 'runtime') {
+        if (this.settingConfig.whenToSpecify == 'runtime') {
           this.runtimeFilter = this.settingConfig.executeNodeConfig.filter || {};
         }
       }
@@ -264,6 +304,14 @@ export default {
         this.$set(this.settingConfig.executeNodeConfig, 'paramList', paramList);
         this.save();
       }
+      if (this.$utils.isEmpty(this.settingConfig.parallelPolicy)) {
+        this.settingConfig.roundCount = null;
+        this.settingConfig.parallelCount = null;
+      } else if (this.settingConfig.parallelPolicy === 'parallel') {
+        this.settingConfig.roundCount = null;
+      } else {
+        this.settingConfig.parallelCount = null;
+      }
     },
     save() {
       this.closeSetting(this.settingConfig);
@@ -330,6 +378,17 @@ export default {
     changeWhenToSpecify(val) {
       this.settingConfig.whenToSpecify = val;
       this.settingConfig.executeNodeConfig = {};
+    },
+    changeParallelPolicy(val) {
+      this.$nextTick(() => {
+        this.$set(this.form.roundCount, 'isHidden', true);
+        this.$set(this.form.parallelCount, 'isHidden', true);
+        if (val && val == 'roundCount') {
+          this.$set(this.form.roundCount, 'isHidden', false);
+        } else if (val && val == 'parallel') {
+          this.$set(this.form.parallelCount, 'isHidden', false);
+        }
+      });
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/detail/actionDetail/group/node-view.vue b/src/views/pages/autoexec/detail/actionDetail/group/node-view.vue
index 82aa85ba02ea9f678762602f3abe930b42e5b609..f1df3c970d25363eb51ef635e630a6b97286f7d6 100644
--- a/src/views/pages/autoexec/detail/actionDetail/group/node-view.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/group/node-view.vue
@@ -25,7 +25,7 @@
 export default {
   name: '',
   components: {
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
+    MoreTarget: () => import('@/views/pages/autoexec/components/common/addTarget/more-target.vue')
   },
   filters: {
   },
diff --git a/src/views/pages/autoexec/detail/actionDetail/node-list.vue b/src/views/pages/autoexec/detail/actionDetail/node-list.vue
index 98dca4892f37e79e90c748e00551957d86f346e7..d66788dd18e4115809acbca6611ef72e4b3709ec 100644
--- a/src/views/pages/autoexec/detail/actionDetail/node-list.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/node-list.vue
@@ -74,7 +74,7 @@ export default {
   components: {
     FilterSearch,
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
+    MoreTarget: () => import('@/views/pages/autoexec/components/common/addTarget/more-target.vue')
     // NodeView:()=>import('@/views/pages/autoexec/components/common/targetView/node-view')
   },
   filters: {
diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
index c2c9467714b3ba06c20162fa631ceba735d72f1b..b7330f1809d2eb43efd5a74974e8581fdc2dc558 100644
--- a/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue
@@ -7,6 +7,7 @@
           :dataList="mappingModeList"
           :disabled="disabled"
           :clearable="false"
+          border="border"
           transfer
           @change="changeMappingMode"
         ></TsFormSelect>
@@ -22,6 +23,7 @@
           :firstText="$t('term.autoexec.jobparam')"
           :firstSelect="false"
           :firstLi="isEditRuntimeParam"
+          border="border"
           @first="gotoAddParameter"
         ></TsFormSelect>
         <TsFormSelect
@@ -117,7 +119,7 @@ export default {
         transfer: true,
         needCallback: false,
         border: 'border',
-        validateList: ['required'],
+        validateList: this.isRequired ? ['required'] : [],
         dealDataByUrl: this.$utils.getRunnerGroupList,
         dynamicUrl: '/api/rest/runnergroup/search',
         params: {
diff --git a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
index 7744a5a077c1dd0108f3466755996d7afa1e62f5..fcd20939b2c0895b355052439f3693c1a0ef8e87 100644
--- a/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue
@@ -7,6 +7,7 @@
           :dataList="mappingModeList"
           :disabled="disabled"
           :clearable="false"
+          border="border"
           transfer
           @change="changeMappingMode"
         ></TsFormSelect>
@@ -21,6 +22,7 @@
           transfer
           :firstText="$t('term.autoexec.jobparam')"
           :firstSelect="false"
+          border="border"
           :firstLi="isEditRuntimeParam"
           @first="gotoAddParameter"
         ></TsFormSelect>
@@ -55,7 +57,6 @@
   </div>
 </template>
 <script>
-import { sync } from '../../../pbc/policy/phase';
 export default {
   name: '',
   inject: {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step-group.vue b/src/views/pages/autoexec/detail/actionDetail/step-group.vue
index 730de1e94286b593739ececed5f834f70e811b00..78136ed589cbca9ba6a53569395a378fdb46df12 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step-group.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step-group.vue
@@ -100,12 +100,24 @@
           </div>
           <div v-else>-</div>
         </TsFormItem>
-        <TsFormItem :label="$t('term.autoexec.batchquantity')" labelWidth="80">
+        <TsFormItem :label="$t('page.autoexecparallpolicy')" labelWidth="80">
+          <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.parallelPolicy)">
+            {{ getParallelPolicyText(groupConfig.config.executeConfig.parallelPolicy) }}
+          </div>
+          <div v-else>-</div>
+        </TsFormItem>
+        <TsFormItem v-if="groupConfig.config.executeConfig.parallelPolicy === 'roundCount'" :label="$t('term.autoexec.batchquantity')" labelWidth="80">
           <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.roundCount)">
             {{ getRoundCountText(groupConfig.config.executeConfig.roundCount) }}
           </div>
           <div v-else>-</div>
         </TsFormItem>
+        <TsFormItem v-else :label="$t('term.autoexec.parall')" labelWidth="80">
+          <div v-if="!$utils.isEmpty(groupConfig.config.executeConfig.parallelCount)">
+            {{ getRoundCountText(groupConfig.config.executeConfig.parallelCount) }}
+          </div>
+          <div v-else>-</div>
+        </TsFormItem>
       </template>
     </div>
     <TsDialog
@@ -257,6 +269,25 @@ export default {
             type: 'slot',
             label: this.$t('page.executeuser')
           },
+          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,
+            onChange: (val) => {
+              this.changeParallelPolicy(val);
+            }
+          },
           roundCount: {
             type: 'select',
             value: null,
@@ -264,6 +295,14 @@ export default {
             label: this.$t('term.autoexec.batchquantity'),
             desc: this.$t('term.deploy.executetargetdesc'),
             dataList: this.$utils.getRoundCountList()
+          },
+          parallelCount: {
+            type: 'select',
+            value: null,
+            transfer: true,
+            label: this.$t('term.autoexec.parall'),
+            desc: this.$t('term.autoexec.paralldesc'),
+            dataList: this.$utils.getRoundCountList()
           }
         }
       },
@@ -320,6 +359,8 @@ export default {
         protocolId: null,
         executeUser: {},
         roundCount: null,
+        parallelCount: null,
+        parallelPolicy: null,
         executeNodeConfig: {},
         whitelist: [],
         blacklist: []
@@ -346,6 +387,14 @@ export default {
         this.isShowBlacklist = true;
       }
       this.isShowDialog = true;
+
+      this.$set(this.executeForm.itemList.roundCount, 'isHidden', true);
+      this.$set(this.executeForm.itemList.parallelCount, 'isHidden', true);
+      if (this.executeConfig.parallelPolicy && this.executeConfig.parallelPolicy == 'roundCount') {
+        this.$set(this.executeForm.itemList.roundCount, 'isHidden', false);
+      } else if (this.executeConfig.parallelPolicy && this.executeConfig.parallelPolicy == 'parallel') {
+        this.$set(this.executeForm.itemList.parallelCount, 'isHidden', false);
+      }
     },
     close() {
       this.isShowExecute = true;
@@ -414,6 +463,14 @@ export default {
       this.executeConfig.whitelist = this.$refs.whitelist.save();
       this.executeConfig.blacklist = this.$refs.blacklist.save();
       this.groupConfig.policy = this.groupPolicy;
+      if (this.$utils.isEmpty(this.executeConfig.parallelPolicy)) {
+        this.executeConfig.roundCount = null;
+        this.executeConfig.parallelCount = null;
+      } else if (this.executeConfig.parallelPolicy === 'parallel') {
+        this.executeConfig.roundCount = null;
+      } else {
+        this.executeConfig.parallelCount = null;
+      }
       let isEmpty = true;
       Object.keys(this.executeConfig).forEach(key => {
         if (!this.$utils.isEmpty(this.executeConfig[key])) {
@@ -446,6 +503,17 @@ export default {
     },
     closeValid() { //关闭校验弹框
       this.isValid = false;
+    },
+    changeParallelPolicy(val) {
+      this.$nextTick(() => {
+        this.$set(this.executeForm.itemList.roundCount, 'isHidden', true);
+        this.$set(this.executeForm.itemList.parallelCount, 'isHidden', true);
+        if (val && val == 'roundCount') {
+          this.$set(this.executeForm.itemList.roundCount, 'isHidden', false);
+        } else if (val && val == 'parallel') {
+          this.$set(this.executeForm.itemList.parallelCount, 'isHidden', false);
+        }
+      });
     }
   },
   computed: {
@@ -472,6 +540,17 @@ export default {
         }
         return text;
       };
+    },
+    getParallelPolicyText() {
+      return (val) => {
+        let text = val;
+        if (val === 'parallel') {
+          text = this.$t('page.autoexecparall');
+        } else if (val === 'roundCount') {
+          text = this.$t('page.autoexecbatchround');
+        }
+        return text;
+      };
     }
   },
   watch: {
diff --git a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
index bd4d91cf58da4d5a928cd0d1b989d258815b424f..8ea62f2421be073e24ee7c6f87e9a4d647ee20fe 100644
--- a/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/step/edit/step-edit.vue
@@ -53,48 +53,88 @@
               ></TsFormSelect>
             </TsFormItem>
           </div>
-          <div v-if="editConfig.execMode !='runner' && editConfig.execMode !='sqlfile' && (!groupConfig || groupConfig.policy !='grayScale')" class="mt-lg">
-            <TsFormItem
-              :label="$t('term.deploy.presetexecutiontarget')"
-              labelPosition="left"
-              :labelWidth="115"
-              :tooltip="executeTooltip"
-            >
-              <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
-            </TsFormItem>
-            <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
-              <TsForm
-                ref="executeForm"
-                v-model="executeConfig"
-                :itemList="executeForm"
+          <template v-if="!groupConfig || groupConfig.policy !='grayScale'">
+            <div v-if="editConfig.execMode !='runner' && editConfig.execMode !='sqlfile'" class="mt-lg">
+              <TsFormItem
+                :label="$t('term.deploy.presetexecutiontarget')"
                 labelPosition="left"
-                tipPlacement="right"
                 :labelWidth="115"
+                :tooltip="executeTooltip"
               >
-                <template v-slot:executeUser>
-                  <ExecuteuserSetting
-                    ref="executeUser"
-                    :config="executeConfig.executeUser"
+                <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
+              </TsFormItem>
+              <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
+                <TsForm
+                  ref="executeForm"
+                  v-model="executeConfig"
+                  :itemList="executeForm"
+                  labelPosition="left"
+                  tipPlacement="right"
+                  :labelWidth="115"
+                >
+                  <template v-slot:executeUser>
+                    <ExecuteuserSetting
+                      ref="executeUser"
+                      :config="executeConfig.executeUser"
+                      :disabled="!canEdit"
+                      :runtimeParamList="runtimeParamList"
+                    ></ExecuteuserSetting>
+                  </template>
+                </TsForm>
+                <div class="pt-nm">
+                  <TargetDetail
+                    :id="id"
+                    ref="targetDetail"
+                    :canEdit="canEdit"
+                    :config="executeConfig.executeNodeConfig"
+                    :isAddParam="true"
+                    :labelWidth="115"
+                    :isAddPrenode="prevStepList.length > 0 ? true : false"
+                    :prevStepList="prevStepList"
+                    :runtimeParamList="runtimeParamList"
+                  ></TargetDetail>
+                </div>
+              </template>
+            </div>
+            <div v-if="editConfig.execMode ==='runner'">
+              <TsFormItem
+                :label="$t('term.deploy.presetrunnergroup')"
+                labelPosition="left"
+                :labelWidth="115"
+                :tooltip="runnerGroupTooltip"
+              >
+                <TsFormSwitch v-model="executeConfig.isPresetRunnerGroup" :disabled="!canEdit"></TsFormSwitch>
+              </TsFormItem>
+              <template v-if="executeConfig.isPresetRunnerGroup">
+                <TsFormItem
+                  :label="$t('term.deploy.actuatorgrouptag')"
+                  labelPosition="left"
+                  :labelWidth="115"
+                >
+                  <RunnerGroupTagSetting
+                    ref="runnerGroupTag"
+                    :config="executeConfig.runnerGroupTag"
                     :disabled="!canEdit"
                     :runtimeParamList="runtimeParamList"
-                  ></ExecuteuserSetting>
-                </template>
-              </TsForm>
-              <div class="pt-nm">
-                <TargetDetail
-                  :id="id"
-                  ref="targetDetail"
-                  :canEdit="canEdit"
-                  :config="executeConfig.executeNodeConfig"
-                  :isAddParam="true"
+                    :isRequired="false"
+                  ></RunnerGroupTagSetting>
+                </TsFormItem>
+                <TsFormItem
+                  :label="$t('page.autoexeccomboprunnergrouplabel')"
+                  labelPosition="left"
                   :labelWidth="115"
-                  :isAddPrenode="prevStepList.length > 0 ? true : false"
-                  :prevStepList="prevStepList"
-                  :runtimeParamList="runtimeParamList"
-                ></TargetDetail>
-              </div>
-            </template>
-          </div>
+                >
+                  <RunnerGroupSetting
+                    ref="runnerGroup"
+                    :config="!$utils.isEmpty(executeConfig.runnerGroup)?executeConfig.runnerGroup : runnerGroup"
+                    :disabled="!canEdit"
+                    :runtimeParamList="runtimeParamList"
+                    :isRequired="false"
+                  ></RunnerGroupSetting>
+                </TsFormItem>
+              </template>
+            </div>
+          </template>
         </div>
       </template>
       <template v-slot:footer>
@@ -130,7 +170,9 @@ export default {
     TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
-    ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue')
+    ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue'),
+    RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
+    RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue')
   },
   filters: {},
   props: {
@@ -200,10 +242,9 @@ export default {
           popLable: 120
         }
       ],
-      executeForm: [
-        {
+      executeForm: {
+        protocolId: {
           type: 'select',
-          name: 'protocolId',
           label: this.$t('page.protocol'), //添加阶段
           value: '',
           multiple: false,
@@ -214,15 +255,34 @@ export default {
           transfer: true,
           disabled: !_this.canEdit
         },
-        {
+        executeUser: {
           type: 'slot',
-          name: 'executeUser',
           label: this.$t('page.executeuser'),
           tooltip: this.$t('term.autoexec.nowriteusertooltip')
         },
-        {
+        parallelPolicy: {
+          type: 'radio',
+          labelWidth: '113',
+          disabled: !_this.canEdit,
+          label: this.$t('page.autoexecparallpolicy'),
+          dataList: [
+            {
+              text: this.$t('page.autoexecparall'),
+              value: 'parallel'
+            },
+            {
+              text: this.$t('page.autoexecbatchround'),
+              value: 'roundCount'
+            }
+          ],
+          allowToggle: true,
+          transfer: true,
+          onChange: (val) => {
+            this.changeParallelPolicy(val);
+          }
+        },
+        roundCount: {
           type: 'select',
-          name: 'roundCount',
           value: null,
           transfer: true,
           label: this.$t('term.autoexec.batchquantity'),
@@ -230,20 +290,41 @@ export default {
           dataList: this.$utils.getRoundCountList(),
           filterName: 'text',
           disabled: !_this.canEdit
+        },
+        parallelCount: {
+          type: 'select',
+          value: null,
+          transfer: true,
+          disabled: !_this.canEdit,
+          label: this.$t('term.autoexec.parall'),
+          desc: this.$t('term.autoexec.paralldesc'),
+          dataList: this.$utils.getRoundCountList()
         }
-      ],
+      },
       executeConfig: {
         protocolId: '',
         executeUser: {},
+        parallelPolicy: null,
+        parallelCount: null,
         roundCount: null,
         isPresetExecuteConfig: 0,
-        executeNodeConfig: {}
+        executeNodeConfig: {},
+        isPresetRunnerGroup: 0,
+        runnerGroup: null,
+        runnerGroupTag: null
+
       },
       isValid: false, // 校验执行目标
       resultList: [], //校验结果
       validateList: ['required'],
       executePolicyList: [],
-      executeTooltip: this.$t('term.autoexec.executeTooltip')
+      executeTooltip: this.$t('term.autoexec.executeTooltip'),
+      runnerGroupTooltip: this.$t('term.autoexec.runnerGroupTooltip'),
+      runnerGroup: {
+        mappingMode: 'constant',
+        value: '',
+        text: ''
+      }
     };
   },
   beforeCreate() {},
@@ -260,6 +341,16 @@ export default {
             this.executeConfig[key] = this.config.config.executeConfig[key];
           }
         });
+        if (!this.$utils.isEmpty(this.executeConfig.runnerGroup) || !this.$utils.isEmpty(this.executeConfig.runnerGroupTag)) {
+          this.$set(this.executeConfig, 'isPresetRunnerGroup', 1);
+        }
+        this.$set(this.executeForm.roundCount, 'isHidden', true);
+        this.$set(this.executeForm.parallelCount, 'isHidden', true);
+        if (this.executeConfig.parallelPolicy && this.executeConfig.parallelPolicy == 'roundCount') {
+          this.$set(this.executeForm.roundCount, 'isHidden', false);
+        } else if (this.executeConfig.parallelPolicy && this.executeConfig.parallelPolicy == 'parallel') {
+          this.$set(this.executeForm.parallelCount, 'isHidden', false);
+        }
       }
     }
     for (let key in this.formItem) {
@@ -289,12 +380,28 @@ export default {
       } else {
         this.executeConfig.executeNodeConfig = {};
       }
+      if (this.$refs.runnerGroupTag) {
+        this.$set(this.executeConfig, 'runnerGroupTag', this.$refs.runnerGroupTag.save());
+      }
+      if (this.$refs.runnerGroup) {
+        this.$set(this.executeConfig, 'runnerGroup', this.$refs.runnerGroup.save());
+      }
+
+      if (this.$utils.isEmpty(this.executeConfig.parallelPolicy)) {
+        this.executeConfig.roundCount = null;
+        this.executeConfig.parallelCount = null;
+      } else if (this.executeConfig.parallelPolicy === 'parallel') {
+        this.executeConfig.roundCount = null;
+      } else {
+        this.executeConfig.parallelCount = null;
+      }
+   
       if (this.$refs.form.valid()) {
         let editConfig = this.$utils.deepClone(this.editConfig);
         if (editConfig.policy && (!this.groupConfig || this.groupConfig.policy != 'grayScale' || (this.editConfig.execMode && this.editConfig.execMode != 'runner' && this.editConfig.execMode != 'sqlfile'))) {
           this.$delete(editConfig, 'policy');
         }
-        this.$emit('close', editConfig, this.executeConfig.isPresetExecuteConfig ? this.executeConfig : {});
+        this.$emit('close', editConfig, this.executeConfig.isPresetExecuteConfig || this.executeConfig.isPresetRunnerGroup ? this.executeConfig : {});
       }
     },
     checkExist(key, val) {
@@ -326,14 +433,15 @@ export default {
       }
     },
     toggleExecuteForm(type) {
-      let _this = this;
       //runner方式的阶段无需选执行目标；其他方式需要（非必选)
       if (type == 'runner') {
-        _this.executeConfig = {
+        this.executeConfig = {
           protocolId: '',
           executeUser: {},
-          isPresetExecuteConfig: 0,
-          executeNodeConfig: {}
+          executeNodeConfig: {},
+          isPresetRunnerGroup: 0,
+          runnerGroup: null,
+          runnerGroupTag: null
         };
       }
     },
@@ -402,6 +510,17 @@ export default {
           this.executePolicyList = res.Return || [];
         }
       });
+    },
+    changeParallelPolicy(val) {
+      this.$nextTick(() => {
+        this.$set(this.executeForm.roundCount, 'isHidden', true);
+        this.$set(this.executeForm.parallelCount, 'isHidden', true);
+        if (val && val == 'roundCount') {
+          this.$set(this.executeForm.roundCount, 'isHidden', false);
+        } else if (val && val == 'parallel') {
+          this.$set(this.executeForm.parallelCount, 'isHidden', false);
+        }
+      });
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/detail/actionDetail/version-list.vue b/src/views/pages/autoexec/detail/actionDetail/version-list.vue
index 8d1fe24d4cd6ee35bd75968e8153f05119830d16..817e08929483547346ce5415b076895ae88c16d3 100644
--- a/src/views/pages/autoexec/detail/actionDetail/version-list.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/version-list.vue
@@ -23,6 +23,7 @@
                 <CommonStatus v-if="currentVersion.status" :statusValue="adjustStatusValue(currentVersion.status, currentVersion.isActive)" :statusName="getStatusText(currentVersion.status, currentVersion.isActive)"></CommonStatus>
               </div>
             </div>
+            <div v-if="currentVersion.name" class="title">{{ currentVersion.name }}</div>
             <div class="text-tip fz10">
               <span class="user overflow">
                 <UserCard v-bind="currentVersion.lcuVo" hideAvatar></UserCard>
@@ -76,6 +77,7 @@
                 <div class="version-content-top">
                   <div>{{ $t('page.versions') }}{{ row.version }}</div>
                 </div>
+                <div v-if="row.name" class="title">{{ row.name }}</div>
                 <div class="text-tip fz10">
                   <span class="user overflow">
                     <UserCard v-bind="row.lcuVo" hideAvatar></UserCard>
diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue
index d35a5b61bcbd599fe90628b2117dc963fc3d36cd..329eeee1212aa4fe9c8bd7ffa0547973217de764 100644
--- a/src/views/pages/autoexec/detail/job-detail.vue
+++ b/src/views/pages/autoexec/detail/job-detail.vue
@@ -4,6 +4,8 @@
       ref="jobDetailContain"
       :siderWidth="258"
       :enableCollapse="true"
+      topLeftWidth="30%"
+      topRightWidth="70%"
       @toggleSiderHide="toggleSiderHide"
     >
       <template v-slot:navigation>
@@ -63,7 +65,7 @@
       <template v-slot:topRight>
         <div ref="topRightRef" class="div-btn-contain action-group">
           <span v-if="jobData.extraInfo && jobData.extraInfo.isHasLock == 1" class="tsfont-lock text-action action-item text-warning" @click="globalLockShow">{{ $t('term.autoexec.resourcelock') }}</span>
-          <span class="action-item tsfont-accessendpoint" @click="isShowFlow = true">流程图</span>
+          <span class="action-item tsfont-accessendpoint" @click="isShowFlow = true">{{ $t('term.deploy.flowchart') }}</span>
           <span class="action-item tsfont-console" @click="isShowConsoleLogDialog = true">{{ $t('term.autoexec.controlpanel') }}</span>
           <span class="action-item tsfont-config" @click="openShowParam">{{ $t('page.param') }}</span>
           <span v-if="versionId != null" class="action-item tsfont-file-single icon" @click="openProjectDirectoryDialog(versionId)">{{ $t('term.deploy.projectdirectory') }}</span>
@@ -85,7 +87,7 @@
                     {{ $t('term.autoexec.copyjob') }}
                   </div>
                 </DropdownItem>
-                <DropdownItem v-if="jobData.isCanExecute || jobData.isCanTakeOver" @click.native="abortJob()">
+                <DropdownItem v-if="jobData.isCanExecute" @click.native="abortJob()">
                   <div>
                     {{ $t('term.autoexec.abortjob') }}
                   </div>
@@ -214,7 +216,7 @@ export default {
         pageSize: 10
       },
       statusActionMapping: {
-        pending: ['abort'], //未开始：
+        pending: ['refire', 'abort'], //未开始：
         running: ['pause', 'abort'], //运行中： 暂停  终止
         aborting: ['abort'], //终止中
         pausing: ['pause', 'abort'], //暂定中
@@ -224,7 +226,7 @@ export default {
         failed: ['refire'], //已失败：继续
         ready: ['execute', 'revoke'], //已就绪 撤销 执行
         waitInput: ['abort'],
-        waiting: ['abort']
+        waiting: ['pause', 'abort']
       },
       actionMap: {
         valid: {
@@ -270,7 +272,8 @@ export default {
       },
       versionId: null,
       hasOperationVersionAndProductManagerAuth: false,
-      jobNameWidth: 0
+      jobNameWidth: 0,
+      refreshTimes: 3 //作业完成后刷新次数
     };
   },
   beforeCreate() {},
@@ -341,7 +344,7 @@ export default {
       this.getPhaseList(true);
     },
     refireJob() {
-      if (this.phaseEndingStatusList.includes(this.jobData.status)) {
+      if (this.phaseEndingStatusList.includes(this.jobData.status) || this.jobData.status === 'pending') {
         this.isShowRerunDialog = true;
       }
     },
@@ -453,11 +456,11 @@ export default {
               }
             });
             if (phaseIdList.length > 0) {
-              //refreshPhaseList存在定时器
-              // this.timmer = setTimeout(() => {
-              this.refreshPhaseList(phaseIdList);
-              // }, 5000);
+              this.refreshTimes = 3;
             }
+            this.timmer = setTimeout(() => {
+              this.refreshPhaseList(phaseIdList);
+            }, 5000);
           }
         })
         .finally(() => {
@@ -472,7 +475,11 @@ export default {
     },
     refreshPhaseList(phaseIdList) {
       this.clearTimmer();
-      if (phaseIdList && phaseIdList.length > 0) {
+      //阶段刷新机制：
+      //1、phaseIdList不为空；
+      //2、作业状态为终点状态时，根据refreshTimes刷新次数判断是否需要继续刷新；
+      //3、作业状态不在终点状态时(phaseEndingStatusList)。
+      if (!this.$utils.isEmpty(phaseIdList) || this.refreshTimes > 0 || !this.phaseEndingStatusList.includes(this.jobData.status)) {
         this.$api.autoexec.job.getPhaseList({ jobId: this.jobParam.jobId, phaseIdList: phaseIdList }).then(res => {
           if (res.Return['phaseList'] && res.Return['phaseList'].length > 0) {
             res.Return['phaseList'].forEach(phase => {
@@ -494,7 +501,10 @@ export default {
           if (this.jobData && this.jobData.extraInfo) {
             this.$set(this.jobData, 'extraInfo', res.Return['extraInfo']);
           }
-          if (phaseIdList.length > 0) {
+          if (this.$utils.isEmpty(phaseIdList)) {
+            this.refreshTimes--;
+          }
+          if (phaseIdList.length > 0 || this.refreshTimes > 0) {
             this.timmer = setTimeout(() => {
               this.refreshPhaseList(phaseIdList);
             }, 5000);
@@ -558,12 +568,13 @@ export default {
     copyJob() {
       //复制作业
       let path = '';
-      if (this.jobData.source == 'test') {
+      if (this.jobData.source == 'test' || this.jobData.source == 'scripttest' || this.jobData.source == 'tooltest') {
         path = '/test-detail';
-      } else if (this.jobData.source == 'deploy' || this.jobData.source == 'deployschedulegeneral') {
-        // deployschedulegeneral 发布定时普通作业
+      } else if (this.jobData.extraInfo && this.jobData.extraInfo.sourceType == 'deploy') {
+        //  集成发布
         path = '/job-add';
       } else {
+        //自动化
         path = '/runner-detail';
       }
       this.$router.push({
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 c304b93b4dc73cfc7aec7b93900915388b85fbec..50c328ad03ef414b911d5bee3adad455a80311cd 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -270,7 +270,7 @@ export default {
           //内容变化会影响高度，可能会因此产生滚动条，所以每次内容变化都要触发跳转，并且需要延时等待内容加载完毕才能进行定位
           if (this.activePhaseId) {
             setTimeout(() => {
-              const rect = this.$refs['phase_' + this.activePhaseId][0].getBoundingClientRect();
+              const rect = this.$refs['phase_' + this.activePhaseId][0]?.getBoundingClientRect();
               if (rect && (rect.top < 0 || rect.top > window.innerHeight)) {
                 this.$utils.jumpTo('#phase_' + this.activePhaseId, 'smooth');
               }
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 5ee990dfa04fb1465729b5a03bc32e635341437b..d305994f634c214193d974ae21bc1847a1cd31a7 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
@@ -5,18 +5,43 @@
       <Col :span="16">
         <div class="div-btn-contain action-group no-line">
           <template v-if="jobData.isCanExecute && nodeData">
-            <span class="action-item tsfont-minus-o" :class="{ disable: selectedNodeList.length <= 0 }" @click="ignoreNode()">{{ $t('page.ignore') }}</span>
-            <span class="action-item tsfont-restart" :class="{ disable: selectedNodeList.length <= 0 }" @click="resetNode()">{{ $t('page.reset') }}</span>
+            <span class="action-item tsfont-minus-o" :class="{ disable: selectedNodeList.length <= 0 || phaseData.status == 'running' }" @click="ignoreNode()">{{ $t('page.ignore') }}</span>
+            <span class="action-item tsfont-restart" :class="{ disable: selectedNodeList.length <= 0 || phaseData.status == 'running' }" @click="resetNode()">{{ $t('page.reset') }}</span>
             <span class="action-item tsfont-restart" :class="phaseData.status == 'running'?'disable':''" @click="resetAllNode()">{{ $t('page.resetall') }}</span>
-            <span class="action-item tsfont-run" :class="phaseData.status == 'running'?'disable':''" @click="refirePhase()">{{ $t('page.execute') }}</span>
-          </template>
-          <template v-if="canExportNode">
-            <span v-if="!downloadLoadingNode" v-download="downloadNodeUrl" class="action-item tsfont-download">{{ $t('term.autoexec.exportnode') }}</span>
-            <span v-if="downloadLoadingNode" class="action-item disable" :title="$t('page.downloadloadingtip')">
-              <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
-              {{ $t('term.autoexec.exportnode') }}
-            </span>
+            <span class="action-item tsfont-run" :class="phaseData.status == 'running'?'disable':''" @click="refirePhase()">{{ $t('page.executeall') }}</span>
           </template>
+          <span class="action-item">
+            <Poptip transfer placement="bottom"> 
+              <span class="text-action">
+                <i class="tsfont-adapter pr-icon"></i><span>{{ $t('term.autoexec.actuatorinformation') }}</span>
+              </span>
+              <div slot="content">
+                <TsTable
+                  v-bind="runnerTableConfig"
+                >
+                  <template v-slot:ipPort="{ row }">
+                    <span>{{ row.host }}:{{ row.port }}</span>
+                  </template>
+                </TsTable>
+              </div>
+            </Poptip>
+          </span>
+          <span v-if="canExportNode" class="action-item">
+            <Dropdown trigger="hover" placement="bottom">
+              <span class="tsfont-option-horizontal"></span>
+              <DropdownMenu slot="list">
+                <DropdownItem>
+                  <div>
+                    <span v-if="!downloadLoadingNode" v-download="downloadNodeUrl" class="action-item tsfont-download">{{ $t('term.autoexec.exportnode') }}</span>
+                    <span v-if="downloadLoadingNode" class="action-item disable" :title="$t('page.downloadloadingtip')">
+                      <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
+                      {{ $t('term.autoexec.exportnode') }}
+                    </span>
+                  </div>
+                </DropdownItem>
+              </DropdownMenu>
+            </Dropdown>
+          </span>
         </div>
       </Col>
       <Col :span="8">
@@ -42,16 +67,28 @@
             class="col-span custom-flex text-right"
             span="14"
           >
-            <span v-if="phaseData.jobGroupVo.policy" class="status-text text-pending">执行策略:{{ phaseData.jobGroupVo.policy }} </span>
+            <span v-if="phaseData.jobGroupVo.policy" class="status-text text-pending">{{ $t('term.deploy.executivestrategy') }}:{{ phaseData.jobGroupVo.policy }} </span>
+            <Tooltip
+              v-if="phaseData.parallelPolicy === 'parallel' && parallelCount"
+              max-width="320"
+              theme="light"
+              transfer
+            >
+              <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>
+            </Tooltip>
             <Tooltip
-              v-if="roundCount"
+              v-if="phaseData.parallelPolicy === 'roundCount' && roundCount"
               max-width="320"
               theme="light"
               transfer
             >
-              <span class="status-text text-pending">分批数:{{ roundCount }} </span>
+              <span class="status-text text-pending">{{ $t('term.autoexec.batchquantity') }}:{{ roundCount }} </span>
               <div slot="content">
-                分批数来源: {{ phaseData.roundCountFrom }}
+                {{ $t('term.autoexec.batchquantity') }}{{ $t('page.source') }}: {{ phaseData.roundCountFrom }}
               </div>
             </Tooltip>
             <Tooltip
@@ -60,9 +97,9 @@
               theme="light"
               transfer
             >
-              <span class="status-text text-pending">执行用户:{{ phaseData.userName }} </span>
+              <span class="status-text text-pending">{{ $t('page.executeuser') }}:{{ phaseData.userName }} </span>
               <div slot="content">
-                执行用户来源: {{ phaseData.userNameFrom }}
+                {{ $t('page.executeuser') }}{{ $t('page.source') }}: {{ phaseData.userNameFrom }}
               </div>
             </Tooltip>
             <Tooltip
@@ -71,125 +108,131 @@
               theme="light"
               transfer
             >
-              <span class="status-text text-pending">执行协议:{{ phaseData.protocol }}</span>
+              <span class="status-text text-pending">{{ $t('page.protocol') }}:{{ phaseData.protocol }}</span>
               <div slot="content">
-                执行协议来源: {{ phaseData.protocolFrom }}
+                {{ $t('page.protocol') }}{{ $t('page.source') }}: {{ phaseData.protocolFrom }}
               </div>
             </Tooltip>
           </Col>
         </Row>
       </div>
     </div>
-    <TsTable
-      v-if="nodeData"
-      ref="nodeTable"
-      v-bind="nodeData"
-      :theadList="theadList"
-      multiple
-      :fixedHeader="false"
-      @changeCurrent="changeCurrentPage"
-      @changePageSize="changePageSize"
-      @getSelected="getSelected"
-    >
-      <template v-slot:sqlFile="{ row }">
-        <!--sql-list.vue专用-->
-        <span class="text-href" :class="{ 'text-grey through': row.isDelete === 1 }" @click.stop="viewNodeDetail(row, row.sqlFile)">{{ row.sqlFile }}</span>
-      </template>
-      <template v-slot:host="{ row }">
-        <!--兼容sql-list.vue的场景-->
-        <span
-          v-if="!row.sqlFile"
-          class="text-href"
-          :class="{ 'text-grey through': row.isDelete === 1 }"
-          @click.stop="viewNodeDetail(row)"
-        >{{ row.host }}{{ row.port ? ':' + row.port : '' }}</span>
-        <span v-else :class="{ 'text-grey through': row.isDelete === 1 }">{{ row.host }}{{ row.port ? ':' + row.port : '' }}</span>
-        <span v-if="row.warnCount" class="ml-xs tsfont-warning-o text-warning">{{ row.warnCount }}</span>
-      </template>
-      <template v-slot:version="{ row }">
-        <span v-if="row && row.extraInfo && row.extraInfo.version">{{ row.extraInfo.version }}</span>
-        <span v-else>-</span>
-      </template>
-      <template v-slot:blueGreenName="{ row }">
-        <span v-if="row && row.extraInfo && row.extraInfo.blueGreenName">{{ row.extraInfo.blueGreenName }}({{ row.extraInfo.blueGreenSort }})</span>
-        <span v-else>-</span>
-      </template>
-      <template v-slot:nodeName="{ row }">
-        <span :class="{ 'text-grey': row.isDelete === 1 }">{{ row.nodeName }}</span>
-      </template>
-      <template v-slot:costTime="{ row }">
-        <span :class="{ 'text-grey': row.isDelete === 1 }">{{ row.costTime }}</span>
-      </template>
-      <template v-slot:startTime="{ row }">
-        <span v-if="row.startTime" class="overflow" :class="{ 'text-grey': row.isDelete === 1 }">
-          <div v-if="row.startTime" class="fz10">
-            <span>{{ row.startTime | formatDate }}</span>
-            <span class="text-grey ml-xs">{{ $t('page.begin') }}</span>
-          </div>
-          <div v-if="row.endTime" class="fz10">
-            <span>{{ row.endTime | formatDate }}</span>
-            <span class="text-grey ml-xs">{{ $t('page.finish') }}</span>
-          </div>
-        </span>
-      </template>
-      <template v-slot:statusVo="{ row }">
-        <span v-if="row.isDelete === 1" class="text-grey">{{ row.statusName }}</span>
-        <span v-else-if="row.status == 'running'">
-          <Progress
-            hide-info
-            :percent="99"
-            status="active"
-            style="width:50px"
-          />
-        </span>
-        <span
-          v-else
-          :class="{
-            'text-success': row.status == 'succeed',
-            'text-error': row.status == 'failed',
-            'text-grey': row.status == 'pending',
-            'text-warning': row.status == 'waiting' || row.status == 'ignored' || row.status == 'aborted' || row.status == 'aborting' || row.status == 'waitInput' || row.status == 'paused' || row.status == 'invalid'
-          }"
-        >
-          <Tooltip
-            v-if="row.status == 'invalid'"
-            :transfer="true"
-            placement="bottom-start"
-            trigger="hover"
-            max-width="400"
+    <div ref="tableBox">
+      <TsTable
+        v-if="nodeData"
+        ref="nodeTable"
+        v-bind="nodeData"
+        :theadList="theadList"
+        multiple
+        :height="tableHeight"
+        @changeCurrent="changeCurrentPage"
+        @changePageSize="changePageSize"
+        @getSelected="getSelected"
+      >
+        <template v-slot:sqlFile="{ row }">
+          <!--sql-list.vue专用-->
+          <span class="text-href" :class="{ 'text-grey through': row.isDelete === 1 }" @click.stop="viewNodeDetail(row, row.sqlFile)">{{ row.sqlFile }}</span>
+        </template>
+        <template v-slot:host="{ row }">
+          <!--兼容sql-list.vue的场景-->
+          <span
+            v-if="!row.sqlFile"
+            class="text-href"
+            :class="{ 'text-grey through': row.isDelete === 1 }"
+            @click.stop="viewNodeDetail(row)"
+          >{{ row.host }}{{ row.port ? ':' + row.port : '' }}</span>
+          <span v-else :class="{ 'text-grey through': row.isDelete === 1 }">{{ row.host }}{{ row.port ? ':' + row.port : '' }}</span>
+          <span v-if="row.warnCount" class="ml-xs tsfont-warning-o text-warning">{{ row.warnCount }}</span>
+        </template>
+        <template v-slot:version="{ row }">
+          <span v-if="row && row.extraInfo && row.extraInfo.version">{{ row.extraInfo.version }}</span>
+          <span v-else>-</span>
+        </template>
+        <template v-slot:isModified="{row}">
+          <span :class="{'text-warning': row.isModified == 1,'':row.isModified == 0}">
+            {{ row.isModified == 1?$t('page.yes'):$t('page.no') }}
+          </span>
+        </template>
+        <template v-slot:blueGreenName="{ row }">
+          <span v-if="row && row.extraInfo && row.extraInfo.blueGreenName">{{ row.extraInfo.blueGreenName }}({{ row.extraInfo.blueGreenSort }})</span>
+          <span v-else>-</span>
+        </template>
+        <template v-slot:nodeName="{ row }">
+          <span :class="{ 'text-grey': row.isDelete === 1 }">{{ row.nodeName }}</span>
+        </template>
+        <template v-slot:costTime="{ row }">
+          <span :class="{ 'text-grey': row.isDelete === 1 }">{{ row.costTime }}</span>
+        </template>
+        <template v-slot:startTime="{ row }">
+          <span v-if="row.startTime" class="overflow" :class="{ 'text-grey': row.isDelete === 1 }">
+            <div v-if="row.startTime" class="fz10">
+              <span>{{ row.startTime | formatDate }}</span>
+              <span class="text-grey ml-xs">{{ $t('page.begin') }}</span>
+            </div>
+            <div v-if="row.endTime" class="fz10">
+              <span>{{ row.endTime | formatDate }}</span>
+              <span class="text-grey ml-xs">{{ $t('page.finish') }}</span>
+            </div>
+          </span>
+        </template>
+        <template v-slot:statusVo="{ row }">
+          <span v-if="row.isDelete === 1" class="text-grey">{{ row.statusName }}</span>
+          <span v-else-if="row.status == 'running'">
+            <Progress
+              hide-info
+              :percent="99"
+              status="active"
+              style="width:50px"
+            />
+          </span>
+          <span
+            v-else
+            :class="{
+              'text-success': row.status == 'succeed',
+              'text-error': row.status == 'failed',
+              'text-grey': row.status == 'pending',
+              'text-warning': row.status == 'waiting' || row.status == 'ignored' || row.status == 'aborted' || row.status == 'aborting' || row.status == 'waitInput' || row.status == 'paused' || row.status == 'invalid'
+            }"
           >
-            <span class="ml-xs tsfont-warning-o text-warn">{{ row.statusName }}</span>
-            <div slot="content">{{ row.errorMsg }}</div>
-          </Tooltip>
-          <span v-else>{{ row.statusName }}</span>
-        </span>
-      </template>
-      <template v-slot:action="{ row }">
-        <div class="tstable-action">
-          <ul class="tstable-action-ul">
-            <li>
-              <Tooltip
-                v-if="row.runnerHost"
-                :transfer="true"
-                placement="bottom-start"
-                trigger="hover"
-              >
-                <span class="action-item tsfont-adapter text-action">{{ $t('term.autoexec.actuatorinformation') }}</span>
-                <div slot="content">{{ row.runnerHost }}{{ row.runnerPort ? ':' + row.runnerPort : '' }}</div>
-              </Tooltip>
-            </li>
-            <template v-if="jobData.isCanExecute && row.isDelete != 1">
-              <li
-                v-for="(action, index) in statusActionMapping[row.status]"
-                :key="index"
-                :class="actionMap[action].icon"
-                @click.stop="actionMap[action].fn(row)"
-              >{{ actionMap[action].text }}</li>
-            </template>
-          </ul>
-        </div>
-      </template>
-    </TsTable>
+            <Tooltip
+              v-if="row.status == 'invalid'"
+              :transfer="true"
+              placement="bottom-start"
+              trigger="hover"
+              max-width="400"
+            >
+              <span class="ml-xs tsfont-warning-o text-warn">{{ row.statusName }}</span>
+              <div slot="content">{{ row.errorMsg }}</div>
+            </Tooltip>
+            <span v-else>{{ row.statusName }}</span>
+          </span>
+        </template>
+        <template v-slot:action="{ row }">
+          <div class="tstable-action">
+            <ul class="tstable-action-ul">
+              <li v-if="row.runnerHost && phaseData.execMode != 'sqlfile'">
+                <Tooltip
+                  :transfer="true"
+                  placement="bottom-start"
+                  trigger="hover"
+                >
+                  <span class="action-item tsfont-adapter text-action">{{ $t('term.autoexec.actuatorinformation') }}</span>
+                  <div slot="content">{{ row.runnerHost }}{{ row.runnerPort ? ':' + row.runnerPort : '' }}</div>
+                </Tooltip>
+              </li>
+              <template v-if="phaseData.status != 'running' && jobData.isCanExecute && row.isDelete != 1">
+                <li
+                  v-for="(action, index) in statusActionMapping[row.status]"
+                  :key="index"
+                  :class="actionMap[action].icon"
+                  @click.stop="actionMap[action].fn(row)"
+                >{{ actionMap[action].text }}</li>
+              </template>
+            </ul>
+          </div>
+        </template>
+      </TsTable>
+    </div>
     <!-- 节点详情弹出框 -->
     <NodeDialog
       v-if="isNodeDetailDialogShow"
@@ -349,12 +392,28 @@ export default {
           fn: _this.resetNode
         }
       },
-      nodeTitle: null
+      nodeTitle: null,
+      refreshTimes: 3, //完成后刷新次数
+      isFirst: true,
+      tableHeight: 150,
+      runnerTableConfig: {
+        theadList: [
+          { title: this.$t('page.name'), key: 'name' },
+          { title: this.$t('page.config'), key: 'ipPort' },
+          { title: this.$t('page.status'), key: 'status' },
+          { title: this.$t('term.autoexec.isfirenext'), key: 'isFireNext' },
+          { title: this.$t('page.updatetime'), key: 'lcd', type: 'time' }
+        ],
+        tbodyList: this.phaseData.runnerVos,
+        currentPage: 1,
+        pageSize: 20,
+        pageCount: 1
+      }
     };
   },
   beforeCreate() {},
   created() {
-    if (this.jobData.extraInfo && this.jobData.extraInfo.sourceType == 'deploy') {
+    if (this.jobData.extraInfo && this.jobData.extraInfo.sourceType == 'deploy' && this.phaseData.execMode != 'sqlfile') {
       // 添加发布版本字段
       this.theadList.splice(1, 0, {
         title: this.$t('page.versions'),
@@ -396,6 +455,9 @@ export default {
       this.searchNode(1);
     },
     ignoreNode(node) {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
       //如果node为空代表是批量模式，需要检查是否有选中数据
       if (!node && !this.selectedNodeList.length) {
         return;
@@ -411,6 +473,9 @@ export default {
       this.isIgnoreDialogShow = true;
     },
     resetNode(node) {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
       //如果node为空代表是批量模式，需要检查是否有选中数据
       if (!node && !this.selectedNodeList.length) {
         return;
@@ -427,6 +492,9 @@ export default {
       this.isResetDialogShow = true;
     },
     resetAllNode() {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
       this.actionParam = {};
       this.actionParam.jobId = this.jobData.id;
       this.actionParam.phaseId = this.phaseData.id;
@@ -492,7 +560,7 @@ export default {
         clearTimeout(this.timmer);
         this.timmer = null;
       }
-      if (nodeIdList && nodeIdList.length > 0) {
+      if (!this.$utils.isEmpty(nodeIdList) || this.refreshTimes > 0) {
         this.$api.autoexec.job
           .searchPhaseNode({
             nodeIdList: nodeIdList,
@@ -516,7 +584,10 @@ export default {
                   node['isDisabled'] = true;
                 }
               });
-              if (nodeIdList.length > 0) {
+              if (this.$utils.isEmpty(nodeIdList)) {
+                this.refreshTimes--;
+              }
+              if (nodeIdList.length > 0 || this.refreshTimes > 0) {
                 this.timmer = setTimeout(() => {
                   this.refreshNode(nodeIdList);
                 }, 3000);
@@ -538,6 +609,9 @@ export default {
       mutations.setSearchParam(this.searchParam);
       this.$api.autoexec.job.searchPhaseNode(this.searchParam).then(res => {
         this.nodeData = res.Return;
+        if (this.isFirst) {
+          this.getTableHeight();
+        }
         const nodeList = res.Return.tbodyList;
         if (nodeList && nodeList.length > 0) {
           const nodeIdList = [];
@@ -550,10 +624,11 @@ export default {
             });
           }
           if (nodeIdList.length > 0) {
-            this.timmer = setTimeout(() => {
-              this.refreshNode(nodeIdList);
-            }, 3000);
+            this.refreshTimes = 3;  
           }
+          this.timmer = setTimeout(() => {
+            this.refreshNode(nodeIdList);
+          }, 3000);
         }
         if (this.nodeData && this.nodeData.tbodyList && this.nodeData.tbodyList.length > 0) {
           // 节点被删除，复选框禁用
@@ -578,6 +653,19 @@ export default {
       this.nodeTitle = title || row.host + (row.port ? ':' + row.port : '');
       this.currentNodeId = row.id;
       this.isNodeDetailDialogShow = true;
+    },
+    getTableHeight() {
+      this.isFirst = false;
+      const windowHeight = document.documentElement.clientHeight - 36;
+      this.$nextTick(() => {
+        if (this.$refs.tableBox) {
+          let top = this.$refs.tableBox.getBoundingClientRect().top;
+          const tableHeight = windowHeight - top;
+          if (this.tableHeight < tableHeight) {
+            this.tableHeight = tableHeight;
+          }
+        }
+      });
     }
   },
   computed: {
@@ -593,6 +681,18 @@ export default {
         return roundCount;
       }
     },
+    parallelCount() {
+      let parallelCount = this.phaseData.parallelCount;
+      if (parallelCount == 0) {
+        return '全部串行';
+      } else if (parallelCount == 1) {
+        return '全部并行';
+      } else if (parallelCount == -1) {
+        return '蓝绿执行';
+      } else {
+        return parallelCount;
+      }
+    },
     currentNode() {
       if (this.currentNodeId && this.nodeData && this.nodeData.tbodyList && this.nodeData.tbodyList.length > 0) {
         return this.nodeData.tbodyList.find(d => d.id === this.currentNodeId);
@@ -625,7 +725,16 @@ export default {
       }
     }
   },
-  watch: {}
+  watch: {
+    phaseData: {
+      handler(val, oldval) {
+        if (val) {
+          this.$set(this.runnerTableConfig, 'tbodyList', val.runnerVos);
+        }
+      },
+      deep: true
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue
index f7c90f728f896ba71f74652763634e7c53201ec8..093f8faf66367beef24c6b7a2f2c9b788cfdf398 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue
@@ -11,12 +11,38 @@
       <TabPane
         v-if="phaseData.execMode != 'sqlfile'"
         :label="$t('term.autoexec.standardoutput')"
-        class="padding"
         :class="getTabDetailClass()"
         name="standardOutput"
       >
-        <div style="display:grid;grid-template-columns:228px auto">
-          <div style="overflow-y: auto;" :style="{ height: 'calc(100vh - ' + (mode === 'page' ? !$utils.isEmptyObj(jobData.extraInfo) ? '310px': '215px' : '190px') + ')' }">
+        <div v-if="phaseData.execMode === 'runner'" class="pl-nm pr-nm flex-between">
+          <div class="action-group line">
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-restart"
+              :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
+              @click="runnerAction('reset')"
+            >{{ $t('page.reset') }}</span>
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-minus-o"
+              :class="phaseData.status != 'failed' ? 'disable' : 'text-action'"
+              @click="runnerAction('ignore')"
+            >{{ $t('page.ignore') }}
+            </span>
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-run"
+              :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
+              @click="runnerAction('refire')"
+            >{{ $t('page.execute') }}
+            </span>
+          </div>
+          <div>
+            <span v-if="phaseData.jobGroupVo && phaseData.jobGroupVo.policy" class="text-tip">{{ $t('term.deploy.executivestrategy') }}：{{ phaseData.jobGroupVo.policy }} </span>
+          </div>
+        </div>
+        <div style="display:grid;grid-template-columns:228px auto" class="padding">
+          <div style="overflow-y: auto;" :style="{ height: 'calc(100vh - ' + (mode === 'page' ? (!$utils.isEmptyObj(jobData.extraInfo) ? '330px': '235px') : '190px') + ')' }">
             <div v-if="operationList && operationList.length">
               <div
                 v-for="(step, sindex) in operationList"
@@ -49,14 +75,14 @@
                     <div v-if="locationId === step.name.replace(/[-\.\/]+?/gi, '_') + '_' + step.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
                     <div style="white-space:nowrap" class="overflow">
                       <span class="stepIndex tips icon-right" :class="getStepIndexClass(step)" @click.stop></span>
-                      <span class="stepName name" :class="{ 'text-primary': step.status == 'running' }" :title="step.name">{{ getOperationName(step) }}</span>
+                      <OperationTooltips :operation="step"></OperationTooltips>
                     </div>
                     <div v-if="step.description" class="stepType overflow description-pl">
                       <span class="text-tip fz10 tips" :title="step.description">{{ step.description }}</span>
                     </div>
                   </div>
                   <div v-if="!$utils.isEmpty(step.ifList) || !$utils.isEmpty(step.elseList)" class="divide-line border-color"></div>
-                  <div v-if="!$utils.isEmpty(step.ifList)" class="padding-sm">
+                  <div class="padding-sm">
                     <div>
                       <div class="text-grey pb-xs">{{ $t('page.condition') }}</div>
                       <div class="overflow mb-sm" style="white-space: nowrap;" :title="step.condition">{{ step.condition }}</div>
@@ -84,7 +110,7 @@
                           <div v-if="locationId === item.name.replace(/[-\.\/]+?/gi, '_') + '_' + item.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
                           <div style="white-space:nowrap" class="overflow">
                             <span class="stepIndex tips icon-right" :class="getStepIndexClass(item)" @click.stop></span>
-                            <span class="stepName name" :class="{ 'text-primary': item.status == 'running' }" :title="item.name">{{ getOperationName(item) }}</span>
+                            <OperationTooltips :operation="item"></OperationTooltips>
                           </div>
                           <div v-if="item.description" class="stepType overflow description-pl">
                             <span class="text-tip fz10 tips" :title="item.description">{{ item.description }}</span>
@@ -115,7 +141,7 @@
                           <div v-if="locationId === item.name.replace(/[-\.\/]+?/gi, '_') + '_' + item.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
                           <div style="white-space:nowrap" class="overflow">
                             <span class="stepIndex tips icon-right" :class="getStepIndexClass(item)" @click.stop></span>
-                            <span class="stepName name" :class="{ 'text-primary': item.status == 'running' }" :title="item.name">{{ getOperationName(item) }}</span>
+                            <OperationTooltips :operation="item"></OperationTooltips>
                           </div>
                           <div v-if="item.description" class="stepType overflow description-pl">
                             <span class="text-tip fz10 tips" :title="item.description">{{ item.description }}</span>
@@ -133,7 +159,7 @@
                     <div v-if="locationId === step.name.replace(/[-\.\/]+?/gi, '_') + '_' + step.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
                     <div style="white-space:nowrap" class="overflow">
                       <span class="stepIndex tips icon-right" :class="getStepIndexClass(step)" @click.stop></span>
-                      <span class="stepName name" :class="{ 'text-primary': step.status == 'running' }" :title="step.name">{{ getOperationName(step) }}</span>
+                      <OperationTooltips :operation="step"></OperationTooltips>
                     </div>
                     <div v-if="step.description" class="stepType overflow description-pl">
                       <span class="text-tip fz10 tips" :title="step.description">{{ step.description }}</span>
@@ -168,7 +194,7 @@
                           <div v-if="locationId === item.name.replace(/[-\.\/]+?/gi, '_') + '_' + item.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
                           <div style="white-space:nowrap" class="overflow">
                             <span class="stepIndex tips icon-right" :class="getStepIndexClass(item)" @click.stop></span>
-                            <span class="stepName name" :class="{ 'text-primary': item.status == 'running' }" :title="item.name">{{ getOperationName(item) }}</span>
+                            <OperationTooltips :operation="item"></OperationTooltips>
                           </div>
                           <div v-if="item.description" class="stepType overflow description-pl">
                             <span class="text-tip fz10 tips" :title="item.description">{{ item.description }}</span>
@@ -186,7 +212,7 @@
                   <div v-if="locationId === step.name.replace(/[-\.\/]+?/gi, '_') + '_' + step.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
                   <div style="white-space:nowrap" class="overflow">
                     <span class="stepIndex tips icon-right" :class="getStepIndexClass(step)" @click.stop></span>
-                    <span class="stepName name" :class="{ 'text-primary': step.status == 'running' }" :title="step.name">{{ getOperationName(step) }}</span>
+                    <OperationTooltips :operation="step"></OperationTooltips>
                   </div>
                   <div v-if="step.description" class="stepType overflow description-pl">
                     <span class="text-tip fz10 tips" :title="step.description">{{ step.description }}</span>
@@ -209,6 +235,7 @@
               :mode="mode"
               :locationId="locationId"
               :isHasExtraInfo="!$utils.isEmptyObj(jobData.extraInfo)"
+              @refresh="runnerAction('refresh')"
             ></NodeLog>
           </div>
         </div>
@@ -248,7 +275,7 @@
       </TabPane>
       <TabPane
         :label="$t('page.inputparam')"
-        class="padding"
+        class="pl-nm pr-nm"
         :class="getTabDetailClass()"
         name="inputParameters"
         style="paddint-top:0px"
@@ -261,11 +288,14 @@
           :sqlName="nodeData.sqlFile"
           :jobId="jobData.id"
           :type="'input'"
+          :jobData="jobData"
+          :phaseData="phaseData"
+          @runnerAction="runnerAction"
         ></NodeParam>
       </TabPane>
       <TabPane
         :label="$t('page.outputparam')"
-        class="padding"
+        class="pl-nm pr-nm"
         :class="getTabDetailClass()"
         name="outputParameters"
         style="paddint-top:0px"
@@ -278,15 +308,39 @@
           :sqlName="nodeData.sqlFile"
           :jobId="jobData.id"
           :type="'output'"
+          :jobData="jobData"
+          :phaseData="phaseData"
+          @runnerAction="runnerAction"
         ></NodeParam>
       </TabPane>
       <TabPane
         :label="$t('term.autoexec.runrecord')"
-        class="padding"
         :class="getTabDetailClass()"
         name="record"
       >
-        <Record v-if="tabValue == 'record'" :nodeData="nodeData" :phaseData="phaseData"></Record>
+        <div v-if="phaseData.execMode === 'runner'" class="pl-nm">
+          <div v-if="jobData.isCanExecute" class="action-group line">
+            <span class="action-item tsfont-restart" :class="phaseData.status == 'running' ? 'disable' : 'text-action'" @click="runnerAction('reset')">{{ $t('page.reset') }}</span>
+            <span
+              class="action-item tsfont-minus-o"
+              :class="phaseData.status != 'failed' ? 'disable' : 'text-action'"
+              @click="runnerAction('ignore')"
+            >{{ $t('page.ignore') }}
+            </span>
+            <span
+              class="action-item tsfont-run"
+              :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
+              @click="runnerAction('refire')"
+            >{{ $t('page.execute') }}
+            </span>
+          </div>
+        </div>
+        <Record
+          v-if="tabValue == 'record'"
+          :nodeData="nodeData"
+          :phaseData="phaseData"
+          class="padding"
+        ></Record>
       </TabPane>
       <template v-if="customTemplateList.length">
         <TabPane
@@ -323,7 +377,8 @@ export default {
     NodeParam: () => import('./param.vue'),
     SqlContent: () => import('@/views/pages/autoexec/detail/logcomponents/sql-content.vue'), // 脚本内容
     ScriptContentDialog: () => import('@/views/pages/autoexec/detail/script-content-dialog.vue'),
-    CustomTemplateViewer: () => import('@/resources/components/customtemplate/customtemplate-viewer.vue')
+    CustomTemplateViewer: () => import('@/resources/components/customtemplate/customtemplate-viewer.vue'),
+    OperationTooltips: () => import('./operation-tooltips.vue')
   },
   filters: {},
   directives: {},
@@ -350,6 +405,7 @@ export default {
       customTemplateData: {},
       isCustomTemplateShow: true,
       customTemplateTimmer: null,
+      refreshTimes: 3, //刷新次数：终点状态后刷新，避免operationList数据不更新
       operationEndingStatusList: ['completed', 'aborted', 'failed'] //终点状态节点列表，非终点状态列表的需要定时刷新。
     };
   },
@@ -434,6 +490,12 @@ export default {
           let isRefresh = data.isRefresh;
           this.$set(this, 'operationList', data.operationStatusList);
           if (isRefresh === 1) {
+            this.refreshTimes = 3;
+            this.timmer = setTimeout(() => {
+              this.refreshOperationStatus();
+            }, 3000);
+          } else if (isRefresh === 0 && this.refreshTimes > 0) {
+            this.refreshTimes--;
             this.timmer = setTimeout(() => {
               this.refreshOperationStatus();
             }, 3000);
@@ -441,13 +503,6 @@ export default {
         });
       }
     },
-    getOperationName(step) {
-      if (step.name) {
-        return step.name;
-      } else {
-        return '-';
-      }
-    },
     getjobCustomTemplateListList() { //自定义模板列表
       this.$api.autoexec.job.getjobCustomTemplateListList({jobPhaseId: this.phaseData.id}).then(res => {
         if (res.Status == 'OK') {
@@ -498,6 +553,9 @@ export default {
       } else if (this.mode === 'dialog') {
         return 'tab-detail-dialog';
       }
+    },
+    runnerAction(type) {
+      this.$emit('runnerAction', type);
     }
   },
   computed: {
@@ -510,6 +568,10 @@ export default {
           arr.push('tsfont-play-o text-primary');
         } else if (step.status == 'failed') {
           arr.push('tsfont-close-o text-danger');
+        } else if (step.status == 'aborted') {
+          arr.push('tsfont-close-o text-warning');
+        } else if (step.status == 'ignored') {
+          arr.push('tsfont-check-o text-warning');
         } else {
           arr.push('tsfont-sla text-grey');
         }
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node/operation-tooltips.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node/operation-tooltips.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a471487b5d50900eb164331f263773e60ed687a6
--- /dev/null
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node/operation-tooltips.vue
@@ -0,0 +1,45 @@
+<template>
+  <Tooltip
+    placement="bottom"
+    max-width="500px"
+    theme="light"
+    transfer
+  >
+    <span class="stepName name" :class="{ 'text-primary': operation.status == 'running' }">{{ getOperationName(operation) }}</span>
+    <div slot="content" style="width:500px">
+      <TsRow :gutter="8">
+        <Col span="4" class="text-right">{{ $t('page.name') }}:</Col>
+        <Col span="20" class="text-left">{{ getOperationName(operation) }}</Col>
+      </TsRow>
+      <TsRow v-if="operation.version" :gutter="8">
+        <Col span="4" class="text-right">{{ $t('page.versions') }}:</Col>
+        <Col span="20" class="text-left">{{ operation.version }}</Col>
+      </TsRow>
+      <TsRow v-if="operation.title" :gutter="8">
+        <Col span="4" class="text-right">{{ $t('term.framework.versionremarks') }}:</Col>
+        <Col span="20" class="text-left">{{ operation.title }}</Col>
+      </TsRow>
+    </div>
+  </Tooltip>
+</template>
+
+<script>
+export default {
+  props: {
+    operation: { type: Object }
+  },
+  methods: {
+    getOperationName(step) {
+      if (step.name) {
+        return step.name;
+      } else {
+        return '-';
+      }
+    }
+  }
+};
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue
index e9a2e740a8bac3e7b517bac922158a13687f9937..eda9e3add9670ba9feef95b8095f89ae55f18a97 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue
@@ -1,12 +1,33 @@
 <template>
   <div>
-    <div>
-      <Button
+    <div class="action-group line">
+      <template v-if="phaseData && phaseData.execMode === 'runner'">
+        <span
+          v-if="jobData.isCanExecute"
+          class="action-item tsfont-restart"
+          :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
+          @click="runnerAction('reset')"
+        >{{ $t('page.reset') }}</span>
+        <span
+          v-if="jobData.isCanExecute"
+          class="action-item tsfont-minus-o"
+          :class="phaseData.status != 'failed' ? 'disable' : 'text-action'"
+          @click="runnerAction('ignore')"
+        >{{ $t('page.ignore') }}
+        </span>
+        <span
+          v-if="jobData.isCanExecute"
+          class="action-item tsfont-run"
+          :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
+          @click="runnerAction('refire')"
+        >{{ $t('page.execute') }}
+        </span>
+      </template>
+      <span
         v-if="!downLoading && paramList.length > 0"
         v-download="getDownurl()"
-        type="primary"
-        ghost
-      >{{ $t('term.autoexec.paramdownload') }}</Button>
+        class="action-item tsfont-download"
+      >{{ $t('term.autoexec.paramdownload') }}</span>
       <span v-if="downLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
         <Icon type="ios-loading" size="18" class="loading"></Icon>
         {{ $t('page.downloading') }}
@@ -97,7 +118,9 @@ export default {
     resourceId: [Number, String], //资源id
     sqlName: [String, String], //作业文件名
     jobId: [Number, String], // 作业id
-    type: [String, String] //输入|输出 参数
+    type: [String, String], //输入|输出 参数
+    phaseData: { type: Object },
+    jobData: { type: Object }
   },
   data() {
     let _this = this;
@@ -184,6 +207,9 @@ export default {
         isJson = false;
       }
       return isJson;
+    },
+    runnerAction(action) {
+      this.$emit('runnerAction', action);
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
index f51c6cc5775c8b454daf444cf1603ee0cc613ae7..3a8d900d539bb8924a1d438f59ed3cb2bd951828 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
@@ -6,21 +6,6 @@
           <span>{{ $t('page.warningmessage') }}</span>
           <span class="text-warning pl-icon">{{ phaseData.warnCount }}</span>
         </span>
-        <span class="action-item tsfont-restart" :class="phaseData.status == 'running' ? 'disable' : 'text-action'" @click="resetAllNode()">{{ $t('page.reset') }}</span>
-        <span
-          v-if="jobData.isCanExecute"
-          class="action-item tsfont-minus-o"
-          :class="phaseData.status != 'failed' ? 'disable' : 'text-action'"
-          @click="ignorePhase()"
-        >{{ $t('page.ignore') }}
-        </span>
-        <span
-          v-if="jobData.isCanExecute"
-          class="action-item tsfont-run"
-          :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
-          @click="refirePhase()"
-        >{{ $t('page.execute') }}
-        </span>
         <span class="action-item">
           <Poptip transfer placement="bottom">
             <span class="text-action">
@@ -35,6 +20,14 @@
                 <span class="text-title">{{ $t('page.config') }}</span>
                 <p class="text-default">{{ runnerData.port }}</p>
               </div>
+              <div>
+                <span v-if="runnerData.phaseRunnerGroupFrom" class="text-title">{{ $t('page.config') }}{{ $t('page.source') }}</span>
+                <p class="text-default">{{ runnerData.phaseRunnerGroupFrom }}</p>
+              </div>
+              <div>
+                <span class="text-title">{{ $t('page.status') }}</span>
+                <p class="text-default">{{ runnerData.status }}</p>
+              </div>
             </div>
           </Poptip>
         </span>
@@ -46,6 +39,7 @@
       :phaseData="phaseData"
       :runnerData="runnerData"
       :nodeData="nodeData"
+      @runnerAction="runnerAction"
     ></NodeDetail>
     <RefirePhaseDialog
       v-if="isRefireDialogShow"
@@ -136,6 +130,9 @@ export default {
       this.isIgnorePhseeDialogShow = false;
     },
     resetAllNode() {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
       this.isResetDialogShow = true;
     },
     getRunner() {
@@ -148,9 +145,11 @@ export default {
           this.runnerData = {};
           this.runnerData.name = res.Return.runnerVo.name;
           this.runnerData.port = res.Return.runnerVo.host + ':' + res.Return.runnerVo.port;
+          this.runnerData.phaseRunnerGroupFrom = res.Return.phaseRunnerGroupFrom;
+          this.runnerData.status = res.Return.runnerVo.status;
           this.nodeData.status = res.Return.status;
           this.nodeData.warnCount = res.Return.warnCount;
-          if (res.Return.status == 'pending' || res.Return.status == 'running') {
+          if (res.Return.status == 'pending' || res.Return.status == 'running' || res.Return.status == 'waitInput') {
             this.timmer = setTimeout(() => {
               this.getRunner();
             }, 3000);
@@ -171,6 +170,22 @@ export default {
         return false;
       }
       this.isIgnorePhseeDialogShow = true;
+    },
+    runnerAction(action) {
+      switch (action) {
+        case 'refire':
+          this.refirePhase();
+          break;
+        case 'reset':
+          this.resetAllNode();
+          break;
+        case 'ignore':
+          this.ignorePhase();
+          break;
+        case 'refresh':
+          this.$emit('refresh');
+          break;
+      }
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
index ab832a9a831ac89bcc68ba83dd957baf8c8dfb8d..0f172a07686019cdc2c839aab81eee66b73f9cc7 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
@@ -1,9 +1,45 @@
 
 <template>
-  <div class="content-main">
+  <div class="content-main sql-content">
+    <span class="action-item runner-show pl-nm pr-nm pt-nm text-right">
+      <Poptip transfer placement="bottom">
+        <span class="text-action">
+          <i class="tsfont-adapter pr-icon"></i><span>{{ $t('term.autoexec.actuatorinformation') }}</span>
+        </span>
+        <div slot="content">
+          <div>
+            <span class="text-title">{{ $t('page.name') }}</span>
+            <p class="text-default">{{ runnerData.name }}</p>
+          </div>
+          <div>
+            <span class="text-title">{{ $t('page.config') }}</span>
+            <p class="text-default">{{ runnerData.port }}</p>
+          </div>
+        </div>
+      </Poptip>
+    </span>
     <Tabs v-model="tabValue" class="tab-contain block-tabs2" :animated="false">
-      <TabPane :label="$t('term.autoexec.standardoutput')" class="padding" name="standardOutput">
-        <div style="display:grid;grid-template-columns:186px auto">
+      <TabPane :label="$t('term.autoexec.standardoutput')" name="standardOutput">
+        <div class="pl-nm pr-nm flex-between">
+          <div class="div-btn-contain action-group no-line">
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-restart"
+              :class="phaseData.status == 'running'?'disable':''"
+              @click="resetAllNode()"
+            >{{ $t('page.resetall') }}</span>
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-run"
+              :class="phaseData.status == 'running'?'disable':''"
+              @click="refirePhase()"
+            >{{ $t('page.executeall') }}</span>
+          </div>
+          <div>
+            <span v-if="phaseData.jobGroupVo && phaseData.jobGroupVo.policy" class="text-tip">{{ $t('term.deploy.executivestrategy') }}：{{ phaseData.jobGroupVo.policy }} </span>
+          </div>
+        </div>
+        <div style="display:grid;grid-template-columns:186px auto;" class="padding">
           <div>
             <div v-if="operationList && operationList.length">
               <div
@@ -46,10 +82,34 @@
           @refresh="refresh"
         ></SqlFileList>
       </TabPane>
-      <TabPane :label="$t('term.autoexec.runrecord')" class="padding" name="record">
-        <Record v-if="tabValue == 'record'" :nodeData="nodeData" :phaseData="phaseData"></Record>
+      <TabPane :label="$t('term.autoexec.runrecord')" name="record">
+        <div v-if="jobData.isCanExecute && phaseData" class="div-btn-contain action-group no-line pl-nm">
+          <span class="action-item tsfont-restart" :class="phaseData.status == 'running'?'disable':''" @click="resetAllNode()">{{ $t('page.resetall') }}</span>
+          <span class="action-item tsfont-run" :class="phaseData.status == 'running'?'disable':''" @click="refirePhase()">{{ $t('page.executeall') }}</span>
+        </div>
+        <Record
+          v-if="tabValue == 'record'"
+          :nodeData="nodeData"
+          :phaseData="phaseData"
+          class="padding"
+        ></Record>
       </TabPane>
     </Tabs>
+    <ResetDialog
+      v-if="actionParam && isResetDialogShow"
+      :jobId="actionParam.jobId"
+      :phaseId="actionParam.phaseId"
+      :nodeList="actionParam.nodeList"
+      :isAll="actionParam.isAll"
+      @close="closeResetDialog"
+    ></ResetDialog>
+    <RefirePhaseDialog
+      v-if="isRefireDialogShow"
+      :phaseId="phaseData.id"
+      :phaseName="phaseData.name"
+      :execMode="phaseData.execMode"
+      @close="closeRefireDialog"
+    ></RefirePhaseDialog>
   </div>
 </template>
 <script>
@@ -58,7 +118,9 @@ export default {
   components: {
     SqlLog: () => import('@/views/pages/autoexec/detail/logcomponents/sql-log.vue'),
     Record: () => import('./node/record.vue'),
-    SqlFileList: () => import('./sqlfile-list.vue')
+    SqlFileList: () => import('./sqlfile-list.vue'),
+    ResetDialog: () => import('../reset-dialog.vue'),
+    RefirePhaseDialog: () => import('../refire-phase-dialog.vue')
   },
   filters: {},
   directives: {},
@@ -73,14 +135,16 @@ export default {
       isRefireDialogShow: false,
       interact: null, //配置waitinput对应的值
       timmer: null,
-      runnerData: null,
+      runnerData: {},
       nodeData: {},
-      locationId: null //日志定位行id
+      locationId: null, //日志定位行id
+      isResetDialogShow: false,
+      actionParam: {}
     };
   },
   beforeCreate() {},
-  created() {
-    this.getRunner();
+  async created() {
+    await this.getRunner();
     this.getOperationList();
   },
   beforeMount() {},
@@ -124,12 +188,12 @@ export default {
         }
       });
     },
-    getRunner() {
+    async getRunner() {
       let params = {
         jobId: this.jobData.id,
         jobPhaseId: this.phaseData.id
       };
-      this.$api.autoexec.job.getRunnerByPhase(params).then(res => {
+      await this.$api.autoexec.job.getRunnerByPhase(params).then(res => {
         if (res.Return.runnerVo) {
           this.runnerData = {};
           this.runnerData.name = res.Return.runnerVo.name;
@@ -141,6 +205,34 @@ export default {
     },
     refresh() {
       this.$emit('refresh');
+    },
+    resetAllNode() {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
+      this.actionParam = {};
+      this.actionParam.jobId = this.jobData.id;
+      this.actionParam.phaseId = this.phaseData.id;
+      this.actionParam.isAll = 1;
+      this.isResetDialogShow = true;
+    },
+    closeResetDialog(needRefresh) {
+      this.isResetDialogShow = false;
+      if (needRefresh) {
+        this.refresh();
+      }
+    },
+    refirePhase() {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
+      this.isRefireDialogShow = true;
+    },
+    closeRefireDialog(needRefresh) {
+      this.isRefireDialogShow = false;
+      if (needRefresh) {
+        this.refresh();
+      }
     }
   },
   computed: {
@@ -181,4 +273,14 @@ export default {
   border-width: 1px;
   border-style: solid;
 }
+.sql-content {
+  position: relative;
+  padding-top: 4px;
+}
+.runner-show{
+  z-index: 1;
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 </style>
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-list.vue b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-list.vue
index 17941538fb21265b944eec443fadd793b94dddd2..9d6e99646b7f44b636ec99da98c73aaf6e3f5301 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-list.vue
@@ -26,6 +26,10 @@ export default {
           title: this.$t('page.status'),
           key: 'statusVo'
         },
+        {
+          title: this.$t('term.deploy.ismodified'),
+          key: 'isModified'
+        },
         {
           title: this.$t('page.startstoptime'),
           width: 300,
@@ -34,6 +38,10 @@ export default {
         {
           title: this.$t('page.timecost'),
           key: 'costTime'
+        },
+        {
+          title: '',
+          key: 'action'
         }
       ]
     };
@@ -99,6 +107,9 @@ export default {
       }
       this.$api.autoexec.job.getSqlListByPhase(this.searchParam).then(res => {
         this.nodeData = res.Return;
+        if (this.isFirst) {
+          this.getTableHeight();
+        }
         const nodeList = res.Return.tbodyList;
         if (nodeList && nodeList.length > 0) {
           const nodeIdList = [];
diff --git a/src/views/pages/autoexec/detail/logcomponents/node-log.vue b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
index efd34d277b76d394003dfb01b44cad591f509962..e8c776aa671d1cf6639df7d60ecb3fb43dab1836 100644
--- a/src/views/pages/autoexec/detail/logcomponents/node-log.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
@@ -15,7 +15,7 @@
           v-for="(log, index) in logContentList"
           :id="'content' + index"
           :key="index"
-          :class="log.anchor && log.anchor.replace(/[-\.\/]+?/gi, '_')"
+          :class="log.anchor && ('content_'+ log.anchor).replace(/[-\.\/]+?/gi, '_')"
           class="content-grid"
         >
           <div class="text-grey">{{ log.time }}</div>
@@ -99,7 +99,8 @@ export default {
       timmer: null,
       isAutoScroll: true, //自动滚动日志
       encodeList: [], //编码列表
-      encoding: 'UTF-8'
+      encoding: 'UTF-8',
+      refreshTimes: 3 //刷新次数：终点状态后刷新，避免日志内容不一致
     };
   },
   beforeCreate() {},
@@ -125,6 +126,7 @@ export default {
   methods: {
     afterInteract() {
       this.getContent('down', this.endPos);
+      this.$emit('refresh');
     },
     onMousewheel(event) {
       this.isAutoScroll = false;
@@ -185,23 +187,35 @@ export default {
           .then(res => {
             this.logData = res.Return;
             const isRefresh = res.Return.isRefresh;
+            const lineList = res.Return.lineList || [];
             this.startPos = Math.min(this.logData.startPos, this.startPos);
             this.endPos = Math.max(this.logData.endPos, this.endPos);
+       
             if (param.direction == 'down') {
-              for (let i = 0; i < res.Return.lineList.length; i++) {
-                this.logContentList.push(res.Return.lineList[i]);
+              if (!this.$utils.isEmpty(lineList)) {
+                for (let i = 0; i < lineList.length; i++) {
+                  this.logContentList.push(lineList[i]);
+                }
               }
             } else {
               //记录第一行原来的位置，更新内容后重新定位到这个地方
-              firstIndex = res.Return.lineList.length;
-              for (let i = res.Return.lineList.length - 1; i >= 0; i--) {
-                this.logContentList.unshift(res.Return.lineList[i]);
+              firstIndex = lineList.length;
+              if (!this.$utils.isEmpty(lineList)) {
+                for (let i = lineList.length - 1; i >= 0; i--) {
+                  this.logContentList.unshift(lineList[i]);
+                }
               }
             }
             if (isRefresh == 1) {
+              this.refreshTimes = 3;
               this.timmer = setTimeout(() => {
                 this.getContent('down', this.endPos);
-              }, this.calcIntervalTime(res.Return.lineList.length));
+              }, this.calcIntervalTime(lineList.length));
+            } else if (isRefresh == 0 && this.refreshTimes > 0) {
+              this.refreshTimes--;
+              this.timmer = setTimeout(() => {
+                this.getContent('down', this.endPos);
+              }, 2000);
             }
           })
           .finally(() => {
@@ -260,7 +274,7 @@ export default {
   },
   computed: {
     offsetHeight() {
-      return this.mode == 'page' ? this.isHasExtraInfo ? '310px' : '215px' : '190px';
+      return this.mode == 'page' ? (this.isHasExtraInfo ? '330px' : '235px') : '190px';
     },
     getContentClass() {
       return type => {
@@ -301,7 +315,10 @@ export default {
     locationId: {
       handler: function(val) {
         if (val) {
-          this.$utils.jumpTo('.' + val, 'smooth', this.$refs['codeContent'], 'start');
+          this.$utils.jumpTo('.content_' + val, 'smooth', this.$refs['codeContent'], 'start');
+          this.isAutoScroll = false;
+        } else {
+          this.isAutoScroll = true;
         }
       }
     }
diff --git a/src/views/pages/autoexec/detail/logcomponents/sql-log.vue b/src/views/pages/autoexec/detail/logcomponents/sql-log.vue
index 001db9edc2a616f324a4ee218eaa286f5b8b5e9d..10da762e27a3532ece8c9ae5bf2361efe66dfa4f 100644
--- a/src/views/pages/autoexec/detail/logcomponents/sql-log.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/sql-log.vue
@@ -70,6 +70,9 @@ export default {
             const isRefresh = res.Return.isRefresh;
             this.startPos = Math.min(this.logData.startPos, this.startPos);
             this.endPos = Math.max(this.logData.endPos, this.endPos);
+            if (!res.Return.lineList) {
+              return;
+            }
             if (param.direction == 'down') {
               for (let i = 0; i < res.Return.lineList.length; i++) {
                 this.logContentList.push(res.Return.lineList[i]);
@@ -126,7 +129,7 @@ export default {
       };
     },
     offsetHeight() {
-      return this.mode == 'page' ? this.isHasExtraInfo ? '310px' : '215px' : '180px';
+      return this.mode == 'page' ? this.isHasExtraInfo ? '330px' : '215px' : '180px';
     }
   },
   watch: {
diff --git a/src/views/pages/autoexec/detail/logcomponents/waitinput.vue b/src/views/pages/autoexec/detail/logcomponents/waitinput.vue
index ceaa119153aa653974ab4be75cfb2cadd178d5ed..e457b3ed7b3b1efed206ef30c0a8ef1ade4ecd36 100644
--- a/src/views/pages/autoexec/detail/logcomponents/waitinput.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/waitinput.vue
@@ -1,7 +1,7 @@
 
 <template>
   <div class="mt-sm">
-    <div v-if="!interactData.role || $AuthUtils.hasRole(interactData.role)">
+    <div v-if="(!interactData.role&& jobData.isCanExecute) || (interactData.role && $AuthUtils.hasRole(interactData.role))">
       <Divider orientation="left">{{ interactData.message }}</Divider>
       <template v-if="interactData.opType == 'button'">
         <div v-if="interactData.options && interactData.options.length > 0" class="action-group">
diff --git a/src/views/pages/autoexec/detail/runner-detail.vue b/src/views/pages/autoexec/detail/runner-detail.vue
index d98ded58056b289456b17e9eb46f3c311d1ec99b..3244dfe718aba4ed5b31cb2df311a7b5484ef368 100644
--- a/src/views/pages/autoexec/detail/runner-detail.vue
+++ b/src/views/pages/autoexec/detail/runner-detail.vue
@@ -56,8 +56,36 @@
           </div>
         </div>
         <div v-if="dataConfig.needRoundCount" class="box-block">
-          <Divider orientation="start">{{ $t('term.autoexec.batchsetting') }}</Divider>
+          <Divider orientation="start">{{ $t('page.autoexecparallel') }}</Divider>
           <div>
+            <TsFormItem
+              :label="$t('page.autoexecparallpolicy')"
+              :labelWidth="100"
+              labelPosition="left"
+              :required="true"
+            >
+              <TsFormRadio
+                v-model="parallelPolicy"
+                :dataList="parallelPolicyDataList"
+                @on-change="changeParallelPolicy"
+              ></TsFormRadio>
+            </TsFormItem>
+          </div>
+          <div v-if="parallelPolicy !== 'roundCount'">
+            <TsFormItem
+              :label="$t('term.autoexec.parall')"
+              :labelWidth="100"
+              labelPosition="left"
+              :required="true"
+            >
+              <TsFormSelect
+                ref="parallelForm"
+                v-model="parallelCount"
+                v-bind="parallelForm"
+              ></TsFormSelect>
+            </TsFormItem>
+          </div>
+          <div v-else>
             <TsFormItem
               :label="$t('term.autoexec.batchquantity')"
               :labelWidth="100"
@@ -367,7 +395,19 @@ export default {
       selectStepList: [], //根据场景选择的阶段
       isShowStepList: false, //展示流水线
       showScenarioExecute: true, //切换场景是是否需要执行目标(阶段全是'runner'或者'sqlfile'不需要执行目标)
-      roundCount: 2,
+      roundCount: 32,
+      parallelCount: 64,
+      parallelForm: {
+        dataList: this.$utils.getRoundCountList(),
+        placeholder: this.$t('page.selectinput'),
+        border: 'border',
+        filterName: 'text',
+        // allowCreate: true, //与发布分批数设置保持一致
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.paralldesc'),
+        validateList: ['required', 'maxNum']
+      },
       roundCountForm: {
         dataList: this.$utils.getRoundCountList(),
         placeholder: this.$t('page.selectinput'),
@@ -376,7 +416,7 @@ export default {
         // allowCreate: true, //与发布分批数设置保持一致
         search: true,
         transfer: true,
-        desc: this.$t('term.autoexec.roundcountdescrition'),
+        desc: this.$t('term.autoexec.batchcountdisabledesc'),
         validateList: ['required', 'maxNum']
       },
       paramValue: {},
@@ -385,7 +425,18 @@ export default {
       jobConfig: {},
       filterSearchValue: {},
       configExpired: 0,
-      configExpiredReason: {}
+      configExpiredReason: {},
+      parallelPolicyDataList: [
+        {
+          text: this.$t('page.autoexecparall'),
+          value: 'parallel'
+        },
+        {
+          text: this.$t('page.autoexecbatchround'),
+          value: 'roundCount'
+        }
+      ],
+      parallelPolicy: 'parallel'
     };
   },
   beforeCreate() {},
@@ -472,12 +523,10 @@ export default {
             if (this.jobId) {
               this.setJobParams(this.jobConfig);
             } else {
-              if (!this.$utils.isEmpty(this.executeConfig.roundCount)) {
-                this.roundCount = this.executeConfig.roundCount;
-                //组合工具设置了分批数，创建作业时支持修改
-                // this.$set(this.roundCountForm, 'disabled', true);
-                // this.$set(this.roundCountForm, 'disabledHoverTitle', this.$t('term.autoexec.setbantchnumbernoupdate'));
-              }
+              this.roundCount = this.executeConfig.roundCount || 64;
+              this.parallelCount = this.executeConfig.parallelCount || 32;
+              this.parallelPolicy = this.executeConfig.parallelPolicy || 'parallel';
+              
               if (this.executeConfig.whenToSpecify == 'runtime') {
                 this.$set(this.executeConfig, 'executeNodeConfig', {});
               }
@@ -540,6 +589,7 @@ export default {
       isValid = this.$refs.executeForm ? this.$refs.executeForm.valid() && isValid : isValid;
       isValid = this.$refs.nameForm ? this.$refs.nameForm.valid() && isValid : isValid;
       isValid = this.$refs.roundCountForm ? this.$refs.roundCountForm.valid() && isValid : isValid;
+      isValid = this.$refs.parallelForm ? this.$refs.parallelForm.valid() && isValid : isValid;
       isValid = this.$refs.runnerGroup ? this.$refs.runnerGroup.valid() && isValid : isValid;
       return isValid;
     },
@@ -640,7 +690,14 @@ export default {
         this.$set(data, 'scenarioId', this.scenarioId);
       }
       if (this.dataConfig && this.dataConfig.needRoundCount) { //是否需要设置分批数量
-        this.$set(data, 'roundCount', this.roundCount);
+        this.$set(data, 'parallelPolicy', this.parallelPolicy || 'parallel');
+        if (this.parallelPolicy == 'parallel') {
+          this.$set(data, 'parallelCount', this.parallelCount || 32);
+          this.$set(data, 'roundCount', null);
+        } else {
+          this.$set(data, 'parallelCount', null);
+          this.$set(data, 'roundCount', this.roundCount || 64);
+        }
       }
       if (this.$refs.param) {
         this.$set(data, 'param', this.$refs.param.getValue());
@@ -677,11 +734,13 @@ export default {
     },
     setJobParams(obj) {
       let config = this.$utils.deepClone(obj);
-      let {name = '', param = {}, roundCount = 2, scenarioId = null, executeConfig = {}, runnerGroupTag = null, runnerGroup = null} = config || {};
+      let {name = '', param = {}, roundCount = 64, parallelCount = 32, parallelPolicy = 'parallel', scenarioId = null, executeConfig = {}, runnerGroupTag = null, runnerGroup = null} = config || {};
       this.nameForm.itemList.name.value = name;
       this.paramValue = param;
       this.scenarioId = scenarioId;
       this.roundCount = roundCount;
+      this.parallelCount = parallelCount;
+      this.parallelPolicy = parallelPolicy;
       this.executeConfig = executeConfig;
       this.runnerGroupTag = runnerGroupTag || {
         mappingMode: 'constant',
@@ -707,6 +766,13 @@ export default {
           this.getAction();
         }
       });
+    },
+    changeParallelPolicy(val) {
+      if (val && val == 'roundCount') {
+        this.roundCount = this.roundCount || 64;
+      } else {
+        this.parallelCount = this.parallelCount || 32;
+      }
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/detail/script-detail.vue b/src/views/pages/autoexec/detail/script-detail.vue
index 99cdeb7d637a3c865b6eefc82fafa0eaec1e53c4..e633d28afcd4e4a801732e44544a470c1622010d 100644
--- a/src/views/pages/autoexec/detail/script-detail.vue
+++ b/src/views/pages/autoexec/detail/script-detail.vue
@@ -220,7 +220,7 @@ export default {
       formConfig: {
         version: {
           type: 'text',
-          label: this.$t('term.framework.pkgversion'),
+          label: this.$t('term.framework.versionremarks'),
           maxlength: 50,
           validateList: ['required']
         }
@@ -287,7 +287,7 @@ export default {
             this.versionId = versionId;
             this.versionOperateList = operateList;
             this.versionType = status;
-
+            this.versionStatus = status;
             //isLib（是否库文件）标识为1时，标识该脚本是库文件，不支持使用测试功能，需要隐藏测试按钮
             this.updateIsLib(isLib);
             this.getDefaultConfig();
@@ -332,7 +332,7 @@ export default {
         return false;
       }
       let data = this.saveData();
-      if (this.$utils.isSame(this.initData, data)) {
+      if (this.$utils.isSame(this.initData, data) || this.versionStatus === 'passed') {
         this.$router.push({
           path: '/test-detail',
           query: {
@@ -385,7 +385,7 @@ export default {
     save() {
       //编辑保存
       this.typeDialog = 'save';
-      this.$set(this.versionFormData, 'version', this.name + '_' + this.$utils.getCurrenttime('MMdd'));
+      this.$set(this.versionFormData, 'version', this.title);
       this.isShowVersionDialog = true;
     },
     async handleSave(item, isLeave) {
@@ -417,7 +417,7 @@ export default {
     },
     submit() {
       this.typeDialog = 'submit';
-      this.$set(this.versionFormData, 'version', this.name + '_' + this.$utils.getCurrenttime('MMdd'));
+      this.$set(this.versionFormData, 'version', this.title);
       this.isShowVersionDialog = true;
     },
     async submitData(item) {
diff --git a/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue b/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue
index f65bb8970d2b389257988cb40b2311f9e37f26f9..4e89a2bbb3940b0bd9e0608621b55b1c0cae11ac 100644
--- a/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue
+++ b/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue
@@ -23,6 +23,7 @@
                 <CommonStatus v-if="currentVersion.statusVo" :statusValue="currentVersion.statusVo.value" :statusName="currentVersion.statusVo.text"></CommonStatus>
               </div>
             </div>
+            <div v-if="currentVersion.title" class="title">{{ currentVersion.title }}</div>
             <div class="text-tip fz10">
               <span class="user overflow">
                 <UserCard v-bind="currentVersion.lcuVo" hideAvatar></UserCard>
@@ -76,6 +77,7 @@
                 <div class="version-content-top">
                   <div>{{ $t('page.versions') }}{{ row.version }}</div>
                 </div>
+                <div v-if="row.title" class="title">{{ row.title }}</div>
                 <div class="text-tip fz10">
                   <span class="user overflow">
                     <UserCard v-bind="row.lcuVo" hideAvatar></UserCard>
diff --git a/src/views/pages/autoexec/detail/test-detail.vue b/src/views/pages/autoexec/detail/test-detail.vue
index fd8cc10676b47bcc199bdcf58f6650e5d4209905..f65bd4b2b8fe4dea733baa8387735b8b7078be22 100644
--- a/src/views/pages/autoexec/detail/test-detail.vue
+++ b/src/views/pages/autoexec/detail/test-detail.vue
@@ -155,7 +155,8 @@ export default {
       runnerGroup: {
         mappingMode: 'constant',
         value: '-1'
-      }
+      },
+      scriptId: null
     };
   },
   beforeCreate() {},
@@ -164,6 +165,9 @@ export default {
       if (this.$route.query.id) {
         this.id = parseInt(this.$route.query.id);
       }
+      if (this.$route.query.scriptId) {
+        this.scriptId = parseInt(this.$route.query.scriptId);
+      }
       if (this.$route.query.type) {
         this.type = this.$route.query.type;
       }
@@ -194,24 +198,37 @@ export default {
     },
     getData() {
       //根据id获取详情
-      if (!this.id) {
+      if (!this.id && !this.scriptId) {
         return;
       }
-      let param = { id: this.id, type: this.type};
+      let param = { type: this.type };
+      if (this.id) {
+        param.id = this.id;
+      } else if (this.scriptId) {
+        param.scriptId = this.scriptId;
+      }
       this.$api.autoexec.script.getTestDetail(param).then(res => {
         if (res.Status == 'OK' && res.Return) {
           this.dataConfig = res.Return;
           if (!this.jobId) {
             this.nameForm.itemList.name.value = this.dataConfig.name;
           }
+          if (!this.id) {
+            this.id = this.dataConfig.id;
+          }
         }
       });
     },
     getArgument() {
-      if (!this.id) {
+      if (!this.id && !this.scriptId) {
         return;
       }
-      let param = { id: this.id, type: this.type};
+      let param = { type: this.type };
+      if (this.id) {
+        param.id = this.id;
+      } else if (this.scriptId) {
+        param.scriptId = this.scriptId;
+      }
       this.$api.autoexec.script.getArgument(param).then(res => {
         if (res.Status == 'OK' && res.Return) {
           this.argumentConfig = res.Return || {};
diff --git a/src/views/pages/autoexec/manage/action/single-upload-dialog.vue b/src/views/pages/autoexec/manage/action/single-upload-dialog.vue
index cbb258b893fb528b34beab4794ff727cdb61e425..88cb7a95d6d69b072e206d90f4da10f17809b567 100644
--- a/src/views/pages/autoexec/manage/action/single-upload-dialog.vue
+++ b/src/views/pages/autoexec/manage/action/single-upload-dialog.vue
@@ -162,7 +162,7 @@ export default {
       if ((file.Status = 'ERROR')) {
         this.$Notice.error({
           title: this.$t('message.importfailed'),
-          desc: response.Message
+          desc: response?.Message
         });
       }
     },
diff --git a/src/views/pages/autoexec/manage/script-manage.vue b/src/views/pages/autoexec/manage/script-manage.vue
index a01f343df8ec9544cd437f05efd5f0abd1ca108f..0263f5f7bfabe932377f6b1bf116e516ebe1b66d 100644
--- a/src/views/pages/autoexec/manage/script-manage.vue
+++ b/src/views/pages/autoexec/manage/script-manage.vue
@@ -261,7 +261,8 @@ export default {
         'generateToCombop': 'tsfont-tool',
         'copy': 'tsfont-copy',
         'export': 'tsfont-download',
-        'delete': 'tsfont-trash-o'
+        'delete': 'tsfont-trash-o',
+        'test': 'tsfont-test'
       },
       showEdit: false,
       editId: null,
@@ -494,8 +495,21 @@ export default {
         this.exportRow(row);
       } else if (type == 'delete') {
         this.deleteRow(item, row);
+      } else if (type == 'test') {
+        this.testRow(row);
       }
     },
+    testRow(row) {
+      //跳转到测试页面
+      this.$router.push({
+        path: '/test-detail',
+        query: {
+          scriptId: row.id,
+          type: 'script',
+          execMode: row.execMode
+        }
+      });
+    },
     close(isRefresh) {
       this.editId = null;
       this.showEdit = false;
diff --git a/src/views/pages/autoexec/manage/time-job-list.vue b/src/views/pages/autoexec/manage/time-job-list.vue
index 8629d9c3263635da1bb9348a32bd2220abdba643..3a4035da01755786e0058e42ddcd27beeeb41796 100644
--- a/src/views/pages/autoexec/manage/time-job-list.vue
+++ b/src/views/pages/autoexec/manage/time-job-list.vue
@@ -32,6 +32,10 @@
           <template slot="isActive" slot-scope="{ row }">
             <span>{{ getActiveName(row.isActive) }}</span>
           </template>
+          <template slot="isLoad" slot-scope="{ row }">
+            <span v-if="row.jobStatus && row.jobStatus.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
           <template slot="cron" slot-scope="{ row }">
             <div>
               <TsQuartz :value="row.cron" showType="read"></TsQuartz>
@@ -166,6 +170,7 @@ export default {
           // 选中列表表头字段
           { key: 'name', title: _this.$t('page.name') }, // 名称
           { key: 'isActive', title: _this.$t('page.status') }, // 状态
+          { 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') }, // 执行次数
diff --git a/src/views/pages/autoexec/quick-service/catalog/service.vue b/src/views/pages/autoexec/quick-service/catalog/service.vue
index 66aca1c376d3d63096454fa6dab5e4a1d5b07d7d..60348149ab1ceb3f989c5b51bb07088b26af36fe 100644
--- a/src/views/pages/autoexec/quick-service/catalog/service.vue
+++ b/src/views/pages/autoexec/quick-service/catalog/service.vue
@@ -51,45 +51,103 @@
         <span>{{ $t('term.autoexec.batchsetting') }}</span>
         <span class="tsfont-down cursor" :class="unfoldAndFold.roundCountForm ? 'tsfont-down' : 'tsfont-up'" @click.stop="handleUnfoldAndFold('roundCountForm')"></span>
       </div>
-      <TsFormItem v-show="unfoldAndFold.roundCountForm" :label="$t('term.autoexec.batchquantity')" :required="hasRequired(roundCount.mappingMode)">
-        <div id="positioningkey_roundCount" :class="roundCount.mappingMode == 'formattr' || roundCount.mappingMode == 'constant' ? 'form-wrap-box' : ''">
-          <TsFormSelect
-            ref="roundCountmappingMode"
-            v-model="roundCount.mappingMode"
-            :dataList="mappingModeDataList"
-            :disabled="roundCountForm.disabled ? true : false"
-            :clearable="false"
-            :width="roundCount.mappingMode == 'formattr' || roundCount.mappingMode == 'constant' ? 100 : '100%'"
-            transfer
-            border="border"
-            :class="roundCount.mappingMode == 'formattr' || roundCount.mappingMode == 'constant' ? 'pr-sm' : ''"
-            :validateList="['required']"
-            @change="mappingMode => changeMappingMode(mappingMode, 'roundCount')"
-          ></TsFormSelect>
-          <TsFormSelect
-            v-if="roundCount.mappingMode == 'formattr'"
-            ref="roundCountmappingMode"
-            v-model="roundCount.value"
-            :dataList="formDataList"
-            :disabled="roundCountForm.disabled ? true : false"
-            valueName="uuid"
-            textName="label"
-            transfer
-            border="border"
-            class="pr-sm form-li-width"
-            :validateList="['required']"
-          ></TsFormSelect>
-          <TsFormSelect
-            v-else-if="roundCount.mappingMode == 'constant'"
-            ref="roundCountForm"
-            v-model="roundCount.value"
-            class="form-li-width"
-            v-bind="roundCountForm"
-            :validateList="hasRequired(roundCount.mappingMode) ? ['required'] : []"
-            transfer
-          ></TsFormSelect>
-        </div>
+      <TsFormItem
+        v-show="unfoldAndFold.roundCountForm"
+        :label="$t('page.autoexecparallpolicy')"
+        :required="true"
+      >
+        <TsFormRadio
+          ref="parallelPolicy"
+          v-model="parallelPolicy.value"
+          v-bind="parallelPolicyForm"
+          :validateList="['required']"
+          @on-change="(val)=>{
+            changeParallelPolicy(val);
+          }"
+        ></TsFormRadio>
       </TsFormItem>
+      <template v-if="parallelPolicy.value ==='roundCount'">
+        <TsFormItem v-show="unfoldAndFold.roundCountForm" :label="$t('term.autoexec.batchquantity')" :required="hasRequired(roundCount.mappingMode)">
+          <div id="positioningkey_roundCount" :class="roundCount.mappingMode == 'formattr' || roundCount.mappingMode == 'constant' ? 'form-wrap-box' : ''">
+            <TsFormSelect
+              ref="roundCountmappingMode"
+              v-model="roundCount.mappingMode"
+              :dataList="mappingModeDataList"
+              :disabled="roundCountForm.disabled ? true : false"
+              :clearable="false"
+              :width="roundCount.mappingMode == 'formattr' || roundCount.mappingMode == 'constant' ? 100 : '100%'"
+              transfer
+              border="border"
+              :class="roundCount.mappingMode == 'formattr' || roundCount.mappingMode == 'constant' ? 'pr-sm' : ''"
+              :validateList="['required']"
+              @change="mappingMode => changeMappingMode(mappingMode, 'roundCount')"
+            ></TsFormSelect>
+            <TsFormSelect
+              v-if="roundCount.mappingMode == 'formattr'"
+              ref="roundCountmappingMode"
+              v-model="roundCount.value"
+              :dataList="formDataList"
+              :disabled="roundCountForm.disabled ? true : false"
+              valueName="uuid"
+              textName="label"
+              transfer
+              border="border"
+              class="pr-sm form-li-width"
+              :validateList="['required']"
+            ></TsFormSelect>
+            <TsFormSelect
+              v-else-if="roundCount.mappingMode == 'constant'"
+              ref="roundCountForm"
+              v-model="roundCount.value"
+              class="form-li-width"
+              v-bind="roundCountForm"
+              :validateList="hasRequired(roundCount.mappingMode) ? ['required'] : []"
+              transfer
+            ></TsFormSelect>
+          </div>
+        </TsFormItem>
+      </template>
+      <template v-else-if="parallelPolicy.value ==='parallel'">
+        <TsFormItem v-show="unfoldAndFold.roundCountForm" :label="$t('term.autoexec.parall')" :required="hasRequired(parallelCount.mappingMode)">
+          <div id="positioningkey_parallelCount" :class="parallelCount.mappingMode == 'formattr' || parallelCount.mappingMode == 'constant' ? 'form-wrap-box' : ''">
+            <TsFormSelect
+              ref="parallelCountmappingMode"
+              v-model="parallelCount.mappingMode"
+              :dataList="mappingModeDataList"
+              :disabled="parallelCountForm.disabled ? true : false"
+              :clearable="false"
+              :width="parallelCount.mappingMode == 'formattr' || parallelCount.mappingMode == 'constant' ? 100 : '100%'"
+              transfer
+              border="border"
+              :class="parallelCount.mappingMode == 'formattr' || parallelCount.mappingMode == 'constant' ? 'pr-sm' : ''"
+              :validateList="['required']"
+              @change="mappingMode => changeMappingMode(mappingMode, 'parallelCount')"
+            ></TsFormSelect>
+            <TsFormSelect
+              v-if="parallelCount.mappingMode == 'formattr'"
+              ref="parallelCountmappingMode"
+              v-model="parallelCount.value"
+              :dataList="formDataList"
+              :disabled="parallelCountForm.disabled ? true : false"
+              valueName="uuid"
+              textName="label"
+              transfer
+              border="border"
+              class="pr-sm form-li-width"
+              :validateList="['required']"
+            ></TsFormSelect>
+            <TsFormSelect
+              v-else-if="parallelCount.mappingMode == 'constant'"
+              ref="parallelCountForm"
+              v-model="parallelCount.value"
+              class="form-li-width"
+              v-bind="parallelCountForm"
+              :validateList="hasRequired(parallelCount.mappingMode) ? ['required'] : []"
+              transfer
+            ></TsFormSelect>
+          </div>
+        </TsFormItem>
+      </template>
     </div>
     <div v-if="hasCombopId" class="radius-lg bg-op padding mt-nm">
       <div class="flex-between" :class="unfoldAndFold.runnerGroupTag ? 'mb-sm' : ''">
@@ -703,7 +761,40 @@ export default {
       jobParamValue: {}, // 作业参数值
       jobParamsMappingMode: {}, // 作业参数映射关系
       locationKey: '',
-      dataConfig: null
+      dataConfig: null,
+      parallelPolicy: {
+        mappingMode: 'constant',
+        value: ''
+      },
+      parallelPolicyForm: {
+        dataList: [
+          {
+            text: this.$t('page.autoexecparall'),
+            value: 'parallel'
+          },
+          {
+            text: this.$t('page.autoexecbatchround'),
+            value: 'roundCount'
+          }
+        ],
+        allowToggle: true,
+        disabled: false
+      },
+      parallelCount: {
+        mappingMode: 'constant',
+        value: ''
+      },
+      parallelCountForm: {
+        dataList: this.$utils.getRoundCountList(),
+        border: 'border',
+        filterName: 'text',
+        labelWidth: 0,
+        hideLabel: true,
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.paralldesc'),
+        disabled: false
+      }
     };
   },
   beforeCreate() {},
@@ -752,7 +843,7 @@ export default {
       // 清空映射关系
       this.formUuid = '';
       this.$set(this.basicFormValue, 'formUuid', '');
-      let clearAttrList = ['roundCount', 'protocol', 'executeUser', 'executeNode'];
+      let clearAttrList = ['roundCount', 'protocol', 'executeUser', 'executeNode', 'parallelCount', 'parallelPolicy'];
       clearAttrList.forEach(item => {
         if (this[item] && this[item].mappingMode && this[item].mappingMode == 'formattr') {
           this.$set(this[item], 'mappingMode', 'constant');
@@ -808,6 +899,9 @@ export default {
       this.jobParamValue = {};
       this.jobParamsMappingMode = {};
       this.paramsList = [];
+      this.parallelPolicy = { mappingMode: 'constant', value: null }; //并发策略
+      this.parallelPolicyForm.disabled = false;
+      this.parallelCount = {mappingMode: 'constant', value: null}; //并发数量
     },
     async initData() {
       this.defaultIniData();
@@ -971,7 +1065,7 @@ export default {
     },
     valid() {
       let isValid = true;
-      let formList = ['basicForm', 'scenarioForm', 'roundCountForm', 'executeTarget', 'executeUserForm', 'protocolForm'];
+      let formList = ['basicForm', 'scenarioForm', 'roundCountForm', 'executeTarget', 'executeUserForm', 'protocolForm', 'parallelCountForm', 'parallelPolicy'];
       let jobParamFormList = this.$refs.jobParamForm || [];
       let mappingModeFormList = ['roundCountmappingMode', 'executeNodemappingMode', 'protocolmappingMode', 'executeUsermappingMode']; // 映射关系下拉列表
       !this.$utils.isEmpty(formList) &&
@@ -1051,7 +1145,15 @@ export default {
           },
           runnerGroup: this.runnerGroup,
           runnerGroupTag: this.runnerGroupTag,
-          runtimeParamList: runtimeParamList
+          runtimeParamList: runtimeParamList,
+          parallelPolicy: {
+            mappingMode: this.parallelPolicy.mappingMode,
+            value: this.parallelPolicy.value
+          },
+          parallelCount: {
+            mappingMode: this.parallelCount.mappingMode,
+            value: this.parallelCount.value
+          }
         }
       };
       if (params && params.hasOwnProperty('citeForm')) {
@@ -1060,6 +1162,8 @@ export default {
       // 组合工具已设置好的参数，这里不需要传递给后端
       if (!this.needRoundCount) {
         delete params.config.roundCount;
+        delete params.config.parallelPolicy;
+        delete params.config.parallelCount;
       }
       if (!this.needExecuteNode) {
         delete params.config.executeNodeConfig;
@@ -1155,14 +1259,24 @@ export default {
             }
             // 场景
             this.scenarioList = scenarioList;
-            if (this.executeConfig.roundCount == 0 || !this.$utils.isEmpty(this.executeConfig.roundCount)) {
+            if (!this.$utils.isEmpty(this.executeConfig.roundCount)) {
               if (this.$utils.isEmpty(this.roundCount.value)) {
-                this.$set(this.roundCount, 'value', this.executeConfig.roundCount || 2);
+                this.$set(this.roundCount, 'value', this.executeConfig.roundCount);
               }
               //组合工具设置了分批数，编辑服务需要支持修改
               // this.$set(this.roundCountForm, 'disabled', true);
               // this.$set(this.roundCountForm, 'disabledHoverTitle', this.$t('term.autoexec.setbantchnumbernoupdate'));
             }
+            if (!this.$utils.isEmpty(this.executeConfig.parallelCount)) {
+              if (this.$utils.isEmpty(this.parallelCount.value)) {
+                this.$set(this.parallelCount, 'value', this.executeConfig.parallelCount);
+              }
+            }
+            if (!this.$utils.isEmpty(this.executeConfig.parallelPolicy)) {
+              if (this.$utils.isEmpty(this.parallelPolicy.value)) {
+                this.$set(this.parallelPolicy, 'value', this.executeConfig.parallelPolicy);
+              }
+            }
             if (this.executeConfig.whenToSpecify == 'runtime') {
               // 过滤器运行在执行，需要把执行目标值清空
               this.$set(this.executeConfig, 'executeNodeConfig', this.filterSearchValue || {});
@@ -1189,6 +1303,10 @@ export default {
         .finally(() => {
           this.loadingShow = false;
         });
+    },
+    changeParallelPolicy(val) {
+      this.roundCount.value = null;
+      this.parallelCount.value = null;
     }
   },
   filter: {},
diff --git a/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue b/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
index 2d4bf3f6025cf71b49071b1db1e626175c94557c..c93672edcb05b7dff036a21d83abb7c9bad6b9b8 100644
--- a/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
+++ b/src/views/pages/autoexec/quick-service/service-catalog/no-form-service-edit.vue
@@ -47,7 +47,7 @@
         ></TsFormRadio>
       </TsFormItem>
     </div>
-    <div v-if="hasServiceValue.roundCount" :class="getClassByBorder">
+    <div v-if="(parallelPolicy.value==='roundCount' && hasServiceValue.roundCount) || (parallelPolicy.value==='parallel' && hasServiceValue.parallelCount)" :class="getClassByBorder">
       <div :class="getFlexClass(unfoldAndFold.roundCount)">
         <template v-if="border !='border'">
           <span class="tsfont-down cursor" :class="getDownUpClass(unfoldAndFold.roundCount)" @click.stop="handleUnfoldAndFold('roundCount')"></span>
@@ -58,15 +58,28 @@
           <span class="tsfont-down cursor" :class="getDownUpClass(unfoldAndFold.roundCount)" @click.stop="handleUnfoldAndFold('roundCount')"></span>
         </template>
       </div>
-      <TsFormItem v-show="unfoldAndFold.roundCount" :label="$t('term.autoexec.batchquantity')" :required="true">
-        <TsFormSelect
-          ref="ref_roundCount"
-          v-model="roundCount"
-          v-bind="roundCountForm"
-          transfer
-          @change="handleChange"
-        ></TsFormSelect>
-      </TsFormItem>
+      <template v-if="parallelPolicy.value ==='roundCount'">
+        <TsFormItem v-show="unfoldAndFold.roundCount" :label="$t('term.autoexec.batchquantity')" :required="true">
+          <TsFormSelect
+            ref="ref_roundCount"
+            v-model="roundCount"
+            v-bind="roundCountForm"
+            transfer
+            @change="handleChange"
+          ></TsFormSelect>
+        </TsFormItem>
+      </template>
+      <template v-if="parallelPolicy.value ==='parallel'">
+        <TsFormItem v-show="unfoldAndFold.roundCount" :label="$t('term.autoexec.parall')" :required="true">
+          <TsFormSelect
+            ref="ref_parallelCount"
+            v-model="parallelCount"
+            v-bind="parallelCountForm"
+            transfer
+            @change="handleChange"
+          ></TsFormSelect>
+        </TsFormItem>
+      </template>
     </div>
     <div v-if="hasServiceValue.runnerGroupTag" :class="getClassByBorder">
       <div :class="getFlexClass(unfoldAndFold.runnerGroupTag)">
@@ -295,7 +308,9 @@ export default {
         executeNodeConfig: false,
         runtimeParamList: false,
         runnerGroupTag: false, // 执行器组标签
-        runnerGroup: false // 执行器组
+        runnerGroup: false, // 执行器组
+        parallelCount: false,
+        parallelPolicy: false
       },
       valueConfig: {}, //所有值对应的集合
       itemConfig: {}, //所以组件对应的渲染config集合
@@ -352,7 +367,23 @@ export default {
         // 执行账户
         validateList: ['required']
       },
-      isReady: false
+      isReady: false,
+      parallelPolicy: {
+        value: ''
+      },
+      parallelCount: null,
+      parallelCountForm: {
+        // 分批数量
+        dataList: this.$utils.getRoundCountList(),
+        border: 'border',
+        filterName: 'text',
+        labelWidth: 0,
+        hideLabel: true,
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.paralldesc'),
+        validateList: ['required', 'maxNum']
+      }
     };
   },
   beforeCreate() {},
@@ -422,6 +453,7 @@ export default {
       this.paramKeyList = []; // 没有设置执行目标key值
       this.needExecuteUser = '';
       this.needProtocol = '';
+      this.parallelCount = null;
     },
     async initData() {
       // 初始化
@@ -443,6 +475,9 @@ export default {
                 this.$set(this.hasServiceValue, [key], true);
               }
             }
+            if (key === 'parallelPolicy') {
+              this.parallelPolicy = config.parallelPolicy;
+            }
           }
           if (!this.$utils.isEmpty(runtimeParamList)) {
             // 作业参数映射关系为不设置时，需要把对应作业参数显示出来
@@ -585,6 +620,9 @@ export default {
       if (!this.$utils.isEmpty(this.runnerGroupTag)) {
         params.runnerGroupTag = this.runnerGroupTag;
       }
+      if (this.parallelCount) {
+        params.parallelCount = this.parallelCount;
+      }
       return params;
     },
     valid() {
diff --git a/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue b/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
index 4549aee5aed2cd9fcf3cfe483a8239ca9f1b2238..d661849e9986d3211a484334043c5a41ecc8d405 100644
--- a/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
+++ b/src/views/pages/autoexec/quick-service/service-catalog/other-params.vue
@@ -251,6 +251,21 @@ export default {
             readonly: true
           }
         },
+        {
+          name: 'parallelCount',
+          label: this.$t('term.autoexec.parall'),
+          constantMappingMode: {
+            type: 'select',
+            dataList: this.$utils.getRoundCountList(),
+            border: 'border',
+            filterName: 'text',
+            allowCreate: true,
+            search: true,
+            transfer: true,
+            desc: this.$t('term.autoexec.paralldesc'),
+            readonly: true
+          }
+        },
         {
           label: this.$t('page.protocol'),
           name: 'protocol',
@@ -435,6 +450,20 @@ export default {
               });
             }
           }
+          this.otherParamItemList.forEach(item => {
+            let isHidden = false;
+            if (item.name === 'roundCount') {
+              if (this.otherParamFormValue.parallelPolicy === 'parallel' || this.$utils.isEmpty(this.otherParamFormValue.roundCount)) {
+                isHidden = true;
+              }
+            } 
+            if (item.name === 'parallelCount') {
+              if (this.otherParamFormValue.parallelPolicy === 'roundCount' || this.$utils.isEmpty(this.otherParamFormValue.parallelCount)) {
+                isHidden = true;
+              }
+            }
+            item.isHidden = isHidden;
+          });
         }
       }
       this.$nextTick(() => {
diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index 0c4b467a94236022e200051f622c79acf163e4a8..fe1bab57668985dbca4877b4e907019907caba21 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -422,7 +422,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false },
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
@@ -663,17 +663,15 @@ export default {
           type: 'select',
           label: this.$t('term.autoexec.assetstatus'),
           search: true,
-          textName: 'description',
           transfer: true,
-          valueName: 'id',
           defaultValue: [],
-          rootName: 'tbodyList',
           multiple: true,
           className: 'block-span',
-          params: {
-            needPage: false
-          },
           url: '/api/rest/resourcecenter/state/list/forselect',
+          params: { needPage: false },
+          rootName: 'tbodyList',
+          textName: 'name',
+          valueName: 'id',
           validateList: [{ name: 'required', message: '' }]
         }
       ]
diff --git a/src/views/pages/cmdb/cientity/cientity-edit.vue b/src/views/pages/cmdb/cientity/cientity-edit.vue
index 59140e78fe896bb6304736fbba1c330f2c332a1e..7d639113760800170867d61a2054ee2a89de6e7b 100644
--- a/src/views/pages/cmdb/cientity/cientity-edit.vue
+++ b/src/views/pages/cmdb/cientity/cientity-edit.vue
@@ -153,6 +153,7 @@ export default {
               uuid: this.$utils.setUuid(),
               _relId: relId, //记录来自哪个关系，自动填上配置项
               _direction: rel.direction, //记录关系方向
+              flagRelId: relId, // 标识关系id，用于ITSM判断是否是关系，关系不需要直接显示在列表中。
               ciId: ciId,
               rootCiId: this.propRootCiId,
               ciName: ci.name,
diff --git a/src/views/pages/cmdb/cientity/cientity-tree.vue b/src/views/pages/cmdb/cientity/cientity-tree.vue
index 182fde5c49e95a92bd8bb8d2cbb05d62ae30247d..b7d31dea64507ef296a6391e0ebf33de6e959f17 100644
--- a/src/views/pages/cmdb/cientity/cientity-tree.vue
+++ b/src/views/pages/cmdb/cientity/cientity-tree.vue
@@ -135,43 +135,6 @@ export default {
           nodeSpacing: 20,
           preventOverlap: true
         }
-        //以下布局可能会导致死循环，先禁用
-        /*'compact-box': {
-          type: 'compact-box',
-          name: '径向布局',
-          radial: true,
-          direction: 'RL',
-          getHeight: () => {
-            return 40;
-          },
-          getWidth: () => {
-            return 40;
-          },
-          getVGap: () => {
-            return 20;
-          },
-          getHGap: () => {
-            return 20;
-          }
-        },
-        'indented': {
-          type: 'indented',
-          name: '缩进树布局',
-          direction: 'H',
-          indent: 80,
-          getHeight: () => {
-            return 40;
-          },
-          getWidth: () => {
-            return 40;
-          },
-          getVGap: () => {
-            return 20;
-          },
-          getHGap: () => {
-            return 20;
-          }
-        }*/
       }
     };
   },
diff --git a/src/views/pages/cmdb/cientity/delete-cientity-list.vue b/src/views/pages/cmdb/cientity/delete-cientity-list.vue
index 42445e463b66704f896e0b2f4c7aef241869a421..ff1d825a14db1a14d40f5f0e64ce5e4e744a9b11 100644
--- a/src/views/pages/cmdb/cientity/delete-cientity-list.vue
+++ b/src/views/pages/cmdb/cientity/delete-cientity-list.vue
@@ -3,7 +3,7 @@
     <div class="textRight">
       <CombineSearcher
         v-model="searchVal"
-        style="width:400px;display:inline-block"
+        style="width: 400px; display: inline-block"
         v-bind="searchConfig"
         @change="searchCiEntity(1)"
       ></CombineSearcher>
@@ -22,6 +22,9 @@
         <template slot="deleteTime" slot-scope="{ row }">
           <span>{{ row.deleteTime | formatDate }}</span>
         </template>
+        <template slot="deleteUser" slot-scope="{ row }">
+          <UserCard :uuid="row.deleteUser" :name="row.deleteUserName" :hideAvatar="true"></UserCard>
+        </template>
         <template slot="description" slot-scope="{ row }">
           <Tooltip
             v-if="row.description"
@@ -47,7 +50,7 @@
           </div>
           <div v-else-if="head.key.startsWith('global_') && row.globalAttrEntityData" :key="index">
             <div v-if="row.globalAttrEntityData[head.key] && row.globalAttrEntityData[head.key].valueList">
-              <Tag v-for="(v,vindex) in row.globalAttrEntityData[head.key].valueList" :key="vindex">
+              <Tag v-for="(v, vindex) in row.globalAttrEntityData[head.key].valueList" :key="vindex">
                 {{ v.value }}
               </Tag>
             </div>
@@ -85,15 +88,14 @@
   </div>
 </template>
 <script>
-import CombineSearcher from '@/resources/components/CombineSearcher/CombineSearcher.vue';
-
 export default {
   name: '',
   components: {
-    CombineSearcher,
+    CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue'),
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     AttrViewer: () => import('./attr-viewer.vue'),
-    DeletedHistoryDetail: () => import('./deleted-history-detail.vue')
+    DeletedHistoryDetail: () => import('./deleted-history-detail.vue'),
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue')
   },
   props: {
     ciId: { type: Number },
@@ -169,7 +171,7 @@ export default {
         this.searchParam.currentPage = current;
       }
 
-      this.$api.cmdb.cientity.searchDeleteCiEntity({...this.searchParam, ...this.searchVal}).then(res => {
+      this.$api.cmdb.cientity.searchDeleteCiEntity({ ...this.searchParam, ...this.searchVal }).then(res => {
         this.searchParam.currentPage = res.Return.currentPage;
         this.searchParam.pageSize = res.Return.pageSize;
         this.ciEntityData = res.Return;
@@ -186,9 +188,9 @@ export default {
           brotherTransactionCount = res.Return;
         });
       }
-      let content = this.$t('dialog.content.recoverconfirm', {target: this.$t('term.cmdb.cientity')});
+      let content = this.$t('dialog.content.recoverconfirm', { target: this.$t('term.cmdb.cientity') });
       if (brotherTransactionCount > 0) {
-        content = this.$t('dialog.content.invokerecoverconfirm', {count: brotherTransactionCount});
+        content = this.$t('dialog.content.invokerecoverconfirm', { count: brotherTransactionCount });
       }
       this.$createDialog({
         title: this.$t('dialog.title.recoverconfirm'),
diff --git a/src/views/pages/cmdb/cmdb.js b/src/views/pages/cmdb/cmdb.js
index 2a11313026ec049fed83cdc199eade777f0d908a..0abe676c04720b89a27528e3b7c0e57b4e7b85d5 100644
--- a/src/views/pages/cmdb/cmdb.js
+++ b/src/views/pages/cmdb/cmdb.js
@@ -7,6 +7,7 @@ import VueI18n from 'vue-i18n';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -28,6 +29,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$tsrouter = router;
 Vue.prototype.$localStore = new LocalStore('cmdb', router);
+Vue.prototype.$state = new State('cmdb');
 
 new Vue({
   router,
diff --git a/src/views/pages/cmdb/customview/view-data.vue b/src/views/pages/cmdb/customview/view-data.vue
index 6b2794109298e67a5bfe5db1a56df6dd4e4bd5f6..1a14d764521ccf09d9c3c9ef0b0ac664d190f7a8 100644
--- a/src/views/pages/cmdb/customview/view-data.vue
+++ b/src/views/pages/cmdb/customview/view-data.vue
@@ -74,7 +74,7 @@ export default {
   destroyed() {},
   methods: {
     editView() {
-      this.$router.push({ path: '/view-edit/' + (this.viewData.isPrivate == 1 ? 'private/' : 'public/') + this.id });
+      this.$router.push({ path: '/view-edit/' + (this.viewData.type == 'private' ? 'private/' : 'public/') + this.id });
     },
     switchView(viewId) {
       this.$router.push({ path: '/view-data/' + viewId });
diff --git a/src/views/pages/cmdb/customview/view-detail.vue b/src/views/pages/cmdb/customview/view-detail.vue
index 156eddd5b0cb847d8ded731a8b75cc13428b0506..35ebf9c5a21c47bfbbf57f631616f73f64bfae94 100644
--- a/src/views/pages/cmdb/customview/view-detail.vue
+++ b/src/views/pages/cmdb/customview/view-detail.vue
@@ -12,12 +12,12 @@
           </span>
         </div>-->
       </template>
-      <template v-slot:sider>
+      <!--<template v-slot:sider>
         <ViewCiEntityList :viewId="viewId" :ciEntityId="ciEntityId"></ViewCiEntityList>
-      </template>
+      </template>-->
       <template v-slot:content>
         <div class="padding-md">
-          <div class="right-block bg-block radius-lg ">
+          <div class="right-block bg-block radius-lg">
             <div v-if="!isTopoShow">
               <ViewDetailData mode="particular" :viewId="viewId" :ciEntityId="ciEntityId"></ViewDetailData>
             </div>
@@ -36,11 +36,11 @@
   </div>
 </template>
 <script>
-import ViewCiEntityList from './view-cientity-list.vue';
+//import ViewCiEntityList from './view-cientity-list.vue';
 export default {
   name: '',
   components: {
-    ViewCiEntityList,
+    //ViewCiEntityList,
     ViewDetailData: () => import('./view-detail-data.vue'),
     CustomViewTopo: () => import('./view-topo.vue')
   },
@@ -70,8 +70,7 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-  },
+  methods: {},
   filter: {},
   computed: {
     attrListGrouped() {
diff --git a/src/views/pages/cmdb/form/component/formcientitymodify/index.vue b/src/views/pages/cmdb/form/component/formcientitymodify/index.vue
index f5474629be6bb50d641d5148833dde27dcfe1295..1df3a84f79aba2541e5b1c2b7bd0af71470fcd53 100644
--- a/src/views/pages/cmdb/form/component/formcientitymodify/index.vue
+++ b/src/views/pages/cmdb/form/component/formcientitymodify/index.vue
@@ -482,7 +482,7 @@ export default {
         if (this.entityList && this.entityList.length > 0) {
           const returnList = [];
           this.entityList.forEach(cientity => {
-            if (cientity.rootCiId === ciId && !cientity._isnew) {
+            if (cientity.rootCiId === ciId && !cientity._isnew && !cientity.flagRelId) {
               returnList.push(cientity);
             }
           });
diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
index 9ef78a7cb67c94be24c464241e3f64e270237743..4099182c0196c5e678d1b1a379dec2616845e33e 100644
--- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
@@ -77,7 +77,7 @@ export default {
           value: 'globalAttr'
         },
         {
-          text: '新关系',
+          text: '引用关系',
           value: 'newRel'
         },
         {
diff --git a/src/views/pages/cmdb/router.js b/src/views/pages/cmdb/router.js
index fbc3b229eeb0fd3023219dbb263710b3fff9a7b8..15c9f5dc984b43cb192d2a3fbef5f8d54ff6973b 100644
--- a/src/views/pages/cmdb/router.js
+++ b/src/views/pages/cmdb/router.js
@@ -506,7 +506,7 @@ let routerArr = [
     meta: {
       title: $t('router.cmdb.viewedit'),
       ismenu: false,
-      authority: 'CMDB_BASE'
+      authority: 'PRIVATE_CUSTOMVIEW_MODIFY'
     }
   },
   {
diff --git a/src/views/pages/dashboard/dashboard.js b/src/views/pages/dashboard/dashboard.js
index 636c6b00edd562259ebda1c6f1ff567b0d4a48b7..6381e9827d09d0df18139190b47ba95c6adb06a4 100644
--- a/src/views/pages/dashboard/dashboard.js
+++ b/src/views/pages/dashboard/dashboard.js
@@ -8,6 +8,7 @@ import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import md5 from 'js-md5';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -30,6 +31,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$md5 = md5;
 Vue.prototype.$localStore = new LocalStore('dashboard', router);
+Vue.prototype.$state = new State('dashboard');
 
 new Vue({
   router,
diff --git a/src/views/pages/dashboard/widget/charts/original/table-widget.vue b/src/views/pages/dashboard/widget/charts/original/table-widget.vue
index 7517997616721252c6a0cc2b397327c41616fb56..0b35125533a67b21599a7e1e49afd386d4169b9a 100644
--- a/src/views/pages/dashboard/widget/charts/original/table-widget.vue
+++ b/src/views/pages/dashboard/widget/charts/original/table-widget.vue
@@ -2,10 +2,11 @@
   <div>
     <TsTable
       ref="table"
-      :isAutoScroll="widget.config && widget.config.autoscroll?true:false"
-      :fixedHeader="true"
+      :isAutoScroll="widget.config && widget.config.autoscroll ? true : false"
+      :fixedHeader="widget.config && widget.config.autoscroll ? true : false"
+      :theadList="theadList"
       v-bind="tableData"
-      :height="widget.height-2"
+      :height="widget.height - 2"
     ></TsTable>
   </div>
 </template>
@@ -42,10 +43,15 @@ export default {
   deactivated() {},
   beforeDestroy() {},
   destroyed() {},
-  methods: {
-  },
+  methods: {},
   filter: {},
   computed: {
+    theadList() {
+      if (this.tableData && this.tableData.theadList) {
+        return this.tableData.theadList.filter(d => d.key && d.key.startsWith('field_'));
+      }
+      return [];
+    },
     style() {
       const style = {};
       if (this.widget.config) {
@@ -56,8 +62,7 @@ export default {
       return style;
     }
   },
-  watch: {
-  }
+  watch: {}
 };
 </script>
 <style lang="less" scoped></style>
diff --git a/src/views/pages/dashboard/widget/configs/original/number-widget-config.vue b/src/views/pages/dashboard/widget/configs/original/number-widget-config.vue
index 987c83d6916df81746255850c225a2345dce6e5f..d4de5e7df1d0589286a12073fc766628e39ea1bd 100644
--- a/src/views/pages/dashboard/widget/configs/original/number-widget-config.vue
+++ b/src/views/pages/dashboard/widget/configs/original/number-widget-config.vue
@@ -173,7 +173,6 @@ export default {
   created() {},
   beforeMount() {},
   mounted() {
-    console.log(HOME);
   },
   beforeUpdate() {},
   updated() {},
diff --git a/src/views/pages/dashboard/widget/widget-list.js b/src/views/pages/dashboard/widget/widget-list.js
index 124892f6542de3b28dd3949fbd2757a034927b1f..05ce21a054c90452f49c988b36c43c6289f16705 100644
--- a/src/views/pages/dashboard/widget/widget-list.js
+++ b/src/views/pages/dashboard/widget/widget-list.js
@@ -7,7 +7,7 @@ export const WIDGET_TYPES = [
 ];
 import { default as text } from './define/text.js';
 import { default as number } from './define/number.js';
-//import { default as table } from './define/table.js';
+import { default as table } from './define/table.js';
 import { default as pie } from './define/pie.js';
 import { default as radar } from './define/radar.js';
 import { default as rose } from './define/rose.js';
@@ -40,7 +40,7 @@ import { default as time } from './define/time.js';
 export const WIDGETS = [
   text,
   number,
-  //table,
+  table,
   pie,
   radar,
   rose,
diff --git a/src/views/pages/deploy/application-config/application-config-pipeline.vue b/src/views/pages/deploy/application-config/application-config-pipeline.vue
index d9f0080f3b7fcf54b90d5f09dde00e5418aecfed..4735cdd5651e87289ff284efa1ab0ab494993574 100644
--- a/src/views/pages/deploy/application-config/application-config-pipeline.vue
+++ b/src/views/pages/deploy/application-config/application-config-pipeline.vue
@@ -608,6 +608,16 @@ export default {
               id: '#id_' + step.uuid + '_' + p.uuid,
               current: 1
             });
+            if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) {
+              validList.push({
+                text: this.$t('page.phase') + step.name + '【' + p.operationName + '】：' + this.$t('term.deploy.chooseatleastonetool'),
+                type: 'error',
+                stepUuid: step.uuid,
+                operationUuid: p.uuid,
+                id: '#id_' + step.uuid + '_' + p.uuid,
+                current: 1
+              });
+            }
             if (p.config.ifList && p.config.ifList.length) {
               let validIfList = this.validPhaseOperationList(step, p.config.ifList);
               validIfList.length && validList.push(...validIfList);
diff --git a/src/views/pages/deploy/application-config/config/app/app-config-tree.vue b/src/views/pages/deploy/application-config/config/app/app-config-tree.vue
index 7bef7b0ce658341957e0680e166f3585fad15f59..88c050c756377049f676e23661a60e6c2c66d90f 100644
--- a/src/views/pages/deploy/application-config/config/app/app-config-tree.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-config-tree.vue
@@ -163,7 +163,7 @@ export default {
         };
         this.$api.deploy.applicationConfig.getEnvTreeList(params).then(res => {
           if (res && res.Status == 'OK') {
-            const envList = res.Return || [];
+            const envList = res.Return.tbodyList || [];
             let children = [];
             children = envList.map(item => {
               return { title: item.name, appSystemId: currentNode.appSystemId, appModuleId: currentNode.appModuleId, envId: item.id, isConfig: currentNode.isConfig, configType: 'env', path: `${currentNode.path}/${item.name}`, isDeletable: item.isDeletable, isHasAllAuthority: currentNode.isHasAllAuthority, isConfigAuthority: currentNode.isConfigAuthority, authActionSet: currentNode.authActionSet || []};
@@ -401,7 +401,7 @@ export default {
         };
         this.$api.deploy.applicationConfig.getEnvTreeList(params).then(res => {
           if (res && res.Status == 'OK') {
-            const envList = res.Return || [];
+            const envList = res.Return.tbodyList || [];
             let children = [];
             let selectedTreeNode = {};
             children = envList.map(item => {
@@ -482,7 +482,7 @@ export default {
                             };
                             this.$api.deploy.applicationConfig.getEnvTreeList(params).then(res => {
                               if (res && res.Status == 'OK') {
-                                const envList = res.Return || [];
+                                const envList = res.Return.tbodyList || [];
                                 let children = [];
                                 children = envList.map(item => {
                                   return { title: item.name, appSystemId: appSystemId, appModuleId: appModuleId, envId: item.id, isConfig: isConfig, configType: 'env', path: `${path}/${item.name}`, isDeletable: item.isDeletable};
diff --git a/src/views/pages/deploy/application-config/config/app/app-module-list.vue b/src/views/pages/deploy/application-config/config/app/app-module-list.vue
index 27cb48189b92ca90f36d8c8647d6a5c8609db64b..6d175d7b065420d2fde4fd5d4e34787b8b5d0087 100644
--- a/src/views/pages/deploy/application-config/config/app/app-module-list.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-module-list.vue
@@ -413,7 +413,7 @@ export default {
           .getEnvTreeList(params)
           .then(res => {
             if (res && res.Status == 'OK') {
-              const envList = res.Return || [];
+              const envList = res.Return.tbodyList || [];
               this.$set(module, 'envList', envList);
               this.$set(module, 'isExpand', true);
             }
diff --git a/src/views/pages/deploy/application-config/config/app/components/env-tree-edit.vue b/src/views/pages/deploy/application-config/config/app/components/env-tree-edit.vue
index fde6ff6e05a9225d0ccba1f372866eab89a85271..b705c928252b10ef155889531e5f90370966ec1d 100644
--- a/src/views/pages/deploy/application-config/config/app/components/env-tree-edit.vue
+++ b/src/views/pages/deploy/application-config/config/app/components/env-tree-edit.vue
@@ -50,11 +50,12 @@ export default {
           label: this.$t('page.environment'),
           type: 'select',
           validateList: ['required'],
+          rootName: 'tbodyList',
           valueName: 'id',
           textName: 'name',
           multiple: true,
           transfer: true,
-          params: {...this.params, isHasEnv: 0},
+          params: {...this.params, isHasEnv: 0, needPage: true},
           dynamicUrl: 'api/rest/deploy/app/config/env/list'
         }
       }
diff --git a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0f1a7e12a9e0ecb2434bdc7689c62235430e2f30
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
@@ -0,0 +1,565 @@
+<template>
+  <div>
+    <TsDialog v-bind="dialogConfig" @on-close="closeDialog">
+      <Loading :loadingShow="loadingShow" type="fix"></Loading>
+      <div v-if="$AuthUtils.hasRole('RESOURCECENTER_ACCOUNT_MODIFY')" class="action-icon text-right">
+        <span class="tsfont-rotate-right text-tip-active" @click="refreshAccountList"></span>
+        <span class="tsfont-edit text-tip-active pl-md" @click="editAccount"></span>
+      </div>
+      <TsForm
+        ref="form"
+        v-model="settingConfig"
+        :item-list="settingForm"
+        type="type"
+        label-position="right"
+      >
+        <template v-slot:account>
+          <TsFormSelect
+            ref="formSelect"
+            v-model="settingConfig.accountList"
+            v-bind="settingForm.account"
+            @first="gotoAccount"
+            @searchCallback="refreshSuccess()"
+          >
+            <template v-if="validMessage != '' && validMessage == 'validMessage'" v-slot:validMessage>
+              <div>
+                <template>
+                  <div v-for="(value, key, index) in validMessageObj" :key="index" class="form-error-tip">
+                    {{ getItem(value) }}
+                  </div>
+                </template>
+              </div>
+            </template>
+          </TsFormSelect>
+        </template>
+        <template v-slot:privateAccount>
+          <div>
+            <div v-if="privateAccountList && privateAccountList.length > 0" class="bg-op radius-lg padding">
+              <div
+                v-for="(item, index) in privateAccountList"
+                :key="item.id"
+                @mouseenter="mouseenter(item)"
+                @mouseleave="mouseleave(item)"
+              >
+                <TsRow>
+                  <Col span="22" class="text-href">
+                    <div @click="editPrivateAccount(item)">
+                      {{ item.text }}
+                    </div>
+                  </Col>
+                  <Col span="2">
+                    <span v-show="item.isShow" class="tsfont-trash-o cursor" @click="delPrivateAccount(item, index)"></span>
+                  </Col>
+                </TsRow>
+              </div>
+            </div>
+            <div class="text-href tsfont-plus" @click="openPrivateAccount">{{ $t('page.privateaccount') }}</div>
+          </div>
+        </template>
+        <template v-slot:testRunner>
+          <TsFormSelect
+            ref="formSelect"
+            v-model="testRunner"
+            v-bind="settingForm.testRunner"
+            @first="gotoRunner"
+            @searchCallback="refreshSuccess()"
+          ></TsFormSelect>
+     
+        </template>
+        <template v-slot:testResult>
+          <div v-if="connectTestResultList && connectTestResultList.length > 0">
+            <span v-if="hasErrorInfo(connectTestResultList)" class="tsfont-copy text-action mb-xs" @click.stop="handleCopy">{{ $t('page.copyerrorinfo') }}</span>
+            <TsTable
+              :hideAction="false"
+              :showPager="false"
+              :showTotal="false"
+              height="auto"
+              :theadList="theadList"
+              :canExpand="true"
+              :tbodyList="connectTestResultList"
+            >
+              <template v-slot:showInnerTable="{ row }">
+                <span
+                  v-if="row.msgError"
+                  :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }"
+                  class="cursor-pointer text-error"
+                  @click.stop="openInnerTable(row)"
+                ></span>
+              </template>
+              <template slot="status" slot-scope="{row}">
+                <span :class="row && (row.exitValue == 0) ? 'text-success' : 'text-error'">{{ getReasonText(row) }}</span>
+              </template>
+              <template slot="accountName" slot-scope="{row}">
+                <span>{{ getConnectResultText(row) }}</span>
+              </template>
+              <template slot="runner" slot-scope="{}">
+                <span>{{ connectTestRunner }}</span>
+              </template>
+              <template v-slot:expand="{ row }">
+                <div v-if="row._expand" class="text-error" style="margin-left: 55px;">{{ row.msgError }}</div>
+              </template>
+            </TsTable>
+          </div>
+        </template>
+      </TsForm>
+      <template v-slot:footer>
+        <Button @click="closeDialog">{{ $t('page.cancel') }}</Button>
+        <Button type="primary" @click="testConnect">{{ $t('page.testconnection') }}</Button>
+        <Button type="primary" @click="saveAccount">{{ $t('page.confirm') }}</Button>
+      </template>
+    </TsDialog>
+    <PrivateAccountEditDialog
+      v-if="isShowNewAccount"
+      :params="params"
+      :resourceId="resourceId"
+      :accountId="accountId"
+      :accountList="[...privateAccountList, ...publicAccountList]"
+      @close="closePrivateAccount"
+    ></PrivateAccountEditDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    PrivateAccountEditDialog: () => import('./private-account-edit-dialog')
+  },
+  filters: {},
+  props: {
+    params: {
+      type: Object,
+      default: () => {}
+    },
+    resourceId: {
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      testRunner: null,
+      connectTestRunner: null,
+      isShowNewAccount: false,
+      accountId: null,
+      publicAccountList: [], // 公共账号列表
+      privateAccountList: [], // 私有账号列表
+      failureCount: 0, //错误校验信息条数
+      successCount: 0, //成功校验信息条数
+      failureReasonList: [], //失败校验信息详情
+      validMessage: '', //是否显示自定义校验信息
+      validMessageObj: {},
+      connectTestResultList: [], // 连接测试结果列表
+      loadingShow: false,
+      dialogConfig: {
+        type: 'modal',
+        isShow: true,
+        title: this.$t('page.accountsmanage'),
+        maskClose: false,
+        width: 'medium'
+      },
+      theadList: [
+        {
+          title: '',
+          width: 50,
+          key: 'showInnerTable'
+        },
+        {
+          title: this.$t('page.status'),
+          key: 'status'
+        },
+        {
+          title: this.$t('page.account'),
+          key: 'accountName'
+        },
+        {
+          title: this.$t('term.deploy.actuator'),
+          key: 'runner'
+        }
+      ],
+      settingConfig: {
+        accountList: []
+      },
+      settingForm: {
+        id: {
+          type: 'text',
+          name: 'id',
+          isHidden: true
+        },
+        account: {
+          type: 'slot',
+          name: 'account',
+          label: this.$t('page.publicaccount'),
+          transfer: true,
+          multiple: true,
+          firstText: this.$t('dialog.title.addtarget', { target: this.$t('page.account') }),
+          firstLi: this.$AuthUtils.hasRole('RESOURCECENTER_ACCOUNT_MODIFY'),
+          dynamicUrl: '/api/rest/resourcecenter/account/search',
+          rootName: 'tbodyList',
+          dealDataByUrl: this.$utils.getAccountNodeList,
+          needCallback: false,
+          onChange: (val, textlist, nodeList) => {
+            let list = [...nodeList, ...this.privateAccountList];
+            this.publicAccountList = nodeList || [];
+            this.getValidMessage(list);
+          }
+        },
+        privateAccount: {
+          type: 'slot',
+          name: 'privateAccount',
+          label: this.$t('page.privateaccount')
+        },
+        testRunner: {
+          type: 'slot',
+          name: 'testRunner',
+          desc: this.$t('term.deploy.testrunnerdesc'),
+          label: this.$t('page.test') + this.$t('term.deploy.actuator'),
+          transfer: true,
+          multiple: false,
+          firstText: this.$t('dialog.title.addtarget', { target: this.$t('term.deploy.actuator') }),
+          firstLi: this.$AuthUtils.hasRole('RUNNER_MODIFY'),
+          dynamicUrl: '/api/rest/runner/search',
+          rootName: 'tbodyList',
+          valueName: 'id',
+          textName: 'name',
+          needCallback: false
+        },
+        testResult: {
+          type: 'slot',
+          label: this.$t('term.cmdb.testaccount'),
+          isHidden: true // 默认隐藏，点击【测试连接】之后才显示
+        }
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    if (this.resourceId) {
+      this.getAccountList();
+    }
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    handleCopy() {
+      let errorList = this.connectTestResultList.filter(v => v.exitValue != 0);
+      let errorInfo = errorList.map(v => `${this.getConnectResultText(v)}通过执行器${this.connectTestRunner}测试${this.getReasonText(v)}${v.msgError}`).join('\n');
+      this.$utils.copyText('', errorInfo);
+    },
+    openInnerTable(row) {
+      // 展开收起内嵌表格
+      this.$set(row, '_expand', !row._expand);
+    },
+    getValidMessage(list) {
+      if (list.length == 0) {
+        this.validMessage = '';
+      } else {
+        this.validMessage = 'noValidMessage';
+      }
+      let obj = {};
+      list &&
+        list.forEach(item => {
+          let accountProtocal = item.config.account + '/' + item.config.protocol;
+          if (obj[accountProtocal]) {
+            obj[accountProtocal].push(item.text);
+          } else {
+            obj[accountProtocal] = [item.text];
+          }
+        });
+      this.validMessageObj = obj;
+      Object.keys(obj).forEach(item => {
+        if (obj[item].length > 1) {
+          this.validMessage = 'validMessage';
+        }
+      });
+    },
+    getAccountList() {
+      this.getPublicAccountList();
+      this.getPrivateAccountList();
+    },
+    getPublicAccountList() {
+      if (this.resourceId) {
+        this.$api.cmdb.asset.listAccount({ resourceId: this.resourceId, type: 'public' }).then(res => {
+          // 公有账号列表
+          if (res.Return.length > 0) {
+            this.settingConfig.accountList = [];
+            let publicAccountList = [];
+            res.Return.forEach(item => {
+              if (item.protocol != 'tagent' && item.id) {
+                this.settingConfig.accountList.push(item.id);
+                publicAccountList.push(item);
+              }
+            });
+            this.publicAccountList = this.$utils.getAccountNodeList(publicAccountList);
+          } else {
+            this.settingConfig.accountList = [];
+            this.publicAccountList = [];
+          }
+        });
+      } else {
+        this.settingConfig.accountList = [];
+        this.publicAccountList = [];
+      }
+    },
+    getPrivateAccountList() {
+      if (this.resourceId) {
+        this.$api.cmdb.asset.listAccount({ resourceId: this.resourceId, type: 'private' }).then(res => {
+          // 私有账号列表
+          if (res.Return.length > 0) {
+            this.privateAccountList = [];
+            let privateAccountList = [];
+            res.Return.forEach(item => {
+              if (item.protocol != 'tagent' && item.id) {
+                privateAccountList.push(item);
+              }
+            });
+            this.privateAccountList = this.$utils.getAccountNodeList(privateAccountList);
+          } else {
+            this.privateAccountList = [];
+          }
+        });
+      } else {
+        this.privateAccountList = [];
+      }
+    },
+    validRequired() {
+      let accountIdList = this.getAccountIdList();
+      if (accountIdList && accountIdList.length == 0) {
+        this.$Notice.error({ title: this.$t('page.tip'), desc: this.$t('term.cmdb.publicprivateaccountchooseoneaccountdesc') });
+        this.connectTestResultList = [];
+        this.connectTestRunner = '';
+        this.settingForm.testResult.isHidden = true;
+        return false;
+      }
+      return true;
+    },
+    saveAccount() {
+      if (this.$utils.isEmpty(this.params)) {
+        return false;
+      }
+      let data = {
+        appSystemId: this.params.appSystemId,
+        appModuleId: this.params.appModuleId,
+        envId: this.params.envId,
+        resourceId: this.resourceId,
+        accountIdList: this.getAccountIdList()
+      };
+      this.$api.deploy.env.saveEnvDbPublicAccount(data).then(res => {
+        if (res.Status == 'OK') {
+          this.closeDialog(true);
+          this.handleTipsMessage(res, this.$t('message.savesuccess'));
+        }
+      });
+    },
+    getAccountIdList() {
+      let privateAccountIdList = [];
+      this.privateAccountList &&
+        this.privateAccountList.forEach(item => {
+          if (item.value) {
+            privateAccountIdList.push(item.value);
+          }
+        });
+      return [...this.settingConfig.accountList, ...privateAccountIdList];
+    },
+    handleTipsMessage(res, msg) {
+      if (res.Return) {
+        this.failureCount = res.Return.failureCount;
+        this.successCount = res.Return.successCount;
+      }
+      // 失败，错误提示
+      if (this.failureCount != 0 || (this.failureReasonList && this.failureReasonList.length > 0)) {
+        this.$Notice.error({
+          title: this.$t('page.tip'),
+          duration: 10,
+          render: h => {
+            return h('div', [
+              h('div', { class: 'text-success pb-md' }, [h('span', { class: 'text-success valid-icon tsfont-check-s' }, ''), this.$t('term.cmdb.successfullyboundaccountforassetstarget', { target: this.successCount || 0 })]),
+              h('div', { class: 'text-danger pb-md' }, [h('span', { class: 'valid-icon tsfont-close-s' }, ''), this.$t('term.cmdb.failedtobindaccountforassetstarget', { target: this.failureCount || 0 })]),
+              h(
+                'ul',
+                { class: 'pb-md', style: { lineHeight: '20px', display: this.failureReasonList && this.failureReasonList.length > 0 ? 'block' : 'none' } },
+                this.failureReasonList.map(item => {
+                  return h('li', {}, item || '');
+                })
+              )
+            ]);
+          }
+        });
+      }
+
+      this.$emit('success', msg);
+    },
+    openPrivateAccount() {
+      // 私有账号
+      this.accountId = null;
+      this.isShowNewAccount = true;
+    },
+    delPrivateAccount(row, index) {
+      // 删除私有账号
+      if (row && row.value) {
+        this.$createDialog({
+          title: this.$t('dialog.title.deleteconfirm'),
+          content: this.$t('dialog.content.deleteconfirm', { target: row.text }),
+          btnType: 'error',
+          okText: this.$t('page.delete'),
+          'on-ok': vnode => {
+            let data = {
+              appSystemId: this.params.appSystemId,
+              appModuleId: this.params.appModuleId,
+              envId: this.params.envId,
+              resourceId: this.resourceId,
+              id: row.value
+            };
+            this.$api.deploy.env.deleteEnvDbPrivateaccount(data).then(res => {
+              if (res && res.Status == 'OK') {
+                this.$Message.success(this.$t('message.deletesuccess'));
+                this.privateAccountList.splice(index, 1);
+                vnode.isShow = false;
+              }
+            });
+          }
+        });
+      }
+    },
+    editPrivateAccount(item) {
+      // 编辑私有账号
+      if (item && item.value) {
+        this.accountId = item.value;
+        this.isShowNewAccount = true;
+      }
+    },
+    closePrivateAccount(needRefresh) {
+      this.isShowNewAccount = false;
+      if (needRefresh) {
+        this.getPrivateAccountList();
+      }
+    },
+    closeDialog(needRefresh = false) {
+      this.$emit('close', needRefresh);
+    },
+    gotoAccount() {
+      window.open(HOME + '/cmdb.html#/account-manage?isNewAccountShow=' + true, '_blank');
+    },
+    gotoRunner() {
+      window.open(HOME + '/framework.html#/runnergroup-manage', '_blank');
+    },
+    editAccount() {
+      window.open(HOME + '/cmdb.html#/account-manage', '_blank');
+    },
+    refreshAccountList() {
+      this.$set(this.settingForm.account, 'params', { timeUuid: this.$utils.setUuid() });
+      this.$set(this.settingForm.account, 'needCallback', true);
+    },
+    refreshSuccess() {
+      this.$Message.success(this.$t('message.refreshsuccess'));
+    },
+    testConnect() {
+      // 测试连接
+      if (!this.validRequired()) {
+        return false;
+      }
+      if (this.resourceId) {
+        this.loadingShow = true;
+        this.$api.cmdb.asset
+          .testConnectAccount({ resourceId: this.resourceId, accountIdList: this.getAccountIdList(), runnerId: this.testRunner })
+          .then(res => {
+            if (res && res.Status == 'OK') {
+              this.connectTestRunner = res.Return.runner;
+              this.connectTestResultList = res.Return.result || [];
+              if (this.connectTestResultList && this.connectTestResultList.length > 0) {
+                this.settingForm.testResult.isHidden = false;
+              }
+              if (this.connectTestResultList.every(item => item.exitValue == 0)) {
+                this.$Message.success(this.$t('message.executesuccess'));
+              }
+            }
+          })
+          .finally(() => {
+            this.loadingShow = false;
+          });
+      }
+    },
+    getConnectResultText(item) {
+      let text = '';
+      if (item && item.name) {
+        text = item.name;
+      }
+      if (item && item.username) {
+        text += `(${item.username})`;
+      }
+      if (item && item.protocol) {
+        text += `/${item.protocol}`;
+      }
+      if (item && item.protocolPort) {
+        text += `(${item.protocolPort})`;
+      }
+      return text;
+    },
+    mouseenter(item) {
+      // 鼠标移入
+      this.$set(item, 'isShow', true);
+    },
+    mouseleave(item) {
+      // 鼠标移出
+      this.$set(item, 'isShow', false);
+    }
+  },
+  computed: {
+    getItem() {
+      return function(value) {
+        if (value.length > 1) {
+          return value.join('、') + this.$t('term.cmdb.repeataccount');
+        } else {
+          return;
+        }
+      };
+    },
+    getConnectStatus() {
+      // 获取连接状态
+      return function(value) {
+        let statusObj = {
+          0: 'text-success',
+          1: 'text-danger',
+          2: 'text-danger',
+          3: 'text-danger'
+        };
+        return statusObj[value];
+      };
+    },
+    getReasonText() {
+      // 测试连接，成功失败原因
+      return function(value) {
+        if (value.exitValue == 0) {
+          return this.$t('page.success');
+        } else {
+          return this.$t('page.fail');
+        }
+      };
+    },
+    hasErrorInfo() {
+      return (connectTestResultList) => {
+        return connectTestResultList.some(v => v.exitValue != 0);
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style scoped lang="less">
+.showValidMessage {
+  background-color: #f8e3e3;
+}
+.form-error-tip {
+  white-space: normal;
+  text-overflow: ellipsis;
+  word-break: break-all;
+}
+</style>
diff --git a/src/views/pages/deploy/application-config/config/env/copy-config-env.vue b/src/views/pages/deploy/application-config/config/env/copy-config-env.vue
index 7eb41291137fc37973599236a8015560eeb19ccc..86fa0b82f7ad2118b69c7f0da15ffaabed219db3 100644
--- a/src/views/pages/deploy/application-config/config/env/copy-config-env.vue
+++ b/src/views/pages/deploy/application-config/config/env/copy-config-env.vue
@@ -82,10 +82,11 @@ export default {
           validateList: ['required'],
           multiple: true,
           transfer: true,
+          rootName: 'tbodyList',
           valueName: 'id',
           textName: 'name',
-          params: {...this.params, isHasEnv: 0},
-          url: '/api/rest/deploy/app/config/env/list'
+          params: {...this.params, isHasEnv: 0, needPage: true},
+          dynamicUrl: '/api/rest/deploy/app/config/env/list'
         }
       ],
       existingFormList: [ // 现有环境
diff --git a/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1e807248fc6c922ee4e432c88334617d215770b1
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <TsDialog
+      v-bind="dialogSetting"
+      :title="isNewData? $t('dialog.title.addtarget', {target: $t('page.database')}): $t('dialog.title.edittarget', {target: $t('page.database')})"
+      @on-ok="okDialog"
+      @on-close="closeDialog"
+    >
+      <template v-slot>
+        <div>
+          <loading :loadingShow="loadingShow" type="fix"></loading>
+          <TsForm
+            v-if="!loadingShow"
+            ref="form"
+            v-model="formValue"
+            :item-list="formList"
+          ></TsForm>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+  },
+  props: {
+    isNewData: { // 是否新增数据
+      type: Boolean,
+      default: false
+    },
+    dbResourceData: Object,
+    params: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      dialogSetting: {
+        isShow: true,
+        type: 'modal',
+        width: 'medium'
+      },
+      formValue: {
+        ciId: null,
+        name: null,
+        ip: null,
+        port: null
+      },
+      formList: [
+        {
+          name: 'ciId',
+          type: 'select',
+          label: this.$t('term.deploy.configurationmodel'),
+          validateList: ['required'],
+          multiple: false,
+          transfer: true,
+          disabled: !this.isNewData,
+          dataList: []
+        },
+        {
+          name: 'name',
+          type: 'text',
+          label: this.$t('page.name'),
+          maxlength: 50,
+          validateList: ['name-special']
+        },
+        {
+          name: 'ip',
+          type: 'text',
+          label: 'IP',
+          validateList: ['domainOrIP']
+        },
+        {
+          name: 'port',
+          type: 'number',
+          label: this.$t('page.port'),
+          validateList: ['port']
+        }
+      ],
+      ciId: null,
+      attrNameList: ['name', 'ip', 'port']
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async initData() {
+      this.loadingShow = true;
+      await this.getResourceEntityByCiId();
+      await this.getAppInstanceCiAttrList(this.ciId);
+      this.getCiList();
+      if (!this.isNewData && !this.$utils.isEmpty(this.dbResourceData)) {
+        this.$set(this.formValue, 'ciId', this.dbResourceData.typeId);
+        this.$set(this.formValue, 'name', this.dbResourceData.name);
+        this.$set(this.formValue, 'ip', this.dbResourceData.ip);
+        this.$set(this.formValue, 'port', this.dbResourceData.port);
+      }
+      this.$nextTick(() => {
+        this.loadingShow = false;
+      });
+    },
+    getAppInstanceCiAttrList(ciId) {
+      if (!this.ciId) {
+        return false; 
+      }
+      let params = {
+        isAll: 0,
+        attrNameList: this.attrNameList,
+        ciId: ciId
+      };
+      return this.$api.deploy.applicationConfig.getAppInstanceCiAttrList(params).then((res) => {
+        if (res.Status == 'OK') {
+          const attrObj = res.Return || {};
+          const validMap = {
+            name: ['name-special'],
+            ip: ['domainOrIP'],
+            port: ['port']
+          };
+          this.formList.forEach((item) => {
+            if (attrObj[item.name]) {
+              const attr = attrObj[item.name];
+              let validateList = validMap[item.name] || [];
+              if (attr.isRequired && attr.isRequired == 1) {
+                validateList.push('required');
+              } 
+              this.$set(item, 'validateList', validateList);
+            }
+          });
+        }
+      });
+    },
+    getResourceEntityByCiId() {
+      return this.$api.cmdb.applicationManage.getResourceEntityByName('scence_database_ip_port_env_appmodule').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.ciId = res.Return.ciId;
+        }
+      });
+    },
+    getCiList() {
+      if (!this.ciId) {
+        return false;
+      }
+      this.$api.cmdb.ci.getCiList({idList: [this.ciId], needChildren: 1, isAbstract: 0}).then((res) => {
+        if (res && res.Status == 'OK') {
+          this.formList.forEach((item) => {
+            if (item.name == 'ciId') {
+              item.dataList = res.Return || [];
+            }
+          });
+        }
+      });
+    },
+    okDialog() {
+      if (!this.$refs.form.valid()) {
+        return false; 
+      }
+      let data = {
+        appSystemId: this.params.appSystemId,
+        appModuleId: this.params.appModuleId,
+        envId: this.params.envId,
+        ciId: this.formValue.ciId,
+        name: this.formValue.name,
+        ip: this.formValue.ip,
+        port: this.formValue.port
+      };
+      if (!this.isNewData) {
+        data.id = this.dbResourceData.id;
+      }
+      this.$api.deploy.env.saveEnvDbResource(data).then((res) => {
+        if (res && res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          const id = res.Return.id;
+          this.closeDialog(id);
+        }
+      });
+    },
+    closeDialog(id) {
+      this.$emit('close', id);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
index 8b9976272e03090997d08851c346190a8d9e54fa..efc9259964f8a6464efadb0dad482a1f141c58aa 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
@@ -17,30 +17,50 @@
             v-model="formValue"
             :item-list="formItemList"
           >
+            <template v-slot:dbResourceId>
+              <TsFormItem :label="$t('page.database')" :required="true" tooltip="数据来自scence_database_ip_port_env_appmodule视图">
+                <div class="flex-start">
+                  <TsFormSelect
+                    ref="formSelect"
+                    v-model="formValue.dbResourceId"
+                    v-bind="dbResourceSetting"
+                    style="flex: 1;"
+                    @first="addDbResource"
+                  >
+                  </TsFormSelect>
+                  <div v-if="formValue.dbResourceId">
+                    <span class="tsfont-edit text-tip-active pl-md" @click="editDbResource()"></span>
+                  </div>
+                </div>
+              </TsFormItem>
+            </template>
             <template v-slot:accountId>
-              <div class="action-icon text-right">
-                <template v-if="getDisabled">
-                  <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
-                    <span class="tsfont-rotate-right text-tip-active" :class="getDisabledClassName"></span>
-                  </Tooltip>
-                  <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
-                    <span class="tsfont-edit text-tip-active pl-md" :class="getDisabledClassName"></span>
-                  </Tooltip>
-                </template>
-                <template v-else>
-                  <span class="tsfont-rotate-right text-tip-active" @click="refreshAccountList"></span>
-                  <span class="tsfont-edit text-tip-active pl-md" :class="getDisabledClassName" @click="toAssetManageEditAccount"></span>
-                </template>
-              </div>
-              <TsFormItem :label="$t('page.account')" :required="true">
-                <TsFormSelect
-                  ref="formSelect"
-                  v-model="formValue.accountId"
-                  v-bind="accountSetting"
-                  @first="toAssetManageEditAccount"
-                  @searchCallback="refreshSuccess()"
-                >
-                </TsFormSelect>
+              <TsFormItem :label="$t('page.account')" :required="true" tooltip="账号协议是database">
+                <div class="flex-start">
+                  <TsFormSelect
+                    ref="formSelect"
+                    v-model="formValue.accountId"
+                    v-bind="accountSetting"
+                    style="flex: 1;"
+                    @first="editAccount"
+                    @searchCallback="refreshSuccess()"
+                  >
+                  </TsFormSelect>
+                  <div class="pl-sm">
+                    <template v-if="getDisabled">
+                      <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
+                        <span class="tsfont-rotate-right text-tip-active" :class="getDisabledClassName"></span>
+                      </Tooltip>
+                      <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
+                        <span class="tsfont-edit text-tip-active pl-sm" :class="getDisabledClassName"></span>
+                      </Tooltip>
+                    </template>
+                    <template v-else>
+                      <span class="tsfont-rotate-right text-tip-active" @click="refreshAccountList"></span>
+                      <span class="tsfont-edit text-tip-active pl-sm" :class="getDisabledClassName" @click="editAccount"></span>
+                    </template>
+                  </div>
+                </div>
               </TsFormItem>
             </template>
           </TsForm>
@@ -52,6 +72,19 @@
         </div>
       </template>
     </TsDialog>
+    <DbResourceSettingDialog
+      v-if="isShowDbResourceDialog"
+      :isNewData="isAddDbResource"
+      :dbResourceData="dbResourceData"
+      :params="params"
+      @close="closeDbResourceSettingDialog"
+    ></DbResourceSettingDialog>
+    <AccountEditDialog
+      v-if="isShowAccountEditDialog"
+      :params="params"
+      :resourceId="resourceId"
+      @close="closeAccountEditDialog"
+    ></AccountEditDialog>
   </div>
 </template>
 <script>
@@ -60,7 +93,9 @@ export default {
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
     TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
-    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    DbResourceSettingDialog: () => import('./db-resource-setting-dialog.vue'),
+    AccountEditDialog: () => import('./account-edit-dialog')
   },
   props: {
     id: {
@@ -101,7 +136,6 @@ export default {
         validateList: ['required'],
         firstSelect: false
       },
-
       config: {},
       hasConfig: false,
       databaseList: [],
@@ -142,31 +176,9 @@ export default {
         },
         {
           name: 'dbResourceId',
-          type: 'select',
-          label: this.$t('page.database'),
-          validateList: ['required'],
-          dynamicUrl: '/api/rest/deploy/app/config/env/database/search',
-          params: {...this.params},
-          rootName: 'tbodyList',
-          firstSelect: false,
-          dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList); },
-          onChange: (dbResourceId) => {
-            this.getDBList(null);
-            if (dbResourceId) {
-              this.handleSpecialFields(dbResourceId);
-              this.dbResourceId = dbResourceId;
-              this.$set(this.accountSetting, 'disabled', false);
-              this.$set(this.accountSetting, 'disabledHoverTitle', '');
-              this.$set(this.accountSetting.params, 'resourceId', dbResourceId);
-              this.getAccountList();
-            } else {
-              this.dbResourceId = null;
-              this.$set(this.accountSetting, 'disabled', true);
-              this.$set(this.accountSetting, 'disabledHoverTitle', this.$t('form.placeholder.pleaseselect', {target: this.$t('page.database')}));
-              this.$set(this.accountSetting.params, 'resourceId', null);
-              this.$set(this.formValue, 'accountId', null); // 清空账号
-            }
-          }
+          type: 'slot',
+          label: '',
+          labelWidth: 1
         },
         {
           name: 'accountId',
@@ -283,7 +295,26 @@ export default {
           label: 'db2ProcTerminator',
           maxlength: 256
         }
-      ]
+      ],
+      dbResourceSetting: {
+        validateList: ['required'],
+        dynamicUrl: '/api/rest/deploy/app/config/env/database/search',
+        params: {...this.params},
+        rootName: 'tbodyList',
+        firstSelect: false,
+        firstLi: true,
+        firstText: this.$t('page.database'),
+        transfer: true,
+        dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList); },
+        onChange: (dbResourceId, item, selectItem) => {
+          this.changeDbResourceId(dbResourceId, selectItem);
+        }
+      },
+      dbResourceData: null,
+      isAddDbResource: false,
+      isShowDbResourceDialog: false,
+      isShowAccountEditDialog: false,
+      resourceId: null
     };
   },
   beforeCreate() {},
@@ -325,10 +356,14 @@ export default {
       if (nodeList && nodeList.length > 0) {
         nodeList.forEach(item => {
           databaseList.push({
+            ...item,
             text: this.getText(item),
             value: item.id
           });
         });
+        if (!this.dbResourceData && this.dbResourceId) {
+          this.dbResourceData = nodeList.find(item => item.id == this.dbResourceId);
+        }
       }
       return databaseList;
     },
@@ -438,12 +473,13 @@ export default {
     closeDialog(needRefresh = false) {
       this.$emit('close', needRefresh);
     },
-    toAssetManageEditAccount() {
-      // 跳转到资产清单页面，打开单个账号管理弹窗
+    editAccount() {
+      // 资产清单，打开单个账号管理弹窗
       if (this.getDisabled) {
         return false;
       }
-      window.open(HOME + '/cmdb.html#/asset-manage?resourceId=' + this.dbResourceId, '_blank');
+      this.resourceId = this.dbResourceId;
+      this.isShowAccountEditDialog = true;
     },
     refreshAccountList() {
       if (this.getDisabled) {
@@ -459,6 +495,52 @@ export default {
       if (this.accountSetting.params && this.accountSetting.params.hasOwnProperty('refreshUuid')) {
         delete this.accountSetting.params.refreshUuid;
       }
+    },
+    changeDbResourceId(dbResourceId, selectItem) {
+      this.getDBList(null);
+      if (dbResourceId) {
+        this.handleSpecialFields(dbResourceId);
+        this.dbResourceId = dbResourceId;
+        this.$set(this.accountSetting, 'disabled', false);
+        this.$set(this.accountSetting, 'disabledHoverTitle', '');
+        this.$set(this.accountSetting.params, 'resourceId', dbResourceId);
+        this.getAccountList();
+        this.dbResourceData = selectItem;
+      } else {
+        this.dbResourceId = null;
+        this.$set(this.accountSetting, 'disabled', true);
+        this.$set(this.accountSetting, 'disabledHoverTitle', this.$t('form.placeholder.pleaseselect', {target: this.$t('page.database')}));
+        this.$set(this.accountSetting.params, 'resourceId', null);
+        this.$set(this.formValue, 'accountId', null); // 清空账号
+        this.dbResourceData = null;
+      }
+    },
+    addDbResource() {
+      this.isAddDbResource = true;
+      this.isShowDbResourceDialog = true;
+    },
+    editDbResource() {
+      this.isAddDbResource = false;
+      this.isShowDbResourceDialog = true;
+    },
+    closeDbResourceSettingDialog(id) {
+      this.isLoading = true;
+      this.dbResourceData = null;
+      if (id && !this.dbResourceId) {
+        this.$set(this.formValue, 'dbResourceId', id);
+        this.changeDbResourceId(id);
+      }
+      this.isShowDbResourceDialog = false;
+      this.$nextTick(() => {
+        this.isLoading = false;
+      });
+    },
+    closeAccountEditDialog(needFresh) {
+      this.resourceId = null;
+      this.isShowAccountEditDialog = false;
+      if (needFresh) {
+        this.refreshAccountList();
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue
index 79f9425fe55f8ce86a61e74da06da8e0bc734057..d9fd6d9e470d7f3e8726d0a03c8a65c1a1fd3ef0 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue
@@ -34,74 +34,77 @@
           </Tooltip>
         </template>
       </ul>
-      <div
-        v-for="(item, index) in dbConfigList"
-        :key="index"
-        class="pb-lg db-list-box border-color"
-        :class="index == 0 ? (!item.isShow ? 'pt-nm pb-nm' : 'pt-nm') : (!item.isShow ? 'pt-nm pb-nm' : 'pt-lg')"
-      >
-        <header class="header-box pl-nm pr-nm" :class="item.isShow ? 'pb-nm' : ''">
-          <div>
-            <span class="text-grey title">{{ $t('term.deploy.databaseschema') }}</span>
-            <span>{{ item.dbSchema }}</span>
-          </div>
-          <div class="action-group">
-            <span v-if="hasEditConfigAuth" class="action-item tsfont-edit" @click="editDbConfig(item.id)"></span>
-            <template v-else>
-              <Tooltip
-                max-width="400"
-                placement="right"
-                transfer
-              >
-                <span class="text-disabled action-item tsfont-edit"></span>
-                <ul slot="content">
-                  <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
-                </ul>
-              </Tooltip>
-            </template>
-            <span v-if="hasEditConfigAuth" class="action-item tsfont-trash-o" @click="delDbConfig(item)"></span>
-            <template v-else>
-              <Tooltip
-                max-width="400"
-                placement="right"
-                transfer
-              >
-                <span class="text-disabled action-item tsfont-trash-o"></span>
-                <ul slot="content">
-                  <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
-                </ul>
-              </Tooltip>
-            </template>
-            <span class="action-item" :class="item.isShow ? 'tsfont-down' : 'tsfont-up'" @click="handleDownUp(item, index)"></span>
-          </div>
-        </header>
-        <ul v-if="item.isShow" class="ul-box pl-nm pr-nm">
-          <li class="pb-nm">
-            <span class="text-grey title">{{ $t('page.database') }}</span>
-            <span class="db-user-text-box">
-              <TsFormSelect
-                v-model="item.dbResourceId"
-                v-bind="dbSetting"
-              ></TsFormSelect>
-            </span>
-          </li>
-          <li class="pb-nm flex-box">
-            <span class="text-grey title">{{ $t('page.account') }}</span>
-            <span class="db-user-text-box">
-              <TsFormSelect
-                v-model="item.accountId"
-                v-bind="userSetting"
-              ></TsFormSelect>
-            </span>
-          </li>
-          <template v-if="item.config">
-            <li v-for="(configItem, key , cIndex) of item.config" :key="cIndex" class="pb-nm">
-              <span class="text-grey title">{{ advancedConfig[key] }}</span>
-              <span>{{ handleShowText(key, configItem) }}</span>
+      <Loading :loadingShow="loadingShow" type="fix"></Loading>
+      <template v-if="!loadingShow">
+        <div
+          v-for="(item, index) in dbConfigList"
+          :key="index"
+          class="pb-lg db-list-box border-color"
+          :class="index == 0 ? (!item.isShow ? 'pt-nm pb-nm' : 'pt-nm') : (!item.isShow ? 'pt-nm pb-nm' : 'pt-lg')"
+        >
+          <header class="header-box pl-nm pr-nm" :class="item.isShow ? 'pb-nm' : ''">
+            <div>
+              <span class="text-grey title">{{ $t('term.deploy.databaseschema') }}</span>
+              <span>{{ item.dbSchema }}</span>
+            </div>
+            <div class="action-group">
+              <span v-if="hasEditConfigAuth" class="action-item tsfont-edit" @click="editDbConfig(item.id)"></span>
+              <template v-else>
+                <Tooltip
+                  max-width="400"
+                  placement="right"
+                  transfer
+                >
+                  <span class="text-disabled action-item tsfont-edit"></span>
+                  <ul slot="content">
+                    <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
+                  </ul>
+                </Tooltip>
+              </template>
+              <span v-if="hasEditConfigAuth" class="action-item tsfont-trash-o" @click="delDbConfig(item)"></span>
+              <template v-else>
+                <Tooltip
+                  max-width="400"
+                  placement="right"
+                  transfer
+                >
+                  <span class="text-disabled action-item tsfont-trash-o"></span>
+                  <ul slot="content">
+                    <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
+                  </ul>
+                </Tooltip>
+              </template>
+              <span class="action-item" :class="item.isShow ? 'tsfont-down' : 'tsfont-up'" @click="handleDownUp(item, index)"></span>
+            </div>
+          </header>
+          <ul v-if="item.isShow" class="ul-box pl-nm pr-nm">
+            <li class="pb-nm">
+              <span class="text-grey title">{{ $t('page.database') }}</span>
+              <span class="db-user-text-box">
+                <TsFormSelect
+                  v-model="item.dbResourceId"
+                  v-bind="dbSetting"
+                ></TsFormSelect>
+              </span>
             </li>
-          </template>
-        </ul>
-      </div>
+            <li class="pb-nm flex-box">
+              <span class="text-grey title">{{ $t('page.account') }}</span>
+              <span class="db-user-text-box">
+                <TsFormSelect
+                  v-model="item.accountId"
+                  v-bind="userSetting"
+                ></TsFormSelect>
+              </span>
+            </li>
+            <template v-if="item.config">
+              <li v-for="(configItem, key , cIndex) of item.config" :key="cIndex" class="pb-nm">
+                <span class="text-grey title">{{ advancedConfig[key] }}</span>
+                <span>{{ handleShowText(key, configItem) }}</span>
+              </li>
+            </template>
+          </ul>
+        </div>
+      </template>
     </template>
   
     <EnvDbConfigEdit
@@ -134,6 +137,7 @@ export default {
   },
   data() {
     return {
+      loadingShow: false,
       dbConfigId: null,
       isShowDbConfigEdit: false,
       hasDbConfig: false,
@@ -217,6 +221,7 @@ export default {
     },
     searchDbConfig() {
       if (this.params) {
+        this.loadingShow = true;
         this.$api.deploy.applicationConfig.getEnvInfo(this.params).then((res) => {
           if (res && res.Status == 'OK') {
             let {DBConfigList} = res.Return;
@@ -232,6 +237,8 @@ export default {
               this.dbConfigList = [];
             }
           }
+        }).finally(() => {
+          this.loadingShow = false;
         });
       }
     },
diff --git a/src/views/pages/deploy/application-config/config/env/env-instance-bluegreen-dialog.vue b/src/views/pages/deploy/application-config/config/env/env-instance-bluegreen-dialog.vue
index dbffa3784c8dee50396e628299e56730c935c573..c4f54b1a0e22c2bba537dd978b192a7a43c98978 100644
--- a/src/views/pages/deploy/application-config/config/env/env-instance-bluegreen-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-instance-bluegreen-dialog.vue
@@ -48,6 +48,7 @@ export default {
         dataList: [],
         border: 'border',
         dynamicUrl: '/api/rest/deploy/bluegreen/search',
+        params: {isActive: 1},
         rootName: 'tbodyList',
         dealDataByUrl: this.dealDataByUrl,
         transfer: true
diff --git a/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue b/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
index b297b05fa6e899226a119df11713659152db2774..07df4adb5783379b965486c8da7c34d6786a9099 100644
--- a/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
@@ -64,7 +64,8 @@ export default {
             },
             {
               text: this.$t('term.deploy.selectexistexample'),
-              value: 2
+              value: 2,
+              description: '1. 应用环境和关联模块数据为空的实例\n2. 应用环境为当前环境且关联模块数据为空的实例\n3. 应用环境数据为空且关联模块为当前模块的实例'
             }
           ],
           validateList: ['required'],
@@ -91,8 +92,6 @@ export default {
           validateList: ['required'],
           multiple: false,
           transfer: true,
-          textName: 'label',
-          valueName: 'id',
           disabled: this.isEdit,
           dataList: []
         }
@@ -105,12 +104,13 @@ export default {
           multiple: true,
           transfer: true,
           validateList: ['required'],
-          params: {...this.params, isAutoConfig: 0},
+          params: {...this.params},
           rootName: 'tbodyList',
           dynamicUrl: 'api/rest/deploy/app/config/instance/search',
           dealDataByUrl: (list) => this.dealDataByUrl(list)
         }
-      ]
+      ],
+      ciId: null
     };
   },
   beforeCreate() {},
@@ -118,6 +118,7 @@ export default {
   beforeMount() {},
   async mounted() {
     await this.getAppInstanceCiAttrList();
+    await this.getResourceEntityByCiId();
     this.formList = this.exampleList.concat(this.addformList);
     this.$set(this.formValue, 'instance', 1);
     if (this.isEdit == true && this.instanceData) {
@@ -176,12 +177,22 @@ export default {
       }
       return dataList;
     },
+    getResourceEntityByCiId() {
+      return this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appinstance_env_appmodule_appsystem').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.ciId = res.Return.ciId;
+        }
+      });
+    },
     getCiList() {
-      this.$api.common.updateCmdbMenu({ciNameList: ['AppIns'], isAbstract: 0}).then((res) => {
+      if (!this.ciId) {
+        return false;
+      }
+      this.$api.cmdb.ci.getCiList({idList: [this.ciId], needChildren: 1, isAbstract: 0}).then((res) => {
         if (res && res.Status == 'OK') {
           this.addformList.forEach((item) => {
             if (item.name == 'ciId') {
-              item.dataList = res.Return ? res.Return[0]['ciList'] : [];
+              item.dataList = res.Return || [];
             }
           });
         }
diff --git a/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5f21a274270cc2d4a0275df054051e94f5dce339
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
@@ -0,0 +1,276 @@
+<template>
+  <TsDialog v-bind="dialogConfig" @on-close="closeDialog" @on-ok="savePrivateAccount">
+    <TsForm ref="form" v-model="formValue" :item-list="formConfig">
+    </TsForm>
+  </TsDialog>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+  },
+  filters: {},
+  props: {
+    accountId: {
+      // 账号id
+      type: Number,
+      default: null
+    },
+    resourceId: {
+      // 资产id
+      type: Number,
+      default: null
+    },
+    accountList: {
+      // 账号列表
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
+    params: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      protocol: '', // 协议
+      formValue: {
+        id: this.accountId,
+        name: '', // 前端拼接：用户名[协议]
+        account: '',
+        passwordPlain: null,
+        protocolId: null,
+        tagIdList: []
+      },
+      dialogConfig: {
+        type: 'modal',
+        isShow: true,
+        title: this.accountId ? this.$t('dialog.title.edittarget', {'target': this.$t('page.privateaccount')}) : this.$t('page.newtarget', {'target': this.$t('page.privateaccount')})
+      },
+      formConfig: {
+        id: {
+          type: 'text',
+          name: 'id',
+          isHidden: true,
+          value: this.accountId
+        },
+        name: {
+          type: 'text',
+          name: 'name',
+          width: '100%',
+          label: this.$t('page.name'),
+          maxlength: 50,
+          isHidden: true
+        },
+        account: {
+          type: 'text',
+          name: 'account',
+          width: '100%',
+          label: this.$t('page.username'),
+          maxlength: 50,
+          validateList: ['required', {
+            name: 'custom',
+            trigger: 'change',
+            message: this.$t('term.cmdb.repeataccount'),
+            validator: (rule, val) => {
+              return this.validAccountProtocalUnique(val);
+            }
+          }],
+          isHidden: false
+        },
+        passwordPlain: {
+          type: 'password',
+          name: 'passwordPlain',
+          width: '100%',
+          label: this.$t('page.password')
+        },
+        protocolId: {
+          type: 'select',
+          width: '100%',
+          label: '协议',
+          placeholder: this.$t('form.validate.selectprotocol'),
+          dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
+          rootName: 'tbodyList',
+          dealDataByUrl: (nodeList) => { return this.dealProtocolIdDataByUrl(nodeList); },
+          name: 'protocolId',
+          errorMessage: '',
+          validateList: ['required', {
+            name: 'custom',
+            trigger: 'change',
+            message: this.$t('term.cmdb.repeataccount'),
+            validator: (rule, protocolId) => {
+              return this.validAccountProtocalUnique();
+            }
+          }],
+          transfer: true,
+          onChangelabel: (label) => {
+            this.protocol = label;
+          },
+          onChange: (val, objectValue) => {
+            this.protocol = objectValue ? objectValue.text : '';
+            if (!this.validAccountProtocalUnique()) {
+              this.$set(this.formConfig['protocolId'], 'errorMessage', this.$t('term.cmdb.repeataccount'));
+            } else {
+              this.$set(this.formConfig['protocolId'], 'errorMessage', '');
+            }
+            if (val == '478184378212353') {
+              // 如果选择为 tagent 的时候，用户名为非必填
+              this.formConfig.account.validateList = [];
+              this.formConfig.account.isHidden = true; // 隐藏账号字段
+            } else {
+              this.formConfig.account.validateList = ['required',
+                {
+                  name: 'custom',
+                  trigger: 'change',
+                  message: this.$t('term.cmdb.repeataccount'),
+                  validator: (rule, val) => {
+                    return this.validAccountProtocalUnique(val);
+                  }
+                }];
+              this.formConfig.account.isHidden = false;
+            }
+          }
+        },
+        tagIdList: {
+          type: 'select',
+          name: 'tagIdList',
+          width: '100%',
+          label: this.$t('page.tag'),
+          transfer: true,
+          multiple: true,
+          search: true,
+          allowCreate: true,
+          dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
+          rootName: 'tbodyList',
+          textName: 'name',
+          valueName: 'id'
+        }
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.getAccountInfoById();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getProtocalName(protocalPort) {
+      let protocolName = protocalPort;
+      return protocolName;
+    },
+    validAccountProtocalUnique(account) {
+      // 验证协议和账号唯一
+      let isValid = true;
+      let accountName = '';
+      let accountList = this.$utils.deepClone(this.accountList) || []; // 编辑私有账号时，不验证自身协议和账号唯一
+      accountList = accountList.filter((item) => {
+        return item.value != this.accountId;
+      });
+      if (this.protocol && (account || (this.formValue && this.formValue.account))) {
+        accountName = account || (this.formValue && this.formValue.account);
+        for (let i = 0; i < accountList.length; i++) {
+          if (accountList[i] && accountList[i].config && accountList[i].config.account && (accountList[i].config.account == accountName) && (accountList[i].config.protocol == this.protocol)) {
+            isValid = false;
+          }
+        }
+      }
+      if (isValid) {
+        this.$set(this.formConfig['protocolId'], 'errorMessage', '');
+      }
+      return isValid;
+    },
+    savePrivateAccount() {
+      const form = this.$refs['form'];
+      let formValue = this.$refs.form.getFormValue();
+      if (!form.valid()) {
+        return;
+      }
+      let data = {
+        ...formValue, 
+        appSystemId: this.params.appSystemId,
+        appModuleId: this.params.appModuleId,
+        envId: this.params.envId,
+        type: 'private', 
+        resourceId: this.resourceId,
+        name: `${formValue.account}[${this.protocol}]`
+      };
+      // 私有账号
+      this.$api.deploy.env.saveEnvDbPrivateaccount(data).then(res => {
+        if (res && (res.Status == 'OK')) {
+          this.handleTipsMessage(res.Return);
+        }
+      });
+    },
+    handleTipsMessage(res) {
+      // 失败，错误提示
+      if (res && res.failureReasonList && res.failureReasonList instanceof Array && res.failureReasonList.length > 0) {
+        this.$Notice.error({
+          title: this.$t('term.framework.errorinfo'),
+          duration: 10,
+          render: h => {
+            return h('div', [
+              h(
+                'ul',
+                { class: 'pb-md'},
+                res.failureReasonList.map(item => {
+                  return h('li', {}, item || '');
+                })
+              ),
+              h('div', {}, this.$t('term.cmdb.repeataccount'))
+            ]);
+          }
+        });
+      } else {
+        this.$Message.success(this.$t('message.savesuccess'));
+        this.closeDialog(true);
+      }
+    },
+    getAccountInfoById() {
+      if (this.accountId) {
+        this.$api.cmdb.accountManage.getAccountById(this.accountId).then(res => {
+          this.tableData = res.Return;
+          for (let key in this.formConfig) {
+            this.$set(this.formValue, [key], this.tableData[key]);
+          }
+          if (this.tableData.tagList && this.tableData.tagList.length > 0) {
+            let idList = [];
+            this.tableData.tagList.forEach(v => {
+              idList.push(v.id);
+            });
+            this.$set(this.formValue, 'tagIdList', idList);
+          }
+        });
+      }
+    },
+    dealProtocolIdDataByUrl(nodeList) {
+      // 处理协议id下拉列表
+      let dataList = [];
+      if (nodeList && nodeList.length > 0) {
+        nodeList.forEach((item) => {
+          dataList.push({
+            text: item.name,
+            value: item.id,
+            _disabled: item.id == '445524809146368'
+          });
+        });
+      }
+      return dataList;
+    },
+    closeDialog(needRefresh) {
+      this.$emit('close', needRefresh);
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
diff --git a/src/views/pages/deploy/application-config/pipeline-detail.vue b/src/views/pages/deploy/application-config/pipeline-detail.vue
index 87faa0940204f5c51b8ac974c2c787a8622976c1..bb2b6453c41b89c6ae1b854e62a83bae1cbaf1ad 100644
--- a/src/views/pages/deploy/application-config/pipeline-detail.vue
+++ b/src/views/pages/deploy/application-config/pipeline-detail.vue
@@ -934,6 +934,15 @@ export default {
               operationUuid: p.uuid,
               id: '#id_' + step.uuid + '_' + p.uuid
             });
+            if (this.$utils.isEmpty(p.config.ifList) && this.$utils.isEmpty(p.config.elseList)) {
+              validList.push({
+                text: this.$t('page.phase') + step.name + '【' + p.operationName + '】：' + this.$t('term.deploy.chooseatleastonetool'),
+                type: 'error',
+                stepUuid: step.uuid,
+                operationUuid: p.uuid,
+                id: '#id_' + step.uuid + '_' + p.uuid
+              });
+            }
             if (p.config.ifList && p.config.ifList.length) {
               let validIfList = this.validPhaseOperationList(step, p.config.ifList);
               validIfList.length && validList.push(...validIfList);
diff --git a/src/views/pages/deploy/application-config/pipeline/profile-setting.vue b/src/views/pages/deploy/application-config/pipeline/profile-setting.vue
index ed2e9795950627058bc6a3c30314055d44dd55d6..949bf929588aa76b2aa0747dc6d874c62f259be5 100644
--- a/src/views/pages/deploy/application-config/pipeline/profile-setting.vue
+++ b/src/views/pages/deploy/application-config/pipeline/profile-setting.vue
@@ -74,10 +74,11 @@
                 <ul class="tstable-action-ul">
                   <li class="icon tsfont-tool">
                     <Dropdown
-                      :visible="isVisible"
-                      trigger="click"
+                      :visible="referenceListMap[row.id]"
+                      trigger="custom"
                       transfer
-                      @on-visible-change="(val)=>{getReferenceList(val, row, item)}"
+                      @click.native="getReferenceList(row, item)"
+                      @on-clickoutside="referenceListMap[row.id] = false"
                     >
                       <span class="text-action">{{ $t('term.deploy.referencequery') }}</span>
                       <DropdownMenu v-if="referenceList.length > 0" slot="list" class="dropdown">
@@ -203,7 +204,8 @@ export default {
       },
       isVisible: false,
       isHideAll: true,
-      profileMap: {} //预置参数id对应的参数列表
+      profileMap: {}, //预置参数id对应的参数列表
+      referenceListMap: {} //预置参数id对应的是否展示引用列表
     };
   },
   beforeCreate() {},
@@ -243,8 +245,16 @@ export default {
       let isAnyExpand = this.profileList.some(item => !item.isHide);
       this.isHideAll = !isAnyExpand;
     },
-    getReferenceList(val, row, item) {
-      if (!val) {
+    getReferenceList(row, item) {
+      Object.keys(this.referenceListMap).forEach(key => {
+        this.$set(this.referenceListMap, key, key == row.id ? !this.referenceListMap[key] : false);
+      });
+      // 如果当前row.id不存在，则设置为true
+      if (!(row.id in this.referenceListMap)) {
+        this.$set(this.referenceListMap, row.id, true);
+      }
+     
+      if (!this.referenceListMap[row.id]) {
         return;
       }
       let data = {
diff --git a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue
index dde31bebf284ee915a80e4b1c00f88c71b1fbc3a..3626be3215025f65604ef5fc341a2f2d349e787a 100644
--- a/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue
+++ b/src/views/pages/deploy/application-config/pipeline/step/step-edit.vue
@@ -41,46 +41,86 @@
               ></TsFormSelect>
             </TsFormItem>
           </div>
-          <div v-if="envId && editConfig.execMode !='runner' && editConfig.execMode !='sqlfile' && (!groupConfig || groupConfig.policy !='grayScale')" class="mt-lg">
-            <TsFormItem
-              :label="$t('term.deploy.presetexecutiontarget')"
-              labelPosition="left"
-              :labelWidth="115"
-              :tooltip="executeTooltip"
-            >
-              <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
-            </TsFormItem>
-            <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
-              <TsForm
-                ref="executeForm"
-                v-model="executeConfig"
-                :itemList="executeForm"
+          <template v-if="envId && (!groupConfig || groupConfig.policy !='grayScale')">
+            <div v-if="editConfig.execMode !='runner' && editConfig.execMode !='sqlfile'" class="mt-lg">
+              <TsFormItem
+                :label="$t('term.deploy.presetexecutiontarget')"
+                labelPosition="left"
+                :labelWidth="115"
+                :tooltip="executeTooltip"
+              >
+                <TsFormSwitch v-model="executeConfig.isPresetExecuteConfig" :disabled="!canEdit"></TsFormSwitch>
+              </TsFormItem>
+              <template v-if="(!groupConfig || groupConfig.policy!='grayScale') && executeConfig.isPresetExecuteConfig">
+                <TsForm
+                  ref="executeForm"
+                  v-model="executeConfig"
+                  :itemList="executeForm"
+                  labelPosition="left"
+                  tipPlacement="right"
+                  :labelWidth="115"
+                >
+                  <template v-slot:executeUser>
+                    <ExecuteuserSetting
+                      ref="executeUser"
+                      :config="executeConfig.executeUser"
+                      :disabled="!canEdit"
+                      :runtimeParamList="runtimeParamList"
+                      :isEditRuntimeParam="false"
+                    ></ExecuteuserSetting>
+                  </template>
+                </TsForm>
+                <div class="pt-nm">
+                  <TargetDetail
+                    ref="targetDetail"
+                    :runtimeParamList="runtimeParamList"
+                    :canEdit="canEdit"
+                    :config="executeConfig.executeNodeConfig"
+                    :isAddParam="true"
+                    :labelWidth="115"
+                  ></TargetDetail>
+                </div>
+              </template>
+            </div>
+            <!-- <div v-if="editConfig.execMode ==='runner'">
+              <TsFormItem
+                :label="$t('term.deploy.presetrunnergroup')"
                 labelPosition="left"
-                tipPlacement="right"
                 :labelWidth="115"
+                :tooltip="runnerGroupTooltip"
               >
-                <template v-slot:executeUser>
-                  <ExecuteuserSetting
-                    ref="executeUser"
-                    :config="executeConfig.executeUser"
+                <TsFormSwitch v-model="executeConfig.isPresetRunnerGroup" :disabled="!canEdit"></TsFormSwitch>
+              </TsFormItem>
+              <template v-if="executeConfig.isPresetRunnerGroup">
+                <TsFormItem
+                  :label="$t('term.deploy.actuatorgrouptag')"
+                  labelPosition="left"
+                  :labelWidth="115"
+                >
+                  <RunnerGroupTagSetting
+                    ref="runnerGroupTag"
+                    :config="executeConfig.runnerGroupTag"
                     :disabled="!canEdit"
                     :runtimeParamList="runtimeParamList"
-                    :isEditRuntimeParam="false"
-                  ></ExecuteuserSetting>
-                </template>
-              </TsForm>
-              <div class="pt-nm">
-                <TargetDetail
-                  ref="targetDetail"
-                  :runtimeParamList="runtimeParamList"
-                  :canEdit="canEdit"
-                  :config="executeConfig.executeNodeConfig"
-                  :isAddParam="true"
+                    :isRequired="false"
+                  ></RunnerGroupTagSetting>
+                </TsFormItem>
+                <TsFormItem
+                  :label="$t('page.autoexeccomboprunnergrouplabel')"
+                  labelPosition="left"
                   :labelWidth="115"
-                ></TargetDetail>
-              </div>
-            </template>
-          </div>
+                >
+                  <RunnerGroupSetting
+                    ref="runnerGroup"
+                    :config="!$utils.isEmpty(executeConfig.runnerGroup)?executeConfig.runnerGroup : runnerGroup"
+                    :disabled="!canEdit"
+                    :runtimeParamList="runtimeParamList"
+                    :isRequired="false"
+                  ></RunnerGroupSetting>
+                </TsFormItem>
+              </template>
+            </div> -->
+          </template>
         </div>
       </template>
       <template v-slot:footer>
@@ -115,6 +155,8 @@ export default {
     TargetDetail: () => import('@/views/pages/autoexec/components/common/addTarget/target-detail'),
     TargetValid: () => import('@/views/pages/autoexec/components/common/targetView/target-valid.vue'),
     ExecuteuserSetting: () => import('@/views/pages/autoexec/detail/actionDetail/executeuser-setting.vue')
+    // RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue'),
+    // RunnerGroupTagSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergrouptag-setting.vue')
   },
   props: {
     canEdit: {
@@ -202,12 +244,21 @@ export default {
         executeUser: {},
         roundCount: null,
         isPresetExecuteConfig: 0,
-        executeNodeConfig: {}
+        executeNodeConfig: {},
+        isPresetRunnerGroup: 0,
+        runnerGroup: null,
+        runnerGroupTag: null
       },
       resultList: [], //执行目标校验结果
       isValid: true, //校验结果通过
       isShowTargetValid: false,
-      executeTooltip: this.$t('term.autoexec.executeTooltip')
+      executeTooltip: this.$t('term.autoexec.executeTooltip'),
+      runnerGroupTooltip: this.$t('term.autoexec.runnerGroupTooltip'),
+      runnerGroup: {
+        mappingMode: 'constant',
+        value: '',
+        text: ''
+      }
     };
   },
   beforeCreate() {},
@@ -234,6 +285,9 @@ export default {
               this.executeConfig[key] = this.editConfig.config.executeConfig[key];
             }
           });
+          if (!this.$utils.isEmpty(this.executeConfig.runnerGroup) || !this.$utils.isEmpty(this.executeConfig.runnerGroupTag)) {
+            this.$set(this.executeConfig, 'isPresetRunnerGroup', 1);
+          }
         }
       }
       for (let key in this.formItem) {
@@ -252,7 +306,7 @@ export default {
         if (!this.isValid) {
           return;
         }
-        if (this.executeConfig.isPresetExecuteConfig) {
+        if (this.executeConfig.isPresetExecuteConfig || this.executeConfig.isPresetRunnerGroup) {
           this.saveExecuteNodeConfig();
         } else if (this.editConfig.config) {
           this.$set(this.editConfig.config, 'executeConfig', {});
@@ -353,11 +407,17 @@ export default {
       if (this.$refs.executeUser) {
         this.$set(this.executeConfig, 'executeUser', this.$refs.executeUser.save());
       }
+      if (this.$refs.runnerGroupTag) {
+        this.$set(this.executeConfig, 'runnerGroupTag', this.$refs.runnerGroupTag.save());
+      }
+      if (this.$refs.runnerGroup) {
+        this.$set(this.executeConfig, 'runnerGroup', this.$refs.runnerGroup.save());
+      }
       if (this.$refs.targetDetail) {
         let executeNodeConfig = this.$refs.targetDetail.save();
         this.executeConfig.executeNodeConfig = executeNodeConfig;
-        this.$set(this.editConfig.config, 'executeConfig', this.executeConfig);
       }
+      this.$set(this.editConfig.config, 'executeConfig', this.executeConfig);
     },
     saveValid() {
       this.saveExecuteNodeConfig();
diff --git a/src/views/pages/deploy/application-config/pipeline/step/step-list.vue b/src/views/pages/deploy/application-config/pipeline/step/step-list.vue
index 3c93a339f7833c4d57200d4dcb4efcfa8becc7a1..63e2fc73a94322b2de6e17a0ab86afba14b33505 100644
--- a/src/views/pages/deploy/application-config/pipeline/step/step-list.vue
+++ b/src/views/pages/deploy/application-config/pipeline/step/step-list.vue
@@ -12,7 +12,7 @@
         tag="ul"
         :list="list"
         handle=".stepIndex"
-        :disabled="!canEdit"
+        :disabled="!canEdit || appModuleId || envId"
         @end="dragEnd"
       >
         <template v-for="(ary, sindex) in list">
@@ -20,13 +20,13 @@
             v-if="ary && ary.length"
             :key="sindex"
             class="border-color"
-            :class="{edit:canEdit}"
+            :class="{edit:canEdit && !appModuleId && !envId}"
           >
             <span
               class="stepIndex border-color tsfont bg-op"
               :class="{'text-primary border-primary':ary.find(item=>item.uuid==currentStep.uuid)}"
               :data-index="sindex + 1"
-              :title="canEdit?$t('term.deploy.dragtochangetheorder'):''"
+              :title="canEdit && !appModuleId && !envId?$t('term.deploy.dragtochangetheorder'):''"
               @click.stop
             ></span>
             <draggable
@@ -53,7 +53,7 @@
                       <div class="step-content-top" @click="showStep(step)">
                         <div class="stepName name overflow" :class="{'text-primary':step.uuid == currentStep.uuid}" :title="step.name && step.name.length > 9 ? step.name : ''">
                           <span
-                            v-if="canEdit && ary.length > 1"
+                            v-if="canEdit && ary.length > 1 && (!appModuleId && !envId)"
                             class="tsfont-bar move"
                             :title="canEdit ? '阶段组内拖拽排序' : ''"
                             @click.stop
@@ -78,9 +78,9 @@
                           <span class="text-grey fz10">{{ getExecModeText(step.execMode) }}</span>
                         </div>
                         <div class="stepBtn" @click.stop>
-                          <!-- 阶段的增删：只能在应用层; 阶段的修改：应用层可以修改名称，模块层不能修改阶段，环境层只能修改执行目标 -->
+                          <!-- 阶段的增删：只能在应用层; 阶段的修改：应用层可以修改名称，模块层不能修改阶段;环境层只能修改执行目标且阶段必须重载 -->
                           <i v-if="canEdit && !appModuleId && !envId" class="tsfont-plus text-tip-active" @click="editStep('add', step, sindex)"></i>
-                          <i v-if="canEdit && (envId || (appSystemId && !appModuleId && !envId))" class="tsfont-edit text-tip-active pl-md" @click="editStep('edit', step, sindex)"></i>
+                          <i v-if="canEdit && ((envId && step.hasOwnProperty('override') && step.override) || (appSystemId && !appModuleId && !envId))" class="tsfont-edit text-tip-active pl-md" @click="editStep('edit', step, sindex)"></i>
                           <i v-if="canEdit && !appModuleId && !envId" class="tsfont-trash-o text-tip-active pl-md" @click="delStep(step,sindex)"></i>
                           <i class="text-tip-active pl-md" :class="step.isShow? 'tsfont-up' : 'tsfont-down'" @click="showStep(step)"></i>
                         </div>
diff --git a/src/views/pages/deploy/deploy.js b/src/views/pages/deploy/deploy.js
index 664beb8bc992d5679ac6224ee10170dacce433b6..27153d9b78ac21f678db22bade10245af6e6698a 100644
--- a/src/views/pages/deploy/deploy.js
+++ b/src/views/pages/deploy/deploy.js
@@ -6,6 +6,7 @@ import store from '@/resources/store';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 import VueI18n from 'vue-i18n';
 import toolCatalogUtils from '@/views/pages/autoexec/utils/tools-catalog';
@@ -30,6 +31,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$toolCatalogUtils = toolCatalogUtils;
 Vue.prototype.$localStore = new LocalStore('deploy', router);
+Vue.prototype.$state = new State('deploy');
 
 new Vue({
   router,
diff --git a/src/views/pages/deploy/job/job-add.vue b/src/views/pages/deploy/job/job-add.vue
index 857fc04912bf03d0fbc3b046168dbe5f59d53d4e..50f74e4b3bae7289686d63fc78c9e15e3be11ecf 100644
--- a/src/views/pages/deploy/job/job-add.vue
+++ b/src/views/pages/deploy/job/job-add.vue
@@ -114,8 +114,22 @@
             ></ModuleList>
           </div>
           <div id="roundCount" class="box-block">
-            <Divider orientation="start">{{ $t('term.autoexec.batchsetting') }}</Divider>
+            <Divider orientation="start">{{ $t('page.autoexecparallel') }}</Divider>
             <div>
+              <TsFormItem
+                :label="$t('page.autoexecparallpolicy')"
+                :labelWidth="100"
+                labelPosition="left"
+                :required="true"
+              >
+                <TsFormRadio
+                  v-model="parallelPolicy"
+                  :dataList="parallelPolicyDataList"
+                  @on-change="changeParallelPolicy"
+                ></TsFormRadio>
+              </TsFormItem>
+            </div>
+            <div v-if="parallelPolicy === 'roundCount'">
               <TsFormItem
                 :label="$t('term.autoexec.batchquantity')"
                 :labelWidth="100"
@@ -128,6 +142,20 @@
                 ></TsFormSelect>
               </TsFormItem>
             </div>
+            <div v-else>
+              <TsFormItem
+                :label="$t('term.autoexec.parall')"
+                :labelWidth="100"
+                labelPosition="left"
+                :required="true"
+              >
+                <TsFormSelect
+                  ref="parallelForm"
+                  v-model="parallelCount"
+                  v-bind="parallelForm"
+                ></TsFormSelect>
+              </TsFormItem>
+            </div>
           </div>
           <div v-if="runtimeParamList && runtimeParamList.length > 0" id="param" class="box-block">
             <Divider orientation="start">{{ $t('term.autoexec.jobparam') }}</Divider>
@@ -174,7 +202,8 @@ export default {
     SaveSetting: () => import('@/views/pages/autoexec/detail/runnerDetail/save-setting.vue'),
     ResultDialog: () => import('./publishing/result-dialog'),
     PublishingValid: () => import('./publishing/publishing-valid'),
-    PhaseList: () => import('./publishing/phase-list')
+    PhaseList: () => import('./publishing/phase-list'),
+    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio')
   },
   props: {},
   data() {
@@ -201,6 +230,17 @@ export default {
         desc: this.$t('term.autoexec.roundcountdescrition'),
         validateList: ['required', 'maxNum']
       },
+      parallelForm: {
+        placeholder: this.$t('page.selectinput'),
+        border: 'border',
+        dataList: this.getRoundCountList(),
+        filterName: 'text',
+        // allowCreate: true,
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.paralldesc'),
+        validateList: ['required', 'maxNum']
+      },
       runtimeParamList: [], //作业参数
       combopPhaseList: [],
       isSaveDialog: false,
@@ -216,7 +256,19 @@ export default {
       jobConfig: {},
       paramValue: {},
       saveLoading: false,
-      moduleEnvInstanceMap: {}
+      moduleEnvInstanceMap: {},
+      parallelPolicyDataList: [
+        {
+          text: this.$t('page.autoexecparall'),
+          value: 'parallel'
+        },
+        {
+          text: this.$t('page.autoexecbatchround'),
+          value: 'roundCount'
+        }
+      ],
+      parallelPolicy: 'roundCount',
+      parallelCount: 4
     };
   },
   beforeCreate() {},
@@ -376,6 +428,8 @@ export default {
         envId: this.envId,
         scenarioId: this.scenarioId,
         roundCount: this.roundCount,
+        parallelCount: this.parallelCount,
+        parallelPolicy: this.parallelPolicy,
         param: {},
         moduleList: this.$refs.moduleList.getData()
       };
@@ -524,6 +578,8 @@ export default {
         }
       });
       this.jobConfig.roundCount && (this.roundCount = this.jobConfig.roundCount);
+      this.jobConfig.parallelCount && (this.parallelCount = this.jobConfig.parallelCount);
+      this.jobConfig.parallelPolicy && (this.parallelPolicy = this.jobConfig.parallelPolicy);
       this.paramValue = this.jobConfig.param || {};
       if (this.jobConfig.scenarioId) {
         let findScenario = this.initData.scenarioList.find((item) => item.isEnable == true && item.scenarioId == this.jobConfig.scenarioId);
@@ -549,6 +605,13 @@ export default {
       ];
       list.push(...this.$utils.getRoundCountList());
       return list;
+    },
+    changeParallelPolicy(val) {
+      if (val && val == 'roundCount') {
+        this.roundCount = this.roundCount || 64;
+      } else {
+        this.parallelCount = this.parallelCount || 32;
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/job/job-manage.vue b/src/views/pages/deploy/job/job-manage.vue
index 68241e0b77d4d2d9d634283c8fea2ccf6f766e16..0a54f52693732f492f43b09a2363fb3bfa53494b 100644
--- a/src/views/pages/deploy/job/job-manage.vue
+++ b/src/views/pages/deploy/job/job-manage.vue
@@ -86,92 +86,13 @@
       </template>
       <template v-slot:content>
         <div class="job-content">
-          <TsTable
-            v-bind="jobData"
-            :theadList="theadList"
-            :loading="isLoading"
+          <DeployPipelineTable
+            ref="tableData"
+            :defaultSearchParam="searchParam"
+            :defaultSearchValue="searchValue"
             :sortList="sortList"
             :sortOrder="sortOrder"
-            :sortMulti="false"
-            @changeCurrent="searchJob"
-            @changePageSize="changePageSize"
-            @updateSort="updateSort"
-          >
-            <template v-slot:showChildren="{ row }">
-              <span v-if="row.parentId == -1" class="text-href">
-                <span v-if="!row.loading" :class="{ 'tsfont-minus-square': row['showChildren'], 'tsfont-plus-square': !row['showChildren'] }" @click="toggleChildJob(row)"></span>
-                <Icon
-                  v-else
-                  type="ios-loading"
-                  size="16"
-                  class="loading"
-                ></Icon>
-              </span>
-            </template>
-            <template v-slot:name="{ row }">
-              <span
-                v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'"
-                class="text-href"
-                @click="toBatchJobDetail(row)"
-                @contextmenu="newTab($event, row, 'batch-job-detail')"
-              >
-                {{ row.name }}
-              </span>
-              <span
-                v-else
-                class="text-href"
-                :class="{ 'ml-nm': (!!row.parentId && row.parentId != -1) }"
-                @contextmenu="newTab($event, row, 'job-detail')"
-                @click="toJobDetail(row)"
-              >{{ row.name }}</span>
-              <span><Status v-if="row.reviewStatus != 'passed'" :statusValue="row.reviewStatus" :statusName="row.reviewStatusName"></Status></span>
-              <Tooltip
-                v-if="row.warnCount > 0 || row.isHasIgnored > 0"
-                transfer
-                class="stepStatues com-status"
-                placement="bottom"
-                theme="light"
-              >
-                <span class="tsfont-warning-o text-warn"></span>
-                <template v-slot:content>
-                  <div>
-                    <div v-if="row.warnCount > 0">{{ $t('term.autoexec.loghaswarninfo') }}</div>
-                    <div v-if="row.isHasIgnored > 0">{{ $t('term.deploy.phaseexistignorenode') }}</div>
-                  </div>
-                </template>
-              </Tooltip>
-            </template>
-            <!-- <template slot="operationType" slot-scope="{ row }">
-              <span class="text-href" @click="toOperationDetail(row)">
-                <span>{{ row.operationTypeName }}</span>
-                <span v-if="row.operationName">({{ row.operationName }})</span>
-              </span>
-            </template> -->
-            <template slot="routeName" slot-scope="{ row }">
-              <span v-if="row.source == 'batchdeploy'">
-                <span>{{ row.route && row.route.name }}</span>
-              </span>
-              <span v-else class="text-href" @click="toRoute(row)">
-                <span>{{ row.route && row.route.name }}</span>
-              </span>
-            </template>
-            <template slot="status" slot-scope="{ row }">
-              <Status :statusValue="row.status" :statusName="row.statusName" type="text"></Status>
-            </template>
-            <template v-slot:startTime="{ row }">
-              <div v-if="row.startTime" class="fz10">
-                <span>{{ row.startTime | formatDate }}</span>
-                <span class="text-grey ml-xs">{{ $t('page.begin') }}</span>
-              </div>
-              <div v-if="row.endTime" class="fz10">
-                <span>{{ row.endTime | formatDate }}</span>
-                <span class="text-grey ml-xs">{{ $t('page.finish') }}</span>
-              </div>
-            </template>
-            <template slot="completionRate" slot-scope="{ row }">
-              <Liquid :percent="row.completionRate" :size="7" :config="getConfig(row)" />
-            </template>
-          </TsTable>
+          ></DeployPipelineTable>
         </div>
       </template>
     </TsContain>
@@ -225,15 +146,13 @@ export default {
   components: {
     CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue'),
     AppModuleList: () => import('../application-config/config/app/app-module-list.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    Status: () => import('@/resources/components/Status/CommonStatus.vue'),
-    Liquid: () => import('@/resources/components/SimpleGraph/Liquid.vue'),
     // SettingDialog:()=>import('./publishing/setting-dialog.vue'),
     AppEdit: () => import('@/views/pages/deploy/application-config/config/app/app-edit'), // 编辑权限
     ModuleEdit: () => import('@/views/pages/deploy/application-config/config/app/components/module-tree-edit'), // 编辑模块
     EnvEdit: () => import('@/views/pages/deploy/application-config/config/app/components/env-tree-edit'), // 编辑模块
     LockDialog: () => import('@/views/pages/deploy/job/resourcelock/resourcelock-dialog'), //资源锁
-    AddBatchJobDialog: () => import('./add-batch-job-dialog.vue')
+    AddBatchJobDialog: () => import('./add-batch-job-dialog.vue'),
+    DeployPipelineTable: () => import('@/views/pages/deploy/job/publishing/deploy-pipeline-table.vue')
   },
   props: {},
   data() {
@@ -243,7 +162,6 @@ export default {
       sortOrder: [{planStartTime: 'DESC'}],
       noConfigInfo: false, // 无配置信息，模块和环境
       moduleList: [],
-      isLoading: false,
       isShowResourceLockDialog: false,
       appModuleData: {},
       searchValue: {},
@@ -289,60 +207,6 @@ export default {
           }
         ]
       },
-      jobData: null,
-      jobEndStatusList: ['completed', 'aborted', 'ignored', 'failed'], //终点状态节点列表，非终点状态列表的需要定时刷新。
-      theadList: [
-        { key: 'showChildren' },
-        {
-          title: this.$t('page.name'),
-          key: 'name'
-        },
-        {
-          title: this.$t('page.scene'),
-          key: 'scenarioName'
-        },
-        {
-          title: this.$t('page.status'),
-          key: 'status'
-        },
-        {
-          title: this.$t('page.timecost'),
-          key: 'costTime'
-        },
-        {
-          title: this.$t('page.executeuser'),
-          key: 'execUserVo',
-          type: 'user',
-          uuid: 'uuid'
-        },
-        {
-          title: this.$t('page.sourcecategory'),
-          key: 'routeName'
-        },
-        {
-          title: this.$t('page.source'),
-          key: 'sourceName'
-        },
-        {
-          title: this.$t('page.plantime'),
-          key: 'planStartTime',
-          type: 'time'
-        },
-        {
-          title: this.$t('page.startstoptime'),
-          key: 'startTime',
-          keyend: 'endTime'
-        },
-        {
-          title: this.$t('term.autoexec.triggertype'),
-          key: 'triggerTypeName'
-        },
-        {
-          title: this.$t('term.autoexec.executionsituation'),
-          key: 'completionRate'
-        }
-      ],
-      contentHeight: 100,
       showDialog: false,
       selectedTreeNodeConfig: {},
       selectedApp: null,
@@ -374,15 +238,12 @@ export default {
     }
   },
   beforeMount() {},
-  mounted() {
-    this.searchJob();
-  },
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
   deactivated() {},
-  beforeDestroy() {
-    this.clearTimmer();
+  beforeDestroy() {  
   },
   destroyed() {},
   methods: {
@@ -408,39 +269,6 @@ export default {
         });
       }
     },
-    toggleChildJob(row, isShow) {
-      if (row['showChildren']) {
-        this.$set(row, 'showChildren', false);
-        for (let i = this.jobData.tbodyList.length - 1; i >= 0; i--) {
-          const element = this.jobData.tbodyList[i];
-          if (element.parentId === row.id) {
-            this.jobData.tbodyList.splice(i, 1);
-          }
-        }
-      } else {
-        this.getChildrenJob(row);
-      }
-    },
-    getChildrenJob(parentRow) {
-      this.$set(parentRow, 'loading', true);
-      this.$api.deploy.job.searchJobList({ parentId: parentRow.id }).then(res => {
-        const jobList = res.Return.tbodyList;
-        if (jobList && jobList.length > 0) {
-          const pIndex = this.jobData.tbodyList.findIndex(d => d === parentRow);
-          if (pIndex >= 0) {
-            this.$set(parentRow, 'showChildren', true);
-            this.$set(parentRow, 'loading', false);
-            this.jobData.tbodyList.splice(pIndex + 1, 0, ...jobList);
-          }
-        }
-      });
-    },
-    clearTimmer() {
-      if (this.timmer) {
-        clearTimeout(this.timmer);
-        this.timmer = null;
-      }
-    },
     restoreHistory(historyData) {
       if (historyData['searchParam']) {
         this.searchParam = historyData['searchParam'];
@@ -489,73 +317,14 @@ export default {
       this.isShowResourceLockDialog = false;
     },
     searchJob(currentPage) {
-      this.clearTimmer();
-      this.isLoading = true;
       if (currentPage) {
         this.searchParam.currentPage = currentPage;
       }
-      const param = { ...this.searchParam, ...this.searchValue };
       this.$addHistoryData('searchValue', this.searchValue);
       this.$addHistoryData('searchParam', this.searchParam);
-      this.$api.deploy.job
-        .searchJobList(param)
-        .then(res => {
-          this.jobData = res.Return;
-          const idList = [];
-          if (this.jobData.tbodyList && this.jobData.tbodyList.length > 0) {
-            this.jobData.tbodyList.forEach(element => {
-              if (element.source === 'batchdeploy' || element.source === 'deployschedulepipeline') {
-                this.$set(element, '#expander', true);
-                if (this.searchValue.keyword) { //keyword搜索时，匹配到的父作业也需要将子作业展开
-                  this.toggleChildJob(element);
-                }
-              } else {
-                this.$set(element, '#expander', false);
-              }
-              if (!this.jobEndStatusList.includes(element.status)) {
-                idList.push(element.id);
-              }
-            });
-            if (idList.length > 0) {
-              this.timmer = setTimeout(() => {
-                this.refresh(idList);
-              }, 5000);
-            }
-          }
-        })
-        .finally(() => {
-          this.isLoading = false;
-        });
-    },
-    refresh(idList) {
-      this.clearTimmer();
-      this.$api.deploy.job.searchJobList({ needPage: false, idList: idList }).then(res => {
-        const jobList = res.Return.tbodyList;
-        const newIdList = [];
-        if (jobList && jobList.length > 0 && this.jobData.tbodyList && this.jobData.tbodyList.length > 0) {
-          jobList.forEach(job => {
-            const element = this.jobData.tbodyList.find(d => d.id === job.id);
-            if (element) {
-              this.$set(element, 'status', job.status);
-              this.$set(element, 'statusName', job.statusName);
-            }
-          });
-          this.jobData.tbodyList.forEach(job => {
-            if (!this.jobEndStatusList.includes(job.status)) {
-              newIdList.push(job.id);
-            }
-          });
-          if (newIdList.length > 0) {
-            this.timmer = setTimeout(() => {
-              this.refresh(newIdList);
-            }, 5000);
-          }
-        }
-      });
-    },
-    changePageSize(pageSize) {
-      this.searchParam.pageSize = pageSize;
-      this.searchJob(1);
+      if (this.$refs.tableData) {
+        this.$refs.tableData.searchJob(currentPage, this.searchValue);
+      }
     },
     getSelectedApp(app) {
       this.selectedApp = app;
@@ -581,33 +350,6 @@ export default {
         return false;
       }
     },
-    newTab(e, row, redirectPage) {
-      //鼠标右键打开新标签页
-      let base = this.$router.options.base;
-      let params = '';
-      if (row && row.id) {
-        params = `?id=${row.id}`;
-      }
-      let replaceStr = `<a href="${base}#${redirectPage}${params}" class="cursor">${row.name}</a>`;
-      e.currentTarget.innerHTML = replaceStr;
-    },
-    toJobDetail(row) {
-      this.$router.push({
-        path: '/job-detail',
-        query: { id: row.id }
-      });
-    },
-    toBatchJobDetail(row) {
-      const {parentId = ''} = row || {};
-      if (parentId != -1) {
-        this.toJobDetail(row);
-      } else {
-        this.$router.push({
-          path: '/batch-job-detail',
-          query: { id: row.id }
-        });
-      }
-    },
     // toOperationDetail(row) {
     //   if (row.operationType == 'combop') {
     //     this.$router.push({
@@ -619,21 +361,6 @@ export default {
     //     });
     //   }
     // },
-    toRoute(row) {
-      let routeConfig = row.route?.config;
-      if (routeConfig == null) {
-        return;
-      }
-      if (row.source == 'deploy') {
-        window.open(HOME + '/deploy.html#/application-config-pipeline-detail?appSystemId=' + routeConfig.appSystemId, '_blank');
-      } else if (row.source == 'batchdeploy') {
-        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') {
-        window.open(HOME + '/deploy.html#/config-add?appSystemId=' + routeConfig.appSystemId + '&id=' + routeConfig.id, '_blank');
-      }
-    },
     close(needPage) {
       this.showDialog = false;
       if (needPage) {
@@ -674,14 +401,6 @@ export default {
           this.moduleList = res.Return || [];
         }
       });
-    }, updateSort(sort) {
-      this.sortOrder = [];
-      this.sortOrder.push(sort);
-      this.$addHistoryData('sortOrder', this.sortOrder);
-      for (let key in sort) {
-        this.$set(this.searchParam, 'sortOrder', {'key': key, 'type': sort[key]});
-      }
-      this.searchJob();
     }
   },
   filter: {},
@@ -750,14 +469,14 @@ export default {
         const appSystemId = val && val.appId;
         const appModuleId = val && val.moduleId;
         if (appSystemId) {
-          this.searchParam.appSystemId = appSystemId;
+          this.$set(this.searchParam, 'appSystemId', appSystemId);
           this.envParam.appSystemId = appSystemId;
         } else {
           this.$delete(this.searchParam, 'appSystemId');
           this.$delete(this.envParam, 'appSystemId');
         }
         if (appModuleId) {
-          this.searchParam.appModuleId = appModuleId;
+          this.$set(this.searchParam, 'appModuleId', appModuleId);
           this.envParam.appModuleIdList = [appModuleId];
         } else {
           this.$delete(this.searchParam, 'appModuleId');
@@ -772,7 +491,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.job-content {
-  position: relative;
-}
 </style>
diff --git a/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
new file mode 100644
index 0000000000000000000000000000000000000000..03b88c6641203637d3ad8c9333a9fde9123bdf92
--- /dev/null
+++ b/src/views/pages/deploy/job/publishing/deploy-pipeline-table.vue
@@ -0,0 +1,361 @@
+<template>
+  <div class="job-content">
+    <TsTable
+      v-bind="jobData"
+      :theadList="theadList"
+      :loading="isLoading"
+      :sortList="sortList"
+      :sortOrder="sortOrder"
+      :sortMulti="false"
+      :fixedHeader="fixedHeader"
+      @changeCurrent="searchJob"
+      @changePageSize="changePageSize"
+      @updateSort="updateSort"
+    >
+      <template v-slot:showChildren="{ row }">
+        <span v-if="row.parentId == -1" class="text-href">
+          <span v-if="!row.loading" :class="{ 'tsfont-minus-square': row['showChildren'], 'tsfont-plus-square': !row['showChildren'] }" @click="toggleChildJob(row)"></span>
+          <Icon
+            v-else
+            type="ios-loading"
+            size="16"
+            class="loading"
+          ></Icon>
+        </span>
+      </template>
+      <template v-slot:name="{ row }">
+        <span
+          v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'"
+          class="text-href"
+          @click="toBatchJobDetail(row)"
+          @contextmenu="newTab($event, row, 'batch-job-detail')"
+        >
+          {{ row.name }}
+        </span>
+        <span
+          v-else
+          class="text-href"
+          :class="{ 'ml-nm': (!!row.parentId && row.parentId != -1) }"
+          @contextmenu="newTab($event, row, 'job-detail')"
+          @click="toJobDetail(row)"
+        >{{ row.name }}</span>
+        <span><Status v-if="row.reviewStatus != 'passed'" :statusValue="row.reviewStatus" :statusName="row.reviewStatusName"></Status></span>
+        <Tooltip
+          v-if="row.warnCount > 0 || row.isHasIgnored > 0"
+          transfer
+          class="stepStatues com-status"
+          placement="bottom"
+          theme="light"
+        >
+          <span class="tsfont-warning-o text-warn"></span>
+          <template v-slot:content>
+            <div>
+              <div v-if="row.warnCount > 0">{{ $t('term.autoexec.loghaswarninfo') }}</div>
+              <div v-if="row.isHasIgnored > 0">{{ $t('term.deploy.phaseexistignorenode') }}</div>
+            </div>
+          </template>
+        </Tooltip>
+      </template>
+      <!-- <template slot="operationType" slot-scope="{ row }">
+              <span class="text-href" @click="toOperationDetail(row)">
+                <span>{{ row.operationTypeName }}</span>
+                <span v-if="row.operationName">({{ row.operationName }})</span>
+              </span>
+            </template> -->
+      <template slot="routeName" slot-scope="{ row }">
+        <span v-if="row.source == 'batchdeploy'">
+          <span>{{ row.route && row.route.name }}</span>
+        </span>
+        <span v-else class="text-href" @click="toRoute(row)">
+          <span>{{ row.route && row.route.name }}</span>
+        </span>
+      </template>
+      <template slot="status" slot-scope="{ row }">
+        <Status :statusValue="row.status" :statusName="row.statusName" type="text"></Status>
+      </template>
+      <template v-slot:startTime="{ row }">
+        <div v-if="row.startTime" class="fz10">
+          <span>{{ row.startTime | formatDate }}</span>
+          <span class="text-grey ml-xs">{{ $t('page.begin') }}</span>
+        </div>
+        <div v-if="row.endTime" class="fz10">
+          <span>{{ row.endTime | formatDate }}</span>
+          <span class="text-grey ml-xs">{{ $t('page.finish') }}</span>
+        </div>
+      </template>
+      <template slot="completionRate" slot-scope="{ row }">
+        <Liquid :percent="row.completionRate" :size="7" :config="getConfig(row)" />
+      </template>
+    </TsTable>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    Status: () => import('@/resources/components/Status/CommonStatus.vue'),
+    Liquid: () => import('@/resources/components/SimpleGraph/Liquid.vue')
+
+  },
+  props: {
+    isNeedRefresh: {
+      type: Boolean,
+      default: true
+    },
+    defaultSearchParam: { type: Object },
+    defaultSearchValue: { type: Object },
+    sortList: { type: Array },
+    sortOrder: { type: Array },
+    fixedHeader: { type: Boolean, default: true }
+  },
+  data() {
+    return {
+      searchParam: this.defaultSearchParam || {},
+      isLoading: false,
+      jobData: null,
+      jobEndStatusList: ['completed', 'aborted', 'ignored', 'failed'], //终点状态节点列表，非终点状态列表的需要定时刷新。
+      theadList: [
+        { key: 'showChildren' },
+        {
+          title: this.$t('page.name'),
+          key: 'name'
+        },
+        {
+          title: this.$t('page.scene'),
+          key: 'scenarioName'
+        },
+        {
+          title: this.$t('page.status'),
+          key: 'status'
+        },
+        {
+          title: this.$t('page.timecost'),
+          key: 'costTime'
+        },
+        {
+          title: this.$t('page.executeuser'),
+          key: 'execUserVo',
+          type: 'user',
+          uuid: 'uuid'
+        },
+        {
+          title: this.$t('page.sourcecategory'),
+          key: 'routeName'
+        },
+        {
+          title: this.$t('page.source'),
+          key: 'sourceName'
+        },
+        {
+          title: this.$t('page.plantime'),
+          key: 'planStartTime',
+          type: 'time'
+        },
+        {
+          title: this.$t('page.startstoptime'),
+          key: 'startTime',
+          keyend: 'endTime'
+        },
+        {
+          title: this.$t('term.autoexec.triggertype'),
+          key: 'triggerTypeName'
+        },
+        {
+          title: this.$t('term.autoexec.executionsituation'),
+          key: 'completionRate'
+        }
+      ],
+      timmer: null
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.searchJob(1, this.defaultSearchValue);
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {
+    this.clearTimmer();
+  },
+  destroyed() {},
+  methods: {
+    searchJob(currentPage, searchValue) {
+      this.clearTimmer();
+      this.isLoading = true;
+      if (currentPage) {
+        this.searchParam.currentPage = currentPage;
+      }
+      const param = { ...this.searchParam, ...searchValue || {} };
+      if (this.$utils.isSame(this.searchParam, this.defaultSearchParam)) {
+        this.$emit('updateParam', 'searchParam', this.searchParam);
+      }
+      this.$api.deploy.job
+        .searchJobList(param)
+        .then(res => {
+          this.jobData = res.Return;
+          const idList = [];
+          if (this.jobData.tbodyList && this.jobData.tbodyList.length > 0) {
+            this.jobData.tbodyList.forEach(element => {
+              if (element.source === 'batchdeploy' || element.source === 'deployschedulepipeline') {
+                this.$set(element, '#expander', true);
+                if (searchValue && searchValue.keyword) { //keyword搜索时，匹配到的父作业也需要将子作业展开
+                  this.toggleChildJob(element);
+                }
+              } else {
+                this.$set(element, '#expander', false);
+              }
+              if (this.isNeedRefresh && !this.jobEndStatusList.includes(element.status)) {
+                idList.push(element.id);
+              }
+            });
+            if (this.isNeedRefresh && idList.length > 0) {
+              this.timmer = setTimeout(() => {
+                this.refresh(idList);
+              }, 5000);
+            }
+          }
+        })
+        .finally(() => {
+          this.isLoading = false;
+        });
+    },
+    changePageSize(pageSize) {
+      this.searchParam.pageSize = pageSize;
+      this.searchJob(1);
+    },
+    updateSort(sort) {
+      this.sortOrder = [];
+      this.sortOrder.push(sort);
+      this.$addHistoryData('sortOrder', this.sortOrder);
+      this.$emit('updateParam', 'sortOrder', this.sortOrder);
+      for (let key in sort) {
+        this.$set(this.searchParam, 'sortOrder', {'key': key, 'type': sort[key]});
+      }
+      this.searchJob();
+    },
+    toggleChildJob(row) {
+      if (row['showChildren']) {
+        this.$set(row, 'showChildren', false);
+        for (let i = this.jobData.tbodyList.length - 1; i >= 0; i--) {
+          const element = this.jobData.tbodyList[i];
+          if (element.parentId === row.id) {
+            this.jobData.tbodyList.splice(i, 1);
+          }
+        }
+      } else {
+        this.getChildrenJob(row);
+      }
+    },
+    getChildrenJob(parentRow) {
+      this.$set(parentRow, 'loading', true);
+      this.$api.deploy.job.searchJobList({ parentId: parentRow.id }).then(res => {
+        const jobList = res.Return.tbodyList;
+        if (jobList && jobList.length > 0) {
+          const pIndex = this.jobData.tbodyList.findIndex(d => d === parentRow);
+          if (pIndex >= 0) {
+            this.$set(parentRow, 'showChildren', true);
+            this.$set(parentRow, 'loading', false);
+            this.jobData.tbodyList.splice(pIndex + 1, 0, ...jobList);
+          }
+        }
+      });
+    },
+    toBatchJobDetail(row) {
+      const {parentId = ''} = row || {};
+      if (parentId != -1) {
+        this.toJobDetail(row);
+      } else {
+        this.$router.push({
+          path: '/batch-job-detail',
+          query: { id: row.id }
+        });
+      }
+    },
+    newTab(e, row, redirectPage) {
+      //鼠标右键打开新标签页
+      let base = this.$router.options.base;
+      let params = '';
+      if (row && row.id) {
+        params = `?id=${row.id}`;
+      }
+      let replaceStr = `<a href="${base}#${redirectPage}${params}" class="cursor">${row.name}</a>`;
+      e.currentTarget.innerHTML = replaceStr;
+    },
+    toJobDetail(row) {
+      this.$router.push({
+        path: '/job-detail',
+        query: { id: row.id }
+      });
+    },
+    toRoute(row) {
+      let routeConfig = row.route?.config;
+      if (routeConfig == null) {
+        return;
+      }
+      if (row.source == 'deploy') {
+        window.open(HOME + '/deploy.html#/application-config-pipeline-detail?appSystemId=' + routeConfig.appSystemId, '_blank');
+      } else if (row.source == 'batchdeploy') {
+        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') {
+        window.open(HOME + '/deploy.html#/config-add?appSystemId=' + routeConfig.appSystemId + '&id=' + routeConfig.id, '_blank');
+      }
+    },
+    refresh(idList) {
+      this.clearTimmer();
+      this.$api.deploy.job.searchJobList({ needPage: false, idList: idList }).then(res => {
+        const jobList = res.Return.tbodyList;
+        const newIdList = [];
+        if (jobList && jobList.length > 0 && this.jobData.tbodyList && this.jobData.tbodyList.length > 0) {
+          jobList.forEach(job => {
+            const element = this.jobData.tbodyList.find(d => d.id === job.id);
+            if (element) {
+              this.$set(element, 'status', job.status);
+              this.$set(element, 'statusName', job.statusName);
+            }
+          });
+          this.jobData.tbodyList.forEach(job => {
+            if (!this.jobEndStatusList.includes(job.status)) {
+              newIdList.push(job.id);
+            }
+          });
+          if (newIdList.length > 0) {
+            this.timmer = setTimeout(() => {
+              this.refresh(newIdList);
+            }, 5000);
+          }
+        }
+      });
+    },
+    clearTimmer() {
+      if (this.timmer) {
+        clearTimeout(this.timmer);
+        this.timmer = null;
+      }
+    }
+  },
+  filter: {},
+  computed: {
+    getConfig() {
+      return row => {
+        let config = {};
+        config.status = row.status;
+        row.status == 'running' ? (config.status = 'active') : row.status == 'error' ? (config.status = 'wrong') : '';
+        return config;
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.job-content {
+  position: relative;
+}
+</style>
diff --git a/src/views/pages/deploy/job/publishing/module/instance-setting.vue b/src/views/pages/deploy/job/publishing/module/instance-setting.vue
index 174173253f8a92be416b7b442917812b1058f9bc..c54dfa93dfca45d2e62347a58ee3bb6404f0da44 100644
--- a/src/views/pages/deploy/job/publishing/module/instance-setting.vue
+++ b/src/views/pages/deploy/job/publishing/module/instance-setting.vue
@@ -25,6 +25,17 @@
         </span>
       </div>
     </div>
+    <TsRow v-if="isHaveInitData">
+      <Col :span="12">
+      </Col>
+      <Col :span="12">
+        <InputSearcher
+          v-model="keyword"
+          :placeholder="$t('form.placeholder.pleaseinput',{'target':'ip'})"
+          @change="getInstanceList(1)"
+        ></InputSearcher>
+      </Col>
+    </TsRow>
     <div v-if="tableData.tbodyList && tableData.tbodyList.length > 0">
       <div class="pl-xs">
         <Checkbox
@@ -75,6 +86,7 @@
         </TsCard>
       </div>
     </div>
+    <NoData v-else-if="isHaveInitData"></NoData>
     <div v-else class="text-tip">{{ $t('term.deploy.moduleenvnotinstance', {modulename: module.name, envname: envName}) }}</div>
     <MoreInstanceDialog
       v-if="isShowMoreDialog"
@@ -89,7 +101,8 @@ export default {
   name: '',
   components: {
     TsCard: () => import('@/resources/components/TsCard/TsCard.vue'),
-    MoreInstanceDialog: () => import('./more-instance-dialog.vue')
+    MoreInstanceDialog: () => import('./more-instance-dialog.vue'),
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
   },
   props: {
     disabled: {
@@ -107,7 +120,9 @@ export default {
       isShowMoreDialog: false,
       tableData: {},
       currentPage: 1,
-      instanceList: []
+      instanceList: [],
+      keyword: '',
+      isHaveInitData: false //是否有初始数据
     };
   },
   beforeCreate() {},
@@ -125,6 +140,7 @@ export default {
   methods: {
     initData() {
       this.instanceList = [];
+      this.isHaveInitData = false;
       if (this.module.instanceList && this.module.instanceList.length) {
         this.instanceList = this.module.instanceList.map(m => {
           return {
@@ -142,19 +158,26 @@ export default {
         envId: this.envId,
         appModuleId: this.module.id,
         currentPage: currentPage || this.currentPage,
-        pageSize: 100
+        pageSize: 100,
+        keyword: this.keyword
       };
       currentPage && (this.currentPage = currentPage);
       this.$api.deploy.env.getInstanceList(data).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
-          if (isFirst && this.$utils.isEmpty(this.instanceList)) {
-            this.instanceList = this.tableData.tbodyList.map(m => {
-              return {
-                ...m,
-                isChecked: true
-              };
-            });
+          if (isFirst) {
+            if (!this.$utils.isEmpty(this.tableData.tbodyList)) {
+              this.isHaveInitData = true;
+            }
+          
+            if (this.$utils.isEmpty(this.instanceList)) {
+              this.instanceList = this.tableData.tbodyList.map(m => {
+                return {
+                  ...m,
+                  isChecked: true
+                };
+              });
+            }
           }
           this.tableData.tbodyList.forEach(i => {
             if (this.instanceList.find(ins => ins.id === i.id)) {
diff --git a/src/views/pages/deploy/job/publishing/module/more-instance-dialog.vue b/src/views/pages/deploy/job/publishing/module/more-instance-dialog.vue
index 46af74229688702caed68dae9def6d7adbf45fd0..2dd9ca45041f44128c02886175b3eb4a7239828f 100644
--- a/src/views/pages/deploy/job/publishing/module/more-instance-dialog.vue
+++ b/src/views/pages/deploy/job/publishing/module/more-instance-dialog.vue
@@ -32,8 +32,8 @@
     </div>
     <template v-slot:footer>
       <template v-if="!disabled">
-        <Button type="primary" ghost @click.native="onOk('removeAll')">全部清空</Button>
-        <Button type="primary" @click="onOk('save')">确定</Button>
+        <Button type="primary" ghost @click.native="onOk('removeAll')">{{ $t('page.clear') }}</Button>
+        <Button type="primary" @click="onOk('save')">{{ $t('page.confirm') }}</Button>
       </template>
     </template>
   </TsDialog>
diff --git a/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue b/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue
index 6e86889c5a57dd8b4165eeba2c3b0574e6dd0baa..a8ed543e6d672b9fad3aca18358c03f8ecaaf9e5 100644
--- a/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue
+++ b/src/views/pages/deploy/pipeline/edit-jobtemplate-dialog.vue
@@ -102,8 +102,21 @@
           </div>
         </div>
         <div>
-          <Divider orientation="start" class="divier">{{ $t('term.autoexec.batchsetting') }}</Divider>
+          <Divider orientation="start" class="divier">{{ $t('page.autoexecparallel') }}</Divider>
           <div class="pb-nm">
+            <TsFormRadio
+              v-model="jobTemplateData.parallelPolicy"
+              :dataList="parallelPolicyDataList"
+              @on-change="changeParallelPolicy"
+            ></TsFormRadio>
+          </div>
+          <div v-if="jobTemplateData.parallelPolicy !== 'roundCount'" class="pb-nm">
+            <TsFormSelect
+              v-model="jobTemplateData.parallelCount"
+              v-bind="parallelForm"
+            ></TsFormSelect>
+          </div>
+          <div v-else class="pb-nm">
             <TsFormSelect
               v-model="jobTemplateData.roundCount"
               v-bind="roundCountForm"
@@ -134,6 +147,7 @@ export default {
   name: '',
   components: {
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'),
     ModuleList: () => import('@/views/pages/deploy/job/publishing/module-list'),
     SetParam: () => import('@/views/pages/autoexec/detail/runnerDetail/param.vue')
   },
@@ -154,7 +168,9 @@ export default {
         appSystemId: null,
         envId: null,
         scenarioId: null,
-        roundCount: 1,
+        roundCount: null,
+        parallelCount: null,
+        parallelPolicy: null,
         config: { param: {}, selectNodeList: [] }
       },
       scenarioList: [], //场景列表
@@ -190,7 +206,26 @@ export default {
         desc: this.$t('term.autoexec.roundcountdescrition'),
         validateList: ['required', 'maxNum']
       },
-      moduleEnvInstanceMap: {}
+      parallelForm: {
+        border: 'border',
+        dataList: this.getRoundCountList(),
+        filterName: 'text',
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.paralldesc'),
+        validateList: ['required', 'maxNum']
+      },
+      moduleEnvInstanceMap: {},
+      parallelPolicyDataList: [
+        {
+          text: this.$t('page.autoexecparall'),
+          value: 'parallel'
+        },
+        {
+          text: this.$t('page.autoexecbatchround'),
+          value: 'roundCount'
+        }
+      ]
     };
   },
   beforeCreate() {},
@@ -423,6 +458,13 @@ export default {
           this.$set(item, 'instanceList', []);
         }
       });
+    },
+    changeParallelPolicy(val) {
+      if (val && val == 'roundCount') {
+        this.jobTemplateData.roundCount = this.jobTemplateData.roundCount || 2;
+      } else {
+        this.jobTemplateData.parallelCount = this.jobTemplateData.parallelCount || 2;
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue b/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue
index 2841dcea7b731776a712b5072ca54d671071fbf8..5280a21bb63b447da2dc4aad0f26c8b89499c4e7 100644
--- a/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue
+++ b/src/views/pages/deploy/pipeline/list-deployjob-dialog.vue
@@ -6,85 +6,17 @@
           <div class="mb-nm">
             <TsRow>
               <Col :span="12"></Col>
-              <Col :span="12"><CombineSearcher v-model="searchValue" v-bind="searchConfig" @change="searchJob(1)"></CombineSearcher>
+              <Col :span="12"><CombineSearcher v-model="searchValue" v-bind="searchConfig" @change="searchDeployPipeline(1)"></CombineSearcher>
               </Col>
             </TsRow>
           </div>
           <div>
-            <TsTable
-              :theadList="theadList"
-              v-bind="jobData"
-              :loading="isLoading"
-              @changeCurrent="searchJob"
-              @changePageSize="changePageSize"
-            >
-              <template v-slot:showChildren="{ row }">
-                <span v-if="row.parentId == -1" class="text-href">
-                  <span v-if="!row.loading" :class="{ 'tsfont-minus-square': row['showChildren'], 'tsfont-plus-square': !row['showChildren'] }" @click="toggleChildJob(row)"></span>
-                  <Icon
-                    v-else
-                    type="ios-loading"
-                    size="16"
-                    class="loading"
-                  ></Icon>
-                </span>
-              </template>
-              <template v-slot:name="{ row }">
-                <span
-                  v-if="row.source === 'batchdeploy' || row.source === 'deployschedulepipeline'"
-                  class="text-href"
-                  @click="toBatchJobDetail(row)"
-                  @contextmenu="newTab($event, row, 'batch-job-detail')"
-                >
-                  {{ row.name }}
-                </span>
-                <span
-                  v-else
-                  class="text-href"
-                  :class="{ 'ml-nm': (!!row.parentId && row.parentId != -1) }"
-                  @contextmenu="newTab($event, row, 'job-detail')"
-                  @click="toJobDetail(row)"
-                >{{ row.name }}</span>
-                <span><Status v-if="row.reviewStatus != 'passed'" :statusValue="row.reviewStatus" :statusName="row.reviewStatusName"></Status></span>
-                <Tooltip
-                  v-if="row.warnCount > 0 || row.isHasIgnored > 0"
-                  transfer
-                  class="stepStatues com-status"
-                  placement="bottom"
-                  theme="light"
-                >
-                  <span class="tsfont-warning-o text-warn"></span>
-                  <template v-slot:content>
-                    <div>
-                      <div v-if="row.warnCount > 0">{{ $t('term.autoexec.loghaswarninfo') }}</div>
-                      <div v-if="row.isHasIgnored > 0">{{ $t('term.deploy.phaseexistignorenode') }}</div>
-                    </div>
-                  </template>
-                </Tooltip>
-              </template>
-              <template slot="operationType" slot-scope="{ row }">
-                <span class="text-href" @click="toOperationDetail(row)">
-                  <span>{{ row.operationTypeName }}</span>
-                  <span v-if="row.operationName">({{ row.operationName }})</span>
-                </span>
-              </template>
-              <template slot="status" slot-scope="{ row }">
-                <Status :statusValue="row.status" :statusName="row.statusName" type="text"></Status>
-              </template>
-              <template v-slot:startTime="{ row }">
-                <div v-if="row.startTime" class="fz10">
-                  <span>{{ row.startTime | formatDate }}</span>
-                  <span class="text-grey ml-xs">{{ $t('page.begin') }}</span>
-                </div>
-                <div v-if="row.endTime" class="fz10">
-                  <span>{{ row.endTime | formatDate }}</span>
-                  <span class="text-grey ml-xs">{{ $t('page.finish') }}</span>
-                </div>
-              </template>
-              <template slot="completionRate" slot-scope="{ row }">
-                <Liquid :percent="row.completionRate" :size="7" :config="getConfig(row)" />
-              </template>
-            </TsTable>
+            <DeployPipelineTable
+              ref="tableData"
+              :defaultSearchParam="searchParam"
+              :fixedHeader="false"
+              :isNeedRefresh="false"
+            ></DeployPipelineTable>
           </div>
         </div>
       </template>
@@ -95,10 +27,8 @@
 export default {
   name: '',
   components: {
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    Liquid: () => import('@/resources/components/SimpleGraph/Liquid.vue'),
-    Status: () => import('@/resources/components/Status/CommonStatus.vue'),
-    CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue')
+    CombineSearcher: () => import('@/resources/components/CombineSearcher/CombineSearcher.vue'),
+    DeployPipelineTable: () => import('@/views/pages/deploy/job/publishing/deploy-pipeline-table.vue')
   },
   props: {
     id: { type: Number },
@@ -107,7 +37,6 @@ export default {
   data() {
     return {
       isLoading: false,
-      jobData: {},
       searchValue: {},
       searchConfig: { search: true,
         labelPosition: 'top',
@@ -158,60 +87,11 @@ export default {
         isShow: true,
         width: 'large',
         hasFooter: false
-      },
-      theadList: [
-        { key: 'showChildren' },
-        {
-          title: this.$t('page.name'),
-          key: 'name'
-        },
-        {
-          title: this.$t('page.scene'),
-          key: 'scenarioName'
-        },
-        {
-          title: this.$t('page.status'),
-          key: 'status'
-        },
-        {
-          title: this.$t('page.timecost'),
-          key: 'costTime'
-        },
-        {
-          title: this.$t('page.executeuser'),
-          key: 'execUserVo',
-          type: 'user',
-          uuid: 'uuid'
-        },
-        {
-          title: this.$t('page.source'),
-          key: 'sourceName'
-        },
-        {
-          title: this.$t('page.plantime'),
-          key: 'planStartTime',
-          type: 'time'
-        },
-        {
-          title: this.$t('page.startstoptime'),
-          key: 'startTime',
-          keyend: 'endTime'
-        },
-        {
-          title: this.$t('term.autoexec.triggertype'),
-          key: 'triggerTypeName'
-        },
-        {
-          title: this.$t('term.autoexec.executionsituation'),
-          key: 'completionRate'
-        }
-      ]
+      }
     };
   },
   beforeCreate() {},
-  created() {
-    this.searchJob(1);
-  },
+  created() {},
   beforeMount() {},
   mounted() {},
   beforeUpdate() {},
@@ -221,99 +101,17 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    changePageSize(pageSize) {
-      this.searchParam.pageSize = pageSize;
-      this.searchJob(1);
-    },
-    toggleChildJob(row, isShow) {
-      if (row['showChildren']) {
-        this.$set(row, 'showChildren', false);
-        for (let i = this.jobData.tbodyList.length - 1; i >= 0; i--) {
-          const element = this.jobData.tbodyList[i];
-          if (element.parentId === row.id) {
-            this.jobData.tbodyList.splice(i, 1);
-          }
-        }
-      } else {
-        this.getChildrenJob(row);
-      }
-    },
-    getChildrenJob(parentRow) {
-      this.$set(parentRow, 'loading', true);
-      this.$api.deploy.job.searchJobList({ parentId: parentRow.id }).then(res => {
-        const jobList = res.Return.tbodyList;
-        if (jobList && jobList.length > 0) {
-          const pIndex = this.jobData.tbodyList.findIndex(d => d === parentRow);
-          if (pIndex >= 0) {
-            this.$set(parentRow, 'showChildren', true);
-            this.$set(parentRow, 'loading', false);
-            this.jobData.tbodyList.splice(pIndex + 1, 0, ...jobList);
-          }
-        }
-      });
-    },
-    searchJob(currentPage) {
-      this.isLoading = true;
-      if (currentPage) {
-        this.searchParam.currentPage = currentPage;
+    searchDeployPipeline(currentPage) {
+      if (this.$refs.tableData) {
+        this.$refs.tableData.searchJob(currentPage, this.searchValue);
       }
-      const param = { ...this.searchParam, ...this.searchValue };
-      this.$api.deploy.job
-        .searchJobList(param)
-        .then(res => {
-          this.jobData = res.Return;
-          if (this.jobData.tbodyList && this.jobData.tbodyList.length > 0) {
-            this.jobData.tbodyList.forEach(element => {
-              if (element.source === 'batchdeploy' || element.source === 'deployschedulepipeline') {
-                this.$set(element, '#expander', true);
-              } else {
-                this.$set(element, '#expander', false);
-              }
-            });
-          }
-        })
-        .finally(() => {
-          this.isLoading = false;
-        });
     },
     close() {
       this.$emit('close');
-    },
-    toJobDetail(row) {
-      this.$router.push({
-        path: '/job-detail',
-        query: { id: row.id }
-      });
-    },
-    toBatchJobDetail(row) {
-      const {parentId = '', id = ''} = row || {};
-      if (parentId != -1) {
-        this.toJobDetail(row);
-      } else {
-        window.open(HOME + '/deploy.html#/batch-job-detail?id=' + id, '_blank');
-      }
-    },
-    newTab(e, row, redirectPage) {
-      //鼠标右键打开新标签页
-      let base = this.$router.options.base;
-      let params = '';
-      if (row && row.id) {
-        params = `?id=${row.id}`;
-      }
-      let replaceStr = `<a href="${base}#${redirectPage}${params}" class="cursor">${row.name}</a>`;
-      e.currentTarget.innerHTML = replaceStr;
     }
   },
   filter: {},
   computed: {
-    getConfig() {
-      return row => {
-        let config = {};
-        config.status = row.status;
-        row.status == 'running' ? (config.status = 'active') : row.status == 'error' ? (config.status = 'wrong') : '';
-        return config;
-      };
-    }
   },
   watch: {}
 };
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 c504035e374a191ea500e63cc5d64e5008731d88..dbd05c1ea77d56d460d454e5248b70e79c335666 100644
--- a/src/views/pages/deploy/schedule/components/job-base-info.vue
+++ b/src/views/pages/deploy/schedule/components/job-base-info.vue
@@ -106,7 +106,10 @@ export default {
           url: '/api/rest/universal/enum/get',
           params: { enumClass: 'ScheduleType' },
           validateList: ['required'],
-          disabled: this.disabled
+          disabled: this.disabled,
+          onChange: (val) => {
+            this.changeJobType(val);
+          }
         }
       },
       generalFormConfig: {
@@ -151,6 +154,20 @@ export default {
             this.handlePipelineId(val);
           }
         },
+        appSystemId: {
+          type: 'select',
+          label: this.$t('page.apply'),
+          value: null,
+          dynamicUrl: '/api/rest/deploy/app/config/appsystem/search',
+          dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList, 'app'); },
+          rootName: 'tbodyList',
+          border: 'border',
+          transfer: true,
+          validateList: ['required'],
+          onChange: (val) => {
+            this.changeAppSystemId(val);
+          }
+        },
         pipelineId: {
           type: 'select',
           label: this.$t('term.autoexec.pipeline'),
@@ -159,7 +176,8 @@ export default {
           params: {type: 'appsystem', needVerifyAuth: 1},
           rootName: 'tbodyList',
           dealDataByUrl: this.dealPipelineData,
-          validateList: ['required']
+          validateList: ['required'],
+          transfer: true
         }
       }
     };
@@ -273,6 +291,23 @@ export default {
     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');
+    },
+    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);
+      }
     },
     dealPipelineData(nodeList) {
       let dataList = [];
@@ -285,6 +320,17 @@ export default {
         });
       }
       return dataList;
+    },
+    changeJobType(val) { //定时作业类型切换
+      if (val == 'general') {
+        Object.keys(this.generalFormConfig).forEach(key => {
+          this.$set(this.generalFormConfig[key], 'value', null);
+        });
+        this.handleModuleParams();
+      } else if (val == 'pipeline') {
+        this.$set(this.pipelineFormConfig.pipelineType, 'value', 'appsystem');
+        this.handlePipelineId('appsystem');
+      }
     }
   },
   filter: {},
@@ -303,8 +349,11 @@ export default {
           } else if (this.baseParams.type == 'pipeline') {
             this.$set(this.pipelineFormConfig.pipelineType, 'value', this.baseParams.pipelineType);
             this.$set(this.pipelineFormConfig.pipelineId, 'value', this.baseParams.pipelineId);
+            this.$set(this.pipelineFormConfig.appSystemId, 'value', this.baseParams.appSystemId);
             this.$set(this.pipelineFormConfig.pipelineType, 'disabled', true);
             this.$set(this.pipelineFormConfig.pipelineId, 'disabled', true);
+            this.$set(this.pipelineFormConfig.appSystemId, 'disabled', true);
+            this.$set(this.pipelineFormConfig.appSystemId, 'isHidden', this.baseParams.pipelineType !== 'appsystem');
             if (this.baseParams.pipelineType == 'appsystem') {
               this.$set(this.pipelineFormConfig.pipelineId.params, 'type', 'appsystem');
             } else if (this.baseParams.pipelineType == 'global') {
diff --git a/src/views/pages/deploy/schedule/components/params/general.vue b/src/views/pages/deploy/schedule/components/params/general.vue
index 1eb818ac946b2de5ad569e18e30b0438598443ae..9ed3d4c83e07335572e41ab979866d6a0759c8de 100644
--- a/src/views/pages/deploy/schedule/components/params/general.vue
+++ b/src/views/pages/deploy/schedule/components/params/general.vue
@@ -90,8 +90,20 @@
       ></ModuleList>
     </div>
     <div id="roundCount" class="box-block">
-      <Divider orientation="start">{{ $t('term.autoexec.batchsetting') }}</Divider>
-      <div>
+      <Divider orientation="start">{{ $t('page.autoexecparallel') }}</Divider>
+      <TsFormItem
+        :label="$t('page.autoexecparallpolicy')"
+        :labelWidth="100"
+        labelPosition="left"
+        :required="true"
+      >
+        <TsFormRadio
+          v-model="parallelPolicy"
+          :dataList="parallelPolicyDataList"
+          @on-change="changeParallelPolicy"
+        ></TsFormRadio>
+      </TsFormItem>
+      <div v-if="parallelPolicy === 'roundCount'">
         <TsFormItem
           :label="$t('term.autoexec.batchquantity')"
           :labelWidth="100"
@@ -99,12 +111,27 @@
           :required="true"
         >
           <TsFormSelect
+            ref="roundCountForm"
             v-model="roundCount"
             v-bind="roundCountForm"
             :disabled="disabled"
           ></TsFormSelect>
         </TsFormItem>
       </div>
+      <div v-else>
+        <TsFormItem
+          :label="$t('term.autoexec.parall')"
+          :labelWidth="100"
+          labelPosition="left"
+          :required="true"
+        >
+          <TsFormSelect
+            ref="parallelForm"
+            v-model="parallelCount"
+            v-bind="parallelForm"
+          ></TsFormSelect>
+        </TsFormItem>
+      </div>
     </div>
     <div id="param" class="box-block">
       <Divider orientation="start">{{ $t('term.autoexec.jobparam') }}</Divider>
@@ -135,7 +162,8 @@ export default {
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     ModuleList: () => import('@/views/pages/deploy/job/publishing/module-list'),
     SetParam: () => import('@/views/pages/autoexec/detail/runnerDetail/param.vue'),
-    PhaseList: () => import('@/views/pages/deploy/job/publishing/phase-list')
+    PhaseList: () => import('@/views/pages/deploy/job/publishing/phase-list'),
+    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio')
   },
   props: {
     baseParams: Object,
@@ -166,13 +194,35 @@ export default {
         search: true,
         transfer: true,
         desc: this.$t('term.autoexec.roundcountdescrition'),
-        validateList: ['required', 'integer_p']
+        validateList: ['required', 'maxNum']
       },
       runtimeParamList: [], //作业参数
       combopPhaseList: [],
       param: {},
       defaultModuleList: [], //模块默认值
-      moduleEnvInstanceMap: {}
+      moduleEnvInstanceMap: {},
+      parallelForm: {
+        placeholder: this.$t('page.selectinput'),
+        border: 'border',
+        dataList: this.getRoundCountList(),
+        filterName: 'text',
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.paralldesc'),
+        validateList: ['required', 'maxNum']
+      },
+      parallelPolicyDataList: [
+        {
+          text: this.$t('page.autoexecparall'),
+          value: 'parallel'
+        },
+        {
+          text: this.$t('page.autoexecbatchround'),
+          value: 'roundCount'
+        }
+      ],
+      parallelPolicy: 'roundCount',
+      parallelCount: 4
     };
   },
   beforeCreate() {},
@@ -196,6 +246,8 @@ export default {
       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 || [];
     },
@@ -367,6 +419,15 @@ export default {
           });
         }
       }
+      if (this.$refs.parallelForm) {
+        if (!this.$refs.parallelForm.valid()) {
+          validList.push({
+            text: this.$t('term.deploy.roundcountvalidate'),
+            type: 'error',
+            id: '#roundCount'
+          });
+        }
+      }
       if (this.$refs.param) {
         if (!this.$refs.param.valid()) {
           validList.push({
@@ -383,9 +444,18 @@ export default {
         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);
+      } else {
+        this.$set(data, 'parallelCount', null);
+        this.$set(data, 'roundCount', this.roundCount || 64);
+      }
       if (this.$refs.param) {
         this.$set(data, 'param', this.$refs.param.getValue());
       }
@@ -400,6 +470,13 @@ export default {
       ];
       list.push(...this.$utils.getRoundCountList());
       return list;
+    },
+    changeParallelPolicy(val) {
+      if (val && val == 'roundCount') {
+        this.roundCount = this.roundCount || 64;
+      } else {
+        this.parallelCount = this.parallelCount || 32;
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/schedule/schedule-job-edit.vue b/src/views/pages/deploy/schedule/schedule-job-edit.vue
index 37cb54d6035799b5e02cc61c9f3ae55a1f3cc322..350e842dac346c3fe279158d28af3e10c6700366 100644
--- a/src/views/pages/deploy/schedule/schedule-job-edit.vue
+++ b/src/views/pages/deploy/schedule/schedule-job-edit.vue
@@ -115,6 +115,7 @@ export default {
             } else if (this.initData.type == 'pipeline') {
               this.$set(this.baseParams, 'pipelineType', this.initData.pipelineType);
               this.$set(this.baseParams, 'pipelineId', this.initData.pipelineId);
+              this.$set(this.baseParams, 'appSystemId', this.initData.appSystemId);
             }
           }
         })
diff --git a/src/views/pages/deploy/schedule/schedule-job-manage.vue b/src/views/pages/deploy/schedule/schedule-job-manage.vue
index 174e233d1fbc01b0456a2b07fd8192b4574742d4..5bd4db7ed89c90218f722abf936aa666679cdba8 100644
--- a/src/views/pages/deploy/schedule/schedule-job-manage.vue
+++ b/src/views/pages/deploy/schedule/schedule-job-manage.vue
@@ -39,6 +39,10 @@
               <span v-if="row.isActive">{{ $t('page.enable') }}</span>
               <span v-else>{{ $t('page.disable') }}</span>
             </template>
+            <template slot="isLoad" slot-scope="{ row }">
+              <span v-if="row.jobStatus && row.jobStatus.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+              <span v-else class="text-grey">{{ $t('page.no') }}</span>
+            </template>
             <template slot="cron" slot-scope="{ row }">
               <div>
                 <TsQuartz :value="row.cron" showType="read"></TsQuartz>
@@ -69,6 +73,34 @@
                 {{ row.execCount }}
               </div>
             </template>
+            <template slot="jobStatus" slot-scope="{ row }">
+              <div v-if="!$utils.isEmpty(row.jobStatus)">
+                <div>
+                  <span class="text-grey">{{ $t('term.autoexec.starttoexecute') }}</span>
+                  <span>{{ row.jobStatus.execCount || '0' }}次</span>
+                </div>
+                <div v-if="row.jobStatus.beginTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.planstarttime') }}：</span>
+                  <span>{{ row.jobStatus.beginTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.endTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.planendtime') }}：</span>
+                  <span>{{ row.jobStatus.endTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.lastFireTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.lastactivetime') }}：</span>
+                  <span>{{ row.jobStatus.lastFireTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.lastFinishTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.lastcompletetime') }}：</span>
+                  <span>{{ row.jobStatus.lastFinishTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.nextFireTime != null">
+                  <span class="text-grey">{{ $t('page.nextactivationtime') }}：</span>
+                  <span>{{ row.jobStatus.nextFireTime | formatDate }}</span>
+                </div>
+              </div>
+            </template>
             <template v-slot:action="{ row }">
               <div class="tstable-action">
                 <ul class="tstable-action-ul">
@@ -130,6 +162,10 @@ export default {
           title: this.$t('page.status'),
           key: 'isActive'
         },
+        {
+          title: this.$t('page.loaded'),
+          key: 'isLoad'
+        },
         {
           title: this.$t('term.autoexec.timingplan'),
           key: 'cron'
@@ -164,6 +200,10 @@ export default {
           key: 'lcd',
           type: 'time'
         },
+        {
+          title: this.$t('term.autoexec.executionsituation'),
+          key: 'jobStatus'
+        },
         { key: 'action' }
       ],
       isListDeployJobDialogShow: false,
diff --git a/src/views/pages/documentonline/documentonline.js b/src/views/pages/documentonline/documentonline.js
index 5b60debb3a05ac9b46df4f17b3891c2ddda50c5d..afea239ec9b948bde237bdd07949b71358ec49ca 100644
--- a/src/views/pages/documentonline/documentonline.js
+++ b/src/views/pages/documentonline/documentonline.js
@@ -9,6 +9,7 @@ import md5 from 'js-md5';
 import api from '@/resources/api/api.js';
 import '@/resources/base.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 import {initRouter, initI18n} from '@/resources/init.js';
 
 MODULEID = 'documentonline';
@@ -26,6 +27,7 @@ Vue.prototype.$api = api;
 Vue.prototype.$md5 = md5;
 Vue.prototype.$trosuter = router;
 Vue.prototype.$localStore = new LocalStore('documentonline', router);
+Vue.prototype.$state = new State('documentonline');
 
 new Vue({
   router,
diff --git a/src/views/pages/framework/changelogaudit/changelogaudit-manage.vue b/src/views/pages/framework/changelogaudit/changelogaudit-manage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..840b3ef510d7195b8c6ded9bd9cdf463c349e627
--- /dev/null
+++ b/src/views/pages/framework/changelogaudit/changelogaudit-manage.vue
@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <TsContain border="border">
+      <template v-slot:topLeft>
+      </template>
+      <template v-slot:topRight>
+        <div>
+          <Row span="24" :gutter="16">
+            <Col span="4"></Col>
+            <Col span="8">
+              <TsFormInput
+                v-model.trim="searchParam.version"
+                :placeholder="$t('page.versions')"
+                @change="handleChange"
+              ></TsFormInput>
+            </Col>
+            <Col span="4">
+              <TsFormSelect
+                v-model="statusSelectSetting.value"
+                v-bind="statusSelectSetting"
+                @change="handleChange"
+              ></TsFormSelect>
+            </Col>
+            <Col span="8">
+              <TsFormInput
+                v-model.trim="searchParam.keyword"
+                :placeholder="$t('page.keyword')"
+                @change="handleChange"
+              ></TsFormInput>
+            </Col>
+          </Row>
+        </div>
+      </template>
+      <div slot="content">
+        <TsTable
+          v-if="tableData"
+          v-bind="tableData"
+          :theadList="theadList"
+          @changeCurrent="changePage"
+          @changePageSize="changePageSize"
+        >
+          <template slot="sqlStatus" slot-scope="{ row }">
+            <span v-if="row.sqlStatus == 1" class="text-success">{{ $t('page.success') }}</span>
+            <span v-else class="text-error">{{ $t('page.fail') }}</span>
+          </template>
+          <template slot="lcd" slot-scope="{ row }">
+            {{ row.lcd | formatDate }}
+          </template>
+          <template v-slot:sql="{ row, index}">
+            <Poptip
+              v-if="row.sql"
+              trigger="hover"
+              :title="$t('term.framework.sqlsstatement')"
+              word-wrap
+              width="700"
+              :transfer="true"
+              placement="left"
+            >
+              <span class="tsfont-zirenwu" style="cursor:pointer"></span>
+              <div
+                slot="content"
+                class="fz10 scroll"
+                style="max-height:500px"
+              >
+                <div :id="'sql_' + row.version + '_' + row.moduleId + '_' + index">{{ row.sql }}</div>
+                <div style="text-align:right"><Button size="small" @click="copySql('#sql_' + row.version + '_' + row.moduleId + '_' + index)">{{ $t('page.copy') }}</Button></div>
+              </div>
+            </Poptip>
+          </template>
+          <template v-slot:errorMsg="{ row, index}">
+            <Poptip
+              v-if="row.errorMsg"
+              trigger="hover"
+              :title="$t('term.framework.sqlsstatement')"
+              word-wrap
+              width="700"
+              :transfer="true"
+              placement="left"
+            >
+              <span class="tsfont-zirenwu" style="cursor:pointer"></span>
+              <div
+                slot="content"
+                class="fz10 scroll"
+                style="max-height:500px"
+              >
+                <div :id="'errorMsg_' + row.version + '_' + row.moduleId + '_' + index">{{ row.errorMsg }}</div>
+                <div style="text-align:right"><Button size="small" @click="copySql('#errorMsg_' + row.version + '_' + row.moduleId + '_' + index)">{{ $t('page.copy') }}</Button></div>
+              </div>
+            </Poptip>
+          </template>
+        </TsTable>
+      </div>
+    </TsContain>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput.vue'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect.vue')
+  },
+  props: {},
+  data() {
+    return {
+      searchParam: {
+        keyword: '',
+        currentPage: 1,
+        pageSize: 20
+      },
+      statusSelectSetting: {
+        // 状态下拉
+        defaultValueIsFirst: true, // 默认选中第一个
+        dataList: [
+          {
+            value: 'all',
+            text: this.$t('page.allofthem')
+          },
+          {
+            value: '1',
+            text: this.$t('page.success')
+          },
+          {
+            value: '0',
+            text: this.$t('page.fail')
+          }
+        ],
+        transfer: true,
+        placeholder: this.$t('page.status'),
+        value: ''
+      },
+      theadList: [
+        {
+          key: 'version',
+          title: this.$t('page.versions')
+        },
+        {
+          key: 'moduleId',
+          title: this.$t('page.module')
+        },
+        {
+          key: 'sqlStatus',
+          title: this.$t('page.status')
+        },
+        {
+          key: 'sql',
+          title: this.$t('term.framework.sqlsstatement')
+        },
+        {
+          key: 'errorMsg',
+          title: this.$t('term.framework.errorinfo')
+        },
+        {
+          key: 'lcd',
+          title: this.$t('term.autoexec.executiontime')
+        }
+      ],
+      tableData: []
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.searchChangelogAuditList();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestory() {},
+  destroyed() {},
+  methods: {
+    searchChangelogAuditList() {
+      this.$api.framework.changelogaudit.searchChangelogAuditList(this.searchParam).then(res => {
+        this.tableData = res.Return;
+      });
+    },
+    changePage(currentPage) {
+      if (currentPage) {
+        this.searchParam.currentPage = currentPage;
+      } else {
+        this.searchParam.currentPage = 1;
+      }
+      this.searchChangelogAuditList();
+    },
+    changePageSize(pageSize) {
+      this.searchParam.pageSize = pageSize;
+      this.searchParam.currentPage = 1;
+      this.searchChangelogAuditList();
+    },
+    handleChange() {
+      if (this.statusSelectSetting.value == 1 || this.statusSelectSetting.value == 0) {
+        this.searchParam.sqlStatus = this.statusSelectSetting.value;
+      } else {
+        this.searchParam.sqlStatus = null;
+      }
+      this.searchChangelogAuditList();
+    },
+    copySql(id) {
+      this.$utils.copyText(id);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/framework/database/database-edit.vue b/src/views/pages/framework/database/database-edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..fef55bfa368800ca2e92951ca1182607ee075864
--- /dev/null
+++ b/src/views/pages/framework/database/database-edit.vue
@@ -0,0 +1,187 @@
+<template>
+  <div>
+    <TsDialog
+      v-bind="dialogConfig"
+      :okBtnDisable="!!errorMsg"
+      @on-close="close"
+      @on-ok="save"
+    >
+      <template v-slot>
+        <TsForm ref="form" :item-list="formConfig">
+          <template v-slot:fileIdList>
+            <div>
+              <TsUpLoad
+                styleType="button"
+                dataType="DATASOURCE"
+                className="smallUpload"
+                type="drag"
+                width="75%"
+                :multiple="true"
+                :uploadCount="100"
+                :format="['jar']"
+                :defaultList="fileList"
+                @remove="getFileList"
+                @getFileList="getFileList"
+              ></TsUpLoad>
+            </div>
+          </template>
+        </TsForm>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm.vue'),
+    TsUpLoad: () => import('@/resources/components/UpLoad/UpLoad.vue')
+  },
+  props: {
+    id: {
+      type: Number
+    }
+  },
+  data() {
+    const _this = this;
+    return {
+      errorMsg: '',
+      fileList: [],
+      databaseData: {
+        id: null,
+        name: '',
+        config: {},
+        fileIdList: []
+      },
+      dialogConfig: {
+        type: 'modal',
+        maskClose: false,
+        isShow: true,
+        title: !this.id ? this.$t('dialog.title.addtarget', { target: this.$t('page.datasource') }) : this.$t('dialog.title.edittarget', { target: this.$t('page.datasource') }),
+        width: 'medium'
+      },
+      formConfig: [
+        {
+          type: 'text',
+          name: 'name',
+          label: this.$t('page.name'),
+          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {target: this.$t('page.name')}) }, { name: 'name-special' }, {
+            name: 'searchUrl',
+            url: '/api/rest/database/save',
+            key: 'name'
+          }],
+          maxlength: 50,
+          onChange: name => {
+            this.databaseData.name = name;
+          }
+        },
+        {
+          type: 'radio',
+          name: 'type',
+          label: this.$t('page.type'),
+          dataList: [
+            {
+              value: 'jdbc',
+              text: 'jdbc'
+            }
+          ],
+          validateList: ['required'],
+          onChange: type => {
+            this.databaseData.type = type;
+          }
+        },
+        {
+          type: 'textarea',
+          name: 'config',
+          label: this.$t('page.config'),
+          validateList: ['required'],
+          onChange: config => {
+            this.databaseData.config = config;
+          }
+        },
+        {
+          type: 'slot',
+          name: 'fileIdList',
+          label: this.$t('page.driverjar'),
+          value: null,
+          transfer: true,
+          width: '75%',
+          validateList: ['required']
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getDatabaseById();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getDatabaseById() {
+      if (this.id) {
+        this.$api.framework.database.getDatabaseById({id: this.id}).then(res => {
+          this.databaseData = res.Return;
+          if (this.databaseData.fileList && this.databaseData.fileList.length > 0) {
+            this.fileList = this.databaseData.fileList;
+          }
+          this.formConfig.forEach(element => {
+            if (element.name == 'config') {
+              this.$set(element, 'value', JSON.stringify(this.databaseData[element.name]));
+            } else {
+              this.$set(element, 'value', this.databaseData[element.name]);
+            }
+          });
+        });
+      } else {
+        this.databaseData = { type: 'jdbc', config: {}};
+        this.formConfig.forEach(element => {
+          if (element.name == 'config') {
+            this.$set(element, 'value', JSON.stringify(this.databaseData[element.name]));
+          } else {
+            this.$set(element, 'value', this.databaseData[element.name]);
+          }
+        });
+      }
+    },
+    save() {
+      const form = this.$refs['form'];
+      if (form.valid()) {
+        if (this.id) {
+          this.databaseData.id = this.id;
+        }
+        let fileIdList = [];
+        if (this.fileList && this.fileList.length > 0) {
+          this.fileList.forEach(element => {
+            fileIdList.push(element.id);
+          });
+        }
+        this.databaseData.fileIdList = fileIdList;
+        this.$api.framework.database.saveDatabase(this.databaseData).then(res => {
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.savesuccess'));
+            this.close(true);
+          }
+        });
+      }
+    },
+    close(needRefresh) {
+      this.$emit('close', needRefresh);
+    },
+    getFileList(fileList) {
+      this.fileList = fileList;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/framework/database/database-manage.vue b/src/views/pages/framework/database/database-manage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..bf7c5253d4484f4ce8215d877c77a51916366aec
--- /dev/null
+++ b/src/views/pages/framework/database/database-manage.vue
@@ -0,0 +1,140 @@
+<template>
+  <div>
+    <TsContain>
+      <template slot="topLeft">
+        <div class="action-group">
+          <span class="action-item tsfont-plus" @click="addDatabase()">{{ $t('page.datasource') }}</span>
+        </div>
+      </template>
+      <template slot="topRight">
+      </template>
+      <div slot="content">
+        <TsTable
+          v-if="tbodyList"
+          v-bind="tbodyList"
+          :theadList="theadList"
+          @changeCurrent="changePage"
+          @changePageSize="changePageSize"
+        >
+          <template slot="action" slot-scope="{ row }">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li class="tsfont-test" @click="testDatabase(row)">{{ $t('page.testconnection') }}</li>
+                <li class="tsfont-edit" @click="editDatabase(row)">{{ $t('page.edit') }}</li>
+                <li class="tsfont-trash-o" @click="deleteDatabase(row)">{{ $t('page.delete') }}</li>
+              </ul>
+            </div>
+          </template>
+        </TsTable>
+      </div>
+    </TsContain>
+    <DatabaseEdit v-if="isEditShow" :id="currentDatabaseId" @close="closeEditDialog"></DatabaseEdit>
+  </div>
+</template>
+<script>
+
+export default {
+  name: '',
+  components: {
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    DatabaseEdit: () => import('./database-edit.vue')
+  },
+  props: {},
+  data() {
+    return {
+      isEditShow: false,
+      searchParam: {
+        keyword: '',
+        currentPage: 1,
+        pageSize: 20
+      },
+      theadList: [
+        {
+          key: 'name',
+          title: this.$t('page.name')
+        },
+        {
+          key: 'type',
+          title: this.$t('page.type')
+        },
+        {
+          key: 'action'
+        }
+      ],
+      tbodyList: []
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.searchDatabaseList();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    searchDatabaseList() {
+      this.$api.framework.database.searchDatabaseList(this.searchParam).then(res => {
+        this.tbodyList = res.Return;
+      });
+    },
+    changePage() {
+      if (currentPage) {
+        this.searchParam.currentPage = currentPage;
+      } else {
+        this.searchParam.currentPage = 1;
+      }
+      this.searchDatabaseList();
+    },
+    changePageSize(pageSize) {
+      this.searchParam.pageSize = pageSize;
+      this.searchParam.currentPage = 1;
+      this.searchDatabaseList();
+    },
+    addDatabase() {
+      this.isEditShow = true;
+      this.currentDatabaseId = null;
+    },
+    editDatabase(row) {
+      this.isEditShow = true;
+      this.currentDatabaseId = row.id;
+    },
+    closeEditDialog(needRefresh) {
+      this.isEditShow = false;
+      if (needRefresh) {
+        this.searchDatabaseList();
+      }
+    },
+    testDatabase(row) {
+      this.$api.framework.database.testDatabaseById({id: row.id}).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('page.connectionsuccessful'));
+        }
+      });
+    },
+    deleteDatabase(row) {
+      this.$createDialog({
+        title: this.$t('dialog.title.deleteconfirm'),
+        content: this.$t('dialog.content.deleteconfirm', { target: this.$t('page.datasource') }),
+        btnType: 'error',
+        'on-ok': vnode => {
+          this.$api.framework.database.deleteDatabaseById({id: row.id}).then(res => {
+            if (res.Status == 'OK') {
+              this.searchDatabaseList();
+              vnode.isShow = false;
+            }
+          });
+        }
+      });
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/framework/datawarehouse/datawarehouse-edit.vue b/src/views/pages/framework/datawarehouse/datawarehouse-edit.vue
index ac03de1a2fb5f6ef49dbd6c92fa0aac2f7c22563..4ca195eed0237042ec300b94a84f92fdbdcd14e4 100644
--- a/src/views/pages/framework/datawarehouse/datawarehouse-edit.vue
+++ b/src/views/pages/framework/datawarehouse/datawarehouse-edit.vue
@@ -51,53 +51,21 @@
             </TsTable>
           </template>
           <template v-slot:content>
-            <div>
-              <div>
-                <Poptip
-                  trigger="hover"
-                  placement="right"
-                  width="750"
-                  :transfer="true"
-                >
-                  <span class="text-href">{{ $t('term.framework.configexample') }}</span>
-                  <div slot="content" class="api">
-                    <pre>
-&lt;datasource name="testreport" label="测试报表"&gt;
-  &lt;!--fields用于定义返回的字段列表--&gt;
-  &lt;fields&gt;
-  &lt;!--id代表唯一字段，支持多个id字段进行组合。普通字段用field定义，type是数据类型，目前只支持number、text、time、date、datetime五种，number类型系统最多只会保留4位小数。
-  如果需要聚合计算，可以使用aggregate属性，目前支持sum和count两种算法。配置了aggregate属性的field字段会根据id字段进行计数或累加计算。--&gt;
-    &lt;id column="id" label="id" type="number"/&gt;
-    &lt;field column="user_id" label="用户id" type="text"/&gt;
-    &lt;field column="user_name" label="用户名" type="text"/&gt;
-    &lt;field column="phone" label="电话" type="number"/&gt;
-  &lt;/fields&gt;
-  &lt;!--params用于定义需要保存最大值的字段，例如每次执行完保留最大的id值，下次执行可以用这个id值作为过滤条件实现增量同步--&gt;
-  &lt;params&gt;
-  &lt;!--column是返回字段，返回字段的类型必须是数字型（如果需要保存时间可以先把时间转换成时间戳）。
-      在where条件中可以通过#{column值}使用，--&gt;
-    &lt;param column="id" label="最大id" default="0"/&gt;
-  &lt;/params&gt;
-  &lt;!--select元素支持多个，但每个select语句返回的字段需要和fields中定义的一致。--&gt;
-  &lt;!--mongodb 仅支持aggregation pipeline,具体api 参考官方文档:https://www.mongodb.com/docs/manual/reference/operator/aggregation/ --&gt;
-  &lt;!--如: {aggregate: "INSPECT_REPORTS",pipeline: [{ '$match': { '_report_time': { $lte: ISODate("2022-11-05T00:00:00.0Z") }, '_inspect_result.status': { '$in': ['CRITICAL', 'WARN', 'FATAL'] } } }, { '$sort': {'_report_time': -1 } }, {$project: { resourceId: "$RESOURCE_ID",status: "$_inspect_result.status" }}}--&gt;
-  &lt;select&gt;
-    select user_id,user_name,phone from `user` where id &gt; #{id}
-  &lt;/select&gt;
-&lt;/datasource&gt;
-                    </pre>
-                  </div>
-                </Poptip>
-              </div>
+            <Tabs v-model="currentTab">
+              <TabPane label="配置" name="content"></TabPane>
+              <TabPane label="范例" name="example"></TabPane>
+            </Tabs>
+            <div v-if="currentTab === 'content'">
               <TsCodemirror
                 v-model="reportDataSourceData.xml"
-                :isLoading="isValiding"
                 codeMode="xml"
-                :loadingText="$t('term.framework.parsing')"
                 @change="changeXml"
               ></TsCodemirror>
               <Alert v-if="errorMsg" class="mt-sm" type="error">{{ errorMsg }}</Alert>
             </div>
+            <div v-else-if="currentTab === 'example'">
+              <TsCodemirror :value="example" :disabled="true" codeMode="xml"></TsCodemirror>
+            </div>
           </template>
           <template v-slot:expireTime>
             <div style="display: grid; grid-template-columns: 50% 50%; grid-gap: 10px">
@@ -163,6 +131,8 @@ export default {
   data() {
     const _this = this;
     return {
+      example: null,
+      currentTab: 'content',
       errorMsg: '',
       isValiding: false,
       dataSourceData: {},
@@ -173,7 +143,7 @@ export default {
         maskClose: false,
         isShow: true,
         title: !this.id ? this.$t('dialog.title.addtarget', { target: this.$t('page.datasource') }) : this.$t('dialog.title.edittarget', { target: this.$t('page.datasource') }),
-        width: 'medium'
+        width: 'large'
       },
       reportDataSourceData: {},
       fieldHeadList: [
@@ -305,11 +275,12 @@ export default {
   beforeCreate() {},
   created() {
     this.getModuleList();
+    this.getDatabaseList();
     this.getDatasourceById();
+    this.getExample();
   },
   beforeMount() {},
-  mounted() {
-  },
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -317,11 +288,42 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    getExample() {
+      this.$api.framework.datawarehouse.getExample().then(res => {
+        this.example = res;
+      });
+    },
+    getDatabaseList() {
+      let params = {
+        currentPage: 1,
+        pageSize: 100
+      };
+      this.$api.framework.database.searchDatabaseList(params).then(res => {
+        let tbodyList = res.Return.tbodyList;
+        let dataList = [
+          { value: 'mysql', text: 'mysql' },
+          { value: 'mongodb', text: 'mongodb' }
+        ];
+        tbodyList.forEach(item => {
+          let text = item.name;
+          let value = item.type + '-' + item.id;
+          dataList.push({
+            text: text,
+            value: value
+          });
+        });
+        this.formConfig.forEach(element => {
+          if (element.name == 'dbType') {
+            this.$set(element, 'dataList', dataList);
+          }
+        });
+      });
+    },
     getModuleList() {
       this.$api.framework.module.searchModule().then(res => {
         if (res.Return) {
           res.Return.forEach(g => {
-            this.moduleList.push({value: g.group, text: g.groupName});
+            this.moduleList.push({ value: g.group, text: g.groupName });
           });
         }
       });
@@ -360,6 +362,11 @@ export default {
       if (this.id) {
         this.$api.framework.datawarehouse.getDatasourceById(this.id).then(res => {
           this.reportDataSourceData = res.Return;
+          if (this.reportDataSourceData.dbType && this.reportDataSourceData.dbType != 'mysql' && this.reportDataSourceData.dbType != 'mongodb') {
+            if (this.reportDataSourceData.databaseId && this.reportDataSourceData.databaseId != null) {
+              this.reportDataSourceData.dbType = this.reportDataSourceData.dbType + '-' + this.reportDataSourceData.databaseId;
+            }
+          }
           this.formConfig.forEach(element => {
             this.$set(element, 'value', this.reportDataSourceData[element.name]);
             if (element.name == 'fields') {
@@ -397,6 +404,13 @@ export default {
         if (this.id) {
           this.reportDataSourceData.id = this.id;
         }
+        if (this.reportDataSourceData.dbType != 'mysql' && this.reportDataSourceData.dbType != 'mongodb') {
+          let index = this.reportDataSourceData.dbType.lastIndexOf('-');
+          let type = this.reportDataSourceData.dbType.substring(0, index);
+          let databaseId = this.reportDataSourceData.dbType.substring(index + 1, this.reportDataSourceData.dbType.length);
+          this.reportDataSourceData.dbType = type;
+          this.reportDataSourceData.databaseId = databaseId;
+        }
         this.$api.framework.datawarehouse.saveDataSource(this.reportDataSourceData).then(res => {
           if (res.Status == 'OK') {
             this.$Message.success(this.$t('message.savesuccess'));
@@ -468,7 +482,7 @@ export default {
           .finally(() => {
             this.isValiding = false;
           });
-      }, 1000);
+      }, 3000);
     }
   },
   filter: {},
diff --git a/src/views/pages/framework/extramenu/extramenu-manage.vue b/src/views/pages/framework/extramenu/extramenu-manage.vue
index 69125fad4d078bd040cf5b9a97c5710d0f4ab949..7192b6ceeff8a8d58daa5d56a7682aedc7b322ab 100644
--- a/src/views/pages/framework/extramenu/extramenu-manage.vue
+++ b/src/views/pages/framework/extramenu/extramenu-manage.vue
@@ -30,6 +30,7 @@
             :expandAll="false"
             :onClick="clickNode"
             :beforeDrop="beforeDrop"
+            :beforeDrag="beforeDrag"
             :onDrop="onDrop"
           ></TsZtree>
           <NoData v-else-if="!loadingShow && $utils.isEmpty(nodeList)"></NoData>
@@ -413,6 +414,18 @@ export default {
         return false;
       }
     },
+    beforeDrag(treeId, treeNodes) {
+      // 拖拽前的操作，可去掉节点拖拽功能
+      if (this.$utils.isEmpty(treeNodes)) {
+        return false;
+      }
+      for (let i = 0; i < treeNodes.length; i++) {
+        if (treeNodes[i] && (treeNodes[i].drag === false)) {
+          return false;
+        }
+      }
+      return true;
+    },
     onDrop(tree, treeNodes, targetNode, moveType) {
       let treeNode = treeNodes[0];
       let data = {
@@ -448,15 +461,16 @@ export default {
             menuType: 'innerMenu',
             moduleId: moduleId,
             moduleName: moduleName,
+            drag: false, // 内部菜单不可拖拽
             children: item.menuList.map((v) => ({
               id: `${moduleId}_${v.path}`,
               name: v.name,
               menuType: 'innerMenu',
               isMenu: true,
               moduleId: moduleId,
-              moduleName: moduleName
-            })
-            )
+              moduleName: moduleName,
+              drag: false
+            }))
           });
         }
       });
@@ -507,7 +521,8 @@ export default {
             children: this.handleChildren(item.moduleId, item.moduleName, item.menuGroupList),
             menuType: 'innerMenu',
             moduleId: item.moduleId,
-            moduleName: item.moduleName
+            moduleName: item.moduleName,
+            drag: false // 内部菜单不可拖拽
           });
           // 获取菜单模块列表
           item.menuGroupList && item.menuGroupList.forEach((v) => {
@@ -538,7 +553,8 @@ export default {
               id: 1,
               name: this.$t('term.framework.internalmenu'),
               children: moduleList,
-              menuType: 'innerMenu'
+              menuType: 'innerMenu',
+              drag: false // 内部菜单不可拖拽
             },
             {
               id: 2,
diff --git a/src/views/pages/framework/framework.js b/src/views/pages/framework/framework.js
index 3a1818557065cb95110e95f6160c17f5011f4495..0c56b6b9b1b43a49968bbc443b649e8773ba5e57 100644
--- a/src/views/pages/framework/framework.js
+++ b/src/views/pages/framework/framework.js
@@ -9,6 +9,7 @@ import VueI18n from 'vue-i18n';
 import md5 from 'js-md5';
 import frameworkUtils from '@/views/pages/framework/matrix/utils/utils';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -32,6 +33,7 @@ Vue.prototype.$api = api;
 Vue.prototype.$md5 = md5;
 Vue.prototype.$frameworkUtils = frameworkUtils;
 Vue.prototype.$localStore = new LocalStore('framework', router);
+Vue.prototype.$state = new State('framework');
 
 new Vue({
   router,
diff --git a/src/views/pages/framework/fulltextindex/fulltextindex-dictionay-edit.vue b/src/views/pages/framework/fulltextindex/fulltextindex-dictionay-edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4632b7e2a90bea931cb8a16b030e2b26edeefe15
--- /dev/null
+++ b/src/views/pages/framework/fulltextindex/fulltextindex-dictionay-edit.vue
@@ -0,0 +1,216 @@
+<template>
+  <div>
+    <TsDialog v-bind="dialogConfig" @on-ok="confirm()" @on-close="close()">
+      <template v-slot>
+        <div>
+          <Tabs v-model="currentTab">
+            <TabPane label="词库管理" name="dictionary"></TabPane>
+            <TabPane label="测试文本" name="content"></TabPane>
+            <TabPane v-if="wordList && wordList.length > 0" label="分词结果" name="result"></TabPane>
+          </Tabs>
+          <div v-if="currentTab === 'dictionary'">
+            <div style="width: 300px">
+              <InputSearcher v-model="searchParam.keyword" @change="searchWord(1)"></InputSearcher>
+            </div>
+            <div v-if="dictionaryData && dictionaryData.tbodyList && dictionaryData.tbodyList.length > 0" class="mt-md">
+              <Tag
+                v-for="(dict, index) in dictionaryData.tbodyList"
+                :key="index"
+                size="medium"
+                closable
+                @on-close="deleteWord(dict.id)"
+              >
+                {{ dict.word }}
+              </Tag>
+            </div>
+            <div class="mt-md text-grey">提示：删除关键字需要重启服务才能生效。如词库发生变化，旧索引需要重建才能应用新的词库。</div>
+            <div v-if="dictionaryData.pageCount > 1" class="mt-md" style="text-align: right">
+              <Page
+                class="page-container"
+                transfer
+                size="small"
+                show-total
+                :total="dictionaryData.rowNum"
+                :current="dictionaryData.currentPage"
+                :page-size="dictionaryData.pageSize"
+                @on-change="searchWord"
+              />
+            </div>
+            <TsFormItem label="导入新词" labelPosition="top">
+              <TsFormInput
+                ref="word"
+                v-model="newWord"
+                type="textarea"
+                placeholder="多个词用换行分隔，单个词最多20个字符，超过长度将自动切断"
+                border="border"
+                :validateList="[{ name: 'required', message: '' }]"
+              ></TsFormInput>
+              <div class="mt-md">
+                <Button style="width: 100%" type="primary" @click="addWord()">{{ $t('page.save') }}</Button>
+              </div>
+            </TsFormItem>
+          </div>
+          <div v-else-if="currentTab === 'content'">
+            <TsFormInput
+              ref="content"
+              v-model="content"
+              border="border"
+              type="textarea"
+              :validateList="[{ name: 'required', message: ' ' }]"
+            ></TsFormInput>
+            <div class="mt-md">
+              <Button type="primary" @click="testSliceWord()">{{ $t('page.test') }}</Button>
+            </div>
+          </div>
+          <div v-else-if="currentTab === 'result'">
+            <span
+              v-for="(segment, index) in highlightedSegments"
+              :key="index"
+              :class="segment.highlight ? 'text-error text-bold' : ''"
+            >
+              {{ segment.text }}
+            </span>
+            <!--<Tag v-for="(word, index) in wordList" :key="index">{{ word.word }}({{ word.type }})({{ word.start }}:{{ word.end }})</Tag>-->
+          </div>
+        </div>
+      </template>
+      <template v-slot:footer>
+        <div style="text-align: right">
+          <Button type="default" @click="close()">{{ $t('page.close') }}</Button>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
+    TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput'),
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
+  },
+  props: {},
+  data() {
+    return {
+      dialogConfig: {
+        title: '字典管理',
+        type: 'modal',
+        maskClose: false,
+        isShow: true,
+        width: 'medium'
+      },
+      currentTab: 'dictionary',
+      newWord: '',
+      content: '',
+      dictionaryData: {},
+      searchParam: { keyword: '', pageSize: 30 },
+      wordList: []
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.searchWord();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    searchWord(currentPage) {
+      if (currentPage) {
+        this.searchParam.currentPage = currentPage;
+      }
+
+      this.$api.framework.fulltextindex.searchWord(this.searchParam).then(res => {
+        this.dictionaryData = res.Return;
+      });
+    },
+    addWord() {
+      if (this.$refs.word && this.$refs.word.valid()) {
+        this.$api.framework.fulltextindex.addWord({ word: this.newWord }).then(res => {
+          if (res.Status === 'OK') {
+            this.newWord = '';
+            this.$Message.success(this.$t('message.savesuccess'));
+            this.searchWord(1);
+          }
+        });
+      }
+    },
+    testSliceWord() {
+      this.wordList = [];
+      if (this.$refs.content && this.$refs.content.valid()) {
+        this.$api.framework.fulltextindex.testSliceWord(this.content).then(res => {
+          this.wordList = res.Return;
+          if (this.wordList.length > 0) {
+            this.currentTab = 'result';
+          }
+        });
+      }
+    },
+    deleteWord(id) {
+      this.$api.framework.fulltextindex.deleteWordById(id).then(res => {
+        if (res.Status === 'OK') {
+          this.$Message.success(this.$t('message.deletesuccess'));
+          this.searchWord(1);
+        }
+      });
+    },
+    close() {
+      this.$emit('close');
+    }
+  },
+  filter: {},
+  computed: {
+    highlightedSegments() {
+      let segments = [];
+      let lastIndex = 0;
+
+      // 按 start 升序排序
+      const sortedList = this.wordList.slice().sort((a, b) => a.start - b.start);
+
+      for (let item of sortedList) {
+        const { start, end } = item;
+
+        // 加未匹配部分
+        if (lastIndex < start) {
+          segments.push({
+            text: this.content.slice(lastIndex, start),
+            highlight: false
+          });
+        }
+
+        // 加匹配部分
+        segments.push({
+          text: this.content.slice(start, end),
+          highlight: true
+        });
+
+        lastIndex = end;
+      }
+
+      // 最后一段
+      if (lastIndex < this.content.length) {
+        segments.push({
+          text: this.content.slice(lastIndex),
+          highlight: false
+        });
+      }
+
+      return segments;
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.grid {
+  display: grid;
+  gap: 10px;
+  grid-template-columns: 250px auto;
+}
+</style>
diff --git a/src/views/pages/framework/fulltextindex/fulltextindex-manage.vue b/src/views/pages/framework/fulltextindex/fulltextindex-manage.vue
index dada017d7bace2d7d33881cc49e2dc9ab199847f..29cbc12ffb43c99732e94758223d8a9f94ed4e83 100644
--- a/src/views/pages/framework/fulltextindex/fulltextindex-manage.vue
+++ b/src/views/pages/framework/fulltextindex/fulltextindex-manage.vue
@@ -2,8 +2,11 @@
   <div class="padding-t">
     <TsContain :hideHeader="true">
       <div slot="content">
-        <Tabs v-model="currentTab">
+        <Tabs v-model="currentTab" :animated="false">
           <TabPane label="数据库" name="database">
+            <div class="mb-md action-group">
+              <div class="action-item tsfont-setting" @click="isWordEdit = true">字典管理</div>
+            </div>
             <TsTable :tbodyList="fullTextIndexRebuildAuditData['database']" :theadList="theadList">
               <template v-slot:error="{ row }">
                 <Poptip
@@ -25,9 +28,8 @@
                   v-else-if="row.status === 'doing'"
                   :percent="99"
                   status="active"
-                  style="width:110px"
-                ><span></span>
-                </Progress>
+                  style="width: 110px"
+                ><span></span></Progress>
               </template>
               <template v-slot:action="{ row }">
                 <div class="tstable-action">
@@ -60,13 +62,11 @@
                   v-else-if="row.status === 'doing'"
                   :percent="99"
                   status="active"
-                  style="width:110px"
-                ><span></span>
-                </Progress>
+                  style="width: 110px"
+                ><span></span></Progress>
               </template>
               <template v-slot:action="{ row }">
                 <div class="tstable-action">
-                
                   <ul class="tstable-action-ul">
                     <li :class="row.status === 'doing' ? 'text-disabled' : ''" class="tsfont-restart" @click="rebuildIndex(row)">{{ $t('page.rebuildindex') }}</li>
                   </ul>
@@ -78,6 +78,7 @@
         <FullIndexRebuildDialog v-if="isRebuildDialogShow" :audit="currentAudit" @close="closeRebuildDialog"></FullIndexRebuildDialog>
       </div>
     </TsContain>
+    <FulltextIndexDictionaryEdit v-if="isWordEdit" @close="isWordEdit = false"></FulltextIndexDictionaryEdit>
   </div>
 </template>
 <script>
@@ -85,7 +86,8 @@ export default {
   name: '',
   components: {
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    FullIndexRebuildDialog: () => import('./fulltextindex-rebuild-dialog.vue')
+    FullIndexRebuildDialog: () => import('./fulltextindex-rebuild-dialog.vue'),
+    FulltextIndexDictionaryEdit: () => import('./fulltextindex-dictionay-edit.vue')
   },
   props: {},
   data() {
@@ -93,6 +95,8 @@ export default {
       currentTab: 'database',
       isRebuildDialogShow: false,
       currentAudit: null,
+      isWordEdit: false,
+      isTest: false,
       theadList: [
         {
           key: 'typeName',
diff --git a/src/views/pages/framework/healthcheck/sqldump.vue b/src/views/pages/framework/healthcheck/sqldump.vue
index f71a646d774632fc90eb7f3faabd36cbf1fad7f6..3c7ffb18c02d801455ffa1aefb125eb11e4076e3 100644
--- a/src/views/pages/framework/healthcheck/sqldump.vue
+++ b/src/views/pages/framework/healthcheck/sqldump.vue
@@ -182,6 +182,7 @@ export default {
         { key: 'userId', title: this.$t('page.user') },
         { key: 'recordCount', title: this.$t('page.datacapacity') },
         { key: 'runTime', title: this.$t('term.autoexec.executiontime'), type: 'time' },
+        { key: 'useCacheLevel', title: this.$t('page.cache') },
         { key: 'sql', title: this.$t('term.framework.sqlsstatement') }
       ],
       fromPath: '',
diff --git a/src/views/pages/framework/integration/integration-audit.vue b/src/views/pages/framework/integration/integration-audit.vue
index 438b2892a09227bd3791a6c962a5f78701bd2f45..ca3e8690ba1115c00c7118acf996a2c433a4c561 100644
--- a/src/views/pages/framework/integration/integration-audit.vue
+++ b/src/views/pages/framework/integration/integration-audit.vue
@@ -8,7 +8,6 @@
     >
       <template v-slot>
         <Row class="mb-md">
-          <Col span="8"></Col>
           <Col span="4">
             <UserSelect
               v-model="userSelectSetting.value"
@@ -29,11 +28,19 @@
           <Col span="8">
             <TimeSelect
               v-model="timeSelectSetting.value"
-              class="bg-op radius-sm"
+              class="mr-md bg-op radius-sm"
               v-bind="timeSelectSetting"
               @change="handleChange"
             ></TimeSelect>
           </Col>
+          <Col span="8">
+            <TsFormInput
+              v-model.trim="paramKeyword"
+              :placeholder="$t('page.paramkeyword')"
+              class="bg-op radius-sm"
+              @change="handleChange"
+            ></TsFormInput>
+          </Col>
         </Row>
         <div ref="tableMain">
           <TsTable
@@ -101,6 +108,7 @@
 <script>
 import UserSelect from '@/resources/components/UserSelect/UserSelect.vue';
 import TsFormSelect from '@/resources/plugins/TsForm/TsFormSelect';
+import TsFormInput from '@/resources/plugins/TsForm/TsFormInput';
 import TimeSelect from '@/resources/components/TimeSelect/TimeSelect.vue';
 export default {
   name: '',
@@ -109,6 +117,7 @@ export default {
     IntegrationAuditDetail: () => import('./integration-audit-detail.vue'),
     UserSelect,
     TsFormSelect,
+    TsFormInput,
     TimeSelect
   },
   props: {
@@ -122,6 +131,7 @@ export default {
       detailData: {},
       auditData: {},
       contentHeight: '100',
+      paramKeyword: '',
       userSelectSetting: {
         // 用户选择
         groupList: ['user'],
@@ -251,6 +261,9 @@ export default {
       }
       params.userUuidList = this.userSelectSetting.value ? [this.userSelectSetting.value] : []; // 用户
       params.statusList = this.selectSetting.value ? (this.selectSetting.value == 'all' ? [] : [this.selectSetting.value]) : []; // 状态
+      if (this.paramKeyword) {
+        params.paramKeyword = this.paramKeyword;
+      }
       if (!this.timeSelectSetting.value) {
         // 为空设置默认值
         this.timeSelectSetting.value = {
diff --git a/src/views/pages/framework/integration/other-edit.vue b/src/views/pages/framework/integration/other-edit.vue
index 5f896b769f75208ec9df84328cc37a99f7ad6192..5bde856b494e05996cec1171f478338a65fc8b50 100644
--- a/src/views/pages/framework/integration/other-edit.vue
+++ b/src/views/pages/framework/integration/other-edit.vue
@@ -24,7 +24,7 @@ export default {
           width: '100%',
           value: ''
         },
-        chartset: {
+        charset: {
           label: '字符编码',
           type: 'select',
           dataList: [
diff --git a/src/views/pages/framework/integration/param-edit.vue b/src/views/pages/framework/integration/param-edit.vue
index c3e0d1e4a96d1aeef14edae739c359a2b46d7604..fc85c7ce072e86e64750ea40411d333382d92e26 100644
--- a/src/views/pages/framework/integration/param-edit.vue
+++ b/src/views/pages/framework/integration/param-edit.vue
@@ -26,6 +26,7 @@
             <th style="width:20%">{{ $t('term.framework.paramtype') }}</th>
             <th style="width:20%">{{ $t('term.report.datatype.name') }}</th>
             <th style="width:10%">{{ $t('page.require') }}</th>
+            <th style="width:10%">{{ $t('term.cmdb.searchable') }}</th>
             <th style="width:30%">{{ $t('page.description') }}</th>
             <th v-if="allowEditParam == 1">
               <a href="javascript:void(0)" style="margin-right:5px" @click="addParam">
@@ -68,6 +69,14 @@
                 :false-value="0"
               ></i-switch>
             </td>
+            <td>
+              <i-switch
+                v-if="item.mode == 'input'"
+                v-model="item.isSearchAble"
+                :true-value="1"
+                :false-value="0"
+              ></i-switch>
+            </td>
             <td>
               <TsFormInput v-model="item.description" :maxlength="200" transfer></TsFormInput>
             </td>
diff --git a/src/views/pages/framework/matrix/components/UploadDialog.vue b/src/views/pages/framework/matrix/components/UploadDialog.vue
index 365a0808d3149a3ff88d6a611f54c4c7f5b298d6..791565c0adb3346b7c916a6cb2502668023fdf83 100644
--- a/src/views/pages/framework/matrix/components/UploadDialog.vue
+++ b/src/views/pages/framework/matrix/components/UploadDialog.vue
@@ -442,7 +442,7 @@ export default {
       if ((file.Status = 'ERROR')) {
         this.$Notice.error({
           title: this.$t('message.importfailed'),
-          desc: response.Message
+          desc: response?.Message
         });
         let findFileItem = this.fileList.find(item => item.file.name === file.name);
         if (findFileItem) {
diff --git a/src/views/pages/framework/mq/mq-subscribe-list.vue b/src/views/pages/framework/mq/mq-subscribe-list.vue
index 794b07b37c6cb7a641e3f1c2731cb5603ab66b7b..0539405c598412021d232489f4a34c40b8e4c2a7 100644
--- a/src/views/pages/framework/mq/mq-subscribe-list.vue
+++ b/src/views/pages/framework/mq/mq-subscribe-list.vue
@@ -4,10 +4,6 @@
       <span class="cursor tsfont-plus" @click="editSubscribe()">{{ $t('term.framework.subscribe') }}</span>
     </div>
     <TsTable v-if="subscribeData" v-bind="subscribeData" :theadList="theadList">
-      <!-- <template slot="isDurable" slot-scope="{ row }">
-        <span v-if="row.isDurable == 1">{{ $t('term.framework.dursubs') }}</span>
-        <span v-else>{{ $t('term.framework.tempsubs') }}</span>
-      </template>-->
       <template v-slot:handlerName="{ row }">
         <span>{{ row.handlerName }}</span>
         <span>
@@ -50,6 +46,7 @@
                 @on-change="toggleSubscribeActive(row)"
               ></TsFormSwitch>
             </li>
+            <li class="tsfont-heart-s" @click.stop="healthCheck(row)">状态检查</li>
             <li class="tsfont-edit" @click.stop="editSubscribe(row)">{{ $t('page.edit') }}</li>
             <li class="tsfont-trash-o" @click="deleteSubscribe(row)">{{ $t('page.delete') }}</li>
           </ul>
@@ -72,7 +69,7 @@ export default {
     return {
       isEditShow: false,
       currentSubscribeId: null,
-      searchParam: { },
+      searchParam: {},
       subscribeData: {},
       theadList: [
         {
@@ -102,6 +99,22 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    healthCheck(row) {
+      this.$api.framework.mq.healthCheck(row.id).then(res => {
+        const healthcheckResultList = res.Return;
+        if (healthcheckResultList && healthcheckResultList.length > 0) {
+          healthcheckResultList.forEach(item => {
+            if (item.level === 'normal') {
+              this.$Notice.success({ title: item.message });
+            } else if (item.level === 'warning') {
+              this.$Notice.warning({ title: item.message });
+            } else if (item.level === 'error') {
+              this.$Notice.error({ title: item.message });
+            }
+          });
+        }
+      });
+    },
     editSubscribe(row) {
       if (row) {
         this.currentSubscribeId = row.id;
diff --git a/src/views/pages/framework/notifytactics/notifytactics-overview.vue b/src/views/pages/framework/notifytactics/notifytactics-overview.vue
index dd0991dd75a181d5a1d8ef4a085828137b0a7c14..cedfb10fa6a8c499a6d40c29f67293f82126e99d 100644
--- a/src/views/pages/framework/notifytactics/notifytactics-overview.vue
+++ b/src/views/pages/framework/notifytactics/notifytactics-overview.vue
@@ -479,6 +479,7 @@ export default {
                   id: obj.id
                 }
               });
+              this.$addHistoryData('handler', this.handler);
             }
           });
         }
diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js
index 17e425a91b20008146eea64acbb465c66b1db2df..d751ed90edef816d4f829bb62350a844064562de 100644
--- a/src/views/pages/framework/router.js
+++ b/src/views/pages/framework/router.js
@@ -46,6 +46,7 @@ const sqldump = () => import('./healthcheck/sqldump.vue');
 const databaseFragment = () => import('./healthcheck/database-fragment.vue');
 
 const dataWarehouseManage = () => import('./datawarehouse/datawarehouse-manage.vue');
+const databaseManage = () => import('./database/database-manage.vue');
 const fileManage = () => import('./file/file-manage.vue');
 const themeManage = () => import('./theme/theme-manage.vue');
 
@@ -59,6 +60,7 @@ const serverManage = () => import('./server/server-manage.vue'); // 服务器管
 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');//数据库变更记录
 
 import { $t } from '@/resources/init.js';
 import { config } from './config.js';
@@ -359,6 +361,18 @@ let routerList = [
       authority: ['DATA_WAREHOUSE_MODIFY']
     }
   },
+  {
+    path: '/database-manage',
+    name: 'database-manage',
+    component: databaseManage,
+    meta: {
+      title: $t('router.framework.datasource'),
+      icon: 'tsfont-db-cluster',
+      ismenu: true,
+      type: 'integration',
+      authority: ['DATA_WAREHOUSE_MODIFY']
+    }
+  },
   {
     path: '/history-overview',
     name: 'history-overview',
@@ -730,6 +744,18 @@ let routerList = [
       authority: 'HOME_PAGE_MODIFY',
       type: 'others'
     }
+  },
+  {
+    path: '/changelogaudit-manage',
+    name: 'changelogAuditManage',
+    component: changelogAuditManage,
+    meta: {
+      title: $t('router.framework.changelogaudit'),
+      ismenu: true,
+      icon: 'tsfont-formstaticlist',
+      authority: 'ADMIN',
+      type: 'others'
+    }
   }
 ];
 export default routerList;
diff --git a/src/views/pages/framework/runner/group-add-dialog.vue b/src/views/pages/framework/runner/group-add-dialog.vue
index b435d70d22051213644a4727dd914d229e7f4695..944374d52fc9f483175c26c24f492f994d2c4609 100644
--- a/src/views/pages/framework/runner/group-add-dialog.vue
+++ b/src/views/pages/framework/runner/group-add-dialog.vue
@@ -45,9 +45,9 @@
                 />
               </template>
               <template v-slot:act="{ index }">
-                <div class="actions flex-start groupwork">
-                  <span v-if="netWorkList.length>1" class="tsfont-close-o text-action" @click="operationRow('del', index)"></span>
-                  <span class="tsfont-plus-o text-action" @click="operationRow('add', index)"></span>
+                <div class="action-group">
+                  <span v-if="netWorkList.length > 1" class="action-item tsfont-close-o" @click="operationRow('del', index)"></span>
+                  <span class="action-item tsfont-plus-o" @click="operationRow('add', index)"></span>
                 </div>
               </template>
             </TsTable>
@@ -88,6 +88,12 @@ export default {
   props: {
     runnerGroupData: {
       type: Object
+    },
+    runnerGroupTableConfig: {
+      type: Object,
+      default: function() {
+        return {};
+      }
     }
   },
   data() {
diff --git a/src/views/pages/framework/runner/group-edit-dialog.vue b/src/views/pages/framework/runner/group-edit-dialog.vue
index f534e3b55942ab5f8c0c50d86d2e3fcf7731903c..6f13cd2609e454549e452c921be9f1397c34b580 100644
--- a/src/views/pages/framework/runner/group-edit-dialog.vue
+++ b/src/views/pages/framework/runner/group-edit-dialog.vue
@@ -51,9 +51,9 @@
                           />
                         </template>
                         <template v-slot:act="{ index }">
-                          <div class="actions flex-start">
-                            <span v-if="netWorkList.length>1" class="tsfont-close-o text-action" @click="operationRow('del', index)"></span>
-                            <span class="tsfont-plus-o text-action" @click="operationRow('add', index)"></span>
+                          <div class="action-group">
+                            <span v-if="netWorkList.length > 1" class="action-item tsfont-close-o" @click="operationRow('del', index)"></span>
+                            <span class="action-item tsfont-plus-o" @click="operationRow('add', index)"></span>
                           </div>
                         </template>
                       </TsTable>
@@ -104,6 +104,12 @@ export default {
       default: function() {
         return {};
       }
+    },
+    runnerGroupTableConfig: {
+      type: Object,
+      default: function() {
+        return {};
+      }
     }
   },
   data() {
diff --git a/src/views/pages/framework/runner/networkip-mask-dialog.vue b/src/views/pages/framework/runner/networkip-mask-dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d3d9c7f33c8c3321b22b33afaddceb159befc9b9
--- /dev/null
+++ b/src/views/pages/framework/runner/networkip-mask-dialog.vue
@@ -0,0 +1,80 @@
+<template>
+  <TsDialog v-bind="dialogSetting" @on-close="closeDialog" @on-cancel="closeDialog">
+    <template v-slot>
+      <div class="network-dialog-wrapper">
+        <TsRow :gutter="10">
+          <template v-for="(item) in networkList">
+            <Col
+              :key="item.id"
+              :span="8"
+            >
+              <div class="networkip-mask-list border-color bg-op radius-sm text-center overflow" :title="getNetworkIpMask(item)">
+                {{ getNetworkIpMask(item) }}
+              </div>
+            </Col>
+          </template>  
+        </TsRow>
+      </div>
+    </template>
+  </TsDialog>
+</template>
+<script>
+export default {
+  name: '',
+  components: {},
+  directives: {},
+  props: {
+    networkList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      dialogSetting: {
+        title: '查看更多网段IP/子网掩码',
+        type: 'modal',
+        width: 'medium',
+        isShow: true,
+        hasFooter: false,
+        maskClose: true
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    closeDialog() {
+      this.$emit('close');
+    }
+  },
+  filter: {},
+  computed: {
+    getNetworkIpMask() {
+      return (item) => {
+        return item.networkIp + ' / ' + item.mask;
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less">
+.network-dialog-wrapper {
+  .networkip-mask-list {
+    border: 1px solid;
+    padding: 6px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+}
+</style>
diff --git a/src/views/pages/framework/runner/runner-manage.vue b/src/views/pages/framework/runner/runner-manage.vue
index 10a3f177f1179a7106dea5a28993c548ae290b22..b2bc5ff4d12eecf1e6673e7e8ecfee6a7fd5c7aa 100644
--- a/src/views/pages/framework/runner/runner-manage.vue
+++ b/src/views/pages/framework/runner/runner-manage.vue
@@ -26,6 +26,7 @@
             v-bind="tableSetting"
             @changeCurrent="changeCurrent"
             @changePageSize="changePageSize"
+            @headerTitleOperation="headerTitleOperation"
           >
             <template slot="name" slot-scope="{ row }">
               <span v-if="row && row.name" class="text-href" @click="editRunner(row)">{{ row.name }}</span>
@@ -124,7 +125,8 @@ export default {
         },
         {
           title: this.$t('page.status'),
-          key: 'status'
+          key: 'status',
+          headerIcon: 'tsfont-refresh'
         },
         {
           title: 'IP',
@@ -173,7 +175,9 @@ export default {
   updated() {},
   activated() {},
   deactivated() {},
-  beforeDestroy() {},
+  beforeDestroy() {
+    this.clearTimmer();
+  },
   destroyed() {},
   methods: {
     closeAddRunner(needRefresh) {
@@ -228,8 +232,46 @@ export default {
         .then(res => {
           if (res.Status == 'OK') {
             Object.assign(this.tableSetting, res.Return);
+            this.refreshTbodyList();
+          }
+        });
+    },
+    getRunnerStatus(item) {
+      return this.$api.framework.runner.getRunnerStatus({id: item.id}).then((res) => {
+        if (res.Status == 'OK') {
+          if (!this.$utils.isEmpty(res.Return)) {
+            this.$set(item, 'status', res.Return.status);
+            this.$set(item, 'statusLcd', res.Return.statusLcd);
+            this.$set(item, 'statusText', res.Return.statusText);
+          }
+        }
+      });
+    },
+    clearTimmer() {
+      if (this.timmer) {
+        clearTimeout(this.timmer);
+        this.timmer = null;
+      }
+    },
+    refreshTbodyList(isShowRefreshTip) {
+      this.clearTimmer();
+      if (!this.$utils.isEmpty(this.tableSetting.tbodyList)) {
+        let promiseArr = [];
+        promiseArr = this.tableSetting.tbodyList.map(item => {
+          return this.getRunnerStatus(item);
+        });
+        Promise.all(promiseArr).then(() => {
+          if (isShowRefreshTip) {
+            this.$Message.success(this.$t('message.refreshsuccess'));
           }
+          this.timmer = setTimeout(() => {
+            this.refreshTbodyList();
+          }, 10000);
         });
+      }
+    },
+    headerTitleOperation() {
+      this.refreshTbodyList(true);
     }
   },
   computed: {},
diff --git a/src/views/pages/framework/runner/runnergroup-manage.vue b/src/views/pages/framework/runner/runnergroup-manage.vue
index d2e0f38f5480266ca468f08e9337425a2361476c..571de9aafd54a0ebaf65602ef3c1fbed4f51d271 100644
--- a/src/views/pages/framework/runner/runnergroup-manage.vue
+++ b/src/views/pages/framework/runner/runnergroup-manage.vue
@@ -27,10 +27,17 @@
           >
             <template slot="groupNetworkList" slot-scope="{ row }">
               <!-- 网段IP/子网掩码 -->
-              <div v-if="row.groupNetworkList.length > 0">
-                <div v-for="item in row.groupNetworkList" :key="item.id">
+              <div v-if="row.groupNetworkList && row.groupNetworkList.length > 0">
+                <div
+                  v-for="item in row.groupNetworkList.slice(0,3)"
+                  :key="item.id"
+                  class="mb-xs"
+                >
                   {{ item.networkIp }} / {{ item.mask }}
                 </div>
+                <template v-if="row.groupNetworkList.length >= 3">
+                  <span class="tsfont-option-horizontal text-href" @click.stop="openNetworkIpMaskDialog(row.groupNetworkList)">查看更多</span>
+                </template>
               </div>
             </template>
             <template slot="runnerCount" slot-scope="{ row }">
@@ -61,6 +68,7 @@
     <GroupAddDialog
       v-if="isShowGroupAddDialog"
       :runnerGroupData="runnerGroupData"
+      :runnerGroupTableConfig="tableConfig"
       @close="closeGroupAddDialog"
     ></GroupAddDialog>
 
@@ -68,6 +76,7 @@
     <GroupEditDialog
       v-if="isShowRunnerGroupEdit"
       :runnerGroupData="runnerGroupData"
+      :runnerGroupTableConfig="tableConfig"
       @close="closeGroupEditDialog"
     ></GroupEditDialog>
 
@@ -83,6 +92,12 @@
         </div>
       </template>
     </TsDialog>
+    <NetworkipMaskDialog
+      v-if="isShowNetworkIpMaskDialog"
+      :networkList="groupNetworkList"
+      @close="closeNetworkIpMaskDialog"
+    >
+    </NetworkipMaskDialog>
   </div>
 
 </template>
@@ -94,7 +109,8 @@ export default {
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     GroupAddDialog: () => import('./group-add-dialog.vue'),
     GroupEditDialog: () => import('./group-edit-dialog.vue'),
-    RunnerRelate: () => import('./runner-relate.vue')
+    RunnerRelate: () => import('./runner-relate.vue'),
+    NetworkipMaskDialog: () => import('./networkip-mask-dialog.vue')
   },
   filters: {},
   props: {
@@ -108,6 +124,8 @@ export default {
       runnerRowData: {}, // 点击数量，获取行的数据
       isShowGroupAddDialog: false,
       isShowRunnerGroupEdit: false,
+      isShowNetworkIpMaskDialog: false,
+      groupNetworkList: [],
       runnerGroupData: {},
       runnerManageDialog: {
         type: 'modal',
@@ -292,6 +310,14 @@ export default {
       let textList = '';
       textList = list.slice(3);
       return textList;
+    },
+    openNetworkIpMaskDialog(groupNetworkList) {
+      this.isShowNetworkIpMaskDialog = true;
+      this.groupNetworkList = groupNetworkList;
+    },
+    closeNetworkIpMaskDialog() {
+      this.isShowNetworkIpMaskDialog = false;
+      this.groupNetworkList = [];
     }
   },
   computed: {},
diff --git a/src/views/pages/framework/runner/src/runner-group-mixin.js b/src/views/pages/framework/runner/src/runner-group-mixin.js
index 9fc92e0b5e6737fa981e3055af2b91da3a11187e..f057d98e875f1794640ba3e32a12b325ae6af729 100644
--- a/src/views/pages/framework/runner/src/runner-group-mixin.js
+++ b/src/views/pages/framework/runner/src/runner-group-mixin.js
@@ -60,6 +60,17 @@ const runnerGroupMixin = {
           valueName: 'name',
           textName: 'name'
         },
+        rule: {
+          type: 'textarea',
+          name: 'rule',
+          placeholder: _this.$t('form.placeholder.pleaseinput', {
+            target: $t('page.rule')
+          }),
+          label: _this.$t('page.rule'),
+          tooltip: $t('term.framework.runnergrouptips', {
+            prefix: _this.runnerGroupTableConfig?.prefix
+          }) + '${' + _this.runnerGroupTableConfig?.prefix + "env}=='sit'&&(${" + _this.runnerGroupTableConfig?.prefix + "test}=='1'||${" + _this.runnerGroupTableConfig?.prefix + "test2}=='aaa')"
+        },
         groupNetworkList: {
           label: $t('page.networksegment'),
           type: 'slot'
diff --git a/src/views/pages/framework/runner/src/runner-group.less b/src/views/pages/framework/runner/src/runner-group.less
index 94faf83b4b8cee22d1950b6562865eff9544b6f8..df6f249dc979beccf466153454b5af39a2329490 100644
--- a/src/views/pages/framework/runner/src/runner-group.less
+++ b/src/views/pages/framework/runner/src/runner-group.less
@@ -6,14 +6,14 @@
   ::v-deep div:first-of-type {
     //  解决网段IP和掩码有错误提示，高度不对齐问题
     height: 50px;
-    line-height: 40px;
+    line-height: 50px;
   }
   ::v-deep .form-error-tip {
     position: absolute;
-    top: 34px;
+    top: 40px;
   }
   ::v-deep .ivu-input-icon {
-    line-height: 38px;
+    line-height: 46px;
   }
 }
 .netWork {
diff --git a/src/views/pages/framework/schedule/job-manage.vue b/src/views/pages/framework/schedule/job-manage.vue
index 9485deb3ac4019d8d45cc4863ab34ea19e6e8409..2b6d3d90f3c8913e0ab594ee383fa0ce71c0a12f 100644
--- a/src/views/pages/framework/schedule/job-manage.vue
+++ b/src/views/pages/framework/schedule/job-manage.vue
@@ -44,6 +44,10 @@
             <span v-if="row.needAudit == 1" class="text-success">{{ $t('page.yes') }}</span>
             <span v-else class="text-grey">{{ $t('page.no') }}</span>
           </template>
+          <template slot="isLoad" slot-scope="{ row }">
+            <span v-if="row.jobStatus && row.jobStatus.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
           <template slot="execCount" slot-scope="{ row }">
             <div>{{ row.jobStatus.execCount }}</div>
           </template>
@@ -148,6 +152,10 @@ export default {
           title: this.$t('page.keeprecords'),
           key: 'needAudit'
         },
+        {
+          title: this.$t('page.loaded'),
+          key: 'isLoad'
+        },
         {
           title: this.$t('page.plantime'),
           key: 'cron'
diff --git a/src/views/pages/framework/schedule/job-memory.vue b/src/views/pages/framework/schedule/job-memory.vue
index 98fedd48e155ecf6095354e882649c2a43c08d6c..60c3784c480fca94c5d6c9c92af1e7f37b84cdfc 100644
--- a/src/views/pages/framework/schedule/job-memory.vue
+++ b/src/views/pages/framework/schedule/job-memory.vue
@@ -58,6 +58,7 @@ export default {
         valueName: 'value',
         search: true,
         transfer: true,
+        border: 'border',
         onChange: val => {
           this.changeJobGroupName(val);
         }
@@ -74,6 +75,7 @@ export default {
         search: true,
         transfer: true,
         disabled: true,
+        border: 'border',
         onChange: val => {
           this.changeJobName(val);
         }
diff --git a/src/views/pages/framework/server/server-manage.vue b/src/views/pages/framework/server/server-manage.vue
index 3fc4d95d2d69e573b73e3581c22f1eb3e61ff120..2c7916484732aba8a5de1ab7b073301b1226f161 100644
--- a/src/views/pages/framework/server/server-manage.vue
+++ b/src/views/pages/framework/server/server-manage.vue
@@ -78,7 +78,7 @@ export default {
         },
         {
           key: 'host',
-          title: this.$t('term.framework.host')
+          title: this.$t('term.framework.heartbeaturl')
         },
         {
           key: 'heartbeatTime',
@@ -111,7 +111,7 @@ export default {
         },
         host: {
           type: 'text',
-          label: this.$t('term.framework.host'),
+          label: this.$t('term.framework.heartbeaturl'),
           placeholder: 'http(s)://ip:port',
           validateList: ['required']
         }
diff --git a/src/views/pages/framework/tagent/tagent/install-tips-dialog.vue b/src/views/pages/framework/tagent/tagent/install-tips-dialog.vue
index 2551e9cba86ca2622f141a8639edbe45df9732bf..513d5d3d144130191e8065b2bbec83ddf4210304 100644
--- a/src/views/pages/framework/tagent/tagent/install-tips-dialog.vue
+++ b/src/views/pages/framework/tagent/tagent/install-tips-dialog.vue
@@ -76,7 +76,7 @@ export default {
             {
               id: this.$utils.setUuid(),
               systemName: 'Windows',
-              WindowScripts: '#Open cmd.exec in Administrator mode\ncd "%Temp%"\n#use browser downlaod install.vbs to directory:%Temp%\n#http://192.168.0.26:8080/download/tagent-bootstrap/install.vbs\nset RUNNER_ADDR=http://10.68.10.60:8084\ncscript install.vbs /tenant:develop /pkgurl:%RUNNER_ADDR%/autoexecrunner/tagent/download/tagent_windows_x64.tar /serveraddr:%RUNNER_ADDR% /listenaddr:0.0.0.0 /port:3939'
+              WindowScripts: '#Open cmd.exe in Administrator mode\ncd "%Temp%"\n#use browser download install.vbs to directory:%Temp%\n#http://10.68.10.60:8084/autoexecrunner/tagent/download/install.vbs\nset RUNNER_ADDR=http://10.68.10.60:8084\ncscript install.vbs /tenant:develop /pkgurl:%RUNNER_ADDR%/autoexecrunner/tagent/download/tagent_windows_x64.tar /serveraddr:%RUNNER_ADDR% /listenaddr:0.0.0.0 /port:3939'
             }
           ]
         },
diff --git a/src/views/pages/framework/users/common/common-auth.vue b/src/views/pages/framework/users/common/common-auth.vue
index 84271a7717845b86275c69a0512da58a7e096a95..67f5247b14d3dd7c9839d12037b184e35a163045 100644
--- a/src/views/pages/framework/users/common/common-auth.vue
+++ b/src/views/pages/framework/users/common/common-auth.vue
@@ -89,9 +89,19 @@ export default {
     isDisabled(row) {
       // 继承角色权限，不允许取消授权
       let isDisabled = false;
-      let authRoleObj = JSON.stringify(this.authRoleSelectList);
-      let hasAuthRole = authRoleObj.indexOf(row.name);
-      isDisabled = hasAuthRole != '-1';
+      const {name = ''} = row || {};
+      if (this.$utils.isEmpty(name)) {
+        return false;
+      }
+      // 处理继承角色权限，之前是转成JSON字符串去匹配，导致匹配的权限不对，授权范围扩大了。
+      for (let key in this.authRoleSelectList) {
+        if (key && this.authRoleSelectList[key] && this.authRoleSelectList[key].length > 0 && Array.isArray(this.authRoleSelectList[key])) {
+          if (this.authRoleSelectList[key].some(authName => authName === row.name)) {
+            isDisabled = true;
+            break;
+          }
+        }
+      }
       return isDisabled;
     },
     isReadOnly() {
diff --git a/src/views/pages/framework/users/role-addview.vue b/src/views/pages/framework/users/role-addview.vue
index c051a4df7821c45fdae4b95745787f82bbb96722..351bd0d7e05f94d4fe79e6598b54f3cbe887ef51 100644
--- a/src/views/pages/framework/users/role-addview.vue
+++ b/src/views/pages/framework/users/role-addview.vue
@@ -219,7 +219,9 @@ export default {
           value: '',
           placeholder: this.$t('form.placeholder.pleaseinput', {target: this.$t('page.rule')}),
           label: this.$t('page.rule'),
-          tooltip: this.$t('page.rolerule')
+          tooltip: this.$t('page.rolerule', {
+            prefix: this.rulePrefix
+          }) + '${' + this.rulePrefix + "env}=='sit'&&(${" + this.rulePrefix + "test}=='1'||${" + this.rulePrefix + "test2}=='aaa')"
         }
       ],
       uuid: '', //角色uuid
@@ -262,11 +264,14 @@ export default {
         isRefreshRoleUserList: false
       },
       defaultAuthUserSelectList: {}, // 默认授权列表回显选中数据
-      isRefreshCommonAuth: false // 是否刷新授权列表
+      isRefreshCommonAuth: false, // 是否刷新授权列表
+      rulePrefix: '' //规则key前缀
     };
   },
 
-  beforeCreate() {},
+  beforeCreate() {
+    this.rulePrefix = this.$route.query.rulePrefix || '';
+  },
 
   created() {
     this.uuid = this.$route.query.uuid || null;
diff --git a/src/views/pages/framework/users/role-manage.vue b/src/views/pages/framework/users/role-manage.vue
index 4a7575897d8817495b75e4535007e99ad476058c..fc28daf728701c43cd7eb3a054e6e2e67ad91513 100644
--- a/src/views/pages/framework/users/role-manage.vue
+++ b/src/views/pages/framework/users/role-manage.vue
@@ -77,7 +77,8 @@ export default {
         { title: this.$t('term.framework.usercount'), key: 'userCount' },
         { title: this.$t('term.framework.teamcount'), key: 'teamCount' },
         { title: ' ', key: 'action'}
-      ]
+      ],
+      rulePrefix: ''
     };
   },
   created() {},
@@ -98,6 +99,7 @@ export default {
       this.$api.framework.role.roleList(data).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
+          this.rulePrefix = res.Return.prefix;
         }
       }).finally(() => {
         this.loadingShow = false;
@@ -171,7 +173,7 @@ export default {
       }
       this.$router.push({
         path: `role-addview`,
-        query: { roleId: roleId, key: key, uuid: uuid, groupType: this.groupType}
+        query: { roleId: roleId, key: key, uuid: uuid, groupType: this.groupType, rulePrefix: this.rulePrefix}
       });
     }
   },
diff --git a/src/views/pages/framework/users/user-addview.vue b/src/views/pages/framework/users/user-addview.vue
index d95a0c11f7e40e3c7a18c825f50e68482d961400..937146940834378a3ee895b91c3c5090500a5d46 100644
--- a/src/views/pages/framework/users/user-addview.vue
+++ b/src/views/pages/framework/users/user-addview.vue
@@ -15,7 +15,7 @@
       <div slot="topRight" class="top">
         <div class="bar-top">
           <div class="bar-top-right">
-            <div v-if="uuid == null">
+            <div v-if="$utils.isEmpty(uuid)">
               <Button v-show="current > 0" type="default" @click="current -= 1">{{ $t('page.previousstep') }}</Button>
               <Button v-show="current != 1" type="primary" @click="next()">{{ $t('page.thenextstep') }}</Button>
               <Button
@@ -33,12 +33,8 @@
         </div>
       </div>
       <div slot="content" class="content">
-        <div v-if="uuid == null">
+        <div v-if="$utils.isEmpty(uuid)">
           <div class="step">
-            <!-- <Steps :current="current" :status="stepStatus">
-              <Step title="基本信息" content=""></Step>
-              <Step title="授权" content=""></Step>
-            </Steps> -->
             <Steps :current="current" :status="stepStatus">
               <Step
                 v-for="(litem, lindex) in stepList"
@@ -61,7 +57,7 @@
                     :label="vipLevel"
                     class="vip-level-item"
                   >
-                    <img :src="getVipIconByLevel(vipLevel)" class="vip-icon">
+                    <img :src="getVipIconByLevel(vipLevel)" class="vip-icon" />
                   </Radio>
                 </RadioGroup>
               </template>
@@ -77,17 +73,17 @@
               type="primary"
               :loading="isLoading"
               @click="submit()"
-            >{{ $t('dialog.title.createtarget', {target: $t('page.user')}) }}</Button>
+            >{{ $t('dialog.title.createtarget', { target: $t('page.user') }) }}</Button>
           </div>
         </div>
         <div v-else style="heigth: 100%">
           <Tabs v-model="tabsName">
-            <TabPane :label="label1" name="user">
+            <TabPane :label="basicInfoTabLabelName" name="user">
               <div class="form">
                 <TsForm v-if="formShow" ref="userForm" :itemList="formData">
                   <template slot="vipLevel">
                     <RadioGroup v-model="formData[3].value" class="vip-level-item">
-                      <Radio :label="0" class="vip-level-item" :disabled="readonly?true:false">
+                      <Radio :label="0" class="vip-level-item" :disabled="readonly ? true : false">
                         <span>{{ $t('page.nothave') }}</span>
                       </Radio>
                       <Radio
@@ -95,9 +91,9 @@
                         :key="vipLevel"
                         :label="vipLevel"
                         class="vip-level-item"
-                        :disabled="readonly?true:false"
+                        :disabled="readonly ? true : false"
                       >
-                        <img :src="getVipIconByLevel(vipLevel)" class="vip-icon">
+                        <img :src="getVipIconByLevel(vipLevel)" class="vip-icon" />
                       </Radio>
                     </RadioGroup>
                   </template>
@@ -136,7 +132,7 @@
                 >{{ $t('page.save') }}</Button>
               </div>
             </TabPane>
-            <TabPane :label="label2" name="auth">
+            <TabPane :label="authTabLabelName" name="auth">
               <div v-if="authUserSelectList !== '{}'" class="auth">
                 <CommonAuth
                   v-if="!isRefreshCommonAuth"
@@ -207,13 +203,12 @@ export default {
   },
   props: [''],
   data() {
-    let _this = this;
     return {
       formData: [
         {
           type: 'text',
           name: 'uuid',
-          value: _this.uuid || null,
+          value: this.uuid || null,
           isHidden: true,
           disabled: true,
           label: 'uuid',
@@ -270,7 +265,7 @@ export default {
               message: this.$t('message.passcode')
             }
           ],
-          onChange: _this.psdChange
+          onChange: this.psdChange
         },
         {
           type: 'password',
@@ -289,7 +284,7 @@ export default {
               message: this.$t('message.passcode')
             }
           ],
-          onChange: _this.psdChange
+          onChange: this.psdChange
         },
         {
           type: 'email',
@@ -345,7 +340,7 @@ export default {
           width: '100%',
           transfer: true,
           groupList: ['role'],
-          onChange: _this.roleChange
+          onChange: this.roleChange
         },
         {
           type: 'slot',
@@ -376,11 +371,11 @@ export default {
       path: '', //跳转路径
       userData: null, //用户所有初始化数据
       userToken: '', //用户令牌
-      userTabsDataList: null, //用户基本信息数据
+      defaultUserDataTab: null, //用户基本信息数据
       userTabsAuthList: null, //用户授权信息数据
       submitModel: false, //提交成功模态框
-      label1: '',
-      label2: '',
+      basicInfoTabLabelName: '',
+      authTabLabelName: '',
       leaveName: '', //准备进入tabsname
       tabSaveTip: true,
       tabsaveModel: false,
@@ -398,9 +393,7 @@ export default {
       isRefreshCommonAuth: false // 是否刷新授权列表
     };
   },
-
   beforeCreate() {},
-
   created() {
     if (sessionStorage.getItem('useraddPrev')) {
       let prevsetting = JSON.parse(sessionStorage.getItem('useraddPrev'));
@@ -408,42 +401,64 @@ export default {
         this.prevPath = prevsetting;
       }
     }
-    let query = this.$route.query;
-
-    this.uuid = query.uuid || null;
-    this.userId = query.userId || null;
-    this.tabsName = query.key || null;
-    this.readonly = query.readonly || false;
-    if (this.readonly && this.uuid) {
-      let newConfig = this.formData.find(v => v.name === 'teamRoleList');
-      if (newConfig) {
-        newConfig.isHidden = false;
-      }
-    }
-    this.label1 = this.getLabel(this.$t('page.basicinfo'), 'user');
-    this.label2 = this.getLabel(this.$t('page.auth'), 'auth');
-    this.getRoleList();
-    this.getAuthList();
-    this.getProfile();
+    this.initData();
   },
-
   beforeMount() {},
-
   mounted() {},
-
   beforeUpdate() {},
-
   updated() {},
-
   activated() {},
-
   deactivated() {},
-
   beforeDestroy() {},
-
   destroyed() {},
-
   methods: {
+    initData() {
+      let { uuid = null, userId = null, key = null, readonly = false } = this.$route.query;
+      this.uuid = uuid;
+      this.userId = userId;
+      this.tabsName = key;
+      this.readonly = readonly;
+      this.handleDataByUuid();
+      this.handleReadonly();
+      this.basicInfoTabLabelName = this.getLabel(this.$t('page.basicinfo'), 'user');
+      this.authTabLabelName = this.getLabel(this.$t('page.auth'), 'auth');
+      this.getAuthList();
+      this.getProfile();
+    },
+    handleDataByUuid() {
+      if (!this.$utils.isEmpty(this.uuid)) {
+        this.getUserDetail(this.uuid);
+        this.getAuthSelect(this.uuid);
+        this.getUserToken(this.uuid);
+      }
+    },
+    handleReadonly() {
+      if (this.readonly) {
+        this.formData.forEach(item => {
+          item.disabled = true;
+        });
+        this.formData
+          .filter(d => d.name == 'roleUuidList' || d.name == 'teamUuidList')
+          .forEach(item => {
+            item.readonly = true;
+          });
+      } else {
+        this.formData.forEach(item => {
+          if (this.uuid && item.name == 'userId') {
+            item.disabled = true;
+          } else if (item.name != 'uuid') {
+            item.disabled = false;
+            item.readonly = false;
+          }
+        });
+      }
+      if (this.readonly && this.uuid) {
+        let findTeamRoleItem = this.formData.find(v => v.name === 'teamRoleList');
+        if (findTeamRoleItem) {
+          findTeamRoleItem.isHidden = false;
+        }
+      }
+    },
     //密码框改变
     psdChange: function(val) {
       if (this.userId != null) {
@@ -500,7 +515,6 @@ export default {
     },
     //下一步
     next() {
-      let _this = this;
       let data = this.$refs.userForm.getFormValue();
       if (!this.$refs.userForm.valid()) {
         this.stepStatus = 'error';
@@ -590,7 +604,7 @@ export default {
           .then(res => {
             if (res.Status == 'OK') {
               this.$Message.success(this.$t('message.savesuccess'));
-              this.userTabsDataList = this.$refs.userForm ? this.$refs.userForm.getFormValue() : null;
+              this.defaultUserDataTab = this.$refs.userForm ? this.$refs.userForm.getFormValue() : null;
               this.userData = this.getData();
             }
           })
@@ -618,7 +632,6 @@ export default {
     },
     //获取当前用户信息
     getUserDetail(id) {
-      let _this = this;
       let obj_name = this.formData.find(d => d.name === 'userId');
       let psd = this.formData.find(d => d.name === 'password');
       let newpwd = this.formData.find(d => d.name === 'confirmpwd');
@@ -633,10 +646,9 @@ export default {
       }
       this.formShow = true;
       let data = {
-        userUuid: id,
-        isRuleRole: false
+        userUuid: id
       };
-      this.$api.common.getUser(data).then(res => {
+      this.$api.framework.user.getUserForEdit(data).then(res => {
         if (res.Status == 'OK') {
           let row = res.Return;
           this.userDetail = row;
@@ -674,34 +686,16 @@ export default {
     //获取所有权限列表
     getAuthList: function() {
       let data = {};
-      let _this = this;
-      this.$api.common
-        .getAuthGrouplist(data)
-        .then(res => {
-          if (res.Status == 'OK') {
-            _this.authList = res.Return.authGroupList;
-            _this.$nextTick(() => {
-              setTimeout(() => {
-                _this.userData = _this.getData();
-                _this.userTabsDataList = _this.$refs.userForm.getFormValue();
-                _this.userTabsAuthList = JSON.parse(JSON.stringify(_this.$refs.commonAuth.authSelectList));
-              }, 500);
-            });
-          }
-        });
-    },
-    //获取角色列表
-    getRoleList: function() {
-      let data = {
-        needPage: false
-      };
-      this.$api.framework.role.roleList(data).then(res => {
+      this.$api.common.getAuthGrouplist(data).then(res => {
         if (res.Status == 'OK') {
-          let list = res.Return.tbodyList;
-          let newConfig = this.formData.find(d => d.name == 'roleUuidList');
-          if (newConfig) {
-            newConfig.dataList = list;
-          }
+          this.authList = res.Return.authGroupList;
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.userData = this.getData();
+              this.defaultUserDataTab = this.$refs.userForm?.getFormValue();
+              this.userTabsAuthList = JSON.parse(JSON.stringify(this.$refs.commonAuth.authSelectList));
+            }, 500);
+          });
         }
       });
     },
@@ -724,7 +718,7 @@ export default {
         if (this.tabsName != name) {
           if (name == 'auth') {
             let newData = this.$refs.userForm.getFormValue();
-            if (JSON.stringify(newData) == JSON.stringify(this.userTabsDataList)) {
+            if (this.$utils.isSame(newData, this.defaultUserDataTab)) {
               this.tabSaveTip = false; //可以跳转
             } else {
               this.tabSaveTip = true;
@@ -733,7 +727,7 @@ export default {
           }
           if (name == 'user') {
             let newData = this.$refs.commonAuth.authSelectList;
-            if (JSON.stringify(newData) == JSON.stringify(this.userTabsAuthList)) {
+            if (this.$utils.isSame(newData, this.userTabsAuthList)) {
               this.tabSaveTip = false; //可以跳转
             } else {
               this.tabSaveTip = true;
@@ -760,7 +754,6 @@ export default {
     },
     //自定义初始化tabs
     getLabel(label, name) {
-      var _this = this;
       return h => {
         return h(
           'div',
@@ -770,7 +763,7 @@ export default {
             },
             on: {
               click: e => {
-                var tip = _this.tabClick(name); // 判断条件是否满足
+                const tip = this.tabClick(name); // 判断条件是否满足
                 if (tip) {
                   e.stopPropagation(); // 不满足条件则阻止事件冒泡 本质是不让触发tab的on-click事件
                 }
@@ -872,46 +865,9 @@ export default {
       });
     }
   },
-
   filter: {},
-
   computed: {},
-
   watch: {
-    uuid() {
-      if (this.uuid != undefined) {
-        let uuid = this.uuid;
-        this.getUserDetail(uuid);
-        this.getAuthSelect(uuid);
-        this.getUserToken(uuid);
-      }
-    },
-    // userId: function () {
-    //   if (this.userId != undefined) {
-    //     let userId = this.userId;
-    //   }
-    // },
-    readonly: function(newVal) {
-      if (newVal) {
-        this.formData.forEach(item => {
-          item.disabled = true;
-        });
-        this.formData
-          .filter(d => d.name == 'roleUuidList' || d.name == 'teamUuidList')
-          .forEach(item => {
-            item.readonly = true;
-          });
-      } else {
-        this.formData.forEach(item => {
-          if (this.uuid && item.name == 'userId') {
-            item.disabled = true;
-          } else if (item.name != 'uuid') {
-            item.disabled = false;
-            item.readonly = false;
-          }
-        });
-      }
-    }
   },
   //路由离开之前
   beforeRouteLeave(to, from, next, url) {
@@ -954,7 +910,7 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '~@/resources/assets/css/framework/manage.less';
-.tsfont-arrow-right{
+.tsfont-arrow-right {
   font-size: 12px;
 }
 .user-addview {
diff --git a/src/views/pages/framework/users/user-manage.vue b/src/views/pages/framework/users/user-manage.vue
index b5a1fa30978020d68bfe796cd983924564839291..fb2b3640ff4f2509b5a85baba6b4261db3b313a1 100644
--- a/src/views/pages/framework/users/user-manage.vue
+++ b/src/views/pages/framework/users/user-manage.vue
@@ -29,7 +29,7 @@
           >
             <template slot="userName" slot-scope="{row}">
               <UserCard :uuid="row.uuid" hideName></UserCard>
-              <span class="text-href" @click.stop="trClick(row)">{{ row.userName||'-' }}</span>
+              <span class="text-href" @click.stop="editUser(row, 'user')">{{ row.userName||'-' }}</span>
             </template>
             <template slot="roleDescriptionList" slot-scope="{ row }">
               <div @click.stop>
@@ -511,19 +511,6 @@ export default {
         query: { userId: userId, key: key, uuid: uuid }
       });
     },
-    //行点击
-    trClick: function(item) {
-      let userId = '';
-      let uuid = '';
-      if (item) {
-        userId = item.userId || '';
-        uuid = item.uuid || '';
-      }
-      this.$router.push({
-        path: `user-addview`,
-        query: { userId: userId, key: 'user', readonly: true, uuid: uuid }
-      });
-    },
     getVipIconByLevel(vipLevel) {
       return this.$store.getters.getVipIconByLevel(vipLevel, true);
     }
diff --git a/src/views/pages/framework/worktime/worktime-manage.vue b/src/views/pages/framework/worktime/worktime-manage.vue
index 295080e5e666b0a866829cf55c45860dd4ff9aaa..47d02a66b2a226d5ffefa66de9268ebdda7faaa5 100644
--- a/src/views/pages/framework/worktime/worktime-manage.vue
+++ b/src/views/pages/framework/worktime/worktime-manage.vue
@@ -22,9 +22,6 @@
             <div v-if="row.isActive == 1" class="text-success">{{ $t('page.enable') }}</div>
             <div v-else class="text-danger">{{ $t('page.disable') }}</div>
           </template>
-          <template slot="name" slot-scope="{ row }">
-            <span class="text-href" @click.stop="editRow(row.uuid)">{{ row.name }}</span>
-          </template>
           <template slot="yearList" slot-scope="{ row }">
             <div>{{ row.yearList | yearListToText }}</div>
           </template>
@@ -44,9 +41,9 @@
           <template slot="action" slot-scope="{ row }">
             <div class="tstable-action">
               <ul class="tstable-action-ul">
-                <!-- <li class="tsfont-edit icon" @click="editRow(row.uuid)">{{ $t('page.edit') }}</li> -->
-                <li class="tsfont-calendar icon" @click="editCalendar(row.uuid, row.name)">{{ $t('term.framework.calendar') }}</li>
-                <li class="tsfont-trash-o icon" :class="row.referenceCount>0?'disable':''" @click="deleteRow(row.uuid, row.name,row.referenceCount)">{{ $t('page.delete') }}</li>
+                <li class="tsfont-edit" @click="editRow(row.uuid)">{{ $t('term.process.serwindow') }}</li> 
+                <li class="tsfont-edit" @click="editCalendar(row.uuid, row.name)">{{ $t('term.process.sercalendar') }}</li>
+                <li class="tsfont-trash-o" :class="row.referenceCount>0?'disable':''" @click="deleteRow(row.uuid, row.name,row.referenceCount)">{{ $t('page.delete') }}</li>
               </ul>
             </div>
           </template>
diff --git a/src/views/pages/inspect/application/application-manage.vue b/src/views/pages/inspect/application/application-manage.vue
index d44fa355d1467f4dc9eb136433e30c5ca22195ac..0bd6151710905183af662d0f20bbd79c34fdbe6c 100644
--- a/src/views/pages/inspect/application/application-manage.vue
+++ b/src/views/pages/inspect/application/application-manage.vue
@@ -21,39 +21,44 @@
         </div>
       </template>
       <template v-slot:topRight>
-        <div v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY') && (selectedApp && !selectedModule)" class="action-group">
-          <span
-            class="action-item tsfont-edit"
-            @click="editApp()"
-          >{{ $t('dialog.title.edittarget', {target: $t('page.apply')}) }}</span>
-          <span
-            class="action-item tsfont-trash-o"
-            @click="deleteApp()"
-          >{{ $t('dialog.title.deletetarget', {target: $t('page.apply')}) }}</span>
-          <span
-            class="action-item tsfont-setting"
-            @click="toRoleOfThreshold()"
-          >{{ $t('term.inspect.thresholdrule') }}</span>
-          <div class="action-item">
+        <div v-if="(selectedApp && !selectedModule)" class="action-group">
+          <template v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')">
+            <span
+              class="action-item tsfont-edit"
+              @click="editApp()"
+            >{{ $t('dialog.title.edittarget', {target: $t('page.apply')}) }}</span>
+            <span
+              class="action-item tsfont-trash-o"
+              @click="deleteApp()"
+            >{{ $t('dialog.title.deletetarget', {target: $t('page.apply')}) }}</span>
+          </template>
+          <template v-if="$AuthUtils.hasRole('INSPECT_MODIFY')">
+            <span
+              class="action-item tsfont-setting"
+              @click="toRoleOfThreshold()"
+            >{{ $t('term.inspect.thresholdrule') }}</span>
+          </template>
+          <div v-if="$AuthUtils.hasRole('INSPECT_EXECUTE')" class="action-item">
             <Button
-              v-auth="'INSPECT_EXECUTE'"
               type="primary"
               class="ml-sm mr-sm"
               @click="openSystemInspection"
             >{{ $t('term.inspect.inspect') }}</Button>
           </div>
         </div>
-        <div v-else-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-group">
-          <span
-            class="action-item tsfont-edit"
-            @click="editAppModule()"
-          >{{ $t('dialog.title.edittarget', {target: $t('page.module')}) }}</span>
-          <span
-            class="action-item tsfont-trash-o"
-            @click="deleteAppModule()"
-          >{{ $t('dialog.title.deletetarget', {target: $t('page.module')}) }}</span>
+        <div v-else class="action-group">
+          <template v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')">
+            <span
+              class="action-item tsfont-edit"
+              @click="editAppModule()"
+            >{{ $t('dialog.title.edittarget', {target: $t('page.module')}) }}</span>
+            <span
+              class="action-item tsfont-trash-o"
+              @click="deleteAppModule()"
+            >{{ $t('dialog.title.deletetarget', {target: $t('page.module')}) }}</span>
+          </template>
           <Button
-            v-auth="'INSPECT_EXECUTE'"
+            v-if="$AuthUtils.hasRole('INSPECT_EXECUTE')"
             type="primary"
             class="ml-sm mr-sm"
             @click="openModuleInspectionDialog"
diff --git a/src/views/pages/inspect/application/inspection-schedule-dialog.vue b/src/views/pages/inspect/application/inspection-schedule-dialog.vue
index daee0f6b148da87e18d5d1b39280e1f83c553e8c..ad1b6586b84b8ecb5fe90d5e40d2c52ee9c65a53 100644
--- a/src/views/pages/inspect/application/inspection-schedule-dialog.vue
+++ b/src/views/pages/inspect/application/inspection-schedule-dialog.vue
@@ -21,6 +21,10 @@
               <span v-if="row.isActive == 1" class="text-success">{{ $t('page.isactived') }}</span>
               <span v-if="row.isActive == 0" class="text-grey">{{ $t('page.ban') }}</span>
             </template>
+            <template slot="isLoad" slot-scope="{ row }">
+              <span v-if="row.jobStatus && row.jobStatus.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+              <span v-else class="text-grey">{{ $t('page.no') }}</span>
+            </template>
             <template v-slot:appSystem="{ row }">
               <span class="text-href" @click="openCronDialog(row)">{{ row.appSystemAbbrName }} ({{ row.appSystemName }})</span>
             </template>
@@ -155,6 +159,10 @@ export default {
           title: this.$t('page.status'),
           key: 'isActive'
         },
+        {
+          title: this.$t('page.loaded'),
+          key: 'isLoad'
+        },
         {
           title: this.$t('term.pbc.timeplan'),
           key: 'cron',
diff --git a/src/views/pages/inspect/assetsInspect/assets-inspection-manage.vue b/src/views/pages/inspect/assetsInspect/assets-inspection-manage.vue
index bf9975d321aa1a1243c483c0169fe99816b07650..731d31d5bc95e2fbc4ff9193b68baea0c2093d37 100644
--- a/src/views/pages/inspect/assetsInspect/assets-inspection-manage.vue
+++ b/src/views/pages/inspect/assetsInspect/assets-inspection-manage.vue
@@ -420,7 +420,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false },
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
diff --git a/src/views/pages/inspect/assetsInspect/inspection-schedule-dialog.vue b/src/views/pages/inspect/assetsInspect/inspection-schedule-dialog.vue
index 4be64ebb7c0921b4a1c0ad7b9a1c8a53084dc89e..eab6ec3a748afbde4d19460157eb63680ce3fb6e 100644
--- a/src/views/pages/inspect/assetsInspect/inspection-schedule-dialog.vue
+++ b/src/views/pages/inspect/assetsInspect/inspection-schedule-dialog.vue
@@ -24,6 +24,10 @@
               <span v-if="row.isActive == 1" class="text-success">{{ $t('page.isactived') }}</span>
               <span v-if="row.isActive == 0" class="text-grey">{{ $t('page.ban') }}</span>
             </template>
+            <template slot="isLoad" slot-scope="{ row }">
+              <span v-if="row.jobStatus && row.jobStatus.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+              <span v-else class="text-grey">{{ $t('page.no') }}</span>
+            </template>
             <template v-slot:ciLabel="{ row }">
               <span class="text-href" @click="openCronDialog(row)">{{ row.ciLabel }} ({{ row.ciName }})</span>
             </template>
@@ -151,6 +155,10 @@ export default {
           title: this.$t('page.status'),
           key: 'isActive'
         },
+        {
+          title: this.$t('page.loaded'),
+          key: 'isLoad'
+        },
         {
           title: this.$t('term.pbc.timeplan'),
           key: 'cron',
diff --git a/src/views/pages/inspect/configfile/configfile-manage.vue b/src/views/pages/inspect/configfile/configfile-manage.vue
index 7e59b61c29b3ea98461c9c468d38e866042d5747..7ba7bd74ac166d22e4b03bc027f4c1e5928d41ec 100644
--- a/src/views/pages/inspect/configfile/configfile-manage.vue
+++ b/src/views/pages/inspect/configfile/configfile-manage.vue
@@ -271,7 +271,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false },
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
diff --git a/src/views/pages/inspect/inspect.js b/src/views/pages/inspect/inspect.js
index ba24b3efc9a8918e700454093000e9968ef736a2..aed3ca4201e67ac1a35f1d3fd183bad572ab640b 100644
--- a/src/views/pages/inspect/inspect.js
+++ b/src/views/pages/inspect/inspect.js
@@ -7,6 +7,7 @@ import VueI18n from 'vue-i18n';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -30,6 +31,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$toolCatalogUtils = toolCatalogUtils;
 Vue.prototype.$localStore = new LocalStore('inspect', router);
+Vue.prototype.$state = new State('inspect');
 
 new Vue({
   router,
diff --git a/src/views/pages/inspect/job/inspect-result.vue b/src/views/pages/inspect/job/inspect-result.vue
index 988124b921916c79d8ea5bebcc07cc06d456681c..5c524c1c68c0f2dd8b383bcb8ce119d6e4ace3d7 100644
--- a/src/views/pages/inspect/job/inspect-result.vue
+++ b/src/views/pages/inspect/job/inspect-result.vue
@@ -153,7 +153,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false},
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
diff --git a/src/views/pages/inspect/job/question-report.vue b/src/views/pages/inspect/job/question-report.vue
index 5523e19f4858332f9e4dda0f627896a480287125..b58f6d9fc1891158d0a7be07a0be8976db22a839 100644
--- a/src/views/pages/inspect/job/question-report.vue
+++ b/src/views/pages/inspect/job/question-report.vue
@@ -152,7 +152,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false },
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
diff --git a/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue b/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue
index 2667eeab892895204dba961a175a38deb42a09da..a23484f49d02c4d5142b8184e8b8fe390dab5d40 100644
--- a/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue
+++ b/src/views/pages/inspect/recentIssues/recent-issues-searcher.vue
@@ -300,7 +300,7 @@ export default {
           url: '/api/rest/resourcecenter/state/list/forselect',
           params: { needPage: false },
           rootName: 'tbodyList',
-          textName: 'description',
+          textName: 'name',
           valueName: 'id',
           transfer: true,
           className: 'block-span',
diff --git a/src/views/pages/inspect/recentIssues/recent-issues.vue b/src/views/pages/inspect/recentIssues/recent-issues.vue
index 66a57cb7385bac25345f4e6afe6c09990bf4d01f..9aaa8ce066c20152e0dcb8285f92fbd88a3debc0 100644
--- a/src/views/pages/inspect/recentIssues/recent-issues.vue
+++ b/src/views/pages/inspect/recentIssues/recent-issues.vue
@@ -435,7 +435,7 @@ export default {
             url: '/api/rest/resourcecenter/state/list/forselect',
             params: { needPage: false },
             rootName: 'tbodyList',
-            textName: 'description',
+            textName: 'name',
             valueName: 'id',
             transfer: true,
             className: 'block-span'
diff --git a/src/views/pages/knowledge/knowledge.js b/src/views/pages/knowledge/knowledge.js
index a0846cee58a3e9f6a60c566217f39d8c4cd8f999..d4047e0a7303da27ae3dd2d8e355a82dbc2e1e0c 100644
--- a/src/views/pages/knowledge/knowledge.js
+++ b/src/views/pages/knowledge/knowledge.js
@@ -7,6 +7,7 @@ import store from '@/resources/store';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 import '@/resources/base.js';
 import { initRouter, initI18n, $t } from '@/resources/init.js';
 
@@ -26,6 +27,7 @@ Vue.prototype.$tsrouter = router;
 Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$localStore = new LocalStore('knowledge', router);
+Vue.prototype.$state = new State('knowledge');
 router.beforeEach((to, from, next) => {
   let title = to.meta.title ? to.meta.title : to.name || to.path;
   document.title = $t(title);
diff --git a/src/views/pages/pbc/pbc.js b/src/views/pages/pbc/pbc.js
index dba2438c7e67ae6068fbccdc15dab05d72309b1e..bcba390093c29ffab111f8420f4fd75547bf5fab 100644
--- a/src/views/pages/pbc/pbc.js
+++ b/src/views/pages/pbc/pbc.js
@@ -7,6 +7,7 @@ import VueI18n from 'vue-i18n';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -28,6 +29,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$tsrouter = router;
 Vue.prototype.$localStore = new LocalStore('pbc', router);
+Vue.prototype.$state = new State('pbc');
 
 new Vue({
   router,
diff --git a/src/views/pages/process/catalog/catalog-manage.vue b/src/views/pages/process/catalog/catalog-manage.vue
index 51715b5047a3abbdacc1e8f7fe93c3655bded1f0..046685f4d4281f46577efd37ac57899c543d087f 100644
--- a/src/views/pages/process/catalog/catalog-manage.vue
+++ b/src/views/pages/process/catalog/catalog-manage.vue
@@ -217,6 +217,7 @@ export default {
             this.catalogName = this.$t('dialog.title.edittarget', { target: this.$t('term.process.catalog') });
             this.channelData.parentUuid = node.parentUuid; // 编辑服务
             this.channelData.uuid = node.uuid;
+            this.childrenCount = node.childrenCount;
           }
         }
         return false;
@@ -427,7 +428,7 @@ export default {
   },
   computed: {
     handleClassName() {
-      return !!(!(this.childrenCount == undefined || this.childrenCount == 0) || this.disabledConfig.saving);
+      return this.childrenCount > 0 || this.disabledConfig.saving;
     }
   },
   watch: {}
diff --git a/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue b/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue
index 7d164a6049fb9d9e941e2068c86e01e64c964d0d..ccfb8afbda9f8a7cc98093b5bf64ac300204295d 100644
--- a/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue
+++ b/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue
@@ -4,6 +4,7 @@
     <TsFormItem
       label="自动化服务表单组件"
       labelPosition="left"
+      labelWidth="140"
       required
     >
       <TsFormSelect
diff --git a/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue b/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue
index 13b314b972a0d63308ad39a25a8cd65c4687140b..a0d6bb758d7511da4e5831b32461a0c6325800fa 100644
--- a/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue
+++ b/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue
@@ -23,6 +23,7 @@
             <TsFormItem
               label="作业类型"
               labelPosition="left"
+              :labelWidth="item.type == 'service' ? '140': '120'"
               required
             >
               <TsFormRadio
diff --git a/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue b/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue
index f035eeb8660244c1acb42c627310a41e48c23550..bfbb6e95e944b08e0a5fa7f6bb92fd018526086c 100644
--- a/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue
+++ b/src/views/pages/process/flow/flowedit/components/createjob/params/execute-param.vue
@@ -17,121 +17,346 @@
       </span>
     </div>
     <div>
-      <TsFormItem
-        v-for="(item,index) in executeParamMappingGroupList"
-        :key="index"
-        :label="item.name"
-        :required="!!item.isRequired"
-        labelPosition="left"
-      >
-        <div v-if="item.mappingMode==='constant'">
-          <ProtocolReadonly v-if="item.key=='protocolId'" :value="item.value" readonly></ProtocolReadonly>
-          <template v-else-if="item.key==='executeNodeConfig'">
-            <div v-if="item.value && !$utils.isEmpty(item.value.paramList)">
-              <Tag v-for="param in item.value.paramList" :key="param">
-                {{ paramsName(param) }}
-              </Tag>
+      <template v-for="(item,index) in executeParamMappingGroupList">
+        <TsFormItem
+          v-if="whitelist.includes(item.key)"
+          :key="index"
+          :label="item.name"
+          :required="!!item.isRequired"
+          labelPosition="left"
+        >
+          <div v-if="item.mappingMode==='constant'">
+            <ProtocolReadonly v-if="item.key=='protocolId'" :value="item.value" readonly></ProtocolReadonly>
+            <template v-else-if="item.key==='executeNodeConfig'">
+              <div v-if="item.value && !$utils.isEmpty(item.value.paramList)">
+                <Tag v-for="param in item.value.paramList" :key="param">
+                  {{ paramsName(param) }}
+                </Tag>
+              </div>
+              <ExecuteNodeReadonly v-else :value="item.value" readonly></ExecuteNodeReadonly>
+            </template>
+            <div v-else-if="item.key==='roundCount'">
+              {{ getRoundCountText(item.value) }}
             </div>
-            <ExecuteNodeReadonly v-else :value="item.value" readonly></ExecuteNodeReadonly>
-          </template>
-          <div v-else-if="item.key==='roundCount'">
-            {{ getRoundCountText(item.value) }}
+            <div v-else>{{ item.value }}</div>
+          </div>
+          <div v-else-if="item.mappingMode=='runtimeparam'">
+            <span class="text-tip pr-sm">{{ $t('term.autoexec.jobparam') }}</span>
+            <span>{{ paramsName(item.value) }}</span>
           </div>
-          <div v-else>{{ item.value }}</div>
-        </div>
-        <div v-else-if="item.mappingMode=='runtimeparam'">
-          <span class="text-tip pr-sm">{{ $t('term.autoexec.jobparam') }}</span>
-          <span>{{ paramsName(item.value) }}</span>
-        </div>
-        <div v-else>
-          <div v-for="(m,mindex) in item.mappingList" :key="mindex" class="mapping-list">
-            <TsRow :gutter="8">
-              <Col span="6">
-                <TsFormSelect
-                  ref="formValid"
-                  v-model="m.mappingMode"
-                  :dataList="mappingModeList"
-                  :validateList="item.isRequired?validateList:[]"
-                  :firstSelect="false"
-                  transfer
-                  border="border"
-                  @on-change="(val)=>{changeMappingMode(m,val)}"
-                ></TsFormSelect>
-              </Col>
-              <Col span="16">
-                <template v-if="m.mappingMode === 'formCommonComponent'">
+          <div v-else>
+            <div v-for="(m,mindex) in item.mappingList" :key="mindex" class="mapping-list">
+              <TsRow :gutter="8">
+                <Col span="6">
                   <TsFormSelect
                     ref="formValid"
-                    v-model="m.value"
-                    :dataList="getFormComponent('formCommonComponent')"
-                    textName="label"
-                    valueName="uuid"
-                    :validateList="item.isRequired? validateList:[]"
+                    v-model="m.mappingMode"
+                    :dataList="mappingModeList"
+                    :validateList="item.isRequired?validateList:[]"
                     :firstSelect="false"
                     transfer
                     border="border"
+                    @on-change="(val)=>{changeMappingMode(m,val)}"
                   ></TsFormSelect>
-                </template>
-                <template v-else-if="m.mappingMode === 'formTableComponent'">
-                  <div class="formTableComponent">
-                    <TsRow :gutter="8">
-                      <Col :span="12">
-                        <TsFormSelect
-                          ref="formValid"
-                          v-model="m.value"
-                          :dataList="getFormComponent('formTableComponent')"
-                          textName="label"
-                          valueName="uuid"
-                          :placeholder="$t('term.framework.tablecomponent')"
-                          :validateList="item.isRequired? validateList:[]"
-                          transfer
-                          @on-change="(val)=>{
-                            $set(m, 'column', '');
-                          }"
-                        ></TsFormSelect>
-                      </Col>
-                      <Col :span="12">
-                        <TsFormSelect
-                          ref="formValid"
-                          v-model="m.column"
-                          :dataList="getFormTableAttrList(m.value)"
-                          :placeholder="$t('page.attribute')"
-                          :validateList="item.isRequired? validateList:[]"
-                          transfer
-                        ></TsFormSelect>
-                      </Col>
-                    </TsRow>
-                  </div>
-                </template>
-                <template v-else>
-                  <TsFormInput
-                    ref="formValid"
-                    v-model="m.value"
-                    :validateList="item.isRequired?validateList:[]"
-                    border="border"
-                  ></TsFormInput>
-                </template>
-              </Col>
-              <Col span="2">
-                <span class="text-tip-active tsfont-plus pr-xs" @click="addItem(item.mappingList)"></span>
-                <span v-if="item.mappingList.length > 1" class="text-tip-active tsfont-trash-o delete-condition" @click="delItem(item.mappingList, mindex)"></span>
-              </Col>
-            </TsRow>
-            <div v-if="m.mappingMode === 'formTableComponent'" class="pb-sm">
-              <FilterList
-                ref="filterList"
-                :filterList="m.filterList"
-                :allFormitemList="allFormitemList"
+                </Col>
+                <Col span="16">
+                  <template v-if="m.mappingMode === 'formCommonComponent'">
+                    <TsFormSelect
+                      ref="formValid"
+                      v-model="m.value"
+                      :dataList="getFormComponent('formCommonComponent')"
+                      textName="label"
+                      valueName="uuid"
+                      :validateList="item.isRequired? validateList:[]"
+                      :firstSelect="false"
+                      transfer
+                      border="border"
+                    ></TsFormSelect>
+                  </template>
+                  <template v-else-if="m.mappingMode === 'formTableComponent'">
+                    <div class="formTableComponent">
+                      <TsRow :gutter="8">
+                        <Col :span="12">
+                          <TsFormSelect
+                            ref="formValid"
+                            v-model="m.value"
+                            :dataList="getFormComponent('formTableComponent')"
+                            textName="label"
+                            valueName="uuid"
+                            :placeholder="$t('term.framework.tablecomponent')"
+                            :validateList="item.isRequired? validateList:[]"
+                            transfer
+                            @on-change="(val)=>{
+                              $set(m, 'column', '');
+                            }"
+                          ></TsFormSelect>
+                        </Col>
+                        <Col :span="12">
+                          <TsFormSelect
+                            ref="formValid"
+                            v-model="m.column"
+                            :dataList="getFormTableAttrList(m.value)"
+                            :placeholder="$t('page.attribute')"
+                            :validateList="item.isRequired? validateList:[]"
+                            transfer
+                          ></TsFormSelect>
+                        </Col>
+                      </TsRow>
+                    </div>
+                  </template>
+                  <template v-else>
+                    <TsFormInput
+                      ref="formValid"
+                      v-model="m.value"
+                      :validateList="item.isRequired?validateList:[]"
+                      border="border"
+                    ></TsFormInput>
+                  </template>
+                </Col>
+                <Col span="2">
+                  <span class="text-tip-active tsfont-plus pr-xs" @click="addItem(item.mappingList)"></span>
+                  <span v-if="item.mappingList.length > 1" class="text-tip-active tsfont-trash-o delete-condition" @click="delItem(item.mappingList, mindex)"></span>
+                </Col>
+              </TsRow>
+              <div v-if="m.mappingMode === 'formTableComponent'" class="pb-sm">
+                <FilterList
+                  ref="filterList"
+                  :filterList="m.filterList"
+                  :allFormitemList="allFormitemList"
+                  :value="m.value"
+                  showStatus
+                  @updateFilterList="(list)=>{
+                    $set(m,'filterList', list);
+                  }"
+                ></FilterList>
+              </div>
+            </div>
+          </div>
+        </TsFormItem>
+      </template>
+      <template v-if="isShowExecuteParam('parallelPolicy')">
+        <TsFormItem
+          :label="$t('page.autoexecparallpolicy')"
+          :required="!!getExecuteParamValue('parallelPolicy', 'isRequired')"
+          labelPosition="left"
+        >
+          <div v-if="getExecuteParamValue('parallelPolicy', 'mappingMode')==='constant'">
+            <TsFormRadio
+              :value="getExecuteParamValue('parallelPolicy', 'value')"
+              :dataList="parallelPolicyList"
+              :disabled="true"
+            ></TsFormRadio>
+          </div>
+          <div v-else>
+            <div v-for="(m,mindex) in getExecuteParamValue('parallelPolicy', 'mappingList')" :key="mindex" class="mapping-list">
+              <TsFormRadio
+                ref="formValid"
                 :value="m.value"
-                showStatus
-                @updateFilterList="(list)=>{
-                  $set(m,'filterList', list);
+                :dataList="parallelPolicyList"
+                :disabled="getExecuteParamValue('parallelPolicy', 'mappingMode')==='constant'"
+                :validateList="getExecuteParamValue('parallelPolicy', 'isRequired')?validateList:[]"
+                allowToggle
+                @on-change="(val)=>{
+                  $set(m,'value',val);
+                  clearCount();
                 }"
-              ></FilterList>
+              ></TsFormRadio>
             </div>
           </div>
-        </div>
-      </TsFormItem>
+        </TsFormItem>
+      </template>
+      <template v-if="isShowExecuteParam('roundCount') && parallelPolicyValue=== 'roundCount'">
+        <TsFormItem
+          :label="$t('term.autoexec.batchquantity')"
+          :required="!!getExecuteParamValue('roundCount', 'isRequired')"
+          labelPosition="left"
+          :tooltip="$t('term.autoexec.batchcountdisabledesc')"
+        >
+          <div v-if="getExecuteParamValue('roundCount', 'mappingMode')==='constant'">
+            {{ getRoundCountText(getExecuteParamValue('roundCount', 'value')) }}
+          </div>
+          <div v-else>
+            <div v-for="(m,mindex) in getExecuteParamValue('roundCount', 'mappingList')" :key="mindex" class="mapping-list">
+              <TsRow :gutter="8">
+                <Col span="6">
+                  <TsFormSelect
+                    ref="formValid"
+                    v-model="m.mappingMode"
+                    :dataList="mappingModeList"
+                    :validateList="getExecuteParamValue('roundCount', 'isRequired')?validateList:[]"
+                    :firstSelect="false"
+                    transfer
+                    border="border"
+                    @on-change="(val)=>{changeMappingMode(m,val)}"
+                  ></TsFormSelect>
+                </Col>
+                <Col span="16">
+                  <template v-if="m.mappingMode === 'formCommonComponent'">
+                    <TsFormSelect
+                      ref="formValid"
+                      v-model="m.value"
+                      :dataList="getFormComponent('formCommonComponent')"
+                      textName="label"
+                      valueName="uuid"
+                      :validateList="getExecuteParamValue('roundCount', 'isRequired')?validateList:[]"
+                      :firstSelect="false"
+                      transfer
+                      border="border"
+                    ></TsFormSelect>
+                  </template>
+                  <template v-else-if="m.mappingMode === 'formTableComponent'">
+                    <div class="formTableComponent">
+                      <TsRow :gutter="8">
+                        <Col :span="12">
+                          <TsFormSelect
+                            ref="formValid"
+                            v-model="m.value"
+                            :dataList="getFormComponent('formTableComponent')"
+                            textName="label"
+                            valueName="uuid"
+                            :placeholder="$t('term.framework.tablecomponent')"
+                            :validateList="getExecuteParamValue('roundCount', 'isRequired')?validateList:[]"
+                            transfer
+                            @on-change="(val)=>{
+                              $set(m, 'column', '');
+                            }"
+                          ></TsFormSelect>
+                        </Col>
+                        <Col :span="12">
+                          <TsFormSelect
+                            ref="formValid"
+                            v-model="m.column"
+                            :dataList="getFormTableAttrList(m.value)"
+                            :placeholder="$t('page.attribute')"
+                            :validateList="getExecuteParamValue('roundCount', 'isRequired')?validateList:[]"
+                            transfer
+                          ></TsFormSelect>
+                        </Col>
+                      </TsRow>
+                    </div>
+                  </template>
+                  <template v-else>
+                    <TsFormInput
+                      ref="formValid"
+                      v-model="m.value"
+                      :validateList="getExecuteParamValue('roundCount', 'isRequired')?validateList:[]"
+                      border="border"
+                    ></TsFormInput>
+                  </template>
+                </Col>
+              </TsRow>
+              <div v-if="m.mappingMode === 'formTableComponent'" class="pb-sm">
+                <FilterList
+                  ref="filterList"
+                  :filterList="m.filterList"
+                  :allFormitemList="allFormitemList"
+                  :value="m.value"
+                  showStatus
+                  @updateFilterList="(list)=>{
+                    $set(m,'filterList', list);
+                  }"
+                ></FilterList>
+              </div>
+            </div>
+          </div>
+        </TsFormItem>
+      </template>
+      <template v-if="isShowExecuteParam('parallelCount') && parallelPolicyValue === 'parallel'">
+        <TsFormItem
+          :label="$t('term.autoexec.parall')"
+          :required="!!getExecuteParamValue('parallelCount', 'isRequired')"
+          labelPosition="left"
+          :tooltip="$t('term.autoexec.paralldesc')"
+        >
+          <div v-if="getExecuteParamValue('parallelCount', 'mappingMode')==='constant'">
+            {{ getRoundCountText(getExecuteParamValue('parallelCount', 'value')) }}
+          </div>
+          <div v-else>
+            <div v-for="(m,mindex) in getExecuteParamValue('parallelCount', 'mappingList')" :key="mindex" class="mapping-list">
+              <TsRow :gutter="8">
+                <Col span="6">
+                  <TsFormSelect
+                    ref="formValid"
+                    v-model="m.mappingMode"
+                    :dataList="mappingModeList"
+                    :validateList="getExecuteParamValue('parallelCount', 'isRequired')?validateList:[]"
+                    :firstSelect="false"
+                    transfer
+                    border="border"
+                    @on-change="(val)=>{changeMappingMode(m,val)}"
+                  ></TsFormSelect>
+                </Col>
+                <Col span="16">
+                  <template v-if="m.mappingMode === 'formCommonComponent'">
+                    <TsFormSelect
+                      ref="formValid"
+                      v-model="m.value"
+                      :dataList="getFormComponent('formCommonComponent')"
+                      textName="label"
+                      valueName="uuid"
+                      :validateList="getExecuteParamValue('parallelCount', 'isRequired')?validateList:[]"
+                      :firstSelect="false"
+                      transfer
+                      border="border"
+                    ></TsFormSelect>
+                  </template>
+                  <template v-else-if="m.mappingMode === 'formTableComponent'">
+                    <div class="formTableComponent">
+                      <TsRow :gutter="8">
+                        <Col :span="12">
+                          <TsFormSelect
+                            ref="formValid"
+                            v-model="m.value"
+                            :dataList="getFormComponent('formTableComponent')"
+                            textName="label"
+                            valueName="uuid"
+                            :placeholder="$t('term.framework.tablecomponent')"
+                            :validateList="getExecuteParamValue('parallelCount', 'isRequired')?validateList:[]"
+                            transfer
+                            @on-change="(val)=>{
+                              $set(m, 'column', '');
+                            }"
+                          ></TsFormSelect>
+                        </Col>
+                        <Col :span="12">
+                          <TsFormSelect
+                            ref="formValid"
+                            v-model="m.column"
+                            :dataList="getFormTableAttrList(m.value)"
+                            :placeholder="$t('page.attribute')"
+                            :validateList="getExecuteParamValue('parallelCount', 'isRequired')?validateList:[]"
+                            transfer
+                          ></TsFormSelect>
+                        </Col>
+                      </TsRow>
+                    </div>
+                  </template>
+                  <template v-else>
+                    <TsFormInput
+                      ref="formValid"
+                      v-model="m.value"
+                      :validateList="getExecuteParamValue('parallelCount', 'isRequired')?validateList:[]"
+                      border="border"
+                    ></TsFormInput>
+                  </template>
+                </Col>
+              </TsRow>
+              <div v-if="m.mappingMode === 'formTableComponent'" class="pb-sm">
+                <FilterList
+                  ref="filterList"
+                  :filterList="m.filterList"
+                  :allFormitemList="allFormitemList"
+                  :value="m.value"
+                  showStatus
+                  @updateFilterList="(list)=>{
+                    $set(m,'filterList', list);
+                  }"
+                ></FilterList>
+              </div>
+            </div>
+          </div>
+        </TsFormItem>
+      </template>
     </div>
   </div>
 </template>
@@ -144,7 +369,8 @@ export default {
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     FilterList: () => import('../filter-list.vue'),
     ExecuteNodeReadonly: () => import('@/views/pages/autoexec/form/component/formresoureces/index.vue'),
-    ProtocolReadonly: () => import('./protocol-readonly')
+    ProtocolReadonly: () => import('./protocol-readonly'),
+    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio')
    
   },
   props: {
@@ -164,13 +390,22 @@ export default {
           text: this.$t('term.process.formtableitem'),
           value: 'formTableComponent'
         }
-      ]
+      ],
+      parallelPolicyList: [
+        {
+          text: this.$t('page.autoexecparall'),
+          value: 'parallel'
+        },
+        {
+          text: this.$t('page.autoexecbatchround'),
+          value: 'roundCount'
+        }
+      ],
+      whitelist: ['executeNodeConfig', 'protocolId', 'executeUser']
     };
   },
   beforeCreate() {},
-  created() {
-    
-  },
+  created() {},
   beforeMount() {},
   mounted() {},
   beforeUpdate() {},
@@ -222,6 +457,25 @@ export default {
         }
       }
       return isValid;
+    },
+    isShowExecuteParam(key) {
+      let isShow = false;
+      if (!this.$utils.isEmpty(this.executeParamMappingGroupList)) {
+        isShow = !!this.executeParamMappingGroupList.find(item => item.key === key);
+      }
+      return isShow;
+    },
+    clearCount() {
+      this.executeParamMappingGroupList.forEach(item => {
+        if (item.key === 'roundCount' || item.key === 'parallelCount') {
+          this.$set(item, 'mappingList', [{
+            mappingMode: '',
+            value: '',
+            column: '',
+            filterList: []
+          }]);
+        }
+      });
     }
   },
   filter: {},
@@ -269,6 +523,24 @@ export default {
         }
         return dataList;
       };
+    },
+    getExecuteParamValue() {
+      return (key, attr) => {
+        let value = '';
+        let findItem = this.executeParamMappingGroupList.find(item => item.key === key);
+        if (findItem) {
+          value = attr ? findItem[attr] : findItem;
+        }
+        return value;
+      };
+    },
+    parallelPolicyValue() {
+      let value = '';
+      let findItem = this.executeParamMappingGroupList.find(item => item.key === 'parallelPolicy');
+      if (findItem) {
+        value = findItem.value || (findItem.mappingList && findItem.mappingList[0] && findItem.mappingList[0].value) || '';
+      }
+      return value;
     }
   },
   watch: {}
diff --git a/src/views/pages/process/process.js b/src/views/pages/process/process.js
index 7188dc0d9da71d43a3cc4502beeeddebdb454152..aff8017808d4d869ea8f98cb66c761a5708a0434 100644
--- a/src/views/pages/process/process.js
+++ b/src/views/pages/process/process.js
@@ -8,6 +8,7 @@ import VueI18n from 'vue-i18n';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import {initRouter, initI18n} from '@/resources/init.js';
@@ -27,6 +28,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$tsrouter = router;
 Vue.prototype.$localStore = new LocalStore('process', router);
+Vue.prototype.$state = new State('process');
 
 new Vue({
   router,
diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
index 366be48a6349d7e2dd69f1c71dcd23412cae45d7..52746bc9ffcf074b2211b8994c3c386b789b5ff9 100644
--- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
@@ -36,117 +36,121 @@
     </div>
     <!-- 描述end -->
     <!-- 固定页面tab -->
-    <div
-      v-for="(item, index) in fixedPageList"
-      :key="index"
-      class="bg-op radius-lg mt-nm mb-nm padding"
-      :class="item.tabValue == 'step' ? 'common-main' : ''"
-    >
-      <template v-if="item.tabValue == 'report'">
-        <!-- 内容详情 -->
-        <div>
-          <span>{{ item.label }}</span>
-          <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage('report')"></span>
-        </div>
-        <div v-if="haveProcessTask(false, false, formConfig, processTaskConfig)" class="pt-nm pb-nm">
-          <div v-if="!$utils.isEmpty(formConfig)" id="form" class="form-view">
-            <template v-if="formConfig._type == 'new'">
-              <TsSheet
-                ref="formSheet"
-                mode="read"
-                :value="formConfig"
-                :formSceneUuid="formSceneUuid"
-                :data="formAttributeDataMap"
-                :readonly="!actionConfig.save || !formEdit"
-                :externalData="externalData"
-                class="pl-sm pr-sm"
-                @emit="formSheetEmitData"
-                @updateHiddenComponentList="updateHiddenComponentList"
-                @setValue="setFormAttributeDataMap"
-              ></TsSheet>
-            </template>
-            <template v-else>
-              <FormPreview
-                ref="FormPreview"
-                :content="formConfig"
-                :isEdit="formEdit"
-                :isReadonly="actionConfig.save ? false : true"
-                :stephidetrList="stephidetrList"
-                :stepreadtrList="stepreadtrList"
-                :formAttributeHideList="formAttributeHideList"
-                :isEnableDefaultValue="!!actionConfig.complete"
-              ></FormPreview>
-            </template>
-          </div>
-          <div v-else-if="processTaskConfig.isHasOldFormProp == 1" class="form-view">
-            <FormPreviewHtml
-              ref="FormPreview"
-              class="block-content"
-              lass="order-list"
+    <template v-if="isFixedAbove">
+      <template v-for="(item, index) in fixedPageList">
+        <div
+          v-if="isShowfixedPage(item.tabValue)"
+          :key="index"
+          class="bg-op radius-lg mt-nm mb-nm padding"
+          :class="item.tabValue == 'step' ? 'common-main' : ''"
+        >
+          <template v-if="item.tabValue == 'report'">
+            <!-- 内容详情 -->
+            <div>
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage('report')"></span>
+            </div>
+            <div v-if="haveProcessTask(false, false, formConfig, processTaskConfig)" class="pt-nm pb-nm">
+              <div v-if="!$utils.isEmpty(formConfig)" id="form" class="form-view">
+                <template v-if="formConfig._type == 'new'">
+                  <TsSheet
+                    ref="formSheet"
+                    mode="read"
+                    :value="formConfig"
+                    :formSceneUuid="formSceneUuid"
+                    :data="formAttributeDataMap"
+                    :readonly="!actionConfig.save || !formEdit"
+                    :externalData="externalData"
+                    class="pl-sm pr-sm"
+                    @emit="formSheetEmitData"
+                    @updateHiddenComponentList="updateHiddenComponentList"
+                    @setValue="setFormAttributeDataMap"
+                  ></TsSheet>
+                </template>
+                <template v-else>
+                  <FormPreview
+                    ref="FormPreview"
+                    :content="formConfig"
+                    :isEdit="formEdit"
+                    :isReadonly="actionConfig.save ? false : true"
+                    :stephidetrList="stephidetrList"
+                    :stepreadtrList="stepreadtrList"
+                    :formAttributeHideList="formAttributeHideList"
+                    :isEnableDefaultValue="!!actionConfig.complete"
+                  ></FormPreview>
+                </template>
+              </div>
+              <div v-else-if="processTaskConfig.isHasOldFormProp == 1" class="form-view">
+                <FormPreviewHtml
+                  ref="FormPreview"
+                  class="block-content"
+                  lass="order-list"
+                  :processTaskId="processTaskId"
+                ></FormPreviewHtml>
+              </div>
+            </div>
+          </template>
+          <template v-else-if="item.tabValue.indexOf('showStep') != -1">
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <stepitems
+              :is="getSteptype(item.item)"
+              :item="item.item"
+              :handlerStepInfo="item.item.handlerStepInfo"
+            ></stepitems>
+          </template>
+          <template v-else-if="item.tabValue.indexOf('subTask') != -1">
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <StrategyDetail
               :processTaskId="processTaskId"
-            ></FormPreviewHtml>
-          </div>
-        </div>
-      </template>
-      <template v-else-if="item.tabValue.indexOf('showStep') != -1">
-        <div class="mb-xs">
-          <span>{{ item.label }}</span>
-          <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
-        </div>
-        <stepitems
-          :is="getSteptype(item.item)"
-          :item="item.item"
-          :handlerStepInfo="item.item.handlerStepInfo"
-        ></stepitems>
-      </template>
-      <template v-else-if="item.tabValue.indexOf('subTask') != -1">
-        <div class="mb-xs">
-          <span>{{ item.label }}</span>
-          <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
-        </div>
-        <StrategyDetail
-          :processTaskId="processTaskId"
-          :processTaskStepId="processTaskStepId"
-          :actionConfig="actionConfig"
-          :config="getStrategyConfig(item.tabValue)"
-          @getStepList="getStepList"
-        ></StrategyDetail>
-      </template>
-      <template v-else-if="slotList.find(d => d.name === item.tabValue)">
-        <div class="mb-xs">
-          <span>{{ item.label }}</span>
-          <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
-        </div>
-        <div class="padding">
-          <slot :name="item.tabValue"></slot>
-        </div>
-      </template>
-      <template v-else>
-        <div class="mb-xs">
-          <span>{{ item.label }}</span>
-          <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+              :processTaskStepId="processTaskStepId"
+              :actionConfig="actionConfig"
+              :config="getStrategyConfig(item.tabValue)"
+              @getStepList="getStepList"
+            ></StrategyDetail>
+          </template>
+          <template v-else-if="slotList.find(d => d.name === item.tabValue)">
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <div class="padding">
+              <slot :name="item.tabValue"></slot>
+            </div>
+          </template>
+          <template v-else>
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <Component
+              :is="item.tabValue"
+              :processTaskId="processTaskId"
+              :processTaskStepId="processTaskStepId"
+              :defaultStepData="stepData"
+              :currentStepId="defaultProcessTaskStepId"
+              :processTaskConfig="processTaskConfig"
+              :defaultActiveData="activeData"
+              :stepDataList="stepData"
+              :relationAuth="actionConfig.tranferreport"
+              :actionConfig="actionConfig"
+              :repeatList="repeatList"
+              :handlerStepInfo="autoexechandlerStepInfo"
+              :formConfig="formConfig"
+              :fileTable="fileTable"
+              @closeRepeatTab="closeRepeatTab"
+              @upActivityList="updateStepActive()"
+              @updataActive="(val)=>updataActive(val)"
+            ></Component>
+          </template>
         </div>
-        <Component
-          :is="item.tabValue"
-          :processTaskId="processTaskId"
-          :processTaskStepId="processTaskStepId"
-          :defaultStepData="stepData"
-          :currentStepId="defaultProcessTaskStepId"
-          :processTaskConfig="processTaskConfig"
-          :defaultActiveData="activeData"
-          :stepDataList="stepData"
-          :relationAuth="actionConfig.tranferreport"
-          :actionConfig="actionConfig"
-          :repeatList="repeatList"
-          :handlerStepInfo="autoexechandlerStepInfo"
-          :formConfig="formConfig"
-          :fileTable="fileTable"
-          @closeRepeatTab="closeRepeatTab"
-          @upActivityList="updateStepActive()"
-          @updataActive="(val)=>updataActive(val)"
-        ></Component>
       </template>
-    </div>
+    </template>
     <!-- 固定页面tab end-->
     <!-- 中间选项卡内容 -->
     <div v-if="!loadingShow" ref="commonMain" class="common-main">
@@ -244,6 +248,9 @@
                 </div>
               </TabPane>
             </template>
+            <!-- 节点详情end -->
+          </template>
+          <template v-else-if="!tab.top && tab.key === 'taskConfigList'">
             <template v-for="subStep in taskConfigList">
               <TabPane
                 v-if="fixedPageTab[`subTask${subStep.id}`]"
@@ -263,7 +270,6 @@
                 <!-- 子任务策略end -->
               </TabPane>
             </template>
-            <!-- 节点详情end -->
           </template>
           <template v-else-if="!tab.top && tab.key === 'step'">
             <TabPane
@@ -374,7 +380,123 @@
       </Tabs>
     </div>
     <!-- 中间选项卡内容end -->
-
+    <!-- 固定底部页面tab -->
+    <template v-if="!isFixedAbove">
+      <template v-for="(item, index) in fixedPageList">
+        <div
+          v-if="isShowfixedPage(item.tabValue)"
+          :key="index"
+          class="bg-op radius-lg mt-nm mb-nm padding"
+          :class="item.tabValue == 'step' ? 'common-main' : ''"
+        >
+          <template v-if="item.tabValue == 'report'">
+            <!-- 内容详情 -->
+            <div>
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage('report')"></span>
+            </div>
+            <div v-if="haveProcessTask(false, false, formConfig, processTaskConfig)" class="pt-nm pb-nm">
+              <div v-if="!$utils.isEmpty(formConfig)" id="form" class="form-view">
+                <template v-if="formConfig._type == 'new'">
+                  <TsSheet
+                    ref="formSheet"
+                    mode="read"
+                    :value="formConfig"
+                    :formSceneUuid="formSceneUuid"
+                    :data="formAttributeDataMap"
+                    :readonly="!actionConfig.save || !formEdit"
+                    :externalData="externalData"
+                    class="pl-sm pr-sm"
+                    @emit="formSheetEmitData"
+                    @updateHiddenComponentList="updateHiddenComponentList"
+                    @setValue="setFormAttributeDataMap"
+                  ></TsSheet>
+                </template>
+                <template v-else>
+                  <FormPreview
+                    ref="FormPreview"
+                    :content="formConfig"
+                    :isEdit="formEdit"
+                    :isReadonly="actionConfig.save ? false : true"
+                    :stephidetrList="stephidetrList"
+                    :stepreadtrList="stepreadtrList"
+                    :formAttributeHideList="formAttributeHideList"
+                    :isEnableDefaultValue="!!actionConfig.complete"
+                  ></FormPreview>
+                </template>
+              </div>
+              <div v-else-if="processTaskConfig.isHasOldFormProp == 1" class="form-view">
+                <FormPreviewHtml
+                  ref="FormPreview"
+                  class="block-content"
+                  lass="order-list"
+                  :processTaskId="processTaskId"
+                ></FormPreviewHtml>
+              </div>
+            </div>
+          </template>
+          <template v-else-if="item.tabValue.indexOf('showStep') != -1">
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <stepitems
+              :is="getSteptype(item.item)"
+              :item="item.item"
+              :handlerStepInfo="item.item.handlerStepInfo"
+            ></stepitems>
+          </template>
+          <template v-else-if="item.tabValue.indexOf('subTask') != -1">
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <StrategyDetail
+              :processTaskId="processTaskId"
+              :processTaskStepId="processTaskStepId"
+              :actionConfig="actionConfig"
+              :config="getStrategyConfig(item.tabValue)"
+              @getStepList="getStepList"
+            ></StrategyDetail>
+          </template>
+          <template v-else-if="slotList.find(d => d.name === item.tabValue)">
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <div class="padding">
+              <slot :name="item.tabValue"></slot>
+            </div>
+          </template>
+          <template v-else>
+            <div class="mb-xs">
+              <span>{{ item.label }}</span>
+              <span class="tsfont-pin-angle-s text-primary cursor pl-xs" :title="$t('page.cancelfixedpage')" @click="cancelFixedPage(item.tabValue)"></span>
+            </div>
+            <Component
+              :is="item.tabValue"
+              :processTaskId="processTaskId"
+              :processTaskStepId="processTaskStepId"
+              :defaultStepData="stepData"
+              :currentStepId="defaultProcessTaskStepId"
+              :processTaskConfig="processTaskConfig"
+              :defaultActiveData="activeData"
+              :stepDataList="stepData"
+              :relationAuth="actionConfig.tranferreport"
+              :actionConfig="actionConfig"
+              :repeatList="repeatList"
+              :handlerStepInfo="autoexechandlerStepInfo"
+              :formConfig="formConfig"
+              :fileTable="fileTable"
+              @closeRepeatTab="closeRepeatTab"
+              @upActivityList="updateStepActive()"
+              @updataActive="(val)=>updataActive(val)"
+            ></Component>
+          </template>
+        </div>
+      </template>
+    </template>
+    <!-- 固定页面tab end-->
     <!-- 底部内容 -->
     <div ref="footerReply">
       <!-- 用户评分 -->
@@ -563,13 +685,17 @@ export default {
           top: false
         },
         {
-          key: 'preNode', //步骤信息
-          top: true
+          key: 'node', //节点信息
+          top: false
         },
         {
-          key: 'node', //节点信息
+          key: 'taskConfigList', //子任务策略
           top: false
         },
+        {
+          key: 'preNode', //步骤信息
+          top: true
+        },
         {
           key: 'step', //步骤信息
           labelKey: 'Steplist',
@@ -620,10 +746,17 @@ export default {
     }
     //补充动态slot进fixedPageTab
     if (this.slotList && this.slotList.length > 0) {
+      let nodeList = [];
       this.slotList.forEach(d => {
         this.$set(this.fixedPageTab, d.name, true);
+        nodeList.push({
+          key: d.name,
+          top: false
+        });
       });
+      this.defaultTabList.splice(1, 0, ...nodeList);
     }
+    this.initData();
   },
   mounted() {
     this.$nextTick(() => {
@@ -656,30 +789,44 @@ export default {
         // 合并布局列表和默认 tab 列表，并去重
         const combinedList = this.$utils.uniqueByField([...layoutList, ...this.defaultTabList], 'key');
 
-        // 处理每个 tab 项
+        // 处理每个 tab 
         combinedList.forEach(item => {
           const defaultTab = this.defaultTabList.find(val => val.key === item.key);
-
-          // 根据不同的 key 处理不同的 tab 类型
-          switch (item.key) {
-            case 'preNode':
-              this.handlePreNodeTab(item, defaultTabValue);
-              break;
-            case 'node':
-              defaultTabValue = this.handleNodeTab(item, defaultTabValue);
-              break;
-            case 'report':
-              defaultTabValue = this.handleReportTab(item, defaultTab, defaultTabValue);
-              break;
-            default:
-              defaultTabValue = this.handleDefaultTab(item, defaultTab, defaultTabValue);
-              break;
+          //节点插槽自定义tab
+          const findSlot = this.slotList.find(s => s.name === item.key);
+          let key = item.key;
+          if (findSlot) {
+            key = 'node';
+          }
+          if (defaultTab) {
+            // 根据不同的 key 处理不同的 tab 类型
+            switch (key) {
+              case 'preNode':
+                this.handlePreNodeTab(item, defaultTabValue);
+                break;
+              case 'node':
+                //默认设置
+                defaultTabValue = this.handleNodeTab(item, defaultTabValue);
+                break;
+              case 'taskConfigList':
+                defaultTabValue = this.handleTaskConfigList(item, defaultTabValue);
+                break;
+              case 'report':
+                defaultTabValue = this.handleReportTab(item, defaultTab, defaultTabValue);
+                break;
+              default:
+                defaultTabValue = this.handleDefaultTab(item, defaultTab, defaultTabValue);
+                break;
+            }
+            // 将处理后的 tab 项添加到 tabList 中
+            if (!this.tabList.find(t => t.key === key)) {
+              this.tabList.push({
+                ...defaultTab,
+                ...item,
+                key: key
+              });
+            }
           }
-          // 将处理后的 tab 项添加到 tabList 中
-          this.tabList.push({
-            ...defaultTab,
-            ...item
-          });
         });
         // 如果没有设置当前 tab 值，则使用默认值
         if (defaultTabValue && !this.tabValue) {
@@ -697,14 +844,20 @@ export default {
         if (item.top) {
           // 前置步骤信息
           this.viewStepData.forEach(step => {
+            this.$set(this.fixedPageTab, `showStep${step.id}`, false);
             this.fixedPageList.push({
               tabValue: `showStep${step.id}`,
               label: step.name,
               item: step
             });
           });
-        } else if (!defaultTabValue) {
-          defaultTabValue = `showStep${this.viewStepData[0].id}`;
+        } else {
+          this.viewStepData.forEach(step => {
+            this.$set(this.fixedPageTab, `showStep${step.id}`, true);
+          });
+          if (!defaultTabValue) {
+            defaultTabValue = `showStep${this.viewStepData[0].id}`;
+          }
         }
       }
       return defaultTabValue;
@@ -715,10 +868,14 @@ export default {
         if (item.top) {
           this.slotList.forEach(d => {
             this.$set(this.fixedPageTab, d.name, false);
-            this.fixedPageList.push({
-              tabValue: d.name,
-              label: d.label
-            });
+            if (this.$slots[d.name]) {
+              if (!this.fixedPageList.find(f => f.tabValue === d.name)) {
+                this.fixedPageList.push({
+                  tabValue: d.name,
+                  label: d.label
+                });
+              }
+            }
           });
           if (this.tabValue && this.slotList.find(d => d.name === this.tabValue)) {
             this.tabValue = '';
@@ -731,13 +888,17 @@ export default {
         }
       }
 
+      return defaultTabValue;
+    },
+    //处理子任务策略
+    handleTaskConfigList(item, defaultTabValue) {
       if (this.taskConfigList.length > 0) {
         if (item.top) {
           this.taskConfigList.forEach(d => {
             this.fixedPageTab[`subTask${d.id}`] = false;
             this.fixedPageList.push({
               tabValue: `subTask${d.id}`,
-              label: this.subTask(d)
+              label: d.name
             });
           });
         } else {
@@ -745,7 +906,6 @@ export default {
           this.tabValue = '';
         }
       }
-
       return defaultTabValue;
     },
     // 处理 report tab
@@ -825,11 +985,12 @@ export default {
         this.setTimeUpdata = null;
       }, 300);
     },
-    initData() {
+    async initData() {
+      await this.getStepStatusList();
       this.wipeCenterDetail();
       this.getActivityList();
       this.getAllFileList();
-      this.getStepStatusList();
+    
       this.getTaskComment();
       this.getRepeatList();
       this.initTabList();
@@ -934,7 +1095,7 @@ export default {
       let data = {
         processTaskId: this.processTaskId
       };
-      this.$api.process.processtask.getStepStatusList(data).then(res => {
+      return this.$api.process.processtask.getStepStatusList(data).then(res => {
         if (res.Status == 'OK') {
           this.stepData = res.Return;
           mutations.setStepList(res.Return);
@@ -951,13 +1112,6 @@ export default {
                   let step = this.stepData.find(step => step.processStepUuid === pre);
                   if (!this.$utils.isEmpty(step)) {
                     this.viewStepData.push(step);
-                    this.fixedPageTab['showStep' + step.id] = false;
-                    //前置步骤信息
-                    this.fixedPageList.push({
-                      tabValue: 'showStep' + step.id,
-                      label: step.name,
-                      item: step
-                    });
                   }
                 });
               }
@@ -1379,6 +1533,12 @@ export default {
         if (this.slotList.find(s => s.name === tabValue)) {
           //步骤节点信息
           findTab = this.tabList.find(item => item.key === 'node');
+        } else if (this.viewStepData.find(v => `showStep${v.id}` === tabValue)) {
+          //前置步骤
+          findTab = this.tabList.find(item => item.key === 'preNode');
+        } else if (this.taskConfigList.find(t => `subTask${t.id}` === tabValue)) {
+          //子任务策略
+          findTab = this.tabList.find(item => item.key === 'taskConfigList');
         }
       } 
       findTab && this.$set(findTab, 'top', false);
@@ -1699,14 +1859,31 @@ export default {
         }
         return type;
       };
+    },
+    isFixedAbove() { //固定tab的位置：'above(上)/below(下)
+      let isAbove = true;
+      if (this.processTaskConfig.processTaskTabLayout && this.processTaskConfig.processTaskTabLayout.position === 'below') {
+        isAbove = false;
+      }
+      return isAbove;
+    },
+    isShowfixedPage() {
+      return (handler) => {
+        let isShow = true;
+        if (handler === 'relevance' && !this.showRelationDetail(this.actionConfig.tranferreport, this.processTaskConfig.processTaskRelationCount)) {
+          isShow = false;
+        } else if (handler === 'markrepeat' && !this.actionConfig.markrepeat && this.$utils.isEmpty(this.repeatList)) {
+          isShow = false;
+        } else if (handler === 'file' && !this.hasAccessoriesList) {
+          isShow = false;
+        }
+        return isShow;
+      };
     }
   },
   watch: {
     processTaskConfig: {
       handler(val, oldval) {
-        if (val.id && ((oldval && val.id != oldval.id) || !oldval)) {
-          this.initData();
-        }
         if (val && ((oldval && val.id != oldval.id) || !oldval) && val.formAttributeDataMap) {
           this.$nextTick(() => {
             if (this.$refs.FormPreview) {
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5bf2a5a5be34a34fea7dc795dbe3505ebbe4d16f
--- /dev/null
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/assignworkerlist-handler.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="flex-start">
+    <div class="left-label-text text-grey">{{ config.typeName }}</div>
+    <div v-if="newContentList && newContentList.length > 0">
+      <div v-for="(newContentObj, i) in newContentList" :key="i">
+        <span v-if="newContentObj.workerList && newContentObj.workerList.length > 0">
+          <span>{{ newContentObj.processTaskStepName }}</span>
+          <span class="text-grey pl-xs pr-xs">{{ $t('term.process.stepishandledby') }}</span>
+          <span v-for="(item,index) in newContentObj.workerList" :key="index" style="display: inline-block;">
+            <UserCard v-bind="item"></UserCard>
+            <span v-if="newContentObj.workerList.length - 1 > index">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+          </span>
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue')
+  },
+  filters: {},
+  props: {
+    config: Object
+  },
+  data() {
+    return {
+      newContentList: null
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    console.log(this.config.newContent, 'config.newContent');
+    if (this.config.newContent) {
+      this.newContentList = JSON.parse(this.config.newContent);
+    }
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    setData(str) {
+      let data = JSON.parse(str);
+      return data;
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang='less' scoped>
+</style>
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
index c8190789e664e06ec5055f2257ca0964aa1a98ba..7e227eeb93639ad9fd58d594b323f78f64a6a95d 100644
--- a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
@@ -7,6 +7,7 @@ import formHandler from './form-handler';
 import fileHandler from './file-handler';
 import restfulactionHandler from './restfulaction-handler';
 import workerlistHandler from './workerlist-handler';
+import assignworkerlistHandler from './assignworkerlist-handler';
 import workerHandler from './worker-handler';
 import causeHandler from './cause-handler';
 import ruleHandler from './rule-handler';
@@ -33,6 +34,7 @@ export default {
   restfulactionHandler, //动作激活
   workerHandler,
   workerlistHandler,
+  assignworkerlistHandler,
   causeHandler, //条件异常原因
   ruleHandler, //条件规则
   fromprocesstaskHandler, //原工单
diff --git a/src/views/pages/rdm/project/viewtab/components/issue-list-table.vue b/src/views/pages/rdm/project/viewtab/components/issue-list-table.vue
index 52d6dc5d4e3a11b2aa148fb1964f83d090c5f102..4af939e9f71ef9c3de66b84645c682b391d0a903 100644
--- a/src/views/pages/rdm/project/viewtab/components/issue-list-table.vue
+++ b/src/views/pages/rdm/project/viewtab/components/issue-list-table.vue
@@ -108,6 +108,11 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    newWindowOpen(row) {
+      const { appType = '', projectId = null, appId = null, id = null} = row || {};
+      const path = `${appType}-detail/${projectId}/${appId}/${id}`;
+      window.open(HOME + '/rdm.html#/' + path, '_blank');
+    },
     highlightKeywords(text, wordList) {
       if (!wordList || wordList.length === 0) return text;
       const escapedWords = wordList.map(word => this.escapeRegExp(word));
@@ -148,7 +153,12 @@ export default {
       this.$emit('deleteIssue', row);
     },
     openIssueDetail(row) {
-      this.$emit('openIssue', row);
+      if (row && row.parentId) {
+        // 子需求新标签页打开
+        this.newWindowOpen(row);
+      } else {
+        this.$emit('openIssue', row);
+      }
     },
     searchIssue(currentPage) {
       this.$emit('searchIssue', currentPage);
diff --git a/src/views/pages/rdm/rdm.js b/src/views/pages/rdm/rdm.js
index cd5ca014379ca8986eed0e43546747ffda44eec1..280c81b4abc044a8e74be04e7b44115e64154db7 100644
--- a/src/views/pages/rdm/rdm.js
+++ b/src/views/pages/rdm/rdm.js
@@ -7,6 +7,7 @@ import VueI18n from 'vue-i18n';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 //公共的全局组件、样式等
 import '@/resources/base.js';
@@ -28,6 +29,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$api = api;
 Vue.prototype.$tsrouter = router;
 Vue.prototype.$localStore = new LocalStore('rdm', router);
+Vue.prototype.$state = new State('rdm');
 
 new Vue({
   router,
diff --git a/src/views/pages/report/report.js b/src/views/pages/report/report.js
index 6701013a7c87ebc4d49287e8f7fdac394d8b858f..c66681f5797596b6604e938a2c071cf428db50d6 100644
--- a/src/views/pages/report/report.js
+++ b/src/views/pages/report/report.js
@@ -7,6 +7,7 @@ import VueI18n from 'vue-i18n';
 import CompareUtil from '@/resources/assets/js/compareUtil.js';
 import api from '@/resources/api/api.js';
 import LocalStore from '@/resources/assets/js/localStore.js';
+import State from '@/resources/assets/js/state.js';
 
 import md5 from 'js-md5';
 
@@ -42,6 +43,7 @@ Vue.prototype.$api = api;
 Vue.prototype.$md5 = md5;
 Vue.prototype.$tsrouter = router;
 Vue.prototype.$localStore = new LocalStore('report', router);
+Vue.prototype.$state = new State('report');
 
 new Vue({
   router,
diff --git a/src/views/pages/report/sendjob/sendjob-manage.vue b/src/views/pages/report/sendjob/sendjob-manage.vue
index ed7e50919ddc6cdfda7024f07fd1a378fcf6139c..3a314469d0f854eb00cc4e09b415d747d2410135 100644
--- a/src/views/pages/report/sendjob/sendjob-manage.vue
+++ b/src/views/pages/report/sendjob/sendjob-manage.vue
@@ -36,6 +36,10 @@
             </template>
           </template>
           <template v-slot:name="{row}"><span class="text-href" @click.stop="toEditPage('edit',row)">{{ row.name }}</span></template>
+          <template v-slot:isLoad="{row}">
+            <span v-if="row.jobStatus && row.jobStatus.isLoad == 1" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
           <template v-slot:cron="{row}">
             <TsQuartz :value="row.cron" showType="read" />
           </template>
@@ -48,7 +52,7 @@
             ></TsFormSwitch>
           </template>
           <template v-slot:nextFireTime="{row}">
-            {{ row.nextFireTime | formatDate }}
+            <span v-if="row.jobStatus">{{ row.jobStatus.nextFireTime | formatDate }}</span>
           </template>
           <template v-slot:action="{row}">
             <div class="tstable-action">
@@ -118,6 +122,7 @@ export default {
         {title: this.$t('page.name'), key: 'name'},
         {title: this.$t('page.emailtitle'), key: 'emailTitle'},
         {title: this.$t('page.recipient'), key: 'toNameList'},
+        {title: this.$t('page.loaded'), key: 'isLoad'},
         {title: this.$t('page.executeplan'), key: 'cron'},
         {title: this.$t('page.status'), key: 'isActive'},
         {title: this.$t('term.report.nextsendingtime'), key: 'nextFireTime'},
diff --git a/version.js b/version.js
index 9c254f1fb2d6fe8ffb137a24f917b363aef29bb1..74d992b9b2f675a7c2def4a5b1e495043db612ec 100644
--- a/version.js
+++ b/version.js
@@ -8,6 +8,8 @@ try {
 
   const moduleCommitInfo = { 'web': commitId };
   const commercialModulePath = path.join(__dirname, './src/commercial-module');
+  const communityModulsPath = path.join(__dirname, './src/community-module');
+  
   // 遍历 commercial-module 文件夹中的所有子文件夹
   if (fs.existsSync(commercialModulePath)) {
     fs.readdirSync(commercialModulePath).forEach((folder) => {
@@ -24,6 +26,22 @@ try {
     });
   }
 
+  // 遍历 community-module 文件夹中的所有子文件夹
+  if (fs.existsSync(communityModulsPath)) {
+    fs.readdirSync(communityModulsPath).forEach((folder) => {
+      const modulePath = path.join(communityModulsPath, folder);
+      if (fs.lstatSync(modulePath).isDirectory()) {
+        try {
+          // 进入每个模块文件夹并获取最新的 commitId
+          const commitId = execSync('git rev-parse HEAD', { cwd: modulePath }).toString().trim().substring(0, 8);
+          moduleCommitInfo[folder] = commitId;
+        } catch (err) {
+          console.error(`Error fetching commitId for ${folder}:`, err);
+        }
+      }
+    });
+  }
+
   fs.writeFile('./public/version.md', JSON.stringify({ 'version': moduleCommitInfo, 'fcd': buidDate }), err => {
     if (err) {
       console.error(err);
diff --git a/vue.config.js b/vue.config.js
index 3991808119bd1796fadf039c94f95e23dcb4663b..8cc2a5867d01b380c58712f48a5202d0a576e613 100755
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,14 +5,15 @@ let copyPath = '';
 let src = './src';
 let baseImg = './public/resource';
 let commercialModule = './src/commercial-module';
+let communityModule = './src/community-module';
 let localUrl = '../neatlogic-web/src/resources';
 let pageTitle = 'neatlogic'; //页面标题名称
 const { tenantName, urlPrefix } = require('./apiconfig.json');
 let faviconIcon = './public/resource/img/common/tsfavicon.png';
 let importCustomConfig = glob.sync(`${commercialModule}/**/customconfig.js`) || [];
-importCustomConfig.forEach((filePath) => {
+importCustomConfig.forEach(filePath => {
   if (filePath) {
-    let {tableStyle, title, loginTitle, imgPath, publicPath = '', faviconIconPath} = require(filePath);
+    let { tableStyle, title, loginTitle, imgPath, publicPath = '', faviconIconPath } = require(filePath);
     copyPath = publicPath;
     if (loginTitle) {
       process.env.VUE_APP_LOGINTITLE = loginTitle || 'welcome';
@@ -35,10 +36,25 @@ function getPages(pageList) {
   const pages = {};
   if (!pageList) {
     const pagePath = glob.sync(src + '/views/pages/*/router.js');
-    let importModulePathList = glob.sync(`${commercialModule}/**/router.js`) || [];
     let pagePathList = [...pagePath];
-
     let defaultModuleList = getAllModuleList([], JSON.parse(JSON.stringify(pagePath)));
+
+    //加载开源模块路由
+    let importCommunityModulePathList = glob.sync(`${communityModule}/**/router.js`) || [];
+    let communityModuleList = [];
+    if (importCommunityModulePathList && importCommunityModulePathList.length > 0) {
+      importCommunityModulePathList.forEach(filePath => {
+        let moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
+        if (moduleName && !defaultModuleList.includes(getModuleName(moduleName))) {
+          // 剔除非模块的情况，如自定义页面或者自定义组件
+          pagePathList.push(filePath);
+          communityModuleList.push(getModuleName(moduleName));
+        }
+      });
+    }
+
+    //加载商业模块路由
+    let importModulePathList = glob.sync(`${commercialModule}/**/router.js`) || [];
     let commercialModuleList = [];
     if (importModulePathList && importModulePathList.length > 0) {
       importModulePathList.forEach(filePath => {
@@ -50,6 +66,7 @@ function getPages(pageList) {
         }
       });
     }
+
     pagePathList.forEach(filePath => {
       let moduleName = filePath.match(/\/([a-zA-Z0-9_-]+)\/router\.js$/)[1];
 
@@ -59,8 +76,14 @@ function getPages(pageList) {
       if (`${filename}` == 'login') {
         pageLogin = `${pageTitle}`;
       }
+      let entry = `${src}/views/pages/${filename}/${filename}.js`;
+      if (communityModuleList.includes(filename)) {
+        entry = `${communityModule}/${moduleName}/${filename}.js`;
+      } else if (commercialModuleList.includes(filename)) {
+        entry = `${commercialModule}/${moduleName}/${filename}.js`;
+      }
       newpage[filename] = {
-        entry: commercialModuleList.includes(filename) ? `${commercialModule}/${moduleName}/${filename}.js` : `${src}/views/pages/${filename}/${filename}.js`,
+        entry: entry,
         template: `public/index.html`,
         filename: `${filename}.html`,
         title: pageLogin, // 标题名称+参数
@@ -83,6 +106,7 @@ function getPages(pageList) {
       Object.assign(pages, newpage);
     });
   }
+  console.log('pages', JSON.stringify(pages));
   return pages;
 }
 function getModuleName(moduleName) {
@@ -107,34 +131,38 @@ function getAllModuleList(defaultModuleList, modulePathList = []) {
 function resolve(dir) {
   return path.join(__dirname, dir);
 }
-const copyRsPack = copyPath ? [
-  {
-    from: resolve(copyPath), // 需要复制的目录
-    to: resolve('dist/'), // 复制到目标目录
-    force: true,
-    filter: (resourcePath) => {
-      return resourcePath.endsWith('.html'); // 只复制 .html 文件
-    },
-    noErrorOnMissing: true // 当没有找到对应的文件或目录时，忽略错误
-  },
-  {
-    from: resolve(copyPath),
-    to: resolve('dist/resource/'),
-    filter: (resourcePath) => {
-      return !resourcePath.endsWith('.html');
+const copyRsPack = copyPath
+  ? [
+    {
+      from: resolve(copyPath), // 需要复制的目录
+      to: resolve('dist/'), // 复制到目标目录
+      force: true,
+      filter: resourcePath => {
+        return resourcePath.endsWith('.html'); // 只复制 .html 文件
+      },
+      noErrorOnMissing: true // 当没有找到对应的文件或目录时，忽略错误
     },
-    force: true,
-    noErrorOnMissing: true
-  }
-] : [];
-const copyFavicon = faviconIcon ? [
-  {
-    from: resolve(faviconIcon),
-    to: resolve('dist/resource/img/common/'),
-    force: true,
-    noErrorOnMissing: true
-  }
-] : [];
+    {
+      from: resolve(copyPath),
+      to: resolve('dist/resource/'),
+      filter: resourcePath => {
+        return !resourcePath.endsWith('.html');
+      },
+      force: true,
+      noErrorOnMissing: true
+    }
+  ]
+  : [];
+const copyFavicon = faviconIcon
+  ? [
+    {
+      from: resolve(faviconIcon),
+      to: resolve('dist/resource/img/common/'),
+      force: true,
+      noErrorOnMissing: true
+    }
+  ]
+  : [];
 module.exports = {
   css: {
     loaderOptions: {
@@ -165,7 +193,7 @@ module.exports = {
     plugins: [
       new CopyPlugin({
         patterns: [...copyRsPack, ...copyFavicon]
-      }) 
+      })
     ]
   },
   chainWebpack: config => {