fix: 合并上游

wxfeiang · May 10, 2024 · c962856 · c962856
2 parents ef69580 + 30f598d
commit c962856
Show file tree

Hide file tree

Showing 17 changed files with 121 additions and 124 deletions.
diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts
@@ -146,30 +146,6 @@ const frameRouter = {
     rank: frame
   },
   children: [
-    {
-      path: "/iframe/external",
-      meta: {
-        title: "menus.pureExternalDoc"
-      },
-      children: [
-        {
-          path: "/external",
-          name: "https://pure-admin.github.io/pure-admin-doc",
-          meta: {
-            title: "menus.pureExternalLink",
-            roles: ["admin", "common"]
-          }
-        },
-        {
-          path: "/pureUtilsLink",
-          name: "https://pure-admin-utils.netlify.app/",
-          meta: {
-            title: "menus.pureUtilsLink",
-            roles: ["admin", "common"]
-          }
-        }
-      ]
-    },
     {
       path: "/iframe/embedded",
       meta: {
@@ -257,6 +233,30 @@ const frameRouter = {
           }
         }
       ]
+    },
+    {
+      path: "/iframe/external",
+      meta: {
+        title: "menus.pureExternalDoc"
+      },
+      children: [
+        {
+          path: "/external",
+          name: "https://pure-admin.github.io/pure-admin-doc",
+          meta: {
+            title: "menus.pureExternalLink",
+            roles: ["admin", "common"]
+          }
+        },
+        {
+          path: "/pureUtilsLink",
+          name: "https://pure-admin-utils.netlify.app/",
+          meta: {
+            title: "menus.pureUtilsLink",
+            roles: ["admin", "common"]
+          }
+        }
+      ]
     }
   ]
 };

diff --git a/package.json b/package.json
@@ -80,8 +80,8 @@
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
     "pinia": "^2.1.7",
-    "pinyin-pro": "^3.20.3",
-    "plus-pro-components": "^0.0.11",
+    "pinyin-pro": "^3.20.4",
+    "plus-pro-components": "^0.1.1",
     "qrcode": "^1.5.3",
     "qs": "^6.12.1",
     "responsive-storage": "^2.2.0",
@@ -91,7 +91,7 @@
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.1",
     "version-rocket": "^1.7.1",
-    "vue": "^3.4.26",
+    "vue": "^3.4.27",
     "vue-i18n": "^9.13.1",
     "vue-json-pretty": "^2.4.0",
     "vue-pdf-embed": "^2.0.3",
@@ -123,7 +123,7 @@
     "@types/gradient-string": "^1.1.6",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.12.8",
+    "@types/node": "^20.12.11",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.9.15",
@@ -145,19 +145,19 @@
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "postcss": "^8.4.38",
-    "postcss-html": "^1.6.0",
+    "postcss-html": "^1.7.0",
     "postcss-import": "^16.1.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.76.0",
+    "sass": "^1.77.0",
     "stylelint": "^16.5.0",
     "stylelint-config-recess-order": "^5.0.1",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard-scss": "^13.1.0",
     "stylelint-prettier": "^5.0.0",
-    "svgo": "^3.2.0",
+    "svgo": "^3.3.0",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.4.5",
     "vite": "^5.2.11",
@@ -174,7 +174,7 @@
     "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
     "pnpm": ">=8.6.10"
   },
-  "packageManager": "pnpm@9.0.5",
+  "packageManager": "pnpm@9.1.0",
   "pnpm": {
     "allowedDeprecatedVersions": {
       "sourcemap-codec": "*",