From fb1a2df61fb2d158e2d8f51a0e7a235ac0491cf8 Mon Sep 17 00:00:00 2001 From: mayinrain <624899618@qq.com> Date: Fri, 17 Jan 2025 18:24:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?upd:=20=E6=89=93=E5=8C=85=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Charts/Charts.vue | 6 ++++++ .../components/Charts/useEcharts.ts | 19 ++++++++----------- .../components/hooks/useLocale.ts | 8 +++++++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/traction-widget/components/Charts/Charts.vue b/packages/traction-widget/components/Charts/Charts.vue index cc30766..1ae75ac 100644 --- a/packages/traction-widget/components/Charts/Charts.vue +++ b/packages/traction-widget/components/Charts/Charts.vue @@ -98,3 +98,9 @@ const handleRefresh = async () => { lastUpdateTime.value = format(new Date(), 'yyyy-MM-dd HH:mm:ss'); }; + + \ No newline at end of file diff --git a/packages/traction-widget/components/Charts/useEcharts.ts b/packages/traction-widget/components/Charts/useEcharts.ts index b373bef..87b1d6c 100644 --- a/packages/traction-widget/components/Charts/useEcharts.ts +++ b/packages/traction-widget/components/Charts/useEcharts.ts @@ -1,26 +1,23 @@ // 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。 import * as echarts from 'echarts/core'; // 引入柱状图图表，图表后缀都为 Chart -import { BarChart, LineChart } from 'echarts/charts'; +import * as charts from 'echarts/charts'; // 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步 -import { CanvasRenderer } from 'echarts/renderers'; +import * as renderers from 'echarts/renderers'; // 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component -import { - TooltipComponent, - GridComponent, - DataZoomComponent, - LegendComponent, -} from 'echarts/components'; +import * as components from 'echarts/components'; +const { BarChart } = charts; +const { CanvasRenderer } = renderers; +const { TooltipComponent, GridComponent, DataZoomComponent, LegendComponent } = components; // 注册必须的组件 echarts.use([ - BarChart, - LineChart, - CanvasRenderer, TooltipComponent, GridComponent, DataZoomComponent, LegendComponent, + BarChart, + CanvasRenderer ]); export default echarts; \ No newline at end of file diff --git a/packages/traction-widget/components/hooks/useLocale.ts b/packages/traction-widget/components/hooks/useLocale.ts index c0b51c4..b8e360f 100644 --- a/packages/traction-widget/components/hooks/useLocale.ts +++ b/packages/traction-widget/components/hooks/useLocale.ts @@ -7,7 +7,13 @@ type Locale = Record; export function useLocale (): Locale { const locale = ref({}); - const storedLocale = localStorage.getItem('fes_locale'); + let storedLocale = 'zh-CN'; // 默认使用中文 + + // 只在浏览器环境下读取 localStorage + if (typeof window !== 'undefined') { + storedLocale = localStorage.getItem('fes_locale') || 'zh-CN'; + } + if (storedLocale === 'en-US') { locale.value = enUS; } else { From e7e076dc0ecd2daf30e396fb8f0164082b115977 Mon Sep 17 00:00:00 2001 From: mayinrain <624899618@qq.com> Date: Fri, 17 Jan 2025 19:00:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index fcb48f2..09cd6ce 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -34,7 +34,7 @@ export default defineConfig({ ssr: { // lodash-es 模块是 esm，ssr 渲染的时候编译成 cjs 的引入方式，会引发 nodejs 的模块加载异常错误 noExternal: ['lodash-es', '@fesjs/fes-design', '@fesjs/fes-design/icon'], - external: ['@vue/repl'] + external: ['@vue/repl', 'echarts', 'echarts/charts', 'echarts/components', 'echarts/renderers'] }, resolve: { extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'], From ee4eae762d52173f70116930710e084ed78e41d1 Mon Sep 17 00:00:00 2001 From: mayinrain <624899618@qq.com> Date: Fri, 17 Jan 2025 19:07:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20vitepress=E7=9A=84=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=98=AF=E4=B8=8D=E6=98=AF=E6=9C=89=E7=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index 09cd6ce..b8f3e57 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -1,4 +1,3 @@ - import { defineConfig } from 'vitepress'; import vueJsx from '@vitejs/plugin-vue-jsx'; @@ -34,7 +33,10 @@ export default defineConfig({ ssr: { // lodash-es 模块是 esm，ssr 渲染的时候编译成 cjs 的引入方式，会引发 nodejs 的模块加载异常错误 noExternal: ['lodash-es', '@fesjs/fes-design', '@fesjs/fes-design/icon'], - external: ['@vue/repl', 'echarts', 'echarts/charts', 'echarts/components', 'echarts/renderers'] + external: [ + '@vue/repl', + /^echarts(\/.*)?$/ // 匹配 echarts 及其所有子路径 + ] }, resolve: { extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'], From 5824e4cce0da02f953d099df4bcbd2abb4ad5492 Mon Sep 17 00:00:00 2001 From: mayinrain <624899618@qq.com> Date: Fri, 17 Jan 2025 19:13:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20vitepress=E7=9A=84=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=98=AF=E4=B8=8D=E6=98=AF=E6=9C=89=E7=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index b8f3e57..3864d9d 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -32,10 +32,9 @@ export default defineConfig({ }, ssr: { // lodash-es 模块是 esm，ssr 渲染的时候编译成 cjs 的引入方式，会引发 nodejs 的模块加载异常错误 - noExternal: ['lodash-es', '@fesjs/fes-design', '@fesjs/fes-design/icon'], + noExternal: ['lodash-es', '@fesjs/fes-design', '@fesjs/fes-design/icon', /^echarts(\/.*)?$/], external: [ '@vue/repl', - /^echarts(\/.*)?$/ // 匹配 echarts 及其所有子路径 ] }, resolve: { From 11296e8a37bee16e16f3632a8ef8ec42d72dafdb Mon Sep 17 00:00:00 2001 From: mayinrain <624899618@qq.com> Date: Fri, 17 Jan 2025 19:25:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=BB=88=E4=BA=8E=E5=A5=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vitepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index 3864d9d..9bb0866 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -32,7 +32,7 @@ export default defineConfig({ }, ssr: { // lodash-es 模块是 esm，ssr 渲染的时候编译成 cjs 的引入方式，会引发 nodejs 的模块加载异常错误 - noExternal: ['lodash-es', '@fesjs/fes-design', '@fesjs/fes-design/icon', /^echarts(\/.*)?$/], + noExternal: ['lodash-es', '@fesjs/fes-design', '@fesjs/fes-design/icon', 'echarts', 'zrender'], external: [ '@vue/repl', ]