feat(升级包): request、slave

packages/biz/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @zhst/biz
 
+## 0.11.3
+
+### Patch Changes
+
+- @zhst/func@0.9.1
+- @zhst/hooks@0.8.10
+- @zhst/meta@0.9.7
+
 ## 0.11.2
 
 ### Patch Changes

packages/biz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/biz",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "业务库",
   "keywords": [
     "business",

packages/func/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @zhst/utils
 
+## 0.9.1
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies
+  - @zhst/request@0.9.0
+
 ## 0.9.0
 
 ### Minor Changes

packages/func/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/func",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "函数合集",
   "keywords": [
     "hooks"

packages/hooks/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zhst/hooks
 
+## 0.8.10
+
+### Patch Changes
+
+- @zhst/func@0.9.1
+
 ## 0.8.9
 
 ### Patch Changes

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/hooks",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "hooks合集",
   "keywords": [
     "hooks"

packages/material/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @zhst/material
 
+## 0.7.5
+
+### Patch Changes
+
+- @zhst/func@0.9.1
+- @zhst/biz@0.11.3
+- @zhst/hooks@0.8.10
+- @zhst/meta@0.9.7
+
 ## 0.7.4
 
 ### Patch Changes

packages/material/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/material",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "物料库",
   "keywords": [
     "business",

packages/meta/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @zhst/utils
 
+## 0.9.7
+
+### Patch Changes
+
+- @zhst/func@0.9.1
+- @zhst/hooks@0.8.10
+- @zhst/meta@0.9.7
+
 ## 0.9.6
 
 ### Patch Changes

packages/meta/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/meta",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "原子组件",
   "keywords": [
     "meta",

packages/request/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @zhst/request
 
+## 0.9.0
+
+### Minor Changes
+
+- 新包发布
+- 修改配置
+
+### Patch Changes
+
+- @zhst/func@0.9.1
+
 ## 0.8.9
 
 ### Patch Changes

packages/request/README.md

@@ -1,21 +1,36 @@
 # @zhst/request
 
-:::info{title=开发中}
-还在构思最佳使用方案...
-:::
-
-
 ## 介绍
 
-zhst 请求库
+请求库配置，创建初衷是为了统一项目中引用的 request 和 useRequest 的配置。
 
 ## 安装
 
-> pnpm install @zhst/request
+```js
+pnpm install @zhst/request
+```
 
 ## 使用
 
-```js
+```jsx
 import React from 'react';
-import request from '@zhst/request'
+import { reqConfig } from '@zhst/request'
+
+const config = reqConfig()
+
+console.log('配置', config)
+
+export default () => {
+  return (
+    <div>从控制台打印查看</div>
+  )
+}
 ```
+
+## API
+
+参数可以参考 umi 的 request 配置
+
+| 参数 | 说明 | 类型 | 默认值 | 版本 |
+| --- | --- | --- | --- | --- |
+| baseURL | 请求的根域名 | string | location.host | - |

packages/request/es/index.d.ts

@@ -1,4 +1,28 @@
-interface RequestConfig {
+export interface ReqConfigProps {
+    timeout?: number;
+    baseURL?: string;
+    errorConfig?: {
+        errorHandler?: (error: any, opts: any) => void;
+        errorThrower?: (err: any) => void;
+    };
+    authorization: string;
+    showMsg?: boolean;
 }
-export declare const request: RequestConfig;
-export {};
+export declare const reqConfig: (config: ReqConfigProps) => {
+    timeout: number;
+    baseURL: string;
+    errorConfig: {
+        errorHandler?: ((error: any, opts: any) => void) | undefined;
+        errorThrower?: ((err: any) => void) | undefined;
+    };
+    authorization: string;
+    showMsg?: boolean | undefined;
+    requestInterceptors: (((url: any, options: any) => {
+        url: any;
+        options: any;
+    }) | ((error: any) => Promise<never>))[][];
+    responseInterceptors: ((response: {
+        status: number;
+        data: any;
+    }) => any)[][];
+};

packages/request/es/index.js

@@ -4,77 +4,90 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-export var request = {
-  timeout: 1000,
-  // other axios options you want
-  errorConfig: {
-    // @ts-ignore
-    errorHandler: function errorHandler(error, opts) {
-      // if (opts?.skipErrorHandler) throw error
-      // try {
-      //   const { res } = ctx;
-      //   const d = await res.text();
+import { message } from 'antd';
+export var reqConfig = function reqConfig(config) {
+  var _ref = config || {},
+    authorization = _ref.authorization,
+    showMsg = _ref.showMsg;
+  return _objectSpread({
+    timeout: 1000,
+    baseURL: location.origin,
+    // other axios options you want
+    errorConfig: {
+      // @ts-ignore
+      errorHandler: function errorHandler(error, opts) {
+        console.log('first', error, opts);
+        // if (opts?.skipErrorHandler) throw error
+        // try {
+        //   const { res } = ctx;
+        //   const d = await res.text();
 
-      //   if (res.status === 401 && store.user.isLogin) {
-      //     store.user.resetLoginState();
-      //     message.warning('登录过期，请重新登录!');
-      //     return;
-      //   }
-      //   const isEmptyRes = d === '' || d.replace(/\s/g,"")=== 'tokenisinvalid'; //有些后端接口成功会返回空 做下兼容
-      //   const body = !isEmptyRes ? JSON.parse(d || '{}') : d;
-      //   const sessionCode = sessionStorage.getItem('zhst_errcode') || '{}'
-      //   const ERROR_CODE = JSON.parse(sessionCode);
+        //   if (res.status === 401 && store.user.isLogin) {
+        //     store.user.resetLoginState();
+        //     message.warning('登录过期，请重新登录!');
+        //     return;
+        //   }
+        //   const isEmptyRes = d === '' || d.replace(/\s/g,"")=== 'tokenisinvalid'; //有些后端接口成功会返回空 做下兼容
+        //   const body = !isEmptyRes ? JSON.parse(d || '{}') : d;
+        //   const sessionCode = sessionStorage.getItem('zhst_errcode') || '{}'
+        //   const ERROR_CODE = JSON.parse(sessionCode);
 
-      //   if (Number(res.status) === 200) {
-      //     ctx.res = body;
-      //   } else {
-      //     // 先判断Grpc-Metadata-Errorx-Message
-      //     let errMsg = ERROR_CODE[body.code]?.value || body.message || '您的网络发生异常，无法连接服务器'
-      //     toast && message.error(errMsg || body);
-      //     ctx.res = {
-      //       code: body.code,
-      //       message: errMsg
-      //     };
-      //   }
+        //   if (Number(res.status) === 200) {
+        //     ctx.res = body;
+        //   } else {
+        //     // 先判断Grpc-Metadata-Errorx-Message
+        //     let errMsg = ERROR_CODE[body.code]?.value || body.message || '您的网络发生异常，无法连接服务器'
+        //     toast && message.error(errMsg || body);
+        //     ctx.res = {
+        //       code: body.code,
+        //       message: errMsg
+        //     };
+        //   }
 
-      // } catch (error) {
-      //   if (get(error, 'type') !== 'CustomError') {
-      //     toast && message.error('您的网络发生异常，无法连接服务器');
-      //   }
-      //   throw error;
-      // }
+        // } catch (error) {
+        //   if (get(error, 'type') !== 'CustomError') {
+        //     toast && message.error('您的网络发生异常，无法连接服务器');
+        //   }
+        //   throw error;
+        // }
+      },
+      // @ts-ignore
+      errorThrower: function errorThrower(res) {
+        console.log('res', res);
+      }
     },
-    // @ts-ignore
-    errorThrower: function errorThrower(res) {
-      console.log('res', res);
-    }
-  },
-  // 请求
-  requestInterceptors: [
-  // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
-  [function (url, options) {
-    // console.log('options', options);
-    return {
-      url: url,
-      options: _objectSpread(_objectSpread({}, options), {}, {
-        headers: {
-          authorization: 'test'
-          // ...(refererSuffix ? { zhst_referer: `${baseUrl}${refererSuffix}` } : {}),
-        }
-      })
-    };
-  }, function (error) {
-    return Promise.reject(error);
-  }]],
-  // 返回
-  responseInterceptors: [
-  // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
-  [function (response) {
-    if (response.status !== 200) {
-      throw Error(JSON.stringify(response.data));
-    }
-    return response;
-  }, function (error) {
-    return Promise.reject(error);
-  }]]
+    // 请求
+    requestInterceptors: [
+    // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
+    [function (url, options) {
+      var Authorization = authorization || localStorage.getItem('ZHST_AUTH_TOKEN') || '';
+      return {
+        url: url,
+        options: _objectSpread(_objectSpread({}, options), {}, {
+          headers: {
+            Authorization: Authorization
+          }
+        })
+      };
+    }, function (error) {
+      return Promise.reject(error);
+    }]],
+    // 返回
+    responseInterceptors: [
+    // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
+    [function (response) {
+      if (response.status !== 200) {
+        throw Error(JSON.stringify(response.data));
+      }
+      var _ref2 = response.data || {},
+        code = _ref2.code;
+      if (showMsg && code !== 200) {
+        message.error(response.data.message || '请求失败！');
+        return null;
+      }
+      return response.data;
+    }, function (error) {
+      return Promise.reject(error);
+    }]]
+  }, config);
 };

packages/request/lib/index.d.ts

@@ -1,4 +1,28 @@
-interface RequestConfig {
+export interface ReqConfigProps {
+    timeout?: number;
+    baseURL?: string;
+    errorConfig?: {
+        errorHandler?: (error: any, opts: any) => void;
+        errorThrower?: (err: any) => void;
+    };
+    authorization: string;
+    showMsg?: boolean;
 }
-export declare const request: RequestConfig;
-export {};
+export declare const reqConfig: (config: ReqConfigProps) => {
+    timeout: number;
+    baseURL: string;
+    errorConfig: {
+        errorHandler?: ((error: any, opts: any) => void) | undefined;
+        errorThrower?: ((err: any) => void) | undefined;
+    };
+    authorization: string;
+    showMsg?: boolean | undefined;
+    requestInterceptors: (((url: any, options: any) => {
+        url: any;
+        options: any;
+    }) | ((error: any) => Promise<never>))[][];
+    responseInterceptors: ((response: {
+        status: number;
+        data: any;
+    }) => any)[][];
+};

packages/request/lib/index.js

@@ -19,59 +19,74 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.tsx
 var src_exports = {};
 __export(src_exports, {
-  request: () => request
+  reqConfig: () => reqConfig
 });
 module.exports = __toCommonJS(src_exports);
-var request = {
-  timeout: 1e3,
-  // other axios options you want
-  errorConfig: {
-    // @ts-ignore
-    errorHandler(error, opts) {
+var import_antd = require("antd");
+var reqConfig = (config) => {
+  const {
+    authorization,
+    showMsg
+  } = config || {};
+  return {
+    timeout: 1e3,
+    baseURL: location.origin,
+    // other axios options you want
+    errorConfig: {
+      // @ts-ignore
+      errorHandler(error, opts) {
+        console.log("first", error, opts);
+      },
+      // @ts-ignore
+      errorThrower(res) {
+        console.log("res", res);
+      }
     },
-    // @ts-ignore
-    errorThrower(res) {
-      console.log("res", res);
-    }
-  },
-  // 请求
-  requestInterceptors: [
-    // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
-    [
-      (url, options) => {
-        return {
-          url,
-          options: {
-            ...options,
-            headers: {
-              authorization: "test"
-              // ...(refererSuffix ? { zhst_referer: `${baseUrl}${refererSuffix}` } : {}),
+    // 请求
+    requestInterceptors: [
+      // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
+      [
+        (url, options) => {
+          const Authorization = authorization || localStorage.getItem("ZHST_AUTH_TOKEN") || "";
+          return {
+            url,
+            options: {
+              ...options,
+              headers: {
+                Authorization
+              }
             }
-          }
-        };
-      },
-      (error) => {
-        return Promise.reject(error);
-      }
-    ]
-  ],
-  // 返回
-  responseInterceptors: [
-    // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
-    [
-      (response) => {
-        if (response.status !== 200) {
-          throw Error(JSON.stringify(response.data));
+          };
+        },
+        (error) => {
+          return Promise.reject(error);
         }
-        return response;
-      },
-      (error) => {
-        return Promise.reject(error);
-      }
-    ]
-  ]
+      ]
+    ],
+    // 返回
+    responseInterceptors: [
+      // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
+      [
+        (response) => {
+          if (response.status !== 200) {
+            throw Error(JSON.stringify(response.data));
+          }
+          const { code } = response.data || {};
+          if (showMsg && code !== 200) {
+            import_antd.message.error(response.data.message || "请求失败！");
+            return null;
+          }
+          return response.data;
+        },
+        (error) => {
+          return Promise.reject(error);
+        }
+      ]
+    ],
+    ...config
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  request
+  reqConfig
 });

packages/request/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/request",
-  "version": "0.8.9",
+  "version": "0.9.0",
   "description": "请求库",
   "keywords": [
     "request",
@@ -14,7 +14,7 @@
     "lib/**/style/*",
     "*.less"
   ],
-  "main": "lib/index.ts",
+  "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "exports": {
@@ -37,11 +37,7 @@
     "registry": "http://10.0.0.77:4874"
   },
   "dependencies": {
-    "@zhst/func": "workspace:^",
-    "base-64": "^1.0.0",
-    "umi": "^4.1.2"
+    "@zhst/func": "workspace:^"
   },
-  "devDependencies": {
-    "@types/base-64": "^1.0.2"
-  }
+  "devDependencies": {}
 }

packages/request/src/changelog/index.md

@@ -1,7 +1,4 @@
 ---
-nav:
-  title: 其它
-  order: 999
 title: 请求库
 toc: content
 ---

packages/request/src/index.md

@@ -0,0 +1,10 @@
+---
+nav:
+  title: 其它
+  order: 999
+title: 快速上手
+order: 1
+toc: content
+---
+
+## 请求库

packages/request/src/index.tsx

@@ -1,87 +1,112 @@
-interface RequestConfig {
+import { message } from 'antd'
 
+export interface ReqConfigProps {
+  timeout?: number
+  baseURL?: string
+  errorConfig?: {
+    errorHandler?: (error: any, opts: any) => void
+    errorThrower?: (err: any) => void
+  }
+  authorization?: string
+  showMsg?: boolean
 }
 
-export const request: RequestConfig = {
-  timeout: 1000,
-  // other axios options you want
-  errorConfig: {
-    // @ts-ignore
-    errorHandler(error: any, opts: any) {
-      // if (opts?.skipErrorHandler) throw error
-      // try {
-      //   const { res } = ctx;
-      //   const d = await res.text();
+export const reqConfig = (config: ReqConfigProps) => {
+  const {
+    authorization,
+    showMsg
+  } = config || {}
 
-      //   if (res.status === 401 && store.user.isLogin) {
-      //     store.user.resetLoginState();
-      //     message.warning('登录过期，请重新登录!');
-      //     return;
-      //   }
-      //   const isEmptyRes = d === '' || d.replace(/\s/g,"")=== 'tokenisinvalid'; //有些后端接口成功会返回空 做下兼容
-      //   const body = !isEmptyRes ? JSON.parse(d || '{}') : d;
-      //   const sessionCode = sessionStorage.getItem('zhst_errcode') || '{}'
-      //   const ERROR_CODE = JSON.parse(sessionCode);
+  return {
+    timeout: 1000,
+    baseURL: location.origin,
+    // other axios options you want
+    errorConfig: {
+      // @ts-ignore
+      errorHandler(error: any, opts: any) {
+        console.log('first', error, opts);
+        // if (opts?.skipErrorHandler) throw error
+        // try {
+        //   const { res } = ctx;
+        //   const d = await res.text();
 
-      //   if (Number(res.status) === 200) {
-      //     ctx.res = body;
-      //   } else {
-      //     // 先判断Grpc-Metadata-Errorx-Message
-      //     let errMsg = ERROR_CODE[body.code]?.value || body.message || '您的网络发生异常，无法连接服务器'
-      //     toast && message.error(errMsg || body);
-      //     ctx.res = {
-      //       code: body.code,
-      //       message: errMsg
-      //     };
-      //   }
+        //   if (res.status === 401 && store.user.isLogin) {
+        //     store.user.resetLoginState();
+        //     message.warning('登录过期，请重新登录!');
+        //     return;
+        //   }
+        //   const isEmptyRes = d === '' || d.replace(/\s/g,"")=== 'tokenisinvalid'; //有些后端接口成功会返回空 做下兼容
+        //   const body = !isEmptyRes ? JSON.parse(d || '{}') : d;
+        //   const sessionCode = sessionStorage.getItem('zhst_errcode') || '{}'
+        //   const ERROR_CODE = JSON.parse(sessionCode);
 
-      // } catch (error) {
-      //   if (get(error, 'type') !== 'CustomError') {
-      //     toast && message.error('您的网络发生异常，无法连接服务器');
-      //   }
-      //   throw error;
-      // }
+        //   if (Number(res.status) === 200) {
+        //     ctx.res = body;
+        //   } else {
+        //     // 先判断Grpc-Metadata-Errorx-Message
+        //     let errMsg = ERROR_CODE[body.code]?.value || body.message || '您的网络发生异常，无法连接服务器'
+        //     toast && message.error(errMsg || body);
+        //     ctx.res = {
+        //       code: body.code,
+        //       message: errMsg
+        //     };
+        //   }
+
+        // } catch (error) {
+        //   if (get(error, 'type') !== 'CustomError') {
+        //     toast && message.error('您的网络发生异常，无法连接服务器');
+        //   }
+        //   throw error;
+        // }
+      },
+      // @ts-ignore
+      errorThrower(res) {
+        console.log('res', res);
+      },
     },
-    // @ts-ignore
-    errorThrower(res) {
-      console.log('res', res);
-    },
-  },
-  // 请求
-  requestInterceptors: [
-    // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
-    [
-      (url: any, options: any) => {
-        // console.log('options', options);
-        return {
-          url,
-          options: {
-            ...options,
-            headers: {
-              authorization: 'test',
-              // ...(refererSuffix ? { zhst_referer: `${baseUrl}${refererSuffix}` } : {}),
+    // 请求
+    requestInterceptors: [
+      // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
+      [
+        (url: any, options: any) => {
+          const Authorization = authorization || localStorage.getItem('ZHST_AUTH_TOKEN') || ''
+
+          return {
+            url,
+            options: {
+              ...options,
+              headers: {
+                Authorization,
+              },
             },
-          },
-        };
-      },
-      (error: any) => {
-        return Promise.reject(error);
-      },
+          };
+        },
+        (error: any) => {
+          return Promise.reject(error);
+        },
+      ],
     ],
-  ],
-  // 返回
-  responseInterceptors: [
-    // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
-    [
-      (response: { status: number; data: any; }) => {
-        if (response.status !== 200) {
-          throw Error(JSON.stringify(response.data));
-        }
-        return response;
-      },
-      (error: any) => {
-        return Promise.reject(error);
-      },
+    // 返回
+    responseInterceptors: [
+      // 一个二元组，第一个元素是 request 拦截器，第二个元素是错误处理
+      [
+        (response: { status: number; data: any; }) => {
+          if (response.status !== 200) {
+            throw Error(JSON.stringify(response.data));
+          }
+          const { code } = response.data || {}
+
+          if (showMsg && code !== 200) {
+            message.error(response.data.message || '请求失败！')
+            return null
+          }
+          return response.data;
+        },
+        (error: any) => {
+          return Promise.reject(error);
+        },
+      ],
     ],
-  ],
-};
+    ...config
+  };
+}

packages/slave/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @zhst/slave
 
+## 0.5.0
+
+### Minor Changes
+
+- slave 添加一些和 token 相关的方法
+
+## 0.4.1
+
+### Patch Changes
+
+- @zhst/func@0.9.1
+
 ## 0.4.0
 
 ### Minor Changes

packages/slave/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/slave",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "微前端子应用方法库",
   "keywords": [
     "slave",

packages/slave/src/demo/init.tsx

@@ -9,6 +9,12 @@ export default () => {
   }
 
   return (
-    <button onClick={handleInit} >测试</button>
+    <div>
+      <button onClick={handleInit} >初始化</button>
+      <button onClick={() => slave.logOut()}>退出登录</button>
+      <button onClick={() => slave.getToken()}>获取token</button>
+      <button onClick={() => slave.setToken('ppt')}>设置token</button>
+      <button onClick={() => slave.removeToken()}>移除token</button>
+    </div>
   )
 }

packages/slave/src/index.md

@@ -30,3 +30,6 @@ title: 快速上手
 | --- | --- | --- | --- | --- |
 | init | 初始化实例 | function | (data: SlaveProps) => void | - |
 | logOut | 退出登录 | function | () => void | - |
+| getToken | 获取token | function | () => void | - |
+| setToken | 设置token | function | (token: string) => void | - |
+| removeToken | 移除token | function | () => void | - |

packages/slave/src/index.tsx

@@ -87,7 +87,7 @@ class Slave {
   }
 
   // 检查是否为url，并且跑出错误
-  checkUrl(url: string, label: string) {
+  public checkUrl(url: string, label: string) {
     if (!isUrl(url)) {
       throw Error(`请输入正确的 ${label} 链接地址，以http(s)://开头！'`)
     }