From f88d74b1d5313cf5f347a9c4fa84b1c0232f83b3 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Tue, 15 Jul 2025 10:25:49 +0800
Subject: [PATCH 01/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E5=A4=9A=E9=80=89=E9=80=89=E9=A1=B90=E4=BC=9A?=
 =?UTF-8?q?=E8=A2=AB=E5=BD=93=E6=88=90=E7=A9=BA=E5=80=BC=20=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1463242981867520]=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=80=89=E9=A1=B90=E4=BC=9A=E8=A2=AB?=
 =?UTF-8?q?=E5=BD=93=E6=88=90=E7=A9=BA=E5=80=BC=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1463?=
 =?UTF-8?q?242981867520?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/mixins/formMixins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js
index c00deb1a..d4b039ce 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 {
-- 
Gitee


From f8cb803fa11f4dd9fa9f6ae6fc08ce25dbcd4cc0 Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Tue, 15 Jul 2025 17:05:42 +0800
Subject: [PATCH 02/33] =?UTF-8?q?-[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=90=E5=BC=B9=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../widget/charts/original/bullet-widget.vue  | 13 +++++----
 .../pages/dashboard/widget/define/bullet.js   | 27 ++++++++---------
 .../pages/report/statement/statement-edit.vue |  2 ++
 .../report/statement/widgets/define/bullet.js |  7 +++--
 .../widgets/original/bullet-widget.vue        | 29 +++++++++----------
 6 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index a30537fb..67073117 100755
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "@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/views/pages/dashboard/widget/charts/original/bullet-widget.vue b/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue
index 70b5d684..3e3a5911 100644
--- a/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue
+++ b/src/views/pages/dashboard/widget/charts/original/bullet-widget.vue
@@ -68,17 +68,18 @@ export default {
   },
   filter: {},
   computed: {
-    finalData() {
+     finalData() {
       const data = [];
       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/define/bullet.js b/src/views/pages/dashboard/widget/define/bullet.js
index 9a343f5d..9c726f33 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/report/statement/statement-edit.vue b/src/views/pages/report/statement/statement-edit.vue
index 5c2036bc..44573e20 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/bullet.js b/src/views/pages/report/statement/widgets/define/bullet.js
index 2dc1a56a..d7e633c5 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/original/bullet-widget.vue b/src/views/pages/report/statement/widgets/original/bullet-widget.vue
index d8d214f8..5e05a41c 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>
-- 
Gitee


From a5324c6b867c4ed2414d357148b288c1f0ee7455 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 15 Jul 2025 17:21:53 +0800
Subject: [PATCH 03/33] =?UTF-8?q?-[=E5=85=B3=E8=81=94]=20#[146598992383180?=
 =?UTF-8?q?8]=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=AD=EF=BC=8C=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=97=B4=E7=9A=84=E8=81=94=E5=8A=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
 =?UTF-8?q?g-detail/939050947543040/939050947543057/1465989923831808?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-item.vue            | 9 +++++----
 src/resources/plugins/TsSheet/form/reaction/disable.js | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index 57439642..e529ed2b 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -63,7 +63,7 @@
           :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"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemDisabled"
           :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
           :formData="formData"
           :readonlyTextIsHighlight="readonlyTextIsHighlight"
@@ -91,7 +91,7 @@
           :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"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemDisabled"
           :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
           :formData="formData"
           :readonlyTextIsHighlight="readonlyTextIsHighlight"
@@ -120,7 +120,7 @@
         :mode="mode"
         :filter="filter"
         :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-        :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled"
+        :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemDisabled"
         :readonlyTextIsHighlight="readonlyTextIsHighlight"
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
@@ -242,7 +242,8 @@ export default {
       REACTION: REACTION, //联动规则
       isShowErrorMessage: true,
       currentItemHide: false, //当前组件是否隐藏
-      reactionFormItemUuidMap: {} //规格内需要的表单组件值
+      reactionFormItemUuidMap: {}, //规格内需要的表单组件值
+      currentItemDisabled: false //当前组件是否禁用(针对表格组件嵌套子组件)
     };
   },
   beforeCreate() {},
diff --git a/src/resources/plugins/TsSheet/form/reaction/disable.js b/src/resources/plugins/TsSheet/form/reaction/disable.js
index dd7507da..17eee0bb 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.currentItemDisabled = true;
     } else {
       view.$set(view.formItem.config, 'isDisabled', false);
+      view.currentItemDisabled = false;
     }
     view.addExecuteCount('disable');
   }
-- 
Gitee


From bcd8aed147f439546e1e1cd0d758fe1bdb6c10c7 Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Tue, 15 Jul 2025 17:49:30 +0800
Subject: [PATCH 04/33] adjust

---
 .../pages/dashboard/widget/charts/original/bullet-widget.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 3e3a5911..2432ed49 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],
