message-verify 1.0.1-beta.39 → 1.0.1-beta.40

package/dist/index.d.ts

@@ -1,31 +1,5 @@
 import { ModalConfig, LoginModalConfig } from './utils/type.js';
-import React from 'react';
 export declare const initFingerprint: () => Promise<string>;
 export declare const createMessageVerifyModal: (modalProps: ModalConfig) => void;
 export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
-export declare class VerifyHandler extends React.Component {
-    private verifyPromise;
-    createPromise: (detail: any, config: RequestConfig, http: HttpInstance) => Promise<any>;
-    private handlePromiseReset;
-    render(): null;
-}
-type RequestConfig = {
-    hideLoading?: boolean;
-    responseType?: string;
-};
-type HttpInstance = {
-    defaults: {
-        headers: {
-            common: Record<string, string>;
-        };
-    };
-    interceptors: {
-        request: {
-            use: (handler: (config: RequestConfig) => RequestConfig) => void;
-        };
-        response: {
-            use: (handler: (response: any) => any) => void;
-        };
-    };
-};
-export {};
+export declare const VerifyHandler: (modalProps: ModalConfig) => Promise<any>;

package/dist/index.js

@@ -3,7 +3,6 @@ import ReactDOM from 'react-dom/client';
 import VerifyModal from './verify-modal.js';
 import Fingerprint2 from 'fingerprintjs2';
 import ReLoginModal from './relogin-modal.js';
-import React from 'react';
 let fingerprintPromise = null; // 用 Promise 本身作为缓存
 export const initFingerprint = async () => {
     console.log('fingerprintPromise:', fingerprintPromise);
@@ -56,27 +55,22 @@ const destroyModal = () => {
         modalRoot = null;
     }
 };
-export class VerifyHandler extends React.Component {
-    verifyPromise = null;
-    createPromise = (detail, config, http) => {
-        if (!this.verifyPromise) {
-            this.verifyPromise = new Promise((resolve, reject) => {
-                createMessageVerifyModal({
-                    data: detail,
-                    config,
-                    http,
-                    apiResolve: resolve,
-                    apiReject: reject,
-                    apiPromiseToEmpty: this.handlePromiseReset,
-                });
-            }).finally(this.handlePromiseReset);
-        }
-        return this.verifyPromise;
+export const VerifyHandler = (modalProps) => {
+    const { data, config, http, verifyPromise } = modalProps || {};
+    const toEmpty = () => {
+        verifyPromise.current = null;
     };
-    handlePromiseReset = () => {
-        this.verifyPromise = null;
-    };
-    render() {
-        return null; // 纯逻辑组件不需要渲染
+    if (!verifyPromise.current) {
+        verifyPromise.current = new Promise((resolve, reject) => {
+            createMessageVerifyModal({
+                data,
+                config,
+                http,
+                apiResolve: resolve,
+                apiReject: reject,
+                apiPromiseToEmpty: toEmpty,
+            });
+        }).finally(toEmpty);
     }
-}
+    return verifyPromise.current;
+};

package/dist/main.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { createRoot } from 'react-dom/client';
-import { createMessageVerifyModal, initFingerprint, createReLoginModal } from './index.js'; // 或 './index'
+import { initFingerprint, createReLoginModal, VerifyHandler } from './index.js'; // 或 './index'
 import { axios } from '@yqg/resource';
 const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
 const fp = await initFingerprint();
@@ -36,18 +36,11 @@ const config = {
     "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
     "baseURL": "http://localhost:62888"
 };
-createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => createMessageVerifyModal({
-                data,
-                config,
-                lang: 'en',
-                http: axios,
-                apiReject: () => {
-                },
-                apiResolve: () => {
-                },
-                apiPromiseToEmpty: () => {
-                }
-            }), children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
+createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
+                // const new11 = new VerifyHandler();
+                const promise = { current: null };
+                return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
+            }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
                 goLogin: () => {
                     console.log('goLogin');
                 },

package/dist/utils/type.d.ts

@@ -19,9 +19,12 @@ export type ModalConfig = {
         };
     };
     api?: string;
