release: update 3.4.6

fix: 修复iframe加载失败
fix: 修复动态路由子级长度为0时抛出异常 (#333 )
2025-11-03 13:44:47 +08:00 · 2022-08-23 10:31:44 +08:00 · 2022-08-23 10:24:40 +08:00 · 2022-08-23 10:10:49 +08:00 · 2022-08-23 09:55:23 +08:00 · 2022-08-22 20:21:53 +08:00
10 changed files with 72 additions and 23 deletions
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,3 +1,17 @@
 # 3.4.6 (2022-8-23)
 ### 🐞 Bug fixes
 - `process` is not defined in path
 - Fixed an error when dynamic routing `children` is an empty array
 - Fixed `iframe` loading failure
 # 3.4.5 (2022-8-22)
 ### 🐞 Bug fixes
 - Fix local responsive storage object setting issue
 # 3.4.0 (2022-8-22)
 ### 🍏 Perf
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
 # 3.4.6 (2022-8-23)
 ### 🐞 Bug fixes
 - `process` is not defined in path
 - Fixed an error when dynamic routing `children` is an empty array
 - Fixed `iframe` loading failure
 # 3.4.5 (2022-8-22)
 ### 🐞 Bug fixes
 - Fix local responsive storage object setting issue
 # 3.4.0 (2022-8-22)
 ### 🍏 Perf
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,17 @@
 # 3.4.6 (2022-8-23)
 ### 🐞 Bug fixes
 - `process` is not defined in path
 - 修复动态路由`children`为空数组时报错
 - 修复`iframe`加载失败
 # 3.4.5 (2022-8-22)
 ### 🐞 Bug fixes
 - 修复本地响应式存储对象设置问题
 # 3.4.0 (2022-8-22)
 ### 🍏 Perf
--- a/index.html
+++ b/index.html
@@ -10,9 +10,6 @@
    />
    <title>vue-pure-admin</title>
    <link rel="icon" href="/favicon.ico" />
    <script>
      window.process = {};
    </script>
  </head>
  <body>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-pure-admin",
-  "version": "3.4.0",
+  "version": "3.4.6",
  "private": true,
  "scripts": {
    "dev": "cross-env --max_old_space_size=4096 vite",
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.4.0",
+  "Version": "3.4.6",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -211,8 +211,9 @@ function setLayoutModel(layout: string) {
  $storage.layout = {
    layout,
    theme: layoutTheme.value.theme,
-    darkMode: $storage.layout.darkMode,
+    darkMode: $storage.layout?.darkMode,
-    sidebarStatus: $storage.layout.sidebarStatus
+    sidebarStatus: $storage.layout?.sidebarStatus,
    epThemeColor: $storage.layout?.epThemeColor
  };
  useAppStoreHook().setLayout(layout);
 }
--- a/src/layout/hooks/useDataThemeChange.ts
+++ b/src/layout/hooks/useDataThemeChange.ts
@@ -13,7 +13,7 @@ import {
 } from "@pureadmin/theme/dist/browser-utils";
 export function useDataThemeChange() {
-  const { layoutTheme } = useLayout();
+  const { layoutTheme, layout } = useLayout();
  const themeColors = ref<Array<themeColorsType>>([
    /* 道奇蓝（默认） */
    { color: "#1b2a47", themeColor: "default" },
@@ -36,7 +36,7 @@ export function useDataThemeChange() {
  ]);
  const { $storage } = useGlobal<GlobalPropertiesApi>();
-
+  const dataTheme = ref<boolean>($storage?.layout?.darkMode);
  const body = document.documentElement as HTMLElement;
  /** 设置导航主题色 */
@@ -45,8 +45,13 @@ export function useDataThemeChange() {
    toggleTheme({
      scopeName: `layout-theme-${theme}`
    });
-    $storage.layout.theme = theme;
+    $storage.layout = {
-    $storage.layout.darkMode = dataTheme.value;
+      layout: layout.value,
      theme,
      darkMode: dataTheme.value,
      sidebarStatus: $storage.layout?.sidebarStatus,
      epThemeColor: $storage.layout?.epThemeColor
    };
    if (theme === "default" || theme === "light") {
      setEpThemeColor(getConfig().EpThemeColor);
@@ -82,7 +87,6 @@ export function useDataThemeChange() {
      );
    }
  };
  const dataTheme = ref<boolean>($storage?.layout?.darkMode);
  /** 日间、夜间主题切换 */
  function dataThemeChange() {
@@ -94,10 +98,8 @@ export function useDataThemeChange() {
    }
    if (dataTheme.value) {
      $storage.layout.darkMode = true;
      document.documentElement.classList.add("dark");
    } else {
      $storage.layout.darkMode = false;
      document.documentElement.classList.remove("dark");
    }
  }
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -230,16 +230,21 @@ function addAsyncRoutes(arrRoutes: Array<RouteRecordRaw>) {
    // 将backstage属性加入meta，标识此路由为后端返回路由
    v.meta.backstage = true;
    // 父级的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属性，会覆盖默认值
-    if (v?.children && !v.name) v.name = v.children[0].name;
+    if (v?.children && v.children.length && !v.name)
-    if (v.meta?.frameSrc) v.component = IFrame;
+      v.name = v.children[0].name;
-    // 对后端传component组件路径和不传做兼容（如果后端传component组件路径，那么path可以随便写，如果不传，component组件路径会跟path保持一致）
+    if (v.meta?.frameSrc) {
-    const index = v?.component
+      v.component = IFrame;
-      ? modulesRoutesKeys.findIndex(ev => ev.includes(v.component as any))
+    } else {
-      : modulesRoutesKeys.findIndex(ev => ev.includes(v.path));
+      // 对后端传component组件路径和不传做兼容（如果后端传component组件路径，那么path可以随便写，如果不传，component组件路径会跟path保持一致）
-    v.component = modulesRoutes[modulesRoutesKeys[index]];
+      const index = v?.component
-    if (v.children) {
+        ? modulesRoutesKeys.findIndex(ev => ev.includes(v.component as any))
        : modulesRoutesKeys.findIndex(ev => ev.includes(v.path));
      v.component = modulesRoutes[modulesRoutesKeys[index]];
    }
    if (v?.children && v.children.length) {
      addAsyncRoutes(v.children);
    }
  });
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -70,6 +70,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
      chunkSizeWarningLimit: 4000
    },
    define: {
      "process.platform": null,
      "process.version": null,
      __INTLIFY_PROD_DEVTOOLS__: false,
      __APP_INFO__: JSON.stringify(__APP_INFO__)
    }
Author	SHA1	Message	Date
xiaoxian521	88bba7555b	release: update 3.4.6	2022-08-23 10:31:44 +08:00
xiaoxian521	30c682bd24	fix: 修复`iframe`加载失败	2022-08-23 10:24:40 +08:00
SampsonYe(叶飞)	3baffa11e4	fix: 修复动态路由子级长度为0时抛出异常 (#333 )	2022-08-23 10:10:49 +08:00
xiaoxian521	1ed598c5f2	fix: process is not defined in path	2022-08-23 09:55:23 +08:00
xiaoxian521	185d779c8d	release: update 3.4.5	2022-08-22 20:21:53 +08:00
xiaoxian521	241fc618b8	fix: 修复本地响应式存储对象设置问题	2022-08-22 20:17:50 +08:00