fix(echarts): theme setting supported

修复useECharts的theme参数不起作用的问题 fixed: #1095
vbenjs · Aug 18, 2021 · 93812f7 · 93812f7
1 parent e15b4f1
commit 93812f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -11,9 +11,13 @@ import { useRootSetting } from '/@/hooks/setting/useRootSetting';
 
 export function useECharts(
   elRef: Ref<HTMLDivElement>,
-  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<EChartsOption>;