diff --git a/package.json b/package.json index 0928b71b1..f72408e6b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "dayjs": "^1.11.9", "echarts": "^5.4.3", "el-table-infinite-scroll": "^3.0.1", - "element-plus": "2.3.6", + "element-plus": "^2.3.9", "intro.js": "^7.0.1", "js-cookie": "^3.0.5", "jsbarcode": "^3.11.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 86123eb35..709b9bf77 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,7 +43,7 @@ specifiers: dayjs: ^1.11.9 echarts: ^5.4.3 el-table-infinite-scroll: ^3.0.1 - element-plus: 2.3.6 + element-plus: ^2.3.9 eslint: ^8.43.0 eslint-plugin-prettier: ^4.2.1 eslint-plugin-vue: ^9.15.1 @@ -123,8 +123,8 @@ dependencies: "@howdyjs/mouse-menu": 2.0.9_vue@3.3.4 "@logicflow/core": 1.2.10 "@logicflow/extension": 1.2.10 - "@pureadmin/descriptions": 1.1.1_element-plus@2.3.6 - "@pureadmin/table": 2.3.3_element-plus@2.3.6 + "@pureadmin/descriptions": 1.1.1_element-plus@2.3.9 + "@pureadmin/table": 2.3.3_element-plus@2.3.9 "@pureadmin/utils": 1.9.7_echarts@5.4.3+vue@3.3.4 "@vueuse/core": 10.3.0_vue@3.3.4 "@vueuse/motion": 2.0.0_vue@3.3.4 @@ -137,7 +137,7 @@ dependencies: dayjs: 1.11.9 echarts: 5.4.3 el-table-infinite-scroll: 3.0.1 - element-plus: 2.3.6_vue@3.3.4 + element-plus: 2.3.9_vue@3.3.4 intro.js: 7.0.1 js-cookie: 3.0.5 jsbarcode: 3.11.5 @@ -2091,7 +2091,7 @@ packages: } dev: false - /@pureadmin/descriptions/1.1.1_element-plus@2.3.6: + /@pureadmin/descriptions/1.1.1_element-plus@2.3.9: resolution: { integrity: sha512-4BHLKomLU/LxGs5EUA+h+aKNrJEkhrU6+QE8VoWfJZ8VTU6ddvFLT/Pi4WuO5CWNXM9ZjqvHLFFVwEPlKntqtg== @@ -2100,11 +2100,11 @@ packages: element-plus: ^2.0.0 dependencies: "@element-plus/icons-vue": 2.1.0_vue@3.3.4 - element-plus: 2.3.6_vue@3.3.4 + element-plus: 2.3.9_vue@3.3.4 vue: 3.3.4 dev: false - /@pureadmin/table/2.3.3_element-plus@2.3.6: + /@pureadmin/table/2.3.3_element-plus@2.3.9: resolution: { integrity: sha512-MQK4rPdfQRamGVLD5aRzzqhXiBRfMLqIAUJAVLIl2CErPUH1/4NkiOq1ZNroJMow28XxTQDWyG0tHka5HfmHUA== @@ -2112,7 +2112,7 @@ packages: peerDependencies: element-plus: ^2.0.0 dependencies: - element-plus: 2.3.6_vue@3.3.4 + element-plus: 2.3.9_vue@3.3.4 vue: 3.3.4 dev: false @@ -5182,7 +5182,7 @@ packages: } dependencies: core-js: 3.32.0 - element-plus: 2.3.6_vue@3.3.4 + element-plus: 2.3.9_vue@3.3.4 vue: 3.3.4 transitivePeerDependencies: - "@vue/composition-api" @@ -5194,10 +5194,10 @@ packages: integrity: sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A== } - /element-plus/2.3.6_vue@3.3.4: + /element-plus/2.3.9_vue@3.3.4: resolution: { - integrity: sha512-GLz0pXUYI2zRfIgyI6W7SWmHk6dSEikP9yR++hsQUyy63+WjutoiGpA3SZD4cGPSXUzRFeKfVr8CnYhK5LqXZw== + integrity: sha512-TIOLnPl4cnoCPXqK3QYh+jpkthUBQnAM21O7o3Lhbse8v9pfrRXRTaBJtoEKnYNa8GZ4lZptUfH0PeZgDCNLUg== } peerDependencies: vue: ^3.2.0 @@ -12320,7 +12320,7 @@ packages: } dependencies: animate.css: 4.1.1 - element-plus: 2.3.6_vue@3.3.4 + element-plus: 2.3.9_vue@3.3.4 transitivePeerDependencies: - "@vue/composition-api" - vue @@ -12333,7 +12333,7 @@ packages: } dependencies: animate.css: 4.1.1 - element-plus: 2.3.6_vue@3.3.4 + element-plus: 2.3.9_vue@3.3.4 vue-waterfall-plugin-next: 2.2.0_vue@3.3.4 transitivePeerDependencies: - "@vue/composition-api" diff --git a/src/App.vue b/src/App.vue index 84f080dc3..f675b20df 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,9 +9,9 @@ import { defineComponent } from "vue"; import { checkVersion } from "version-rocket"; import { ElConfigProvider } from "element-plus"; -import en from "element-plus/lib/locale/lang/en"; +import en from "element-plus/dist/locale/en.mjs"; import { ReDialog } from "@/components/ReDialog"; -import zhCn from "element-plus/lib/locale/lang/zh-cn"; +import zhCn from "element-plus/dist/locale/zh-cn.mjs"; export default defineComponent({ name: "app", diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index ec53256b9..ed4466ecc 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -5,8 +5,8 @@ import { responsiveStorageNameSpace } from "@/config"; import { storageLocal, isObject } from "@pureadmin/utils"; // element-plus国际化 -import enLocale from "element-plus/lib/locale/lang/en"; -import zhLocale from "element-plus/lib/locale/lang/zh-cn"; +import enLocale from "element-plus/dist/locale/en.mjs"; +import zhLocale from "element-plus/dist/locale/zh-cn.mjs"; function siphonI18n(prefix = "zh-CN") { return Object.fromEntries( diff --git a/types/shims-vue.d.ts b/types/shims-vue.d.ts index 576ca9197..07e615518 100644 --- a/types/shims-vue.d.ts +++ b/types/shims-vue.d.ts @@ -11,3 +11,5 @@ declare module "*.scss" { declare module "vue-virtual-scroller"; declare module "vuedraggable/src/vuedraggable"; +declare module "element-plus/dist/locale/en.mjs"; +declare module "element-plus/dist/locale/zh-cn.mjs";