message-verify 1.0.1-beta.49 → 1.0.1-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
1
+ import { ModalConfig } from './utils/type.js';
2
2
  export declare const initFingerprint: () => Promise<string>;
3
- export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
4
- export declare const VerifyHandler: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => Promise<any>;
3
+ export declare const createMessageVerifyModal: (modalProps: ModalConfig) => void;
package/dist/index.js CHANGED
@@ -1,75 +1,46 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import ReactDOM from 'react-dom/client';
3
- import VerifyModal from './modal/verify-modal.js';
3
+ import VerifyModal from './verify-modal.js';
4
4
  import Fingerprint2 from 'fingerprintjs2';
5
- import ReLoginModal from './modal/relogin-modal.js';
6
- let fingerprintPromise = null; // 用 Promise 本身作为缓存
7
- let modalRoot = null;
5
+ let cachedFingerprint = null;
8
6
  export const initFingerprint = async () => {
9
- console.log('fingerprintPromise:', fingerprintPromise);
10
- if (!fingerprintPromise) {
11
- fingerprintPromise = new Promise((resolve) => {
12
- Fingerprint2.get(components => {
13
- const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
14
- console.log('components:', components);
15
- const values = components
16
- .filter(c => includeKeys.includes(c.key))
17
- .map(c => c.value)
18
- .join('###');
19
- console.log('values:', values);
20
- const fingerprint = Fingerprint2.x64hash128(values, 31);
21
- console.log('fingerprint:', fingerprint);
22
- resolve(fingerprint);
23
- });
24
- });
25
- }
26
- return fingerprintPromise;
27
- };
28
- const destroyModal = (modalId) => {
29
- if (modalRoot) {
30
- modalRoot.unmount();
31
- document.getElementById(modalId)?.remove();
32
- modalRoot = null;
7
+ if (cachedFingerprint) {
8
+ // 已有缓存,直接返回 Promise
9
+ return Promise.resolve(cachedFingerprint);
33
10
  }
11
+ // 首次异步获取并缓存
12
+ return new Promise((resolve) => {
13
+ Fingerprint2.get(function (components) {
14
+ console.log('components', components);
15
+ const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
16
+ const values = components
17
+ .filter(component => includeKeys.includes(component.key))
18
+ .map(component => component.value)
19
+ .join('###');
20
+ const fingerprint = Fingerprint2.x64hash128(values, 31);
21
+ cachedFingerprint = fingerprint;
22
+ resolve(fingerprint);
23
+ });
24
+ });
34
25
  };
35
- const creatModal = (modalProps, modalId, ModalDom) => {
36
- destroyModal(modalId);
26
+ let modalRoot = null;
27
+ export const createMessageVerifyModal = (modalProps) => {
37
28
  const container = document.createElement('div');
38
- container.id = modalId;
29
+ container.id = 'antd-modal-container';
39
30
  document.body.appendChild(container);
40
31
  modalRoot = ReactDOM.createRoot(container);
41
- modalRoot.render(_jsx(ModalDom, { props: {
32
+ modalRoot.render(_jsx(VerifyModal, { props: {
42
33
  ...modalProps,
43
34
  onClose: () => {
44
- destroyModal(modalId);
35
+ modalProps.onClose?.();
36
+ destroyModal();
45
37
  }
46
38
  } }));
47
39
  };
48
- const createMessageVerifyModal = (modalProps) => {
49
- const verifyModalId = 'verify-modal-container';
50
- creatModal(modalProps, verifyModalId, VerifyModal);
51
- };
52
- // 新增 relogin 弹窗创建方法
53
- export const createReLoginModal = (modalProps) => {
54
- const reLoginModalId = 'relogin-modal-container';
55
- creatModal(modalProps, reLoginModalId, ReLoginModal);
56
- };
57
- export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi }) => {
58
- const toEmpty = () => {
59
- verifyPromise.current = null;
60
- };
61
- if (!verifyPromise.current) {
62
- verifyPromise.current = new Promise((resolve, reject) => {
63
- createMessageVerifyModal({
64
- data,
65
- config,
66
- http,
67
- apiResolve: resolve,
68
- apiReject: reject,
69
- apiPromiseToEmpty: toEmpty,
70
- sendApi
71
- });
72
- }).finally(toEmpty);
40
+ const destroyModal = () => {
41
+ if (modalRoot) {
42
+ modalRoot.unmount();
43
+ document.getElementById('antd-modal-container')?.remove();
44
+ modalRoot = null;
73
45
  }
74
- return verifyPromise.current;
75
46
  };
@@ -7,9 +7,5 @@ declare const _default: {
7
7
  sendFailed: string;
8
8
  reSend: string;
9
9
  countDownSecound: string;
10
- accountAlert: string;
11
- alertContent: string;
12
- ok: string;
13
- chidoriOpenPro: string;
14
10
  };
15
11
  export default _default;
@@ -6,9 +6,5 @@ export default {
6
6
  sendSuccess: 'Successfully sent',
7
7
  sendFailed: 'Send failed',
8
8
  reSend: 'Resend',
9
- countDownSecound: '{countdown} seconds',
10
- accountAlert: 'Account Security Alert',
11
- alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
12
- ok: 'OK',
13
- chidoriOpenPro: 'Chidori has activated security protection for you'
9
+ countDownSecound: '{countdown} seconds'
14
10
  };
@@ -7,9 +7,5 @@ declare const _default: {
7
7
  sendFailed: string;
8
8
  reSend: string;
9
9
  countDownSecound: string;
10
- accountAlert: string;
11
- alertContent: string;
12
- ok: string;
13
- chidoriOpenPro: string;
14
10
  };
15
11
  export default _default;
@@ -6,9 +6,5 @@ export default {
6
6
  sendSuccess: 'Berhasil dikirim',
7
7
  sendFailed: 'Gagal mengirim',
8
8
  reSend: 'Kirim Ulang',
9
- countDownSecound: '{countdown} detik',
10
- accountAlert: 'Peringatan Keamanan Akun',
11
- alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
12
- ok: 'Baiklah',
13
- chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda'
9
+ countDownSecound: '{countdown} detik'
14
10
  };
@@ -7,9 +7,5 @@ declare const _default: {
7
7
  sendFailed: string;
8
8
  reSend: string;
9
9
  countDownSecound: string;
10
- accountAlert: string;
11
- alertContent: string;
12
- ok: string;
13
- chidoriOpenPro: string;
14
10
  };
15
11
  export default _default;
@@ -6,9 +6,5 @@ export default {
6
6
  sendSuccess: '发送成功',
7
7
  sendFailed: '发送失败',
8
8
  reSend: '重新发送',
9
- countDownSecound: '{countdown}秒',
10
- accountAlert: '账号安全提醒',
11
- alertContent: '检测到您的登录环境或网络信息有变动,为保障账户安全,请重新登录验证身份',
12
- ok: '好的',
13
- chidoriOpenPro: 'chidori已为您开启安全防护'
9
+ countDownSecound: '{countdown}秒'
14
10
  };
package/dist/main.js CHANGED
@@ -1,17 +1,22 @@
1
- import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
1
+ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
2
2
  import { createRoot } from 'react-dom/client';
3
- import { initFingerprint, createReLoginModal, VerifyHandler } from './index.js'; // 或 './index'
3
+ import { createMessageVerifyModal, initFingerprint } from './index.js'; // 或 './index'
4
4
  import { axios } from '@yqg/resource';
5
5
  const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
6
6
  const fp = await initFingerprint();
7
- const fp2 = await initFingerprint();
8
- console.log(fp, fp2);
7
+ console.log(fp);
9
8
  const config = {
10
9
  "transitional": {
11
10
  "silentJSONParsing": true,
12
11
  "forcedJSONParsing": true,
13
12
  "clarifyTimeoutError": false
14
13
  },
14
+ "transformRequest": [
15
+ null
16
+ ],
17
+ "transformResponse": [
18
+ null
19
+ ],
15
20
  "timeout": 0,
16
21
  "xsrfCookieName": "XSRF-TOKEN",
17
22
  "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -20,7 +25,9 @@ const config = {
20
25
  "headers": {
21
26
  "Accept": "application/json, text/plain, */*",
22
27
  "X-Device-Fingerprint": "185fcce88c629725321adf29daa5e444",
23
- "Content-Type": "application/json"
28
+ "Content-Type": "application/json",
29
+ "sms-code": "121212",
30
+ "sms-code-key": "212190c7-2f5e-4cc1-82ec-a242c2ab5425"
24
31
  },
25
32
  "url": "/classification/admin/level/edit",
26
33
  "method": "post",
@@ -36,12 +43,12 @@ const config = {
36
43
  "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
37
44
  "baseURL": "http://localhost:62888"
38
45
  };
39
- const promise = { current: null };
40
- createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
41
- return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
42
- }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
43
- goLogin: () => {
44
- console.log('goLogin');
45
- },
46
- lang: 'zh',
47
- }), children: "Show login Modal" })] }));
46
+ createRoot(document.getElementById('root')).render(_jsx(_Fragment, { children: _jsx("button", { onClick: () => createMessageVerifyModal({
47
+ data,
48
+ config,
49
+ response: {
50
+ config
51
+ },
52
+ lang: 'en',
53
+ http: axios,
54
+ }), children: "Show verify Modal" }) }));
@@ -1,5 +1,5 @@
1
- import { LoginModalConfig } from './utils/type.js';
1
+ import { ModalConfig } from './utils/type.js';
2
2
  declare const ReLoginModal: ({ props }: {
3
- props: LoginModalConfig;
3
+ props: ModalConfig;
4
4
  }) => import("react/jsx-runtime.js").JSX.Element;
