release: update 3.6.1

feat: 打包构建添加可选 gzip 与 brotli 压缩模式
feat: 添加打包是否启动cdn替换本地库配置，默认false不启动
2025-11-03 13:44:47 +08:00 · 2022-10-27 02:42:33 +08:00 · 2022-10-27 02:35:56 +08:00 · 2022-10-26 19:44:44 +08:00 · 2022-10-26 11:09:33 +08:00 · 2022-10-26 00:16:34 +08:00
20 changed files with 389 additions and 93 deletions
--- a/.env.production
+++ b/.env.production
@@ -8,4 +8,12 @@ VITE_ROUTER_HISTORY = "hash"
 VITE_PROXY_DOMAIN_REAL = ""

 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
-VITE_LEGACY = false
+VITE_LEGACY = false
+
+# 是否在打包时使用cdn替换本地库 替换 true 不替换 false
+VITE_CDN = false
+
+# 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件）
+# 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+# 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+VITE_COMPRESSION = "none"
--- a/.env.staging
+++ b/.env.staging
@@ -12,3 +12,11 @@ VITE_PROXY_DOMAIN_REAL = ""

 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
 VITE_LEGACY = false
+
+# 是否在打包时使用cdn替换本地库 替换 true 不替换 false
+VITE_CDN = false
+
+# 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件）
+# 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+# 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+VITE_COMPRESSION = "none"
--- a/.github/workflows/gitee.yml
+++ b/.github/workflows/gitee.yml
@@ -4,7 +4,7 @@ permissions:
 on:
  push:
    branches:
-      - gitee
+      - master
 jobs:
  deploy:
    concurrency: ci-${{ github.ref }}
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,3 +1,19 @@
+# 3.6.1 (2022-10-27)
+
+### 🎫 Feat
+
+- Add whether to start `cdn` for packaging to replace the local library configuration, the default `false` does not start
+- Added optional `gzip` and `brotli` compression modes for packaging builds
+
+### 🐞 Bug fixes
+
+- Fix `title` too long display style problem
+- Fix the parent `name` in the route should not be repeated with the child `name`, which will cause redirection to jump `404` problem
+
+### 🍏 Perf
+
+- Upgrade `axios` to the latest version
+
 # 3.6.0 (2022-10-25)

 ### 🎫 Feat
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 3.6.1 (2022-10-27)
+
+### 🎫 Feat
+
+- Add whether to start `cdn` for packaging to replace the local library configuration, the default `false` does not start
+- Added optional `gzip` and `brotli` compression modes for packaging builds
+
+### 🐞 Bug fixes
+
+- Fix `title` too long display style problem
+- Fix the parent `name` in the route should not be repeated with the child `name`, which will cause redirection to jump `404` problem
+
+### 🍏 Perf
+
+- Upgrade `axios` to the latest version
+
 # 3.6.0 (2022-10-25)

 ### 🎫 Feat
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,19 @@
+# 3.6.1 (2022-10-27)
+
+### 🎫 Feat
+
+- 添加打包是否启动`cdn`替换本地库配置，默认`false`不启动
+- 添加打包构建可选`gzip`与`brotli`压缩模式
+
+### 🐞 Bug fixes
+
+- 修复`title`过长显示样式问题
+- 修复路由中父级`name`不应和子级`name`重复，会造成重定向跳转`404`问题
+
+### 🍏 Perf
+
+- 升级`axios`至最新版
+
 # 3.6.0 (2022-10-25)

 ### 🎫 Feat