@@ -68,7 +68,7 @@ export default {
   },
   filter: {},
   computed: {
-     finalData() {
+    finalData() {
       const data = [];
       if (this.data && this.data.length > 0) {
         //数据合并汇聚
-- 
Gitee


From dc67485673189d248aecc143f8aa7d4f99ae346c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 15 Jul 2025 18:03:02 +0800
Subject: [PATCH 05/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[146598992383?=
 =?UTF-8?q?1808]=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=AD=EF=BC=8C=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=97=B4=E7=9A=84=E8=81=94=E5=8A=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
 =?UTF-8?q?g-detail/939050947543040/939050947543057/1465989923831808?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-item.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index e529ed2b..c6fcbad9 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -727,6 +727,9 @@ export default {
               this.$emit('updateHiddenComponentList', val, this.formItem.uuid);
             }
           });
+          this.$nextTick(() => {
+            this.isFirstLoad = false;
+          });
         }
       },
       immediate: true
-- 
Gitee


From 1ae25af697c3ce96983651f7e1946f3dfa964ba4 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 16 Jul 2025 18:41:32 +0800
Subject: [PATCH 06/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=E9=85=8D=E7=BD=AE-=E8=B0=83=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1466716125626368?=
 =?UTF-8?q?]=E9=9B=86=E6=88=90=E9=85=8D=E7=BD=AE-=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
 =?UTF-8?q?g-detail/939050947543040/939050947543057/1466716125626368?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/framework/integration/integration-audit.vue     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/pages/framework/integration/integration-audit.vue b/src/views/pages/framework/integration/integration-audit.vue
index ca3e8690..abe618da 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,
-- 
Gitee


From fdce31c917a2af8464ea134022e41dc99b471497 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 17 Jul 2025 10:13:20 +0800
Subject: [PATCH 07/33] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=9F=A5=E7=9C=8B=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/framework/log/log-manage.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/pages/framework/log/log-manage.vue b/src/views/pages/framework/log/log-manage.vue
index 811d4c89..39ecc705 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'));
-- 
Gitee


From e5cf3af687203503336754c70b19a880d02fa38d Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 17 Jul 2025 10:59:34 +0800
Subject: [PATCH 08/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=80=E5=A4=A7=E9=AB=98=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/processdetail/workorder/alert/top-alert.vue        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 4146c1bf..5daa99a6 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>
-- 
Gitee


From 3e2926b8970bef08847d7b1e86343d3b14fa16a2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 17 Jul 2025 11:00:30 +0800
Subject: [PATCH 09/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[146598992383?=
 =?UTF-8?q?1808]=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=AD=EF=BC=8C=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=97=B4=E7=9A=84=E8=81=94=E5=8A=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
 =?UTF-8?q?g-detail/939050947543040/939050947543057/1465989923831808?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-item.vue   | 34 +++++++++++--------
 .../plugins/TsSheet/form/reaction/disable.js  |  4 +--
 .../plugins/TsSheet/form/reaction/mask.js     |  2 ++
 .../plugins/TsSheet/form/reaction/readonly.js |  2 ++
 .../plugins/TsSheet/form/reaction/required.js |  2 ++
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index c6fcbad9..3ddef96f 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 || currentItemDisabled"
-          :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 || currentItemDisabled"
-          :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 || currentItemDisabled"
+        :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,9 +241,15 @@ export default {
       filter: [], //格式[{column:'矩阵属性uuid',expression:'equal',valueList:["value"]}]
       REACTION: REACTION, //联动规则
       isShowErrorMessage: true,
-      currentItemHide: false, //当前组件是否隐藏
       reactionFormItemUuidMap: {}, //规格内需要的表单组件值
-      currentItemDisabled: false //当前组件是否禁用(针对表格组件嵌套子组件)
+      currentItemReaction: { //(针对表格组件嵌套子组件)
+        currentItemHide: false, //当前组件是否隐藏
+        currentItemDisabled: false, //当前组件是否禁用
+        currentItemMask: false, //当前组件是否不可见
+        currentItemReadonly: false, //当前组件是否只读
+        cunrrentRequire: false //
+      }
+      
     };
   },
   beforeCreate() {},
@@ -525,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() {
@@ -690,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;
diff --git a/src/resources/plugins/TsSheet/form/reaction/disable.js b/src/resources/plugins/TsSheet/form/reaction/disable.js
index 17eee0bb..5ba3f3ea 100644
--- a/src/resources/plugins/TsSheet/form/reaction/disable.js
+++ b/src/resources/plugins/TsSheet/form/reaction/disable.js
@@ -2,10 +2,10 @@ export default ({ overrideConfig, result, view }) => {
   if (!overrideConfig.isDisabled) {
     if (result) {
       view.$set(view.formItem.config, 'isDisabled', true);
-      view.currentItemDisabled = true;
+      view.$set(view.currentItemReaction, 'currentItemDisabled', true);
     } else {
       view.$set(view.formItem.config, 'isDisabled', false);
-      view.currentItemDisabled = 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 e1ce93a8..76d11786 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 0917c041..12bb48ad 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 21636a0f..34d49c93 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');
   }
-- 
Gitee


From bc849f7cd27b278893f28ef2a9077a87788c28c9 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 17 Jul 2025 11:12:26 +0800
Subject: [PATCH 10/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[146728035178?=
 =?UTF-8?q?9056]=E5=8F=91=E5=B8=83=E6=B5=81=E6=B0=B4=E7=BA=BF=E2=80=9C?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=B1=82=E7=BA=A7=E2=80=9D=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=89=8D=E8=B0=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1467280351789056?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/app/app-config-status.vue                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 7fe72169..cc8ec4ee 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) {
-- 
Gitee


From 7615eaa3b9f048963a8a1a0a801ecc06ef64809d Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 17 Jul 2025 11:32:26 +0800
Subject: [PATCH 11/33] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96=EF=BC=9A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=B7=BB=E5=8A=A0=E7=9F=A9=E9=98=B5=E7=9A=84=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=E5=90=8E=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=AD=E6=95=88=E6=9E=9C=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1467293647732736]=E7=9F=A9=E9=98=B5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96=EF=BC=9A=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9F=A9=E9=98=B5=E7=9A=84=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=90=8E=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=AD=E6=95=88=E6=9E=9C=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?=
 =?UTF-8?q?67293647732736?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/matrix/matrix-overview.vue      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/pages/framework/matrix/matrix-overview.vue b/src/views/pages/framework/matrix/matrix-overview.vue
index 9e3c7b4d..108eb321 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: {},
-- 
Gitee


From 4c8b213c00d11821d444db801201df66e060f658 Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Thu, 17 Jul 2025 16:29:42 +0800
Subject: [PATCH 12/33] =?UTF-8?q?-[=E4=BF=AE=E5=A4=8D]=E4=BC=98=E5=8C=96ta?=
 =?UTF-8?q?ble=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |   3 +-
 src/resources/assets/languages/term/zh.json   |   3 +-
 .../cmdb/ci/attrhandler/input/table-attr.vue  | 147 +++++++++++-------
 .../cmdb/ci/attrhandler/view/table-attr.vue   |  11 +-
 4 files changed, 97 insertions(+), 67 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 1f4d07ac..36be2505 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",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 7e901aa7..0a818c3b 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": "工单中心",
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 8b6597c8..b0e7d56f 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 b85977c4..b88fdff0 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: {},
-- 
Gitee


From 25fe22b3d1d067355ee63fb08a3b3d5368f67b25 Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Fri, 18 Jul 2025 10:12:07 +0800
Subject: [PATCH 13/33] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/api/cmdb/cientity/cientity.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/resources/api/cmdb/cientity/cientity.js b/src/resources/api/cmdb/cientity/cientity.js
index 7c5789d3..c73a733f 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);
   },
-- 
Gitee


From fc17328c558594140d2b4846b85cacf8b73f636a Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Fri, 18 Jul 2025 11:09:27 +0800
Subject: [PATCH 14/33] adjust

---
 src/resources/assets/languages/term/en.json | 17 ++++++++++++++++-
 src/resources/assets/languages/term/zh.json | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 36be2505..c75f4b14 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -2859,7 +2859,22 @@
     "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"
   },
   "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 0a818c3b..bfc90eb6 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -2859,6 +2859,21 @@
     "alert": "告警",
     "isnormalattr": "作为普通属性展示",
     "closesuccess": "关闭成功",
-    "istop": "是否置顶"
+    "istop": "是否置顶",
+    "onlysearchparentalert": "只搜索父告警",
+    "searchallalert": "搜索所有告警",
+    "closeselectedalert": "关闭选中告警",
+    "openselectedalert": "打开选中告警",
+    "deletematchalert": "删除匹配告警",
+    "allalert": "所有告警",
+    "alerttopo": "告警拓扑",
+    "alertdetail": "告警详情",
+    "applychildalert": "同时应用子告警",
+    "transferworker": "转交处理人",
+    "transferteam": "转交处理组",
+    "reportdata": "上报数据",
+    "eventaudit": "事件记录",
+    "alertnotexists": "告警不存在或已被删除",
+    "childalert": "子告警"
   }
 }