5
5
  export default ReLoginModal;
@@ -1,23 +1,22 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { useState } from 'react';
3
3
  import { Modal, Button } from './compoments/index.js';
4
- import t from './utils/i18n.js';
5
4
  const ReLoginModal = ({ props }) => {
6
- const { goLogin, lang } = props || {};
5
+ console.log('props', props);
7
6
  const [visible, setVisible] = useState(true);
8
7
  const onClose = () => {
9
8
  setVisible(false);
10
- goLogin();
11
9
  };
12
- return (_jsxs(Modal, { visible: visible, onClose: onClose, width: 420, children: [_jsx("div", { style: { fontWeight: 500, fontSize: 20, marginBottom: 24 }, children: t('accountAlert', lang) }), _jsx("div", { style: { color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }, children: t('alertContent', lang) }), _jsx("div", { style: { display: 'flex', justifyContent: 'center' }, children: _jsx(Button, { style: {
10
+ return (_jsxs(Modal, { visible: visible, onClose: onClose, width: 420, children: [_jsx("div", { style: { fontWeight: 500, fontSize: 20, marginBottom: 24 }, children: "\u8D26\u53F7\u5B89\u5168\u63D0\u9192" }), _jsx("div", { style: { color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }, children: "\u68C0\u6D4B\u5230\u60A8\u7684\u767B\u5F55\u73AF\u5883\u6216\u7F51\u7EDC\u4FE1\u606F\u6709\u53D8\u52A8\uFF0C\u4E3A\u4FDD\u969C\u8D26\u6237\u5B89\u5168\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u9A8C\u8BC1\u8EAB\u4EFD" }), _jsx("div", { style: { display: 'flex', justifyContent: 'center' }, children: _jsx(Button, { style: {
13
11
  background: '#1677ff',
14
12
  color: '#fff',
15
13
  border: 'none',
16
- width: 80,
17
- height: 36,
18
- fontSize: 14,
14
+ width: 160,
15
+ height: 44,
16
+ fontSize: 18,
17
+ fontWeight: 500,
19
18
  borderRadius: 8,
20
19
  boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
21
- }, onClick: onClose, children: t('ok', lang) }) })] }));
20
+ }, onClick: onClose, children: "\u597D\u7684" }) })] }));
22
21
  };
