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

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import { ModalConfig, LoginModalConfig } from './utils/type.js';
+import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
 export declare const initFingerprint: () => Promise<string>;
-export declare const createMessageVerifyModal: (modalProps: ModalConfig) => void;
 export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
-export declare const VerifyHandler: (modalProps: ModalConfig) => Promise<any>;
+export declare const VerifyHandler: (modalProps: VerifyModalConfig) => Promise<any>;

package/dist/index.js

@@ -25,9 +25,8 @@ export const initFingerprint = async () => {
     return fingerprintPromise;
 };
 let modalRoot = null;
-export const createMessageVerifyModal = (modalProps) => {
+const createMessageVerifyModal = (modalProps) => {
     const container = document.createElement('div');
-    container.id = 'antd-modal-container';
     document.body.appendChild(container);
     modalRoot = ReactDOM.createRoot(container);
     modalRoot.render(_jsx(VerifyModal, { props: {
@@ -56,7 +55,7 @@ const destroyModal = () => {
     }
 };
 export const VerifyHandler = (modalProps) => {
-    const { data, config, http, verifyPromise } = modalProps || {};
+    const { data, config, http, verifyPromise, sendApi } = modalProps || {};
     const toEmpty = () => {
         verifyPromise.current = null;
     };
@@ -69,6 +68,7 @@ export const VerifyHandler = (modalProps) => {
                 apiResolve: resolve,
                 apiReject: reject,
                 apiPromiseToEmpty: toEmpty,
+                sendApi
             });
         }).finally(toEmpty);
     }

package/dist/main.js

@@ -36,9 +36,8 @@ const config = {
     "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
     "baseURL": "http://localhost:62888"
 };
+const promise = { current: null };
 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: () => {

package/dist/utils/type.d.ts

@@ -1,4 +1,4 @@
-export type ModalConfig = {
+export type VerifyModalConfig = {
     data: string;
     onClose?: () => void;
     config: {
@@ -18,7 +18,7 @@ export type ModalConfig = {
             };
         };
     };
-    api?: string;
+    sendApi?: string;
     apiReject?: any;
     apiResolve?: any;
     apiPromiseToEmpty?: () => void;

package/dist/verify-modal.d.ts

@@ -1,5 +1,5 @@
-import { ModalConfig } from './utils/type.js';
+import { VerifyModalConfig } from './utils/type.js';
 declare const CreateMessageVerifyModal: ({ props }: {
-    props: ModalConfig;
+    props: VerifyModalConfig;
 }) => import("react/jsx-runtime.js").JSX.Element;
 export default CreateMessageVerifyModal;

package/dist/verify-modal.js

@@ -11,7 +11,7 @@ const CreateMessageVerifyModal = ({ props }) => {
     const [captchaImage, setCaptchaImage] = useState('');
     const [captchCode, setCaptchCode] = useState('');
     const [captchaKey, setCaptchaKey] = useState('');
-    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
+    const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
     const getKey = async () => {
@@ -51,7 +51,7 @@ const CreateMessageVerifyModal = ({ props }) => {
         formData.append('captchaKey', captchaKey);
         formData.append('captcha', captchCode);
         // 重新发送验证码
-        const res = await axios.post(api, formData);
+        const res = await axios.post(sendApi, formData);
         const { code, detail } = res.data?.status || {};
         if (code !== 0) {
             message.error(detail || t('sendFailed', lang));

package/package.json

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

package/src/index.tsx

@@ -2,7 +2,7 @@ import ReactDOM from 'react-dom/client'
 import VerifyModal from './verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
 import ReLoginModal from './relogin-modal.js';
-import { ModalConfig, LoginModalConfig } from './utils/type.js';
+import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
 
 let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
 
@@ -29,9 +29,8 @@ export const initFingerprint = async (): Promise<string> => {
 
 let modalRoot: ReactDOM.Root | null = null
 
-export const createMessageVerifyModal = (modalProps: ModalConfig) => {
+const createMessageVerifyModal = (modalProps: VerifyModalConfig) => {
     const container = document.createElement('div')
-    container.id = 'antd-modal-container'
     document.body.appendChild(container)
 
     modalRoot = ReactDOM.createRoot(container)
@@ -72,8 +71,8 @@ const destroyModal = () => {
     }
 }
 
-export const VerifyHandler = (modalProps: ModalConfig): Promise<any> => {
-    const {data, config, http, verifyPromise} = modalProps || {};
+export const VerifyHandler = (modalProps: VerifyModalConfig): Promise<any> => {
+    const {data, config, http, verifyPromise, sendApi} = modalProps || {};
     const toEmpty = () => {
       verifyPromise.current = null;
     };
@@ -86,6 +85,7 @@ export const VerifyHandler = (modalProps: ModalConfig): Promise<any> => {
           apiResolve: resolve,
           apiReject: reject,
           apiPromiseToEmpty: toEmpty,
+          sendApi
         } as any);
       }).finally(toEmpty);
     }

package/src/main.tsx

@@ -38,11 +38,11 @@ const config = {
     "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
     "baseURL": "http://localhost:62888"
 };
+
+const promise = {current: null};
 createRoot(document.getElementById('root')!).render(
     <>
         <button onClick={() => {
-            // const new11 = new VerifyHandler();
-            const promise = {current: null};
             return VerifyHandler({data, config, http: axios, verifyPromise: promise});
         }}>
             Show verify Modal 

package/src/utils/type.ts

@@ -1,5 +1,5 @@
 
-export type ModalConfig = {
+export type VerifyModalConfig = {
     data: string;
     onClose?: () => void
     config: {
@@ -19,7 +19,7 @@ export type ModalConfig = {
             }
         }
     };
-    api?: string;
+    sendApi?: string;
     apiReject?: any;
     apiResolve?: any;
     apiPromiseToEmpty?: () => void;

package/src/verify-modal.tsx

@@ -2,17 +2,17 @@ import { useEffect, useState } from 'react'
 import { Modal, Input, Button, message } from './compoments/index.js'
 import Api from './resource.js'
 import t from './utils/i18n.js'
-import { ModalConfig } from './utils/type.js';
+import { VerifyModalConfig } from './utils/type.js';
 import { axios } from '@yqg/resource';
 
-const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
+const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
     const [visible, setVisible] = useState(true);
     const [countdown, setCountdown] = useState(60);
     const [otp, setOtp] = useState('');
     const [captchaImage, setCaptchaImage] = useState<string>('');
     const [captchCode, setCaptchCode] = useState<string>('');
     const [captchaKey, setCaptchaKey] = useState<string>('');
-    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
+    const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
 
@@ -54,7 +54,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
         formData.append('captchaKey', captchaKey);
         formData.append('captcha', captchCode);
         // 重新发送验证码
-        const res = await axios.post(api, formData);
+        const res = await axios.post(sendApi, formData);
         const { code, detail } = res.data?.status || {};
         if (code !== 0) {
             message.error(detail || t('sendFailed', lang));