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

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;
+}