23
22
  export default ReLoginModal;
@@ -1 +1 @@
1
- {"root":["../src/index.tsx","../src/main.tsx","../src/vite-env.d.ts","../src/compoments/button.tsx","../src/compoments/index.ts","../src/compoments/input.tsx","../src/compoments/message.tsx","../src/compoments/modal.tsx","../src/locales/en.ts","../src/locales/id.ts","../src/locales/zh.ts","../src/modal/relogin-modal.tsx","../src/modal/verify-modal.tsx","../src/utils/i18n.ts","../src/utils/resource.ts","../src/utils/status.ts","../src/utils/type.ts"],"version":"5.7.3"}
1
+ {"root":["../src/index.tsx","../src/main.tsx","../src/relogin-modal.tsx","../src/resource.ts","../src/verify-modal.tsx","../src/vite-env.d.ts","../src/compoments/button.tsx","../src/compoments/index.ts","../src/compoments/input.tsx","../src/compoments/message.tsx","../src/compoments/modal.tsx","../src/locales/en.ts","../src/locales/id.ts","../src/locales/zh.ts","../src/utils/i18n.ts","../src/utils/status.ts","../src/utils/type.ts"],"version":"5.7.3"}
@@ -1,4 +1,4 @@
1
- export type VerifyModalConfig = {
1
+ export type ModalConfig = {
2
2
  data: string;
3
3
  onClose?: () => void;
4
4
  config: {
@@ -7,7 +7,7 @@ export type VerifyModalConfig = {
7
7
  };
8
8
  [key: string]: unknown;
9
9
  };
10
- lang?: 'zh' | 'en' | 'id';
10
+ lang: 'zh' | 'en' | 'id';
11
11
  http: {
12
12
  (params: object): Promise<unknown>;
13
13
  defaults: {
@@ -18,16 +18,6 @@ export type VerifyModalConfig = {
18
18
  };
19
19
  };
20
20
  };
21
- sendApi?: string;
22
- apiReject?: any;
23
- apiResolve?: any;
24
- apiPromiseToEmpty?: () => void;
25
- verifyPromise: {
26
- current: Promise<any> | null;
27
- };
28
- };
29
- export type LoginModalConfig = {
30
- goLogin: () => void;
31
- onClose?: () => void;
32
- lang?: 'zh' | 'en' | 'id';
21
+ api?: string;
22
+ response: any;
33
23
  };
@@ -1,5 +1,5 @@
1
- import { VerifyModalConfig } from './utils/type.js';
1
+ import { ModalConfig } from './utils/type.js';
2
2
  declare const CreateMessageVerifyModal: ({ props }: {
3
- props: VerifyModalConfig;
3
+ props: ModalConfig;
4
4
  }) => import("react/jsx-runtime.js").JSX.Element;
5
5
  export default CreateMessageVerifyModal;
@@ -11,7 +11,7 @@ const CreateMessageVerifyModal = ({ props }) => {
11
11
  const [captchaImage, setCaptchaImage] = useState('');
12
12
  const [captchCode, setCaptchCode] = useState('');
13
13
  const [captchaKey, setCaptchaKey] = useState('');
14
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
14
+ const { data, config, http, lang, api = '/admin/sms/send', response } = props || {};
15
15
  const dataObj = JSON.parse(data || '{}');
16
16
  const { mobile, verifyCodeKey } = dataObj || {};
17
17
  const getKey = async () => {
@@ -51,65 +51,44 @@ const CreateMessageVerifyModal = ({ props }) => {
51
51
  formData.append('captchaKey', captchaKey);
52
52
  formData.append('captcha', captchCode);
53
53
  // 重新发送验证码
54
- const res = await axios.post(sendApi, formData);
54
+ const res = await axios.post(api, formData);
55
55
  const { code, detail } = res.data?.status || {};
56
56
  if (code !== 0) {
57
57
  message.error(detail || t('sendFailed', lang));
58
58
  return;
59
59
  }
60
60
  message.success(t('sendSuccess', lang));
61
- // 重置倒计时、验证码
62
61
  setCountdown(60);
63
- setOtp('');
64
62
  };
65
63
  return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
66
64
  setVisible(false);
67
- apiPromiseToEmpty?.();
68
65
  props.onClose?.();
69
66
  }, 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) => {
70
67
  setOtp(val);
71
68
  if (val.length === 6) {
72
- try {
73
- const res = await Promise.race([
74
- new Promise((resolve, reject) => {
75
- setTimeout(() => {
76
- reject(new Error('Timeout'));
77
- }, 1000);
78
- }),
79
- new Promise((resolve, reject) => {
80
- http({
81
- ...config,
82
- headers: {
83
- ...http.defaults.headers.common,
84
- 'sms-code': val,
85
- 'sms-code-key': verifyCodeKey,
86
- 'Content-Type': config.headers['Content-Type'],
87
- }
88
- }).then(res => {
89
- resolve(res);
90
- }).catch(err => {
91
- reject(err);
92
- });
93
- })
94
- ]);
95
- if (res?.data?.status?.code === 0) {
96
- apiResolve(res);
97
- setVisible(false);
98
- }
99
- else {
100
- message.error('验证失败');
101
- setOtp('');
69
+ const { data: { status: { code, detail } = {} } } = response || {};
70
+ http({
71
+ ...config,
72
+ headers: {
73
+ ...http.defaults.headers.common,
74
+ 'sms-code': val,
75
+ 'sms-code-key': verifyCodeKey,
76
+ 'Content-Type': config.headers['Content-Type'],
102
77
  }
78
+ });
79
+ console.log(response, code, 'config');
80
+ if (code !== 0) {
81
+ message.error(detail || t('verifyFailed', lang));
82
+ return;
103
83
  }
104
- catch (error) {
105
- console.warn('catch', error);
106
- message.error('验证失败');
107
- setOtp('');
84
+ else {
85
+ message.success(t('verifySuccess', lang));
86
+ setVisible(false);
108
87
  }
109
88
  }
110
89
  } }), _jsx(Button, { disabled: countdown > 0 || !captchCode, onClick: handleResend, style: { padding: '8px' }, children: countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang) })] }), countdown > 0 ? null :
