diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 9ae6dc7..041d9c9 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -7,7 +7,6 @@
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
- "lokalise.i18n-ally",
"redhat.vscode-yaml",
"csstools.postcss",
"mikestead.dotenv",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bb65d68..1aa0ecb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -27,13 +27,5 @@
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
- "i18n-ally.localesPaths": "locales",
- "i18n-ally.keystyle": "nested",
- "i18n-ally.sortKeys": true,
- "i18n-ally.namespace": true,
- "i18n-ally.enabledParsers": ["yaml", "js"],
- "i18n-ally.sourceLanguage": "en",
- "i18n-ally.displayLanguage": "zh-CN",
- "i18n-ally.enabledFrameworks": ["vue"],
"iconify.excludes": ["el"]
}
diff --git a/README.en-US.md b/README.en-US.md
index 5960cc2..6bca145 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -1,4 +1,4 @@
-
vue-pure-admin Lite Edition
+vue-pure-admin Lite Edition(no i18n version)
[](LICENSE)
@@ -6,7 +6,7 @@
## introduce
-The lite version is based on the shelf extracted from [vue-pure-admin](https://github.com/xiaoxian521/vue-pure-admin), which contains the main functions and is more suitable for actual project development, the packaged size is only `3MB`, and will permanently sync the full version of the code
+The Lite version is based on the shelf extracted from [vue-pure-admin](https://github.com/xiaoxian521/vue-pure-admin), including the main functions, which is more suitable for actual project development, and the packaged size is lower than ` 3MB`, and will permanently sync the full version of the code. After enabling `brotli` compression and `cdn` to replace the native library mode, the package size is less than `500kb`
## Supporting Video
@@ -42,7 +42,6 @@ bilibili: https://www.bilibili.com/video/BV1534y1S7HV/
## ⚠️ Attention
- The Lite version does not accept any issues and prs. If you have any questions, please go to the full version https://github.com/xiaoxian521/vue-pure-admin/issues/new/choose to mention, thank you! ! !
-- Don't use the `delete-i18n` branch code, this branch is just for you to completely delete the internationalized references, it won't sync the code! ! ! [Completely remove the internationalization tutorial](https://www.bilibili.com/video/BV1Ru411B7k3/), please be sure to use the code from the `main` branch! ! !
## License
diff --git a/README.md b/README.md
index f2e626b..f8dcaa6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-vue-pure-admin精简版
+vue-pure-admin精简版(非国际化版本)
[](LICENSE)
@@ -6,7 +6,7 @@
## 介绍
-精简版是基于 [vue-pure-admin](https://github.com/xiaoxian521/vue-pure-admin) 提炼出的架子,包含主体功能,更适合实际项目开发,打包后的大小仅 `3MB`,并且会永久同步完整版的代码
+精简版是基于 [vue-pure-admin](https://github.com/xiaoxian521/vue-pure-admin) 提炼出的架子,包含主体功能,更适合实际项目开发,打包后的大小低于 `3MB`,并且会永久同步完整版的代码。开启 `brotli` 压缩和 `cdn` 替换本地库模式后,打包大小低于 `500kb`
## 配套视频
@@ -54,7 +54,6 @@ pnpm remove 包名
## ⚠️ 注意
- 精简版不接受任何 `issues` 和 `pr`,如果有问题请到完整版 [issues](https://github.com/xiaoxian521/vue-pure-admin/issues/new/choose) 去提,谢谢!!!
-- 不要使用 `delete-i18n` 分支代码,这个分支只是给你们完全删除国际化的参考,不会同步代码的!!! [完全删除国际化教程](https://www.bilibili.com/video/BV1Ru411B7k3/) ,请务必使用 `main` 分支的代码!!!
## 许可证
diff --git a/build/cdn.ts b/build/cdn.ts
index 20f24ad..abf71b7 100644
--- a/build/cdn.ts
+++ b/build/cdn.ts
@@ -20,11 +20,6 @@ export const cdn = importToCDN({
var: "VueRouter",
path: "vue-router.global.min.js"
},
- {
- name: "vue-i18n",
- var: "VueI18n",
- path: "vue-i18n.runtime.global.prod.min.js"
- },
// 项目中没有直接安装vue-demi,但是pinia用到了,所以需要在引入pinia前引入vue-demi(https://github.com/vuejs/pinia/blob/v2/packages/pinia/package.json#L77)
{
name: "vue-demi",
diff --git a/build/plugins.ts b/build/plugins.ts
index f9a3a8a..4253c91 100644
--- a/build/plugins.ts
+++ b/build/plugins.ts
@@ -1,5 +1,4 @@
import { cdn } from "./cdn";
-import { resolve } from "path";
import vue from "@vitejs/plugin-vue";
import { viteBuildInfo } from "./info";
import svgLoader from "vite-svg-loader";
@@ -7,7 +6,6 @@ import legacy from "@vitejs/plugin-legacy";
import vueJsx from "@vitejs/plugin-vue-jsx";
import { viteMockServe } from "vite-plugin-mock";
import { configCompressPlugin } from "./compress";
-import VueI18n from "@intlify/vite-plugin-vue-i18n";
// import ElementPlus from "unplugin-element-plus/vite";
import { visualizer } from "rollup-plugin-visualizer";
import removeConsole from "vite-plugin-remove-console";
@@ -25,12 +23,6 @@ export function getPluginsList(
const lifecycle = process.env.npm_lifecycle_event;
return [
vue(),
- // https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n
- VueI18n({
- runtimeOnly: true,
- compositionOnly: true,
- include: [resolve("locales/**")]
- }),
// jsx、tsx语法支持
vueJsx(),
VITE_CDN ? cdn : null,
diff --git a/locales/en.yaml b/locales/en.yaml
deleted file mode 100644
index 5d8c6bf..0000000
--- a/locales/en.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-buttons:
- hsLoginOut: LoginOut
- hsfullscreen: FullScreen
- hsexitfullscreen: ExitFullscreen
- hsrefreshRoute: RefreshRoute
- hslogin: Login
- hsadd: Add
- hsmark: Mark/Cancel
- hssave: Save
- hssearch: Search
- hsexpendAll: Expand All
- hscollapseAll: Collapse All
- hssystemSet: Open ProjectConfig
- hsdelete: Delete
- hsreload: Reload
- hscloseCurrentTab: Close CurrentTab
- hscloseLeftTabs: Close LeftTabs
- hscloseRightTabs: Close RightTabs
- hscloseOtherTabs: Close OtherTabs
- hscloseAllTabs: Close AllTabs
- hswholeFullScreen: Whole FullScreen
- hswholeExitFullScreen: Whole ExitFullScreen
- hscontentFullScreen: Content FullScreen
- hscontentExitFullScreen: Content ExitFullScreen
-menus:
- hshome: Home
- hslogin: Login
- hsabnormal: Abnormal Page
- hsfourZeroFour: "404"
- hsfourZeroOne: "403"
- hsFive: "500"
- permission: Permission Manage
- permissionPage: Page Permission
- permissionButton: Button Permission
-status:
- hsLoad: Loading...
-login:
- username: Username
- password: Password
- login: Login
- usernameReg: Please enter username
- passwordReg: Please enter password
- passwordRuleReg: The password format should be any combination of 8-18 digits
diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml
deleted file mode 100644
index 64f52d9..0000000
--- a/locales/zh-CN.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-buttons:
- hsLoginOut: 退出系统
- hsfullscreen: 全屏
- hsexitfullscreen: 退出全屏
- hsrefreshRoute: 刷新路由
- hslogin: 登录
- hsadd: 新增
- hsmark: 标记/取消
- hssave: 保存
- hssearch: 搜索
- hsexpendAll: 全部展开
- hscollapseAll: 全部折叠
- hssystemSet: 打开项目配置
- hsdelete: 删除
- hsreload: 重新加载
- hscloseCurrentTab: 关闭当前标签页
- hscloseLeftTabs: 关闭左侧标签页
- hscloseRightTabs: 关闭右侧标签页
- hscloseOtherTabs: 关闭其他标签页
- hscloseAllTabs: 关闭全部标签页
- hswholeFullScreen: 整体页面全屏
- hswholeExitFullScreen: 整体页面退出全屏
- hscontentFullScreen: 内容区全屏
- hscontentExitFullScreen: 内容区退出全屏
-menus:
- hshome: 首页
- hslogin: 登录
- hsabnormal: 异常页面
- hsfourZeroFour: "404"
- hsfourZeroOne: "403"
- hsFive: "500"
- permission: 权限管理
- permissionPage: 页面权限
- permissionButton: 按钮权限
-status:
- hsLoad: 加载中...
-login:
- username: 账号
- password: 密码
- login: 登录
- usernameReg: 请输入账号
- passwordReg: 请输入密码
- passwordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合
diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts
index 2c1e638..da6a559 100644
--- a/mock/asyncRoutes.ts
+++ b/mock/asyncRoutes.ts
@@ -10,7 +10,7 @@ import { MockMethod } from "vite-plugin-mock";
const permissionRouter = {
path: "/permission",
meta: {
- title: "menus.permission",
+ title: "权限管理",
icon: "lollipop",
rank: 10
},
@@ -19,15 +19,15 @@ const permissionRouter = {
path: "/permission/page/index",
name: "PermissionPage",
meta: {
- roles: ["admin", "common"],
- title: "menus.permissionPage"
+ title: "页面权限",
+ roles: ["admin", "common"]
}
},
{
path: "/permission/button/index",
name: "PermissionButton",
meta: {
- title: "menus.permissionButton",
+ title: "按钮权限",
roles: ["admin", "common"],
auths: ["btn_add", "btn_edit", "btn_delete"]
}
diff --git a/package.json b/package.json
index 6b466cf..e2e742d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"preview:build": "pnpm build && vite preview",
"typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
"cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
- "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && pnpm install",
+ "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && npm cache clean --force && pnpm install",
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
"lint:prettier": "prettier --write \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
"lint:stylelint": "stylelint --cache --fix \"**/*.{vue,css,scss,postcss,less}\" --cache --cache-location node_modules/.cache/stylelint/",
@@ -55,7 +55,6 @@
"resize-observer-polyfill": "^1.5.1",
"responsive-storage": "^2.1.0",
"vue": "^3.2.40",
- "vue-i18n": "^9.2.2",
"vue-router": "^4.1.6",
"vue-types": "^4.2.1",
"vxe-table": "^4.3.2",
@@ -67,7 +66,6 @@
"@iconify-icons/ep": "^1.2.7",
"@iconify-icons/ri": "^1.2.3",
"@iconify/vue": "^3.2.1",
- "@intlify/vite-plugin-vue-i18n": "^6.0.3",
"@pureadmin/theme": "^2.4.0",
"@types/element-resize-detector": "1.1.3",
"@types/js-cookie": "^3.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09bee8a..0b4b64a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,7 +7,6 @@ specifiers:
"@iconify-icons/ep": ^1.2.7
"@iconify-icons/ri": ^1.2.3
"@iconify/vue": ^3.2.1
- "@intlify/vite-plugin-vue-i18n": ^6.0.3
"@pureadmin/components": ^1.1.0
"@pureadmin/descriptions": ^1.1.0
"@pureadmin/table": ^1.2.0
@@ -88,7 +87,6 @@ specifiers:
vite-svg-loader: ^3.6.0
vue: ^3.2.40
vue-eslint-parser: ^8.2.0
- vue-i18n: ^9.2.2
vue-router: ^4.1.6
vue-tsc: ^0.40.13
vue-types: ^4.2.1
@@ -123,7 +121,6 @@ dependencies:
resize-observer-polyfill: 1.5.1
responsive-storage: 2.1.0
vue: 3.2.41
- vue-i18n: 9.2.2_vue@3.2.41
vue-router: 4.1.6_vue@3.2.41
vue-types: 4.2.1_vue@3.2.41
vxe-table: 4.3.5_vue@3.2.41+xe-utils@3.5.7
@@ -135,7 +132,6 @@ devDependencies:
"@iconify-icons/ep": 1.2.9
"@iconify-icons/ri": 1.2.3
"@iconify/vue": 3.2.1_vue@3.2.41
- "@intlify/vite-plugin-vue-i18n": 6.0.3_vite@3.1.8+vue-i18n@9.2.2
"@pureadmin/theme": 2.4.0
"@types/element-resize-detector": 1.1.3
"@types/js-cookie": 3.0.2
@@ -988,131 +984,6 @@ packages:
vue: 3.2.41
dev: true
- /@intlify/bundle-utils/3.2.1_vue-i18n@9.2.2:
- resolution:
- {
- integrity: sha512-rf4cLBOnbqmpXVcCdcYHilZpMt1m82syh3WLBJlZvGxN2KkH9HeHVH4+bnibF/SDXCHNh6lM6wTpS/qw+PkcMg==
- }
- engines: { node: ">= 12" }
- peerDependencies:
- petite-vue-i18n: "*"
- vue-i18n: "*"
- peerDependenciesMeta:
- petite-vue-i18n:
- optional: true
- vue-i18n:
- optional: true
- dependencies:
- "@intlify/message-compiler": 9.3.0-beta.6
- "@intlify/shared": 9.3.0-beta.6
- jsonc-eslint-parser: 1.4.1
- source-map: 0.6.1
- vue-i18n: 9.2.2_vue@3.2.41
- yaml-eslint-parser: 0.3.2
- dev: true
-
- /@intlify/core-base/9.2.2:
- resolution:
- {
- integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==
- }
- engines: { node: ">= 14" }
- dependencies:
- "@intlify/devtools-if": 9.2.2
- "@intlify/message-compiler": 9.2.2
- "@intlify/shared": 9.2.2
- "@intlify/vue-devtools": 9.2.2
- dev: false
-
- /@intlify/devtools-if/9.2.2:
- resolution:
- {
- integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==
- }
- engines: { node: ">= 14" }
- dependencies:
- "@intlify/shared": 9.2.2
- dev: false
-
- /@intlify/message-compiler/9.2.2:
- resolution:
- {
- integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==
- }
- engines: { node: ">= 14" }
- dependencies:
- "@intlify/shared": 9.2.2
- source-map: 0.6.1
- dev: false
-
- /@intlify/message-compiler/9.3.0-beta.6:
- resolution:
- {
- integrity: sha512-3PJqRJoqvFHExA9DCkf7fZYKbvYne1tYQ0fptJAhUOZsELarh8wr4aPLKWCkQSRuutdrtZ/n5CcPgJgUmVthDw==
- }
- engines: { node: ">= 14" }
- dependencies:
- "@intlify/shared": 9.3.0-beta.6
- source-map: 0.6.1
- dev: true
-
- /@intlify/shared/9.2.2:
- resolution:
- {
- integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==
- }
- engines: { node: ">= 14" }
- dev: false
-
- /@intlify/shared/9.3.0-beta.6:
- resolution:
- {
- integrity: sha512-ITA1R4tvJYwZXT5x6QCSwxcwQ4dU52zrzVm/EUbgsp8oWzYS1xexBrxyNM80PSQudYvL2rvcZJKQ7yBh7b0LkQ==
- }
- engines: { node: ">= 14" }
- dev: true
-
- /@intlify/vite-plugin-vue-i18n/6.0.3_vite@3.1.8+vue-i18n@9.2.2:
- resolution:
- {
- integrity: sha512-6SgNzPAOCR90wvt368lKzi7f/5ZEWJn22UCGvhFsP3XvKqlF3cVzojahgQ6o+LTdCkExeM6wPgd+haFf28E9VQ==
- }
- engines: { node: ">= 14.6" }
- peerDependencies:
- petite-vue-i18n: "*"
- vite: ^2.9.0 || ^3.0.0
- vue-i18n: "*"
- peerDependenciesMeta:
- petite-vue-i18n:
- optional: true
- vite:
- optional: true
- vue-i18n:
- optional: true
- dependencies:
- "@intlify/bundle-utils": 3.2.1_vue-i18n@9.2.2
- "@intlify/shared": 9.3.0-beta.6
- "@rollup/pluginutils": 4.2.1
- debug: 4.3.4
- fast-glob: 3.2.12
- source-map: 0.6.1
- vite: 3.1.8_sass@1.55.0+terser@5.15.1
- vue-i18n: 9.2.2_vue@3.2.41
- transitivePeerDependencies:
- - supports-color
- dev: true
-
- /@intlify/vue-devtools/9.2.2:
- resolution:
- {
- integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==
- }
- engines: { node: ">= 14" }
- dependencies:
- "@intlify/core-base": 9.2.2
- "@intlify/shared": 9.2.2
- dev: false
-
/@jridgewell/gen-mapping/0.1.1:
resolution:
{
@@ -2060,17 +1931,6 @@ packages:
through: 2.3.8
dev: true
- /acorn-jsx/5.3.2_acorn@7.4.1:
- resolution:
- {
- integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
- }
- peerDependencies:
- acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
- dependencies:
- acorn: 7.4.1
- dev: true
-
/acorn-jsx/5.3.2_acorn@8.8.0:
resolution:
{
@@ -3736,16 +3596,6 @@ packages:
estraverse: 5.3.0
dev: true
- /eslint-utils/2.1.0:
- resolution:
- {
- integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
- }
- engines: { node: ">=6" }
- dependencies:
- eslint-visitor-keys: 1.3.0
- dev: true
-
/eslint-utils/3.0.0_eslint@8.25.0:
resolution:
{
@@ -3759,14 +3609,6 @@ packages:
eslint-visitor-keys: 2.1.0
dev: true
- /eslint-visitor-keys/1.3.0:
- resolution:
- {
- integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
- }
- engines: { node: ">=4" }
- dev: true
-
/eslint-visitor-keys/2.1.0:
resolution:
{
@@ -3833,18 +3675,6 @@ packages:
- supports-color
dev: true
- /espree/6.2.1:
- resolution:
- {
- integrity: sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
- }
- engines: { node: ">=6.0.0" }
- dependencies:
- acorn: 7.4.1
- acorn-jsx: 5.3.2_acorn@7.4.1
- eslint-visitor-keys: 1.3.0
- dev: true
-
/espree/9.4.0:
resolution:
{
@@ -4819,20 +4649,6 @@ packages:
hasBin: true
dev: true
- /jsonc-eslint-parser/1.4.1:
- resolution:
- {
- integrity: sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==
- }
- engines: { node: ">=8.10.0" }
- dependencies:
- acorn: 7.4.1
- eslint-utils: 2.1.0
- eslint-visitor-keys: 1.3.0
- espree: 6.2.1
- semver: 6.3.0
- dev: true
-
/jsonfile/6.1.0:
resolution:
{
@@ -7670,22 +7486,6 @@ packages:
- supports-color
dev: true
- /vue-i18n/9.2.2_vue@3.2.41:
- resolution:
- {
- integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==
- }
- engines: { node: ">= 14" }
- peerDependencies:
- vue: ^3.0.0
- dependencies:
- "@intlify/core-base": 9.2.2
- "@intlify/shared": 9.2.2
- "@intlify/vue-devtools": 9.2.2
- "@vue/devtools-api": 6.4.5
- vue: 3.2.41
- dev: false
-
/vue-router/4.1.6_vue@3.2.41:
resolution:
{
@@ -7867,17 +7667,6 @@ packages:
}
dev: true
- /yaml-eslint-parser/0.3.2:
- resolution:
- {
- integrity: sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==
- }
- dependencies:
- eslint-visitor-keys: 1.3.0
- lodash: 4.17.21
- yaml: 1.10.2
- dev: true
-
/yaml/1.10.2:
resolution:
{
diff --git a/public/serverConfig.json b/public/serverConfig.json
index 78759d6..4248229 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -5,7 +5,6 @@
"HiddenSideBar": false,
"MultiTagsCache": false,
"KeepAlive": true,
- "Locale": "zh",
"Layout": "vertical",
"Theme": "default",
"DarkMode": false,
diff --git a/src/App.vue b/src/App.vue
index b299a9e..2620967 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,6 @@
import { defineComponent } from "vue";
import { ElConfigProvider } from "element-plus";
import zhCn from "element-plus/lib/locale/lang/zh-cn";
-import en from "element-plus/lib/locale/lang/en";
export default defineComponent({
name: "app",
components: {
@@ -16,7 +15,7 @@ export default defineComponent({
},
computed: {
currentLocale() {
- return this.$storage.locale?.locale === "zh" ? zhCn : en;
+ return zhCn;
}
}
});
diff --git a/src/assets/avatars.jpg b/src/assets/avatars.jpg
deleted file mode 100644
index a0226ae..0000000
Binary files a/src/assets/avatars.jpg and /dev/null differ
diff --git a/src/assets/svg/globalization.svg b/src/assets/svg/globalization.svg
deleted file mode 100644
index 10cddc6..0000000
--- a/src/assets/svg/globalization.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/svg/mdi_keyboard_esc.svg b/src/assets/svg/keyboard_esc.svg
similarity index 100%
rename from src/assets/svg/mdi_keyboard_esc.svg
rename to src/assets/svg/keyboard_esc.svg
diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue
index 0911383..300f6ed 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -2,12 +2,9 @@
import Search from "./search/index.vue";
import Notice from "./notice/index.vue";
import mixNav from "./sidebar/mixNav.vue";
-import avatars from "@/assets/avatars.jpg";
import { useNav } from "@/layout/hooks/useNav";
import Breadcrumb from "./sidebar/breadCrumb.vue";
import topCollapse from "./sidebar/topCollapse.vue";
-import { useTranslationLang } from "../hooks/useTranslationLang";
-import globalization from "@/assets/svg/globalization.svg?component";
const {
layout,
@@ -17,12 +14,8 @@ const {
pureApp,
username,
avatarsStyle,
- toggleSideBar,
- getDropdownItemStyle,
- getDropdownItemClass
+ toggleSideBar
} = useNav();
-
-const { t, locale, translationCh, translationEn } = useTranslationLang();
@@ -48,42 +41,13 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
-
-
-
+
{{ username }}
@@ -93,14 +57,14 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
icon="logout-circle-r-line"
style="margin: 5px"
/>
- {{ t("buttons.hsLoginOut") }}
+ 退出系统
@@ -157,22 +121,6 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
}
}
-.translation {
- ::v-deep(.el-dropdown-menu__item) {
- padding: 5px 40px;
- }
-
- .check-zh {
- position: absolute;
- left: 20px;
- }
-
- .check-en {
- position: absolute;
- left: 20px;
- }
-}
-
.logout {
max-width: 120px;
diff --git a/src/layout/components/screenfull/index.vue b/src/layout/components/screenfull/index.vue
index a551305..978ba50 100644
--- a/src/layout/components/screenfull/index.vue
+++ b/src/layout/components/screenfull/index.vue
@@ -1,8 +1,6 @@
@@ -12,9 +10,7 @@ const { isFullscreen, toggle } = useFullscreen();
@click="toggle"
>
diff --git a/src/layout/components/search/components/SearchFooter.vue b/src/layout/components/search/components/SearchFooter.vue
index 557644d..051ca5f 100644
--- a/src/layout/components/search/components/SearchFooter.vue
+++ b/src/layout/components/search/components/SearchFooter.vue
@@ -18,7 +18,7 @@
diff --git a/src/views/login/utils/rule.ts b/src/views/login/utils/rule.ts
index a68a9d4..6b73d5a 100644
--- a/src/views/login/utils/rule.ts
+++ b/src/views/login/utils/rule.ts
@@ -1,6 +1,5 @@
import { reactive } from "vue";
import type { FormRules } from "element-plus";
-import { $t, transformI18n } from "@/plugins/i18n";
/** 密码正则(密码格式应为8-18位数字、字母、符号的任意两种组合) */
export const REGEXP_PWD =
@@ -12,9 +11,11 @@ const loginRules = reactive({
{
validator: (rule, value, callback) => {
if (value === "") {
- callback(new Error(transformI18n($t("login.passwordReg"))));
+ callback(new Error("请输入密码"));
} else if (!REGEXP_PWD.test(value)) {
- callback(new Error(transformI18n($t("login.passwordRuleReg"))));
+ callback(
+ new Error("密码格式应为8-18位数字、字母、符号的任意两种组合")
+ );
} else {
callback();
}
diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue
index 9b7248b..8db10d2 100644
--- a/src/views/welcome/index.vue
+++ b/src/views/welcome/index.vue
@@ -5,5 +5,5 @@ defineOptions({
- Pure-Admin-Thin
+ Pure-Admin-Thin(非国际化版本)
diff --git a/types/global.d.ts b/types/global.d.ts
index 06d9739..60acb4d 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -101,7 +101,6 @@ declare global {
HiddenSideBar?: boolean;
MultiTagsCache?: boolean;
KeepAlive?: boolean;
- Locale?: string;
Layout?: string;
Theme?: string;
DarkMode?: boolean;
diff --git a/types/index.ts b/types/index.ts
index 017550a..914094c 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -7,7 +7,6 @@ export interface StorageConfigs {
hiddenSideBar?: boolean;
multiTagsCache?: boolean;
keepAlive?: boolean;
- locale?: string;
layout?: string;
theme?: string;
darkMode?: boolean;
@@ -30,9 +29,6 @@ export interface StorageConfigs {
}
export interface ResponsiveStorage {
- locale: {
- locale?: string;
- };
layout: {
layout?: string;
theme?: string;
diff --git a/vite.config.ts b/vite.config.ts
index b1c7707..c10236c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -63,7 +63,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
},
plugins: getPluginsList(command, VITE_LEGACY, VITE_CDN, VITE_COMPRESSION),
optimizeDeps: {
- include: ["pinia", "vue-i18n", "lodash-es", "@vueuse/core", "dayjs"],
+ include: ["pinia", "lodash-es", "@vueuse/core", "dayjs"],
exclude: ["@pureadmin/theme/dist/browser-utils"]
},
build: {