\ No newline at end of file
-- 
Gitee


From e374f83007f42cca70c02ec5ad839545335e0b87 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Fri, 18 Jul 2025 16:24:51 +0800
Subject: [PATCH 15/33] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E9=85=8D=E7=BD=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E5=AF=B9=E6=AF=94?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1467978?=
 =?UTF-8?q?955063296]=E8=A1=A8=E5=8D=95=E5=8F=91=E5=B8=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=B9=E6=AF=94=E5=8A=9F=E8=83=BD=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1467978955063296?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  1 +
 src/resources/assets/css/theme.less | 65 +++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/package.json b/package.json
index a30537fb..c9f0bfe8 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",
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index 5b3fc45e..a4f2decf 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 {
-- 
Gitee


From 391dfbca94f22cb865f84be0920eb6556a93a47b Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Fri, 18 Jul 2025 18:51:15 +0800
Subject: [PATCH 16/33] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E8=AE=BE=E8=AE=A1=E7=BB=84=E4=BB=B6=E4=B8=8E=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=81=94=E5=8A=A8=20=20=20=20-=20[=E5=85=B3=E8=81=94]?=
 =?UTF-8?q?#[1463039113527296]=E6=9E=B6=E6=9E=84=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8E=E8=A1=A8=E5=8D=95=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1463039113527296?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/process/task/processdetail/detailmixin.js      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js
index 18354528..d6529e75 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();
-- 
Gitee


From bcbbb4a382a3087c5e617459dc2fd95f988dd5e9 Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Mon, 21 Jul 2025 15:04:22 +0800
Subject: [PATCH 17/33] adjust

---
 src/resources/assets/languages/term/en.json | 8 +++++++-
 src/resources/assets/languages/term/zh.json | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index c75f4b14..69187154 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -2874,7 +2874,13 @@
     "reportdata": "reported data",
     "eventaudit": "Event record",
     "alertnotexists": "Alarm does not exist or has been deleted",
-    "childalert": "Sub alarm"
+    "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 bfc90eb6..d04b9b89 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -2874,6 +2874,12 @@
     "reportdata": "上报数据",
     "eventaudit": "事件记录",
     "alertnotexists": "告警不存在或已被删除",
-    "childalert": "子告警"
+    "childalert": "子告警",
+    "dealresult": "处理结果",
+    "createalert": "创建告警",
+    "defaultstatus": "默认状态",
+    "joinalert": "归并到告警",
+    "uniquekey": "唯一键",
+    "alertsign": "告警特征"
   }
 }
