chore(projects): merge main to example

.vscode/settings.json

@@ -14,5 +14,6 @@
   "i18n-ally.localesPaths": ["src/locales/langs"],
   "prettier.enable": false,
   "typescript.tsdk": "node_modules/typescript/lib",
-  "unocss.root": ["./"]
+  "unocss.root": ["./"],
+  "vue.server.hybridMode": false
 }

CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 
 
+## [v1.1.4](https://github.com/honghuangdc/soybean-admin/compare/v1.1.3...v1.1.4) (2024-06-06)
+
+###    🐞 Bug Fixes
+
+- **utils**: modalLogout bug when esc is pressed &nbsp;-&nbsp; by @sigma-plus in https://github.com/honghuangdc/soybean-admin/issues/470 [<samp>(bd69c)</samp>](https://github.com/honghuangdc/soybean-admin/commit/bd69c00)
+
+### &nbsp;&nbsp;&nbsp;🛠 Optimizations
+
+- **projects**: optimize RouteMeta remarks &nbsp;-&nbsp; by @soybeanjs [<samp>(ffb48)</samp>](https://github.com/honghuangdc/soybean-admin/commit/ffb48b1)
+
+### &nbsp;&nbsp;&nbsp;📖 Documentation
+
+- **projects**:
+  - update CHANGELOG &nbsp;-&nbsp; by @soybeanjs [<samp>(756f8)</samp>](https://github.com/honghuangdc/soybean-admin/commit/756f84a)
+  - update Node&pnpm version &nbsp;-&nbsp; by @Azir-11 in https://github.com/honghuangdc/soybean-admin/issues/472 [<samp>(9b05d)</samp>](https://github.com/honghuangdc/soybean-admin/commit/9b05d73)
+
+### &nbsp;&nbsp;&nbsp;🏡 Chore
+
+- **deps**:
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(d0380)</samp>](https://github.com/honghuangdc/soybean-admin/commit/d0380ce)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(1f464)</samp>](https://github.com/honghuangdc/soybean-admin/commit/1f4647b)
+- **projects**:
+  - close http proxy &nbsp;-&nbsp; by @soybeanjs [<samp>(d08a3)</samp>](https://github.com/honghuangdc/soybean-admin/commit/d08a381)
+  - update mock url &nbsp;-&nbsp; by @soybeanjs [<samp>(e6086)</samp>](https://github.com/honghuangdc/soybean-admin/commit/e6086f0)
+  - update vscode settings &nbsp;-&nbsp; by @soybeanjs [<samp>(910df)</samp>](https://github.com/honghuangdc/soybean-admin/commit/910dfca)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[![sigma-plus](https://github.com/sigma-plus.png?size=48)](https://github.com/sigma-plus)&nbsp;&nbsp;
+
 ## [v1.1.3](https://github.com/soybeanjs/soybean-admin/compare/v1.1.2...v1.1.3) (2024-06-02)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
@@ -78,13 +78,13 @@
   "devDependencies": {
     "@amap/amap-jsapi-types": "0.0.8",
     "@elegant-router/vue": "0.3.7",
-    "@iconify/json": "2.2.215",
+    "@iconify/json": "2.2.216",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
-    "@soybeanjs/eslint-config": "1.3.5",
+    "@soybeanjs/eslint-config": "1.3.6",
     "@types/bmapgl": "0.0.5",
     "@types/lodash-es": "4.17.12",
-    "@types/node": "20.13.0",
+    "@types/node": "20.14.2",
     "@types/nprogress": "0.2.3",
     "@unocss/eslint-config": "0.60.4",
     "@unocss/preset-icons": "0.60.4",
@@ -99,7 +99,7 @@
     "lint-staged": "15.2.5",
     "sass": "1.77.4",
     "simple-git-hooks": "2.11.1",
-    "tsx": "4.11.0",
+    "tsx": "4.11.2",
     "typescript": "5.4.5",
     "unplugin-icons": "0.19.0",
     "unplugin-vue-components": "0.27.0",

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -12,7 +12,7 @@
   "dependencies": {
     "@sa/utils": "workspace:*",
     "axios": "1.7.2",
-    "axios-retry": "4.3.0",
+    "axios-retry": "4.4.0",
     "qs": "6.12.1"
   },
   "devDependencies": {

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "bin": {
     "sa": "./bin.ts"
   },

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "exports": {
     ".": "./src/index.ts"
   },

src/typings/router.d.ts

@@ -27,7 +27,7 @@ declare module 'vue-router' {
     /**
      * Is constant route
      *
-     * Does not need to login, and the route is defined in the front-end
+     * when it is set to true, there will be no login verification and no permission verification to access the route
      */
     constant?: boolean | null;
     /**
@@ -57,7 +57,10 @@ declare module 'vue-router' {
      *   the route is "user_detail", if it is set to "user_list", the menu "user_list" will be activated
      */
     activeMenu?: import('@elegant-router/types').RouteKey | null;
-    /** By default, the same route path will use one tab, if set to true, it will use multiple tabs */
+    /**
+     * By default, the same route path will use one tab, even with different query, if set true, the route with
+     * different query will use different tabs
+     */
     multiTab?: boolean | null;
     /** If set, the route will be fixed in tabs, and the value is the order of fixed tabs */
     fixedIndexInTab?: number | null;