@fairys/taro-tools-react 1.0.33 → 1.0.34

package/lib/components/index.d.ts

@@ -4,3 +4,4 @@ export * from './Mesage';
 export * from './Toast';
 export * from './connectToastMessage';
 export * from './MainPage';
+export * from './custom-tab-bar';

package/lib/components/index.js

@@ -17,6 +17,9 @@ var __webpack_modules__ = {
     },
     "./connectToastMessage": function(module) {
         module.exports = require("./connectToastMessage/index.js");
+    },
+    "./custom-tab-bar": function(module) {
+        module.exports = require("./custom-tab-bar/index.js");
     }
 };
 var __webpack_module_cache__ = {};
@@ -98,6 +101,12 @@ var __webpack_exports__ = {};
         return _MainPage__WEBPACK_IMPORTED_MODULE_5__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _custom_tab_bar__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./custom-tab-bar");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _custom_tab_bar__WEBPACK_IMPORTED_MODULE_6__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _custom_tab_bar__WEBPACK_IMPORTED_MODULE_6__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();
 for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

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

@@ -0,0 +1,27 @@
+import { ProxyInstanceObjectBase } from '../utils/valtio/instance';
+export interface GlobalDataInstanceState {
+    /**数据默认值不使用*/
+    __defaultValue?: string;
+}
+/**
+ * 全局数据实例
+ */
+export declare class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstanceState> {
+    store: GlobalDataInstanceState;
+    /**
+     * 跳转登录页面前执行
+     */
+    onBeforetToLoginPage?: () => boolean | void;
+    /**跳转 redirect 路由*/
+    toRedirect: () => void;
+    /**跳转登录页面*/
+    toLoginPage: () => void;
+}
+/**
+ * 全局数据实例
+ */
+export declare const globalDataInstance: GlobalDataInstance;
+/**
+ * 全局数据状态管理
+ */
+export declare const useGlobalData: () => [GlobalDataInstanceState, GlobalDataInstance, string | undefined];

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

@@ -0,0 +1,91 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    useGlobalData: ()=>useGlobalData,
+    GlobalDataInstance: ()=>GlobalDataInstance,
+    globalDataInstance: ()=>globalDataInstance
+});
+const external_valtio_namespaceObject = require("valtio");
+const navigate_js_namespaceObject = require("../utils/navigate.js");
+var navigate_js_default = /*#__PURE__*/ __webpack_require__.n(navigate_js_namespaceObject);
+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 GlobalDataInstance extends instance_js_namespaceObject.ProxyInstanceObjectBase {
+    store = (0, external_valtio_namespaceObject.proxy)({});
+    onBeforetToLoginPage;
+    toRedirect = ()=>{
+        const currentPath = taro_default().getCurrentInstance().router?.params?.redirect || '';
+        if (currentPath) navigate_js_default().navigateTo({
+            url: currentPath
+        });
+    };
+    toLoginPage = ()=>{
+        external_auth_data_instance_js_namespaceObject.authDataInstance.clear();
+        if (this.onBeforetToLoginPage) {
+            const f = this.onBeforetToLoginPage();
+            if (false === f) return;
+        }
+        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;
+        taro_default().navigateTo({
+            url: `/${_loginPageRoute}`
+        });
+    };
+}
+const globalDataInstance = new GlobalDataInstance();
+const useGlobalData = ()=>{
+    const store = (0, external_valtio_namespaceObject.useSnapshot)(globalDataInstance.store);
+    return [
+        store,
+        globalDataInstance,
+        store.__defaultValue
+    ];
+};
+exports.GlobalDataInstance = __webpack_exports__.GlobalDataInstance;
+exports.globalDataInstance = __webpack_exports__.globalDataInstance;
+exports.useGlobalData = __webpack_exports__.useGlobalData;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "GlobalDataInstance",
+    "globalDataInstance",
+    "useGlobalData"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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

@@ -40,13 +40,6 @@ export declare class GlobalMessageDataInstance extends ProxyInstanceObjectBase<G
     showToast: (config?: Partial<ToastDataType>) => void;
     /**隐藏Toast */
     hideToast: () => void;
