diff --git a/package.json b/package.json
index a30537fbd758f9127eee8235cc13b8c862b46bf9..b3743f0b96a93bef6155dbd4647eedd06d34111e 100755
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "particles.vue": "^2.42.2",
     "qs": "^6.11.2",
     "save": "^2.4.0",
+    "v-code-diff": "^1.13.1",
     "vue": "^2.7.16",
     "vue-codemirror": "^4.0.6",
     "vue-cropper": "^0.5.6",
@@ -82,15 +83,14 @@
     "vue-loader": "^17.4.0",
     "vue-router": "^3.5.4",
     "vuedraggable": "^2.23.2",
-    "vuex": "^3.0.1",
-    "xlsx": "^0.18.5"
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",
     "@babel/eslint-parser": "^7.12.16",
     "@babel/plugin-transform-runtime": "^7.24.3",
     "@babel/preset-env": "^7.24.5",
-    "@rsbuild/core": "^1.2.4",
+    "@rsbuild/core": "^1.4.6",
     "@rsbuild/plugin-less": "^1.1.0",
     "@rsbuild/plugin-vue2": "^1.0.2",
     "@vue/cli-plugin-babel": "~5.0.6",
diff --git a/src/resources/api/cmdb/cientity/cientity.js b/src/resources/api/cmdb/cientity/cientity.js
index 7c5789d3afcd4246610e1de8fdd9fd2149bd8723..c73a733f5a40f31d4d558a45e8f1dfd160b79a76 100644
--- a/src/resources/api/cmdb/cientity/cientity.js
+++ b/src/resources/api/cmdb/cientity/cientity.js
@@ -73,9 +73,11 @@ const cientity = {
   getCiEntityBaseInfoByIdList(idList) {
     return axios.post('/api/rest/cmdb/cientity/baseinfo/list', { idList: idList });
   },
+  /*已删除
   getCiEntityByIdList(ciId, idList) {
     return axios.post('/api/rest/cmdb/cientity/list', { ciId: ciId, idList: idList });
   },
+  */
   getCiEntityTopoData(params) {
     return axios.post('/api/rest/cmdb/topo/cientity', params);
   },
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index 5b3fc45e98b037b0d949679020539dba0ddd20f9..a4f2decf7c690170454bd6e6574470347130e612 100644
--- a/src/resources/assets/css/theme.less
+++ b/src/resources/assets/css/theme.less
@@ -4119,6 +4119,71 @@
       }
     }
   }
+
+  // code-diff 对比样式
+  .code-diff-view {
+    border: 1px solid var(--border-color, @border-color-base);
+    background-color: @op-color;
+    .file-header {
+      background-color: @background-color;
+      border-bottom: 1px solid var(--border-color, @border-color-base);
+      .file-info {
+        .info-left,
+        .info-right {
+          color: @text-color;
+        }
+      }
+    }
+    .file-diff-split {
+      .blob-code + .blob-num {
+        border-left: 1px solid var(--border-color, @border-color-base);
+      }
+    }
+    .diff-table {
+      .blob-num-deletion,
+      .blob-code-deletion {
+        background-color: #fdd;
+      }
+      .blob-code-deletion,
+      .blob-code-addition {
+        .hljs-regexp,
+        .hljs-attr,
+        .hljs-attribute,
+        .hljs-literal,
+        .hljs-meta,
+        .hljs-number,
+        .hljs-string,
+        .hljs-operator,
+        .hljs-variable,
+        .hljs-punctuation,
+        .hljs-selector-attr,
+        .hljs-selector-class,
+        .hljs-selector-id {
+          color: #212121 !important; // 新增删除高亮行保持黑色，确保字体可见
+        }
+      }
+      .blob-code {
+        .blob-code-inner {
+          color: @text-color;
+        }
+      }
+    }
+    .hljs-regexp,
+    .hljs-attr,
+    .hljs-attribute,
+    .hljs-literal,
+    .hljs-meta,
+    .hljs-number,
+    .hljs-string,
+    .hljs-operator,
+    .hljs-variable,
+    .hljs-punctuation,
+    .hljs-selector-attr,
+    .hljs-selector-class,
+    .hljs-selector-id {
+      color: @text-color !important;
+    }
+  }
 }
 
 .theme-dark {
diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index e81b3b329d5273bb5c643937a298cc0e8f1bf6f2..21b03e3f6f7cdc0e2584b5d5a33c8e3825f5e51b 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -1243,5 +1243,32 @@ const methods = {
     }
     return result;
   },
+  isValidTimeString(timeStr) { //校验时间字符串
+      if(!timeStr || typeof timeStr !== 'string') {
+        return false;
+      }
+      const parts = timeStr.split(':');
+      if (parts.length === 2) {
+        const [h, m] = parts.map(Number);
+        return h >= 0 && h < 24 && m >= 0 && m < 60;
+      } else if (parts.length === 3) {
+        const [h, m, s] = parts.map(Number);
+        return h >= 0 && h < 24 && m >= 0 && m < 60 && s >= 0 && s; 
+      }
+      return false;
+    },
+    isValidDateTime(dateStr) { //校验日期时间字符串
+      // 检查是否为Date对象实例
+      if (dateStr instanceof Date) {
+        return !isNaN(dateStr.getTime());
+      }
+      // 检查是否为可解析的日期字符串
+      if (typeof dateStr === 'string') {
+        // 尝试解析为Date对象
+        const date = new Date(dateStr);
+        return !isNaN(date.getTime());
+      }
+      return false;
+    }
 };
 export default methods;
diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index aa34785c660052a328bab9cae9d57ee8f8515db6..4fa43bc3ff91681456a084895e5d029a6907f7c5 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1078,5 +1078,6 @@
   "autoexecparallel": "Concurrent settings",
   "paramkeyword": "Participate in search",
   "loglevel": "log level",
-  "bluegreen": "Blue green execution"
+  "bluegreen": "Blue green execution",
+  "mailserver": "mail serve"
 }
\ 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 6a19d149c036c093d5083f92a5cf8b4a1a4ee5b2..7c447c9a2238bdff96d4b01e6de63146a04beed9 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -1080,5 +1080,6 @@
   "autoexecparallel": "并发设置",
   "paramkeyword": "入参搜索",
   "loglevel": "日志级别",
-  "bluegreen": "蓝绿执行"
+  "bluegreen": "蓝绿执行",
+  "mailserver": "邮件服务"
 }
\ 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 22778a4b8228a6d573ee6710c0f950453b350db5..9e4a22acb2030b9e13d5d0acbaae9afa18a54708 100644
--- a/src/resources/assets/languages/router/en.json
+++ b/src/resources/assets/languages/router/en.json
@@ -156,7 +156,7 @@
     "tenantconfigmanage": "Configuration information management",
     "threaddump": "Thread snapshot",
     "sqldump": "SQL Monitoring",
-    "servermanage": "Server management",
+    "servermanage": "Server instance status",
     "databasefragment": "Database Fragmentation",
     "licensemanage": "Licenses",
     "batchoperation": "Batch Operation",
@@ -164,7 +164,7 @@
     "message": "Messages and Announcements",
     "integration": "Data and Integration",
     "notify": "Notification and Subscription",
-    "job": "Timed job",
+    "agent": "Agent & Runner",
     "others": "Basic Services",
     "healthcheck": "Health Check",
     "license": "License Management",
@@ -309,4 +309,4 @@
     "catalogdetail": "Catalog Detail",
     "diagramdetail": "Diagram Detail"
   }
-}
\ No newline at end of file
+}
diff --git a/src/resources/assets/languages/router/zh.json b/src/resources/assets/languages/router/zh.json
index 0e70111e70dc26e17bacafb9fe3b6ceaab5ea4f3..c3b0f5a2b0a8a21c733465ea58a9e7eb25e95ccc 100644
--- a/src/resources/assets/languages/router/zh.json
+++ b/src/resources/assets/languages/router/zh.json
@@ -156,7 +156,7 @@
     "tenantconfigmanage": "系统参数",
     "threaddump": "线程快照",
     "sqldump": "SQL监控",
-    "servermanage": "服务器管理",
+    "servermanage": "服务节点状态",
     "databasefragment": "数据库碎片整理",
     "licensemanage": "查看许可",
     "batchoperation": "批量操作",
@@ -164,7 +164,7 @@
     "message": "消息和公告",
     "integration": "数据和集成",
     "notify": "通知和订阅",
-    "job": "定时作业",
+    "agent": "代理和执行器",
     "others": "基础服务",
     "healthcheck": "健康检查",
     "license": "许可管理",
@@ -309,4 +309,4 @@
     "catalogdetail": "目录详情",
     "diagramdetail": "架构图详情"
   }
-}
\ No newline at end of file
+}
diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 1f4d07ac5207ae2f2932f128f7101001c49ed735..6918715453f3c07448bdb3f60159c1ce8d1196a2 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -246,7 +246,8 @@
     "pause": "stop it",
     "cientityisnotfound": "Configuration item does not exist",
     "testaccount": "test result",
-    "repeataccount": "The same protocol and username cannot bind multiple accounts with the same protocol and username to the same asset."
+    "repeataccount": "The same protocol and username cannot bind multiple accounts with the same protocol and username to the same asset.",
+    "datadetail": "Data Details"
   },
   "process": {
     "workordercenter": "Work Center",
@@ -2858,7 +2859,28 @@
     "alert": "give an alarm",
     "isnormalattr": "As a regular attribute display",
     "closesuccess": "Close successfully",
-    "istop": "topped"
+    "istop": "topped",
+    "onlysearchparentalert": "Only search for parent alarms",
+    "searchallalert": "Search for all alarms",
+    "closeselectedalert": "Close selected alarms",
+    "openselectedalert": "Open the selected alarm",
+    "deletematchalert": "Delete matching alarm",
+    "allalert": "All Alarms",
+    "alerttopo": "Alarm topology",
+    "alertdetail": "Alarm details",
+    "applychildalert": "Simultaneously apply sub alarms",
+    "transferworker": "Transfer to the handler",
+    "transferteam": "Transfer to processing team",
+    "reportdata": "reported data",
+    "eventaudit": "Event record",
+    "alertnotexists": "Alarm does not exist or has been deleted",
+    "childalert": "Sub alarm",
+    "dealresult": "Processing results",
+    "createalert": "Create an alarm",
+    "defaultstatus": "Defaults on",
+    "joinalert": "Merge into alarms",
+    "uniquekey": "unique",
+    "alertsign": "Alarm features"
   },
   "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 \\)"
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 7e901aa7d39119a7e4f8df7e761c831168510fb1..d04b9b894d02c2d0d9eb61b2060a5160539d0868 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -247,7 +247,8 @@
     "pause": "停止",
     "cientityisnotfound": "配置项不存在",
     "testaccount": "测试结果",
-    "repeataccount": "协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。"
+    "repeataccount": "协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。",
+    "datadetail": "数据明细"
   },
   "process": {
     "workordercenter": "工单中心",
@@ -2858,6 +2859,27 @@
     "alert": "告警",
     "isnormalattr": "作为普通属性展示",
     "closesuccess": "关闭成功",
-    "istop": "是否置顶"
+    "istop": "是否置顶",
+    "onlysearchparentalert": "只搜索父告警",
+    "searchallalert": "搜索所有告警",
+    "closeselectedalert": "关闭选中告警",
+    "openselectedalert": "打开选中告警",
+    "deletematchalert": "删除匹配告警",
+    "allalert": "所有告警",
+    "alerttopo": "告警拓扑",
+    "alertdetail": "告警详情",
+    "applychildalert": "同时应用子告警",
+    "transferworker": "转交处理人",
+    "transferteam": "转交处理组",
+    "reportdata": "上报数据",
+    "eventaudit": "事件记录",
+    "alertnotexists": "告警不存在或已被删除",
+    "childalert": "子告警",
+    "dealresult": "处理结果",
+    "createalert": "创建告警",
+    "defaultstatus": "默认状态",
+    "joinalert": "归并到告警",
+    "uniquekey": "唯一键",
+    "alertsign": "告警特征"
   }
 }