-    apiReject: any;
-    apiResolve: any;
-    apiPromiseToEmpty: () => void;
+    apiReject?: any;
+    apiResolve?: any;
+    apiPromiseToEmpty?: () => void;
+    verifyPromise: {
+        current: Promise<any> | null;
+    };
 };
 export type LoginModalConfig = {
     goLogin: () => void;

package/dist/verify-modal.js

@@ -64,7 +64,7 @@ const CreateMessageVerifyModal = ({ props }) => {
     };
     return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
             setVisible(false);
-            apiPromiseToEmpty();
+            apiPromiseToEmpty?.();
             props.onClose?.();
         }, children: [_jsx("div", { style: { fontSize: 14, color: '#666' }, children: t('alreadySend', lang, { phone: mobile }) }), _jsxs("div", { style: { display: 'flex', alignItems: 'center', gap: 8, marginTop: 12 }, children: [_jsx(Input.OTP, { length: 6, value: otp, onChange: async (val) => {
                             setOtp(val);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-verify",
-  "version": "1.0.1-beta.39",
+  "version": "1.0.1-beta.40",
   "type": "module",
   "main": "dist/index.js",
   "dependencies": {

package/src/index.tsx

@@ -3,7 +3,6 @@ import VerifyModal from './verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
 import ReLoginModal from './relogin-modal.js';
 import { ModalConfig, LoginModalConfig } from './utils/type.js';
-import React from 'react';
 
 let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
 
@@ -73,53 +72,22 @@ const destroyModal = () => {
     }
 }
 
-export class VerifyHandler extends React.Component {
-  private verifyPromise: Promise<any> | null = null;
-
-  createPromise = (detail: any, config: RequestConfig, http: HttpInstance): Promise<any> => {
-    if (!this.verifyPromise) {
-      this.verifyPromise = new Promise((resolve, reject) => {
+export const VerifyHandler = (modalProps: ModalConfig): Promise<any> => {
+    const {data, config, http, verifyPromise} = modalProps || {};
+    const toEmpty = () => {
+      verifyPromise.current = null;
+    };
+    if (!verifyPromise.current) {
+        verifyPromise.current = new Promise((resolve, reject) => {
         createMessageVerifyModal({
-          data: detail,
+          data,
           config,
           http,
           apiResolve: resolve,
           apiReject: reject,
-          apiPromiseToEmpty: this.handlePromiseReset,
+          apiPromiseToEmpty: toEmpty,
         } as any);
-      }).finally(this.handlePromiseReset);
+      }).finally(toEmpty);
     }
-    return this.verifyPromise;
-  };
-
-  private handlePromiseReset = (): void => {
-    this.verifyPromise = null;
-  };
-
-  render() {
-    return null; // 纯逻辑组件不需要渲染
-  }
-}
-
-// 类型定义
-type RequestConfig = {
-  hideLoading?: boolean;
-  responseType?: string;
-  // 根据实际需求扩展其他配置项
-};
-
-type HttpInstance = {
-  defaults: {
-    headers: {
-      common: Record<string, string>;
-    };
-  };
-  interceptors: {
-    request: {
-      use: (handler: (config: RequestConfig) => RequestConfig) => void;
-    };
-    response: {
-      use: (handler: (response: any) => any) => void;
-    };
-  };
-};
+    return verifyPromise.current;
+  };

package/src/main.tsx

@@ -1,5 +1,5 @@
 import { createRoot } from 'react-dom/client';
-import { createMessageVerifyModal, initFingerprint, createReLoginModal } from './index.js'; // 或 './index'
+import { initFingerprint, createReLoginModal, VerifyHandler } from './index.js'; // 或 './index'
 import { axios } from '@yqg/resource';
 
 const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
@@ -40,19 +40,12 @@ const config = {
 };
 createRoot(document.getElementById('root')!).render(
     <>
-        <button onClick={() => createMessageVerifyModal({
-            data,
-            config,
-            lang: 'en',
-            http: axios,
-            apiReject: () => {
-            },
-            apiResolve: () => {
-            },
-            apiPromiseToEmpty: () => {
-            }
-        })}>
-            Show verify Modal
+        <button onClick={() => {
+            // const new11 = new VerifyHandler();
+            const promise = {current: null};
+            return VerifyHandler({data, config, http: axios, verifyPromise: promise});
+        }}>
+            Show verify Modal 
         </button>
         <button  onClick={() => createReLoginModal({
             goLogin: () => {

package/src/utils/type.ts

@@ -20,9 +20,10 @@ export type ModalConfig = {
         }
     };
     api?: string;
-    apiReject: any;
-    apiResolve: any;
-    apiPromiseToEmpty: () => void;
+    apiReject?: any;
+    apiResolve?: any;
+    apiPromiseToEmpty?: () => void;
+    verifyPromise: {current: Promise<any> | null}
 }
 
 export type LoginModalConfig = {

package/src/verify-modal.tsx

@@ -72,7 +72,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
             visible={visible}
             onClose={() => {
                 setVisible(false);
-                apiPromiseToEmpty();
+                apiPromiseToEmpty?.();
                 props.onClose?.();
             }}
         >