nhanh-pure-function 1.1.0 → 1.2.1

package/lib/Index.d.ts

@@ -1,3 +1,7 @@
 export * from "./Utility";
 export * from "./User";
- 
+
+// 提取单个函数的参数类型
+export type ExtractParameters<T> = T extends (...args: infer P) => any
+  ? P
+  : never;

package/lib/Index.js

@@ -1,3 +1,4 @@
+import "./index.css";
+
 export * from "./Utility";
 export * from "./User";
- 

package/lib/User.d.ts

@@ -1,26 +1,10 @@
 /**
- * 添加滚动触底事件
- * @param {滚动标签} element
+ * 滚动触底事件
  * @param {触底事件} callback
  */
-export function _AddScrollBottomListener(
-  element: HTMLElement,
+export function _ScrollBottomListener(
   callback: Function
-): void;
-
-/**
- * 自动处理 currentPage * pageSize > total
- * @param ask 请求方法
- * @param config 请求参数
- */
-export function _PagingQuery<Ask extends Function>(
-  ask: Ask,
-  config: {
-    currentPage: number;
-    pageSize: number;
-    [key: string]: any;
-  }
-): ReturnType<Ask> & { currentPage?: number };
+): (payload: Event) => void;
 
 /**
  * 纯数字转  数字加单位
@@ -70,10 +54,10 @@ export function _SetQuantifierAttribute<T>(
  */
 export function _SetDefaultValue<T>(
   data: T,
-  options: {
+  options?: {
     defaultValue?: string;
     fieldsNotRequiringAction?: (string | number | symbol)[];
-  } = {}
+  }
 ): T;
 
 /**
@@ -116,7 +100,7 @@ export function _SetPhoto<T>(
  */
 export function _Exhibit_details<T>(
   data: T,
-  options: {
+  options?: {
     dictionaryOptions?: { [key in keyof T]: { [key: string | number]: any } };
     dictionaryLabel?: (keyof T)[];
     dictionaryLabelJoin?: (keyof T)[];
@@ -141,7 +125,7 @@ export function _Exhibit_details<T>(
     filterLabel?: (keyof T)[];
 
     defaultValue?: string;
-  } = {}
+  }
 ): T;
 
 // 定义加载状态更新函数类型
@@ -149,7 +133,7 @@ type LoadingStateUpdater = (newState: boolean) => void;
 // 定义加载控制器的类型
 interface LoadingController {
   invokers: Set<any>; // 假设invoker可以是任何类型
-  timer: NodeJS.Timeout | null;
+  timer: number | null;
   startTime: number;
   loadingState: LoadingStateUpdater;
   delayTime: number;
@@ -159,11 +143,9 @@ interface LoadingController {
 export class _LoadingController {
   #controllersCollection: Map<string, LoadingController>;
 
-  constructor() {}
-
   // addController方法的类型定义
   addController(
-    key?: string,
+    key: string,
     config: {
       loadingState: LoadingStateUpdater;
       delayTime?: number;
@@ -190,14 +172,20 @@ export class _LoadingController {
 type UiLibrary = "naiveUI" | "ElementPlus" | "Element";
 /**
  * 点击非指定dom(包含子级dom)时执行 callback
- * @param  clickableSelector 允许点击的 dom 选择器
+ * @param  querySelector 允许点击的 dom 顶层祖先元素选择器
  * @param  callback 满足条件时执行的回调
- * @param  uiLibrary 项目使用的 ui库 , 用于排除  ui库 创建的元素 , 避免点击 ui库 创建的元素时意外的执行 callback
+ *
+ * @param  options 其他配置
+ * @param  options.uiLibrary 项目使用的 ui库 , 用于排除  ui库 创建的元素 , 避免点击 ui库 创建的元素时意外的执行 callback
+ * @param  options.isClickAllowed 是否允许该点击 ( 如果不确定可以返回 undefined )
  */
 export function _CloseOnOutsideClick(
-  clickableSelector: string[],
+  querySelector: string[],
   callback: Function,
-  uiLibrary?: UiLibrary[]
+  options?: {
+    uiLibrary?: UiLibrary[];
+    isClickAllowed?: (event: MouseEvent) => boolean | undefined;
+  }
 ): void;
 
 /** 拖拽配置 */
@@ -250,7 +238,7 @@ export class LocalDrag {
    * @param  parentDom 被拖拽元素的祖先元素
    * @param  option 局部拖拽配置
    */
-  init(parentDom: HTMLElement, options: LocalDragOptions = {}): void;
+  init(parentDom: HTMLElement, options?: LocalDragOptions): void;
   /** 结束拖拽 */
   finish(): void;
 }

package/lib/User.js

@@ -1,48 +1,18 @@
-import { _IsObject, _IsWithinErrorMargin, _NotNull } from "./Utility";
+import { _IsObject, _NotNull } from "./Utility";
 
 /**
- * 添加滚动触底事件
- * @param {滚动标签} element
+ * 滚动触底事件
  * @param {触底事件} callback
  */
-export function _AddScrollBottomListener(element, callback) {
-  element.addEventListener("scroll", function () {
-    if (
-      _IsWithinErrorMargin(
-        element.scrollTop + element.clientHeight,
-        element.scrollHeight,
-        2
-      )
-    ) {
+export function _ScrollBottomListener(callback) {
+  return function (payload) {
+    const target = payload.target;
+    const { scrollTop, scrollHeight, clientHeight } = target;
+    const bottom = scrollHeight - scrollTop - clientHeight;
+    if (bottom <= 1) {
       callback();
     }
-  });
-}
-
-/**
- * 自动处理 currentPage * pageSize > total
- * @param ask 请求方法
- * @param config 请求参数
- */
-export function _PagingQuery(ask, config) {
-  return new Promise(function (resolve, reject) {
-    ask(config)
-      .then((data) => {
-        const { rows, total } = data;
-        if (rows.length == 0 && total > 0) {
-          config.currentPage = Math.ceil(total / config.pageSize);
-          ask(config)
-            .then((data) => {
-              data.currentPage = config.currentPage;
-              resolve(data);
-            })
-            .catch(reject);
-        } else {
-          resolve(data);
-        }
-      })
-      .catch(reject);
-  });
+  };
 }
 
 /**
@@ -413,17 +383,38 @@ export class _LoadingController {
 
 /**
  * 点击非指定dom(包含子级dom)时执行 callback
- * @param  clickableSelector 允许点击的 dom 选择器
+ * @param  querySelector 允许点击的 dom 顶层祖先元素选择器
  * @param  callback 满足条件时执行的回调
- * @param  uiLibrary 项目使用的 ui库 , 用于排除  ui库 创建的元素 , 避免点击 ui库 创建的元素时意外的执行 callback
+ *
+ * @param  options 其他配置
+ * @param  options.uiLibrary 项目使用的 ui库 , 用于排除  ui库 创建的元素 , 避免点击 ui库 创建的元素时意外的执行 callback
+ * @param  options.isClickAllowed 是否允许该点击 ( 如果不确定可以返回 undefined )
  */
 export function _CloseOnOutsideClick(
-  clickableSelector,
+  querySelector,
   callback,
-  uiLibrary = ["naiveUI", "ElementPlus", "Element"]
+  options = {
+    uiLibrary: ["naiveUI", "ElementPlus", "Element"],
+  }
 ) {
+  function end() {
+    callback();
+    document.removeEventListener("mousedown", mousedown);
+  }
   function mousedown(event) {
+    const { isClickAllowed, uiLibrary } = options;
+
+    if (isClickAllowed) {
+      const bool = isClickAllowed(event);
+      if (bool) return;
+      if (bool === false) return end();
+    }
+
     const target = event.target;
+
+    /** 元素这时可能已经被删除了 */
+    if (!target?.closest("body")) return;
+
     const UI = (function (obj) {
       const arr = [];
       for (const key in obj) {
@@ -433,18 +424,19 @@ export function _CloseOnOutsideClick(
       }
       return arr;
     })({
-      naiveUI: [".v-binder-follower-container"],
+      naiveUI: [
+        ".v-binder-follower-container",
+        ".n-image-preview-container",
+        ".n-modal-container",
+      ],
       ElementPlus: ["el-popper"],
       Element: ["el-popper"],
     });
-    const isClickable = clickableSelector
+    const isClickable = querySelector
       .concat(UI)
       .some((className) => Boolean(target?.closest(className)));
 
-    if (!isClickable) {
-      callback();
-      document.removeEventListener("mousedown", mousedown);
-    }
+    if (!isClickable) end();
   }
   requestAnimationFrame(() =>
     document.addEventListener("mousedown", mousedown)

package/lib/Utility.d.ts

@@ -1,3 +1,5 @@
+import { ExtractParameters } from "./Index";
+
 /**
  * 非null | undefined判断
  * @param value any
@@ -40,7 +42,7 @@ export function _ConvertToPercentage(
 export function _WaitForCondition(
   conditionChecker: () => boolean,
   timeoutMillis: number
-): Promise;
+): Promise<"完成" | "超时">;
 
 /**
  * 排除子串
@@ -116,7 +118,7 @@ export function _DownloadFile(href: string, fileName?: string): void;
  */
 export function _GetFrameRate(
   callback: (fps: number, frameTime: number) => void,
-  referenceNode: number = 10
+  referenceNode: number
 ): void;
 
 /**
@@ -126,7 +128,7 @@ export function _GetFrameRate(
  */
 export function _Schedule(
   callback: (schedule: number) => void,
-  TIME: number = 500
+  TIME: number
 ): void;
 
 /**
@@ -165,3 +167,38 @@ export function _CreateAndDownloadFile(
   fileName: string,
   options?: BlobPropertyBag
 ): void;
+
+/**
+ * 获取url参数
+ * @param {string} url
+ * @returns {Object}
+ */
+export function _GetQueryParams(url: string): void;
+
+/**
+ * 生成uuid
+ * @returns {string}
+ */
+export function _GenerateUUID(): string;
+
+/**
+ * 防抖
+ * @param {Function} fn
+ * @param {number} delay
+ * @returns {Function}
+ */
+export function _Debounce<T extends Function>(
+  fn: T,
+  delay: number
+): (...args: ExtractParameters<T>) => void;
+
+/**
+ * 节流
+ * @param {Function} fn
+ * @param {number} delay
+ * @returns {Function}
+ */
+export function _Throttle<T extends Function>(
+  fn: T,
+  delay: number
+): (...args: ExtractParameters<T>) => void;

package/lib/Utility.js

@@ -328,3 +328,56 @@ export function _CreateAndDownloadFile(content, fileName, options) {
   // 最后，别忘了撤销 Blob 对象的 URL，以释放资源
   URL.revokeObjectURL(url);
 }
+
+/**
+ * 获取url参数
+ * @param {string} url
+ * @returns {Object}
+ */
+export function _GetQueryParams(url) {
+  return Object.fromEntries(new URL(url).searchParams);
+}
+
+/**
+ * 生成uuid
+ * @returns {string}
+ */
+export function _GenerateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+    const r = (Math.random() * 16) | 0; // 随机生成一个0到15的数
+    const v = c === "x" ? r : (r & 0x3) | 0x8; // 对于'y'位, v = (r & 0x3 | 0x8) 确保变体正确
+    return v.toString(16); // 将数字转换为16进制
+  });
+}
+
+/**
+ * 防抖
+ * @param {Function} fn
+ * @param {number} delay
+ * @returns {Function}
+ */
+export function _Debounce(fn, delay) {
+  let timeoutId;
+  return function (...args) {
+    clearTimeout(timeoutId);
+    timeoutId = setTimeout(() => fn.apply(this, args), delay);
+  };
+}
+
+/**
+ * 节流
+ * @param {Function} fn
+ * @param {number} delay
+ * @returns {Function}
+ */
+export function _Throttle(fn, delay) {
+  let timer;
+  return function (...args) {
+    if (!timer) {
+      timer = setTimeout(() => {
+        fn.apply(this, args);
+        timer = null;
+      }, delay);
+    }
+  };
+}

package/lib/index.css

@@ -0,0 +1,8 @@
+.no-select {
+  -webkit-user-select: none;
+  /* Safari */
+  -ms-user-select: none;
+  /* IE10+/Edge */
+  user-select: none;
+  /* Standard syntax */
+}

package/lib/index.less

@@ -0,0 +1,5 @@
+.no-select {
+  -webkit-user-select: none; /* Safari */
+  -ms-user-select: none; /* IE10+/Edge */
+  user-select: none; /* Standard syntax */
+}

package/lib/test.ts

@@ -0,0 +1 @@
+/** 用于测试 js / ts 功能实现及类型是否正确 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nhanh-pure-function",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "纯函数工具",
   "main": "lib/Index.js",
   "scripts": {