diff --git a/packages/biz/CHANGELOG.md b/packages/biz/CHANGELOG.md index 917b5e3..903e306 100644 --- a/packages/biz/CHANGELOG.md +++ b/packages/biz/CHANGELOG.md @@ -1,5 +1,14 @@ # @zhst/biz +## 0.22.2 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.16.0 + - @zhst/hooks@0.13.1 + - @zhst/meta@0.21.2 + ## 0.22.1 ### Patch Changes diff --git a/packages/biz/package.json b/packages/biz/package.json index 84a6621..c45796c 100644 --- a/packages/biz/package.json +++ b/packages/biz/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/biz", - "version": "0.22.1", + "version": "0.22.2", "description": "业务库", "keywords": [ "business", diff --git a/packages/func/CHANGELOG.md b/packages/func/CHANGELOG.md index acd5b23..0010a8c 100644 --- a/packages/func/CHANGELOG.md +++ b/packages/func/CHANGELOG.md @@ -1,5 +1,16 @@ # @zhst/utils +## 0.16.0 + +### Minor Changes + +- zhst/request 修改重新登录问题,zhst/func 添加指定路由跳转方法 + +### Patch Changes + +- Updated dependencies + - @zhst/request@0.16.0 + ## 0.15.0 ### Minor Changes diff --git a/packages/func/package.json b/packages/func/package.json index bdfe2fb..b641dd8 100644 --- a/packages/func/package.json +++ b/packages/func/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/func", - "version": "0.15.0", + "version": "0.16.0", "description": "函数合集", "keywords": [ "hooks" diff --git a/packages/func/src/string/index.ts b/packages/func/src/string/index.ts index aca9e9b..3013364 100644 --- a/packages/func/src/string/index.ts +++ b/packages/func/src/string/index.ts @@ -90,3 +90,19 @@ export const pxToRem = (value: string, rootFontSize?: number) => { return valueArr.filter(o => o).map(val => ((parseFloat(val) / fontSize) + 'rem')).join(' ') } + +/** + * 跳转到指定URL + * @param to 跳转的url + * @returns URL + */ +export const jumpTo = (to: string) => { + const from = (location.origin + location.pathname) + // 检查是否为url,并且跑出错误 + if (!isUrl(to)) { + throw Error(`请输入正确的链接,以http(s)://开头!'`) + } + let _targetUrl = new URL(to) + _targetUrl.searchParams.set('from', from) + return _targetUrl +} diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md index 03d7444..f28355b 100644 --- a/packages/hooks/CHANGELOG.md +++ b/packages/hooks/CHANGELOG.md @@ -1,5 +1,12 @@ # @zhst/hooks +## 0.13.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.16.0 + ## 0.13.0 ### Minor Changes diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 750ee14..921fdbc 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/hooks", - "version": "0.13.0", + "version": "0.13.1", "description": "hooks合集", "keywords": [ "hooks" diff --git a/packages/material/CHANGELOG.md b/packages/material/CHANGELOG.md index 51676ae..5e46d4d 100644 --- a/packages/material/CHANGELOG.md +++ b/packages/material/CHANGELOG.md @@ -1,5 +1,15 @@ # @zhst/material +## 0.18.2 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.16.0 + - @zhst/biz@0.22.2 + - @zhst/hooks@0.13.1 + - @zhst/meta@0.21.2 + ## 0.18.1 ### Patch Changes diff --git a/packages/material/package.json b/packages/material/package.json index db1ab3f..b9504df 100644 --- a/packages/material/package.json +++ b/packages/material/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/material", - "version": "0.18.1", + "version": "0.18.2", "description": "物料库", "keywords": [ "business", diff --git a/packages/meta/CHANGELOG.md b/packages/meta/CHANGELOG.md index 623a6e9..c0e8a4e 100644 --- a/packages/meta/CHANGELOG.md +++ b/packages/meta/CHANGELOG.md @@ -1,5 +1,14 @@ # @zhst/utils +## 0.21.2 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.16.0 + - @zhst/hooks@0.13.1 + - @zhst/meta@0.21.2 + ## 0.21.1 ### Patch Changes diff --git a/packages/meta/package.json b/packages/meta/package.json index acfec6e..4c0959e 100644 --- a/packages/meta/package.json +++ b/packages/meta/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/meta", - "version": "0.21.1", + "version": "0.21.2", "description": "原子组件", "keywords": [ "meta", diff --git a/packages/request/CHANGELOG.md b/packages/request/CHANGELOG.md index 343a93e..b4da31a 100644 --- a/packages/request/CHANGELOG.md +++ b/packages/request/CHANGELOG.md @@ -1,5 +1,16 @@ # @zhst/request +## 0.16.0 + +### Minor Changes + +- zhst/request 修改重新登录问题,zhst/func 添加指定路由跳转方法 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.16.0 + ## 0.15.0 ### Minor Changes diff --git a/packages/request/package.json b/packages/request/package.json index be82317..a354a24 100644 --- a/packages/request/package.json +++ b/packages/request/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/request", - "version": "0.15.0", + "version": "0.16.0", "description": "请求库", "keywords": [ "request", diff --git a/packages/request/src/demo/index.tsx b/packages/request/src/demo/index.tsx new file mode 100644 index 0000000..e69de29 diff --git a/packages/request/src/index.tsx b/packages/request/src/index.tsx index 75a0bcf..627369f 100644 --- a/packages/request/src/index.tsx +++ b/packages/request/src/index.tsx @@ -15,6 +15,11 @@ export interface ReqConfigProps { */ authorization?: string showMsg?: boolean + /** + * 过期信息捕捉 + * @param error + * @returns + */ onExpired?: (error?: any) => void; expiredCodes?: number[]; /** @@ -38,17 +43,42 @@ export const reqConfig = (config: ReqConfigProps) => { timeout: 1000, baseURL: location.origin, errorConfig: { - // @ts-ignore - errorHandler(error) { - // const { status } = error?.request || {} - onError?.(error) - message.error('网络异常') - }, - // @ts-ignore - errorThrower(res) { - console.log('报错啦:', res); - }, + // @ts-ignore + errorHandler(response) { + const { code, message: resMessage } = response?.data || {} + let msg = resMessage || '请求失败!' + + if (response.status !== 200) { + // 服务器错误 + msg = '网络异常' + onError?.(response) + } else if (expiredCodes.includes(code)) { + // 登录失效 + msg = '登录过期,请重新登录' + onExpired?.(response) + } + showMsg && message.error(msg) }, + // @ts-ignore + errorThrower(res) { + console.log('报错啦:', res); + }, + }, + // @ts-ignore + responseInterceptors: [ + // 一个二元组,第一个元素是 request 拦截器,第二个元素是错误处理 + [ + (response: { status: number; data: any; }) => { + const { code, data = {} } = response?.data || {} + + if (code !== 200) { + // 报错捕捉 + return Promise.reject(response) + } + return response?.data || {}; + } + ], + ], // 请求 requestInterceptors: [ // 一个二元组,第一个元素是 request 拦截器,第二个元素是错误处理 @@ -71,35 +101,6 @@ export const reqConfig = (config: ReqConfigProps) => { }, ], ], - // 返回 - responseInterceptors: [ - // 一个二元组,第一个元素是 request 拦截器,第二个元素是错误处理 - [ - (response: { status: number; data: any; }) => { - const { code } = response?.data || {} - - if (expiredCodes.includes(code)) { - message.error('登录过期,请重新登录') - onExpired?.(response?.data) - return {} - } - - if (showMsg && code !== 200) { - message.error(response.data?.message || '请求失败!') - return {} - } - return response.data || {}; - }, - (error: any) => { - const { code } = error.response?.data || {} - - if (showMsg && code !== 200) { - message.error(error.response.data.message || '请求失败!') - } - return Promise.reject(error.response); - }, - ], - ], ...config }; } diff --git a/packages/slave/CHANGELOG.md b/packages/slave/CHANGELOG.md index 62e1ae9..9a9178e 100644 --- a/packages/slave/CHANGELOG.md +++ b/packages/slave/CHANGELOG.md @@ -1,5 +1,12 @@ # @zhst/slave +## 0.11.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.16.0 + ## 0.11.0 ### Minor Changes diff --git a/packages/slave/package.json b/packages/slave/package.json index c24a0ef..bfbd848 100644 --- a/packages/slave/package.json +++ b/packages/slave/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/slave", - "version": "0.11.0", + "version": "0.11.1", "description": "微前端子应用方法库", "keywords": [ "slave",