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

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 -0
  2. package/dist/utils/type.d.ts +2 -0
  3. package/dist/verify-modal.js +24 -35
  4. package/package.json +1 -1
  5. package/src/main.tsx +4 -0
  6. package/src/utils/type.ts +2 -0
  7. package/src/verify-modal.tsx +16 -25
package/dist/main.js CHANGED
@@ -49,6 +49,10 @@ createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children:
49
49
  },
50
50
  lang: 'en',
51
51
  http: axios,
52
+ myReject: () => {
53
+ },
54
+ myResolve: () => {
55
+ }
52
56
  }), children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
53
57
  goLogin: () => {
54
58
  console.log('goLogin');
package/dist/utils/type.d.ts CHANGED
@@ -20,6 +20,8 @@ export type ModalConfig = {
20
20
  };
21
21
  api?: string;
22
22
  response: any;
23
+ myReject: any;
24
+ myResolve: any;
23
25
  };
24
26
  export type LoginModalConfig = {
25
27
  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, myResolve, myReject } = props || {};
15
15
  const dataObj = JSON.parse(data || '{}');
16
16
  const { mobile, verifyCodeKey } = dataObj || {};
17
17
  const getKey = async () => {
@@ -68,42 +68,31 @@ const CreateMessageVerifyModal = ({ props }) => {
68
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) => {
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
+ // try {
72
+ 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'],
85
79
  }
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
- // }
80
+ }).then(res => {
102
81
  setVisible(false);
103
- }
104
- catch (error) {
105
- message.error(error?.message || t('sendFailed', lang));
106
- }
82
+ myResolve(res);
83
+ // return res;
84
+ }).catch(err => {
85
+ myReject(err);
86
+ });
87
+ // console.log('组件打印res', res);
88
+ // if(!res) {
89
+ // message.error('验证失败');
90
+ // } else {
91
+ // message.success('验证成功');
92
+ // }
93
+ // } catch (error: any) {
94
+ // message.error(error?.message || t('sendFailed', lang));
95
+ // }
107
96
  }
108
97
  } }), _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
98
  _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.17",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
package/src/main.tsx CHANGED
@@ -53,6 +53,10 @@ createRoot(document.getElementById('root')!).render(
53
53
  },
54
54
  lang: 'en',
55
55
  http: axios,
56
+ myReject: () => {
57
+ },
58
+ myResolve: () => {
59
+ }
56
60
  })}>
57
61
  Show verify Modal
58
62
  </button>
package/src/utils/type.ts CHANGED
@@ -21,6 +21,8 @@ export type ModalConfig = {
21
21
  };
22
22
  api?: string;
23
23
  response: any;
24
+ myReject: any;
25
+ myResolve: any;
24
26
  }
25
27
 
26
28
  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, myResolve, myReject } = props || {};
16
16
  const dataObj = JSON.parse(data || '{}');
17
17
  const { mobile, verifyCodeKey } = dataObj || {};
18
18
 
@@ -83,8 +83,8 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
83
83
  onChange={async (val) => {
84
84
  setOtp(val);
85
85
  if (val.length === 6) {
86
- try {
87
- const res = await http({
86
+ // try {
87
+ http({
88
88
  ...config,
89
89
  headers: {
90
90
  ...http.defaults.headers.common,
@@ -92,31 +92,22 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
92
92
  'sms-code-key': verifyCodeKey,
93
93
  'Content-Type': config.headers['Content-Type'],
94
94
  }
95
+ }).then(res => {
96
+ setVisible(false);
97
+ myResolve(res);
98
+ // return res;
99
+ }).catch(err => {
100
+ myReject(err);
95
101
  });
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('验证成功');
102
- }
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;
102
+ // console.log('组件打印res', res);
103
+ // if(!res) {
104
+ // message.error('验证失败');
110
105
  // } else {
111
- // console.log('成功了')
112
- // // message.success(t('verifySuccess', lang));
113
- // setVisible(false);
114
- // // return Promise.resolve(response);
106
+ // message.success('验证成功');
115
107
  // }
116
- setVisible(false);
117
- } catch (error: any) {
118
- message.error(error?.message || t('sendFailed', lang));
119
- }
108
+ // } catch (error: any) {
109
+ // message.error(error?.message || t('sendFailed', lang));
110
+ // }
120
111
  }
121
112
  }} />
122
113
  <Button