@fairys/taro-tools-react 1.0.31 → 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/esm/utils/navigate.d.ts

@@ -1,5 +1,7 @@
 import Taro from '@tarojs/taro';
 declare class NavigateInstance {
+    /**格式化路由，去掉查询参数*/
+    formateUrl: (url?: string) => string;
     /**判断是否已登录(方法需要在项目入口文件中进行挂载,如果不挂载,默认使用 authDataInstance.hasMenuPermission 判断是否有菜单权限)*/
     isAuth: (url: string) => Promise<boolean> | boolean;
     private _isAuth;

package/esm/utils/navigate.js

@@ -2,18 +2,20 @@ import taro from "@tarojs/taro";
 import { globalSettingDataInstance } from "../context/global.setting.data.instance.js";
 import { authDataInstance } from "../context/auth.data.instance.js";
 class NavigateInstance {
+    formateUrl = (url)=>`${url}`.split('?')?.[0] || '';
     isAuth;
     _isAuth = async (url)=>{
+        const _url = this.formateUrl(url);
         let isAuthTo = true;
-        const isIgnoreAuthRoutes = globalSettingDataInstance.isIgnoreAuthRoutes(url);
+        const isIgnoreAuthRoutes = globalSettingDataInstance.isIgnoreAuthRoutes(_url);
         const useAuthHasMenuPermission = globalSettingDataInstance.store.useAuthHasMenuPermission;
         const isEnableAuth = globalSettingDataInstance.store.isEnableAuth;
         let isAuthFunction = this.isAuth;
         if (useAuthHasMenuPermission && 'function' != typeof isAuthFunction && isEnableAuth) isAuthFunction = authDataInstance.hasMenuPermission;
-        if (url && 'function' == typeof isAuthFunction && !isIgnoreAuthRoutes && isEnableAuth) isAuthTo = await isAuthFunction(url);
+        if (_url && 'function' == typeof isAuthFunction && !isIgnoreAuthRoutes && isEnableAuth) isAuthTo = await isAuthFunction(_url);
         if (false === isAuthTo) {
             taro.showToast({
-                title: `${url} \u{65E0}\u{6743}\u{8BBF}\u{95EE}`,
+                title: `${_url} \u{65E0}\u{6743}\u{8BBF}\u{95EE}`,
                 icon: 'none'
             });
             return false;
@@ -21,8 +23,8 @@ class NavigateInstance {
         return true;
     };
     isCurrentPage = (route)=>{
-        const _route = route.replace(/^\//, '');
-        const currentPath = (taro.getCurrentInstance().router?.path || '').replace(/^\//, '');
+        const _route = this.formateUrl(route.replace(/^\//, ''));
+        const currentPath = this.formateUrl((taro.getCurrentInstance().router?.path || '').replace(/^\//, ''));
         return currentPath === _route;
     };
     switchTab = async (options)=>{

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/lib/utils/navigate.d.ts

@@ -1,5 +1,7 @@
 import Taro from '@tarojs/taro';
 declare class NavigateInstance {
+    /**格式化路由，去掉查询参数*/
+    formateUrl: (url?: string) => string;
     /**判断是否已登录(方法需要在项目入口文件中进行挂载,如果不挂载,默认使用 authDataInstance.hasMenuPermission 判断是否有菜单权限)*/
     isAuth: (url: string) => Promise<boolean> | boolean;
     private _isAuth;

package/lib/utils/navigate.js

@@ -41,18 +41,20 @@ var taro_default = /*#__PURE__*/ __webpack_require__.n(taro_namespaceObject);
 const global_setting_data_instance_js_namespaceObject = require("../context/global.setting.data.instance.js");
 const auth_data_instance_js_namespaceObject = require("../context/auth.data.instance.js");
 class NavigateInstance {
+    formateUrl = (url)=>`${url}`.split('?')?.[0] || '';
     isAuth;
     _isAuth = async (url)=>{
+        const _url = this.formateUrl(url);
         let isAuthTo = true;
-        const isIgnoreAuthRoutes = global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.isIgnoreAuthRoutes(url);
+        const isIgnoreAuthRoutes = global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.isIgnoreAuthRoutes(_url);
         const useAuthHasMenuPermission = global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.useAuthHasMenuPermission;
         const isEnableAuth = global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isEnableAuth;
         let isAuthFunction = this.isAuth;
         if (useAuthHasMenuPermission && 'function' != typeof isAuthFunction && isEnableAuth) isAuthFunction = auth_data_instance_js_namespaceObject.authDataInstance.hasMenuPermission;
-        if (url && 'function' == typeof isAuthFunction && !isIgnoreAuthRoutes && isEnableAuth) isAuthTo = await isAuthFunction(url);
+        if (_url && 'function' == typeof isAuthFunction && !isIgnoreAuthRoutes && isEnableAuth) isAuthTo = await isAuthFunction(_url);
         if (false === isAuthTo) {
             taro_default().showToast({
-                title: `${url} \u{65E0}\u{6743}\u{8BBF}\u{95EE}`,
+                title: `${_url} \u{65E0}\u{6743}\u{8BBF}\u{95EE}`,
                 icon: 'none'
             });
             return false;
@@ -60,8 +62,8 @@ class NavigateInstance {
         return true;
     };
     isCurrentPage = (route)=>{
-        const _route = route.replace(/^\//, '');
-        const currentPath = (taro_default().getCurrentInstance().router?.path || '').replace(/^\//, '');
+        const _route = this.formateUrl(route.replace(/^\//, ''));
+        const currentPath = this.formateUrl((taro_default().getCurrentInstance().router?.path || '').replace(/^\//, ''));
         return currentPath === _route;
     };
     switchTab = async (options)=>{

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.31",
+  "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>
   );

package/src/utils/navigate.ts

@@ -3,12 +3,19 @@ import { globalSettingDataInstance } from 'context/global.setting.data.instance'
 import { authDataInstance } from 'context/auth.data.instance';
 
 class NavigateInstance {
+  /**格式化路由，去掉查询参数*/
+  formateUrl = (url?: string) => {
+    return `${url}`.split('?')?.[0] || '';
+  };
+
   /**判断是否已登录(方法需要在项目入口文件中进行挂载,如果不挂载,默认使用 authDataInstance.hasMenuPermission 判断是否有菜单权限)*/
   public isAuth: (url: string) => Promise<boolean> | boolean;
+
   private _isAuth = async (url?: string) => {
+    const _url = this.formateUrl(url);
     let isAuthTo = true;
     // 判断是否跳转忽略权限校验的路由
-    const isIgnoreAuthRoutes = globalSettingDataInstance.isIgnoreAuthRoutes(url);
+    const isIgnoreAuthRoutes = globalSettingDataInstance.isIgnoreAuthRoutes(_url);
     // 判断是否使用 authDataInstance中的hasMenuPermission 判断是否有菜单权限
     const useAuthHasMenuPermission = globalSettingDataInstance.store.useAuthHasMenuPermission;
     // 判断是否开启权限校验
@@ -17,13 +24,12 @@ class NavigateInstance {
     if (useAuthHasMenuPermission && typeof isAuthFunction !== 'function' && isEnableAuth) {
       isAuthFunction = authDataInstance.hasMenuPermission;
     }
-
-    if (url && typeof isAuthFunction === 'function' && !isIgnoreAuthRoutes && isEnableAuth) {
-      isAuthTo = await isAuthFunction(url);
+    if (_url && typeof isAuthFunction === 'function' && !isIgnoreAuthRoutes && isEnableAuth) {
+      isAuthTo = await isAuthFunction(_url);
     }
     if (isAuthTo === false) {
       // 无权访问页面
-      Taro.showToast({ title: `${url} 无权访问`, icon: 'none' });
+      Taro.showToast({ title: `${_url} 无权访问`, icon: 'none' });
       return false;
     }
     return true;
@@ -34,8 +40,8 @@ class NavigateInstance {
    */
   isCurrentPage = (route: string) => {
     /**处理路由前缀*/
-    const _route = route.replace(/^\//, '');
-    const currentPath = (Taro.getCurrentInstance().router?.path || '').replace(/^\//, '');
+    const _route = this.formateUrl(route.replace(/^\//, ''));
+    const currentPath = this.formateUrl((Taro.getCurrentInstance().router?.path || '').replace(/^\//, ''));
     return currentPath === _route;
   };