@ibiz-template/core 0.0.4-beta.5 → 0.1.1

package/out/utils/net/net.js

@@ -28,6 +28,16 @@ export class Net {
          * @protected
          */
         this.urlReg = /^http[s]?:\/\/[^\s]*/;
+        /**
+         * 请求等待队列，防止重复请求。当有完全相同请求参数的请求时，会等待上一个请求完成后把结果返回给当前请求，不会重复请求
+         * key: 由请求的 config 生成的字符串,用于唯一标识请求
+         * value: 当前正在请求的 Promise
+         *
+         * @author chitanda
+         * @date 2023-06-07 14:06:19
+         * @protected
+         */
+        this.waitRequest = new Map();
         /**
          * 注册的拦截器
          *
@@ -142,10 +152,6 @@ export class Net {
      * @return {*}  {Promise<IHttpResponse>}
      */
     async get(url, params = {}, headers = {}, option = {}) {
-        // if (params.srfparentdata) {
-        //   Object.assign(params, params.srfparentdata);
-        //   delete params.srfparentdata;
-        // }
         url = this.attachUrlParam(url, params);
         try {
             const response = await this.request(url, merge({ method: 'get', headers }, option));
@@ -230,11 +236,31 @@ export class Net {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async request(url, config = {}) {
+        // axios 请求参数配置
+        const cfg = this.mergeConfig({ url }, config);
+        // 当前请求的唯一标识
+        const key = JSON.stringify(cfg);
         try {
-            const response = await this.instance.request(this.mergeConfig({ url }, config));
+            let requestPromise = null;
+            if (!this.waitRequest.has(key)) {
+                requestPromise = this.instance.request(cfg);
+                this.waitRequest.set(key, requestPromise);
+            }
+            else {
+                requestPromise = this.waitRequest.get(key);
+            }
+            const response = await requestPromise;
+            // 当第一个请求完成后就删除等待队列中的请求
+            if (this.waitRequest.has(key)) {
+                this.waitRequest.delete(key);
+            }
             return this.doResponseResult(response);
         }
         catch (error) {
+            // 请求异常删除等待队列中的请求体
+            if (this.waitRequest.has(key)) {
+                this.waitRequest.delete(key);
+            }
             throw new HttpError(error);
         }
     }

package/out/utils/recursive/find-recursive-child.d.ts

@@ -0,0 +1,43 @@
+/** 默认配置参数 */
+declare const IterateOpts: {
+    /** 子集合属性数组 */
+    childrenFields: string[];
+};
+/**
+ * 递归遍历子元素
+ * @author lxm
+ * @date 2023-04-23 09:07:06
+ * @export
+ * @param {IData} parent 父元素
+ * @param {(item: any) => boolean} callback 每一个子元素的回调
+ * @param {Partial<typeof IterateOpts>} [opts]
+ */
+export declare function recursiveIterate(parent: IData, callback: (item: any) => boolean | void, opts?: Partial<typeof IterateOpts>): void;
+/** 默认配置参数 */
+declare const CompareOpts: {
+    /** 比较的属性 */
+    compareField: string;
+    /** 子集合属性数组 */
+    childrenFields: string[];
+};
+type ICompareOpts = Partial<typeof CompareOpts> & {
+    /**
+     * 自定义比较回调
+     * @author lxm
+     * @date 2023-04-23 09:06:42
+     */
+    compareCallback?: (child: IData, key: string, compareField: string) => boolean;
+};
+/**
+ * 递归查找子元素
+ * @author lxm
+ * @date 2023-04-20 08:53:35
+ * @export
+ * @param {IData} parent 父对象
+ * @param {string} key 子元素的比较属性的值
+ * @param {ICompareOpts} [opts]
+ * @return {*}  {(IData | undefined)}
+ */
+export declare function findRecursiveChild(parent: IData, key: string, opts?: ICompareOpts): IData | undefined;
+export {};
+//# sourceMappingURL=find-recursive-child.d.ts.map

package/out/utils/recursive/find-recursive-child.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-recursive-child.d.ts","sourceRoot":"","sources":["../../../src/utils/recursive/find-recursive-child.ts"],"names":[],"mappings":"AAGA,aAAa;AACb,QAAA,MAAM,WAAW;IACf,cAAc;;CAEf,CAAC;AA0CF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,GAAG,IAAI,EACvC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,GACjC,IAAI,CAQN;AAED,aAAa;AACb,QAAA,MAAM,WAAW;IAEf,YAAY;;IAtEZ,cAAc;;CAwEf,CAAC;AAEF,KAAK,YAAY,GAAG,OAAO,CAAC,OAAO,WAAW,CAAC,GAAG;IAChD;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,KACjB,OAAO,CAAC;CACd,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,KAAK,EACb,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,YAAY,GAClB,KAAK,GAAG,SAAS,CA0BnB"}

package/out/utils/recursive/find-recursive-child.js

@@ -0,0 +1,90 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { mergeDeepRight } from 'ramda';
+/** 默认配置参数 */
+const IterateOpts = {
+    /** 子集合属性数组 */
+    childrenFields: ['children'],
+};
+const BreakError = new Error('中断操作');
+/**
+ * 获取子属性集合
+ * @author lxm
+ * @date 2023-04-20 08:54:32
+ * @param {IData} parent
+ * @param {string[]} fields 子集合可能的属性名称
+ * @return {*}  {(IData[] | undefined)}
+ */
+function getChildField(parent, fields) {
+    var _a;
+    for (const field of fields) {
+        if ((_a = parent[field]) === null || _a === void 0 ? void 0 : _a.length) {
+            return parent[field];
+        }
+    }
+}
+function _recursiveIterate(parent, callback, opts) {
+    const { childrenFields } = mergeDeepRight(IterateOpts, opts || {});
+    const children = getChildField(parent, childrenFields);
+    if (children === null || children === void 0 ? void 0 : children.length) {
+        for (const child of children) {
+            // 递归自身的子成员
+            const isBreak = callback(child);
+            // 如果回调返回true则退出
+            if (isBreak) {
+                throw BreakError;
+            }
+            // 递归孙的成员
+            recursiveIterate(child, callback, opts);
+        }
+    }
+}
+/**
+ * 递归遍历子元素
+ * @author lxm
+ * @date 2023-04-23 09:07:06
+ * @export
+ * @param {IData} parent 父元素
+ * @param {(item: any) => boolean} callback 每一个子元素的回调
+ * @param {Partial<typeof IterateOpts>} [opts]
+ */
+export function recursiveIterate(parent, callback, opts) {
+    try {
+        _recursiveIterate(parent, callback, opts);
+    }
+    catch (error) {
+        if (error !== BreakError) {
+            throw error;
+        }
+    }
+}
+/** 默认配置参数 */
+const CompareOpts = Object.assign(Object.assign({}, IterateOpts), { 
+    /** 比较的属性 */
+    compareField: 'name' });
+/**
+ * 递归查找子元素
+ * @author lxm
+ * @date 2023-04-20 08:53:35
+ * @export
+ * @param {IData} parent 父对象
+ * @param {string} key 子元素的比较属性的值
+ * @param {ICompareOpts} [opts]
+ * @return {*}  {(IData | undefined)}
+ */
+export function findRecursiveChild(parent, key, opts) {
+    const { compareField, compareCallback } = mergeDeepRight(CompareOpts, opts || {});
+    // 默认比较方法
+    const _compareCallback = compareCallback ||
+        ((child) => {
+            return child[compareField] === key;
+        });
+    // 递归遍历，找到后中断遍历，返回找到项
+    let find;
+    recursiveIterate(parent, item => {
+        if (_compareCallback(item, key, compareField)) {
+            find = item;
+            return true;
+        }
+    }, opts);
+    return find;
+}

package/out/utils/string-util/string-util.js

@@ -7,7 +7,7 @@ import { notNilEmpty } from 'qx-util';
  * @export
  * @class StringUtil
  */
-class StringUtil {
+export class StringUtil {
     /**
      * 填充字符串中的数据
      *
@@ -55,4 +55,3 @@ StringUtil.contextReg = /\$\{context.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;
  * @static
  */
 StringUtil.dataReg = /\$\{data.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;
-export { StringUtil };

package/out/utils/style/remote-style.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-style.d.ts","sourceRoot":"","sources":["../../../src/utils/style/remote-style.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/D"}
+{"version":3,"file":"remote-style.d.ts","sourceRoot":"","sources":["../../../src/utils/style/remote-style.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/D"}

package/out/utils/style/remote-style.js

@@ -1,4 +1,3 @@
-import { Logger } from '../logger/logger';
 /**
  * 设置远程样式表
  *
@@ -17,6 +16,6 @@ export async function setRemoteStyle(url) {
         document.head.appendChild(styleDom);
     }
     catch (error) {
-        Logger.debug('加载远程样式表失败', url);
+        ibiz.log.debug('加载远程样式表失败', url);
     }
 }

package/out/utils/sync/count-latch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count-latch.d.ts","sourceRoot":"","sources":["../../../src/utils/sync/count-latch.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA8B;IAE7C,OAAO,CAAC,OAAO,CAAwC;IAEvD;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAMpB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAQlB;;;;;;OAMG;IACH,IAAI;IAOJ;;;;;;OAMG;IACH,MAAM;IAUN;;;;;OAKG;IACG,KAAK;CAKZ"}
+{"version":3,"file":"count-latch.d.ts","sourceRoot":"","sources":["../../../src/utils/sync/count-latch.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA8B;IAE7C,OAAO,CAAC,OAAO,CAAwC;IAEvD;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAMpB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAQlB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI;IAOZ;;;;;;OAMG;IACH,MAAM,IAAI,IAAI;IAUd;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}

package/out/utils/upload/select-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-file.d.ts","sourceRoot":"","sources":["../../../src/utils/upload/select-file.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,EAAE,CAMxD;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,UAAU,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,QAwB/C"}
+{"version":3,"file":"select-file.d.ts","sourceRoot":"","sources":["../../../src/utils/upload/select-file.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,EAAE,CAMxD;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,UAAU,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAwBtD"}

package/out/utils/upload/select-file.js

@@ -32,7 +32,7 @@ export function selectFile(_opts) {
     input.setAttribute('type', 'file');
     input.setAttribute('multiple', `${opts.multiple}`);
     input.setAttribute('accept', opts.accept);
-    input.onchange = e => {
+    input.onchange = (e) => {
         const inputEl = e.target;
         const files = inputEl.files ? fileListToArr(inputEl.files) : [];
         if (files.length === 0) {

package/out/utils/upload/upload-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload-file.d.ts","sourceRoot":"","sources":["../../../src/utils/upload/upload-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IACpD,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,OAAO,CAAC;IACrE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACpE,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,QA2JhD"}
+{"version":3,"file":"upload-file.d.ts","sourceRoot":"","sources":["../../../src/utils/upload/upload-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IACpD,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,OAAO,CAAC;IACrE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACpE,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CA2JvD"}

package/out/utils/upload/upload-file.js

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 /* eslint-disable no-param-reassign */
 import { cloneDeep, isFunction, merge, round, uniqueId } from 'lodash-es';
+import { RuntimeError } from '../../error';
 import { selectFile } from './select-file';
 /**
  * 使用上传文件逻辑
@@ -62,7 +63,7 @@ export function uploadFile(_opts) {
         //   onUploadProgress: onProgress,
         // });
         // return res;
-        throw new Error(`多应用模式等待重新实现请求`);
+        throw new RuntimeError(`多应用模式等待重新实现请求`);
     };
     /**
      * 执行一次上传，可能是一个文件也可能是多个文件

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

@@ -1 +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,WAGnB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,OAAO,WAGjB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,SAAS,WAEnB;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,QAAQ,WAElB;CACF"}
+{"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,IAAI,MAAM,CAG7B;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,OAAO,IAAI,MAAM,CAG3B;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED;;;;;;;;OAQG;IACH,MAAM,KAAK,QAAQ,IAAI,MAAM,CAE5B;CACF"}

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

@@ -18,6 +18,17 @@ export declare function getToken(): string | null;
  * @returns {*}  {boolean}
  */
 export declare function isOverlap(arr1: any[], arr2: any[]): boolean;
+/**
+ * 是否元素相同
+ * @author lxm
+ * @date 2023-05-22 12:50:53
+ * @export
+ * @param {any[]} arr1
+ * @param {any[]} arr2
+ * @param {string} [field] 比较元素里的某个固定属性
+ * @return {*}  {boolean}
+ */
+export declare function isElementSame(arr1: any[], arr2: any[], field?: string): boolean;
 /**
  * 防抖并合并每次的参数，
  * 最后一次才会执行
@@ -52,4 +63,51 @@ export declare function debounceAndMerge<T extends (...args: any[]) => any>(func
  * @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;
+/**
+ * 把右侧的对象里非空的属性合并到左侧对象里
+ * @author lxm
+ * @date 2023-05-16 02:23:39
+ * @param {IData} l
+ * @param {IData} r
+ */
+export declare function mergeInLeft(l: IData, r: IData): void;
+/**
+ * 把右侧的对象里非空的属性合并到左侧对象属性为空里
+ *
+ * @author zk
+ * @date 2023-06-01 02:06:36
+ * @export
+ * @param {IData} l
+ * @param {IData} r
+ */
+export declare function mergeDefaultInLeft(l: IData, r: IData): void;
+/**
+ * 比较两个数组集合，找出相同和不同的元素
+ * @author lxm
+ * @date 2023-05-29 12:33:55
+ * @export
+ * @param {IData[]} arr1 数组一
+ * @param {IData[]} arr2 数组二
+ * @param {string} [keyField] 主键属性，有主键比较主键
+ * @return {*}  {{
+ *   more: IData[]; arr1多的元素
+ *   less: IData[]; arr1少的元素
+ *   same: IData[]; 相同的元素
+ * }}
+ */
+export declare function compareArr(arr1: IData[], arr2: IData[], keyField?: string): {
+    more: IData[];
+    less: IData[];
+    same: IData[];
+};
+/**
+ * 转换为数字或undefined
+ * - 如果是undefined或null 返回undefined
+ * - 其他情况转成数字，能转成数字的返回数字，NaN的返回undefined
+ * @author lxm
+ * @date 2023-06-08 06:30:57
+ * @param {unknown} value 值
+ * @return {*}  {(number | undefined)}
+ */
+export declare function toNumberOrNil(value: unknown): number | undefined;
 //# 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":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/utils/util/util.ts"],"names":[],"mappings":"AAMA;;;;;;;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;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,EAAE,GAAG,EAAE,EACX,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAUT;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,GACZ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG,CAiBjC;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;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,IAAI,CAMpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,IAAI,CAM3D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,KAAK,EAAE,EACb,IAAI,EAAE,KAAK,EAAE,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB;IACD,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,IAAI,EAAE,KAAK,EAAE,CAAC;CACf,CAuCA;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAShE"}

package/out/utils/util/util.js

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { debounce } from 'lodash-es';
 import { getCookie } from 'qx-util';
+import { isNotNil, isNil } from 'ramda';
 import { CoreConst } from '../../constant';
 /**
  * 获取认证令牌
@@ -27,6 +28,26 @@ export function isOverlap(arr1, arr2) {
     const newArr = Array.from(new Set([...arr1, ...arr2]));
     return newArr.length !== arr1.length + arr2.length;
 }
+/**
+ * 是否元素相同
+ * @author lxm
+ * @date 2023-05-22 12:50:53
+ * @export
+ * @param {any[]} arr1
+ * @param {any[]} arr2
+ * @param {string} [field] 比较元素里的某个固定属性
+ * @return {*}  {boolean}
+ */
+export function isElementSame(arr1, arr2, field) {
+    if (arr1.length !== arr2.length) {
+        return false;
+    }
+    const allElements = field
+        ? [...arr1.map(item => item[field]), ...arr2.map(item => item[field])]
+        : [...arr1, ...arr2];
+    const newArr = Array.from(new Set(allElements));
+    return newArr.length === arr1.length;
+}
 /**
  * 防抖并合并每次的参数，
  * 最后一次才会执行
@@ -115,3 +136,105 @@ export function debounceAndAsyncMerge(func, mergeFunc, wait) {
     };
     return fun;
 }
+/**
+ * 把右侧的对象里非空的属性合并到左侧对象里
+ * @author lxm
+ * @date 2023-05-16 02:23:39
+ * @param {IData} l
+ * @param {IData} r
+ */
+export function mergeInLeft(l, r) {
+    Object.keys(r).forEach(key => {
+        if (isNotNil(r[key])) {
+            l[key] = r[key];
+        }
+    });
+}
+/**
+ * 把右侧的对象里非空的属性合并到左侧对象属性为空里
+ *
+ * @author zk
+ * @date 2023-06-01 02:06:36
+ * @export
+ * @param {IData} l
+ * @param {IData} r
+ */
+export function mergeDefaultInLeft(l, r) {
+    Object.keys(r).forEach(key => {
+        if (isNotNil(r[key]) && isNil(l[key])) {
+            l[key] = r[key];
+        }
+    });
+}
+/**
+ * 比较两个数组集合，找出相同和不同的元素
+ * @author lxm
+ * @date 2023-05-29 12:33:55
+ * @export
+ * @param {IData[]} arr1 数组一
+ * @param {IData[]} arr2 数组二
+ * @param {string} [keyField] 主键属性，有主键比较主键
+ * @return {*}  {{
+ *   more: IData[]; arr1多的元素
+ *   less: IData[]; arr1少的元素
+ *   same: IData[]; 相同的元素
+ * }}
+ */
+export function compareArr(arr1, arr2, keyField) {
+    const all = new Set([...arr1, ...arr2]);
+    const more = [];
+    const less = [];
+    const same = [];
+    if (keyField) {
+        const arr1Keys = arr1.map(item => item[keyField]);
+        const arr2Keys = arr2.map(item => item[keyField]);
+        all.forEach(item => {
+            if (!arr1Keys.includes(item[keyField])) {
+                less.push(item);
+                return;
+            }
+            if (!arr2Keys.includes(item[keyField])) {
+                more.push(item);
+                return;
+            }
+            same.push(item);
+        });
+    }
+    else {
+        all.forEach(item => {
+            if (!arr1.includes(item)) {
+                less.push(item);
+                return;
+            }
+            if (!arr2.includes(item)) {
+                more.push(item);
+                return;
+            }
+            same.push(item);
+        });
+    }
+    return {
+        more,
+        less,
+        same,
+    };
+}
+/**
+ * 转换为数字或undefined
+ * - 如果是undefined或null 返回undefined
+ * - 其他情况转成数字，能转成数字的返回数字，NaN的返回undefined
+ * @author lxm
+ * @date 2023-06-08 06:30:57
+ * @param {unknown} value 值
+ * @return {*}  {(number | undefined)}
+ */
+export function toNumberOrNil(value) {
+    if (isNil(value)) {
+        return undefined;
+    }
+    const num = Number(value);
+    if (Number.isNaN(num)) {
+        return undefined;
+    }
+    return num;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.4-beta.5",
+  "version": "0.1.1",
   "description": "核心包",
   "type": "module",
   "main": "out/index.js",
@@ -23,9 +23,10 @@
     "lint:fix": "eslint --fix 'src/**/*.ts'",
     "clean": "rimraf out dist",
     "test": "jest",
-    "prepublish": "npm run build",
-    "publish:next": "npm publish --access public --tag next",
-    "publish:npm": "npm publish --access public"
+    "publish:next": "npm run build && npm publish --access public --tag=next",
+    "publish:dev": "npm run build && npm publish --access public --tag=dev",
+    "publish:beta": "npm run build && npm publish --access public --tag=beta",
+    "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/"
   },
   "author": "chitanda",
   "license": "MIT",
@@ -33,7 +34,8 @@
     "axios": "^1.4.0",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.8.1",
-    "qs": "^6.11.1",
+    "loglevel-plugin-prefix": "^0.8.4",
+    "qs": "^6.11.2",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
@@ -41,11 +43,10 @@
     "@types/qs": "^6.9.7"
   },
   "peerDependencies": {
-    "axios": "^1.3.5",
+    "axios": "^1.4.0",
     "lodash-es": "^4.17.21",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  },
-  "gitHead": "899c34a41e55998a64d331fcf8ea28c94d1fdbce"
+  }
 }

package/src/constant/core/core.ts

@@ -19,7 +19,7 @@ export class CoreConst {
    * @date 2022-07-20 15:07:28
    * @static
    */
-  static readonly TOKEN = 'access_token';
+  static readonly TOKEN = 'ibzuaa-token';
 
   /**
    * 访问令牌标识过期时间
@@ -29,5 +29,5 @@ export class CoreConst {
    * @static
    * @memberof CoreConst
    */
-  static readonly TOKEN_EXPIRES = 'access_token_expires';
+  static readonly TOKEN_EXPIRES = 'ibzuaa-token-expires';
 }

package/src/constant/util/util.ts

@@ -2,4 +2,4 @@
 /**
  * 无操作函数
  */
-export const NOOP = () => {};
+export const NOOP = (): void => {};