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

package/src/utils/recursive/find-recursive-child.ts

@@ -0,0 +1,133 @@
+/* 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: IData, fields: string[]): IData[] | undefined {
+  for (const field of fields) {
+    if (parent[field]?.length) {
+      return parent[field];
+    }
+  }
+}
+
+function _recursiveIterate(
+  parent: IData,
+  callback: (item: any) => boolean | void,
+  opts?: Partial<typeof IterateOpts>,
+): void {
+  const { childrenFields } = mergeDeepRight(IterateOpts, opts || {});
+  const children = getChildField(parent, childrenFields);
+  if (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: IData,
+  callback: (item: any) => boolean | void,
+  opts?: Partial<typeof IterateOpts>,
+): void {
+  try {
+    _recursiveIterate(parent, callback, opts);
+  } catch (error) {
+    if (error !== BreakError) {
+      throw error;
+    }
+  }
+}
+
+/** 默认配置参数 */
+const CompareOpts = {
+  ...IterateOpts,
+  /** 比较的属性 */
+  compareField: 'name',
+};
+
+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 function findRecursiveChild(
+  parent: IData,
+  key: string,
+  opts?: ICompareOpts,
+): IData | undefined {
+  const { compareField, compareCallback } = mergeDeepRight(
+    CompareOpts,
+    opts || {},
+  );
+
+  // 默认比较方法
+  const _compareCallback =
+    compareCallback ||
+    ((child: IData): boolean => {
+      return child[compareField] === key;
+    });
+
+  // 递归遍历，找到后中断遍历，返回找到项
+  let find;
+  recursiveIterate(
+    parent,
+    item => {
+      if (_compareCallback(item, key, compareField)) {
+        find = item;
+        return true;
+      }
+    },
+    opts,
+  );
+  return find;
+}

package/src/utils/style/remote-style.ts

@@ -1,5 +1,3 @@
-import { Logger } from '../logger/logger';
-
 /**
  * 设置远程样式表
  *
@@ -17,6 +15,6 @@ export async function setRemoteStyle(url: string): Promise<void> {
     styleDom.innerText = res.data as unknown as string;
     document.head.appendChild(styleDom);
   } catch (error) {
-    Logger.debug('加载远程样式表失败', url);
+    ibiz.log.debug('加载远程样式表失败', url);
   }
 }

package/src/utils/sync/count-latch.ts

@@ -29,7 +29,7 @@ export class CountLatch {
    * @date 2022-11-24 19:11:32
    * @private
    */
