From eaae95b2cea31083de997e26fbc9cb324eab8909 Mon Sep 17 00:00:00 2001
From: MysticBoy <mysticboy@live.com>
Date: Tue, 18 Jul 2023 23:05:53 +0800
Subject: [PATCH] fix   #1060

---
 ClientApp/package.json          | 2 +-
 ClientApp/src/auto-imports.d.ts | 1 -
 ClientApp/src/i18n/index.ts     | 7 ++-----
 ClientApp/vite.config.ts        | 5 ++---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ClientApp/package.json b/ClientApp/package.json
index 2d6d8fd6..97a76de1 100644
--- a/ClientApp/package.json
+++ b/ClientApp/package.json
@@ -28,7 +28,7 @@
 		"echarts": "^5.4.2",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.0.0",
-		"element-plus": "^2.3.3",
+		"element-plus": "^2.3.8",
 		"js-cookie": "^3.0.1",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.21",
diff --git a/ClientApp/src/auto-imports.d.ts b/ClientApp/src/auto-imports.d.ts
index 6258f03d..2b4704b8 100644
--- a/ClientApp/src/auto-imports.d.ts
+++ b/ClientApp/src/auto-imports.d.ts
@@ -2,7 +2,6 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
-  const ElMessage: typeof import('element-plus/es')['ElMessage']
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
diff --git a/ClientApp/src/i18n/index.ts b/ClientApp/src/i18n/index.ts
index 071123b3..111808b6 100644
--- a/ClientApp/src/i18n/index.ts
+++ b/ClientApp/src/i18n/index.ts
@@ -2,14 +2,11 @@ import { createI18n } from 'vue-i18n';
 import pinia from '/@/stores/index';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import zhcnLocale from 'element-plus/lib/locale/lang/zh-cn';
-import enLocale from 'element-plus/lib/locale/lang/en';
-import zhtwLocale from 'element-plus/lib/locale/lang/zh-tw';
-
+import zhcnLocale from "element-plus/dist/locale/zh-cn.mjs";
+import enLocale from "element-plus/dist/locale/en.mjs";
 import nextZhcn from '/@/i18n/lang/zh-cn';
 import nextEn from '/@/i18n/lang/en';
 import nextZhtw from '/@/i18n/lang/zh-tw';
-
 import pagesLoginZhcn from '/@/i18n/pages/login/zh-cn';
 import pagesLoginEn from '/@/i18n/pages/login/en';
 import pagesLoginZhtw from '/@/i18n/pages/login/zh-tw';
diff --git a/ClientApp/vite.config.ts b/ClientApp/vite.config.ts
index a85812ca..15440bf4 100644
--- a/ClientApp/vite.config.ts
+++ b/ClientApp/vite.config.ts
@@ -63,9 +63,8 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 		hmr: true,
 		optimizeDeps: {
 			include: [
-				'element-plus/lib/locale/lang/zh-cn',
-				'element-plus/lib/locale/lang/en',
-				'element-plus/lib/locale/lang/zh-tw',
+				'element-plus/dist/locale/zh-cn.mjs',
+				'element-plus/dist/locale/en.mjs',
 				'monaco-editor/esm/vs/language/json/json.worker',
 				'monaco-editor/esm/vs/language/css/css.worker',
 				'monaco-editor/esm/vs/language/html/html.worker',
-- 
GitLab