-    /**
-     * 跳转登录页面前执行
-     */
-    onBeforetToLoginPage?: () => boolean | void;
-    toRedirect: () => void;
-    /**跳转登录页面*/
-    toLoginPage: () => void;
 }
 /**
  * 全局消息数据实例

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

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -38,14 +29,8 @@ __webpack_require__.d(__webpack_exports__, {
     useGlobalMessageData: ()=>useGlobalMessageData
 });
 const external_valtio_namespaceObject = require("valtio");
-const navigate_js_namespaceObject = require("../utils/navigate.js");
-var navigate_js_default = /*#__PURE__*/ __webpack_require__.n(navigate_js_namespaceObject);
 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);
-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)([]),
@@ -88,27 +73,6 @@ class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanc
             visible: false
         });
     };
-    onBeforetToLoginPage;
-    toRedirect = ()=>{
-        const currentPath = taro_default().getCurrentInstance().router?.params?.redirect || '';
-        if (currentPath) navigate_js_default().navigateTo({
-            url: currentPath
-        });
-    };
-    toLoginPage = ()=>{
-        external_auth_data_instance_js_namespaceObject.authDataInstance.clear();
-        if (this.onBeforetToLoginPage) {
-            const f = this.onBeforetToLoginPage();
-            if (false === f) return;
-        }
-        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;
-        taro_default().navigateTo({
-            url: `/${_loginPageRoute}`
-        });
-    };
 }
 const globalMessageDataInstance = new GlobalMessageDataInstance();
 const useGlobalMessageData = ()=>{

package/lib/context/index.d.ts

@@ -3,3 +3,4 @@ export * from './page.data.instance';
 export * from './page.info.data.instance';
 export * from './auth.data.instance';
 export * from './global.setting.data.instance';
+export * from './global.data.instance';

package/lib/context/index.js

@@ -3,6 +3,9 @@ var __webpack_modules__ = {
     "./auth.data.instance": function(module) {
         module.exports = require("./auth.data.instance.js");
     },
+    "./global.data.instance": function(module) {
+        module.exports = require("./global.data.instance.js");
+    },
     "./global.message.data.instance": function(module) {
         module.exports = require("./global.message.data.instance.js");
     },
@@ -89,6 +92,12 @@ var __webpack_exports__ = {};
         return _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _global_data_instance__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./global.data.instance");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _global_data_instance__WEBPACK_IMPORTED_MODULE_5__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _global_data_instance__WEBPACK_IMPORTED_MODULE_5__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();
 for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

package/lib/styles/index.css

@@ -181,6 +181,11 @@
   font-size: 12.8px;
 }
 
+.fairystaro__text-black {
+  --un-text-opacity: 1;
+  color: rgb(0 0 0 / var(--un-text-opacity));
+}
+
 .fairystaro__text-color-_zkh1_blue_zhk2_ {
   color: #00f;
 }
@@ -197,10 +202,23 @@
   color: red;
 }
 
+.fairystaro__text-gray-400 {
+  --un-text-opacity: 1;
+  color: rgb(156 163 175 / var(--un-text-opacity));
+}
+
 .fairystaro__font-bold {
   font-weight: 700;
 }
 
