@fairys/taro-tools-react 0.0.2 → 0.0.3

package/esm/context/global.data.instance.js

@@ -2,8 +2,8 @@ import { proxy, ref, useSnapshot } from "valtio";
 import utils_navigate from "../utils/navigate.js";
 import { createUseId } from "../utils/useId.js";
 import { ProxyInstanceObjectBase } from "../utils/valtio/instance.js";
+import { globalSettingDataInstance } from "./global.setting.data.instance.js";
 class GlobalDataInstance extends ProxyInstanceObjectBase {
-    loginPageRoute = 'pages/login/index';
     store = proxy({
         messageData: ref([]),
         toastData: void 0
@@ -46,8 +46,9 @@ class GlobalDataInstance extends ProxyInstanceObjectBase {
         });
     };
     toLoginPage = ()=>{
-        const isLoginPage = utils_navigate.isCurrentPage(this.loginPageRoute || '');
-        const _loginPageRoute = `${this.loginPageRoute || ''}`.replace(/^\//, '');
+        const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
+        const isLoginPage = utils_navigate.isCurrentPage(loginPageRoute || '');
+        const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
         if (isLoginPage) return;
         utils_navigate.navigateTo({
             url: `/${_loginPageRoute}`

package/esm/context/global.setting.data.instance.d.ts

@@ -5,6 +5,26 @@ export interface GlobalSettingDataInstanceState {
      * @default 200
      */
     requestSuccessCode?: number;
+    /**
+     * token过期返回code，跳转登录页面
+     * @default 401
+     */
+    tokenExpiredCode?: number;
+    /**
+     * 本地存储token字段名
+     * @default token
+     */
+    tokenFieldName?: string;
+    /**
+     * 请求头token字段名
+     * @default token
+     */
+    headerTokenName?: string;
+    /**
+     * 设置登录页面路由(需要在入口文件中进行设置)
+     * @default pages/login/index
+     */
+    loginPageRoute?: string;
     /**数据默认值不使用*/
     __defaultValue?: string;
 }
@@ -22,7 +42,4 @@ export declare const globalSettingDataInstance: GlobalSettingDataInstance;
 /**
  * 全局设置数据状态管理
  */
-export declare const useGlobalSettingData: () => readonly [{
-    readonly requestSuccessCode?: number;
-    readonly __defaultValue?: string;
-}, GlobalSettingDataInstance, string];
+export declare const useGlobalSettingData: () => [GlobalSettingDataInstanceState, GlobalSettingDataInstance, string | undefined];

package/esm/context/global.setting.data.instance.js

@@ -2,7 +2,11 @@ import { proxy, useSnapshot } from "valtio";
 import { ProxyInstanceObjectBase } from "../utils/valtio/instance.js";
 class GlobalSettingDataInstance extends ProxyInstanceObjectBase {
     store = proxy({
-        requestSuccessCode: 200
+        requestSuccessCode: 200,
+        tokenFieldName: 'token',
+        headerTokenName: 'token',
+        tokenExpiredCode: 401,
+        loginPageRoute: 'pages/login/index'
     });
     extendStore = (state)=>{
         this._setValues(state);

package/esm/context/page.data.instance.d.ts

@@ -68,4 +68,4 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
 /**
  * 页面级数据状态管理
  */
-export declare const usePageData: <T extends PageDataInstanceState = PageDataInstanceState>(options?: PageDataOptions<T>) => readonly [T, PageDataInstance<T>, string];
+export declare const usePageData: <T extends PageDataInstanceState = PageDataInstanceState>(options?: PageDataOptions<T>) => [T, PageDataInstance<T>, string | undefined];

package/esm/context/page.data.instance.js

@@ -63,7 +63,7 @@ class PageDataInstance extends ProxyInstanceObjectBase {
                 let saveData = {};
                 if (this.requestConfig?.onAfter) saveData = this.requestConfig.onAfter(result);
                 else {
-                    const dataList = result?.data?.list || result?.data?.records || [];
+                    const dataList = result?.data?.list || result?.data?.rows || result?.data?.records || [];
                     let newDataList = [];
                     if (1 === this.store.page) newDataList = dataList;
                     else if (this.is_scroll_page) newDataList = [

package/esm/context/page.info.data.instance.d.ts

@@ -69,4 +69,4 @@ export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageI
 /**
  * 页面级数据状态管理
  */
-export declare const usePageInfoData: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(options?: PageInfoDataOptions<T>) => readonly [T, PageInfoDataInstance<T>, string];
+export declare const usePageInfoData: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(options?: PageInfoDataOptions<T>) => [T, PageInfoDataInstance<T>, string | undefined];

package/esm/context/page.info.data.instance.js

@@ -69,7 +69,7 @@ class PageInfoDataInstance extends ProxyInstanceObjectBase {
         try {
             if (this.requestSaveInfoConfig?.onSaveInfo) return void console.error("\u672A\u914D\u7F6E requestSaveInfoConfig.onSaveInfo \u8BF7\u6C42\u65B9\u6CD5");
             this.updatedLoading(true);
-            const newParams = await this.requestSaveInfoConfig?.onSaveBefore?.(this.store);
+            const newParams = await this.requestSaveInfoConfig?.onSaveBefore?.(this.store) || this.store.editFormData || {};
             const result = await this.requestSaveInfoConfig.onSaveInfo?.(newParams);
             this.updatedLoading(false);
             if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {

package/esm/styles/index.css

@@ -165,6 +165,10 @@
   padding-top: .15rem;
 }
 
+.fairystaro__text-_zkh1_0_dl_6rem_zhk2_ {
+  font-size: .6rem;
+}
+
 .fairystaro__text-_zkh1_0_dl_8rem_zhk2_ {
   font-size: .8rem;
 }

package/esm/utils/request.d.ts

@@ -8,16 +8,6 @@ export interface RequestInstanceOptions extends Taro.request.Option<any, any> {
     isShowErrorMessage?: boolean;
 }
 export interface RequestInstanceCreateOptions {
-    /**
-     * 本地存储token字段名
-     * @default token
-     */
-    tokenFieldName?: string;
-    /**
-     * 请求头token字段名
-     * @default token
-     */
-    headerTokenName?: string;
     /**
      * 公共请求配置
      * @default {}
@@ -33,6 +23,10 @@ export interface RequestInstanceCreateOptions {
      * @default {}
      */
     proxy?: {
+        default?: {
+            dev?: string;
+            pro?: string;
+        };
         dev: Record<string, string | {
             target: string;
             pathRewrite: Record<string, string>;
@@ -48,16 +42,6 @@ export declare class RequestInstance {
     IP?: string | ((url: string, module?: string, env?: string) => string);
     /**简单的代理配置*/
     proxy?: RequestInstanceCreateOptions['proxy'];
-    /**
-     * 本地存储token字段名
-     * @default token
-     */
-    tokenFieldName: string;
-    /**
-     * 请求头token字段名
-     * @default token
-     */
-    headerTokenName: string;
     /**公共请求配置*/
     commonOptions: Omit<Taro.request.Option<any, any>, 'url'>;
     constructor(options?: RequestInstanceCreateOptions);

package/esm/utils/request.js

@@ -20,7 +20,7 @@ const requestResponseHandle = (result, options)=>{
         const statusCode = result.statusCode;
         const code = result?.data?.code;
         if (result?.data) {
-            if (401 === statusCode || 401 === code) {
+            if (401 === statusCode || 401 === code || code === globalSettingDataInstance.store.tokenExpiredCode) {
                 msg = "\u8BF7\u91CD\u65B0\u767B\u5F55";
                 globalDataInstance.toLoginPage();
             } else if (![
@@ -40,8 +40,6 @@ const requestResponseHandle = (result, options)=>{
 class RequestInstance {
     IP;
     proxy;
-    tokenFieldName = 'token';
-    headerTokenName = 'token';
     commonOptions = {};
     constructor(options = {}){
         this.extends(options);
@@ -53,8 +51,6 @@ class RequestInstance {
     extends = (options = {})=>{
         this.IP = options.IP || this.IP;
         this.proxy = options.proxy || this.proxy;
-        this.tokenFieldName = options.tokenFieldName || this.tokenFieldName;
-        this.headerTokenName = options.headerTokenName || this.headerTokenName;
         this.commonOptions = {
             ...this.commonOptions,
             ...options.commonOptions
@@ -90,6 +86,7 @@ class RequestInstance {
                 }
             }
         }
+        if (!host) host = this.proxy?.default?.['production' === process.env.NODE_ENV ? 'pro' : 'dev'] || '';
         if (!host) host = this.getHttpPath(url, module);
         return {
             host,
@@ -108,11 +105,11 @@ class RequestInstance {
     };
     requestBase = (options)=>{
         const { data, header = {}, module, isIgnoreToken, isShowErrorMessage, ...restOptions } = options;
-        const token = taro.getStorageSync(this.tokenFieldName || 'token');
+        const token = taro.getStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
         const newHeader = {
             ...header
         };
-        if (token) newHeader[this.headerTokenName || 'token'] = token;
+        if (token) newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
         else if (true !== isIgnoreToken) {
             if (false !== isShowErrorMessage) globalDataInstance.showMessage({
                 content: "\u672A\u767B\u5F55",

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "lib/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/components/Mesage/index.tsx

@@ -88,7 +88,7 @@ export const FairysTaroMessageItem = (props: FairysTaroMessageItemProps) => {
 
   const classIconName = useMemo(
     () =>
-      clsx('fairys_taro-ui-message-icon fairystaro__box-border ', iconClassName, {
+      clsx('fairys_taro-ui-message-icon fairystaro__box-border fairystaro__text-[0.6rem]', iconClassName, {
         'ant-design--close-circle-outlined': type === 'error' && !isIcon,
         'ant-design--exclamation-circle-outlined': type === 'warning' && !isIcon,
         'ant-design--check-circle-outlined': type === 'success' && !isIcon,
@@ -107,7 +107,7 @@ export const FairysTaroMessageItem = (props: FairysTaroMessageItemProps) => {
   );
 
   const titleClassNames = useMemo(
-    () => clsx('fairys_taro-ui-message-item-title fairystaro__font-bold', titleClassName),
+    () => clsx('fairys_taro-ui-message-item-title fairystaro__font-bold fairystaro__text-[0.6rem]', titleClassName),
     [titleClassName],
   );
 
@@ -157,7 +157,10 @@ export const FairysTaroMessageItem = (props: FairysTaroMessageItemProps) => {
           <Fragment />
         )}
         {children ? (
-          <View className={clsx('fairys_taro-ui-message-item-body', bodyClassName)} style={bodyStyle}>
+          <View
+            className={clsx('fairys_taro-ui-message-item-body fairystaro__text-[0.6rem]', bodyClassName)}
+            style={bodyStyle}
+          >
             {children}
           </View>
         ) : (
@@ -192,7 +195,7 @@ export const FairysTaroPortalMessage = (props: FairysTaroMessageProps) => {
   const classNames = useMemo(
     () =>
       clsx(
-        'fairys_taro-ui-portal-message fairystaro__pointer-events-none fairystaro__position-fixed  fairystaro__top-0  fairystaro__right-0  fairystaro__bottom-0  fairystaro__left-0',
+        'fairys_taro-ui-portal-message fairystaro__pointer-events-none fairystaro__position-fixed  fairystaro__top-0 fairystaro__right-0  fairystaro__bottom-0  fairystaro__left-0',
         messageClassName,
       ),
     [messageClassName],

package/src/context/auth.data.instance.ts

@@ -0,0 +1,133 @@
+import Taro from '@tarojs/taro';
+import { proxy, useSnapshot } from 'valtio';
+import { globalSettingDataInstance } from 'context/global.setting.data.instance';
+
+/**用户信息，权限判断等*/
+export interface AuthDataInstanceState<T = any> {
+  /**用户信息*/
+  userInfo?: T;
+  /**登录凭证（token）*/
+  token?: string;
+  /**权限列表*/
+  permissions?: string[];
+  /**数据默认值不使用*/
+  __defaultValue?: string;
+}
+
+export class AuthDataInstance<T = any> {
+  store = proxy<AuthDataInstanceState<T>>({
+    userInfo: undefined,
+    token: undefined,
+    permissions: undefined,
+  });
+
+  /**
+   * 设置用户信息
+   * @param userInfo 用户信息
+   */
+  set userInfo(userInfo: T) {
+    this.store.userInfo = userInfo;
+    if (userInfo) {
+      Taro.setStorageSync('userInfo', JSON.stringify(userInfo));
+    } else {
+      Taro.removeStorageSync('userInfo');
+    }
+  }
+
+  /**
+   * 获取用户信息
+   * @returns 用户信息
+   */
+  get userInfo(): T {
+    if (!this.store.userInfo) {
+      const userInfo = Taro.getStorageSync('userInfo');
+      if (userInfo) {
+        try {
+          this.store.userInfo = JSON.parse(userInfo);
+        } catch (error) {
+          console.error('解析用户信息失败', error);
+        }
+      }
+    }
+    return (this.store.userInfo || {}) as T;
+  }
+
+  /**
+   * 设置登录凭证（token）
+   * @param token 登录凭证（token）
+   */
+  set token(token: string) {
+    this.store.token = token;
+    if (token) {
+      Taro.setStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token', token);
+    } else {
+      Taro.removeStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
+    }
+  }
+  /**
+   * 获取登录凭证（token）
+   * @returns 登录凭证（token）
+   */
+  get token(): string {
+    if (!this.store.token) {
+      const token = Taro.getStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
+      if (token) {
+        this.store.token = token;
+      }
+    }
+    return this.store.token || '';
+  }
+
+  /**
+   * 设置权限列表
+   * @param permissions 权限列表
+   */
+  set permissions(permissions: string[]) {
+    this.store.permissions = permissions;
+    if (permissions) {
+      Taro.setStorageSync('permissions', JSON.stringify(permissions));
+    } else {
+      Taro.removeStorageSync('permissions');
+    }
+  }
+  /**
+   * 获取权限列表
+   * @returns 权限列表
+   */
+  get permissions(): string[] {
+    if (!this.store.permissions) {
+      const permissions = Taro.getStorageSync('permissions');
+      if (permissions) {
+        try {
+          this.store.permissions = JSON.parse(permissions);
+        } catch (error) {
+          console.error('解析权限列表失败', error);
+        }
+      }
+    }
+    return this.store.permissions || [];
+  }
+
+  /**
+   * 判断是否有指定权限
+   * @param permission 权限
+   * @returns 是否有指定权限
+   */
+  hasPermission(permission: string): boolean {
+    return this.permissions.includes(permission);
+  }
+}
+
+export const authDataInstance = new AuthDataInstance();
+
+/**
+ * 全局数据状态管理
+ */
+export function useAuthData<T = any>() {
+  const store = useSnapshot(authDataInstance.store);
+  return [store, authDataInstance, store.__defaultValue] as [
+    AuthDataInstanceState<T>,
+    AuthDataInstance<T>,
+    string | undefined,
+  ];
+}

package/src/context/global.data.instance.ts

@@ -1,10 +1,11 @@
 import { proxy, ref, useSnapshot } from 'valtio';
-import { TaroToastProps } from '@nutui/nutui-react-taro';
+import type { TaroToastProps } from '@nutui/nutui-react-taro';
 import navigate from 'utils/navigate';
 import { createUseId } from 'utils/useId';
 import React from 'react';
-import { FairysTaroMessageItemProps } from 'components/Mesage';
+import type { FairysTaroMessageItemProps } from 'components/Mesage';
 import { ProxyInstanceObjectBase } from 'utils/valtio/instance';
+import { globalSettingDataInstance } from './global.setting.data.instance';
 
 export interface MessageDataType extends FairysTaroMessageItemProps {
   /**用于唯一标识提示框(默认自动生成)*/
@@ -32,12 +33,6 @@ export interface GlobalDataInstanceState {
 }
 
 export class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstanceState> {
-  /**
-   * 设置登录页面路由(需要在入口文件中进行设置)
-   * @param loginPageRoute 登录页面路由(默认pages/login/index)
-   */
-  public loginPageRoute = 'pages/login/index';
-
   store = proxy<GlobalDataInstanceState>({
     messageData: ref([]),
     toastData: undefined,
@@ -82,8 +77,9 @@ export class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstan
 
   /**跳转登录页面*/
   toLoginPage = () => {
-    const isLoginPage = navigate.isCurrentPage(this.loginPageRoute || '');
-    const _loginPageRoute = `${this.loginPageRoute || ''}`.replace(/^\//, '');
+    const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
+    const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
+    const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
     if (isLoginPage) {
       // 如果是登录页面不进行跳转
       return;
@@ -102,5 +98,9 @@ export const globalDataInstance = new GlobalDataInstance();
  */
 export const useGlobalData = () => {
   const store = useSnapshot(globalDataInstance.store);
-  return [store, globalDataInstance, store.__defaultValue] as const;
+  return [store, globalDataInstance, store.__defaultValue] as [
+    GlobalDataInstanceState,
+    GlobalDataInstance,
+    string | undefined,
+  ];
 };

package/src/context/global.setting.data.instance.ts

@@ -7,6 +7,26 @@ export interface GlobalSettingDataInstanceState {
    * @default 200
    */
   requestSuccessCode?: number;
+  /**
+   * token过期返回code，跳转登录页面
+   * @default 401
+   */
+  tokenExpiredCode?: number;
+  /**
+   * 本地存储token字段名
+   * @default token
+   */
+  tokenFieldName?: string;
+  /**
+   * 请求头token字段名
+   * @default token
+   */
+  headerTokenName?: string;
+  /**
+   * 设置登录页面路由(需要在入口文件中进行设置)
+   * @default pages/login/index
+   */
+  loginPageRoute?: string;
   /**数据默认值不使用*/
   __defaultValue?: string;
 }
@@ -14,6 +34,10 @@ export interface GlobalSettingDataInstanceState {
 export class GlobalSettingDataInstance extends ProxyInstanceObjectBase<GlobalSettingDataInstanceState> {
   store = proxy<GlobalSettingDataInstanceState>({
     requestSuccessCode: 200,
+    tokenFieldName: 'token',
+    headerTokenName: 'token',
+    tokenExpiredCode: 401,
+    loginPageRoute: 'pages/login/index',
   });
   /**
    * 扩展全局设置数据状态
@@ -32,5 +56,9 @@ export const globalSettingDataInstance = new GlobalSettingDataInstance();
  */
 export const useGlobalSettingData = () => {
   const store = useSnapshot(globalSettingDataInstance.store);
-  return [store, globalSettingDataInstance, store.__defaultValue] as const;
+  return [store, globalSettingDataInstance, store.__defaultValue] as [
+    GlobalSettingDataInstanceState,
+    GlobalSettingDataInstance,
+    string | undefined,
+  ];
 };

package/src/context/page.data.instance.ts

@@ -119,7 +119,7 @@ export class PageDataInstance<
         if (this.requestConfig?.onAfter) {
           saveData = this.requestConfig.onAfter(result);
         } else {
-          const dataList = result?.data?.list || result?.data?.records || [];
+          const dataList = result?.data?.list || result?.data?.rows || result?.data?.records || [];
           /**如果是第一页则直接返回数据，否则进行拼接数据*/
           let newDataList = [];
           if (this.store.page === 1) {
@@ -211,5 +211,5 @@ export const usePageData = <T extends PageDataInstanceState = PageDataInstanceSt
 ) => {
   const pageDataInstance = useRef(new PageDataInstance<T>(options)).current;
   const store = useSnapshot(pageDataInstance.store) as T;
-  return [store, pageDataInstance, store.__defaultValue] as const;
+  return [store, pageDataInstance, store.__defaultValue] as [T, PageDataInstance<T>, string | undefined];
 };

package/src/context/page.info.data.instance.ts

@@ -129,7 +129,7 @@ export class PageInfoDataInstance<
         return;
       }
       this.updatedLoading(true);
-      const newParams = await this.requestSaveInfoConfig?.onSaveBefore?.(this.store);
+      const newParams = (await this.requestSaveInfoConfig?.onSaveBefore?.(this.store)) || this.store.editFormData || {};
       const result = await this.requestSaveInfoConfig.onSaveInfo?.(newParams);
       this.updatedLoading(false);
       if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {
@@ -178,5 +178,5 @@ export const usePageInfoData = <T extends PageInfoDataInstanceState = PageInfoDa
 ) => {
   const pageDataInstance = useRef(new PageInfoDataInstance<T>(options)).current;
   const store = useSnapshot(pageDataInstance.store) as T;
-  return [store, pageDataInstance, store.__defaultValue] as const;
+  return [store, pageDataInstance, store.__defaultValue] as [T, PageInfoDataInstance<T>, string | undefined];
 };

package/src/utils/request.ts

@@ -3,8 +3,6 @@ import { globalSettingDataInstance } from 'context/global.setting.data.instance'
 import { globalDataInstance } from 'context/global.data.instance';
 
 const codeMessage = {
-  // 200: '服务器成功返回请求的数据',
-  // 201: '新建或修改数据成功',
   400: '发出的请求错误',
   401: '用户没有权限',
   403: '用户访问被禁止',
@@ -34,7 +32,7 @@ const requestResponseHandle = (result: Taro.request.SuccessCallbackResult<any>,
     const statusCode = result.statusCode;
     const code = result?.data?.code;
     if (result?.data) {
-      if (statusCode === 401 || code === 401) {
+      if (statusCode === 401 || code === 401 || code === globalSettingDataInstance.store.tokenExpiredCode) {
         // 权限问题 ，重新登录
         msg = '请重新登录';
         /**重新跳转登录页面*/
@@ -59,16 +57,6 @@ const requestResponseHandle = (result: Taro.request.SuccessCallbackResult<any>,
 };
 
 export interface RequestInstanceCreateOptions {
-  /**
-   * 本地存储token字段名
-   * @default token
-   */
-  tokenFieldName?: string;
-  /**
-   * 请求头token字段名
-   * @default token
-   */
-  headerTokenName?: string;
   /**
    * 公共请求配置
    * @default {}
@@ -85,6 +73,10 @@ export interface RequestInstanceCreateOptions {
    * @default {}
    */
   proxy?: {
+    default?: {
+      dev?: string;
+      pro?: string;
+    };
     dev: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
     pro: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
   };
@@ -95,16 +87,7 @@ export class RequestInstance {
   public IP?: string | ((url: string, module?: string, env?: string) => string);
   /**简单的代理配置*/
   public proxy?: RequestInstanceCreateOptions['proxy'];
-  /**
-   * 本地存储token字段名
-   * @default token
-   */
-  public tokenFieldName = 'token';
-  /**
-   * 请求头token字段名
-   * @default token
-   */
-  public headerTokenName = 'token';
+
   /**公共请求配置*/
   public commonOptions: Omit<Taro.request.Option<any, any>, 'url'> = {};
 
@@ -122,8 +105,6 @@ export class RequestInstance {
   extends = (options: RequestInstanceCreateOptions = {}) => {
     this.IP = options.IP || this.IP;
     this.proxy = options.proxy || this.proxy;
-    this.tokenFieldName = options.tokenFieldName || this.tokenFieldName;
-    this.headerTokenName = options.headerTokenName || this.headerTokenName;
     this.commonOptions = { ...this.commonOptions, ...options.commonOptions };
     return this;
   };
@@ -169,9 +150,14 @@ export class RequestInstance {
           }
         }
     }
+    if (!host) {
+      host = this.proxy?.default?.[process.env.NODE_ENV === 'production' ? 'pro' : 'dev'] || '';
+    }
+
     if (!host) {
       host = this.getHttpPath(url, module);
     }
+
     return {
       host,
       url: _url,
@@ -195,10 +181,10 @@ export class RequestInstance {
   /**发送请求，返回 Taro.RequestTask */
   requestBase = (options: RequestInstanceOptions) => {
     const { data, header = {}, module, isIgnoreToken, isShowErrorMessage, ...restOptions } = options;
-    const token = Taro.getStorageSync(this.tokenFieldName || 'token');
+    const token = Taro.getStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
     const newHeader = { ...header };
     if (token) {
-      newHeader[this.headerTokenName || 'token'] = token;
+      newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
     } else {
       if (isIgnoreToken !== true) {
         // 跳转登录页