@fairys/taro-tools-react 1.0.22 → 1.0.24

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

@@ -44,6 +44,7 @@ export declare class GlobalMessageDataInstance extends ProxyInstanceObjectBase<G
      * 跳转登录页面前执行
      */
     onBeforetToLoginPage?: () => boolean | void;
+    toRedirect: () => void;
     /**跳转登录页面*/
     toLoginPage: () => void;
 }

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

@@ -3,6 +3,7 @@ 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";
+import taro from "@tarojs/taro";
 class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
     store = proxy({
         messageData: ref([]),
@@ -46,17 +47,24 @@ class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
         });
     };
     onBeforetToLoginPage;
+    toRedirect = ()=>{
+        const currentPath = taro.getCurrentInstance().router?.params?.redirect || '';
+        if (currentPath) utils_navigate.navigateTo({
+            url: currentPath
+        });
+    };
     toLoginPage = ()=>{
         if (this.onBeforetToLoginPage) {
             const f = this.onBeforetToLoginPage();
             if (false === f) return;
         }
+        const currentPath = taro.getCurrentInstance().router?.path || '';
         const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
         const isLoginPage = utils_navigate.isCurrentPage(loginPageRoute || '');
         const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
         if (isLoginPage) return;
         utils_navigate.navigateTo({
-            url: `/${_loginPageRoute}`
+            url: `/${_loginPageRoute}?redirect=${currentPath}`
         });
     };
 }

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

@@ -78,6 +78,14 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     codeFields?: string[];
     /**那些字段取值对象的 value 值 */
     valueFields?: string[];
+    /**成功状态码*/
+    responseSuccessCode?: number;
+    /**对象中取值字段*/
+    responseListField?: string;
+    /**总页数字段
+     * @default "total"
+     */
+    responseTotalField?: string;
     /**是否滚动加载分页*/
     is_scroll_page: boolean;
     /**默认值*/
@@ -154,6 +162,16 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
     isMountLoad?: boolean;
     /**页面标题*/
     title?: string;
