@ibiz-template/core 0.0.1-alpha.6 → 0.0.1-beta.1

package/out/utils/net/net.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { merge } from 'lodash-es';
 import { stringify } from 'qs';
 import { notNilEmpty } from 'qx-util';
 import { HttpError } from '../../error';
@@ -13,45 +14,99 @@ import { HttpError } from '../../error';
 export class Net {
     /**
      * Creates an instance of Net.
-     *
-     * @author chitanda
-     * @date 2022-07-21 10:07:27
-     * @param {string} [prefix] 请求前缀
+     * @author lxm
+     * @date 2022-10-27 16:10:05
+     * @param {CreateAxiosDefaults} [config] 创建实例用的默认配置
      */
-    constructor(prefix) {
+    constructor(config) {
         /**
-         * 标准请求前缀
+         * 注册的拦截器
          *
-         * @author chitanda
-         * @date 2022-07-21 10:07:48
-         * @protected
-         * @type {string}
+         * @author lxm
+         * @date 2022-10-27 17:10:18
+         * @type {Map<string, Interceptor>}
          */
-        this._prefix = '';
-        if (prefix) {
-            this._prefix = prefix;
+        this.interceptors = new Map();
+        this.instance = axios.create(config);
+    }
+    /**
+     * 添加拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:42
+     * @param {string} name 唯一标识
+     * @param {Interceptor} interceptor 拦截器
+     */
+    addInterceptor(name, interceptor) {
+        interceptor.use(this.instance);
+        this.interceptors.set(name, interceptor);
+    }
+    /**
+     * 删除拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:27
+     * @param {string} name 唯一标识
+     */
+    removeInterceptor(name) {
+        const interceptor = this.interceptors.get(name);
+        if (interceptor) {
+            interceptor.eject(this.instance);
+            this.interceptors.delete(name);
         }
     }
-    get prefix() {
-        return this._prefix || ibiz.env.baseUrl;
+    /**
+     * 预置config,绑定动态的配置
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:48
+     * @readonly
+     * @protected
+     * @type {AxiosRequestConfig}
+     */
+    get presetConfig() {
+        return {
+            // 请求前缀路径
+            baseURL: this.instance.defaults.baseURL || ibiz.env.baseUrl,
+            headers: {
+                'Content-Type': 'application/json;charset=UTF-8',
+                Accept: 'application/json',
+            },
+        };
+    }
+    /**
+     * 从左到右递归合并配置参数（内置第一个合并的预置参数）
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:09
+     * @protected
+     * @param {...AxiosRequestConfig[]} configs
+     * @returns {*}
+     */
+    mergeConfig(...configs) {
+        if (configs.length === 0) {
+            return this.presetConfig;
+        }
+        return merge(this.presetConfig, ...configs);
     }
     /**
      * Post 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:01
+     * @date 2022-10-19 11:10:30
      * @param {string} url
+     * @param {IData} data
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async post(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
         try {
-            const response = await axios({
+            const response = await this.request(url, {
                 method: 'post',
-                url,
                 data,
-                headers: Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', Accept: 'application/json' }, headers),
+                headers,
             });
             return this.doResponseResult(response);
         }
@@ -63,9 +118,11 @@ export class Net {
      * Get 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:08
+     * @date 2022-10-19 11:10:24
      * @param {string} url
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
+     * @param {IParams} [option={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async get(url, params = {}, headers = {}, option = {}) {
@@ -75,7 +132,7 @@ export class Net {
         // }
         url = this.attachUrlParam(url, params);
         try {
-            const response = await axios.get(url, Object.assign({ headers }, option));
+            const response = await this.request(url, merge({ method: 'get', headers }, option));
             return this.doResponseResult(response);
         }
         catch (error) {
@@ -86,15 +143,16 @@ export class Net {
      * Delete 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:43
+     * @date 2022-10-19 11:10:17
      * @param {string} url
      * @param {IParams} [params]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async delete(url, params, headers = {}) {
         url = this.handleAppPresetParam(url, params);
         try {
-            const response = await axios.delete(url, { headers });
+            const response = await this.request(url, { method: 'delete', headers });
             return this.doResponseResult(response);
         }
         catch (error) {
@@ -105,15 +163,21 @@ export class Net {
      * Put 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:49
+     * @date 2022-10-19 11:10:11
      * @param {string} url
      * @param {IData} data
+     * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async put(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
         try {
-            const response = await axios.put(url, data, { headers });
+            const response = await this.request(url, {
+                method: 'put',
+                data,
+                headers,
+            });
             return this.doResponseResult(response);
         }
         catch (error) {
@@ -126,12 +190,12 @@ export class Net {
      * @author chitanda
      * @date 2022-07-14 15:07:15
      * @param {string} url
-     * @param {AxiosRequestHeaders} [headers={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async getModel(url, headers = {}) {
         try {
-            const response = await axios.get(url, {
+            const response = await this.instance.get(url, {
                 headers,
             });
             return this.doResponseResult(response);
@@ -140,6 +204,24 @@ export class Net {
             throw new HttpError(error);
         }
     }
+    /**
+     * 基础请求方法，会合并预置配置
+     *
+     * @author lxm
+     * @date 2022-10-27 14:10:06
+     * @param {string} url
+     * @param {AxiosRequestConfig} [config={}]
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async request(url, config = {}) {
+        try {
+            const response = await this.instance.request(this.mergeConfig({ url }, config));
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
+    }
     /**
      * 统一处理请求返回
      *
@@ -190,7 +272,6 @@ export class Net {
      * @return {*}  {string}
      */
     attachUrlParam(url, params) {
-        url = this.attachUrl(url);
         const strParams = stringify(params);
         if (notNilEmpty(strParams)) {
             if (url.endsWith('?')) {
@@ -208,16 +289,4 @@ export class Net {
         }
         return url;
     }
-    /**
-     * 处理 url 参数
-     *
-     * @author chitanda
-     * @date 2022-07-20 20:07:17
-     * @private
-     * @param {string} url
-     * @return {*}  {string}
-     */
-    attachUrl(url) {
-        return `${this.prefix}${url}`;
-    }
 }

package/out/utils/url-helper/url-helper.d.ts

@@ -0,0 +1,51 @@
+/**
+ * 路径解析助手
+ *
+ * @author lxm
+ * @date 2022-10-11 14:10:12
+ * @export
+ * @class UrlHelper
+ */
+export declare class UrlHelper {
+    /**
+     * 路由路径前面的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp/#
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get routeBase(): string;
+    /**
+     * 应用的的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get appBase(): string;
+    /**
+     * #开始到末尾，即路由地址
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 16:10:40
+     * @returns {*}
+     */
+    static get routePath(): string;
+    /**
+     * 当前地址的全路径，包含域名和参数
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 21:10:39
+     * @readonly
+     * @static
+     */
+    static get fullPath(): string;
+}
+//# sourceMappingURL=url-helper.d.ts.map

package/out/utils/url-helper/url-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/url-helper/url-helper.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB;;;;;;;;OAQG;IACH,MAAM,KAAK,SAAS,WAEnB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,OAAO,WAGjB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,SAAS,WAEnB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,QAAQ,WAElB;CACF"}

package/out/utils/url-helper/url-helper.js

@@ -0,0 +1,59 @@
+/**
+ * 路径解析助手
+ *
+ * @author lxm
+ * @date 2022-10-11 14:10:12
+ * @export
+ * @class UrlHelper
+ */
+export class UrlHelper {
+    /**
+     * 路由路径前面的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp/#
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get routeBase() {
+        return `${this.appBase}/#`;
+    }
+    /**
+     * 应用的的基础路径
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：http://172.16.103.120:30061/portalwebapp
+     *
+     * @author lxm
+     * @date 2022-10-11 20:10:29
+     * @returns {*}
+     */
+    static get appBase() {
+        const { origin, pathname } = window.location;
+        return `${origin}${pathname}`.replace(/\/$/, '');
+    }
+    /**
+     * #开始到末尾，即路由地址
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     * 返回：/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 16:10:40
+     * @returns {*}
+     */
+    static get routePath() {
+        return window.location.hash.replace('#', '');
+    }
+    /**
+     * 当前地址的全路径，包含域名和参数
+     * 如：http://172.16.103.120:30061/portalwebapp/#/index/appportalview?params=123
+     *
+     * @author lxm
+     * @date 2022-10-11 21:10:39
+     * @readonly
+     * @static
+     */
+    static get fullPath() {
+        return window.location.href;
+    }
+}

package/out/utils/util/util.d.ts

@@ -1,4 +1,3 @@
-import { DebounceSettings } from 'lodash-es';
 /**
  * 获取认证令牌
  *
@@ -20,7 +19,8 @@ export declare function getToken(): string | null;
  */
 export declare function isOverlap(arr1: any[], arr2: any[]): boolean;
 /**
- * 防抖并合并每次的参数
+ * 防抖并合并每次的参数，
+ * 最后一次才会执行
  *
  * @author lxm
  * @date 2022-09-20 21:09:53
@@ -32,8 +32,24 @@ export declare function isOverlap(arr1: any[], arr2: any[]): boolean;
  *     newParams: Parameters<T>,
  *   ) => Parameters<T>} mergeFunc 合并的回调函数
  * @param {number} [wait] 防抖的延迟毫秒数
- * @param {DebounceSettings} [options] 防抖函数的额外参数
  * @returns {*}
  */
-export declare function debounceAndMerge<T extends (...args: any[]) => any>(func: T, mergeFunc: (oldParams: Parameters<T>, newParams: Parameters<T>) => Parameters<T>, wait?: number, options?: DebounceSettings): (...args: Parameters<T>) => any;
+export declare function debounceAndMerge<T extends (...args: any[]) => any>(func: T, mergeFunc: (oldParams: Parameters<T>, newParams: Parameters<T>) => Parameters<T>, wait?: number): (...args: Parameters<T>) => any;
+/**
+ * 防抖并合并每次的参数，最后一次才会执行
+ * 绑定方法为异步方法，给每次调用返回最终执行那次的结果
+ *
+ * @author lxm
+ * @date 2022-09-20 21:09:53
+ * @export
+ * @template T
+ * @param {T} func 要防抖的函数
+ * @param {(
+ *     oldParams: Parameters<T>,
+ *     newParams: Parameters<T>,
+ *   ) => Parameters<T>} mergeFunc 合并的回调函数
+ * @param {number} [wait] 防抖的延迟毫秒数
+ * @returns {*}
+ */
+export declare function debounceAndAsyncMerge<T extends (...args: any[]) => Promise<any>>(func: T, mergeFunc: (oldParams: Parameters<T>, newParams: Parameters<T>) => Parameters<T>, wait?: number): T;
 //# sourceMappingURL=util.d.ts.map

package/out/utils/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/utils/util/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIvD;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,MAAM,GAAG,IAAI,CAExC;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAG3D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAChE,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,CACT,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EACxB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KACrB,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,gBAAgB,aAaT,WAAW,CAAC,CAAC,SAS/B"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/utils/util/util.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,MAAM,GAAG,IAAI,CAExC;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAG3D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAChE,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,CACT,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EACxB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KACrB,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,EAAE,MAAM,aASI,WAAW,CAAC,CAAC,SAS/B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CACnC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EAE1C,IAAI,EAAE,CAAC,EACP,SAAS,EAAE,CACT,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,EACxB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KACrB,UAAU,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,EAAE,MAAM,GACZ,CAAC,CAoCH"}

package/out/utils/util/util.js

@@ -25,10 +25,11 @@ export function getToken() {
  */
 export function isOverlap(arr1, arr2) {
     const newArr = Array.from(new Set([...arr1, ...arr2]));
-    return newArr.length === arr1.length + arr2.length;
+    return newArr.length !== arr1.length + arr2.length;
 }
 /**
- * 防抖并合并每次的参数
+ * 防抖并合并每次的参数，
+ * 最后一次才会执行
  *
  * @author lxm
  * @date 2022-09-20 21:09:53
@@ -40,17 +41,16 @@ export function isOverlap(arr1, arr2) {
  *     newParams: Parameters<T>,
  *   ) => Parameters<T>} mergeFunc 合并的回调函数
  * @param {number} [wait] 防抖的延迟毫秒数
- * @param {DebounceSettings} [options] 防抖函数的额外参数
  * @returns {*}
  */
-export function debounceAndMerge(func, mergeFunc, wait, options) {
+export function debounceAndMerge(func, mergeFunc, wait) {
     // 缓存上一次的函数参数
     let oldParams;
     const debounceFunc = debounce((...params) => {
         // 防抖函数执行的时候清空缓存参数
         oldParams = undefined;
         return func(...params);
-    }, wait, options);
+    }, wait);
     return (...args) => {
         // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
         let newParams = args;
@@ -61,3 +61,57 @@ export function debounceAndMerge(func, mergeFunc, wait, options) {
         return debounceFunc(...newParams);
     };
 }
+/**
+ * 防抖并合并每次的参数，最后一次才会执行
+ * 绑定方法为异步方法，给每次调用返回最终执行那次的结果
+ *
+ * @author lxm
+ * @date 2022-09-20 21:09:53
+ * @export
+ * @template T
+ * @param {T} func 要防抖的函数
+ * @param {(
+ *     oldParams: Parameters<T>,
+ *     newParams: Parameters<T>,
+ *   ) => Parameters<T>} mergeFunc 合并的回调函数
+ * @param {number} [wait] 防抖的延迟毫秒数
+ * @returns {*}
+ */
+export function debounceAndAsyncMerge(func, mergeFunc, wait) {
+    // 缓存上一次的函数参数
+    let oldParams;
+    let promises = [];
+    const debounceFunc = debounce(async (...params) => {
+        // 防抖函数执行的时候清空缓存参数
+        oldParams = undefined;
+        try {
+            const result = await func(...params);
+            promises.forEach(promise => {
+                promise.resolve(result);
+            });
+            promises = [];
+            return result;
+        }
+        catch (error) {
+            promises.forEach(promise => {
+                promise.reject(error);
+            });
+            promises = [];
+        }
+    }, wait);
+    const fun = async (...args) => {
+        // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
+        let newParams = args;
+        if (oldParams) {
+            newParams = mergeFunc(oldParams, newParams);
+        }
+        oldParams = newParams;
+        // 执行防抖函数
+        debounceFunc(...newParams);
+        return new Promise((resolve, reject) => {
+            // 阻塞当前调用，当防抖函数被执行后返回
+            promises.push({ resolve, reject });
+        });
+    };
+    return fun;
+}

package/package.json

@@ -1,27 +1,37 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-beta.1",
   "description": "核心包",
+  "type": "module",
   "main": "out/index.js",
   "types": "out/index.d.ts",
+  "system": "./dist/system/index.system.js",
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
+  },
   "files": [
+    "dist",
     "out",
     "src"
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run lint && npm run clean && tsc --build",
+    "build": "npm run lint && npm run clean && npm run build:rollup && tsc --build",
+    "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "clean": "rimraf out",
+    "clean": "rimraf out dist",
     "test": "jest",
-    "publish:next": "npm run build && npm publish --access public --tag next",
-    "publish:npm": "npm run build && npm publish --access public"
+    "prepublish": "npm run build",
+    "publish:next": "npm publish --access public --tag next",
+    "publish:npm": "npm publish --access public"
   },
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
+    "loglevel": "^1.8.0",
     "pluralize": "^8.0.0",
     "qs": "^6.11.0"
   },
@@ -29,11 +39,11 @@
     "@types/pluralize": "^0.0.29",
     "@types/qs": "^6.9.7",
     "lodash-es": "^4.17.21",
-    "qx-util": "^0.4.1"
+    "qx-util": "^0.4.4"
   },
   "peerDependencies": {
     "lodash-es": "^4.17.21",
-    "qx-util": "^0.4.1"
+    "qx-util": "^0.4.4"
   },
-  "gitHead": "0af61790674d0f38ffcf2697fc8b2d2324507ce7"
+  "gitHead": "9514cbc720208af6160c67bc43e822262274da1f"
 }

package/src/constant/index.ts

@@ -1,2 +1,5 @@
 export { CoreConst } from './core/core';
+export * from './util/util';
 export { HttpStatusMessageConst } from './http-status-message/http-status-message';
+export { LoginMode } from './login-mode/login-mode';
+export { MenuPermissionMode } from './menu-permission-mode/menu-permission-mode';

package/src/constant/login-mode/login-mode.ts

@@ -0,0 +1,23 @@
+/* eslint-disable no-shadow */
+/**
+ * 登录模式
+ *
+ * @author lxm
+ * @date 2022-10-12 14:10:56
+ * @export
+ * @enum {number}
+ */
+export enum LoginMode {
+  /**
+   * 默认标准登录
+   */
+  DEFAULT = 'DEFAULT',
+  /**
+   * 自定义登录
+   */
+  CUSTOM = 'CUSTOM',
+  /**
+   * 中央认证登录
+   */
+  CAS = 'CAS',
+}

package/src/constant/menu-permission-mode/menu-permission-mode.ts

@@ -0,0 +1,23 @@
+/* eslint-disable no-shadow */
+/**
+ * 菜单权限校验模式
+ *
+ * @author lxm
+ * @date 2022-10-12 14:10:56
+ * @export
+ * @enum {number}
+ */
+export enum MenuPermissionMode {
+  /**
+   * 混合模式（默认）
+   */
+  MIXIN = 'MIXIN',
+  /**
+   * 统一资源模式
+   */
+  RESOURCE = 'RESOURCE',
+  /**
+   * RT模式
+   */
+  RT = 'RT',
+}

package/src/constant/util/util.ts

@@ -0,0 +1,5 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+/**
+ * 无操作函数
+ */
+export const NOOP = () => {};