+.fairystaro__opacity-100 {
+  opacity: 1;
+}
+
+.fairystaro__opacity-60 {
+  opacity: .6;
+}
+
 @keyframes fairys_taro_loading_transform {
   0% {
     --fairys-enter-loading-transform-color: #00a98e;

package/lib/utils/request.js

@@ -41,6 +41,7 @@ const taro_namespaceObject = require("@tarojs/taro");
 var taro_default = /*#__PURE__*/ __webpack_require__.n(taro_namespaceObject);
 const global_setting_data_instance_js_namespaceObject = require("../context/global.setting.data.instance.js");
 const global_message_data_instance_js_namespaceObject = require("../context/global.message.data.instance.js");
+const global_data_instance_js_namespaceObject = require("../context/global.data.instance.js");
 const codeMessage = {
     400: "\u53D1\u51FA\u7684\u8BF7\u6C42\u9519\u8BEF",
     401: "\u7528\u6237\u6CA1\u6709\u6743\u9650",
@@ -62,7 +63,7 @@ const requestResponseHandle = (result, options)=>{
         const code = result?.data?.code;
         if (401 === statusCode || 401 === code || code === global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.tokenExpiredCode) {
             msg = "\u8BF7\u91CD\u65B0\u767B\u5F55";
-            global_message_data_instance_js_namespaceObject.globalMessageDataInstance.toLoginPage();
+            global_data_instance_js_namespaceObject.globalDataInstance.toLoginPage();
         } else msg = [
             global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.requestSuccessCode,
             requestSuccessCode,
@@ -174,7 +175,7 @@ class RequestInstance {
             options?.fail?.({
                 errMsg: "\u672A\u767B\u5F55"
             });
-            global_message_data_instance_js_namespaceObject.globalMessageDataInstance.toLoginPage();
+            global_data_instance_js_namespaceObject.globalDataInstance.toLoginPage();
             return;
         }
         return {

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

package/src/components/custom-tab-bar/index.css

@@ -0,0 +1,38 @@
+.fairys_taro_custom_tab_bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 60px;
+  background: white;
+  display: flex;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.fairys_taro_custom_tab_bar-border {
+  background-color: rgba(0, 0, 0, 0.33);
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 1px;
+  transform: scaleY(0.5);
+}
+
+.fairys_taro_custom_tab_bar_item {
+  flex: 1;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+
+.fairys_taro_custom_tab_bar_item cover-image {
+  width: 54px;
+  height: 54px;
+}
+
+.fairys_taro_custom_tab_bar_item cover-view {
+  font-size: 14px;
+}

package/src/components/custom-tab-bar/index.tsx

@@ -0,0 +1,169 @@
+import { proxy, useSnapshot, ref } from 'valtio';
+import { CoverImage, CoverView } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import { Fragment, memo, useMemo } from 'react';
+import clsx from 'clsx';
+
+let fairysTaroCustomTabBarRender: React.ReactNode | undefined;
+
+/**自定义底部导航栏状态管理*/
+export const fairysTaroCustomTabBarState = proxy({
+  /**当前选中的项*/
+  selected: '',
+  items: ref([]) as FairysTaroCustomTabBarItemItem[],
+  isUpdatedItems: false,
+  /**未选中颜色*/
+  color: 'rgb(156 163 175)',
+  /**选中颜色*/
+  selectedColor: '#000',
+  /**切换标签*/
+  onSwitchTab: (url: string) => {
+    fairysTaroCustomTabBarState.selected = url;
+    Taro.switchTab({ url });
+  },
+  /**更新自定义底部导航栏项*/
+  onUpdatedItems: (items: FairysTaroCustomTabBarItemItem[]) => {
+    fairysTaroCustomTabBarState.items = ref(items);
+    fairysTaroCustomTabBarState.isUpdatedItems = true;
+  },
+  /**设置自定义底部导航栏渲染*/
+  onSetTabBarRender: (_tabBarRender: React.ReactNode) => {
+    fairysTaroCustomTabBarRender = _tabBarRender;
+    fairysTaroCustomTabBarState.isUpdatedItems = false;
+  },
+});
+
+export interface FairysTaroCustomTabBarItemItem {
+  /**自定义底部导航栏项文本*/
+  text: string;
+  /**自定义底部导航栏项 URL*/
+  url: string;
+  /**自定义底部导航栏项图标*/
+  icon?: string;
+  /**自定义底部导航栏项样式*/
+  style?: React.CSSProperties;
+  /**自定义底部导航栏项类名*/
+  className?: string;
+  /**自定义底部导航栏项选中图标*/
+  selectedIcon?: string;
+  /**自定义底部导航栏项选中图标样式*/
+  selectedIconStyle?: React.CSSProperties;
+  /**自定义底部导航栏项图标样式*/
+  iconStyle?: React.CSSProperties;
+  /**自定义底部导航栏项选中图标类名*/
+  selectedIconClassName?: string;
+  /**自定义底部导航栏项选中文本样式*/
+  selectedTextStyle?: React.CSSProperties;
+  /**自定义底部导航栏项文本样式*/
+  textStyle?: React.CSSProperties;
+  /**自定义底部导航栏项选中文本类名*/
+  selectedTextClassName?: string;
+}
+
+export interface FairysTaroCustomTabBarProps {}
+
+export interface FairysTaroCustomTabBarItemProps {
+  /**自定义底部导航栏项*/
+  item: FairysTaroCustomTabBarItemItem;
+}
+
+const FairysTaroCustomTabBarItemBase = (props: FairysTaroCustomTabBarItemProps) => {
+  const { item } = props;
+  const { selected, color, selectedColor } = useSnapshot(fairysTaroCustomTabBarState);
+  const isSelected = selected === item.url;
+  const className = useMemo(() => clsx('fairys_taro_custom_tab_bar_item', item.className), [item.className]);
+  const imgClassName = useMemo(
+    () =>
+      clsx('fairys_taro_custom_tab_bar_item_img', item.selectedIconClassName, {
+        fairys_taro_custom_tab_bar_item_img_selected: isSelected,
+        // 'fairystaro__opacity-100': isSelected,
+        // 'fairystaro__opacity-60': !isSelected,
+      }),
+    [item.selectedIconClassName, isSelected],
+  );
+  const imgStyle = useMemo(() => {
+    return {
+      opacity: isSelected ? 1 : 0.6,
+    };
+  }, [isSelected]);
+
+  const textClassName = useMemo(
+    () =>
+      clsx('fairys_taro_custom_tab_bar_item_text', item.selectedTextClassName, {
+        fairys_taro_custom_tab_bar_item_text_selected: isSelected,
+        // 'fairystaro__text-black': isSelected,
+        // 'fairystaro__text-gray-400': !isSelected,
+      }),
+    [item.selectedTextClassName, isSelected],
+  );
+
+  const textStyle = useMemo(() => {
+    return { color: isSelected ? selectedColor : color };
+  }, [isSelected, color, selectedColor]);
+
+  return (
+    <CoverView
+      onClick={() => fairysTaroCustomTabBarState.onSwitchTab(item.url)}
+      key={item.url}
+      style={item.style}
+      className={className}
+    >
+      {item.icon ? (
+        <CoverImage
+          src={isSelected ? item.selectedIcon || item.icon : item.icon}
+          className={imgClassName}
+          style={{ ...imgStyle, ...((isSelected ? item.selectedIconStyle : item.iconStyle) || {}) }}
+        />
+      ) : (
+        <Fragment />
+      )}
+      <CoverView
+        className={textClassName}
+        style={{
+          ...((isSelected ? item.selectedTextStyle : item.textStyle) || {}),
+          ...textStyle,
+        }}
+      >
+        {item.text}
+      </CoverView>
+    </CoverView>
+  );
+};
+
+const FairysTaroCustomTabBarBase = () => {
+  const { items } = useSnapshot(fairysTaroCustomTabBarState);
+  const _itemsRender = useMemo(() => {
+    if (fairysTaroCustomTabBarState.isUpdatedItems === false && fairysTaroCustomTabBarRender) {
+      return fairysTaroCustomTabBarRender;
+    }
+    const render = items.map((item) => {
+      return <FairysTaroCustomTabBarItemBase key={item.url} item={item} />;
+    });
+    fairysTaroCustomTabBarState.onSetTabBarRender(render);
+    return render;
+  }, [items]);
+
+  return (
+    <CoverView className="fairys_taro_custom_tab_bar">
+      <CoverView className="fairys_taro_custom_tab_bar-border"></CoverView>
+      {_itemsRender}
+    </CoverView>
+  );
+};
+
+export const FairysTaroCustomTabBar = memo(() => {
+  return useMemo(() => <FairysTaroCustomTabBarBase />, []);
+});
+
+/**
+ * 页面高度问题
+ */
+export const useFairysTaroCustomTabBarPageStyle = () => {
+  return useMemo(() => {
+    const height = Taro.getSystemInfoSync().windowHeight;
+    return {
+      height: height - 60,
+      overflowY: 'auto',
+    };
+  }, []);
+};

package/src/components/index.ts

@@ -4,3 +4,4 @@ export * from './Mesage';
 export * from './Toast';
 export * from './connectToastMessage';
 export * from './MainPage';
+export * from './custom-tab-bar';

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

@@ -0,0 +1,69 @@
+import { proxy, useSnapshot } from 'valtio';
+import navigate from 'utils/navigate';
+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 GlobalDataInstanceState {
+  /**数据默认值不使用*/
+  __defaultValue?: string;
+}
+
+/**
+ * 全局数据实例
+ */
+export class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstanceState> {
+  store = proxy<GlobalDataInstanceState>({});
+  /**
+   * 跳转登录页面前执行
+   */
+  onBeforetToLoginPage?: () => boolean | void;
+  /**跳转 redirect 路由*/
+  toRedirect = () => {
+    //  获取当前路由参数
+    const currentPath = Taro.getCurrentInstance().router?.params?.redirect || '';
+    if (currentPath) {
+      // 跳转 redirect 路由
+      navigate.navigateTo({ url: currentPath });
+    }
+  };
+
+  /**跳转登录页面*/
+  toLoginPage = () => {
+    // 清除登录凭证（token）、权限列表、菜单权限列表、用户信息
+    authDataInstance.clear();
+    if (this.onBeforetToLoginPage) {
+      const f = this.onBeforetToLoginPage();
+      if (f === false) {
+        // 如果返回false则不跳转登录页面
+        return;
+      }
+    }
+    const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
+    const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
+    const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
+    if (isLoginPage) {
+      // 如果是登录页面不进行跳转
+      return;
+    }
+    // 跳转登录页面
+    Taro.navigateTo({ url: `/${_loginPageRoute}` });
+  };
+}
+/**
+ * 全局数据实例
+ */
+export const globalDataInstance = new GlobalDataInstance();
+
+/**
+ * 全局数据状态管理
+ */
+export const useGlobalData = () => {
+  const store = useSnapshot(globalDataInstance.store);
+  return [store, globalDataInstance, store.__defaultValue] as [
+    GlobalDataInstanceState,
+    GlobalDataInstance,
+    string | undefined,
+  ];
+};

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

@@ -78,43 +78,6 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
   hideToast = () => {
     this.store.toastData = ref({ ...this.store.toastData, visible: false });
   };
-
-  /**
-   * 跳转登录页面前执行
-   */
-  onBeforetToLoginPage?: () => boolean | void;
-  // 跳转 redirect 路由
-  toRedirect = () => {
-    //  获取当前路由参数
-    const currentPath = Taro.getCurrentInstance().router?.params?.redirect || '';
-    if (currentPath) {
-      // 跳转 redirect 路由
-      navigate.navigateTo({ url: currentPath });
-    }
-  };
-
-  /**跳转登录页面*/
-  toLoginPage = () => {
-    // 清除登录凭证（token）、权限列表、菜单权限列表、用户信息
-    authDataInstance.clear();
-
-    if (this.onBeforetToLoginPage) {
-      const f = this.onBeforetToLoginPage();
-      if (f === false) {
-        // 如果返回false则不跳转登录页面
-        return;
-      }
-    }
-    const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
-    const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
-    const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
-    if (isLoginPage) {
-      // 如果是登录页面不进行跳转
-      return;
-    }
-    // 跳转登录页面
-    Taro.navigateTo({ url: `/${_loginPageRoute}` });
-  };
 }
 /**
  * 全局消息数据实例

package/src/context/index.ts

@@ -3,3 +3,4 @@ export * from './page.data.instance';
 export * from './page.info.data.instance';
 export * from './auth.data.instance';
 export * from './global.setting.data.instance';
+export * from './global.data.instance';