@fairys/taro-tools-react 0.0.11 → 1.0.0

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

@@ -58,6 +58,8 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     }>;
     /**请求之后处理返回值进行存储*/
     onAfter?: (data: Record<string, any>, instance: PageDataInstance<T>) => Partial<T>;
+    /**额外数据处理*/
+    onExtraData?: (data: Record<string, any>, instance: PageDataInstance<T>) => Record<string, any>;
     /** code!==1 时 触发*/
     onError?: (data: Record<string, any>, instance: PageDataInstance<T>) => void;
     /**重置获取值的方法*/
@@ -124,6 +126,8 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
     getList?: PageDataInstance<T>['getList'];
     /**请求之后处理返回值进行存储*/
     onAfter?: PageDataInstance<T>['onAfter'];
+    /** 额外数据处理*/
+    onExtraData?: PageDataInstance<T>['onExtraData'];
     /** code!== 200 时 触发*/
     onError?: PageDataInstance<T>['onError'];
     /**获取弹框内重置参数*/

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

@@ -1,7 +1,7 @@
 import { jsx } from "react/jsx-runtime";
 import { proxy, ref as external_valtio_ref, useSnapshot } from "valtio";
 import { ProxyInstanceObjectBase } from "../utils/valtio/instance.js";
-import { createContext, useContext, useMemo, useRef } from "react";
+import { createContext, useContext, useEffect, useMemo, useRef } from "react";
 import { globalSettingDataInstance } from "./global.setting.data.instance.js";
 import taro, { useDidShow } from "@tarojs/taro";
 class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
@@ -12,6 +12,7 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
     onBefore;
     getList;
     onAfter;
+    onExtraData;
     onError;
     getResetValues;
     defaultQuery = {};
@@ -97,7 +98,7 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
         let totalField = 'total';
         let selectedRowsField = 'selectedRows';
         let selectedRowKeysField = 'selectedRowKeys';
-        let _request;
+        let _request = this.getList;
         let defaultQuery = {};
         if (this.store.isTabs) {
             const tabKey = this.store.tabKey;
@@ -110,7 +111,7 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
             totalField = `${tabKey}Total`;
             selectedRowsField = `${tabKey}SelectedRows`;
             selectedRowKeysField = `${tabKey}SelectedRowKeys`;
-        } else _request = this.getList;
+        }
         if (!_request) return void console.error("\u672A\u914D\u7F6E getList \u8BF7\u6C42\u65B9\u6CD5,\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E\u4E86 getList \u65B9\u6CD5");
         taro.showLoading({
             title: "\u52A0\u8F7D\u4E2D..."
@@ -146,11 +147,18 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
                         [dataListField]: newDataList,
                         [totalField]: result?.data?.total || 0
                     };
-                    if (1 === this.store[pageField]) {
+                    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);
+                    saveData = {
+                        ...saveData,
+                        ..._temps || {}
+                    };
+                }
                 if (saveData) this._setValues(saveData);
             } else if (this.onError) this.onError(result, this);
         } catch (error) {
@@ -264,11 +272,12 @@ const usePageDataInstanceContext = ()=>{
     return PageDataInstance;
 };
 function PageDataInstanceContextProvider(props) {
-    const { instance, children, initialValues, is_scroll_page, defaultTabKey, tabItems, defaultPageSize, onBefore, getList, onAfter, 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 } = props;
     const pageInstance = usePageDataInstance(instance);
     instance.onBefore = onBefore;
     instance.getList = getList;
     instance.onAfter = onAfter;
+    instance.onExtraData = onExtraData;
     instance.onError = onError;
     instance.getResetValues = getResetValues;
     instance.codeFields = codeFields;
@@ -283,7 +292,7 @@ function PageDataInstanceContextProvider(props) {
         }), [
         pageInstance
     ]);
