Merge branch 'main' into example

.vscode/extensions.json

@@ -6,9 +6,6 @@
     "dbaeumer.vscode-eslint",
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
-    "formulahendry.auto-close-tag",
-    "formulahendry.auto-complete-tag",
-    "formulahendry.auto-rename-tag",
     "lokalise.i18n-ally",
     "mhutchie.git-graph",
     "mikestead.dotenv",

packages/alova/package.json

@@ -3,7 +3,9 @@
   "version": "0.1.0",
   "exports": {
     ".": "./src/index.ts",
-    "./client": "./src/client.ts"
+    "./fetch": "./src/fetch.ts",
+    "./client": "./src/client.ts",
+    "./mock": "./src/mock.ts"
   },
   "typesVersions": {
     "*": {
@@ -11,6 +13,7 @@
     }
   },
   "dependencies": {
+    "@alova/mock": "2.0.7",
     "@sa/utils": "workspace:*",
     "alova": "3.0.20"
   }

packages/alova/src/fetch.ts

@@ -0,0 +1,2 @@
+import adapterFetch from 'alova/fetch';
+export default adapterFetch;

packages/alova/src/mock.ts

@@ -0,0 +1 @@
+export * from '@alova/mock';

pnpm-lock.yaml

@@ -213,6 +213,9 @@ importers:
 
   packages/alova:
     dependencies:
+      '@alova/mock':
+        specifier: 2.0.7
+        version: 2.0.7(alova@3.0.20)
       '@sa/utils':
         specifier: workspace:*
         version: link:../utils
@@ -335,9 +338,17 @@ importers:
 
 packages:
 
+  '@alova/mock@2.0.7':
+    resolution: {integrity: sha512-4W8Ncsmj7cdjzZk7f2zFqc32aoYQNoDJS3z7W0nqAkTJ7KR8ZiGaHA5dJovyXnLphmTeyWS3yHMVWnesI7y4ig==}
+    peerDependencies:
+      alova: ^3.0.20
+
   '@alova/shared@1.0.5':
     resolution: {integrity: sha512-/a2Qm+xebQJ1OlIgpslK+UL1J7yhkt1/Mqdq58a22+fSVdANukmUcF4j4w1DF3lxZ04SrqP+2oJprJ8UOvM+9Q==}
 
+  '@alova/shared@1.0.6':
+    resolution: {integrity: sha512-W89j64InjFIsW/u5YmYvpXGWz8JerBAYWyu/Fc7xfc5B+95SSA3ybW4nyHacBUW6yYQyGZwa8S8bVPePqa7bmA==}
+
   '@amap/amap-jsapi-types@0.0.15':
     resolution: {integrity: sha512-oqyRqHpVDZh5bUe2mAJh41ZsziSj0eUzwcfIbiaBNB0eiTJnZNhKsTdk77VOklOjwuwNfsblpKW9LjmWNpeQ7A==}
 
@@ -3570,8 +3581,8 @@ packages:
     peerDependencies:
       vue: ^3.0.0
 
-  nan@2.20.0:
+  nan@2.22.0:
-    resolution: {integrity: sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==}
+    resolution: {integrity: sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==}
 
   nanoid@3.3.7:
     resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
@@ -4947,8 +4958,15 @@ packages:
 
 snapshots:
 
+  '@alova/mock@2.0.7(alova@3.0.20)':
+    dependencies:
+      '@alova/shared': 1.0.6
+      alova: 3.0.20
+
   '@alova/shared@1.0.5': {}
 
+  '@alova/shared@1.0.6': {}
+
   '@amap/amap-jsapi-types@0.0.15': {}
 
   '@ampproject/remapping@2.3.0':
@@ -6555,7 +6573,7 @@ snapshots:
   canvas@2.11.2:
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.11
-      nan: 2.20.0
+      nan: 2.22.0
       simple-get: 3.1.1
     transitivePeerDependencies:
       - encoding
@@ -8612,7 +8630,7 @@ snapshots:
       vue: 3.5.11(typescript@5.6.3)
       vueuc: 0.4.64(vue@3.5.11(typescript@5.6.3))
 
-  nan@2.20.0:
+  nan@2.22.0:
     optional: true
 
   nanoid@3.3.7: {}

src/locales/langs/en-us.ts

@@ -113,7 +113,7 @@ const local: App.I18n.Schema = {
     },
     tab: {
       visible: 'Tab Visible',
-      cache: 'Tab Cache',
+      cache: 'Tag Bar Info Cache',
       height: 'Tab Height',
       mode: {
         title: 'Tab Mode',

src/locales/langs/zh-cn.ts

@@ -113,7 +113,7 @@ const local: App.I18n.Schema = {
     },
     tab: {
       visible: '显示标签栏',
-      cache: '缓存标签页',
+      cache: '标签栏信息缓存',
       height: '标签栏高度',
       mode: {
         title: '标签栏风格',

src/utils/agent.ts

@@ -1,5 +1,7 @@
 export function isPC() {
   const agents = ['Android', 'iPhone', 'webOS', 'BlackBerry', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'];
 
-  return !agents.includes(window.navigator.userAgent);
+  const isMobile = agents.some(agent => window.navigator.userAgent.includes(agent));
+
+  return !isMobile;
 }