Browse Source

release: update 3.4.6

i18n
xiaoxian521 2 years ago
parent
commit
2888f8c4f1
  1. 3
      index.html
  2. 4
      package.json
  3. 2
      pnpm-lock.yaml
  4. 2
      public/serverConfig.json
  5. 13
      src/router/utils.ts
  6. 2
      vite.config.ts

3
index.html

@ -10,9 +10,6 @@
/> />
<title>pure-admin-thin</title> <title>pure-admin-thin</title>
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<script>
window.process = {};
</script>
</head> </head>
<body> <body>

4
package.json

@ -1,6 +1,6 @@
{ {
"name": "pure-admin-thin", "name": "pure-admin-thin",
"version": "3.4.5",
"version": "3.4.6",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "cross-env --max_old_space_size=4096 vite", "dev": "cross-env --max_old_space_size=4096 vite",
@ -116,7 +116,7 @@
"stylelint-config-standard": "^24.0.0", "stylelint-config-standard": "^24.0.0",
"stylelint-order": "^5.0.0", "stylelint-order": "^5.0.0",
"typescript": "^4.7.4", "typescript": "^4.7.4",
"unocss": "^0.45.9",
"unocss": "^0.45.12",
"unplugin-vue-define-options": "^0.7.3", "unplugin-vue-define-options": "^0.7.3",
"vite": "^3.0.9", "vite": "^3.0.9",
"vite-plugin-mock": "^2.9.6", "vite-plugin-mock": "^2.9.6",

2
pnpm-lock.yaml

@ -81,7 +81,7 @@ specifiers:
stylelint-config-standard: ^24.0.0 stylelint-config-standard: ^24.0.0
stylelint-order: ^5.0.0 stylelint-order: ^5.0.0
typescript: ^4.7.4 typescript: ^4.7.4
unocss: ^0.45.9
unocss: ^0.45.12
unplugin-vue-define-options: ^0.7.3 unplugin-vue-define-options: ^0.7.3
vite: ^3.0.9 vite: ^3.0.9
vite-plugin-mock: ^2.9.6 vite-plugin-mock: ^2.9.6

2
public/serverConfig.json

@ -1,5 +1,5 @@
{ {
"Version": "3.4.5",
"Version": "3.4.6",
"Title": "PureAdmin", "Title": "PureAdmin",
"FixedHeader": true, "FixedHeader": true,
"HiddenSideBar": false, "HiddenSideBar": false,

13
src/router/utils.ts

@ -230,16 +230,21 @@ function addAsyncRoutes(arrRoutes: Array<RouteRecordRaw>) {
// 将backstage属性加入meta,标识此路由为后端返回路由 // 将backstage属性加入meta,标识此路由为后端返回路由
v.meta.backstage = true; v.meta.backstage = true;
// 父级的redirect属性取值:如果子级存在且父级的redirect属性不存在,默认取第一个子级的path;如果子级存在且父级的redirect属性存在,取存在的redirect属性,会覆盖默认值 // 父级的redirect属性取值:如果子级存在且父级的redirect属性不存在,默认取第一个子级的path;如果子级存在且父级的redirect属性存在,取存在的redirect属性,会覆盖默认值
if (v?.children && !v.redirect) v.redirect = v.children[0].path;
if (v?.children && v.children.length && !v.redirect)
v.redirect = v.children[0].path;
// 父级的name属性取值:如果子级存在且父级的name属性不存在,默认取第一个子级的name;如果子级存在且父级的name属性存在,取存在的name属性,会覆盖默认值 // 父级的name属性取值:如果子级存在且父级的name属性不存在,默认取第一个子级的name;如果子级存在且父级的name属性存在,取存在的name属性,会覆盖默认值
if (v?.children && !v.name) v.name = v.children[0].name;
if (v.meta?.frameSrc) v.component = IFrame;
if (v?.children && v.children.length && !v.name)
v.name = v.children[0].name;
if (v.meta?.frameSrc) {
v.component = IFrame;
} else {
// 对后端传component组件路径和不传做兼容(如果后端传component组件路径,那么path可以随便写,如果不传,component组件路径会跟path保持一致) // 对后端传component组件路径和不传做兼容(如果后端传component组件路径,那么path可以随便写,如果不传,component组件路径会跟path保持一致)
const index = v?.component const index = v?.component
? modulesRoutesKeys.findIndex(ev => ev.includes(v.component as any)) ? modulesRoutesKeys.findIndex(ev => ev.includes(v.component as any))
: modulesRoutesKeys.findIndex(ev => ev.includes(v.path)); : modulesRoutesKeys.findIndex(ev => ev.includes(v.path));
v.component = modulesRoutes[modulesRoutesKeys[index]]; v.component = modulesRoutes[modulesRoutesKeys[index]];
if (v.children) {
}
if (v?.children && v.children.length) {
addAsyncRoutes(v.children); addAsyncRoutes(v.children);
} }
}); });

2
vite.config.ts

@ -70,6 +70,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
chunkSizeWarningLimit: 4000 chunkSizeWarningLimit: 4000
}, },
define: { define: {
"process.platform": null,
"process.version": null,
__INTLIFY_PROD_DEVTOOLS__: false, __INTLIFY_PROD_DEVTOOLS__: false,
__APP_INFO__: JSON.stringify(__APP_INFO__) __APP_INFO__: JSON.stringify(__APP_INFO__)
} }

Loading…
Cancel
Save