\ No newline at end of file
-- 
Gitee


From 7a9ea68585390bdb3f88ba37187a74d8561189e9 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Mon, 21 Jul 2025 17:48:25 +0800
Subject: [PATCH 18/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]xlsx=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=200.18.5=20=E7=89=88=E6=9C=AC=E7=9A=84=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E6=BC=8F=E6=B4=9E=20=20=20-=20[=E5=85=B3=E8=81=94]#[1?=
 =?UTF-8?q?470366344511488]xlsx=20=E6=8F=92=E4=BB=B6=200.18.5=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E4=B8=A4=E4=B8=AA=E6=BC=8F=E6=B4=9E=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1470366344511488?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  3 +--
 src/views/pages/common/preview.vue | 40 +++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 88a3b8b3..b3743f0b 100755
--- a/package.json
+++ b/package.json
@@ -83,8 +83,7 @@
     "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",
diff --git a/src/views/pages/common/preview.vue b/src/views/pages/common/preview.vue
index c438d038..2dcad4f1 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') {
-- 
Gitee


From de848d043069b3b436dfc3add22bb9e9968fea5c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 22 Jul 2025 14:07:32 +0800
Subject: [PATCH 19/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[147092968987?=
 =?UTF-8?q?0336]=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E7=BC=96=E8=BE=91-?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=9A=84=E6=96=87=E6=9C=AC=E5=9F=9F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E9=A6=96=E6=AC=A1=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=98=AFinput=E6=95=88=E6=9E=9C=20http://192.168.0.96?=
 =?UTF-8?q?:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057?=
 =?UTF-8?q?/1470929689870336?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/autoexec/components/script/item/param/inputparam.vue | 3 +++
 1 file changed, 3 insertions(+)

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 37f723a7..49e41f8b 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 || {};
       };
     },
-- 
Gitee


From 28dd1bf331b940a4bdec1da11e5adeb1f9e1ec8d Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 22 Jul 2025 17:05:49 +0800
Subject: [PATCH 20/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[147108429191?=
 =?UTF-8?q?5776]=E4=BB=AA=E8=A1=A8=E7=9B=98=EF=BC=8C=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?=
 =?UTF-8?q?939050947543042/1471084291915776?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/js/util.js               | 24 +++++++++++++++++++
 .../dashboard/widget/charts/widget-base.js    | 15 +++++++++++-
 .../report/statement/widgets/widget-base.js   | 15 +++++++++++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index e81b3b32..12b90299 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -1243,5 +1243,29 @@ const methods = {
     }
     return result;
   },
+   isValidTimeString(timeStr) { //校验时间字符串
+      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/views/pages/dashboard/widget/charts/widget-base.js b/src/views/pages/dashboard/widget/charts/widget-base.js
index cdc71fd0..f17f0a13 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,19 @@ export const WidgetBase = {
           }, this.widget.dataInterval * 1000);
         }
       });
