@fairys/taro-tools-react 1.0.18 → 1.0.20

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 (6) hide show
  1. package/esm/utils/request.d.ts +5 -3
  2. package/esm/utils/request.js +5 -1
  3. package/lib/utils/request.d.ts +5 -3
  4. package/lib/utils/request.js +5 -1
  5. package/package.json +1 -1
  6. package/src/utils/request.ts +9 -3
package/esm/utils/request.d.ts CHANGED
@@ -6,6 +6,8 @@ export interface TaroRequestOption {
6
6
  isIgnoreToken?: boolean;
7
7
  /**是否提示错误信息*/
8
8
  isShowErrorMessage?: boolean;
9
+ /**成功状态码*/
10
+ requestSuccessCode?: number;
9
11
  }
10
12
  export interface RequestInstanceOptions extends Taro.request.Option<any, any>, TaroRequestOption {
11
13
  }
@@ -107,7 +109,7 @@ export declare class RequestInstance {
107
109
  storeSign?: string;
108
110
  storeCheck?(): boolean;
109
111
  header: {
110
- [x: string]: any;
112
+ 'accept-charset': string;
111
113
  };
112
114
  } | {
113
115
  url: string;
@@ -120,7 +122,7 @@ export declare class RequestInstance {
120
122
  fail?: (res: TaroGeneral.CallbackResult) => void;
121
123
  success?: (result: Taro.downloadFile.FileSuccessCallbackResult) => void;
122
124
  header: {
123
- [x: string]: any;
125
+ 'accept-charset': string;
124
126
  };
125
127
  } | {
126
128
  url: string;
@@ -138,7 +140,7 @@ export declare class RequestInstance {
138
140
  fail?: (res: TaroGeneral.CallbackResult) => void;
139
141
  success?: (result: Taro.uploadFile.SuccessCallbackResult) => void;
140
142
  header: {
141
- [x: string]: any;
143
+ 'accept-charset': string;
142
144
  };
143
145
  };
144
146
  /**发送请求，返回 Taro.RequestTask */
package/esm/utils/request.js CHANGED
@@ -16,6 +16,7 @@ const codeMessage = {
16
16
  };
17
17
  const requestResponseHandle = (result, options)=>{
18
18
  let msg = '';
19
+ const requestSuccessCode = options?.requestSuccessCode;
19
20
  try {
20
21
  const statusCode = result.statusCode;
21
22
  const code = result?.data?.code;
@@ -24,6 +25,8 @@ const requestResponseHandle = (result, options)=>{
24
25
  globalMessageDataInstance.toLoginPage();
25
26
  } else msg = [
26
27
  globalSettingDataInstance.store.requestSuccessCode,
28
+ requestSuccessCode,
29
+ 1,
27
30
  200
28
31
  ].includes(code) ? codeMessage[result?.statusCode] : result?.data?.message || codeMessage[code || result?.statusCode] || "\u63A5\u53E3\u5F02\u5E38";
29
32
  } catch (error) {
@@ -111,9 +114,10 @@ class RequestInstance {
111
114
  return `${host}/${newUrl}`;
112
115
  };
113
116
  formatRequestOptions = (options)=>{
114
- const { header = {}, module, isIgnoreToken, isShowErrorMessage, ...restOptions } = options;
117
+ const { header = {}, module, isIgnoreToken, isShowErrorMessage, requestSuccessCode, ...restOptions } = options;
115
118
  const token = taro.getStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
116
119
  const newHeader = {
120
+ 'accept-charset': 'utf-8',
117
121
  ...header
118
122
  };
119
123
  if (token) newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
package/lib/utils/request.d.ts CHANGED
@@ -6,6 +6,8 @@ export interface TaroRequestOption {
6
6
  isIgnoreToken?: boolean;
7
7
  /**是否提示错误信息*/
8
8
  isShowErrorMessage?: boolean;
9
+ /**成功状态码*/
10
+ requestSuccessCode?: number;
9
11
  }
10
12
  export interface RequestInstanceOptions extends Taro.request.Option<any, any>, TaroRequestOption {
11
13
  }
@@ -107,7 +109,7 @@ export declare class RequestInstance {
107
109
  storeSign?: string;
108
110
  storeCheck?(): boolean;
109
111
  header: {
110
- [x: string]: any;
112
+ 'accept-charset': string;
111
113
  };
112
114
  } | {
113
115
  url: string;
@@ -120,7 +122,7 @@ export declare class RequestInstance {
120
122
  fail?: (res: TaroGeneral.CallbackResult) => void;
121
123
  success?: (result: Taro.downloadFile.FileSuccessCallbackResult) => void;
122
124
  header: {
123
- [x: string]: any;
125
+ 'accept-charset': string;
124
126
  };
125
127
  } | {
126
128
  url: string;
@@ -138,7 +140,7 @@ export declare class RequestInstance {
138
140
  fail?: (res: TaroGeneral.CallbackResult) => void;
139
141
  success?: (result: Taro.uploadFile.SuccessCallbackResult) => void;
140
142
  header: {
141
- [x: string]: any;
143
+ 'accept-charset': string;
142
144
  };
143
145
  };
144
146
  /**发送请求，返回 Taro.RequestTask */
package/lib/utils/request.js CHANGED
@@ -56,6 +56,7 @@ const codeMessage = {
56
56
  };
57
57
  const requestResponseHandle = (result, options)=>{
58
58
  let msg = '';
59
+ const requestSuccessCode = options?.requestSuccessCode;
59
60
  try {
60
61
  const statusCode = result.statusCode;
61
62
  const code = result?.data?.code;
@@ -64,6 +65,8 @@ const requestResponseHandle = (result, options)=>{
64
65
  global_message_data_instance_js_namespaceObject.globalMessageDataInstance.toLoginPage();
65
66
  } else msg = [
66
67
  global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.requestSuccessCode,
68
+ requestSuccessCode,
69
+ 1,
67
70
  200
68
71
  ].includes(code) ? codeMessage[result?.statusCode] : result?.data?.message || codeMessage[code || result?.statusCode] || "\u63A5\u53E3\u5F02\u5E38";
69
72
  } catch (error) {
@@ -151,9 +154,10 @@ class RequestInstance {
151
154
  return `${host}/${newUrl}`;
152
155
  };
153
156
  formatRequestOptions = (options)=>{
154
- const { header = {}, module, isIgnoreToken, isShowErrorMessage, ...restOptions } = options;
157
+ const { header = {}, module, isIgnoreToken, isShowErrorMessage, requestSuccessCode, ...restOptions } = options;
155
158
  const token = taro_default().getStorageSync(global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.tokenFieldName || 'token');
156
159
  const newHeader = {
160
+ 'accept-charset': 'utf-8',
157
161
  ...header
158
162
  };
159
163
  if (token) newHeader[global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.headerTokenName || 'token'] = token;
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "author": "SunLxy <1011771396@qq.com>",
4
4
  "description": "框架组件库",
5
5
  "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
6
- "version": "1.0.18",
6
+ "version": "1.0.20",
7
7
  "main": "esm/index.js",
8
8
  "types": "esm/index.d.ts",
9
9
  "module": "esm/index.js",
package/src/utils/request.ts CHANGED
@@ -23,6 +23,8 @@ export interface TaroRequestOption {
23
23
  isIgnoreToken?: boolean;
24
24
  /**是否提示错误信息*/
25
25
  isShowErrorMessage?: boolean;
26
+ /**成功状态码*/
27
+ requestSuccessCode?: number;
26
28
  }
27
29
 
28
30
  export interface RequestInstanceOptions extends Taro.request.Option<any, any>, TaroRequestOption {}
@@ -45,6 +47,7 @@ const requestResponseHandle = (
45
47
  options?: RequestInstanceOptions,
46
48
  ) => {
47
49
  let msg = '';
50
+ const requestSuccessCode = options?.requestSuccessCode;
48
51
  try {
49
52
  const statusCode = result.statusCode;
50
53
  // @ts-ignore
@@ -54,7 +57,7 @@ const requestResponseHandle = (
54
57
  msg = '请重新登录';
55
58
  /**重新跳转登录页面*/
56
59
  globalMessageDataInstance.toLoginPage();
57
- } else if (![globalSettingDataInstance.store.requestSuccessCode, 200].includes(code)) {
60
+ } else if (![globalSettingDataInstance.store.requestSuccessCode, requestSuccessCode, 1, 200].includes(code)) {
58
61
  // 提示内容
59
62
  // @ts-ignore
60
63
  msg = result?.data?.message || codeMessage[code || result?.statusCode] || '接口异常';
@@ -215,9 +218,12 @@ export class RequestInstance {
215
218
  };
216
219
 
217
220
  formatRequestOptions = (options: RequestInstanceOptions | DownloadFileOptions | UploadFileOptions) => {
218
- const { header = {}, module, isIgnoreToken, isShowErrorMessage, ...restOptions } = options;
221
+ const { header = {}, module, isIgnoreToken, isShowErrorMessage, requestSuccessCode, ...restOptions } = options;
219
222
  const token = Taro.getStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
220
- const newHeader = { ...header };
223
+ const newHeader = {
224
+ 'accept-charset': 'utf-8',
225
+ ...header,
226
+ };
221
227
  if (token) {
222
228
  newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
223
229
  } else {