-  private startPromise() {
+  private startPromise(): void {
     this.promise = new Promise(resolve => {
       this.resolve = resolve;
     });
@@ -42,7 +42,7 @@ export class CountLatch {
    * @date 2022-11-24 19:11:44
    * @private
    */
-  private endPromise() {
+  private endPromise(): void {
     if (this.resolve) {
       this.resolve();
       this.resolve = null;
@@ -57,7 +57,7 @@ export class CountLatch {
    * @author lxm
    * @date 2022-11-24 19:11:27
    */
-  lock() {
+  lock(): void {
     this.count += 1;
     if (!this.promise) {
       this.startPromise();
@@ -71,7 +71,7 @@ export class CountLatch {
    * @author lxm
    * @date 2022-11-24 19:11:47
    */
-  unlock() {
+  unlock(): void {
     if (this.count < 1) {
       throw new RuntimeError('lock和unlock次数不匹配！');
     }
@@ -87,7 +87,7 @@ export class CountLatch {
    * @author lxm
    * @date 2022-11-24 19:11:20
    */
-  async await() {
+  async await(): Promise<void> {
     if (this.promise) {
       await this.promise;
     }

package/src/utils/upload/select-file.ts

@@ -59,7 +59,7 @@ export interface SelectFileOpts {
  * @export
  * @param {SelectFileOpts} _opts 配置参数
  */
-export function selectFile(_opts: SelectFileOpts) {
+export function selectFile(_opts: SelectFileOpts): void {
   const opts: Required<SelectFileOpts> = merge(
     {
       multiple: true,
@@ -71,7 +71,7 @@ export function selectFile(_opts: SelectFileOpts) {
   input.setAttribute('type', 'file');
   input.setAttribute('multiple', `${opts.multiple}`);
   input.setAttribute('accept', opts.accept);
-  input.onchange = e => {
+  input.onchange = (e): void => {
     const inputEl = e.target as HTMLInputElement;
     const files = inputEl.files ? fileListToArr(inputEl.files) : [];
     if (files.length === 0) {

package/src/utils/upload/upload-file.ts

@@ -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 { HttpResponse } from '../net/http-response';
 import { selectFile } from './select-file';
 
@@ -49,7 +50,7 @@ export interface IUploadFileOpts {
  * @param {IUploadFileOpts} _opts
  * @returns {*}
  */
-export function uploadFile(_opts: IUploadFileOpts) {
+export function uploadFile(_opts: IUploadFileOpts): void {
   const opts: Required<IUploadFileOpts> = merge(
     {
       multiple: true,
@@ -72,7 +73,7 @@ export function uploadFile(_opts: IUploadFileOpts) {
    * @param {IParams} event
    * @param {IUploadFile[]} files
    */
-  const onUploadProgress = (event: IParams, files: IUploadFile[]) => {
+  const onUploadProgress = (event: IParams, files: IUploadFile[]): void => {
     files.forEach(file => {
       file.percentage = round(event.progress * 100);
     });
@@ -109,7 +110,7 @@ export function uploadFile(_opts: IUploadFileOpts) {
     //   onUploadProgress: onProgress,
     // });
     // return res;
-    throw new Error(`多应用模式等待重新实现请求`);
+    throw new RuntimeError(`多应用模式等待重新实现请求`);
   };
 
   /**
@@ -174,7 +175,7 @@ export function uploadFile(_opts: IUploadFileOpts) {
    * @date 2022-11-18 13:11:21
    * @param {files} File[] 文件集合
    */
-  const uploadFiles = async (files: File[]) => {
+  const uploadFiles = async (files: File[]): Promise<void> => {
     const uploadSequence = opts.separate ? files.map(file => [file]) : [files];
     const res = await Promise.allSettled(
       uploadSequence.map(async sequence => {
@@ -193,7 +194,7 @@ export function uploadFile(_opts: IUploadFileOpts) {
     opts.finish(resultFiles);
   };
 
-  const select = () => {
+  const select = (): void => {
     selectFile({
       accept: opts.accept,
       multiple: opts.multiple,

package/src/utils/url-helper/url-helper.ts

@@ -16,7 +16,7 @@ export class UrlHelper {
    * @date 2022-10-11 20:10:29
    * @returns {*}
    */
-  static get routeBase() {
+  static get routeBase(): string {
     const hashIndex = window.location.href.lastIndexOf('#/');
     return window.location.href.slice(0, hashIndex + 1);
   }
@@ -30,7 +30,7 @@ export class UrlHelper {
    * @date 2022-10-11 20:10:29
    * @returns {*}
    */
-  static get appBase() {
+  static get appBase(): string {
     const { origin, pathname } = window.location;
     return `${origin}${pathname}`.replace(/\/$/, '');
   }
@@ -44,7 +44,7 @@ export class UrlHelper {
    * @date 2022-10-11 16:10:40
    * @returns {*}
    */
-  static get routePath() {
+  static get routePath(): string {
     return window.location.hash.replace('#', '');
   }
 
@@ -57,7 +57,7 @@ export class UrlHelper {
    * @readonly
    * @static
    */
-  static get fullPath() {
+  static get fullPath(): string {
     return window.location.href;
   }
 }

package/src/utils/util/util.ts

@@ -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';
 
 /**
@@ -30,6 +31,32 @@ export function isOverlap(arr1: any[], arr2: any[]): boolean {
   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: any[],
+  arr2: any[],
+  field?: string,
+): boolean {
+  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;
+}
+
 /**
  * 防抖并合并每次的参数，
  * 最后一次才会执行
@@ -53,7 +80,7 @@ export function debounceAndMerge<T extends (...args: any[]) => any>(
     newParams: Parameters<T>,
   ) => Parameters<T>,
   wait?: number,
-) {
+): (...args: Parameters<T>) => any {
   // 缓存上一次的函数参数
   let oldParams: Parameters<T> | undefined;
   const debounceFunc = debounce((...params: Parameters<T>) => {
@@ -118,7 +145,7 @@ export function debounceAndAsyncMerge<
       promises = [];
     }
   }, wait);
-  const fun = async (...args: Parameters<T>) => {
+  const fun = async (...args: Parameters<T>): Promise<unknown> => {
     // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
     let newParams = args;
     if (oldParams) {
@@ -134,3 +161,118 @@ export function debounceAndAsyncMerge<
   };
   return fun as T;
 }
+
+/**
+ * 把右侧的对象里非空的属性合并到左侧对象里
+ * @author lxm
+ * @date 2023-05-16 02:23:39
+ * @param {IData} l
+ * @param {IData} r
+ */
+export function mergeInLeft(l: IData, r: IData): void {
+  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: IData, r: IData): void {
+  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: IData[],
+  arr2: IData[],
+  keyField?: string,
+): {
+  more: IData[];
+  less: IData[];
+  same: IData[];
+} {
+  const all = new Set([...arr1, ...arr2]);
+  const more: IData[] = [];
+  const less: IData[] = [];
+  const same: IData[] = [];
+
+  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: unknown): number | undefined {
+  if (isNil(value)) {
+    return undefined;
+  }
+  const num = Number(value);
+  if (Number.isNaN(num)) {
+    return undefined;
+  }
+  return num;
+}

package/out/factory-center.d.ts

@@ -1,11 +0,0 @@
-/**
- * 工厂类挂载中心，挂载各种解耦用创建工厂
- *
- * @author lxm
- * @date 2022-10-17 15:10:04
- * @export
- * @class FactoryCenter
- */
-export declare class FactoryCenter {
-}
-//# sourceMappingURL=factory-center.d.ts.map

package/out/factory-center.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"factory-center.d.ts","sourceRoot":"","sources":["../src/factory-center.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,qBAAa,aAAa;CAAG"}

package/out/factory-center.js

@@ -1,10 +0,0 @@
-/**
- * 工厂类挂载中心，挂载各种解耦用创建工厂
- *
- * @author lxm
- * @date 2022-10-17 15:10:04
- * @export
- * @class FactoryCenter
- */
-export class FactoryCenter {
-}

package/src/factory-center.ts

@@ -1,9 +0,0 @@
-/**
- * 工厂类挂载中心，挂载各种解耦用创建工厂
- *
- * @author lxm
- * @date 2022-10-17 15:10:04
- * @export
- * @class FactoryCenter
- */
-export class FactoryCenter {}