+    /**成功状态码
+     * @default 200
+     */
+    responseSuccessCode?: number;
+    /**对象中取值字段*/
+    responseListField?: string;
+    /**总页数字段
+     * @default "total"
+     */
+    responseTotalField?: string;
 }
 /**页面级数据状态管理上下文提供者*/
 export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(props: PageDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;

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

@@ -18,6 +18,9 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
     defaultQuery = {};
     codeFields = [];
     valueFields = [];
+    responseSuccessCode = 200;
+    responseListField = '';
+    responseTotalField = 'total';
     is_scroll_page = true;
     defaultInital = {
         page: 1,
@@ -147,11 +150,14 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
             const result = await this.getList?.(newParams, this);
             this.updatedPageLoading(false);
             this.store.loading.loadMore = false;
-            if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {
+            const successCode = 'number' == typeof this.responseSuccessCode ? this.responseSuccessCode : globalSettingDataInstance.store.requestSuccessCode;
+            if (result && result.code === successCode) {
                 let saveData = {};
                 if (this.onAfter) saveData = this.onAfter(result, this);
                 else {
-                    const dataList = result?.data?.list || result?.data?.rows || result?.data?.records || [];
+                    const responseTotalField = 'string' == typeof this.responseTotalField ? this.responseTotalField : 'total';
+                    let dataList = [];
+                    dataList = 'string' == typeof this.responseListField ? result?.data?.[this.responseListField] || [] : result?.data?.list || result?.data?.rows || result?.data?.records || [];
                     let newDataList = [];
                     if (1 === this.store[pageField]) newDataList = dataList;
                     else if (this.is_scroll_page) newDataList = [
@@ -160,12 +166,12 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
                     ];
                     saveData = {
                         [dataListField]: newDataList,
-                        [totalField]: result?.data?.total || 0
+                        [totalField]: result?.data?.[responseTotalField] || 0
                     };
-                    if (1 === this.store[pageField] || !this.is_scroll_page) {
-                        saveData[selectedRowsField] = external_valtio_ref([]);
-                        saveData[selectedRowKeysField] = external_valtio_ref([]);
-                    }
+                }
+                if (1 === this.store[pageField] || !this.is_scroll_page) {
+                    saveData[selectedRowsField] = external_valtio_ref([]);
+                    saveData[selectedRowKeysField] = external_valtio_ref([]);
                 }
                 if (this.onExtraData) {
                     const _temps = this.onExtraData(result, this);
@@ -301,7 +307,7 @@ const usePageDataInstanceContext = ()=>{
     return PageDataInstance;
 };
 function PageDataInstanceContextProvider(props) {
-    const { instance, children, initialValues, is_scroll_page, defaultTabKey, tabItems, defaultPageSize, onBefore, getList, onAfter, onExtraData, onError, getResetValues, defaultQuery, codeFields, valueFields, isMountLoad, title } = props;
+    const { instance, children, initialValues, is_scroll_page, defaultTabKey, tabItems, defaultPageSize, onBefore, getList, onAfter, onExtraData, onError, getResetValues, defaultQuery, codeFields, valueFields, isMountLoad, title, responseSuccessCode, responseListField, responseTotalField } = props;
     const pageInstance = usePageDataInstance(instance);
     instance.onBefore = onBefore;
     instance.getList = getList;
@@ -312,6 +318,9 @@ function PageDataInstanceContextProvider(props) {
     instance.codeFields = codeFields;
     instance.valueFields = valueFields;
     instance.defaultQuery = defaultQuery;
+    instance.responseSuccessCode = responseSuccessCode;
+    instance.responseListField = responseListField;
+    instance.responseTotalField = responseTotalField;
     useMemo(()=>pageInstance.ctor({
             initialValues,
             is_scroll_page,

package/esm/utils/request.js

@@ -190,7 +190,12 @@ class RequestInstance {
         try {
             return this.request({
                 ...options,
-                method: 'GET'
+                method: 'GET',
+                header: {
+                    accept: 'application/json, text/plain, */*',
+                    'Content-Type': 'application/json;charset=utf-8',
+                    ...options.header || {}
+                }
             });
         } catch (error) {
             throw error;
@@ -200,7 +205,12 @@ class RequestInstance {
         try {
             return this.request({
                 ...options,
-                method: 'POST'
+                method: 'POST',
+                header: {
+                    accept: 'application/json, text/plain, */*',
+                    'Content-Type': 'application/json;charset=utf-8',
+                    ...options.header || {}
+                }
             });
         } catch (error) {
             throw error;

package/lib/context/global.message.data.instance.d.ts

@@ -44,6 +44,7 @@ export declare class GlobalMessageDataInstance extends ProxyInstanceObjectBase<G
      * 跳转登录页面前执行
      */
     onBeforetToLoginPage?: () => boolean | void;
+    toRedirect: () => void;
     /**跳转登录页面*/
     toLoginPage: () => void;
 }

package/lib/context/global.message.data.instance.js

@@ -43,6 +43,8 @@ var navigate_js_default = /*#__PURE__*/ __webpack_require__.n(navigate_js_namesp
 const useId_js_namespaceObject = require("../utils/useId.js");
 const instance_js_namespaceObject = require("../utils/valtio/instance.js");
 const external_global_setting_data_instance_js_namespaceObject = require("./global.setting.data.instance.js");
+const taro_namespaceObject = require("@tarojs/taro");
+var taro_default = /*#__PURE__*/ __webpack_require__.n(taro_namespaceObject);
 class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanceObjectBase {
     store = (0, external_valtio_namespaceObject.proxy)({
         messageData: (0, external_valtio_namespaceObject.ref)([]),
@@ -86,17 +88,24 @@ class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanc
         });
     };
     onBeforetToLoginPage;
+    toRedirect = ()=>{
+        const currentPath = taro_default().getCurrentInstance().router?.params?.redirect || '';
+        if (currentPath) navigate_js_default().navigateTo({
+            url: currentPath
+        });
+    };
     toLoginPage = ()=>{
         if (this.onBeforetToLoginPage) {
             const f = this.onBeforetToLoginPage();
             if (false === f) return;
         }
+        const currentPath = taro_default().getCurrentInstance().router?.path || '';
         const loginPageRoute = external_global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.loginPageRoute || '';
         const isLoginPage = navigate_js_default().isCurrentPage(loginPageRoute || '');
         const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
         if (isLoginPage) return;
         navigate_js_default().navigateTo({
-            url: `/${_loginPageRoute}`
+            url: `/${_loginPageRoute}?redirect=${currentPath}`
         });
     };
 }

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

@@ -78,6 +78,14 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     codeFields?: string[];
     /**那些字段取值对象的 value 值 */
     valueFields?: string[];
+    /**成功状态码*/
+    responseSuccessCode?: number;
+    /**对象中取值字段*/
+    responseListField?: string;
+    /**总页数字段
+     * @default "total"
+     */
+    responseTotalField?: string;
     /**是否滚动加载分页*/
     is_scroll_page: boolean;
     /**默认值*/
@@ -154,6 +162,16 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
     isMountLoad?: boolean;
     /**页面标题*/
     title?: string;
+    /**成功状态码
+     * @default 200
+     */
+    responseSuccessCode?: number;
+    /**对象中取值字段*/
+    responseListField?: string;
+    /**总页数字段
+     * @default "total"
+     */
+    responseTotalField?: string;
 }
 /**页面级数据状态管理上下文提供者*/
 export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(props: PageDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;

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

@@ -61,6 +61,9 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
     defaultQuery = {};
     codeFields = [];
     valueFields = [];
+    responseSuccessCode = 200;
+    responseListField = '';
+    responseTotalField = 'total';
     is_scroll_page = true;
     defaultInital = {
         page: 1,
@@ -190,11 +193,14 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
             const result = await this.getList?.(newParams, this);
             this.updatedPageLoading(false);
             this.store.loading.loadMore = false;
-            if (result && result.code === external_global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.requestSuccessCode) {
+            const successCode = 'number' == typeof this.responseSuccessCode ? this.responseSuccessCode : external_global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.requestSuccessCode;
+            if (result && result.code === successCode) {
                 let saveData = {};
                 if (this.onAfter) saveData = this.onAfter(result, this);
                 else {
-                    const dataList = result?.data?.list || result?.data?.rows || result?.data?.records || [];
+                    const responseTotalField = 'string' == typeof this.responseTotalField ? this.responseTotalField : 'total';
+                    let dataList = [];
+                    dataList = 'string' == typeof this.responseListField ? result?.data?.[this.responseListField] || [] : result?.data?.list || result?.data?.rows || result?.data?.records || [];
                     let newDataList = [];
                     if (1 === this.store[pageField]) newDataList = dataList;
                     else if (this.is_scroll_page) newDataList = [
@@ -203,12 +209,12 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
                     ];
                     saveData = {
                         [dataListField]: newDataList,
-                        [totalField]: result?.data?.total || 0
+                        [totalField]: result?.data?.[responseTotalField] || 0
                     };
-                    if (1 === this.store[pageField] || !this.is_scroll_page) {
-                        saveData[selectedRowsField] = (0, external_valtio_namespaceObject.ref)([]);
-                        saveData[selectedRowKeysField] = (0, external_valtio_namespaceObject.ref)([]);
-                    }
+                }
+                if (1 === this.store[pageField] || !this.is_scroll_page) {
+                    saveData[selectedRowsField] = (0, external_valtio_namespaceObject.ref)([]);
+                    saveData[selectedRowKeysField] = (0, external_valtio_namespaceObject.ref)([]);
                 }
                 if (this.onExtraData) {
                     const _temps = this.onExtraData(result, this);
@@ -344,7 +350,7 @@ const usePageDataInstanceContext = ()=>{
     return PageDataInstance;
 };
 function PageDataInstanceContextProvider(props) {
-    const { instance, children, initialValues, is_scroll_page, defaultTabKey, tabItems, defaultPageSize, onBefore, getList, onAfter, onExtraData, onError, getResetValues, defaultQuery, codeFields, valueFields, isMountLoad, title } = props;
+    const { instance, children, initialValues, is_scroll_page, defaultTabKey, tabItems, defaultPageSize, onBefore, getList, onAfter, onExtraData, onError, getResetValues, defaultQuery, codeFields, valueFields, isMountLoad, title, responseSuccessCode, responseListField, responseTotalField } = props;
     const pageInstance = usePageDataInstance(instance);
     instance.onBefore = onBefore;
     instance.getList = getList;
@@ -355,6 +361,9 @@ function PageDataInstanceContextProvider(props) {
     instance.codeFields = codeFields;
     instance.valueFields = valueFields;
     instance.defaultQuery = defaultQuery;
+    instance.responseSuccessCode = responseSuccessCode;
+    instance.responseListField = responseListField;
+    instance.responseTotalField = responseTotalField;
     (0, external_react_namespaceObject.useMemo)(()=>pageInstance.ctor({
             initialValues,
             is_scroll_page,

package/lib/utils/request.js

@@ -230,7 +230,12 @@ class RequestInstance {
         try {
             return this.request({
                 ...options,
-                method: 'GET'
+                method: 'GET',
+                header: {
+                    accept: 'application/json, text/plain, */*',
+                    'Content-Type': 'application/json;charset=utf-8',
+                    ...options.header || {}
+                }
             });
         } catch (error) {
             throw error;
@@ -240,7 +245,12 @@ class RequestInstance {
         try {
             return this.request({
                 ...options,
-                method: 'POST'
+                method: 'POST',
+                header: {
+                    accept: 'application/json, text/plain, */*',
+                    'Content-Type': 'application/json;charset=utf-8',
+                    ...options.header || {}
+                }
             });
         } catch (error) {
             throw error;

package/package.json

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

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

@@ -6,6 +6,7 @@ import React from 'react';
 import type { FairysTaroMessageItemProps } from 'components/Mesage';
 import { ProxyInstanceObjectBase } from 'utils/valtio/instance';
 import { globalSettingDataInstance } from './global.setting.data.instance';
+import Taro from '@tarojs/taro';
 
 export interface MessageDataType extends FairysTaroMessageItemProps {
   /**用于唯一标识提示框(默认自动生成)*/
@@ -81,6 +82,16 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
    * 跳转登录页面前执行
    */
   onBeforetToLoginPage?: () => boolean | void;
+  // 跳转 redirect 路由
+  toRedirect = () => {
+    //  获取当前路由参数
+    const currentPath = Taro.getCurrentInstance().router?.params?.redirect || '';
+    if (currentPath) {
+      // 跳转 redirect 路由
+      navigate.navigateTo({ url: currentPath });
+    }
+  };
+
   /**跳转登录页面*/
   toLoginPage = () => {
     if (this.onBeforetToLoginPage) {
@@ -90,6 +101,9 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
         return;
       }
     }
+    // 当前路由
+    const currentPath = Taro.getCurrentInstance().router?.path || '';
+
     const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
     const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
     const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
@@ -98,7 +112,7 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
       return;
     }
     // 跳转登录页面
-    navigate.navigateTo({ url: `/${_loginPageRoute}` });
+    navigate.navigateTo({ url: `/${_loginPageRoute}?redirect=${currentPath}` });
   };
 }
 /**

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

@@ -83,6 +83,14 @@ export class PageDataInstance<
   codeFields?: string[] = [];
   /**那些字段取值对象的 value 值 */
   valueFields?: string[] = [];
+  /**成功状态码*/
+  responseSuccessCode?: number = 200;
+  /**对象中取值字段*/
+  responseListField?: string = '';
+  /**总页数字段
+   * @default "total"
+   */
+  responseTotalField?: string = 'total';
   // ======================================挂载方法或参数======================================
   /**是否滚动加载分页*/
   is_scroll_page = true;
@@ -256,12 +264,22 @@ export class PageDataInstance<
       const result = await this.getList?.(newParams, this);
       this.updatedPageLoading(false);
       this.store.loading.loadMore = false;
-      if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {
+      const successCode =
+        typeof this.responseSuccessCode === 'number'
+          ? this.responseSuccessCode
+          : globalSettingDataInstance.store.requestSuccessCode;
+      if (result && result.code === successCode) {
         let saveData = {};
         if (this.onAfter) {
           saveData = this.onAfter(result, this);
         } else {
-          const dataList = result?.data?.list || result?.data?.rows || result?.data?.records || [];
+          const responseTotalField = typeof this.responseTotalField === 'string' ? this.responseTotalField : 'total';
+          let dataList = [];
+          if (typeof this.responseListField === 'string') {
+            dataList = result?.data?.[this.responseListField] || [];
+          } else {
+            dataList = result?.data?.list || result?.data?.rows || result?.data?.records || [];
+          }
           /**如果是第一页则直接返回数据，否则进行拼接数据*/
           let newDataList = [];
           if (this.store[pageField] === 1) {
@@ -271,13 +289,13 @@ export class PageDataInstance<
           }
           saveData = {
             [dataListField]: newDataList,
-            [totalField]: result?.data?.total || 0,
+            [totalField]: result?.data?.[responseTotalField] || 0,
           };
-          // 第一页清理
-          if (this.store[pageField] === 1 || !this.is_scroll_page) {
-            saveData[selectedRowsField] = ref([]);
-            saveData[selectedRowKeysField] = ref([]);
-          }
+        }
+        // 第一页清理
+        if (this.store[pageField] === 1 || !this.is_scroll_page) {
+          saveData[selectedRowsField] = ref([]);
+          saveData[selectedRowKeysField] = ref([]);
         }
         if (this.onExtraData) {
           const _temps = this.onExtraData(result, this);
@@ -478,6 +496,16 @@ export interface PageDataInstanceContextProviderProps<
   isMountLoad?: boolean;
   /**页面标题*/
   title?: string;
+  /**成功状态码
+   * @default 200
+   */
+  responseSuccessCode?: number;
+  /**对象中取值字段*/
+  responseListField?: string;
+  /**总页数字段
+   * @default "total"
+   */
+  responseTotalField?: string;
 }
 
 /**页面级数据状态管理上下文提供者*/
@@ -504,6 +532,9 @@ export function PageDataInstanceContextProvider<
     valueFields,
     isMountLoad,
     title,
+    responseSuccessCode,
+    responseListField,
+    responseTotalField,
   } = props;
 
   const pageInstance = usePageDataInstance(instance);
@@ -517,6 +548,9 @@ export function PageDataInstanceContextProvider<
   instance.codeFields = codeFields;
   instance.valueFields = valueFields;
   instance.defaultQuery = defaultQuery;
+  instance.responseSuccessCode = responseSuccessCode;
+  instance.responseListField = responseListField;
+  instance.responseTotalField = responseTotalField;
 
   useMemo(
     () => pageInstance.ctor({ initialValues, is_scroll_page, defaultTabKey, tabItems, defaultPageSize }),

package/src/utils/request.ts

@@ -321,6 +321,11 @@ export class RequestInstance {
       return this.request({
         ...options,
         method: 'GET',
+        header: {
+          accept: 'application/json, text/plain, */*',
+          'Content-Type': 'application/json;charset=utf-8',
+          ...(options.header || {}),
+        },
       });
     } catch (error) {
       throw error;
@@ -333,6 +338,11 @@ export class RequestInstance {
       return this.request({
         ...options,
         method: 'POST',
+        header: {
+          accept: 'application/json, text/plain, */*',
+          'Content-Type': 'application/json;charset=utf-8',
+          ...(options.header || {}),
+        },
       });
     } catch (error) {
       throw error;