@fairys/taro-tools-react 1.0.32 → 1.0.33

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

@@ -4,6 +4,7 @@ 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";
+import { authDataInstance } from "./auth.data.instance.js";
 class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
     store = proxy({
         messageData: ref([]),
@@ -54,6 +55,7 @@ class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
         });
     };
     toLoginPage = ()=>{
+        authDataInstance.clear();
         if (this.onBeforetToLoginPage) {
             const f = this.onBeforetToLoginPage();
             if (false === f) return;

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

@@ -160,6 +160,8 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
     valueFields?: M['valueFields'];
     /**是否是第一次加载*/
     isMountLoad?: boolean;
+    /**是否使用 useDidShow*/
+    isDidShowLoad?: boolean;
     /**页面标题*/
     title?: string;
     /**成功状态码

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

@@ -307,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, responseSuccessCode, responseListField, responseTotalField } = 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, isDidShowLoad } = props;
     const pageInstance = usePageDataInstance(instance);
     instance.onBefore = onBefore;
     instance.getList = getList;
@@ -333,6 +333,9 @@ function PageDataInstanceContextProvider(props) {
     useEffect(()=>{
         if (isMountLoad) pageInstance.main_onSearch();
     }, []);
+    useDidShow(()=>{
+        if (isDidShowLoad) pageInstance.main_onSearch();
+    });
     useDidShow(()=>{
         if (title) taro.setNavigationBarTitle({
             title

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

@@ -83,6 +83,8 @@ export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoData
     title?: string;
     /**页面一加载是否请求详情接口*/
     isMountRequestInfo?: boolean;
+    /**是否使用 useDidShow*/
+    isDidShowRequestInfo?: boolean;
     /**自定义hooks,挂载参数和设置完初始值后执行*/
     useHooks?: (instance: M) => void;
 }

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

@@ -133,7 +133,7 @@ const usePageInfoDataInstanceContext = ()=>{
     return PageInfoDataInstance;
 };
 function PageInfoDataInstanceContextProvider(props) {
-    const { instance, children, initialValues, requestInfoConfig, requestSaveInfoConfig, isProxy, title, isMountRequestInfo, useHooks } = props;
+    const { instance, children, initialValues, requestInfoConfig, requestSaveInfoConfig, isProxy, title, isMountRequestInfo, useHooks, isDidShowRequestInfo } = props;
     const pageInfoInstance = usePageInfoDataInstance(instance);
     pageInfoInstance.requestInfoConfig = requestInfoConfig;
     pageInfoInstance.requestSaveInfoConfig = requestSaveInfoConfig;
@@ -152,6 +152,9 @@ function PageInfoDataInstanceContextProvider(props) {
     useEffect(()=>{
         if (isMountRequestInfo) pageInfoInstance.main_getInfo();
     }, []);
+    useDidShow(()=>{
+        if (isDidShowRequestInfo) pageInfoInstance.main_getInfo();
+    });
     return /*#__PURE__*/ jsx(PageInfoDataInstanceContext.Provider, {
         value: pageInfoInstance,
         children: children

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

@@ -45,6 +45,7 @@ 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);
+const external_auth_data_instance_js_namespaceObject = require("./auth.data.instance.js");
 class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanceObjectBase {
     store = (0, external_valtio_namespaceObject.proxy)({
         messageData: (0, external_valtio_namespaceObject.ref)([]),
@@ -95,6 +96,7 @@ class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanc
         });
     };
     toLoginPage = ()=>{
+        external_auth_data_instance_js_namespaceObject.authDataInstance.clear();
         if (this.onBeforetToLoginPage) {
             const f = this.onBeforetToLoginPage();
             if (false === f) return;

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

@@ -160,6 +160,8 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
     valueFields?: M['valueFields'];
     /**是否是第一次加载*/
     isMountLoad?: boolean;
+    /**是否使用 useDidShow*/
+    isDidShowLoad?: boolean;
     /**页面标题*/
     title?: string;
     /**成功状态码

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

@@ -350,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, responseSuccessCode, responseListField, responseTotalField } = 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, isDidShowLoad } = props;
     const pageInstance = usePageDataInstance(instance);
     instance.onBefore = onBefore;
     instance.getList = getList;
@@ -376,6 +376,9 @@ function PageDataInstanceContextProvider(props) {
     (0, external_react_namespaceObject.useEffect)(()=>{
         if (isMountLoad) pageInstance.main_onSearch();
     }, []);
+    (0, taro_namespaceObject.useDidShow)(()=>{
+        if (isDidShowLoad) pageInstance.main_onSearch();
+    });
     (0, taro_namespaceObject.useDidShow)(()=>{
         if (title) taro_default().setNavigationBarTitle({
             title

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

@@ -83,6 +83,8 @@ export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoData
     title?: string;
     /**页面一加载是否请求详情接口*/
     isMountRequestInfo?: boolean;
+    /**是否使用 useDidShow*/
+    isDidShowRequestInfo?: boolean;
     /**自定义hooks,挂载参数和设置完初始值后执行*/
     useHooks?: (instance: M) => void;
 }

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

@@ -177,7 +177,7 @@ const usePageInfoDataInstanceContext = ()=>{
     return PageInfoDataInstance;
 };
 function PageInfoDataInstanceContextProvider(props) {
-    const { instance, children, initialValues, requestInfoConfig, requestSaveInfoConfig, isProxy, title, isMountRequestInfo, useHooks } = props;
+    const { instance, children, initialValues, requestInfoConfig, requestSaveInfoConfig, isProxy, title, isMountRequestInfo, useHooks, isDidShowRequestInfo } = props;
     const pageInfoInstance = usePageInfoDataInstance(instance);
     pageInfoInstance.requestInfoConfig = requestInfoConfig;
     pageInfoInstance.requestSaveInfoConfig = requestSaveInfoConfig;
@@ -196,6 +196,9 @@ function PageInfoDataInstanceContextProvider(props) {
     (0, external_react_namespaceObject.useEffect)(()=>{
         if (isMountRequestInfo) pageInfoInstance.main_getInfo();
     }, []);
+    (0, taro_namespaceObject.useDidShow)(()=>{
+        if (isDidShowRequestInfo) pageInfoInstance.main_getInfo();
+    });
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(PageInfoDataInstanceContext.Provider, {
         value: pageInfoInstance,
         children: children

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

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

@@ -7,6 +7,7 @@ import type { FairysTaroMessageItemProps } from 'components/Mesage';
 import { ProxyInstanceObjectBase } from 'utils/valtio/instance';
 import { globalSettingDataInstance } from './global.setting.data.instance';
 import Taro from '@tarojs/taro';
+import { authDataInstance } from './auth.data.instance';
 
 export interface MessageDataType extends FairysTaroMessageItemProps {
   /**用于唯一标识提示框(默认自动生成)*/
@@ -94,6 +95,9 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
 
   /**跳转登录页面*/
   toLoginPage = () => {
+    // 清除登录凭证（token）、权限列表、菜单权限列表、用户信息
+    authDataInstance.clear();
+
     if (this.onBeforetToLoginPage) {
       const f = this.onBeforetToLoginPage();
       if (f === false) {

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

@@ -494,6 +494,8 @@ export interface PageDataInstanceContextProviderProps<
   valueFields?: M['valueFields'];
   /**是否是第一次加载*/
   isMountLoad?: boolean;
+  /**是否使用 useDidShow*/
+  isDidShowLoad?: boolean;
   /**页面标题*/
   title?: string;
   /**成功状态码
@@ -535,6 +537,7 @@ export function PageDataInstanceContextProvider<
     responseSuccessCode,
     responseListField,
     responseTotalField,
+    isDidShowLoad,
   } = props;
 
   const pageInstance = usePageDataInstance(instance);
@@ -563,6 +566,12 @@ export function PageDataInstanceContextProvider<
     }
   }, []);
 
+  useDidShow(() => {
+    if (isDidShowLoad) {
+      pageInstance.main_onSearch();
+    }
+  });
+
   useDidShow(() => {
     if (title) {
       // 列表查询才调用

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

@@ -235,6 +235,8 @@ export interface PageInfoDataInstanceContextProviderProps<
   title?: string;
   /**页面一加载是否请求详情接口*/
   isMountRequestInfo?: boolean;
+  /**是否使用 useDidShow*/
+  isDidShowRequestInfo?: boolean;
   /**自定义hooks,挂载参数和设置完初始值后执行*/
   useHooks?: (instance: M) => void;
 }
@@ -254,6 +256,7 @@ export function PageInfoDataInstanceContextProvider<
     title,
     isMountRequestInfo,
     useHooks,
+    isDidShowRequestInfo,
   } = props;
   const pageInfoInstance = usePageInfoDataInstance(instance);
   pageInfoInstance.requestInfoConfig = requestInfoConfig;
@@ -276,6 +279,11 @@ export function PageInfoDataInstanceContextProvider<
     }
   }, []);
 
+  useDidShow(() => {
+    if (isDidShowRequestInfo) {
+      pageInfoInstance.main_getInfo();
+    }
+  });
   return (
     <PageInfoDataInstanceContext.Provider value={pageInfoInstance}>{children}</PageInfoDataInstanceContext.Provider>
   );