From a4d4e3cea5c842506dd129c3ef3874c51b571ad0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 10 Apr 2024 17:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E4=B8=80=E7=B3=BB?=
 =?UTF-8?q?=E5=88=97=E4=B8=8B,=E4=B8=8D=E5=90=8Citem=E4=B8=8B=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E4=B8=8D=E5=90=8C=E9=A2=9C=E8=89=B2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/packages/tools/AiEchartV2.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ui/packages/tools/AiEchartV2.vue b/ui/packages/tools/AiEchartV2.vue
index 6b817dce..a13519c3 100644
--- a/ui/packages/tools/AiEchartV2.vue
+++ b/ui/packages/tools/AiEchartV2.vue
@@ -7,7 +7,14 @@
 </template>
 
 <script>
-
+const mergeOps = (ori = {}, ext = {}) => {
+  for (const k in ext) {
+    if (typeof ext[k] == 'object') {
+      ori[k] = mergeOps(ori[k], ext[k])
+    } else ori[k] = ext[k]
+  }
+  return ori
+}
 
 export default {
   name: "AiEchartV2",
@@ -57,9 +64,9 @@ export default {
       let {type, data, ops: options = {}} = this,
           style = this.series ? this.series : this.ops.daemon ? this.ops.daemon : {},
           colors = this.theme === '1' ? this.colors : (options.color || this.colors),
-          legend = {textStyle: {color: '#fff', padding: [0, 0, 0, 8], fontSize: 14}, show: false},
-          series = data?.[0] ? Array(Object.keys(data?.[0]).length - 1).fill(1)
-              .map((e, i) => ({type, ...daemon, ...(typeof style == 'object' ? style : style(colors[i]))})) : []
+          legend = {textStyle: {color: '#fff', padding: [0, 0, 0, 8], fontSize: 14}, show: false}
+      const series = data?.[0] ? Array(Object.keys(data?.[0]).length - 1).fill(1)
+          .map((e, i) => ({type, ...mergeOps(daemon, typeof style == 'object' ? style : style(colors[i]))})) : []
       return {
         tooltip: {},
         xAxis: {