111
90
  _jsxs("div", { style: { marginTop: 12, display: 'flex', alignItems: 'center' }, children: [_jsx(Input, { placeholder: t('pleaseEnterPicVerifyCode', lang), onChange: (e) => {
112
91
  setCaptchCode(e);
113
- }, style: { width: 300 } }), captchaImage && _jsx("img", { src: captchaImage, alt: t('verifyCode', lang), style: { width: 100, height: 30, marginLeft: 8 }, onClick: getKey })] }), (countdown > 0 || captchCode) ? null : _jsx("div", { style: { fontSize: 14, color: 'red' }, children: t('pleaseEnterAndSend', lang) }), _jsx("div", { style: { fontSize: 14, color: '#666', marginTop: 12 }, children: t('chidoriOpenPro', lang) })] }));
92
+ }, style: { width: 300 } }), captchaImage && _jsx("img", { src: captchaImage, alt: t('verifyCode', lang), style: { width: 100, height: 30, marginLeft: 8 }, onClick: getKey })] }), (countdown > 0 || captchCode) ? null : _jsx("div", { style: { fontSize: 14, color: 'red' }, children: t('pleaseEnterAndSend', lang) })] }));
114
93
  };
115
94
  export default CreateMessageVerifyModal;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "message-verify",
3
- "version": "1.0.1-beta.49",
3
+ "version": "1.0.1-beta.5",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
@@ -29,7 +29,6 @@
29
29
  "build": "tsc -b",