\ No newline at end of file
diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js
index c00deb1a0fcdcb01996b2315c82708af08e886e3..d4b039ce26fa9a754d7020c074887cd082262807 100644
--- a/src/resources/mixins/formMixins.js
+++ b/src/resources/mixins/formMixins.js
@@ -120,8 +120,8 @@ export default {
           if (Array.isArray(value)) {
             let valueList = [];
             value.forEach(v => {
-              if (v != false && !this.$utils.isEmpty(v)) {
-                if (this.isCustomValue && v[this.valueName]) {
+              if (!this.$utils.isEmpty(v)) { // 兼容为0的情况检验不通过的问题
+                if (this.isCustomValue && !this.$utils.isEmpty(v[this.valueName])) {
                   // 数组对象类型
                   valueList.push(v?.[this.valueName]);
                 } else {
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index 57439642ff452751a2ae4fe492387954887eba8a..3ddef96fa837e0b216920ff5ae8f7a207b4301c3 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -2,7 +2,7 @@
   <div class="form-item radius-md" :class="{ 'bg-error-grey': showStatusIcon && (hasDataError || hasConfigError) }">
     <!--编辑模式下的非container组件需要增加遮罩屏蔽所有操作，container组件需要接受拖拽组件进去，不需要遮罩-->
     <div v-if="(mode === 'edit' || mode === 'editSubform') && !formItem.isContainer" class="editor-mask"></div>
-    <div v-if="mode != 'defaultvalue' && mode !== 'condition' && ((formItem.override_config && formItem.override_config.isMask) || (formItem.config && formItem.config.isMask))" class="mask">
+    <div v-if="mode != 'defaultvalue' && mode !== 'condition' && ((formItem.override_config && formItem.override_config.isMask) || (formItem.config && formItem.config.isMask) || currentItemReaction.currentItemMask)" class="mask">
       <!-- <span class="tsfont-eye-off"></span>
       <span class="mask-text text-grey">当前组件不可见</span>-->
     </div>
@@ -50,7 +50,7 @@
     <div v-if="mode == 'edit' && formItem.config && formItem.config.isHide" class="corner-bottom-icon text-grey tsfont-eye-off"></div>
     <div v-if="needLabel" class="mb-xs">{{ formItem.label }}</div>
     <template v-if="isShowComponent(formItem)">
-      <i v-if="formItem.config && formItem.config.isRequired && !readonly && !formItem.config.isReadOnly" class="require-tip text-error">*</i>
+      <i v-if="formItem.config && formItem.config.isRequired && !readonly && !formItem.config.isReadOnly && !currentItemReaction.currentItemReadonly" class="require-tip text-error">*</i>
       <template v-if=" (!formItem.type || formItem.type === 'form')">
         <component
           :is="formItem.handler"
@@ -62,9 +62,9 @@
           :value="formItemValue"
           :mode="mode"
           :filter="filter"
-          :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-          :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
+          :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly || currentItemReaction.currentItemReadonly"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemReaction.currentItemDisabled"
+          :required="(mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false) || currentItemReaction.cunrrentRequire"
           :formData="formData"
           :readonlyTextIsHighlight="readonlyTextIsHighlight"
           :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
@@ -91,8 +91,8 @@
           :mode="mode"
           :filter="filter"
           :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-          :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemReaction.currentItemDisabled"
+          :required="(mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false) || currentItemReaction.cunrrentRequire"
           :formData="formData"
           :readonlyTextIsHighlight="readonlyTextIsHighlight"
           :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
@@ -119,8 +119,8 @@
         :value="formItemValue"
         :mode="mode"
         :filter="filter"
-        :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-        :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled"
+        :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly || currentItemReaction.currentItemReadonly"
+        :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemReaction.currentItemDisabled"
         :readonlyTextIsHighlight="readonlyTextIsHighlight"
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
@@ -241,8 +241,15 @@ export default {
       filter: [], //格式[{column:'矩阵属性uuid',expression:'equal',valueList:["value"]}]
       REACTION: REACTION, //联动规则
       isShowErrorMessage: true,
-      currentItemHide: false, //当前组件是否隐藏
-      reactionFormItemUuidMap: {} //规格内需要的表单组件值
+      reactionFormItemUuidMap: {}, //规格内需要的表单组件值
+      currentItemReaction: { //(针对表格组件嵌套子组件)
+        currentItemHide: false, //当前组件是否隐藏
+        currentItemDisabled: false, //当前组件是否禁用
+        currentItemMask: false, //当前组件是否不可见
+        currentItemReadonly: false, //当前组件是否只读
+        cunrrentRequire: false //
+      }
+      
     };
   },
   beforeCreate() {},
@@ -524,11 +531,11 @@ export default {
     },
     hideFormItem() {
       this.$set(this.formItem.config, 'isHide', true);
-      this.currentItemHide = true;
+      this.currentItemReaction.currentItemHide = true;
     },
     showFormItem() {
       this.$set(this.formItem.config, 'isHide', false);
-      this.currentItemHide = false;
+      this.currentItemReaction.currentItemHide = false;
     },
     //验证配置是否完整
     validConfig() {
@@ -689,7 +696,7 @@ export default {
     isShowComponent() {
       return (formItem) => {
         let isShow = true;
-        if (this.currentItemHide || (formItem && (this.mode === 'read' || this.mode === 'readSubform') && formItem.config && formItem.config.isHide) || formItem.isEditing || (formItem.override_config && formItem.override_config.isHide)) {
+        if (this.currentItemReaction.currentItemHide || (formItem && (this.mode === 'read' || this.mode === 'readSubform') && formItem.config && formItem.config.isHide) || formItem.isEditing || (formItem.override_config && formItem.override_config.isHide)) {
           isShow = false;
         }
         return isShow;
@@ -726,6 +733,9 @@ export default {
               this.$emit('updateHiddenComponentList', val, this.formItem.uuid);
             }
           });
+          this.$nextTick(() => {
+            this.isFirstLoad = false;
+          });
         }
       },
       immediate: true
diff --git a/src/resources/plugins/TsSheet/form/reaction/disable.js b/src/resources/plugins/TsSheet/form/reaction/disable.js
index dd7507dabcf2e3fc551916234efa3b93cdf21723..5ba3f3ea12636df552007f6a3752a32cfe9a92bd 100644
--- a/src/resources/plugins/TsSheet/form/reaction/disable.js
+++ b/src/resources/plugins/TsSheet/form/reaction/disable.js
@@ -2,8 +2,10 @@ export default ({ overrideConfig, result, view }) => {
   if (!overrideConfig.isDisabled) {
     if (result) {
       view.$set(view.formItem.config, 'isDisabled', true);
+      view.$set(view.currentItemReaction, 'currentItemDisabled', true);
     } else {
       view.$set(view.formItem.config, 'isDisabled', false);
+      view.$set(view.currentItemReaction, 'currentItemDisabled', false);
     }
     view.addExecuteCount('disable');
   }
diff --git a/src/resources/plugins/TsSheet/form/reaction/mask.js b/src/resources/plugins/TsSheet/form/reaction/mask.js
index e1ce93a8f81d0f41e2b3b2ff881caec0fe0a6c1c..76d11786b9b0027ec2d7bc0a96fd2f41ddf7fb00 100644
--- a/src/resources/plugins/TsSheet/form/reaction/mask.js
+++ b/src/resources/plugins/TsSheet/form/reaction/mask.js
@@ -2,8 +2,10 @@ export default ({ overrideConfig, result, view }) => {
   if (!overrideConfig.isMask) {
     if (result) {
       view.$set(view.formItem.config, 'isMask', true);
+      view.$set(view.currentItemReaction, 'currentItemMask', true);
     } else {
       view.$set(view.formItem.config, 'isMask', false);
+      view.$set(view.currentItemReaction, 'currentItemMask', false);
     }
     view.addExecuteCount('mask');
   }
diff --git a/src/resources/plugins/TsSheet/form/reaction/readonly.js b/src/resources/plugins/TsSheet/form/reaction/readonly.js
index 0917c041b8dd62b370341f2cabedc2d4d23c6813..12bb48adce105525e672103ee84caea9395ab7eb 100644
--- a/src/resources/plugins/TsSheet/form/reaction/readonly.js
+++ b/src/resources/plugins/TsSheet/form/reaction/readonly.js
@@ -2,8 +2,10 @@ export default ({ overrideConfig, result, view }) => {
   if (!overrideConfig.isReadonly) {
     if (result) {
       view.$set(view.formItem.config, 'isReadOnly', true);
+      view.$set(view.currentItemReaction, 'currentItemReadonly', true);
     } else {
       view.$set(view.formItem.config, 'isReadOnly', false);
+      view.$set(view.currentItemReaction, 'currentItemReadonly', false);
     }
     view.addExecuteCount('readonly');
   }
diff --git a/src/resources/plugins/TsSheet/form/reaction/required.js b/src/resources/plugins/TsSheet/form/reaction/required.js
index 21636a0fd929170d95f5eb56eb0411e6ee4d1108..34d49c93ad45c623ed85e1ee473b90b4c06c3706 100644
--- a/src/resources/plugins/TsSheet/form/reaction/required.js
+++ b/src/resources/plugins/TsSheet/form/reaction/required.js
@@ -2,8 +2,10 @@ export default ({ overrideConfig, result, view }) => {
   if (!overrideConfig.isRequired) {
     if (result) {
       view.$set(view.formItem.config, 'isRequired', true);
+      view.$set(view.currentItemReaction, 'cunrrentRequire', true);
     } else {
       view.$set(view.formItem.config, 'isRequired', false);
+      view.$set(view.currentItemReaction, 'cunrrentRequire', false);
     }
     view.addExecuteCount('required');
   }
diff --git a/src/views/pages/autoexec/components/script/item/param/inputparam.vue b/src/views/pages/autoexec/components/script/item/param/inputparam.vue
index 37f723a7de98061559faf775f3d8de2b978ec94a..49e41f8b18d1efe436b2465404c141ba769d676a 100644
--- a/src/views/pages/autoexec/components/script/item/param/inputparam.vue
+++ b/src/views/pages/autoexec/components/script/item/param/inputparam.vue
@@ -503,6 +503,9 @@ export default {
         item = item || paramsTypeList.find(p => {
           return p.value == com.component;
         });
+        if (item && !item.type && com.component) {
+          item.type = com.component;
+        }
         return item || {};
       };
     },
diff --git a/src/views/pages/autoexec/detail/test-detail.vue b/src/views/pages/autoexec/detail/test-detail.vue
index f65bd4b2b8fe4dea733baa8387735b8b7078be22..1f62f942fea9aac52925c8ef0b8ac51b8bd395f9 100644
--- a/src/views/pages/autoexec/detail/test-detail.vue
+++ b/src/views/pages/autoexec/detail/test-detail.vue
@@ -66,6 +66,51 @@
               </TsForm>
             </div>
           </div>
+          <div class="box-block">
+            <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"
+                labelPosition="left"
+                :required="true"
+              >
+                <TsFormSelect
+                  ref="roundCountForm"
+                  v-model="roundCount"
+                  v-bind="roundCountForm"
+                ></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>
         </template>
         <div>
           <Divider orientation="start">{{ $t('term.deploy.actuatorgroup') }}</Divider>
@@ -92,6 +137,9 @@ export default {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
     ArgumentParams: () => import('./runnerDetail/argument-params.vue'),
     TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput'),
+    TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'),
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     RunnerGroupSetting: () => import('@/views/pages/autoexec/detail/actionDetail/runnergroup-setting.vue')
   },
   filters: {},
@@ -156,7 +204,40 @@ export default {
         mappingMode: 'constant',
         value: '-1'
       },
-      scriptId: null
+      scriptId: null,
+      roundCount: 32,
+      parallelCount: 64,
+      parallelPolicy: 'parallel',
+      parallelPolicyDataList: [
+        {
+          text: this.$t('page.autoexecparall'),
+          value: 'parallel'
+        },
+        {
+          text: this.$t('page.autoexecbatchround'),
+          value: 'roundCount'
+        }
+      ],
+      roundCountForm: {
+        placeholder: this.$t('page.selectinput'),
+        border: 'border',
+        dataList: this.getRoundCountList(),
+        filterName: 'text',
+        search: true,
+        transfer: true,
+        desc: this.$t('term.autoexec.roundcountdescrition'),
+        validateList: ['required']
+      },
+      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']
+      }
     };
   },
   beforeCreate() {},
@@ -244,6 +325,9 @@ export default {
       isValid = this.$refs.nameForm ? this.$refs.nameForm.valid() && isValid : isValid;
       isValid = this.$refs.argumentConfig ? this.$refs.argumentConfig.valid() && isValid : isValid;
       isValid = this.$refs.executeUser ? this.$refs.executeUser.valid() && isValid : isValid;
+      if ((this.$refs.roundCountForm && !this.$refs.roundCountForm.valid()) || (this.$refs.parallelForm && !this.$refs.parallelForm.valid())) {
+        isValid = false;
+      }
       if (isValid) {
         this.executeAction();
       }
@@ -262,6 +346,12 @@ export default {
       val.executeConfig = this.$refs.executeForm ? this.$refs.executeForm.getFormValue() : {};
       if (this.targetShow) {
         val.executeConfig.executeNodeConfig = this.$refs.addTarget.getValue();
+        val.parallelPolicy = this.parallelPolicy;
+        if (this.parallelPolicy === 'roundCount') {
+          val.roundCount = this.roundCount;
+        } else {
+          val.parallelCount = this.parallelCount;
+        }
       } else {
         val.executeConfig.executeNodeConfig = [];
       }
@@ -321,6 +411,27 @@ export default {
           }
         });
       }
+    },
+    getRoundCountList() {
+      let list = [
+        {
+          value: -1,
+          text: '蓝绿执行'
+        }
+      ];
+      list.push(...this.$utils.getRoundCountList());
+      return list;
+    },
+    changeParallelPolicy(val) {
+      if (val && val == 'roundCount') {
+        if (this.$utils.isEmpty(this.roundCount)) {
+          this.roundCount = 64;
+        }
+      } else {
+        if (this.$utils.isEmpty(this.parallelCount)) {
+          this.parallelCount = 32;
+        }
+      }
     }
   },
   computed: {},
diff --git a/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue b/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
index 8b6597c8abab83d5114e2fb2fb029f69c549f47e..b0e7d56fc3a09aab4c5c239bcb8b52062d9c043b 100644
--- a/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
+++ b/src/views/pages/cmdb/ci/attrhandler/input/table-attr.vue
@@ -1,37 +1,39 @@
 <template>
   <div>
-    <div v-if="!(ciEntityData.tbodyList.length > 0 && !attrData.config.isMultiple)">
+    <div v-if="!(tbodyList.length > 0 && !attrData.config.isMultiple)">
       <a
         v-if="!attrData.config.mode || attrData.config.mode === 'r' || attrData.config.mode === 'rw'"
-        :class="disabled?'text-disabled':''"
+        :class="disabled ? 'text-disabled' : ''"
         href="javascript:void(0)"
         @click="selectCiEntity()"
-      ><i class="tsfont-check"></i>{{ $t('page.choose') }}</a>
+      >
+        <i class="tsfont-check"></i>
+        {{ $t('page.choose') }}
+      </a>
       <a
         v-if="allowBatchAdd && (attrData.config.mode === 'w' || attrData.config.mode === 'rw')"
-        :class="disabled?'text-disabled':''"
+        :class="disabled ? 'text-disabled' : ''"
         href="javascript:void(0)"
         @click="addCiEntity()"
-      ><i class="tsfont-plus"></i>{{ $t('page.add') }}</a>
-    </div>
-    <div v-if="ciEntityData && ciEntityData.tbodyList && ciEntityData.tbodyList.length > 0">
-      <TsTable
-        v-if="ciEntityData"
-        v-bind="ciEntityData"
-        :fixedHeader="false"
       >
+        <i class="tsfont-plus"></i>
+        {{ $t('page.add') }}
+      </a>
+    </div>
+    <div v-if="theadList.length > 0 && tbodyList.length > 0">
+      <TsTable :theadList="theadList" :tbodyList="tbodyList" :fixedHeader="false">
         <template slot="_type" slot-scope="{ row }">
           <Tag v-if="!row.id" color="success" type="border">{{ $t('term.cmdb.newcientity') }}</Tag>
         </template>
-        <template v-for="(head, index) in finalHeaderList" :slot="head.key" slot-scope="{ row }">
+        <template v-for="(head, index) in attrList" :slot="head.key" slot-scope="{ row }">
           <div v-if="head.key.indexOf('attr_') == 0 && row.attrEntityData" :key="index">
             <div v-if="row.attrEntityData[head.key]">
               <AttrViewer :handler="row.attrEntityData[head.key].type" :ciEntity="row" :attrEntity="row.attrEntityData[head.key]"></AttrViewer>
             </div>
           </div>
-          <div v-else-if="row.relEntityData[head.key] && row.relEntityData[head.key]['valueList']" :key="index">
+          <div v-else-if="row.relEntityData[head.key] && row.relEntityData[head.key]['valueList']" :key="'e' + index">
             <a
-              v-for="(relentity,rindex) in row.relEntityData[head.key]['valueList']"
+              v-for="(relentity, rindex) in row.relEntityData[head.key]['valueList']"
               :key="rindex"
               class="modal-tag href"
               href="javascript:void(0)"
@@ -52,7 +54,7 @@
                 class="tsfont-edittext"
                 @click="editCiEntity(row.uuid)"
               >编辑</li>-->
-              <li class="tsfont-trash-o" :class="disabled?'text-disabled':''" @click="deleteCiEntity(row)">删除</li>
+              <li class="tsfont-trash-o" :class="disabled ? 'text-disabled' : ''" @click="deleteCiEntity(row)">删除</li>
             </ul>
           </div>
         </template>
@@ -61,8 +63,8 @@
     <CiEntityChoose
       v-if="showSelectCiEntity"
       :ciId="attrData.targetCiId"
-      :isMultiple="attrData.config.isMultiple?true:false"
-      @close="showSelectCiEntity=false"
+      :isMultiple="attrData.config.isMultiple ? true : false"
+      @close="showSelectCiEntity = false"
       @confirm="getCheckCiEntity"
     ></CiEntityChoose>
   </div>
@@ -76,11 +78,11 @@ export default {
     CiEntityChoose: () => import('../../../cientity/cientity-choose.vue')
   },
   props: {
-    disabled: {type: Boolean, default: false},
-    allowBatchAdd: {type: Boolean, default: true},
-    attrData: {type: Object},
-    valueList: {type: Array},
-    attrEntity: {type: Object}
+    disabled: { type: Boolean, default: false },
+    allowBatchAdd: { type: Boolean, default: true },
+    attrData: { type: Object },
+    valueList: { type: Array },
+    attrEntity: { type: Object }
   },
   data() {
     return {
@@ -89,15 +91,13 @@ export default {
        暂存的选中值，包括选择值和添加值，最后会emit到外面的value中去，数据结构和cientity-list一致
       */
       tmpValueList: [],
-      ciEntityData: {theadList: [], tbodyList: []}
+      tbodyList: []
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
-    this.formatCiEntityData();
-  },
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -105,17 +105,6 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    formatCiEntityData() {
-      if (this.attrData.config.attrList) {
-        const theadList = [{key: '_type', title: ''}];
-        this.attrData.config.attrList.forEach(attr => {
-          theadList.push({key: 'attr_' + attr.id, title: attr.label});
-        });
-        //增加一列操作列，可以删除配置项
-        theadList.push({key: 'action'});
-        this.ciEntityData.theadList = theadList;
-      }
-    },
     selectCiEntity() {
       if (!this.disabled) {
         this.showSelectCiEntity = true;
@@ -153,52 +142,91 @@ export default {
       }
       this.dataList.splice(index, 1);
     },
-    valid() { //验证数据合法性
+    valid() {
+      //验证数据合法性
       return true;
     }
   },
   filter: {},
   computed: {
-    finalHeaderList: function() {
-      let finalList = [];
-      if (this.ciEntityData && this.ciEntityData.theadList && this.ciEntityData.theadList.length > 0) {
-        this.ciEntityData.theadList.forEach(element => {
-          if (element.key.indexOf('attr_') == 0 || element.key.indexOf('relto_') == 0 || element.key.indexOf('relfrom_') == 0) {
-            finalList.push(element);
+    theadList() {
+      return [{ key: '_type', title: '' }, ...this.attrList, { key: 'action' }];
+    },
+    attrList() {
+      const theadList = [];
+      if (this.attrData.config.attrList) {
+        this.attrData.config.attrList.forEach(attr => {
+          if (attr.isSelected) {
+            theadList.push({ key: 'attr_' + attr.id, title: attr.label });
           }
         });
       }
-      return finalList;
+      return theadList;
     }
   },
   watch: {
     valueList: {
       handler: function(val) {
         if (val && val.length > 0) {
+          //排序参照
+          const idSortList = [];
+
+          const newCiEntityList = [];
           //添加配置项
           const newCiEntityIdList = [];
           val.forEach(value => {
-            if (this.ciEntityData.tbodyList.length == 0 || !this.ciEntityData.tbodyList.some(cientity => (cientity.id && value.id && cientity.id === value.id) || (cientity.uuid && value.uuid && cientity.uuid === value.uuid))) {
-              if (typeof value == 'object') { //新添加的配置项
-                this.ciEntityData.tbodyList.push(value);
-              } else if (typeof value == 'string' || typeof value == 'number') {
-                newCiEntityIdList.push(value);
+            if (typeof value === 'object' && !newCiEntityList.some(cientity => (cientity.id && value.id && cientity.id === value.id) || (cientity.uuid && value.uuid && cientity.uuid === value.uuid))) {
+              //新添加的配置项
+              this.$delete(value, '_selected');
+              this.$delete(value, 'isSelected');
+              newCiEntityList.push(value);
+              if (value.id) {
+                idSortList.push({ id: value.id });
+              } else if (value.uuid) {
+                idSortList.push({ uuid: value.uuid });
               }
+            } else if (typeof value === 'number') {
+              newCiEntityIdList.push(value);
+              idSortList.push({ id: value });
             }
           });
-          if (newCiEntityIdList.length) {
-            this.$api.cmdb.cientity.getCiEntityByIdList(this.attrData.targetCiId, newCiEntityIdList).then(res => {
-              if (res.Return && res.Return.length > 0) {
-                res.Return.forEach(item => {
-                  this.ciEntityData.tbodyList.push(item);
+          if (newCiEntityIdList.length > 0) {
+            const attrList = [];
+            this.attrData.config.attrList.forEach(attr => {
+              if (attr.isSelected) {
+                attrList.push('attr_' + attr.id);
+              }
+            });
+            const searchParam = {
+              ciId: this.attrData.targetCiId,
+              idList: newCiEntityIdList,
+              showAttrRelList: attrList
+            };
+            this.$api.cmdb.cientity.searchCiEntity(searchParam).then(res => {
+              if (res.Return && res.Return.tbodyList && res.Return.tbodyList.length > 0) {
+                this.tbodyList = [...newCiEntityList, ...res.Return.tbodyList];
+
+                // 构建排序Map
+                const orderMap = new Map();
+                idSortList.forEach((item, idx) => {
+                  if (item.id !== undefined) orderMap.set(`id:${item.id}`, idx);
+                  if (item.uuid !== undefined) orderMap.set(`uuid:${item.uuid}`, idx);
+                });
+
+                // 排序
+                this.tbodyList.sort((a, b) => {
+                  // 按优先顺序查找对应key
+                  const aIdx = orderMap.get(`id:${a.id}`) ?? orderMap.get(`uuid:${a.uuid}`) ?? Infinity;
+                  const bIdx = orderMap.get(`id:${b.id}`) ?? orderMap.get(`uuid:${b.uuid}`) ?? Infinity;
+                  return aIdx - bIdx;
                 });
               }
             });
+          } else {
+            this.tbodyList = newCiEntityList;
           }
-          //删除配置项
-          this.ciEntityData.tbodyList = this.ciEntityData.tbodyList.filter(cientity => { return val.some(value => { return (cientity.id && value.id && cientity.id === value.id) || (cientity.uuid && value.uuid && cientity.uuid === value.uuid); }); });
         } else {
-          this.ciEntityData.tbodyList = [];
+          this.tbodyList = [];
         }
       },
       deep: true,
@@ -207,5 +235,4 @@ export default {
   }
 };
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/pages/cmdb/ci/attrhandler/view/table-attr.vue b/src/views/pages/cmdb/ci/attrhandler/view/table-attr.vue
index b85977c40552925e2874396f0a244a3e76747ea3..b88fdff0c27b8b584e57decf54347642cfd5695f 100644
--- a/src/views/pages/cmdb/ci/attrhandler/view/table-attr.vue
+++ b/src/views/pages/cmdb/ci/attrhandler/view/table-attr.vue
@@ -9,7 +9,7 @@
       >
         <span v-if="!ciEntity || !ciEntity.maxAttrEntityCount || ciEntity.maxAttrEntityCount > index" class="text-href">{{ value.name }}</span>
       </span>
-      <span v-if="valueList.length > ciEntity.maxAttrEntityCount" class="text-href tsfont-option-horizontal"></span>
+      <span v-if="valueList.length > ciEntity.maxAttrEntityCount" class="text-href tsfont-option-horizontal" @click="showMoreAttrEntity"></span>
     </div>
     <TsDialog
       v-if="isShow"
@@ -20,8 +20,9 @@
       <template v-slot>
         <div>
           <TsTable
-            v-if="tableData"
+            v-if="tableData && tableData.theadList && tableData.theadList.length > 0"
             v-bind="tableData"
+            :theadList="tableData.theadList.filter(d => d.key !== 'action')"
             :fixedHeader="false"
             @changeCurrent="changePage"
             @changePageSize="changePageSize"
@@ -32,7 +33,7 @@
                   <AttrViewer :handler="row.attrEntityData[head.key].type" :ciEntity="row" :attrEntity="row.attrEntityData[head.key]"></AttrViewer>
                 </div>
               </div>
-              <div v-else-if="row.relEntityData[head.key] && row.relEntityData[head.key]['valueList']" :key="index">
+              <div v-else-if="row.relEntityData[head.key] && row.relEntityData[head.key]['valueList']" :key="'e' + index">
                 <a
                   v-for="(relentity, rindex) in row.relEntityData[head.key]['valueList']"
                   :key="rindex"
@@ -69,8 +70,8 @@ export default {
         type: 'modal',
         maskClose: true,
         isShow: false,
-        title: '数据明细',
-        width: 'medium',
+        title: this.$t('term.cmdb.datadetail'),
+        width: 'large',
         hasFooter: false
       },
       tableData: {},
diff --git a/src/views/pages/cmdb/group/group-edit.vue b/src/views/pages/cmdb/group/group-edit.vue
index 7fc294152c49d644894e9354a42f64fff4e9feb4..56423578d093f33540ba60609cf144dd766684a7 100644
--- a/src/views/pages/cmdb/group/group-edit.vue
+++ b/src/views/pages/cmdb/group/group-edit.vue
@@ -79,8 +79,13 @@
                             </Col>
                             <Col v-if="isNeedAttrValue(conItem)" span="8">
                               <TsFormSelect
-                                v-if="conItem.type === 'global' && getGlobalAttrById(conItem.id)"
-                                v-bind="getGlobalSelectConfig(conItem.id)"
+                                v-if="conItem.type === 'global' && conItem.id"
+                                dynamicUrl="/api/rest/cmdb/globalattritem/search"
+                                :params="{ attrId: conItem.id ? conItem.id.split('global_')[1] : '' }"
+                                valueName="id"
+                                textName="value"
+                                border="border"
+                                multiple
                                 :value="conItem.valueList"
                                 transfer
                                 @change="
@@ -428,7 +433,7 @@ export default {
         const attrList = await this.getAttrByCiId(ciId);
         const relList = await this.getRelByCiId(ciId);
         const globalAttrList = await this.getGlobalAttrByCiId(ciId);
-        globalAttrList.forEach(attr => {
+        globalAttrList.forEach((attr) => {
           elementList.push({
             typeText: this.$t('term.cmdb.globalattr'),
             type: 'global',
@@ -574,11 +579,6 @@ export default {
         return this.ciMap['ci' + ciId];
       };
     },
-    getGlobalAttrById() {
-      return attrId => {
-        return this.globalMap[attrId];
-      };
-    },
     getAttrById() {
       return attrId => {
         return this.attrMap[attrId];
@@ -589,20 +589,6 @@ export default {
         return this.relMap[relId];
       };
     },
-    getGlobalSelectConfig() {
-      return id => {
-        const globalAttr = this.getGlobalAttrById(id);
-        if (globalAttr) {
-          return {
-            border: 'border',
-            multiple: true,
-            dataList: globalAttr.itemList,
-            textName: 'value',
-            valueName: 'id'
-          };
-        }
-      };
-    },
     getRelSelectConfig() {
       return id => {
         const rel = this.getRelById(id);
diff --git a/src/views/pages/common/preview.vue b/src/views/pages/common/preview.vue
index c438d038e32e8dfdf410770696313bdeb0f5efed..2dcad4f1cd84af6445767d49221e3f84fe187ca8 100644
--- a/src/views/pages/common/preview.vue
+++ b/src/views/pages/common/preview.vue
@@ -47,7 +47,7 @@
   </div>
 </template>
 <script>
-let xlsx = require('xlsx'); // excel表格
+import ExcelJS from 'exceljs';
 let docx = require('docx-preview'); // word预览
 export default {
   name: '',
@@ -154,15 +154,37 @@ export default {
         this.loadingShow = false;
       });
     },
-    renderExcel() {
-      if (this.excelData) {
-        let workbook = xlsx.read(new Uint8Array(this.excelData), {type: 'array'}); // 解析数据
-        this.tableNums = workbook.SheetNames; // workbook.sheetNames存这每个工作表的名字
-        if (workbook && !this.$utils.isEmpty(workbook.SheetNames)) {
-          let worksheet = workbook.Sheets[workbook.SheetNames[this.tableIndex]];
-          this.tableData = xlsx.utils.sheet_to_html(worksheet); // 渲染
+    async renderExcel() {
+      if (!this.excelData) return;
+      const workbook = new ExcelJS.Workbook();
+      await workbook.xlsx.load(this.excelData);
+      this.tableNums = workbook.worksheets.map(ws => ws.name);
+      const worksheet = workbook.worksheets[this.tableIndex];
+      if (!worksheet) return;
+      // 获取第一行列数，用于列单元格补全
+      const firstRow = worksheet.getRow(1);
+      const maxColCount = firstRow.cellCount;
+      let html = '<table>';
+      worksheet.eachRow({ includeEmpty: true }, (row, rowNumber) => {
+        html += '<tr>';
+        for (let colIndex = 1; colIndex <= maxColCount; colIndex++) {
+          const cell = row.getCell(colIndex);
+          let value = '';
+          if (cell.value) {
+            if (cell.value.richText) {
+              value = cell.value.richText.map(t => t?.text).join('');
+            } else if (cell.value.text) {
+              value = cell.value.text;
+            } else {
+              value = cell.value;
+            }
+          }
+          html += `<td>${value ?? ''}</td>`;
         }
-      }
+        html += '</tr>';
+      });
+      html += '</table>';
+      this.tableData = html;
     },
     isJson(str) {
       if (typeof str == 'string') {
diff --git a/src/views/pages/dashboard/widget/charts/original/bar-widget.vue b/src/views/pages/dashboard/widget/charts/original/bar-widget.vue
index e3fc36d48f9f1d122ed3452c774c00b8f6d941ce..8ab23bc98721a99f79d5666b71ab4ce090fcf818 100644
--- a/src/views/pages/dashboard/widget/charts/original/bar-widget.vue
+++ b/src/views/pages/dashboard/widget/charts/original/bar-widget.vue
@@ -90,6 +90,8 @@ export default {
     finalData() {
       const data = [];
       if (this.data && this.data.length > 0) {
+        //时间排序
+        this.data = this.data.sort((a, b) => this.changeString(b.yField) - this.changeString(a.yField));
         //数据合并汇聚
         this.data.forEach(d => {
           const dd = data.find(dd => dd.yField == d.yField);
diff --git a/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue b/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue
index 70b5d68447ca113d7f452cbd375c019e415068e3..2432ed49a7e0e7d4772bf72c6ff0bb061d88f520 100644
--- a/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue
+++ b/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue
@@ -40,7 +40,7 @@ export default {
     createRandomData() {
       this.data = [];
       for (var i = 1; i <= 1; i++) {
-        this.data.push({ 
+        this.data.push({
           title: '完成度',
           ranges: [100],
           measures: [80],
@@ -73,12 +73,13 @@ export default {
       if (this.data && this.data.length > 0) {
         //数据合并汇聚
         this.data.forEach(d => {
-          const dd = data.find(dd => dd.colorField == d.colorField);
-          if (dd) {
-            dd.angleField += d.angleField;
-          } else {
-            data.push(d);
+          if (d.measure != null) {
+            d.measures = [d.measure];
           }
+          if (d.range != null) {
+            d.ranges = [d.range];
+          }
+          data.push(d);
         });
       }
       return data;
diff --git a/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue b/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue
index 934cb5165841b11a10a206ab11caf8d5cbd89384..cfbdf1e2c37c3b903312cd3836d36ad443a39691 100644
--- a/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue
+++ b/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue
@@ -72,6 +72,8 @@ export default {
     finalData() {
       let data = [];
       if (this.data && this.data.length > 0) {
+        //时间排序
+        this.data = this.data.sort((a, b) => this.changeString(b.yField) - this.changeString(a.yField));
         //数据合并汇聚
         this.data.forEach(d => {
           const dd = data.find(dd => dd.yField == d.yField && dd.seriesField == d.seriesField);
diff --git a/src/views/pages/dashboard/widget/charts/widget-base.js b/src/views/pages/dashboard/widget/charts/widget-base.js
index cdc71fd09705d3a3da888f893f6e90d934375674..1dccbd4064c17c6efbafd726670f7d3ba846ce8a 100644
--- a/src/views/pages/dashboard/widget/charts/widget-base.js
+++ b/src/views/pages/dashboard/widget/charts/widget-base.js
@@ -75,7 +75,7 @@ export const WidgetBase = {
             data.push(d);
           });
         }
-        this.data = data;
+        this.data = data.sort((a, b) => this.changeString(a.xField) - this.changeString(b.xField));
         if (!isFirstGetData) {
           //第一次加载由于组件还没加载完毕，所以不需要调用changeData
           this.changeData();
@@ -90,6 +90,21 @@ export const WidgetBase = {
           }, this.widget.dataInterval * 1000);
         }
       });
+    },
+    changeString(a) { //字符串转时间戳
+      if (a) {
+        if (this.$utils.isValidDateTime(a)) {
+          return new Date(a).getTime();
+        } else if (this.$utils.isValidTimeString(a)) {
+          const pad = num => num.toString().padStart(2, '0');
+          const [h1, m1, s1 = '00'] = a.split(':').map(pad);
+          return `${h1}${m1}${s1}`; 
+        } else if (typeof a === 'string') {
+          return a.charCodeAt(0);
+        }
+        return a;
+      }
+      return a;
     }
   },
   beforeDestroy() {
diff --git a/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue b/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue
index 1c5c1f4b8bff5d429798fcaef784b6fa2b9f05f6..f1973633c646808126959516eb880da9594994fd 100644
--- a/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue
+++ b/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue
@@ -50,7 +50,7 @@
       <label class="ivu-form-item-label overflow">{{ $t('term.report.axis.xaxisshow') }}</label>
       <div class="ivu-form-item-content">
         <TsFormSwitch
-          :value="config.xAxis"
+          :value="config.xAxis ? true : false"
           :true-value="true"
           :false-value="false"
           @change="
@@ -103,7 +103,7 @@
     </div>
     <TsFormItem label="辅助线" labelPosition="top">
       <TsFormSwitch
-        :value="!config.yAxis?true:typeof config.yAxis === 'boolean' ? true : config.yAxis.grid.visible?true:false"
+        :value="!config.yAxis?true:typeof config.yAxis === 'boolean' ? true : (config.yAxis.grid && config.yAxis.grid.visible)?true:false"
         :true-value="true"
         :false-value="false"
         @change="
diff --git a/src/views/pages/dashboard/widget/define/bullet.js b/src/views/pages/dashboard/widget/define/bullet.js
index 9a343f5d1e41d8beba56d64bce3321ab096c117b..9c726f330df75e47fdc7f6933acd2979282f20e5 100644
--- a/src/views/pages/dashboard/widget/define/bullet.js
+++ b/src/views/pages/dashboard/widget/define/bullet.js
@@ -13,21 +13,22 @@ export default {
   needData: true,
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }],
   fields: [
-    { name: 'measureField', label: '当前值', type: 'number', isRequired: true },
-    { name: 'ranges', label: '最大值', type: 'number', isRequired: true },
-    { name: 'targetField', label: '目标值', type: 'number', isRequired: true }
+    { name: 'title', label: '标题', type: 'text', isRequired: true },
+    { name: 'measure', label: '当前值', type: 'number', isRequired: true },
+    { name: 'range', label: '最大值', type: 'number', isRequired: true },
+    { name: 'target', label: '目标值', type: 'number', isRequired: true }
   ],
   config: {
-    legend: { visible: true, position: 'bottom' }, 
+    legend: { visible: true, position: 'bottom' },
     layout: 'horizontal',
-    color: {range: '', measure: '', target: ''}, 
-    yAxis: { 
-      label: { 
-        autoHide: true, 
-        autoEllipsis: true 
-      }, 
-      title: { text: '' } 
-    }, 
-    xAxis: { title: { text: '' } } 
+    color: { range: '', measure: '', target: '' },
+    yAxis: {
+      label: {
+        autoHide: true,
+        autoEllipsis: true
+      },
+      title: { text: '' }
+    },
+    xAxis: { title: { text: '' } }
   }
 };
diff --git a/src/views/pages/deploy/application-config/config/app/app-config-status.vue b/src/views/pages/deploy/application-config/config/app/app-config-status.vue
index 7fe72169da484e75821db8fd656f0a0d0b6fc58a..cc8ec4eecf68071d59ab2b6d8ae9072782c2e3b4 100644
--- a/src/views/pages/deploy/application-config/config/app/app-config-status.vue
+++ b/src/views/pages/deploy/application-config/config/app/app-config-status.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Poptip placement="bottom-start" transfer>
+    <Poptip placement="bottom-start" transfer @on-popper-show="getTree()">
       <span class="tsfont-layer">{{ $t('term.deploy.hierarchyswitching') }}</span>
       <div slot="content">
         <Loading :loadingShow="loadingShow" type="fix"></Loading>
@@ -73,13 +73,12 @@ export default {
   data() {
     return {
       appConfig: null,
-      loadingShow: true
+      loadingShow: true,
+      isFirst: true
     };
   },
   beforeCreate() {},
-  created() {
-    this.getTree();
-  },
+  created() {},
   beforeMount() {},
   mounted() {},
   beforeUpdate() {},
@@ -90,6 +89,9 @@ export default {
   destroyed() {},
   methods: {
     getTree() {
+      if (!this.isFirst) {
+        return;
+      }
       this.$api.deploy.applicationConfig.getAppAppmoduleEnvTree({ appSystemId: this.appSystemId }).then(res => {
         if (res && res.Status == 'OK') {
           this.appConfig = res.Return;
@@ -107,6 +109,7 @@ export default {
         }
       }).finally(() => {
         this.loadingShow = false;
+        this.isFirst = false;
       });
     },
     toggleShow(config) {
diff --git a/src/views/pages/framework/config.js b/src/views/pages/framework/config.js
index b117dc95a2b72bba1a463c48d4a50123744d401b..de5bb2bba9ec0258a8b03180a07a70d8bae1587e 100644
--- a/src/views/pages/framework/config.js
+++ b/src/views/pages/framework/config.js
@@ -1,14 +1,14 @@
 import {$t} from '@/resources/init.js';
-export const config = { 
-  module: 'framework', 
-  menuType: { 
-    user: $t('router.framework.user'), 
-    message: $t('router.framework.message'),  
-    integration: $t('router.framework.integration'), 
-    notify: $t('router.framework.notify'), 
-    job: $t('router.framework.job'), 
-    others: $t('router.framework.others'), 
-    healthcheck: $t('router.framework.healthcheck'), 
-    license: $t('router.framework.license') 
-  } 
+export const config = {
+  module: 'framework',
+  menuType: {
+    user: $t('router.framework.user'),
+    message: $t('router.framework.message'),
+    integration: $t('router.framework.integration'),
+    notify: $t('router.framework.notify'),
+    agent: $t('router.framework.agent'),
+    others: $t('router.framework.others'),
+    healthcheck: $t('router.framework.healthcheck'),
+    license: $t('router.framework.license')
+  }
 };
diff --git a/src/views/pages/framework/integration/integration-audit.vue b/src/views/pages/framework/integration/integration-audit.vue
index ca3e8690ba1115c00c7118acf996a2c433a4c561..abe618da2a254354e622bd4aaa9a165ead628974 100644
--- a/src/views/pages/framework/integration/integration-audit.vue
+++ b/src/views/pages/framework/integration/integration-audit.vue
@@ -50,6 +50,13 @@
             @changeCurrent="searchAudit"
             @changePageSize="pageSize => searchAudit(1, pageSize)"
           >
+            <template slot="userName" slot-scope="{ row }">
+              <UserCard
+                v-if="row.userUuid"
+                :uuid="row.userUuid"
+                :hideAvatar="true"
+              ></UserCard>
+            </template>
             <template slot="startTime" slot-scope="{ row }">
               {{ row.startTime | formatDate }}
             </template>
@@ -115,6 +122,7 @@ export default {
   components: {
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     IntegrationAuditDetail: () => import('./integration-audit-detail.vue'),
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
     UserSelect,
     TsFormSelect,
     TsFormInput,
diff --git a/src/views/pages/framework/log/log-manage.vue b/src/views/pages/framework/log/log-manage.vue
index 811d4c89763cb6ca2fa5428fb4ca219664317540..39ecc705e540140f1323c7c6908ebc56cc4900dc 100644
--- a/src/views/pages/framework/log/log-manage.vue
+++ b/src/views/pages/framework/log/log-manage.vue
@@ -42,6 +42,7 @@
         <div ref="textContainer" style="overflow: auto; white-space: pre-wrap">
           <div 
             v-for="(line, index) in logLines"
+            :id="'line_' + index"
             :key="index"
             :class="getLineClass(line)"
           >
@@ -170,6 +171,11 @@ export default {
             if (isRefresh) {
               this.$Message.success(this.$t('message.refreshsuccess'));
             }
+            this.$nextTick(() => {
+              if (!this.$utils.isEmpty(this.logLines)) {
+                this.$utils.jumpTo('#line_' + (this.logLines.length - 1), 'smooth', this.$refs['textContainer']);
+              }
+            });
           } else {
             if (isRefresh) {
               this.$Message.success(this.$t('message.nothingchange'));
diff --git a/src/views/pages/framework/matrix/matrix-overview.vue b/src/views/pages/framework/matrix/matrix-overview.vue
index 9e3c7b4de6b56c0909dd0a497fcc4d3078a06ccd..108eb321adc63cf7078a283b125203a1f7feac51 100644
--- a/src/views/pages/framework/matrix/matrix-overview.vue
+++ b/src/views/pages/framework/matrix/matrix-overview.vue
@@ -178,8 +178,7 @@
       :has-footer="true"
       :title="isCopy ? $t('dialog.title.copytarget',{'target':$t('page.matrix')}) : $t('dialog.title.addtarget',{'target':$t('page.matrix')})"
       width="medium"
-      @on-close="atrixFormDialog = false"
-      @on-ok="okAddMatrix"
+      @on-close="closeMatrixDialog"
     >
       <TsForm ref="addAtrixForm" :item-list="addAtrixForm" type="type">
         <template v-slot:integrationUuid>
@@ -314,6 +313,10 @@
           </div>
         </template>
       </TsForm>
+      <template v-slot:footer>
+        <Button @click="closeMatrixDialog()">{{ $t('page.cancel') }}</Button>
+        <Button type="primary" :loading="matrixLoading" @click="okAddMatrix()">{{ $t('page.confirm') }}</Button>
+      </template>
     </TsDialog>
   </div>
 </template>
@@ -563,7 +566,8 @@ export default {
       currentPage: 1, //当前页数
       pageCount: 1, //总页数
       modeType: 'block', //显示方式
-      cmdbCiEntityAttrList: []
+      cmdbCiEntityAttrList: [],
+      matrixLoading: false
     };
   },
   beforeCreate() {},
@@ -906,7 +910,7 @@ export default {
           attributeMappingList: data.attributeMappingList
         };
       }
-
+      this.matrixLoading = true;
       if (this.isCopy) {
         delete data.type;
         data.uuid = this.uuid;
@@ -918,6 +922,8 @@ export default {
               this.$Message.success(this.$t('message.copysuccess'));
               this.atrixFormDialog = false;
             }
+          }).finally(() => {
+            this.matrixLoading = false;
           });
       } else {
         this.$api.framework.matrix
@@ -946,6 +952,8 @@ export default {
                 query: query
               });
             }
+          }).finally(() => {
+            this.matrixLoading = false;
           });
       }
     },
@@ -1141,6 +1149,9 @@ export default {
       } else if (valueConfig.type === 'cmdbcustomview') {
         this.$set(conItem, 'uniqueIdentifier', selectItem.defaultUniqueIdentifier);
       }
+    },
+    closeMatrixDialog() {
+      this.atrixFormDialog = false;
     }
   },
   filter: {},
diff --git a/src/views/pages/framework/mq/mq-overview.vue b/src/views/pages/framework/mq/mq-overview.vue
index d8058305163273d74a7202f8f9b1b847506e75b1..780c74d5a6c8446041e238e0be8363466b8d1089 100644
--- a/src/views/pages/framework/mq/mq-overview.vue
+++ b/src/views/pages/framework/mq/mq-overview.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mt-md">
-    <TsContain>
-      <template v-slot:topLeft>
+    <TsContain hideHeader>
+      <template v-slot:content>
         <Tabs
           v-model="currentTab"
           :animated="false"
@@ -14,8 +14,6 @@
           >
           </TabPane>
         </Tabs>
-      </template>
-      <template v-slot:content>
         <div v-if="currentTab === 'subscribe'">
           <MqSubscribeList></MqSubscribeList>
         </div>
diff --git a/src/views/pages/framework/notifyconfig/mailserver-edit.vue b/src/views/pages/framework/notifyconfig/mailserver-edit.vue
index 1006513085d0988633d5b359bca96897e146c284..9301c1405473bb8c871e28c9b90c87e73accafa1 100644
--- a/src/views/pages/framework/notifyconfig/mailserver-edit.vue
+++ b/src/views/pages/framework/notifyconfig/mailserver-edit.vue
@@ -1,10 +1,6 @@
 <template>
   <div>
     <TsDialog v-bind="editDialogSetting" @on-close="close">
-      <template v-slot:header>
-        <div v-if="id">{{ $t('page.edit') }}</div>
-        <div v-if="!id">{{ $t('page.add') }}</div>
-      </template>
       <div>
         <TsForm ref="form" :itemList="formData"></TsForm>
       </div>
@@ -16,7 +12,7 @@
           class="mr-md"
           @click="test()"
         >{{ $t('page.test') }}</Button>
-        <Button type="primary" @click="submit()">{{ $t('page.save') }} </Button>
+        <Button type="primary" @click="submit()">{{ $t('page.save') }}</Button>
       </template>
     </TsDialog>
     <TsDialog
@@ -124,7 +120,8 @@ export default {
       editDialogSetting: {
         type: 'modal',
         isShow: true,
-        width: 'small'
+        width: 'small',
+        title: this.id ? this.$t('dialog.title.edittarget', { target: this.$t('page.mailserver') }) : this.$t('dialog.title.addtarget', { target: this.$t('page.mailserver') })
       },
       isShow: false,
       setting: {
@@ -183,7 +180,7 @@ export default {
       }
     },
     getData() {
-      this.$api.framework.mailserver.get({id: this.id}).then(res => {
+      this.$api.framework.mailserver.get({ id: this.id }).then(res => {
         if (res.Status == 'OK') {
           const obj = res.Return;
           if (obj) {
diff --git a/src/views/pages/framework/notifyconfig/mailserver-manage.vue b/src/views/pages/framework/notifyconfig/mailserver-manage.vue
index b577982e18825069e145b0f7774c6a78dac6171f..9e3f8312b90de19a7e8df837237e6156f2b387de 100644
--- a/src/views/pages/framework/notifyconfig/mailserver-manage.vue
+++ b/src/views/pages/framework/notifyconfig/mailserver-manage.vue
@@ -1,64 +1,48 @@
 <template>
   <div>
-    <TsContain border="border">
-      <template slot="topLeft">
-        <div class="action-group">
-          <span class="action-item tsfont-plus" @click="addMailServer()">{{ $t('page.add') }}</span>
+    <div class="action-group">
+      <span class="action-item tsfont-plus" @click="addMailServer()">{{ $t('page.add') }}</span>
+    </div>
+    <TsTable v-if="true" :theadList="theadList" v-bind="tableData">
+      <template slot="isActive" slot-scope="{ row }">
+        <i-switch
+          :key="row.token"
+          v-model="row.isActive"
+          :true-value="1"
+          :false-value="0"
+          @on-change="handleIsActiveSwitchChange(row)"
+        ></i-switch>
+      </template>
+      <template slot="isDefault" slot-scope="{ row }">
+        <i-switch
+          :key="row.token"
+          v-model="row.isDefault"
+          :true-value="1"
+          :false-value="0"
+          @on-change="handleIsDefaultSwitchChange(row)"
+        ></i-switch>
+      </template>
+      <template slot="sslEnable" slot-scope="{ row }">
+        <span v-if="row.sslEnable == 'true'" class="text-success">{{ $t('page.yes') }}</span>
+        <span v-else class="text-grey">{{ $t('page.no') }}</span>
+      </template>
+      <template slot="action" slot-scope="{ row }">
+        <div class="tstable-action">
+          <ul class="tstable-action-ul">
+            <li class="tsfont-edit" @click="editMailServer(row)">{{ $t('page.edit') }}</li>
+            <li v-if="row.isDefault == 0" class="tsfont-trash-o" @click="deleteMailServer(row)">{{ $t('page.delete') }}</li>
+          </ul>
         </div>
       </template>
-      <div slot="content" ref="maintable">
-        <TsTable 
-          v-if="true"
-          :theadList="theadList"
-          v-bind="tableData"
-        >
-          <template slot="isActive" slot-scope="{ row }">
-            <i-switch
-              :key="row.token"
-              v-model="row.isActive"
-              :true-value="1"
-              :false-value="0"
-              @on-change="handleIsActiveSwitchChange(row)"
-            ></i-switch>
-          </template>
-          <template slot="isDefault" slot-scope="{ row }">
-            <i-switch
-              :key="row.token"
-              v-model="row.isDefault"
-              :true-value="1"
-              :false-value="0"
-              @on-change="handleIsDefaultSwitchChange(row)"
-            ></i-switch>
-          </template>
-          <template slot="sslEnable" slot-scope="{ row }">
-            <span v-if="row.sslEnable == 'true'" class="text-success">{{ $t('page.yes') }}</span>
-            <span v-else class="text-grey">{{ $t('page.no') }}</span>
-          </template>
-          <template slot="action" slot-scope="{ row }">
-            <div class="tstable-action">
-              <ul class="tstable-action-ul">
-                <li class="tsfont-edit" @click="editMailServer(row)">{{ $t('page.edit') }}</li>
-                <li v-if="row.isDefault == 0" class="tsfont-trash-o" @click="deleteMailServer(row)">{{ $t('page.delete') }}</li>
-              </ul>
-            </div>
-          </template>
-        </TsTable>
-      </div>
-    </TsContain>
-    <MailServerEdit 
-      v-if="isShowMailServerEdit"
-      :id="editId"
-      @close="closeMailServerEdit"
-    ></MailserverEdit>
+    </TsTable>
+    <MailServerEdit v-if="isShowMailServerEdit" :id="editId" @close="closeMailServerEdit"></MailServerEdit>
   </div>
 </template>
 <script>
-
 export default {
   name: '',
   components: {
     MailServerEdit: () => import('./mailserver-edit.vue'),
-    TsContain: () => import('@/resources/components/TsContain/TsContain.vue'),
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
   },
   props: {},
@@ -144,7 +128,7 @@ export default {
       }
     },
     deleteMailServer(row) {
-      this.$api.framework.mailserver.deleteMailServer({id: row.id}).then(res => {
+      this.$api.framework.mailserver.deleteMailServer({ id: row.id }).then(res => {
         if (res.Status == 'OK') {
           this.$Message.success(this.$t('message.deletesuccess'));
           this.searchMailServerList();
@@ -185,5 +169,4 @@ export default {
   watch: {}
 };
 </script>
-<style lang="less">
-</style>
+<style lang="less"></style>
diff --git a/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue b/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue
index 781f60fcf2d63d55199dc1b5f9d1875baae07fb4..825f53c01b81bf82e36ec00f99fbaf1305fe52e4 100644
--- a/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue
+++ b/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue
@@ -1,18 +1,16 @@
 <template>
-  <div>
-    <TsContain>
-      <template v-slot:topLeft>
+  <div class="mt-md">
+    <TsContain hideHeader>
+      <template v-slot:content>
         <Tabs v-model="currentTab" :animated="false">
           <TabPane :label="$t('page.mail')" name="mail"></TabPane>
           <TabPane :label="$t('page.wechat')" name="wechat"></TabPane>
         </Tabs>
-      </template>
-      <template v-slot:content>
         <div>
-          <div v-if="currentTab == 'mail'" class="padding">
+          <div v-if="currentTab == 'mail'">
             <MailServerManage></MailServerManage>
           </div>
-          <div v-if="currentTab == 'wechat'" class="padding">
+          <div v-if="currentTab == 'wechat'">
             <WechatEdit></WechatEdit>
           </div>
         </div>
diff --git a/src/views/pages/framework/notifytactics/notifytactics-overview.vue b/src/views/pages/framework/notifytactics/notifytactics-overview.vue
index cedfb10fa6a8c499a6d40c29f67293f82126e99d..77ce57a8556fe9cc2501fd9463c366afc532ed8c 100644
--- a/src/views/pages/framework/notifytactics/notifytactics-overview.vue
+++ b/src/views/pages/framework/notifytactics/notifytactics-overview.vue
@@ -1,10 +1,9 @@
 <template>
-  <div class="notifytactics-overview">
+  <div class="notifytactics-overview mt-md">
     <TsContain v-if="handlerConfig" hideHeader>
       <div slot="content">
         <Tabs
           :value="handlerConfig.value"
-          class="block-tabs"
           :animated="false"
           name="tab1"
           @on-click="changeTab"
@@ -16,10 +15,10 @@
             :name="tab.value"
             tab="tab1"
           >
-            <div v-if="tab.children && tab.children.length > 0" class="padding">
+            <div v-if="tab.children && tab.children.length > 0" class="mt-md">
               <Tabs
                 v-model="handler"
-                class="block-tabs2"
+                class="block-tabs"
                 :animated="false"
                 name="tab2"
                 @on-click="changeHandler"
@@ -30,8 +29,7 @@
                   :label="subtab.text"
                   :name="subtab.value"
                   tab="tab2"
-                >
-                </TabPane>
+                ></TabPane>
                 <div class="notify-card padding">
                   <Loading :loadingShow="loadingShow" type="fix"></Loading>
                   <div v-if="isShow" class="search-box pb-md pt-md">
@@ -43,10 +41,7 @@
                       <span v-else class="action-item active" @click="setDefaultPolicy">{{ $t('page.clicksetting') }}</span>
                     </div>
                     <div class="search-right input-border">
-                      <InputSearcher
-                        v-model="keyword"
-                        @change="search(1)"
-                      ></InputSearcher>
+                      <InputSearcher v-model="keyword" @change="search(1)"></InputSearcher>
                     </div>
                   </div>
                   <div class="notifytactics-card">
@@ -72,7 +67,7 @@
                           </div>
                           <div class="text-grey des-content">
                             <UserCard v-bind="row.lcuVo" hideAvatar class="mr-xs"></UserCard>
-                            <span class="m-userCard"> {{ row.lcd | formatDate }} {{ row.actionType }}</span>
+                            <span class="m-userCard">{{ row.lcd | formatDate }} {{ row.actionType }}</span>
                           </div>
                         </div>
                       </template>
@@ -121,11 +116,7 @@
       @on-ok="saveDefaultPolicy"
     >
       <TsFormItem label="策略">
-        <TsFormSelect
-          ref="defaultPolicyFormSelect"
-          v-model="defaultPolicyFormSelectValue"
-          v-bind="defaultPolicyFormSelect"
-        ></TsFormSelect>
+        <TsFormSelect ref="defaultPolicyFormSelect" v-model="defaultPolicyFormSelectValue" v-bind="defaultPolicyFormSelect"></TsFormSelect>
       </TsFormItem>
     </TsDialog>
   </div>
@@ -173,13 +164,17 @@ export default {
           maxlength: 50,
           width: '100%',
           label: this.$t('page.name'),
-          validateList: ['required', 'name-special', {
-            name: 'searchUrl',
-            url: 'api/rest/notify/policy/save',
-            params: (value, rule) => {
-              rule.url = this.isCopy ? 'api/rest/notify/policy/copy' : 'api/rest/notify/policy/save';
+          validateList: [
+            'required',
+            'name-special',
+            {
+              name: 'searchUrl',
+              url: 'api/rest/notify/policy/save',
+              params: (value, rule) => {
+                rule.url = this.isCopy ? 'api/rest/notify/policy/copy' : 'api/rest/notify/policy/save';
+              }
             }
-          }]
+          ]
         }
       ],
       defaultPolicyId: null,
@@ -200,7 +195,7 @@ export default {
         textName: 'name',
         search: true,
         transfer: true,
-        onChangelabel: (text) => {
+        onChangelabel: text => {
           this.defaultPolicyFormSelectText = text;
         }
       }
@@ -210,7 +205,7 @@ export default {
   created() {},
   beforeMount() {},
   mounted() {
-    let {addNotify = false} = this.$route.query || {};
+    let { addNotify = false } = this.$route.query || {};
     if (addNotify) {
       this.tacticsDialog = true;
     }
@@ -240,9 +235,7 @@ export default {
             if (_this.handler) {
               handlerList.forEach(item => {
                 if (item.children && item.children.length > 0) {
-                  let newObj = item.children.find(d =>
-                    d.value == _this.handler
-                  );
+                  let newObj = item.children.find(d => d.value == _this.handler);
                   item.children.forEach(j => {
                     if (j.value == _this.handler && item.value == 'framework') {
                       if (j.isAllowMultiPolicy == 0) {
@@ -315,8 +308,8 @@ export default {
           if (this.isShow) {
             this.tacticsData.cardList.map(v => {
               v.btnList = [
-                {name: this.$t('page.reference'), value: 'ReferenceSelect', icon: '', type: 'ReferenceSelect', calleeType: 'notifypolicy', key: 'id'},
-                {name: this.$t('page.delete'), value: 'del', type: 'del', icon: 'tsfont-trash-o', disable: true, text: this.$t('message.framework.notdelformtip'), key: 'referenceCount'},
+                { name: this.$t('page.reference'), value: 'ReferenceSelect', icon: '', type: 'ReferenceSelect', calleeType: 'notifypolicy', key: 'id' },
+                { name: this.$t('page.delete'), value: 'del', type: 'del', icon: 'tsfont-trash-o', disable: true, text: this.$t('message.framework.notdelformtip'), key: 'referenceCount' },
                 {
                   name: this.$t('term.framework.multi'),
                   value: 'dropdown',
@@ -332,8 +325,8 @@ export default {
           } else {
             this.tacticsData.cardList.map(v => {
               v.btnList = [
-                {name: this.$t('page.reference'), value: 'ReferenceSelect', icon: '', type: 'ReferenceSelect', calleeType: 'notifypolicy', key: 'id'},
-                {name: this.$t('page.delete'), value: 'del', type: 'del', icon: 'tsfont-trash-o', disable: true, text: this.$t('message.framework.notdelformtip'), key: 'referenceCount'}
+                { name: this.$t('page.reference'), value: 'ReferenceSelect', icon: '', type: 'ReferenceSelect', calleeType: 'notifypolicy', key: 'id' },
+                { name: this.$t('page.delete'), value: 'del', type: 'del', icon: 'tsfont-trash-o', disable: true, text: this.$t('message.framework.notdelformtip'), key: 'referenceCount' }
               ];
             });
           }
@@ -431,7 +424,7 @@ export default {
       }
       this.$createDialog({
         title: this.$t('dialog.title.deleteconfirm'),
-        content: this.$t('dialog.content.deleteconfirm', {target: obj.name}),
+        content: this.$t('dialog.content.deleteconfirm', { target: obj.name }),
         btnType: 'error',
         'on-ok': vnode => {
           let data = {
@@ -497,7 +490,9 @@ export default {
       this.$addHistoryData('handler', val);
       let handlerConfig = null;
       this.handlerList.forEach(item => {
-        if (item.value == val) { handlerConfig = item; }
+        if (item.value == val) {
+          handlerConfig = item;
+        }
       });
       if (val == 'framework') {
         this.frameworkShow = false;
@@ -525,7 +520,6 @@ export default {
 
 <style lang="less" scoped>
 .notifytactics-overview {
-  padding-top: 16px;
   .tscontain-container {
     .tscontain-header {
       border: none;
@@ -537,16 +531,16 @@ export default {
       justify-content: space-between;
       align-items: center;
       .search-right {
-       width: 300px;
+        width: 300px;
       }
     }
     .notifytactics-card {
       .overvivew-main {
-          cursor: pointer;
-          .top-typename {
-            font-size: 13px;
-          }
+        cursor: pointer;
+        .top-typename {
+          font-size: 13px;
         }
+      }
       .action-item {
         width: 100%;
       }
diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js
index 7e8531f34fa710ce8643c4d3826f967666da03af..5fe2f3330336f4df5b9d7358a2c460ff47ad1a0c 100644
--- a/src/views/pages/framework/router.js
+++ b/src/views/pages/framework/router.js
@@ -58,10 +58,10 @@ const databaseViewManage = () => import('./databaseview/databaseview-manage.vue'
 const tenantConfigManage = () => import('./tenantconfig/tenantconfig-manage.vue'); // 租户配置信息管理
 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');//数据库变更记录
-const logManage = () => import('./log/log-manage.vue');//查看日志
+const regionManage = () => import('./region/region-manage.vue'); //地域管理
+const homepageManage = () => import('./homepage/homepage-manage.vue'); //首页管理
+const changelogAuditManage = () => import('./changelogaudit/changelogaudit-manage.vue'); //数据库变更记录
+const logManage = () => import('./log/log-manage.vue'); //查看日志
 
 import { $t } from '@/resources/init.js';
 import { config } from './config.js';
@@ -489,7 +489,7 @@ let routerList = [
       ismenu: true,
       icon: 'tsfont-agent',
       authority: 'TAGENT_BASE',
-      type: 'others'
+      type: 'agent'
     }
   },
   {
@@ -514,7 +514,7 @@ let routerList = [
       ismenu: false,
       icon: '',
       authority: 'TAGENT_BASE',
-      type: 'others'
+      type: 'agent'
     }
   },
   {
@@ -526,7 +526,7 @@ let routerList = [
       ismenu: false,
       icon: '',
       authority: 'TAGENT_BASE',
-      type: 'others'
+      type: 'agent'
     }
   },
   {
@@ -538,7 +538,7 @@ let routerList = [
       ismenu: true,
       icon: 'tsfont-ip-object',
       authority: 'RUNNER_MODIFY',
-      type: 'others'
+      type: 'agent'
     }
   },
 
@@ -551,7 +551,7 @@ let routerList = [
       ismenu: false,
       icon: 'tsfont-ip-object',
       authority: 'RUNNER_MODIFY',
-      type: 'others'
+      type: 'agent'
     }
   },
   {
@@ -659,7 +659,7 @@ let routerList = [
       ismenu: true,
       icon: 'tsfont-adapter',
       authority: 'ADMIN',
-      type: 'others'
+      type: 'healthcheck'
     }
   },
   {
diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js
index 18354528427ecc88765482d54037167a008e3aa3..d6529e7537052e49cd6e3eec15289c751f3c1a5a 100644
--- a/src/views/pages/process/task/processdetail/detailmixin.js
+++ b/src/views/pages/process/task/processdetail/detailmixin.js
@@ -1045,6 +1045,15 @@ export default {
           isComplete = false;
         }
       }
+      // 其他节点校验方法
+      if (this.validNodeData && typeof this.validNodeData === 'function') {
+        let validNodeList = this.validNodeData();
+        if (validNodeList && Array.isArray(validNodeList) && validNodeList.length > 0) {
+          this.validCardOpen = true;
+          isComplete = false;
+          this.validList.push(...validNodeList);
+        }
+      }
       //校验表单
       if (JSON.stringify(this.formConfig) != '{}') {
         let completeList = await this.$refs.TaskCenterDetail.getcompleteValid();
diff --git a/src/views/pages/process/task/processdetail/workorder/alert/top-alert.vue b/src/views/pages/process/task/processdetail/workorder/alert/top-alert.vue
index 4146c1bf7fa4599c8dd5bf966e31df2910296022..5daa99a6f7de54a15bc95a61cd8b3aadc3cb0315 100644
--- a/src/views/pages/process/task/processdetail/workorder/alert/top-alert.vue
+++ b/src/views/pages/process/task/processdetail/workorder/alert/top-alert.vue
@@ -23,9 +23,9 @@
                   placement="bottom-start"
                 >
                   <span v-html="item.content"></span>
-                  <span slot="content">
-                    <span v-html="item.content"></span>
-                  </span>
+                  <div slot="content">
+                    <div style="max-height: 500px;overflow:scroll;" v-html="item.content"></div>
+                  </div>
                 </Tooltip>
               </span>
               <span v-if="item.detail" class="text-href detail-btn" @click="lookDetail(item)">{{ $t('page.viewdetails') }}</span>
diff --git a/src/views/pages/report/statement/statement-edit.vue b/src/views/pages/report/statement/statement-edit.vue
index 5c2036bc14187e3abec97c53efb561f70cc4f0eb..44573e20a5c018cde4846e7aa4716b5716c27d07 100644
--- a/src/views/pages/report/statement/statement-edit.vue
+++ b/src/views/pages/report/statement/statement-edit.vue
@@ -8,6 +8,7 @@
         <TsFormInput
           ref="name"
           v-model="reportData.name"
+          border="border"
           :validateList="[{ name: 'required', message: ' ' }]"
           :maxlength="50"
         ></TsFormInput>
@@ -657,6 +658,7 @@ export default {
       return zindex + 1;
     },
     saveReport() {
+      console.log(this.$refs['name'].valid());
       if (this.$refs['name'] && this.$refs['name'].valid()) {
         if (!this.reportData.widgetList || this.reportData.widgetList.length <= 0) {
           this.$Message.warning(this.$t('message.report.addreportwidget'));
diff --git a/src/views/pages/report/statement/widgets/define/area.js b/src/views/pages/report/statement/widgets/define/area.js
index b2901814ef12c2e5df07c89ba35c44e554416482..54b46c2186ec332ecbeb09785a77793744686a97 100644
--- a/src/views/pages/report/statement/widgets/define/area.js
+++ b/src/views/pages/report/statement/widgets/define/area.js
@@ -13,7 +13,7 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true } 
   ], 
   config: { 
diff --git a/src/views/pages/report/statement/widgets/define/bar.js b/src/views/pages/report/statement/widgets/define/bar.js
index 17a3e85de438ffa7a40121920b9b6c6e5905f2b0..3f69b8f7d0c1a5bae31786d42ea39bc5d07ed780 100644
--- a/src/views/pages/report/statement/widgets/define/bar.js
+++ b/src/views/pages/report/statement/widgets/define/bar.js
@@ -14,7 +14,7 @@ export default {
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
     { name: 'xField', label: $t('term.report.axis.xfield'), type: 'number', isRequired: true }, 
-    { name: 'yField', label: $t('term.report.axis.yfield'), type: 'text', isRequired: true } 
+    { name: 'yField', label: $t('term.report.axis.yfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true } 
   ], 
   config: { 
     legend: { visible: true, position: 'bottom' }, 
diff --git a/src/views/pages/report/statement/widgets/define/bullet.js b/src/views/pages/report/statement/widgets/define/bullet.js
index 2dc1a56af5981b927be85c8921ea35b4753d1a99..d7e633c58a28bad49182133fde4635fa688cad04 100644
--- a/src/views/pages/report/statement/widgets/define/bullet.js
+++ b/src/views/pages/report/statement/widgets/define/bullet.js
@@ -13,9 +13,10 @@ export default {
   needData: true,
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }],
   fields: [
-    { name: 'measureField', label: '当前值', type: 'number', isRequired: true },
-    { name: 'ranges', label: '最大值', type: 'number', isRequired: true },
-    { name: 'targetField', label: '目标值', type: 'number', isRequired: true }
+    { name: 'title', label: '标题', type: 'text', isRequired: true },
+    { name: 'measure', label: '当前值', type: 'number', isRequired: true },
+    { name: 'range', label: '最大值', type: 'number', isRequired: true },
+    { name: 'target', label: '目标值', type: 'number', isRequired: true }
   ],
   config: {
     legend: { visible: true, position: 'bottom' }, 
diff --git a/src/views/pages/report/statement/widgets/define/column.js b/src/views/pages/report/statement/widgets/define/column.js
index 3f873c53b60fecb38f6983b963c3383ac8cb6eb0..bf3fe6913cb9544ad540dbc26114461a325e8860 100644
--- a/src/views/pages/report/statement/widgets/define/column.js
+++ b/src/views/pages/report/statement/widgets/define/column.js
@@ -13,7 +13,7 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true } 
   ], 
   config: { 
diff --git a/src/views/pages/report/statement/widgets/define/groupedcolumn.js b/src/views/pages/report/statement/widgets/define/groupedcolumn.js
index c06ed083c699e814918feb484c2df953c48bf34b..49e9e1c4163f96f90f91a1093fe9d00786d34a45 100644
--- a/src/views/pages/report/statement/widgets/define/groupedcolumn.js
+++ b/src/views/pages/report/statement/widgets/define/groupedcolumn.js
@@ -13,7 +13,7 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true }, 
     { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: 'text', isRequired: true } 
   ], 
diff --git a/src/views/pages/report/statement/widgets/define/heatmap.js b/src/views/pages/report/statement/widgets/define/heatmap.js
index 23305c027873eeaed36a65d1edc306e7f8f68cfd..034c6b0bef0194fac46312c77ee7fbf57407fcd5 100644
--- a/src/views/pages/report/statement/widgets/define/heatmap.js
+++ b/src/views/pages/report/statement/widgets/define/heatmap.js
@@ -13,8 +13,8 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
-    { name: 'yField', label: $t('term.report.axis.yfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
+    { name: 'yField', label: $t('term.report.axis.yfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'colorField', label: $t('term.report.axis.colorfield'), type: 'number', isRequired: true } 
   ], 
   config: { 
diff --git a/src/views/pages/report/statement/widgets/define/line.js b/src/views/pages/report/statement/widgets/define/line.js
index b52554564087a3b70224fe027fd38ac793fb8ac4..b2a98b63b9329f71bdf77251d7d0cf220a86e615 100644
--- a/src/views/pages/report/statement/widgets/define/line.js
+++ b/src/views/pages/report/statement/widgets/define/line.js
@@ -13,7 +13,7 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata')}], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true } 
   ], 
   config: { 
diff --git a/src/views/pages/report/statement/widgets/define/marea.js b/src/views/pages/report/statement/widgets/define/marea.js
index 636a20d9d14e9a8521ce5e737f34c809a65e6a0f..c8c95360a610092d971c4a313d2c63e6e06c7dee 100644
--- a/src/views/pages/report/statement/widgets/define/marea.js
+++ b/src/views/pages/report/statement/widgets/define/marea.js
@@ -13,7 +13,7 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true }, 
     { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: 'text', isRequired: true } 
   ], 
diff --git a/src/views/pages/report/statement/widgets/define/mline.js b/src/views/pages/report/statement/widgets/define/mline.js
index 675bd8fb83662b096fea6565aebf96da725d43d0..ffd586694c46b708c45a789b21a296e9deffec2f 100644
--- a/src/views/pages/report/statement/widgets/define/mline.js
+++ b/src/views/pages/report/statement/widgets/define/mline.js
@@ -13,7 +13,7 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true }, 
     { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: 'text', isRequired: false } 
   ], 
diff --git a/src/views/pages/report/statement/widgets/define/p-scatter.js b/src/views/pages/report/statement/widgets/define/p-scatter.js
index cb86c8e268f748713493aecf506d52ff2f9d788b..5189ee964ef7f7b3ff09d66e23c9050f990d2699 100644
--- a/src/views/pages/report/statement/widgets/define/p-scatter.js
+++ b/src/views/pages/report/statement/widgets/define/p-scatter.js
@@ -15,7 +15,7 @@ export default {
   fields: [ 
     { name: 'xField', label: $t('term.report.axis.xfield'), type: 'number', isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true }, 
-    { name: 'colorField', label: $t('term.report.axis.colorfield'), type: 'text', isRequired: true } 
+    { name: 'colorField', label: $t('term.report.axis.colorfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true } 
   ], 
   config: { 
     xField: 'xField', 
diff --git a/src/views/pages/report/statement/widgets/define/pie.js b/src/views/pages/report/statement/widgets/define/pie.js
index b4306349e1f927e132800b5dddd8c94a02c413b9..31e3e229a5a749d47caf1c0b7896c1752754dae9 100644
--- a/src/views/pages/report/statement/widgets/define/pie.js
+++ b/src/views/pages/report/statement/widgets/define/pie.js
@@ -14,7 +14,7 @@ export default {
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
     { name: 'angleField', label: $t('page.valuefield'), type: 'number', isRequired: true }, 
-    { name: 'colorField', label: $t('term.report.chartsetting.classifyfield'), type: 'text', isRequired: true } 
+    { name: 'colorField', label: $t('term.report.chartsetting.classifyfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true } 
   ], 
   config: { 
     legend: { 
diff --git a/src/views/pages/report/statement/widgets/define/radar.js b/src/views/pages/report/statement/widgets/define/radar.js
index 4ab3446946689eb5a872dfa492b14e85ecf61837..25870428649c457cf5eaebdb58b0f740482fe778 100644
--- a/src/views/pages/report/statement/widgets/define/radar.js
+++ b/src/views/pages/report/statement/widgets/define/radar.js
@@ -13,9 +13,9 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.chartsetting.classifyfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.chartsetting.classifyfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.numberfield'), type: 'number', isRequired: true }, 
-    { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: 'text', isRequired: false } 
+    { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: false } 
   ], 
   config: { 
     legend: { 
diff --git a/src/views/pages/report/statement/widgets/define/rose.js b/src/views/pages/report/statement/widgets/define/rose.js
index 379bd70ada0e5fbd5b7629d28d72ebf4a2bbb47c..3a168e9e4cd6cd678aaa1055039c320f989b90e3 100644
--- a/src/views/pages/report/statement/widgets/define/rose.js
+++ b/src/views/pages/report/statement/widgets/define/rose.js
@@ -14,8 +14,8 @@ export default {
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
     { name: 'yField', label: $t('term.report.numberfield'), type: 'number', isRequired: true }, 
-    { name: 'xField', label: $t('term.report.chartsetting.classifyfield'), type: 'text', isRequired: true }, 
-    { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: 'text', isRequired: true } 
+    { name: 'xField', label: $t('term.report.chartsetting.classifyfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
+    { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true } 
   ], 
   config: { 
     legend: { 
diff --git a/src/views/pages/report/statement/widgets/define/scatter.js b/src/views/pages/report/statement/widgets/define/scatter.js
index 3da12a85ae4495eb838765c776e89728e1119d1b..6ea201b25a150aaba51b363dbd1bbf4250e040e4 100644
--- a/src/views/pages/report/statement/widgets/define/scatter.js
+++ b/src/views/pages/report/statement/widgets/define/scatter.js
@@ -15,7 +15,7 @@ export default {
   fields: [  
     { name: 'xField', label: $t('term.report.axis.xfield'), type: 'number', isRequired: true },  
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true },  
-    { name: 'colorField', label: $t('term.report.axis.colorfield'), type: 'text', isRequired: true },  
+    { name: 'colorField', label: $t('term.report.axis.colorfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true },  
     { name: 'sizeField', label: $t('term.report.axis.sizefield'), type: 'number', isRequired: true }  
   ],  
   config: {  
diff --git a/src/views/pages/report/statement/widgets/define/stackedcolumn.js b/src/views/pages/report/statement/widgets/define/stackedcolumn.js
index 2ba4e3f7f0614b81eccc10f521bb54c98ac371a0..b1f1f0c9663b348a65b101fc8b54af2a461f81ea 100644
--- a/src/views/pages/report/statement/widgets/define/stackedcolumn.js
+++ b/src/views/pages/report/statement/widgets/define/stackedcolumn.js
@@ -13,9 +13,9 @@ export default {
   needData: true, 
   dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
   fields: [ 
-    { name: 'xField', label: $t('term.report.axis.xfield'), type: 'text', isRequired: true }, 
+    { name: 'xField', label: $t('term.report.axis.xfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true }, 
     { name: 'yField', label: $t('term.report.axis.yfield'), type: 'number', isRequired: true }, 
-    { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: 'text', isRequired: true } 
+    { name: 'seriesField', label: $t('term.report.chartsetting.groupfield'), type: ['text', 'date', 'datetime', 'time'], isRequired: true } 
   ], 
   config: { 
     isPercent: false, 
diff --git a/src/views/pages/report/statement/widgets/original/bar-widget.vue b/src/views/pages/report/statement/widgets/original/bar-widget.vue
index 01fdff490f7e3d1602c70d2201f803d0c7249cd3..920e5fe65d7366661c8ae292413b67088a3db62f 100644
--- a/src/views/pages/report/statement/widgets/original/bar-widget.vue
+++ b/src/views/pages/report/statement/widgets/original/bar-widget.vue
@@ -83,6 +83,8 @@ export default {
     finalData() {
       const data = [];
       if (this.data && this.data.length > 0) {
+        //时间排序
+        this.data = this.data.sort((a, b) => this.changeString(b.yField) - this.changeString(a.yField));
         //数据合并汇聚
         this.data.forEach(d => {
           const dd = data.find(dd => dd.yField == d.yField);
diff --git a/src/views/pages/report/statement/widgets/original/bullet-widget.vue b/src/views/pages/report/statement/widgets/original/bullet-widget.vue
index d8d214f84df55f4269a212bd778b55c3c8102e45..5e05a41cad1b14e07074b92c02a6872484f348d3 100644
--- a/src/views/pages/report/statement/widgets/original/bullet-widget.vue
+++ b/src/views/pages/report/statement/widgets/original/bullet-widget.vue
@@ -10,8 +10,7 @@ export default {
   name: '',
   components: {},
   extends: WidgetBase,
-  props: {
-  },
+  props: {},
   data() {
     return {
       plot: null,
@@ -28,24 +27,23 @@ export default {
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
-  },
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
   deactivated() {},
-  beforeDestroy() {
-  },
+  beforeDestroy() {},
   destroyed() {},
   methods: {
     createRandomData() {
       this.data = [];
       for (var i = 1; i <= 1; i++) {
-        this.data.push({ 
+        this.data.push({
           title: '完成度',
           ranges: [100],
           measures: [80],
-          target: 85 });
+          target: 85
+        });
       }
     },
     createPlot() {
@@ -53,6 +51,7 @@ export default {
         this.plot.destroy();
         this.plot = null;
       }
+
       if (this.$refs.container) {
         this.plot = new Bullet(this.$refs.container, {
           ...this.chartConfig,
@@ -74,19 +73,19 @@ export default {
       if (this.data && this.data.length > 0) {
         //数据合并汇聚
         this.data.forEach(d => {
-          const dd = data.find(dd => dd.colorField == d.colorField);
-          if (dd) {
-            dd.angleField += d.angleField;
-          } else {
-            data.push(d);
+          if (d.measure != null) {
+            d.measures = [d.measure];
+          }
+          if (d.range != null) {
+            d.ranges = [d.range];
           }
+          data.push(d);
         });
       }
       return data;
     }
   },
-  watch: {
-  }
+  watch: {}
 };
 </script>
 <style lang="less"></style>
diff --git a/src/views/pages/report/statement/widgets/original/stackedbar-widget.vue b/src/views/pages/report/statement/widgets/original/stackedbar-widget.vue
index cbad51de8dcbbc786622df82ccc563fb55914fbe..75e1d339d89b5a6772d7f2c2a2c625daf3f28e1d 100644
--- a/src/views/pages/report/statement/widgets/original/stackedbar-widget.vue
+++ b/src/views/pages/report/statement/widgets/original/stackedbar-widget.vue
@@ -76,6 +76,8 @@ export default {
     finalData() {
       let data = [];
       if (this.data && this.data.length > 0) {
+        //时间排序
+        this.data = this.data.sort((a, b) => this.changeString(b.yField) - this.changeString(a.yField));
         //数据合并汇聚
         this.data.forEach(d => {
           const dd = data.find(dd => dd.yField == d.yField && dd.seriesField == d.seriesField);
diff --git a/src/views/pages/report/statement/widgets/widget-base.js b/src/views/pages/report/statement/widgets/widget-base.js
index 0b9d8fa436c7834779acb428bb8fb9ab3c01c523..7a20398aeeb341c0ee7f6963b6e07ddc169b96fe 100644
--- a/src/views/pages/report/statement/widgets/widget-base.js
+++ b/src/views/pages/report/statement/widgets/widget-base.js
@@ -65,7 +65,7 @@ export const WidgetBase = {
             data.push(d);
           });
         }
-        this.data = data;
+        this.data = data.sort((a, b) => this.changeString(a.xField) - this.changeString(b.xField));
         if (!isFirstGetData) {
           //第一次加载由于组件还没加载完毕，所以不需要调用changeData
           this.changeData();
@@ -80,6 +80,21 @@ export const WidgetBase = {
           }, this.widget.dataInterval * 1000);
         }
       });
+    },
+    changeString(a) { //字符串转时间戳
+      if (a) {
+        if (this.$utils.isValidDateTime(a)) {
+          return new Date(a).getTime();
+        } else if (this.$utils.isValidTimeString(a)) {
+          const pad = num => num.toString().padStart(2, '0');
+          const [h1, m1, s1 = '00'] = a.split(':').map(pad);
+          return `${h1}${m1}${s1}`; 
+        } else if (typeof a === 'string') {
+          return a.charCodeAt(0);
+        }
+        return a;
+      }
+      return a;
     }
   },
   beforeDestroy() {