--- a/build/cdn.ts
+++ b/build/cdn.ts
@@ -0,0 +1,67 @@
+import { Plugin as importToCDN } from "vite-plugin-cdn-import";
+
+/**
+ * @description 打包时采用`cdn`模式，仅限外网使用（默认不采用，如果需要采用cdn模式，请在 .env.production 文件，将 VITE_CDN 设置成true）
+ * 平台采用国内cdn：https://www.bootcdn.cn，当然你也可以选择 https://unpkg.com 或者 https://www.jsdelivr.com
+ * 提醒：mockjs不能用cdn模式引入，会报错。正确的方式是，生产环境删除mockjs，使用真实的后端请求
+ * 注意：上面提到的仅限外网使用也不是完全肯定的，如果你们公司内网部署的有相关js、css文件，也可以将下面配置对应改一下，整一套内网版cdn
+ */
+export const cdn = importToCDN({
+  //（prodUrl解释： name: 对应下面modules的name，version: 自动读取本地package.json中dependencies依赖中对应包的版本号，path: 对应下面modules的path）
+  prodUrl: "https://cdn.bootcdn.net/ajax/libs/{name}/{version}/{path}",
+  modules: [
+    {
+      name: "vue",
+      var: "Vue",
+      path: "vue.global.prod.min.js"
+    },
+    {
+      name: "vue-router",
+      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",
+      var: "VueDemi",
+      path: "index.iife.min.js"
+    },
+    {
+      name: "pinia",
+      var: "Pinia",
+      path: "pinia.iife.min.js"
+    },
+    {
+      name: "element-plus",
+      var: "ElementPlus",
+      path: "index.full.min.js",
+      css: "index.min.css"
+    },
+    {
+      name: "axios",
+      var: "axios",
+      path: "axios.min.js"
+    },
+    {
+      name: "dayjs",
+      var: "dayjs",
+      path: "dayjs.min.js"
+    },
+    {
+      name: "echarts",
+      var: "echarts",
+      path: "echarts.min.js"
+    },
+    {
+      name: "lodash",
+      var: "lodash",
+      // 可写`完整路径`，会替换`prodUrl`
+      path: "https://cdn.bootcdn.net/ajax/libs/lodash.js/4.17.21/lodash.min.js"
+    }
+  ]
+});
--- a/build/compress.ts
+++ b/build/compress.ts
@@ -0,0 +1,63 @@
+import type { Plugin } from "vite";
+import { isArray } from "@pureadmin/utils";
+import compressPlugin from "vite-plugin-compression";
+
+export const configCompressPlugin = (
+  compress: ViteCompression
+): Plugin | Plugin[] => {
+  if (compress === "none") return null;
+
+  const gz = {
+    // 生成的压缩包后缀
+    ext: ".gz",
+    // 体积大于threshold才会被压缩
+    threshold: 0,
+    // 默认压缩.js|mjs|json|css|html后缀文件，设置成true，压缩全部文件
+    filter: () => true,
+    // 压缩后是否删除原始文件
+    deleteOriginFile: false
+  };
+  const br = {
+    ext: ".br",
+    algorithm: "brotliCompress",
+    threshold: 0,
+    filter: () => true,
+    deleteOriginFile: false
+  };
+
+  const codeList = [
+    { k: "gzip", v: gz },
+    { k: "brotli", v: br },
+    { k: "both", v: [gz, br] }
+  ];
+
+  const plugins: Plugin[] = [];
+
+  codeList.forEach(item => {
+    if (compress.includes(item.k)) {
+      if (compress.includes("clear")) {
+        if (isArray(item.v)) {
+          item.v.forEach(vItem => {
+            plugins.push(
+              compressPlugin(Object.assign(vItem, { deleteOriginFile: true }))
+            );
+          });
+        } else {
+          plugins.push(
+            compressPlugin(Object.assign(item.v, { deleteOriginFile: true }))
+          );
+        }
+      } else {
+        if (isArray(item.v)) {
+          item.v.forEach(vItem => {
+            plugins.push(compressPlugin(vItem));
+          });
+        } else {
+          plugins.push(compressPlugin(item.v));
+        }
+      }
+    }
+  });
+
+  return plugins;
+};
--- a/build/index.ts
+++ b/build/index.ts
@@ -7,7 +7,9 @@ const warpperEnv = (envConf: Recordable): ViteEnv => {
    VITE_PROXY_DOMAIN: "",
    VITE_PROXY_DOMAIN_REAL: "",
    VITE_ROUTER_HISTORY: "",
-    VITE_LEGACY: false
+    VITE_LEGACY: false,
+    VITE_CDN: false,
+    VITE_COMPRESSION: "none"
  };

  for (const envName of Object.keys(envConf)) {
--- a/build/plugins.ts
+++ b/build/plugins.ts
@@ -1,3 +1,4 @@
+import { cdn } from "./cdn";
 import { resolve } from "path";
 import vue from "@vitejs/plugin-vue";
 import { viteBuildInfo } from "./info";
@@ -5,6 +6,7 @@ import svgLoader from "vite-svg-loader";
 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 { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
@@ -12,7 +14,12 @@ import themePreprocessorPlugin from "@pureadmin/theme";
 import { genScssMultipleScopeVars } from "/@/layout/theme";
 import DefineOptions from "unplugin-vue-define-options/vite";

-export function getPluginsList(command, VITE_LEGACY) {
+export function getPluginsList(
+  command: string,
+  VITE_LEGACY: boolean,
+  VITE_CDN: boolean,
+  VITE_COMPRESSION: ViteCompression
+) {
  const prodMock = true;
  const lifecycle = process.env.npm_lifecycle_event;
  return [
@@ -25,6 +32,8 @@ export function getPluginsList(command, VITE_LEGACY) {
    }),
    // jsx、tsx语法支持
    vueJsx(),
+    VITE_CDN ? cdn : null,
+    configCompressPlugin(VITE_COMPRESSION),
    DefineOptions(),
    // 线上环境删除console
    removeConsole({ external: ["src/assets/iconfont/iconfont.js"] }),
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-pure-admin",
-  "version": "3.6.0",
+  "version": "3.6.1",
  "private": true,
  "scripts": {
    "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
@@ -36,13 +36,13 @@
    "@pureadmin/descriptions": "^1.1.0",
    "@pureadmin/table": "^1.2.0",
    "@pureadmin/utils": "^1.1.5",
-    "@vueuse/core": "^9.3.0",
+    "@vueuse/core": "^9.4.0",
    "@vueuse/motion": "^2.0.0-beta.12",
-    "@vueuse/shared": "^9.3.0",
+    "@vueuse/shared": "^9.4.0",
    "@wangeditor/editor": "^5.1.21",
    "@wangeditor/editor-for-vue": "^5.1.12",
    "animate.css": "^4.1.1",
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
    "china-area-data": "^5.0.1",
    "cropperjs": "^1.5.12",
    "dayjs": "^1.11.5",
@@ -66,7 +66,7 @@
    "resize-observer-polyfill": "^1.5.1",
    "responsive-storage": "^2.1.0",
    "sortablejs": "^1.15.0",
-    "swiper": "^8.4.3",
+    "swiper": "^8.4.4",
    "typeit": "^8.7.0",
    "v-contextmenu": "3.0.0",
    "vue": "^3.2.40",
@@ -74,13 +74,13 @@
    "vue-i18n": "^9.2.2",
    "vue-json-pretty": "^2.2.2",
    "vue-pdf-embed": "^1.1.4",
-    "vue-router": "^4.1.5",
+    "vue-router": "^4.1.6",
    "vue-types": "^4.2.1",
    "vue-virtual-scroller": "^2.0.0-alpha.1",
    "vuedraggable": "^4.1.0",
    "vxe-table": "^4.3.5",
    "xe-utils": "^3.5.7",
-    "xgplayer": "^2.32.0",
+    "xgplayer": "^2.32.1",
    "xlsx": "^0.18.5"
  },
  "devDependencies": {
@@ -142,11 +142,13 @@
    "stylelint-config-recommended": "^6.0.0",
    "stylelint-config-standard": "^24.0.0",
    "stylelint-order": "^5.0.0",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.2.1",
    "terser": "^5.15.0",
    "typescript": "^4.7.4",
    "unplugin-vue-define-options": "0.7.3",
    "vite": "^3.1.8",
+    "vite-plugin-cdn-import": "^0.3.5",
+    "vite-plugin-compression": "^0.5.1",
    "vite-plugin-mock": "^2.9.6",
    "vite-plugin-remove-console": "^1.1.0",
    "vite-svg-loader": "^3.6.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,14 +41,14 @@ specifiers:
  "@vue/eslint-config-prettier": ^7.0.0
  "@vue/eslint-config-typescript": ^10.0.0
  "@vue/runtime-core": ^3.2.40
-  "@vueuse/core": ^9.3.0
+  "@vueuse/core": ^9.4.0
  "@vueuse/motion": ^2.0.0-beta.12
-  "@vueuse/shared": ^9.3.0
+  "@vueuse/shared": ^9.4.0
  "@wangeditor/editor": ^5.1.21
  "@wangeditor/editor-for-vue": ^5.1.12
  animate.css: ^4.1.1
  autoprefixer: ^10.4.12
-  axios: ^0.27.2
+  axios: ^1.1.3
  china-area-data: ^5.0.1
  cloc: ^2.10.0
  cropperjs: ^1.5.12
@@ -97,14 +97,16 @@ specifiers:
  stylelint-config-recommended: ^6.0.0
  stylelint-config-standard: ^24.0.0
  stylelint-order: ^5.0.0
-  swiper: ^8.4.3
-  tailwindcss: ^3.1.8
+  swiper: ^8.4.4
+  tailwindcss: ^3.2.1
  terser: ^5.15.0
  typeit: ^8.7.0
  typescript: ^4.7.4
  unplugin-vue-define-options: 0.7.3
  v-contextmenu: 3.0.0
  vite: ^3.1.8
+  vite-plugin-cdn-import: ^0.3.5
+  vite-plugin-compression: ^0.5.1
  vite-plugin-mock: ^2.9.6
  vite-plugin-remove-console: ^1.1.0
  vite-svg-loader: ^3.6.0
@@ -114,14 +116,14 @@ specifiers:
  vue-i18n: ^9.2.2
  vue-json-pretty: ^2.2.2
  vue-pdf-embed: ^1.1.4
-  vue-router: ^4.1.5
+  vue-router: ^4.1.6
  vue-tsc: ^0.40.13
  vue-types: ^4.2.1
  vue-virtual-scroller: ^2.0.0-alpha.1
  vuedraggable: ^4.1.0
  vxe-table: ^4.3.5
  xe-utils: ^3.5.7
-  xgplayer: ^2.32.0
+  xgplayer: ^2.32.1
  xlsx: ^0.18.5

 dependencies:
@@ -133,13 +135,13 @@ dependencies:
  "@pureadmin/descriptions": 1.1.0
  "@pureadmin/table": 1.2.0
  "@pureadmin/utils": 1.1.5_888d42e6b1d4aaf209a7326195b5949d
-  "@vueuse/core": 9.3.0_vue@3.2.40
+  "@vueuse/core": 9.4.0_vue@3.2.40
  "@vueuse/motion": 2.0.0-beta.12_vue@3.2.40
-  "@vueuse/shared": 9.3.0_vue@3.2.40
+  "@vueuse/shared": 9.4.0_vue@3.2.40
  "@wangeditor/editor": 5.1.21
  "@wangeditor/editor-for-vue": 5.1.12_671b67f2147af6cd32d57e9d16d7b064
  animate.css: 4.1.1
-  axios: 0.27.2
+  axios: 1.1.3
  china-area-data: 5.0.1
  cropperjs: 1.5.12
  dayjs: 1.11.5
@@ -163,7 +165,7 @@ dependencies:
  resize-observer-polyfill: 1.5.1
  responsive-storage: 2.1.0
  sortablejs: 1.15.0
-  swiper: 8.4.3
+  swiper: 8.4.4
  typeit: 8.7.0
  v-contextmenu: 3.0.0_vue@3.2.40
  vue: 3.2.40
@@ -171,13 +173,13 @@ dependencies:
  vue-i18n: 9.2.2_vue@3.2.40
  vue-json-pretty: 2.2.2_vue@3.2.40
  vue-pdf-embed: 1.1.4_vue@3.2.40
-  vue-router: 4.1.5_vue@3.2.40
+  vue-router: 4.1.6_vue@3.2.40
  vue-types: 4.2.1_vue@3.2.40
  vue-virtual-scroller: 2.0.0-alpha.1_vue@3.2.40
  vuedraggable: 4.1.0_vue@3.2.40
  vxe-table: 4.3.5_vue@3.2.40+xe-utils@3.5.7
  xe-utils: 3.5.7
-  xgplayer: 2.32.0
+  xgplayer: 2.32.1
  xlsx: 0.18.5

 devDependencies:
@@ -239,11 +241,13 @@ devDependencies:
  stylelint-config-recommended: 6.0.0_stylelint@14.13.0
  stylelint-config-standard: 24.0.0_stylelint@14.13.0
  stylelint-order: 5.0.0_stylelint@14.13.0
-  tailwindcss: 3.1.8
+  tailwindcss: 3.2.1
  terser: 5.15.1
  typescript: 4.8.4
  unplugin-vue-define-options: 0.7.3_vite@3.1.8+vue@3.2.40
  vite: 3.1.8_sass@1.55.0+terser@5.15.1
+  vite-plugin-cdn-import: 0.3.5
+  vite-plugin-compression: 0.5.1_vite@3.1.8
  vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@3.1.8
  vite-plugin-remove-console: 1.1.0
  vite-svg-loader: 3.6.0
@@ -1681,10 +1685,10 @@ packages:
      }
    dev: false

-  /@types/web-bluetooth/0.0.15:
+  /@types/web-bluetooth/0.0.16:
    resolution:
      {
-        integrity: sha512-w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA==
+        integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==
      }
    dev: false

@@ -2080,6 +2084,13 @@ packages:
      }
    dev: false

+  /@vue/devtools-api/6.4.5:
+    resolution:
+      {
+        integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==
+      }
+    dev: false
+
  /@vue/eslint-config-prettier/7.0.0_eslint@8.25.0+prettier@2.7.1:
    resolution:
      {
@@ -2215,15 +2226,15 @@ packages:
      vue-demi: 0.13.11_vue@3.2.40
    dev: false

-  /@vueuse/core/9.3.0_vue@3.2.40:
+  /@vueuse/core/9.4.0_vue@3.2.40:
    resolution:
      {
-        integrity: sha512-64Rna8IQDWpdrJxgitDg7yv1yTp41ZmvV8zlLEylK4QQLWAhz1OFGZDPZ8bU4lwcGgbEJ2sGi2jrdNh4LttUSQ==
+        integrity: sha512-JzgenGj1ZF2BHOen5rsFiAyyI9sXAv7aKhNLlm9b7SwYQeKTcxTWdhudonURCSP3Egl9NQaRBzes2lv/1JUt/Q==
      }
    dependencies:
-      "@types/web-bluetooth": 0.0.15
-      "@vueuse/metadata": 9.3.0
-      "@vueuse/shared": 9.3.0_vue@3.2.40
+      "@types/web-bluetooth": 0.0.16
+      "@vueuse/metadata": 9.4.0
+      "@vueuse/shared": 9.4.0_vue@3.2.40
      vue-demi: 0.13.11_vue@3.2.40
    transitivePeerDependencies:
      - "@vue/composition-api"
@@ -2237,10 +2248,10 @@ packages:
      }
    dev: false

-  /@vueuse/metadata/9.3.0:
+  /@vueuse/metadata/9.4.0:
    resolution:
      {
-        integrity: sha512-GnnfjbzIPJIh9ngL9s9oGU1+Hx/h5/KFqTfJykzh/1xjaHkedV9g0MASpdmPZIP+ynNhKAcEfA6g5i8KXwtoMA==
+        integrity: sha512-7GKMdGAsJyQJl35MYOz/RDpP0FxuiZBRDSN79QIPbdqYx4Sd0sVTnIC68KJ6Oln0t0SouvSUMvRHuno216Ud2Q==
      }
    dev: false

@@ -2283,10 +2294,10 @@ packages:
      vue-demi: 0.13.11_vue@3.2.40
    dev: false

-  /@vueuse/shared/9.3.0_vue@3.2.40:
+  /@vueuse/shared/9.4.0_vue@3.2.40:
    resolution:
      {
-        integrity: sha512-caGUWLY0DpPC6l31KxeUy6vPVNA0yKxx81jFYLoMpyP6cF84FG5Dkf69DfSUqL57wX8JcUkJDMnQaQIZPWFEQQ==
+        integrity: sha512-fTuem51KwMCnqUKkI8B57qAIMcFovtGgsCtAeqxIzH3i6nE9VYge+gVfneNHAAy7lj8twbkNfqQSygOPJTm4tQ==
      }
    dependencies:
      vue-demi: 0.13.11_vue@3.2.40
@@ -2852,14 +2863,15 @@ packages:
      postcss-value-parser: 4.2.0
    dev: true

-  /axios/0.27.2:
+  /axios/1.1.3:
    resolution:
      {
-        integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+        integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==
      }
    dependencies:
      follow-redirects: 1.15.2
      form-data: 4.0.0
+      proxy-from-env: 1.1.0
    transitivePeerDependencies:
      - debug
    dev: false
@@ -3579,10 +3591,10 @@ packages:
      type: 1.2.0
    dev: false

-  /danmu.js/1.1.1:
+  /danmu.js/1.1.2:
    resolution:
      {
-        integrity: sha512-UmnwBCMbedOw8p6Xrl2HZECOmtCOJ3wL709IBQti+u1tHpDyt/rTjbu3I+NUZ8JzBMf3nscf4fAaWXV/mpKx5g==
+        integrity: sha512-QbJYDP7qJ70fZgq+2bm2xj4jLNymC1wYKfb8cM8Y89w3GRdbCgxV39Znoj45AWU3WYzK/CVN7papo+BmoJ7RjQ==
      }
    dependencies:
      event-emitter: 0.3.5
@@ -3673,10 +3685,10 @@ packages:
    engines: { node: ">=8" }
    dev: true

-  /defined/1.0.0:
+  /defined/1.0.1:
    resolution:
      {
-        integrity: sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==
+        integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
      }
    dev: true

@@ -3697,8 +3709,8 @@ packages:
    hasBin: true
    dependencies:
      acorn-node: 1.8.2
-      defined: 1.0.0
-      minimist: 1.2.6
+      defined: 1.0.1
+      minimist: 1.2.7
    dev: true

  /didyoumean/1.2.2:
@@ -3935,7 +3947,7 @@ packages:
      "@popperjs/core": /@sxzz/popperjs-es/2.11.7
      "@types/lodash": 4.14.186
      "@types/lodash-es": 4.17.6
-      "@vueuse/core": 9.3.0_vue@3.2.40
+      "@vueuse/core": 9.4.0_vue@3.2.40
      async-validator: 4.2.5
      dayjs: 1.11.5
      escape-html: 1.0.3
@@ -5513,6 +5525,15 @@ packages:
      }
    engines: { node: ">=0.10.0" }

+  /is-reference/1.2.1:
+    resolution:
+      {
+        integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
+      }
+    dependencies:
+      "@types/estree": 0.0.39
+    dev: true
+
  /is-regexp/1.0.0:
    resolution:
      {
@@ -6170,10 +6191,10 @@ packages:
      kind-of: 6.0.3
    dev: true

-  /minimist/1.2.6:
+  /minimist/1.2.7:
    resolution:
      {
-        integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+        integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
      }
    dev: true

@@ -6920,10 +6941,10 @@ packages:
      postcss-selector-parser: 6.0.10
    dev: true

-  /postcss-nested/5.0.6_postcss@8.4.17:
+  /postcss-nested/6.0.0_postcss@8.4.17:
    resolution:
      {
-        integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
+        integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
      }
    engines: { node: ">=12.0" }
    peerDependencies:
@@ -7259,6 +7280,13 @@ packages:
    engines: { node: ">= 0.6.0" }
    dev: false

+  /proxy-from-env/1.1.0:
+    resolution:
+      {
+        integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+      }
+    dev: false
+
  /pump/3.0.0:
    resolution:
      {
@@ -7523,6 +7551,23 @@ packages:
      glob: 7.2.3
    dev: true

+  /rollup-plugin-external-globals/0.6.1:
+    resolution:
+      {
+        integrity: sha512-mlp3KNa5sE4Sp9UUR2rjBrxjG79OyZAh/QC18RHIjM+iYkbBwNXSo8DHRMZWtzJTrH8GxQ+SJvCTN3i14uMXIA==
+      }
+    peerDependencies:
+      rollup: ^2.25.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+    dependencies:
+      "@rollup/pluginutils": 4.2.1
+      estree-walker: 2.0.2
+      is-reference: 1.2.1
+      magic-string: 0.25.9
+    dev: true
+
  /rollup-plugin-visualizer/5.8.2:
    resolution:
      {
@@ -8235,10 +8280,10 @@ packages:
      stable: 0.1.8
    dev: true

-  /swiper/8.4.3:
+  /swiper/8.4.4:
    resolution:
      {
-        integrity: sha512-+Ne/3rSZ1t28r//Upg8AdLgXJ+/nTw79GZFl6RQb2TckfnX6JTQZWWiNTT3uqP9Cyixb+OhT9fRBqAWnjM444A==
+        integrity: sha512-jA/8BfOZwT8PqPSnMX0TENZYitXEhNa7ZSNj1Diqh5LZyUJoBQaZcqAiPQ/PIg1+IPaRn/V8ZYVb0nxHMh51yw==
      }
    engines: { node: ">= 4.7.0" }
    requiresBuild: true
@@ -8268,10 +8313,10 @@ packages:
      strip-ansi: 6.0.1
    dev: true

-  /tailwindcss/3.1.8:
+  /tailwindcss/3.2.1:
    resolution:
      {
-        integrity: sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==
+        integrity: sha512-Uw+GVSxp5CM48krnjHObqoOwlCt5Qo6nw1jlCRwfGy68dSYb/LwS9ZFidYGRiM+w6rMawkZiu1mEMAsHYAfoLg==
      }
    engines: { node: ">=12.13.0" }
    hasBin: true
@@ -8286,6 +8331,7 @@ packages:
      glob-parent: 6.0.2
      is-glob: 4.0.3
      lilconfig: 2.0.6
+      micromatch: 4.0.5
      normalize-path: 3.0.0
      object-hash: 3.0.0
      picocolors: 1.0.0
@@ -8293,7 +8339,7 @@ packages:
      postcss-import: 14.1.0_postcss@8.4.17
      postcss-js: 4.0.0_postcss@8.4.17
      postcss-load-config: 3.1.4_postcss@8.4.17
-      postcss-nested: 5.0.6_postcss@8.4.17
+      postcss-nested: 6.0.0_postcss@8.4.17
      postcss-selector-parser: 6.0.10
      postcss-value-parser: 4.2.0
      quick-lru: 5.1.1
@@ -8681,6 +8727,33 @@ packages:
      spdx-expression-parse: 3.0.1
    dev: true

+  /vite-plugin-cdn-import/0.3.5:
+    resolution:
+      {
+        integrity: sha512-e1raoalfBiIhv+hnMeSp1UNjloDDBhHpeFxkwRRdPBmTdDRqdEEn8owUmT5u8UBSVCs4xN3n/od4a91vXEhXPQ==
+      }
+    dependencies:
+      rollup-plugin-external-globals: 0.6.1
+    transitivePeerDependencies:
+      - rollup
+    dev: true
+
+  /vite-plugin-compression/0.5.1_vite@3.1.8:
+    resolution:
+      {
+        integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==
+      }
+    peerDependencies:
+      vite: ">=2.0.0"
+    dependencies:
+      chalk: 4.1.2
+      debug: 4.3.4
+      fs-extra: 10.1.0
+      vite: 3.1.8_sass@1.55.0+terser@5.15.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
  /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@3.1.8:
    resolution:
      {
@@ -8875,15 +8948,15 @@ packages:
      vue: 3.2.40
    dev: false

-  /vue-router/4.1.5_vue@3.2.40:
+  /vue-router/4.1.6_vue@3.2.40:
    resolution:
      {
-        integrity: sha512-IsvoF5D2GQ/EGTs/Th4NQms9gd2NSqV+yylxIyp/OYp8xOwxmU8Kj/74E9DTSYAyH5LX7idVUngN3JSj1X4xcQ==
+        integrity: sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==
      }
    peerDependencies:
      vue: ^3.2.0
    dependencies:
-      "@vue/devtools-api": 6.4.4
+      "@vue/devtools-api": 6.4.5
      vue: 3.2.40
    dev: false

@@ -9131,16 +9204,16 @@ packages:
      generate-source-map: 0.0.5
    dev: false

-  /xgplayer/2.32.0:
+  /xgplayer/2.32.1:
    resolution:
      {
-        integrity: sha512-OT5VKU2j4729+bJhrR1BPLIrEF1JYeoDyPe9gLoFodh8XS+i26LbWaM2dOFy7uh+9ZiGUioHkSPDeM1jDrWfdw==
+        integrity: sha512-jUs6108INqnzEn3DTGre6pHW3KroM2w0VKuJNEvOIkoD2oUB+MW5ZZ0PsIwijX/oQRpmvq422CUgo4uqXVidEQ==
      }
    hasBin: true
    dependencies:
      chalk: 2.4.2
      commander: 2.20.3
-      danmu.js: 1.1.1
+      danmu.js: 1.1.2
      downloadjs: 1.4.7
      draggabilly: 2.4.1
      event-emitter: 0.3.5
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.6.0",
+  "Version": "3.6.1",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/sidebar/logo.vue
@@ -51,6 +51,12 @@ const { title } = useNav();
    margin-top: 5px;

    .sidebar-title {
+      display: block;
+      width: 160px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      text-align: left;
      color: #1890ff;
      font-weight: 600;
      font-size: 20px;
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -157,6 +157,7 @@ function initRouter() {
    getAsyncRoutes().then(({ data }) => {
      if (data.length === 0) {
        usePermissionStoreHook().handleWholeMenus(data);
+        resolve(router);
      } else {
        formatFlatteningRoutes(addAsyncRoutes(data)).map(
          (v: RouteRecordRaw) => {
@@ -269,9 +270,9 @@ function addAsyncRoutes(arrRoutes: Array<RouteRecordRaw>) {
    // 父级的redirect属性取值：如果子级存在且父级的redirect属性不存在，默认取第一个子级的path；如果子级存在且父级的redirect属性存在，取存在的redirect属性，会覆盖默认值
    if (v?.children && v.children.length && !v.redirect)
      v.redirect = v.children[0].path;
-    // 父级的name属性取值：如果子级存在且父级的name属性不存在，默认取第一个子级的name；如果子级存在且父级的name属性存在，取存在的name属性，会覆盖默认值
+    // 父级的name属性取值：如果子级存在且父级的name属性不存在，默认取第一个子级的name；如果子级存在且父级的name属性存在，取存在的name属性，会覆盖默认值（注意：测试中发现父级的name不能和子级name重复，如果重复会造成重定向无效（跳转404），所以这里给父级的name起名的时候后面会自动加上`Parent`，避免重复）
    if (v?.children && v.children.length && !v.name)
-      v.name = v.children[0].name;
+      v.name = (v.children[0].name as string) + "Parent";
    if (v.meta?.frameSrc) {
      v.component = IFrame;
    } else {
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -1,11 +1,15 @@
-import Axios, { AxiosInstance, AxiosRequestConfig } from "axios";
+import Axios, {
+  AxiosInstance,
+  AxiosRequestConfig,
+  CustomParamsSerializer
+} from "axios";
 import {
  PureHttpError,
  RequestMethods,
  PureHttpResponse,
  PureHttpRequestConfig
 } from "./types.d";
-import qs from "qs";
+import { stringify } from "qs";
 import NProgress from "../progress";
 // import { loadEnv } from "@build/index";
 import { getToken } from "/@/utils/auth";
@@ -20,7 +24,7 @@ const defaultConfig: AxiosRequestConfig = {
  //   process.env.NODE_ENV === "production"
  //     ? VITE_PROXY_DOMAIN_REAL
  //     : VITE_PROXY_DOMAIN,
-  // 当前使用mock模拟请求，将baseURL制空，如果你的环境用到了http请求，请删除下面的baseURL启用上面的baseURL，并将第10行、15行代码注释取消
+  // 当前使用mock模拟请求，将baseURL制空，如果你的环境用到了http请求，请删除下面的baseURL启用上面的baseURL，并将第14行、19行代码注释取消
  baseURL: "",
  timeout: 10000,
  headers: {
@@ -28,8 +32,10 @@ const defaultConfig: AxiosRequestConfig = {
    "Content-Type": "application/json",
    "X-Requested-With": "XMLHttpRequest"
  },
-  // 数组格式参数序列化
-  paramsSerializer: params => qs.stringify(params, { indices: false })
+  // 数组格式参数序列化（https://github.com/axios/axios/issues/5142）
+  paramsSerializer: {
+    serialize: stringify as unknown as CustomParamsSerializer
+  }
 };

 class PureHttp {
@@ -59,7 +65,7 @@ class PureHttp {
          PureHttp.initConfig.beforeRequestCallback($config);
          return $config;
        }
-        /** 请求白名单（通过设置请求白名单，防止token过期后再请求造成的死循环问题） */
+        /** 请求白名单，放置一些不需要token的接口（通过设置请求白名单，防止token过期后再请求造成的死循环问题） */
        const whiteList = ["/refreshToken", "/login"];
        return whiteList.some(v => config.url.indexOf(v) > -1)
          ? config
--- a/src/views/permission/button/index.vue
+++ b/src/views/permission/button/index.vue
@@ -6,20 +6,21 @@ defineOptions({
  name: "PermissionButton"
 });

-let width = computed((): CSSProperties => {
+let elStyle = computed((): CSSProperties => {
  return {
-    width: "85vw"
+    width: "85vw",
+    justifyContent: "start"
  };
 });
 </script>

 <template>
  <el-space direction="vertical" size="large">
-    <el-tag :style="width" size="large" effect="dark">
+    <el-tag :style="elStyle" size="large" effect="dark">
      当前拥有的code列表：{{ getAuths() }}
    </el-tag>

-    <el-card shadow="never" :style="width">
+    <el-card shadow="never" :style="elStyle">
      <template #header>
        <div class="card-header">组件方式判断权限</div>
      </template>
@@ -36,7 +37,7 @@ let width = computed((): CSSProperties => {
      </Auth>
    </el-card>

-    <el-card shadow="never" :style="width">
+    <el-card shadow="never" :style="elStyle">
      <template #header>
        <div class="card-header">函数方式判断权限</div>
      </template>
@@ -54,7 +55,7 @@ let width = computed((): CSSProperties => {
      </el-button>
    </el-card>

-    <el-card shadow="never" :style="width">
+    <el-card shadow="never" :style="elStyle">
      <template #header>
        <div class="card-header">
          指令方式判断权限（该方式不能动态修改权限）
@@ -72,9 +73,3 @@ let width = computed((): CSSProperties => {
    </el-card>
  </el-space>
 </template>
-
-<style lang="scss" scoped>
-:deep(.el-tag) {
-  justify-content: start;
-}
-</style>
--- a/src/views/permission/page/index.vue
+++ b/src/views/permission/page/index.vue
@@ -8,9 +8,10 @@ defineOptions({
  name: "PermissionPage"
 });

-let width = computed((): CSSProperties => {
+let elStyle = computed((): CSSProperties => {
  return {
-    width: "85vw"
+    width: "85vw",
+    justifyContent: "start"
  };
 });

@@ -41,10 +42,10 @@ function onChange() {

 <template>
  <el-space direction="vertical" size="large">
-    <el-tag :style="width" size="large" effect="dark">
+    <el-tag :style="elStyle" size="large" effect="dark">
      模拟后台根据不同角色返回对应路由，观察左侧菜单变化（管理员角色可查看系统管理菜单、普通角色不可查看系统管理菜单）
    </el-tag>
-    <el-card shadow="never" :style="width">
+    <el-card shadow="never" :style="elStyle">
      <template #header>
        <div class="card-header">
          <span>当前角色：{{ username }}</span>
@@ -61,9 +62,3 @@ function onChange() {
    </el-card>
  </el-space>
 </template>
-
-<style lang="scss" scoped>
-:deep(.el-tag) {
-  justify-content: start;
-}
-</style>
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -74,6 +74,15 @@ declare global {
    __: unknown;
  }

+  type ViteCompression =
+    | "none"
+    | "gzip"
+    | "brotli"
+    | "both"
+    | "gzip-clear"
+    | "brotli-clear"
+    | "both-clear";
+
  declare interface ViteEnv {
    VITE_PORT: number;
    VITE_PUBLIC_PATH: string;
@@ -81,6 +90,8 @@ declare global {
    VITE_PROXY_DOMAIN_REAL: string;
    VITE_ROUTER_HISTORY: string;
    VITE_LEGACY: boolean;
+    VITE_CDN: boolean;
+    VITE_COMPRESSION: ViteCompression;
  }

  declare interface ServerConfigs {
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -27,8 +27,10 @@ const __APP_INFO__ = {

 export default ({ command, mode }: ConfigEnv): UserConfigExport => {
  const {
+    VITE_CDN,
    VITE_PORT,
    VITE_LEGACY,
+    VITE_COMPRESSION,
    VITE_PUBLIC_PATH,
    VITE_PROXY_DOMAIN,
    VITE_PROXY_DOMAIN_REAL
@@ -59,7 +61,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
            }
          : null
    },
-    plugins: getPluginsList(command, VITE_LEGACY),
+    plugins: getPluginsList(command, VITE_LEGACY, VITE_CDN, VITE_COMPRESSION),
    optimizeDeps: {
      include: ["pinia", "vue-i18n", "lodash-es", "@vueuse/core", "dayjs"],
      exclude: ["@pureadmin/theme/dist/browser-utils"]
Author	SHA1	Message	Date
xiaoxian521	307944cdb5	release: update `3.6.1`	2022-10-27 02:42:33 +08:00
xiaoxian521	f5a75356df	feat: 打包构建添加可选 `gzip` 与 `brotli` 压缩模式	2022-10-27 02:35:56 +08:00
xiaoxian521	54ebd19875	feat: 添加打包是否启动`cdn`替换本地库配置，默认`false`不启动	2022-10-26 19:44:44 +08:00
xiaoxian521	303fc25af3	fix: 修复路由中父级`name`不应和子级`name`重复，会造成重定向跳转`404`问题	2022-10-26 11:09:33 +08:00
xiaoxian521	a455072d7a	chore: update `axios` latest	2022-10-26 00:16:34 +08:00
xiaoxian521	2bbf04b191	chore: update	2022-10-25 17:36:35 +08:00
xiaoxian521	e4c33a7d22	fix: 修复`title`过长显示样式问题	2022-10-25 15:50:18 +08:00
xiaoxian521	6765ce8644	workflow: update	2022-10-25 13:33:31 +08:00