nhanh-pure-function 1.2.2 → 1.2.4

package/lib/User.js

@@ -394,20 +394,33 @@ export class _LoadingController {
  * @param  options.uiLibrary 项目使用的 ui库 , 用于排除  ui库 创建的元素 , 避免点击 ui库 创建的元素时意外的执行 callback
  * @param  options.isClickAllowed 是否允许该点击 ( 如果不确定可以返回 undefined )
  */
-export function _CloseOnOutsideClick(
-  querySelector,
-  callback,
-  options = {
-    uiLibrary: ["naiveUI", "ElementPlus", "Element"],
-  }
-) {
+export function _CloseOnOutsideClick(querySelector, callback, options) {
+  const { isClickAllowed, uiLibrary = ["naiveUI", "ElementPlus", "Element"] } =
+    options || {};
+
+  const UI = (function (obj) {
+    const arr = [];
+    for (const key in obj) {
+      if (Object.hasOwnProperty.call(obj, key)) {
+        if (uiLibrary.includes(key)) arr.push(...obj[key]);
+      }
+    }
+    return arr;
+  })({
+    naiveUI: [
+      ".v-binder-follower-container",
+      ".n-image-preview-container",
+      ".n-modal-container",
+    ],
+    ElementPlus: [".el-popper"],
+    Element: [".el-popper"],
+  });
+
   function end() {
     callback();
     document.removeEventListener("mousedown", mousedown);
   }
   function mousedown(event) {
-    const { isClickAllowed, uiLibrary } = options;
-
     if (isClickAllowed) {
       const bool = isClickAllowed(event);
       if (bool) return;
@@ -419,23 +432,6 @@ export function _CloseOnOutsideClick(
     /** 元素这时可能已经被删除了 */
     if (!target?.closest("body")) return;
 
-    const UI = (function (obj) {
-      const arr = [];
-      for (const key in obj) {
-        if (Object.hasOwnProperty.call(obj, key)) {
-          if (uiLibrary.includes(key)) arr.concat(obj[key]);
-        }
-      }
-      return arr;
-    })({
-      naiveUI: [
-        ".v-binder-follower-container",
-        ".n-image-preview-container",
-        ".n-modal-container",
-      ],
-      ElementPlus: ["el-popper"],
-      Element: ["el-popper"],
-    });
     const isClickable = querySelector
       .concat(UI)
       .some((className) => Boolean(target?.closest(className)));

package/package.json

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