release: update 2.8.0

pure-admin · Jan 5, 2022 · 3418f44 · 3418f44
1 parent 749633e
commit 3418f44
Show file tree

Hide file tree

Showing 41 changed files with 543 additions and 418 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,11 @@
+{
+  "recommendations": [
+    "stylelint.vscode-stylelint",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "johnsoncodehk.volar",
+    "lokalise.i18n-ally",
+    "mikestead.dotenv",
+    "antfu.iconify"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,11 +1,14 @@
 {
-  // You should install these plugins:
-  // ESLint
-  // Prettier - Code formatter
-  // stylelint
-  // vscode-icons
-  // TypeScript Vue Plugin (Volar)
-  // Vue Language Features (Volar)
+  /** 你需要安装这些插件，以便带来更好的提示体验
+   * ESLint
+   * Prettier - Code formatter
+   * stylelint
+   * vscode-icons
+   * i18n Ally
+   * Iconify IntelliSense
+   * TypeScript Vue Plugin (Volar)
+   * Vue Language Features (Volar)
+   */
   "terminal.integrated.rendererType": "dom",
   "editor.formatOnType": true,
   "editor.formatOnSave": true,
@@ -45,5 +48,13 @@
   },
   "volar.tsPlugin": true,
   "typescript.tsdk": "node_modules/typescript/lib",
-  "i18n-ally.localesPaths": ["src/plugins/i18n"]
+  "i18n-ally.localesPaths": ["src/plugins/i18n"],
+  "i18n-ally.keystyle": "nested",
+  "i18n-ally.sortKeys": true,
+  "i18n-ally.namespace": true,
+  "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}",
+  "i18n-ally.enabledParsers": ["ts"],
+  "i18n-ally.sourceLanguage": "en",
+  "i18n-ally.displayLanguage": "zh-CN",
+  "i18n-ally.enabledFrameworks": ["vue", "react"]
 }
diff --git a/.vscode/vue3.0.code-snippets → .vscode/vue3.0.code-snippets.json b/.vscode/vue3.0.code-snippets → .vscode/vue3.0.code-snippets.json
diff --git a/.vscode/vue3.2+.setup-snippets.json b/.vscode/vue3.2+.setup-snippets.json
@@ -0,0 +1,17 @@
+{
+  "Vue3.2+快速生成模板": {
+    "prefix": "Vue3.2+",
+    "body": [
+      "<script setup lang='ts'>",
+      "</script>\n",
+      "<template>",
+      "\t<div>\n",
+      "\t</div>",
+      "</template>\n",
+      "<style scoped>\n",
+      "</style>",
+      "$2"
+    ],
+    "description": "Vue3.2+"
+  }
+}
diff --git a/.vscode/vue3.2.setup-snippets b/.vscode/vue3.2.setup-snippets
diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico" />
     <link rel="stylesheet" href="/iconfont.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>vue-pure-admin</title>
+    <title>pure-admin-thin</title>
     <script>
       window.process = {};
     </script>
@@ -14,106 +14,36 @@
   <body>
     <div id="app">
       <style>
-        * {
-          margin: 0;
-          padding: 0;
-        }
-
-        html,
-        body {
-          width: 100%;
-          height: 100%;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          background: #000;
-          overflow: hidden;
-          font-family: "Reggae One", cursive;
-        }
-
         p {
-          font-size: 8vw;
-          overflow: hidden;
-          -webkit-text-stroke: 3px #7272a5;
-        }
-
-        span {
-          display: block;
-          font-size: 20px;
-          overflow: hidden;
-          color: green;
-          text-align: center;
-        }
-
-        p::before {
-          content: " ";
-          width: 100%;
-          height: 100%;
           position: absolute;
-          left: 0;
-          top: 0;
-          background-image: linear-gradient(45deg, #ff269b, #2ab5f5, #ffbf00);
-          mix-blend-mode: multiply;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+          font-size: 26px;
         }
 
         p::after {
           content: "";
-          background: radial-gradient(circle, #fff, #000 50%);
-          background-size: 25% 25%;
           position: absolute;
-          top: -100%;
-          left: -100%;
-          right: 0;
+          top: 0%;
           bottom: 0;
-          mix-blend-mode: color-dodge;
-          animation: mix 2s linear infinite;
+          animation: dot 1s infinite steps(1, start);
         }
 
-        @keyframes mix {
-          to {
-            transform: translate(50%, 50%);
+        @keyframes dot {
+          33.33% {
+            content: ".";
+          }
+          66.67% {
+            content: "..";
+          }
+          100% {
+            content: "...";
           }
         }
       </style>
-      <div class="g-container">
-        <p>Pure-Admin</p>
-        <span class="_develop"></span>
-      </div>
+      <p>Loading</p>
     </div>
-    <script>
-      // 此代码仅用于开发环境的友好提示，项目打包前请去掉这段js代码 This code is only used as a friendly reminder of the development environment, please remove this js code before packaging the project
-      window.onload = function () {
-        (function () {
-          const ua = navigator.userAgent.toLowerCase();
-          const re = /(msie|firefox|chrome|opera|version).*?([\d.]+)/;
-          const m = ua.match(re);
-          const Sys = {
-            browser: m[1].replace(/version/, "'safari"),
-            version: m[2]
-          };
-
-          const browser = Array.of("chrome", "firefox").includes(Sys.browser);
-          const version = parseFloat(Sys.version);
-
-          const el = document.querySelector("._develop");
-
-          if (el) {
-            if (browser && version >= 90) {
-              let success =
-                document.createTextNode("当前浏览器版本很适合开发！！！ 😃");
-              el.appendChild(success);
-            } else {
-              let warn = document.createTextNode(
-                "当前浏览器版本不适合开发，建议使用最新版本的谷歌或者火狐浏览器！！！😯"
-              );
-              el.appendChild(warn);
-              el.style.color = "red";
-            }
-          }
-          return Sys;
-        })();
-      };
-    </script>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts
@@ -4,29 +4,29 @@ import { MockMethod } from "vite-plugin-mock";
 const permissionRouter = {
   path: "/permission",
   name: "permission",
-  redirect: "/permission/page",
+  redirect: "/permission/page/index",
   meta: {
-    title: "message.permission",
+    title: "menus.permission",
     icon: "Lollipop",
     i18n: true,
     showLink: true,
     rank: 3
   },
   children: [
     {
-      path: "/permission/page",
+      path: "/permission/page/index",
       name: "permissionPage",
       meta: {
-        title: "message.permissionPage",
+        title: "menus.permissionPage",
         i18n: true,
         showLink: true
       }
     },
     {
-      path: "/permission/button",
+      path: "/permission/button/index",
       name: "permissionButton",
       meta: {
-        title: "message.permissionButton",
+        title: "menus.permissionButton",
         i18n: true,
         showLink: true,
         authority: []

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "vue-pure-admin",
-  "version": "2.6.0",
+  "name": "pure-admin-thin",
+  "version": "2.8.0",
   "private": true,
   "engines": {
     "node": ">= 16",
@@ -40,7 +40,7 @@
     "axios": "^0.21.1",
     "css-color-function": "^1.3.3",
     "dayjs": "^1.10.7",
-    "element-plus": "1.2.0-beta.6",
+    "element-plus": "1.3.0-beta.1",
     "element-resize-detector": "^1.2.3",
     "font-awesome": "^4.7.0",
     "js-cookie": "^3.0.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/serverConfig.json b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "2.6.0",
+  "Version": "2.8.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
@@ -12,6 +12,10 @@
   "Grey": false,
   "Weak": false,
   "HideTabs": false,
+  "SidebarStatus": true,
+  "EpThemeColor": "#409EFF",
+  "ShowLogo": true,
+  "ShowModel": "smart",
   "MapConfigure": {
     "amapKey": "97b3248d1553172e81f168cf94ea667e",
     "options": {