message-verify 1.0.1-beta.16 → 1.0.1-beta.18

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.
Files changed (7) hide show
  1. package/dist/main.js +4 -9
  2. package/dist/utils/type.d.ts +2 -1
  3. package/dist/verify-modal.js +15 -36
  4. package/package.json +1 -1
  5. package/src/main.tsx +4 -9
  6. package/src/utils/type.ts +2 -1
  7. package/src/verify-modal.tsx +15 -34
package/dist/main.js CHANGED
@@ -11,12 +11,6 @@ const config = {
11
11
  "forcedJSONParsing": true,
12
12
  "clarifyTimeoutError": false
13
13
  },
14
- // "transformRequest": [
15
- // null
16
- // ],
17
- // "transformResponse": [
18
- // null
19
- // ],
20
14
  "timeout": 0,
21
15
  "xsrfCookieName": "XSRF-TOKEN",
22
16
  "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -44,11 +38,12 @@ const config = {
44
38
  createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => createMessageVerifyModal({
45
39
  data,
46
40
  config,
47
- response: {
48
- config
49
- },
50
41
  lang: 'en',
51
42
  http: axios,
43
+ apiReject: () => {
44
+ },
45
+ apiResolve: () => {
46
+ }
52
47
  }), children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
53
48
  goLogin: () => {
54
49
  console.log('goLogin');
package/dist/utils/type.d.ts CHANGED
@@ -19,7 +19,8 @@ export type ModalConfig = {
19
19
  };
20
20
  };
21
21
  api?: string;
22
- response: any;
22
+ apiReject: any;
23
+ apiResolve: any;
23
24
  };
24
25
  export type LoginModalConfig = {
25
26
  goLogin: () => void;
package/dist/verify-modal.js CHANGED
@@ -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, api = '/admin/sms/send', config, response } = props || {};
14
+ const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiReject } = props || {};
15
15
  const dataObj = JSON.parse(data || '{}');
16
16
  const { mobile, verifyCodeKey } = dataObj || {};
17
17
  const getKey = async () => {
@@ -65,45 +65,24 @@ const CreateMessageVerifyModal = ({ props }) => {
65
65
  return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
66
66
  setVisible(false);
67
67
  props.onClose?.();
68
- }, 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) => {
68
+ }, 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: (val) => {
69
69
  setOtp(val);
70
70
  if (val.length === 6) {
71
- try {
72
- const res = await http({
73
- ...config,
74
- headers: {
75
- ...http.defaults.headers.common,
76
- 'sms-code': val,
77
- 'sms-code-key': verifyCodeKey,
78
- 'Content-Type': config.headers['Content-Type'],
79
- }
80
- });
81
- console.log('组件打印res', res);
82
- // const {data: {status: {code, detail}}} = res || {} as any;
83
- if (!res) {
84
- message.error('验证失败');
71
+ http({
72
+ ...config,
73
+ headers: {
74
+ ...http.defaults.headers.common,
75
+ 'sms-code': val,
76
+ 'sms-code-key': verifyCodeKey,
77
+ 'Content-Type': config.headers['Content-Type'],
85
78
  }
86
- else {
87
- message.success('验证成功');
88
- }
89
- // if (code !== 0) {
90
- // console.log('失败了')
91
- // const detailObj = JSON.parse(detail || '{}');
92
- // console.log('detailObj', detailObj);
93
- // message.error(detailObj?.message || t('sendFailed', lang));
94
- // setVisible(false);
95
- // return;
96
- // } else {
97
- // console.log('成功了')
98
- // // message.success(t('verifySuccess', lang));
99
- // setVisible(false);
100
- // // return Promise.resolve(response);
101
- // }
79
+ }).then(res => {
80
+ apiResolve(res);
81
+ }).catch(err => {
82
+ apiReject(err);
83
+ }).finally(() => {
102
84
  setVisible(false);
103
- }
104
- catch (error) {
105
- message.error(error?.message || t('sendFailed', lang));
106
- }
85
+ });
107
86
  }
108
87
  } }), _jsx(Button, { disabled: countdown > 0 || !captchCode, onClick: handleResend, style: { padding: '8px' }, children: countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang) })] }), countdown > 0 ? null :
