From 93812f734ec85529aa27fc3100a2eaef8c7a6df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= Date: Wed, 18 Aug 2021 20:05:40 +0800 Subject: [PATCH] fix(echarts): theme setting supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复useECharts的theme参数不起作用的问题 fixed: #1095 --- CHANGELOG.zh_CN.md | 4 +++- src/hooks/web/useECharts.ts | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 9ce213c3..365009c0 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -4,7 +4,9 @@ ### 🐛 Bug Fixes -- **其它** 修复部分封装组件在使用插槽时报错的问题 +- **其它** + - 修复部分封装组件在使用插槽时报错的问题 + - 修复`useECharts`的`theme`参数不起作用的问题 ## 2.7.1(2021-08-16) diff --git a/src/hooks/web/useECharts.ts b/src/hooks/web/useECharts.ts index 26be030d..e8c0936f 100644 --- a/src/hooks/web/useECharts.ts +++ b/src/hooks/web/useECharts.ts @@ -11,9 +11,13 @@ import { useRootSetting } from '/@/hooks/setting/useRootSetting'; export function useECharts( elRef: Ref, - theme: 'light' | 'dark' | 'default' = 'light' + theme: 'light' | 'dark' | 'default' = 'default' ) { - const { getDarkMode } = useRootSetting(); + const { getDarkMode: getSysDarkMode } = useRootSetting(); + + const getDarkMode = computed(() => { + return theme === 'default' ? getSysDarkMode.value : theme; + }); let chartInstance: echarts.ECharts | null = null; let resizeFn: Fn = resize; const cacheOptions = ref({}) as Ref;