From bd676abbed959884b4dcdb660ffef242acbb65a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Thu, 29 Aug 2024 15:14:50 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml                                            | 8 ++++++++
 webs/aos-web/package.json                                 | 1 +
 .../cosa/report/designer/widgets/mixin-echarts-base.js    | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5e7930f..a3b71d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,6 +163,7 @@ importers:
       '@vue/cli-plugin-babel': ~4.4.1
       '@vue/cli-plugin-typescript': ~4.4.1
       codemirror: 5.65.16
+      echarts-liquidfill: 3.1.0
       jshint: ^2.13.4
       jsonlint: ^1.6.3
       mavon-editor: ^2.9.1
@@ -175,6 +176,7 @@ importers:
       wangeditor: ^4.6.16
     dependencies:
       codemirror: 5.65.16
+      echarts-liquidfill: 3.1.0
       jshint: 2.13.6
       jsonlint: 1.6.3
       mavon-editor: 2.10.4
@@ -6059,6 +6061,12 @@ packages:
       safer-buffer: 2.1.2
     dev: true
 
+  /echarts-liquidfill/3.1.0:
+    resolution: {integrity: sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw==}
+    peerDependencies:
+      echarts: ^5.0.1
+    dev: false
+
   /echarts-liquidfill/3.1.0_echarts@5.4.3:
     resolution: {integrity: sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw==}
     peerDependencies:
diff --git a/webs/aos-web/package.json b/webs/aos-web/package.json
index baac99e..99b4b26 100644
--- a/webs/aos-web/package.json
+++ b/webs/aos-web/package.json
@@ -20,6 +20,7 @@
     "script-loader": "^0.7.2",
     "uuid": "^8.3.2",
     "vue-codemirror": "4.0.6",
+    "echarts-liquidfill": "3.1.0",
     "codemirror": "5.65.16",
     "vue-draggable-resizable": "^2.3.0",
     "vue-json-tool": "^1.0.4",
diff --git a/webs/aos-web/src/views/cosa/report/designer/widgets/mixin-echarts-base.js b/webs/aos-web/src/views/cosa/report/designer/widgets/mixin-echarts-base.js
index 5b54140..148a866 100644
--- a/webs/aos-web/src/views/cosa/report/designer/widgets/mixin-echarts-base.js
+++ b/webs/aos-web/src/views/cosa/report/designer/widgets/mixin-echarts-base.js
@@ -1,5 +1,5 @@
-import * as echarts from 'echarts'
 import Vue from 'vue'
+import echarts from '@cmp/cmp-echarts/hooks/echarts'
 import { getPreviewById } from '@/services/reportform/dataset'
 import { debounce, cloneDeep } from 'lodash-es'
 import { setStyleWithPixel, packParams } from './widgets.utils'