message-verify 1.0.1-beta.69 → 1.0.1-beta.71

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
 export declare const initFingerprint: () => Promise<string>;
 export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
 export declare const VerifyHandler: {
-    ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig): Promise<any>;
-    getResponse(response: any): any;
+    _currentUrl: string;
+    createModal: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => Promise<any>;
+    getResponse: (response: any) => any;
 };

package/dist/index.js

@@ -55,27 +55,32 @@ export const createReLoginModal = (modalProps) => {
     const reLoginModalId = 'relogin-modal-container';
     creatModal(modalProps, reLoginModalId, ReLoginModal);
 };
-export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi }) => {
-    const toEmpty = () => {
-        verifyPromise.current = null;
-    };
-    if (!verifyPromise.current) {
-        verifyPromise.current = new Promise((resolve, reject) => {
-            createMessageVerifyModal({
-                data,
-                config,
-                http,
-                apiResolve: resolve,
-                apiReject: reject,
-                apiPromiseToEmpty: toEmpty,
-                sendApi
-            });
-        }).finally(toEmpty);
+export const VerifyHandler = {
+    _currentUrl: '',
+    createModal: ({ data, config, http, verifyPromise, sendApi }) => {
+        VerifyHandler._currentUrl = config?.url || '';
+        const toEmpty = () => {
+            verifyPromise.current = null;
+        };
+        if (!verifyPromise.current) {
+            verifyPromise.current = new Promise((resolve, reject) => {
+                createMessageVerifyModal({
+                    data,
+                    config,
+                    http,
+                    apiResolve: resolve,
+                    apiReject: reject,
+                    apiPromiseToEmpty: toEmpty,
+                    sendApi
+                });
+            }).finally(toEmpty);
+        }
+        return verifyPromise.current;
+    },
+    getResponse: (response) => {
+        if (VerifyHandler._currentUrl === response?.config?.url) {
+            eventEmitter.emit('response', response?.data?.status?.code ?? -1);
+        }
+        return response;
     }
-    return verifyPromise.current;
-};
-// 获取当前触发接口response
-VerifyHandler.getResponse = (response) => {
-    eventEmitter.emit('response', response?.data?.status?.code ?? -1);
-    return response;
 };

package/dist/main.js

@@ -38,7 +38,7 @@ const config = {
 };
 const promise = { current: null };
 createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
-                return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
+                return VerifyHandler.createModal({ data, config, http: axios, verifyPromise: promise });
             }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
                 goLogin: () => {
                     console.log('goLogin');

package/package.json

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

package/src/index.tsx

@@ -36,7 +36,7 @@ const destroyModal = (modalId: string) => {
     }
 }
 
-const creatModal = (modalProps: VerifyModalConfig | LoginModalConfig, modalId: string, ModalDom:any) => {
+const creatModal = (modalProps: VerifyModalConfig | LoginModalConfig, modalId: string, ModalDom: any) => {
     destroyModal(modalId);
     const container = document.createElement('div')
     container.id = modalId
@@ -65,28 +65,32 @@ export const createReLoginModal = (modalProps: LoginModalConfig) => {
     creatModal(modalProps, reLoginModalId, ReLoginModal);
 }
 
-export const VerifyHandler = ({data, config, http, verifyPromise, sendApi}: VerifyModalConfig): Promise<any> => {
-    const toEmpty = () => {
-      verifyPromise.current = null;
-    };
-    if (!verifyPromise.current) {
-        verifyPromise.current = new Promise((resolve, reject) => {
-        createMessageVerifyModal({
-          data,
-          config,
-          http,
-          apiResolve: resolve,
-          apiReject: reject,
-          apiPromiseToEmpty: toEmpty,
-          sendApi
-        } as VerifyModalConfig);
-      }).finally(toEmpty);
+export const VerifyHandler = {
+    _currentUrl: '',
+    createModal: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => {
+        VerifyHandler._currentUrl = config?.url as string || '';
+        const toEmpty = () => {
+            verifyPromise.current = null;
+        };
+        if (!verifyPromise.current) {
+            verifyPromise.current = new Promise((resolve, reject) => {
+                createMessageVerifyModal({
+                    data,
+                    config,
+                    http,
+                    apiResolve: resolve,
+                    apiReject: reject,
+                    apiPromiseToEmpty: toEmpty,
+                    sendApi
+                } as VerifyModalConfig);
+            }).finally(toEmpty);
+        }
+        return verifyPromise.current;
+    },
+    getResponse: (response: any) => {
+        if (VerifyHandler._currentUrl === response?.config?.url) {
+            eventEmitter.emit('response', response?.data?.status?.code ?? -1);
+        }
+        return response;
     }
-    return verifyPromise.current;
-  };
-
-// 获取当前触发接口response
-VerifyHandler.getResponse = (response: any) => {
-    eventEmitter.emit('response', response?.data?.status?.code ?? -1);
-    return response;
 };

package/src/main.tsx

@@ -43,7 +43,7 @@ const promise = {current: null};
 createRoot(document.getElementById('root')!).render(
     <>
         <button onClick={() => {
-            return VerifyHandler({data, config, http: axios, verifyPromise: promise});
+            return VerifyHandler.createModal({data, config, http: axios, verifyPromise: promise});
         }}>
             Show verify Modal 
         </button>