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

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

@@ -0,0 +1,96 @@
+import { RuntimeError } from '../../error';
+
+/**
+ * 计数插销工具类
+ *
+ * @author lxm
+ * @date 2022-11-24 19:11:49
+ * @export
+ * @class CountLatch
+ */
+export class CountLatch {
+  private promise: Promise<void> | null = null;
+
+  private resolve: ((value: void) => void) | null = null;
+
+  /**
+   * 计数，当前等待的异步逻辑个数
+   *
+   * @author lxm
+   * @date 2022-11-24 19:11:59
+   * @type {number}
+   */
+  count: number = 0;
+
+  /**
+   * 开启promise
+   *
+   * @author lxm
+   * @date 2022-11-24 19:11:32
+   * @private
+   */
+  private startPromise() {
+    this.promise = new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+
+  /**
+   * 结束promise
+   *
+   * @author lxm
+   * @date 2022-11-24 19:11:44
+   * @private
+   */
+  private endPromise() {
+    if (this.resolve) {
+      this.resolve();
+      this.resolve = null;
+      this.promise = null;
+    }
+  }
+
+  /**
+   * 上锁，计数加一
+   * 第一次计数，开启异步
+   *
+   * @author lxm
+   * @date 2022-11-24 19:11:27
+   */
+  lock() {
+    this.count += 1;
+    if (!this.promise) {
+      this.startPromise();
+    }
+  }
+
+  /**
+   * 解锁，计数减一
+   * 归零时结束异步
+   *
+   * @author lxm
+   * @date 2022-11-24 19:11:47
+   */
+  unlock() {
+    if (this.count < 1) {
+      throw new RuntimeError('lock和unlock次数不匹配！');
+    }
+    this.count -= 1;
+    if (this.count === 0) {
+      debugger;
+      this.endPromise();
+    }
+  }
+
+  /**
+   * 等待，计数归零异步结束
+   *
+   * @author lxm
+   * @date 2022-11-24 19:11:20
+   */
+  async await() {
+    if (this.promise) {
+      await this.promise;
+    }
+  }
+}

package/src/utils/sync/index.ts

@@ -0,0 +1,2 @@
+export { awaitTimeout } from './await-timeout';
+export { CountLatch } from './count-latch';

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

@@ -0,0 +1,86 @@
+import { merge } from 'lodash-es';
+
+/**
+ * 文件List转数组
+ *
+ * @author lxm
+ * @date 2022-11-18 13:11:03
+ * @export
+ * @param {FileList} fileList
+ * @returns {*}
+ */
+export function fileListToArr(fileList: FileList): File[] {
+  const files = [];
+  for (let i = 0; i < fileList.length; i++) {
+    files.push(fileList[i]);
+  }
+  return files;
+}
+
+/**
+ * JS打开文件上传操作配置参数
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:47
+ * @export
+ * @interface SelectFileOpts
+ */
+export interface SelectFileOpts {
+  /**
+   * 接受的文件类型
+   *
+   * @author lxm
+   * @date 2022-11-20 21:11:52
+   * @type {string}
+   */
+  accept?: string;
+  /**
+   * 是否支持多选
+   *
+   * @author lxm
+   * @date 2022-11-20 21:11:52
+   * @type {boolean}
+   */
+  multiple?: boolean;
+  /**
+   * 选中文件后回调
+   *
+   * @author lxm
+   * @date 2022-11-20 21:11:50
+   */
+  onSelected: (_fileList: File[]) => void;
+}
+
+/**
+ * JS打开文件上传操作
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:31
+ * @export
+ * @param {SelectFileOpts} _opts 配置参数
+ */
+export function selectFile(_opts: SelectFileOpts) {
+  const opts: Required<SelectFileOpts> = merge(
+    {
+      multiple: true,
+      accept: '',
+    },
+    _opts,
+  );
+  const input = document.createElement('input');
+  input.setAttribute('type', 'file');
+  input.setAttribute('multiple', `${opts.multiple}`);
+  input.setAttribute('accept', opts.accept);
+  input.onchange = e => {
+    const inputEl = e.target as HTMLInputElement;
+    const files = inputEl.files ? fileListToArr(inputEl.files) : [];
+    if (files.length === 0) {
+      return;
+    }
+    opts.onSelected(files);
+    inputEl.value = ''; // 如果不置空，相同的文件不会触发change事件
+  };
+  document.body.appendChild(input);
+  input.click();
+  document.body.removeChild(input);
+}

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

@@ -0,0 +1,206 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+/* eslint-disable no-param-reassign */
+import { cloneDeep, isFunction, merge, round, uniqueId } from 'lodash-es';
+import { HttpResponse } from '../net/http-response';
+import { selectFile } from './select-file';
+
+export interface IUploadFile {
+  name: string;
+  uid: string;
+  status: 'uploading' | 'finished' | 'fail' | 'cancel';
+  percentage: number;
+  response?: HttpResponse;
+  error?: unknown;
+}
+
+export interface IUploadFileOpts {
+  uploadUrl: string;
+  /**
+   * 接受的文件类型
+   *
+   * @author lxm
+   * @date 2022-11-20 21:11:52
+   * @type {string}
+   */
+  accept?: string;
+  /**
+   * 是否支持多选
+   *
+   * @author lxm
+   * @date 2022-11-20 21:11:52
+   * @type {Boolean}
+   */
+  multiple?: boolean;
+  separate?: string;
+  request?: (_files: File[]) => Promise<HttpResponse>;
+  beforeUpload?: (_fileData: File[], _files: IUploadFile[]) => boolean;
+  finish?: (_resultFiles: IUploadFile[]) => void;
+  success?: (_resultFiles: IUploadFile[], _res: HttpResponse) => void;
+  error?: (_resultFiles: IUploadFile[], _error: unknown) => void;
+  progress?: (_files: IUploadFile[]) => void;
+}
+
+/**
+ * 使用上传文件逻辑
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:52
+ * @export
+ * @param {IUploadFileOpts} _opts
+ * @returns {*}
+ */
+export function uploadFile(_opts: IUploadFileOpts) {
+  const opts: Required<IUploadFileOpts> = merge(
+    {
+      multiple: true,
+      accept: '',
+      separate: true,
+      beforeUpload: (_fileData: File[], _files: IUploadFile[]) => true,
+      finish: (_resultFiles: IUploadFile[]) => {},
+      success: (_resultFiles: IUploadFile[], _res: HttpResponse) => {},
+      error: (_resultFiles: IUploadFile[], _error: unknown) => {},
+      progress: (_files: IUploadFile[]) => {},
+    },
+    _opts,
+  );
+
+  /**
+   * 进度条回调
+   *
+   * @author lxm
+   * @date 2022-11-20 21:11:47
+   * @param {IParams} event
+   * @param {IUploadFile[]} files
+   */
+  const onUploadProgress = (event: IParams, files: IUploadFile[]) => {
+    files.forEach(file => {
+      file.percentage = round(event.progress * 100);
+    });
+    opts.progress(cloneDeep(files));
+  };
+
+  /**
+   * 上传请求方法，返回响应对象
+   *
+   * @author lxm
+   * @date 2022-11-18 13:11:57
+   * @param {File[]} files
+   * @returns {*}  {Promise<HttpResponse>}
+   */
+  const uploadRequest = async (
+    files: File[],
+    onProgress: (_event: IParams) => void,
+  ): Promise<HttpResponse> => {
+    // 自定义上传请求
+    if (opts.request && isFunction(opts.request)) {
+      return opts.request(files);
+    }
+
+    // 默认每次单个文件上传，可能存在接口一次上传多个文件,
+    const data = new FormData();
+    files.forEach(file => {
+      data.append('file', file);
+    });
+    const res = await ibiz.net.request(opts.uploadUrl, {
+      method: 'post',
+      baseURL: '',
+      data,
+      headers: { 'Content-Type': 'multipart/form-data' },
+      onUploadProgress: onProgress,
+    });
+    return res;
+  };
+
+  /**
+   * 执行一次上传，可能是一个文件也可能是多个文件
+   *
+   * @author lxm
+   * @date 2022-11-18 14:11:54
+   * @param {File[]} files 此次上传文件的集合
+   * @returns {*}  {Promise<IUploadFile[]>}
+   */
+  const executeSingleUpload = async (files: File[]): Promise<IUploadFile[]> => {
+    const resultFiles: IUploadFile[] = files.map(file => {
+      return {
+        status: 'uploading',
+        name: file.name,
+        uid: uniqueId(),
+        percentage: 0,
+      };
+    });
+
+    // 上传前回调，可以取消此次下载
+    const pass = opts.beforeUpload(files, resultFiles);
+    if (!pass) {
+      resultFiles.forEach(file => {
+        file.status = 'cancel';
+      });
+      ibiz.log.debug('取消上传', resultFiles);
+      return resultFiles;
+    }
+
+    try {
+      const res = await uploadRequest(files, event => {
+        onUploadProgress(event, resultFiles);
+      });
+      resultFiles.forEach(file => {
+        file.status = 'finished';
+      });
+      // 上传成功事件
+      opts.success(resultFiles, res);
+      resultFiles.forEach(file => {
+        file.response = res;
+      });
+    } catch (error) {
+      resultFiles.forEach(file => {
+        file.status = 'fail';
+      });
+      // 上传失败事件
+      opts.error(resultFiles, error);
+      resultFiles.forEach(file => {
+        file.error = error;
+      });
+      ibiz.log.error(error);
+      ibiz.log.error(`${files.map(file => file.name).join(',')}上传失败`);
+    }
+    return resultFiles;
+  };
+
+  /**
+   * 执行上传文件逻辑
+   *
+   * @author lxm
+   * @date 2022-11-18 13:11:21
+   * @param {files} File[] 文件集合
+   */
+  const uploadFiles = async (files: File[]) => {
+    const uploadSequence = opts.separate ? files.map(file => [file]) : [files];
+    const res = await Promise.allSettled(
+      uploadSequence.map(async sequence => {
+        return executeSingleUpload(sequence);
+      }),
+    );
+
+    // 整合所有的返回文件
+    const resultFiles: IUploadFile[] = [];
+    res.forEach(result => {
+      if (result.status === 'fulfilled') {
+        resultFiles.push(...result.value);
+      }
+    });
+
+    opts.finish(resultFiles);
+  };
+
+  const select = () => {
+    selectFile({
+      accept: opts.accept,
+      multiple: opts.multiple,
+      onSelected: files => {
+        uploadFiles(files);
+      },
+    });
+  };
+
+  select();
+}

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

@@ -0,0 +1,62 @@
+/**
+ * 路径解析助手
+ *
+ * @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/src/utils/util/util.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { debounce, DebounceSettings } from 'lodash-es';
+import { debounce } from 'lodash-es';
 import { getCookie } from 'qx-util';
 import { CoreConst } from '../../constant';
 
@@ -27,11 +27,12 @@ export function getToken(): string | null {
  */
 export function isOverlap(arr1: any[], arr2: any[]): boolean {
   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
@@ -43,7 +44,6 @@ export function isOverlap(arr1: any[], arr2: any[]): boolean {
  *     newParams: Parameters<T>,
  *   ) => Parameters<T>} mergeFunc 合并的回调函数
  * @param {number} [wait] 防抖的延迟毫秒数
- * @param {DebounceSettings} [options] 防抖函数的额外参数
  * @returns {*}
  */
 export function debounceAndMerge<T extends (...args: any[]) => any>(
@@ -53,19 +53,14 @@ export function debounceAndMerge<T extends (...args: any[]) => any>(
     newParams: Parameters<T>,
   ) => Parameters<T>,
   wait?: number,
-  options?: DebounceSettings,
 ) {
   // 缓存上一次的函数参数
   let oldParams: Parameters<T> | undefined;
-  const debounceFunc = debounce(
-    (...params: Parameters<T>) => {
-      // 防抖函数执行的时候清空缓存参数
-      oldParams = undefined;
-      return func(...params);
-    },
-    wait,
-    options,
-  );
+  const debounceFunc = debounce((...params: Parameters<T>) => {
+    // 防抖函数执行的时候清空缓存参数
+    oldParams = undefined;
+    return func(...params);
+  }, wait);
   return (...args: Parameters<T>) => {
     // 合并参数，并把参数缓存到oldParams里，用新参数调用防抖函数
     let newParams = args;
@@ -76,3 +71,66 @@ export function debounceAndMerge<T extends (...args: any[]) => any>(
     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<
+  T extends (...args: any[]) => Promise<any>,
+>(
+  func: T,
+  mergeFunc: (
+    oldParams: Parameters<T>,
+    newParams: Parameters<T>,
+  ) => Parameters<T>,
+  wait?: number,
+): T {
+  // 缓存上一次的函数参数
+  let oldParams: Parameters<T> | undefined;
+  let promises: Array<{ resolve: any; reject: any }> = [];
+  const debounceFunc = debounce(async (...params: Parameters<T>) => {
+    // 防抖函数执行的时候清空缓存参数
+    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: Parameters<T>) => {
+    // 合并参数，并把参数缓存到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 as T;
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 千反田丷
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.