+    },
+    changeString(a) { //字符串转时间戳
+      if (!this.$utils.isEmpty(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}`; 
+        } 
+        return a.charCodeAt(0);
+      }
+      return a;
     }
   },
   beforeDestroy() {
diff --git a/src/views/pages/report/statement/widgets/widget-base.js b/src/views/pages/report/statement/widgets/widget-base.js
index 0b9d8fa4..9dc155f6 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,19 @@ export const WidgetBase = {
           }, this.widget.dataInterval * 1000);
         }
       });
+    },
+    changeString(a) { //字符串转时间戳
+      if (!this.$utils.isEmpty(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}`; 
+        } 
+        return a.charCodeAt(0);
+      }
+      return a;
     }
   },
   beforeDestroy() {
-- 
Gitee


From 79db46d6d8fd0646e8dd91e60817f4fd72104a1f Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 22 Jul 2025 17:16:25 +0800
Subject: [PATCH 21/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[147108429191?=
 =?UTF-8?q?5776]=E4=BB=AA=E8=A1=A8=E7=9B=98=EF=BC=8C=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?=
 =?UTF-8?q?939050947543042/1471084291915776?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/js/util.js                         | 5 ++++-
 src/views/pages/dashboard/widget/charts/widget-base.js  | 2 +-
 src/views/pages/report/statement/widgets/widget-base.js | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index 12b90299..b17b6ea1 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -1243,7 +1243,10 @@ const methods = {
     }
     return result;
   },
-   isValidTimeString(timeStr) { //校验时间字符串
+  isValidTimeString(timeStr) { //校验时间字符串
+      if(!timeStr) {
+        return false;
+      }
       const parts = timeStr.split(':');
       if (parts.length === 2) {
         const [h, m] = parts.map(Number);
diff --git a/src/views/pages/dashboard/widget/charts/widget-base.js b/src/views/pages/dashboard/widget/charts/widget-base.js
index f17f0a13..0854bc0d 100644
--- a/src/views/pages/dashboard/widget/charts/widget-base.js
+++ b/src/views/pages/dashboard/widget/charts/widget-base.js
@@ -92,7 +92,7 @@ export const WidgetBase = {
       });
     },
     changeString(a) { //字符串转时间戳
-      if (!this.$utils.isEmpty(a)) {
+      if (a) {
         if (this.$utils.isValidDateTime(a)) {
           return new Date(a).getTime();
         } else if (this.$utils.isValidTimeString(a)) {
diff --git a/src/views/pages/report/statement/widgets/widget-base.js b/src/views/pages/report/statement/widgets/widget-base.js
index 9dc155f6..ac03065c 100644
--- a/src/views/pages/report/statement/widgets/widget-base.js
+++ b/src/views/pages/report/statement/widgets/widget-base.js
@@ -82,7 +82,7 @@ export const WidgetBase = {
       });
     },
     changeString(a) { //字符串转时间戳
-      if (!this.$utils.isEmpty(a)) {
+      if (a) {
         if (this.$utils.isValidDateTime(a)) {
           return new Date(a).getTime();
         } else if (this.$utils.isValidTimeString(a)) {
-- 
Gitee


From 13add99fd76cd67482e9240fdfee8b2dbe9e9d6c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 23 Jul 2025 17:03:30 +0800
Subject: [PATCH 22/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20#[147179584720?=
 =?UTF-8?q?0768]=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96=E8=BE=91-=E7=BA=B5?=
 =?UTF-8?q?=E5=90=91=E7=9A=84=E6=9D=A1=E5=BD=A2=E5=9B=BEy=E8=BD=B4?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=97=B6=E9=97=B4=E5=B1=9E=E6=80=A7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1471795847200768?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/js/util.js                             | 2 +-
 .../pages/dashboard/widget/charts/original/bar-widget.vue   | 2 ++
 .../dashboard/widget/charts/original/stackedbar-widget.vue  | 2 ++
 src/views/pages/dashboard/widget/charts/widget-base.js      | 6 ++++--
 src/views/pages/report/statement/widgets/define/bar.js      | 2 +-
 .../pages/report/statement/widgets/original/bar-widget.vue  | 2 ++
 .../report/statement/widgets/original/stackedbar-widget.vue | 2 ++
 src/views/pages/report/statement/widgets/widget-base.js     | 6 ++++--
 8 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index b17b6ea1..f83e408f 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -1244,7 +1244,7 @@ const methods = {
     return result;
   },
   isValidTimeString(timeStr) { //校验时间字符串
-      if(!timeStr) {
+      if(!timeStr || typeof timeStr === 'number') {
         return false;
       }
       const parts = timeStr.split(':');
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 e3fc36d4..8ab23bc9 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/stackedbar-widget.vue b/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue
index 934cb516..cfbdf1e2 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 0854bc0d..1dccbd40 100644
--- a/src/views/pages/dashboard/widget/charts/widget-base.js
+++ b/src/views/pages/dashboard/widget/charts/widget-base.js
@@ -99,8 +99,10 @@ export const WidgetBase = {
           const pad = num => num.toString().padStart(2, '0');
           const [h1, m1, s1 = '00'] = a.split(':').map(pad);
           return `${h1}${m1}${s1}`; 
-        } 
-        return a.charCodeAt(0);
+        } else if (typeof a === 'string') {
+          return a.charCodeAt(0);
+        }
+        return a;
       }
       return a;
     }
diff --git a/src/views/pages/report/statement/widgets/define/bar.js b/src/views/pages/report/statement/widgets/define/bar.js
index 17a3e85d..3f69b8f7 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/original/bar-widget.vue b/src/views/pages/report/statement/widgets/original/bar-widget.vue
index 01fdff49..920e5fe6 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/stackedbar-widget.vue b/src/views/pages/report/statement/widgets/original/stackedbar-widget.vue
index cbad51de..75e1d339 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 ac03065c..7a20398a 100644
--- a/src/views/pages/report/statement/widgets/widget-base.js
+++ b/src/views/pages/report/statement/widgets/widget-base.js
@@ -89,8 +89,10 @@ export const WidgetBase = {
           const pad = num => num.toString().padStart(2, '0');
           const [h1, m1, s1 = '00'] = a.split(':').map(pad);
           return `${h1}${m1}${s1}`; 
-        } 
-        return a.charCodeAt(0);
+        } else if (typeof a === 'string') {
+          return a.charCodeAt(0);
+        }
+        return a;
       }
       return a;
     }
-- 
Gitee


From fb640c63c634a163f207838b39a352a034a2f4e7 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 23 Jul 2025 17:06:58 +0800
Subject: [PATCH 23/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[147179584720?=
 =?UTF-8?q?0768]=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96=E8=BE=91-=E7=BA=B5?=
 =?UTF-8?q?=E5=90=91=E7=9A=84=E6=9D=A1=E5=BD=A2=E5=9B=BEy=E8=BD=B4?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=97=B6=E9=97=B4=E5=B1=9E=E6=80=A7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1471795847200768?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/js/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js
index f83e408f..21b03e3f 100644
--- a/src/resources/assets/js/util.js
+++ b/src/resources/assets/js/util.js
@@ -1244,7 +1244,7 @@ const methods = {
     return result;
   },
   isValidTimeString(timeStr) { //校验时间字符串
-      if(!timeStr || typeof timeStr === 'number') {
+      if(!timeStr || typeof timeStr !== 'string') {
         return false;
       }
       const parts = timeStr.split(':');
-- 
Gitee


From 01989b0404c6d219513f90e9a98265683eef146c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 23 Jul 2025 17:47:48 +0800
Subject: [PATCH 24/33] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                    | 2 +-
 .../widget/configs/original/groupedcolumn-widget-config.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3dc850f..ec16ca6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ yarn.lock
 /.idea
 /.lh
 /.vscode
-/src/commercial-module/*
+# /src/commercial-module/*
 *.code-workspace
 pnpm-lock.yaml
 public/version.md
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 1c5c1f4b..f1973633 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="
-- 
Gitee


From 3dc36c722df8c2b47cbdef7f33dbf51d0950a5fa Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 23 Jul 2025 17:48:44 +0800
Subject: [PATCH 25/33] commit

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ec16ca6d..e3dc850f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ yarn.lock
 /.idea
 /.lh
 /.vscode
-# /src/commercial-module/*
+/src/commercial-module/*
 *.code-workspace
 pnpm-lock.yaml
 public/version.md
-- 
Gitee


From 1c1a4d7e743237547c8464874f30c1477cb1c1d2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 24 Jul 2025 11:58:08 +0800
Subject: [PATCH 26/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=A7=E5=B1=8F=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1471795847200768]?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96=E8=BE=91-=E7=BA=B5?=
 =?UTF-8?q?=E5=90=91=E7=9A=84=E6=9D=A1=E5=BD=A2=E5=9B=BEy=E8=BD=B4?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=97=B6=E9=97=B4=E5=B1=9E=E6=80=A7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1471795847200768?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/report/statement/widgets/define/area.js       | 2 +-
 src/views/pages/report/statement/widgets/define/column.js     | 2 +-
 .../pages/report/statement/widgets/define/groupedcolumn.js    | 2 +-
 src/views/pages/report/statement/widgets/define/heatmap.js    | 4 ++--
 src/views/pages/report/statement/widgets/define/line.js       | 2 +-
 src/views/pages/report/statement/widgets/define/marea.js      | 2 +-
 src/views/pages/report/statement/widgets/define/mline.js      | 2 +-
 src/views/pages/report/statement/widgets/define/p-scatter.js  | 2 +-
 src/views/pages/report/statement/widgets/define/pie.js        | 2 +-
 src/views/pages/report/statement/widgets/define/radar.js      | 4 ++--
 src/views/pages/report/statement/widgets/define/rose.js       | 4 ++--
 src/views/pages/report/statement/widgets/define/scatter.js    | 2 +-
 .../pages/report/statement/widgets/define/stackedcolumn.js    | 4 ++--
 src/views/pages/report/statement/widgets/widget-handler.vue   | 1 +
 14 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/pages/report/statement/widgets/define/area.js b/src/views/pages/report/statement/widgets/define/area.js
index b2901814..54b46c21 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/column.js b/src/views/pages/report/statement/widgets/define/column.js
index 3f873c53..bf3fe691 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 c06ed083..49e9e1c4 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 23305c02..034c6b0b 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 b5255456..b2a98b63 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 636a20d9..c8c95360 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 675bd8fb..ffd58669 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 cb86c8e2..5189ee96 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 b4306349..31e3e229 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 4ab34469..25870428 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 379bd70a..3a168e9e 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 3da12a85..6ea201b2 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 2ba4e3f7..b1f1f0c9 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/widget-handler.vue b/src/views/pages/report/statement/widgets/widget-handler.vue
index 17c4f648..95c582b1 100644
--- a/src/views/pages/report/statement/widgets/widget-handler.vue
+++ b/src/views/pages/report/statement/widgets/widget-handler.vue
@@ -115,6 +115,7 @@
         ></WidgetBorder>
       </div>
       <div>
+        {{ widget.type }}
         <component
           :is="widget.type + 'widget'"
           ref="widget"
-- 
Gitee


From 4da27b3d8c0794e367a51727a01612a4c4a0cddf Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 24 Jul 2025 11:59:33 +0800
Subject: [PATCH 27/33] commit

---
 src/views/pages/report/statement/widgets/widget-handler.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/pages/report/statement/widgets/widget-handler.vue b/src/views/pages/report/statement/widgets/widget-handler.vue
index 95c582b1..17c4f648 100644
--- a/src/views/pages/report/statement/widgets/widget-handler.vue
+++ b/src/views/pages/report/statement/widgets/widget-handler.vue
@@ -115,7 +115,6 @@
         ></WidgetBorder>
       </div>
       <div>
-        {{ widget.type }}
         <component
           :is="widget.type + 'widget'"
           ref="widget"
-- 
Gitee


From 7a905cf672091068997e91a758614f9cd97ff1be Mon Sep 17 00:00:00 2001
From: chenqw <gdnpc@163.com>
Date: Thu, 24 Jul 2025 15:22:59 +0800
Subject: [PATCH 28/33] adjust

---
 src/resources/assets/languages/page/en.json   |  3 +-
 src/resources/assets/languages/page/zh.json   |  3 +-
 src/resources/assets/languages/router/en.json |  6 +-
 src/resources/assets/languages/router/zh.json |  6 +-
 src/views/pages/framework/config.js           | 24 ++---
 src/views/pages/framework/mq/mq-overview.vue  |  6 +-
 .../notifyconfig/mailserver-edit.vue          | 11 +--
 .../notifyconfig/mailserver-manage.vue        | 89 ++++++++-----------
 .../notifyconfig/notifyconfig-manage.vue      | 12 ++-
 .../notifytactics/notifytactics-overview.vue  | 72 +++++++--------
 src/views/pages/framework/router.js           | 20 ++---
 11 files changed, 112 insertions(+), 140 deletions(-)

diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index aa34785c..4fa43bc3 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 6a19d149..7c447c9a 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 22778a4b..9e4a22ac 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 0e70111e..c3b0f5a2 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/views/pages/framework/config.js b/src/views/pages/framework/config.js
index b117dc95..de5bb2bb 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/mq/mq-overview.vue b/src/views/pages/framework/mq/mq-overview.vue
index d8058305..780c74d5 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 10065130..9301c140 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 b577982e..9e3f8312 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 781f60fc..825f53c0 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 cedfb10f..77ce57a8 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 7e8531f3..5fe2f333 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'
     }
   },
   {
-- 
Gitee


From 6135c4345371c66a934bae0a5337bcf5700e87fa Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 24 Jul 2025 16:42:18 +0800
Subject: [PATCH 29/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89=E6=8B=A9=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1472356?=
 =?UTF-8?q?575313920]=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2?=
 =?UTF-8?q?=E4=BD=93=E7=BC=96=E8=BE=91=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=A8=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=97=B6=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?=
 =?UTF-8?q?3057/1472356575313920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/group/group-edit.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/pages/cmdb/group/group-edit.vue b/src/views/pages/cmdb/group/group-edit.vue
index 7fc29415..106dc05d 100644
--- a/src/views/pages/cmdb/group/group-edit.vue
+++ b/src/views/pages/cmdb/group/group-edit.vue
@@ -361,12 +361,17 @@ export default {
             value: 'is-not-null'
           }
         ];
-        if (!this.globalMap['global_' + attr.id]) {
-          this.$set(this.globalMap, 'global_' + attr.id, attr);
-        }
       });
       return globalAttrList;
     },
+    async getGlobalAttrItemByAttrId(attrId, attr) {
+      await this.$api.cmdb.ci.getGlobalAttrItemByAttrId({attrId: attrId}).then(res => {
+        const globalAttrList = res.Return || [];
+        if (!this.globalMap['global_' + attrId]) {
+          this.$set(this.globalMap, ['global_' + attrId], {...attr, itemList: globalAttrList});
+        }
+      });
+    },
     async getAttrByCiId(ciId) {
       if (ciId) {
         let attrList;
@@ -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 => {
+        for (const attr of globalAttrList) {
           elementList.push({
             typeText: this.$t('term.cmdb.globalattr'),
             type: 'global',
@@ -437,7 +442,8 @@ export default {
             label: attr.label,
             expressionList: attr.expressionList
           });
-        });
+          await this.getGlobalAttrItemByAttrId(attr.id, attr);
+        }
         attrList.forEach(attr => {
           elementList.push({
             typeText: this.$t('page.attribute'),
-- 
Gitee


From a7eefe29c00d99ad1ab5fa1b27f937c9cb87a83c Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 24 Jul 2025 16:43:47 +0800
Subject: [PATCH 30/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89=E6=8B=A9=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=20=20=20-=20[=E5=85=B3=E8=81=94]#[1472356575?=
 =?UTF-8?q?313920]=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=85=A8=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1472?=
 =?UTF-8?q?356575313920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/group/group-edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/cmdb/group/group-edit.vue b/src/views/pages/cmdb/group/group-edit.vue
index 106dc05d..6444f68f 100644
--- a/src/views/pages/cmdb/group/group-edit.vue
+++ b/src/views/pages/cmdb/group/group-edit.vue
@@ -368,7 +368,7 @@ export default {
       await this.$api.cmdb.ci.getGlobalAttrItemByAttrId({attrId: attrId}).then(res => {
         const globalAttrList = res.Return || [];
         if (!this.globalMap['global_' + attrId]) {
-          this.$set(this.globalMap, ['global_' + attrId], {...attr, itemList: globalAttrList});
+          this.$set(this.globalMap, ['global_' + attrId], {...(attr || {}), itemList: globalAttrList});
         }
       });
     },
-- 
Gitee


From fd3a4e799f395e31e6be9906029bf037ebf03bba Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 24 Jul 2025 16:59:23 +0800
Subject: [PATCH 31/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89=E6=8B=A9=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=20=20=20-=20[=E5=85=B3=E8=81=94]#[1472356575?=
 =?UTF-8?q?313920]=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=85=A8=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1472?=
 =?UTF-8?q?356575313920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/group/group-edit.vue | 28 ++++++-----------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/views/pages/cmdb/group/group-edit.vue b/src/views/pages/cmdb/group/group-edit.vue
index 6444f68f..fa5317e4 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="
@@ -580,11 +585,6 @@ export default {
         return this.ciMap['ci' + ciId];
       };
     },
-    getGlobalAttrById() {
-      return attrId => {
-        return this.globalMap[attrId];
-      };
-    },
     getAttrById() {
       return attrId => {
         return this.attrMap[attrId];
@@ -595,20 +595,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);
-- 
Gitee


From 4c297014f06e77c2cd6194a858b1a1acd540080b Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 24 Jul 2025 17:11:04 +0800
Subject: [PATCH 32/33] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89=E6=8B=A9=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=20=20-=20[=E5=85=B3=E8=81=94]#[1472356575313?=
 =?UTF-8?q?920]=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E5=9B=A2=E4=BD=93?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=84=E5=88=99=E7=BB=84=E5=90=88=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=85=A8=E5=B1=80=E5=B1=9E=E6=80=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1472?=
 =?UTF-8?q?356575313920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/group/group-edit.vue | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/views/pages/cmdb/group/group-edit.vue b/src/views/pages/cmdb/group/group-edit.vue
index fa5317e4..56423578 100644
--- a/src/views/pages/cmdb/group/group-edit.vue
+++ b/src/views/pages/cmdb/group/group-edit.vue
@@ -366,16 +366,11 @@ export default {
             value: 'is-not-null'
           }
         ];
-      });
-      return globalAttrList;
-    },
-    async getGlobalAttrItemByAttrId(attrId, attr) {
-      await this.$api.cmdb.ci.getGlobalAttrItemByAttrId({attrId: attrId}).then(res => {
-        const globalAttrList = res.Return || [];
-        if (!this.globalMap['global_' + attrId]) {
-          this.$set(this.globalMap, ['global_' + attrId], {...(attr || {}), itemList: globalAttrList});
+        if (!this.globalMap['global_' + attr.id]) {
+          this.$set(this.globalMap, 'global_' + attr.id, attr);
         }
       });
+      return globalAttrList;
     },
     async getAttrByCiId(ciId) {
       if (ciId) {
@@ -438,7 +433,7 @@ export default {
         const attrList = await this.getAttrByCiId(ciId);
         const relList = await this.getRelByCiId(ciId);
         const globalAttrList = await this.getGlobalAttrByCiId(ciId);
-        for (const attr of globalAttrList) {
+        globalAttrList.forEach((attr) => {
           elementList.push({
             typeText: this.$t('term.cmdb.globalattr'),
             type: 'global',
@@ -447,8 +442,7 @@ export default {
             label: attr.label,
             expressionList: attr.expressionList
           });
-          await this.getGlobalAttrItemByAttrId(attr.id, attr);
-        }
+        });
         attrList.forEach(attr => {
           elementList.push({
             typeText: this.$t('page.attribute'),
-- 
Gitee


From 24aeb6afd54e48dd49cb3bd275a6a2b6304fe533 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 25 Jul 2025 11:17:16 +0800
Subject: [PATCH 33/33] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[147306105061?=
 =?UTF-8?q?3760]=E5=B7=A5=E5=85=B7=E5=BA=93&=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=BA=93-=E6=B5=8B=E8=AF=95=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=9A=84=E6=97=B6=E5=80=99=E5=90=8E=E7=AB=AF=E8=A6=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=88=86=E6=89=B9=E6=95=B0=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/?=
 =?UTF-8?q?939050947543040/939050947543057/1473061050613760?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/autoexec/detail/test-detail.vue     | 113 +++++++++++++++++-
 1 file changed, 112 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/autoexec/detail/test-detail.vue b/src/views/pages/autoexec/detail/test-detail.vue
index f65bd4b2..1f62f942 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: {},
-- 
Gitee