30
30
  "analyze": "vite build",
31
31
  "lint": "eslint .",
32
- "preview": "vite preview",
33
- "release:beta": "pnpm version prerelease --preid=beta && pnpm run build && pnpm publish"
32
+ "preview": "vite preview"
34
33
  }
35
34
  }
package/src/index.tsx CHANGED
@@ -1,85 +1,55 @@
1
1
  import ReactDOM from 'react-dom/client'
2
- import VerifyModal from './modal/verify-modal.js'
2
+ import VerifyModal from './verify-modal.js'
3
3
  import Fingerprint2 from 'fingerprintjs2';
4
- import ReLoginModal from './modal/relogin-modal.js';
5
- import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
4
+ import { ModalConfig } from './utils/type.js';
6
5
 
7
- let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
8
- let modalRoot: ReactDOM.Root | null = null
6
+ let cachedFingerprint: string | null = null;
9
7
  export const initFingerprint = async (): Promise<string> => {
10
- console.log('fingerprintPromise:', fingerprintPromise);
11
- if (!fingerprintPromise) {
12
- fingerprintPromise = new Promise((resolve) => {
13
- Fingerprint2.get(components => {
14
- const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
15
- console.log('components:', components);
16
- const values = components
17
- .filter(c => includeKeys.includes(c.key))
18
- .map(c => c.value)
19
- .join('###');
20
- console.log('values:', values);
21
- const fingerprint = Fingerprint2.x64hash128(values, 31);
22
- console.log('fingerprint:', fingerprint);
23
- resolve(fingerprint);
24
- });
25
- });
8
+ if (cachedFingerprint) {
9
+ // 已有缓存,直接返回 Promise
10
+ return Promise.resolve(cachedFingerprint);
26
11
  }
27
- return fingerprintPromise;
12
+ // 首次异步获取并缓存
13
+ return new Promise((resolve) => {
14
+ Fingerprint2.get(function (components) {
15
+ console.log('components', components);
16
+ const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
17
+ const values = components
18
+ .filter(component => includeKeys.includes(component.key))
19
+ .map(component => component.value)
20
+ .join('###');
21
+ const fingerprint = Fingerprint2.x64hash128(values, 31);
22
+ cachedFingerprint = fingerprint;
23
+ resolve(fingerprint);
24
+ });
25
+ });
28
26
  };
29
27
 
30
- const destroyModal = (modalId: string) => {
31
- if (modalRoot) {
32
- modalRoot.unmount()
33
- document.getElementById(modalId)?.remove()
34
- modalRoot = null
35
- }
36
- }
37
-
38
- const creatModal = (modalProps: VerifyModalConfig | LoginModalConfig, modalId: string, ModalDom:any) => {
39
- destroyModal(modalId);
40
- const container = document.createElement('div')
41
- container.id = modalId
42
- document.body.appendChild(container)
28
+ let modalRoot: ReactDOM.Root | null = null
43
29
 
44
- modalRoot = ReactDOM.createRoot(container)
45
- modalRoot.render(
46
- <ModalDom
47
- props={{
48
- ...modalProps,
49
- onClose: () => {
50
- destroyModal(modalId);
51
- }
52
- }}
53
- />
54
- )
55
- }
30
+ export const createMessageVerifyModal = (modalProps: ModalConfig) => {
31
+ const container = document.createElement('div')
32
+ container.id = 'antd-modal-container'
33
+ document.body.appendChild(container)
56
34
 
57
- const createMessageVerifyModal = (modalProps: VerifyModalConfig) => {
58
- const verifyModalId = 'verify-modal-container';
59
- creatModal(modalProps, verifyModalId, VerifyModal);
60
- }
61
- // 新增 relogin 弹窗创建方法
62
- export const createReLoginModal = (modalProps: LoginModalConfig) => {
63
- const reLoginModalId = 'relogin-modal-container';
64
- creatModal(modalProps, reLoginModalId, ReLoginModal);
35
+ modalRoot = ReactDOM.createRoot(container)
36
+ modalRoot.render(
37
+ <VerifyModal
38
+ props={{
39
+ ...modalProps,
40
+ onClose: () => {
41
+ modalProps.onClose?.()
42
+ destroyModal()
43
+ }
44
+ }}
45
+ />
46
+ )
65
47
  }
66
48
 
67
- export const VerifyHandler = ({data, config, http, verifyPromise, sendApi}: VerifyModalConfig): Promise<any> => {
68
- const toEmpty = () => {
69
- verifyPromise.current = null;
70
- };
71
- if (!verifyPromise.current) {
72
- verifyPromise.current = new Promise((resolve, reject) => {
73
- createMessageVerifyModal({
74
- data,
75
- config,
76
- http,
77
- apiResolve: resolve,
78
- apiReject: reject,
79
- apiPromiseToEmpty: toEmpty,
80
- sendApi
81
- } as VerifyModalConfig);
82
- }).finally(toEmpty);
83
- }
84
- return verifyPromise.current;
85
- };
49
+ const destroyModal = () => {
50
+ if (modalRoot) {
51
+ modalRoot.unmount()
52
+ document.getElementById('antd-modal-container')?.remove()
53
+ modalRoot = null
54
+ }
55
+ }
package/src/locales/en.ts CHANGED
@@ -6,9 +6,5 @@ export default {
6
6
  sendSuccess: 'Successfully sent',
7
7
  sendFailed: 'Send failed',
8
8
  reSend: 'Resend',
9
- countDownSecound: '{countdown} seconds',
10
- accountAlert: 'Account Security Alert',
11
- alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
12
- ok: 'OK',
13
- chidoriOpenPro: 'Chidori has activated security protection for you'
9
+ countDownSecound: '{countdown} seconds'
14
10
  };
package/src/locales/id.ts CHANGED
@@ -6,9 +6,5 @@ export default {
6
6
  sendSuccess: 'Berhasil dikirim',
7
7
  sendFailed: 'Gagal mengirim',
8
8
  reSend: 'Kirim Ulang',
9
- countDownSecound: '{countdown} detik',
10
- accountAlert: 'Peringatan Keamanan Akun',
11
- alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
12
- ok: 'Baiklah',
13
- chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda'
9
+ countDownSecound: '{countdown} detik'
14
10
  };
package/src/locales/zh.ts CHANGED
@@ -6,9 +6,5 @@ export default {
6
6
  sendSuccess: '发送成功',
7
7
  sendFailed: '发送失败',
8
8
  reSend: '重新发送',
9
- countDownSecound: '{countdown}秒',
10
- accountAlert: '账号安全提醒',
11
- alertContent: '检测到您的登录环境或网络信息有变动,为保障账户安全,请重新登录验证身份',
12
- ok: '好的',
13
- chidoriOpenPro: 'chidori已为您开启安全防护'
9
+ countDownSecound: '{countdown}秒'
14
10
  };