@fairys/taro-tools-react 1.0.10 → 1.0.12

package/esm/utils/request.d.ts

@@ -46,8 +46,12 @@ export interface RequestInstanceCreateOptions {
             pathRewrite: Record<string, string>;
         }>;
     };
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
 }
 export declare class RequestInstance {
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
     /**请求IP地址*/
     IP?: string | ((url: string, module?: string, env?: string) => string);
     /**简单的代理配置*/

package/esm/utils/request.js

@@ -41,6 +41,7 @@ const requestResponseHandle = (result, options)=>{
     });
 };
 class RequestInstance {
+    isEnableTokenAuth = true;
     IP;
     proxy;
     commonOptions = {};
@@ -58,6 +59,7 @@ class RequestInstance {
             ...this.commonOptions,
             ...options.commonOptions
         };
+        this.isEnableTokenAuth = 'boolean' == typeof options.isEnableTokenAuth ? options.isEnableTokenAuth : true;
         return this;
     };
     getHttpPath = (url, module)=>{
@@ -115,7 +117,7 @@ class RequestInstance {
             ...header
         };
         if (token) newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
-        else if (true !== isIgnoreToken) {
+        else if (true !== isIgnoreToken && this.isEnableTokenAuth) {
             if (false !== isShowErrorMessage) if (globalSettingDataInstance.store.isUseTaroToast) taro.showToast({
                 title: "\u672A\u767B\u5F55",
                 duration: 3000,

package/esm/utils/valtio/index.d.ts

@@ -7,3 +7,7 @@ export declare const useValtioInstaceState: <T extends object = any, K extends P
 } = {
     new (...args: any[]): K;
 }>(Instance: M) => readonly [import("valtio").Snapshot<T>, K, any];
+/**
+ * 创建valtio proxy 状态管理
+ */
+export declare const useValtioProxyState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, T, any];

package/esm/utils/valtio/index.js

@@ -1,5 +1,5 @@
 import { useRef } from "react";
-import { useSnapshot } from "valtio";
+import { proxy, useSnapshot } from "valtio";
 import { ProxyInstanceObjectBase } from "./instance.js";
 export * from "./instance.js";
 const useValtioState = (inital)=>{
@@ -20,4 +20,13 @@ const useValtioInstaceState = (Instance)=>{
         state.__defaultValue
     ];
 };
-export { useValtioInstaceState, useValtioState };
+const useValtioProxyState = (inital)=>{
+    const instance = useRef(proxy(inital || {})).current;
+    const state = useSnapshot(instance);
+    return [
+        state,
+        instance,
+        state.__defaultValue
+    ];
+};
+export { useValtioInstaceState, useValtioProxyState, useValtioState };

package/lib/utils/request.d.ts

@@ -46,8 +46,12 @@ export interface RequestInstanceCreateOptions {
             pathRewrite: Record<string, string>;
         }>;
     };
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
 }
 export declare class RequestInstance {
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
     /**请求IP地址*/
     IP?: string | ((url: string, module?: string, env?: string) => string);
     /**简单的代理配置*/

package/lib/utils/request.js

@@ -81,6 +81,7 @@ const requestResponseHandle = (result, options)=>{
     });
 };
 class RequestInstance {
+    isEnableTokenAuth = true;
     IP;
     proxy;
     commonOptions = {};
@@ -98,6 +99,7 @@ class RequestInstance {
             ...this.commonOptions,
             ...options.commonOptions
         };
+        this.isEnableTokenAuth = 'boolean' == typeof options.isEnableTokenAuth ? options.isEnableTokenAuth : true;
         return this;
     };
     getHttpPath = (url, module)=>{
@@ -155,7 +157,7 @@ class RequestInstance {
             ...header
         };
         if (token) newHeader[global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.headerTokenName || 'token'] = token;
-        else if (true !== isIgnoreToken) {
+        else if (true !== isIgnoreToken && this.isEnableTokenAuth) {
             if (false !== isShowErrorMessage) if (global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isUseTaroToast) taro_default().showToast({
                 title: "\u672A\u767B\u5F55",
                 duration: 3000,

package/lib/utils/valtio/index.d.ts

@@ -7,3 +7,7 @@ export declare const useValtioInstaceState: <T extends object = any, K extends P
 } = {
     new (...args: any[]): K;
 }>(Instance: M) => readonly [import("valtio").Snapshot<T>, K, any];
+/**
+ * 创建valtio proxy 状态管理
+ */
+export declare const useValtioProxyState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, T, any];

package/lib/utils/valtio/index.js

@@ -55,6 +55,7 @@ var __webpack_exports__ = {};
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
         useValtioInstaceState: ()=>useValtioInstaceState,
+        useValtioProxyState: ()=>useValtioProxyState,
         useValtioState: ()=>useValtioState
     });
     var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("react");
@@ -62,8 +63,9 @@ var __webpack_exports__ = {};
     var _instance__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _instance__WEBPACK_IMPORTED_MODULE_2__)if ([
-        "useValtioInstaceState",
+        "useValtioProxyState",
         "default",
+        "useValtioInstaceState",
         "useValtioState"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _instance__WEBPACK_IMPORTED_MODULE_2__[key];
@@ -87,11 +89,22 @@ var __webpack_exports__ = {};
             state.__defaultValue
         ];
     };