109
88
  _jsxs("div", { style: { marginTop: 12, display: 'flex', alignItems: 'center' }, children: [_jsx(Input, { placeholder: t('pleaseEnterPicVerifyCode', lang), onChange: (e) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "message-verify",
3
- "version": "1.0.1-beta.16",
3
+ "version": "1.0.1-beta.18",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
package/src/main.tsx CHANGED
@@ -13,12 +13,6 @@ const config = {
13
13
  "forcedJSONParsing": true,
14
14
  "clarifyTimeoutError": false
15
15
  },
16
- // "transformRequest": [
17
- // null
18
- // ],
19
- // "transformResponse": [
20
- // null
21
- // ],
22
16
  "timeout": 0,
23
17
  "xsrfCookieName": "XSRF-TOKEN",
24
18
  "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -48,11 +42,12 @@ createRoot(document.getElementById('root')!).render(
48
42
  <button onClick={() => createMessageVerifyModal({
49
43
  data,
50
44
  config,
51
- response: {
52
- config
53
- },
54
45
  lang: 'en',
55
46
  http: axios,
47
+ apiReject: () => {
48
+ },
49
+ apiResolve: () => {
50
+ }
56
51
  })}>
57
52
  Show verify Modal
58
53
  </button>
package/src/utils/type.ts CHANGED
@@ -20,7 +20,8 @@ export type ModalConfig = {
20
20
  }
21
21
  };
22
22
  api?: string;
23
- response: any;
23
+ apiReject: any;
24
+ apiResolve: any;
24
25
  }
25
26
 
26
27
  export type LoginModalConfig = {
package/src/verify-modal.tsx CHANGED
@@ -12,7 +12,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
12
12
  const [captchaImage, setCaptchaImage] = useState<string>('');
13
13
  const [captchCode, setCaptchCode] = useState<string>('');
14
14
  const [captchaKey, setCaptchaKey] = useState<string>('');
15
- const { data, http, lang, api='/admin/sms/send', config, response } = props || {};
15
+ const { data, http, lang, api='/admin/sms/send', config, apiResolve, apiReject } = props || {};
16
16
  const dataObj = JSON.parse(data || '{}');
17
17
  const { mobile, verifyCodeKey } = dataObj || {};
18
18
 
@@ -80,43 +80,24 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
80
80
  <Input.OTP
81
81
  length={6}
82
82
  value={otp}
83
- onChange={async (val) => {
83
+ onChange={(val) => {
84
84
  setOtp(val);
85
85
  if (val.length === 6) {
86
- try {
87
- const res = await http({
88
- ...config,
89
- headers: {
90
- ...http.defaults.headers.common,
91
- 'sms-code': val,
92
- 'sms-code-key': verifyCodeKey,
93
- 'Content-Type': config.headers['Content-Type'],
94
- }
95
- });
96
- console.log('组件打印res', res);
97
- // const {data: {status: {code, detail}}} = res || {} as any;
98
- if(!res) {
99
- message.error('验证失败');
100
- } else {
101
- message.success('验证成功');
86
+ http({
87
+ ...config,
88
+ headers: {
89
+ ...http.defaults.headers.common,
90
+ 'sms-code': val,
91
+ 'sms-code-key': verifyCodeKey,
92
+ 'Content-Type': config.headers['Content-Type'],
102
93
  }
103
- // if (code !== 0) {
104
- // console.log('失败了')
105
- // const detailObj = JSON.parse(detail || '{}');
106
- // console.log('detailObj', detailObj);
107
- // message.error(detailObj?.message || t('sendFailed', lang));
108
- // setVisible(false);
109
- // return;
110
- // } else {
111
- // console.log('成功了')
112
- // // message.success(t('verifySuccess', lang));
113
- // setVisible(false);
114
- // // return Promise.resolve(response);
115
- // }
94
+ }).then(res => {
95
+ apiResolve(res);
96
+ }).catch(err => {
97
+ apiReject(err);
98
+ }).finally(() => {
116
99
  setVisible(false);
117
- } catch (error: any) {
118
- message.error(error?.message || t('sendFailed', lang));
119
- }
100
+ });
120
101
  }
121
102
  }} />
122
103
  <Button