chore(projects): merge main to example

.env.prod

@@ -1,5 +1,5 @@
 # backend service base url, prod environment
-VITE_SERVICE_BASE_URL=https://mock.apifox.com/m1/3109515-0-default
+VITE_SERVICE_BASE_URL=https://mock.apifox.cn/m1/3109515-0-default
 
 # other backend service base url, prod environment
 VITE_OTHER_SERVICE_BASE_URL= `{

.env.test

@@ -1,5 +1,5 @@
 # backend service base url, test environment
-VITE_SERVICE_BASE_URL=https://mock.apifox.com/m1/3109515-0-default
+VITE_SERVICE_BASE_URL=https://mock.apifox.cn/m1/3109515-0-default
 
 # other backend service base url, test environment
 VITE_OTHER_SERVICE_BASE_URL= `{

README.md

@@ -78,8 +78,8 @@
 Make sure your environment meets the following requirements:
 
 - **git**: you need git to clone and manage project versions.
-- **NodeJS**: >=18.0.0, recommended 18.19.0 or higher.
+- **NodeJS**: >=18.12.0, recommended 18.19.0 or higher.
-- **pnpm**: >= 8.0.0, recommended 8.14.0 or higher.
+- **pnpm**: >= 8.7.0, recommended 8.14.0 or higher.
 
 **Clone Project**
 

README.zh_CN.md

@@ -77,8 +77,8 @@
 确保你的环境满足以下要求：
 
 - **git**: 你需要git来克隆和管理项目版本。
-- **NodeJS**: >=18.0.0，推荐 18.19.0 或更高。
+- **NodeJS**: >=18.12.0，推荐 18.19.0 或更高。
-- **pnpm**: >= 8.0.0，推荐 8.14.0 或更高。
+- **pnpm**: >= 8.7.0，推荐 8.14.0 或更高。
 
 **克隆项目**
 

package.json

@@ -55,7 +55,7 @@
     "@sa/hooks": "workspace:*",
     "@sa/materials": "workspace:*",
     "@sa/utils": "workspace:*",
-    "@vueuse/core": "10.9.0",
+    "@vueuse/core": "10.10.0",
     "clipboard": "2.0.11",
     "dayjs": "1.11.11",
     "echarts": "5.5.0",
@@ -69,7 +69,7 @@
     "tailwind-merge": "^2.3.0",
     "vditor": "3.10.4",
     "vue": "3.4.27",
-    "vue-draggable-plus": "0.4.1",
+    "vue-draggable-plus": "0.5.0",
     "vue-i18n": "9.13.1",
     "vue-router": "4.3.2",
     "wangeditor": "4.7.15",
@@ -78,36 +78,36 @@
   "devDependencies": {
     "@amap/amap-jsapi-types": "0.0.8",
     "@elegant-router/vue": "0.3.7",
-    "@iconify/json": "2.2.211",
+    "@iconify/json": "2.2.215",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.3.5",
     "@types/bmapgl": "0.0.5",
     "@types/lodash-es": "4.17.12",
-    "@types/node": "20.12.12",
+    "@types/node": "20.13.0",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "0.60.2",
+    "@unocss/eslint-config": "0.60.4",
-    "@unocss/preset-icons": "0.60.2",
+    "@unocss/preset-icons": "0.60.4",
-    "@unocss/preset-uno": "0.60.2",
+    "@unocss/preset-uno": "0.60.4",
-    "@unocss/transformer-directives": "0.60.2",
+    "@unocss/transformer-directives": "0.60.4",
-    "@unocss/transformer-variant-group": "0.60.2",
+    "@unocss/transformer-variant-group": "0.60.4",
-    "@unocss/vite": "0.60.2",
+    "@unocss/vite": "0.60.4",
-    "@vitejs/plugin-vue": "5.0.4",
+    "@vitejs/plugin-vue": "5.0.5",
-    "@vitejs/plugin-vue-jsx": "3.1.0",
+    "@vitejs/plugin-vue-jsx": "4.0.0",
-    "eslint": "9.3.0",
+    "eslint": "9.4.0",
     "eslint-plugin-vue": "9.26.0",
-    "lint-staged": "15.2.2",
+    "lint-staged": "15.2.5",
-    "sass": "1.77.2",
+    "sass": "1.77.4",
     "simple-git-hooks": "2.11.1",
-    "tsx": "4.10.5",
+    "tsx": "4.11.0",
     "typescript": "5.4.5",
     "unplugin-icons": "0.19.0",
     "unplugin-vue-components": "0.27.0",
-    "vite": "5.2.11",
+    "vite": "5.2.12",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.2.0",
+    "vite-plugin-vue-devtools": "7.2.1",
-    "vue-eslint-parser": "9.4.2",
+    "vue-eslint-parser": "9.4.3",
     "vue-tsc": "2.0.19"
   },
   "simple-git-hooks": {

packages/axios/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@sa/utils": "workspace:*",
-    "axios": "1.6.8",
+    "axios": "1.7.2",
-    "axios-retry": "4.2.0",
+    "axios-retry": "4.3.0",
     "qs": "6.12.1"
   },
   "devDependencies": {

packages/scripts/package.json

@@ -13,7 +13,7 @@
     }
   },
   "devDependencies": {
-    "@soybeanjs/changelog": "0.3.23",
+    "@soybeanjs/changelog": "0.3.24",
     "bumpp": "9.4.1",
     "c12": "1.10.0",
     "cac": "6.7.14",

src/service/request/index.ts

@@ -64,9 +64,10 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
 
         window.$dialog?.error({
           title: 'Error',
-          content: response.data.code,
+          content: response.data.msg,
           positiveText: $t('common.confirm'),
           maskClosable: false,
+          closeOnEsc: false,
           onPositiveClick() {
             logoutAndCleanup();
           },