+    const useValtioProxyState = (inital)=>{
+        const instance = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)((0, valtio__WEBPACK_IMPORTED_MODULE_1__.proxy)(inital || {})).current;
+        const state = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.useSnapshot)(instance);
+        return [
+            state,
+            instance,
+            state.__defaultValue
+        ];
+    };
 })();
 exports.useValtioInstaceState = __webpack_exports__.useValtioInstaceState;
+exports.useValtioProxyState = __webpack_exports__.useValtioProxyState;
 exports.useValtioState = __webpack_exports__.useValtioState;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "useValtioInstaceState",
+    "useValtioProxyState",
     "useValtioState"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

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

package/src/utils/request.ts

@@ -102,9 +102,14 @@ export interface RequestInstanceCreateOptions {
     dev: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
     pro: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
   };
+  /**启用token校验*/
+  isEnableTokenAuth?: boolean;
 }
 
 export class RequestInstance {
+  /**启用token校验*/
+  public isEnableTokenAuth?: boolean = true;
+
   /**请求IP地址*/
   public IP?: string | ((url: string, module?: string, env?: string) => string);
   /**简单的代理配置*/
@@ -128,6 +133,7 @@ export class RequestInstance {
     this.IP = options.IP || this.IP;
     this.proxy = options.proxy || this.proxy;
     this.commonOptions = { ...this.commonOptions, ...options.commonOptions };
+    this.isEnableTokenAuth = typeof options.isEnableTokenAuth === 'boolean' ? options.isEnableTokenAuth : true;
     return this;
   };
 
@@ -213,7 +219,7 @@ export class RequestInstance {
     if (token) {
       newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
     } else {
-      if (isIgnoreToken !== true) {
+      if (isIgnoreToken !== true && this.isEnableTokenAuth) {
         // 跳转登录页
         if (isShowErrorMessage !== false) {
           if (globalSettingDataInstance.store.isUseTaroToast) {

package/src/utils/valtio/index.ts

@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import { useSnapshot } from 'valtio';
+import { useSnapshot, proxy } from 'valtio';
 import { ProxyInstanceObjectBase } from './instance';
 export * from './instance';
 
@@ -21,3 +21,12 @@ export const useValtioInstaceState = <
   const state = useSnapshot(instance.store);
   return [state, instance, (state as any).__defaultValue] as const;
 };
+
+/**
+ * 创建valtio proxy 状态管理
+ */
+export const useValtioProxyState = <T extends object>(inital?: T) => {
+  const instance = useRef(proxy(inital || ({} as T))).current;
+  const state = useSnapshot(instance);
+  return [state, instance, (state as any).__defaultValue] as const;
+};