-    useMemo(()=>{
+    useEffect(()=>{
         if (isMountLoad) pageInstance.main_onSearch();
     }, []);
     useDidShow(()=>{

package/esm/utils/request.js

@@ -92,6 +92,8 @@ class RequestInstance {
         };
     };
     formatUrl = (url, module)=>{
+        if (!url) throw new Error("\u8BF7\u6C42\u7684url\u5FC5\u586B");
+        if (url && (url.startsWith('http://') || url.startsWith('https://'))) return url;
         let { host, url: _url } = this.getProxyHost(url, module);
         if (host) host = host.replace(/\/$/, '');
         const newUrl = `${_url}`.replace(/^\//, '').replace(/\/$/, '');

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.11",
+  "version": "1.0.0",
   "main": "lib/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

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

@@ -1,6 +1,6 @@
 import { proxy, ref, useSnapshot } from 'valtio';
 import { ProxyInstanceObjectBase } from 'utils/valtio/instance';
-import { createContext, useContext, useMemo, useRef } from 'react';
+import { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { globalSettingDataInstance } from './global.setting.data.instance';
 import Taro, { useDidShow } from '@tarojs/taro';
 
@@ -63,6 +63,8 @@ export class PageDataInstance<
   getList?: (payload: any, instance: PageDataInstance<T>) => Promise<{ code?: number; data?: any; message?: string }>;
   /**请求之后处理返回值进行存储*/
   onAfter?: (data: Record<string, any>, instance: PageDataInstance<T>) => Partial<T>;
+  /**额外数据处理*/
+  onExtraData?: (data: Record<string, any>, instance: PageDataInstance<T>) => Record<string, any>;
   /** code!==1 时 触发*/
   onError?: (data: Record<string, any>, instance: PageDataInstance<T>) => void;
   /**重置获取值的方法*/
@@ -173,7 +175,7 @@ export class PageDataInstance<
     let totalField = 'total';
     let selectedRowsField = 'selectedRows';
     let selectedRowKeysField = 'selectedRowKeys';
-    let _request: Function | undefined;
+    let _request: Function | undefined = this.getList;
     /**默认请求参数*/
     let defaultQuery = {};
     if (this.store.isTabs) {
@@ -189,8 +191,6 @@ export class PageDataInstance<
       totalField = `${tabKey}Total`;
       selectedRowsField = `${tabKey}SelectedRows`;
       selectedRowKeysField = `${tabKey}SelectedRowKeys`;
-    } else {
-      _request = this.getList;
     }
     if (!_request) {
       console.error('未配置 getList 请求方法,请检查是否配置了 getList 方法');
@@ -233,11 +233,15 @@ export class PageDataInstance<
             [totalField]: result?.data?.total || 0,
           };
           // 第一页清理
-          if (this.store[pageField] === 1) {
+          if (this.store[pageField] === 1 || !this.is_scroll_page) {
             saveData[selectedRowsField] = ref([]);
             saveData[selectedRowKeysField] = ref([]);
           }
         }
+        if (this.onExtraData) {
+          const _temps = this.onExtraData(result, this);
+          saveData = { ...saveData, ...(_temps || {}) };
+        }
         if (saveData) this._setValues(saveData);
       } else if (this.onError) {
         this.onError(result, this);
@@ -396,6 +400,8 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
   getList?: PageDataInstance<T>['getList'];
   /**请求之后处理返回值进行存储*/
   onAfter?: PageDataInstance<T>['onAfter'];
+  /** 额外数据处理*/
+  onExtraData?: PageDataInstance<T>['onExtraData'];
   /** code!== 200 时 触发*/
   onError?: PageDataInstance<T>['onError'];
   /**获取弹框内重置参数*/
@@ -427,6 +433,7 @@ export function PageDataInstanceContextProvider<T extends PageDataInstanceState
     onBefore,
     getList,
     onAfter,
+    onExtraData,
     onError,
     getResetValues,
     defaultQuery,
@@ -440,6 +447,7 @@ export function PageDataInstanceContextProvider<T extends PageDataInstanceState
   instance.onBefore = onBefore;
   instance.getList = getList;
   instance.onAfter = onAfter;
+  instance.onExtraData = onExtraData;
   instance.onError = onError;
   instance.getResetValues = getResetValues;
   instance.codeFields = codeFields;
@@ -451,7 +459,7 @@ export function PageDataInstanceContextProvider<T extends PageDataInstanceState
     [pageInstance],
   );
 
-  useMemo(() => {
+  useEffect(() => {
     if (isMountLoad) {
       pageInstance.main_onSearch();
     }

package/src/utils/request.ts

@@ -178,6 +178,14 @@ export class RequestInstance {
 
   /**格式化地址*/
   formatUrl = (url: string, module?: string) => {
+    if (!url) {
+      throw new Error('请求的url必填');
+    }
+    /**如果是http或者https开头的，直接返回*/
+    if (url && (url.startsWith('http://') || url.startsWith('https://'))) {
+      return url;
+    }
+
     let { host, url: _url } = this.getProxyHost(url, module);
     if (host) {
       host = host.replace(/\/$/, '');