sculp-js 1.7.0 → 1.7.2

package/lib/es/object.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
@@ -81,7 +81,7 @@ function objectPick(obj, keys) {
     return obj2;
 }
 /**
- * 对象祛除
+ * 对象去除
  * @param {O} obj
  * @param {K} keys
  * @returns {Pick<O, ArrayElements<K>>}
@@ -196,26 +196,110 @@ function objectGet(obj, path, strict = false) {
 }
 /**
  * 深拷贝堪称完全体 即：任何类型的数据都会被深拷贝
- * @param {AnyObject | AnyArray} obj
+ *
+ * 包含对null、原始值、对象循环引用的处理
+ *
+ * 对Map、Set、ArrayBuffer、Date、RegExp、Array、Object及原型链属性方法执行深拷贝
+ * @param {T} source
  * @param {WeakMap} map
- * @returns {AnyObject | AnyArray}
+ * @returns {T}
  */
-function cloneDeep(obj, map = new WeakMap()) {
-    if (obj instanceof Date)
-        return new Date(obj);
-    if (obj instanceof RegExp)
-        return new RegExp(obj);
-    if (map.has(obj)) {
-        return map.get(obj);
-    }
-    const allDesc = Object.getOwnPropertyDescriptors(obj);
-    const cloneObj = Object.create(Object.getPrototypeOf(obj), allDesc);
-    map.set(obj, cloneObj);
-    for (const key of Reflect.ownKeys(obj)) {
-        const value = obj[key];
-        cloneObj[key] = value instanceof Object && typeof value !== 'function' ? cloneDeep(value, map) : value;
-    }
-    return cloneObj;
+function cloneDeep(source, map = new WeakMap()) {
+    // 处理原始类型和 null/undefined
+    if (source === null || typeof source !== 'object') {
+        return source;
+    }
+    // 处理循环引用
+    if (map.has(source)) {
+        return map.get(source);
+    }
+    // 处理 ArrayBuffer
+    if (source instanceof ArrayBuffer) {
+        const copy = new ArrayBuffer(source.byteLength);
+        new Uint8Array(copy).set(new Uint8Array(source));
+        map.set(source, copy);
+        return copy;
+    }
+    // 处理 DataView 和 TypedArray (Uint8Array 等)
+    if (ArrayBuffer.isView(source)) {
+        const constructor = source.constructor;
+        const bufferCopy = cloneDeep(source.buffer, map);
+        return new constructor(bufferCopy, source.byteOffset, source.length);
+    }
+    // 处理 Date 对象
+    if (source instanceof Date) {
+        const copy = new Date(source.getTime());
+        map.set(source, copy);
+        return copy;
+    }
+    // 处理 RegExp 对象
+    if (source instanceof RegExp) {
+        const copy = new RegExp(source.source, source.flags);
+        copy.lastIndex = source.lastIndex; // 保留匹配状态
+        map.set(source, copy);
+        return copy;
+    }
+    // 处理 Map
+    if (source instanceof Map) {
+        const copy = new Map();
+        map.set(source, copy);
+        source.forEach((value, key) => {
+            copy.set(cloneDeep(key, map), cloneDeep(value, map));
+        });
+        return copy;
+    }
+    // 处理 Set
+    if (source instanceof Set) {
+        const copy = new Set();
+        map.set(source, copy);
+        source.forEach(value => {
+            copy.add(cloneDeep(value, map));
+        });
+        return copy;
+    }
+    // 处理数组 (包含稀疏数组)
+    if (Array.isArray(source)) {
+        const copy = Array.from({ length: source.length });
+        map.set(source, copy);
+        // 克隆所有有效索引
+        for (let i = 0; i < source.length; i++) {
+            if (i in source) {
+                // 保留空位
+                copy[i] = cloneDeep(source[i], map);
+            }
+        }
+        // 克隆数组的自定义属性
+        const descriptors = Object.getOwnPropertyDescriptors(source);
+        for (const key of Reflect.ownKeys(descriptors)) {
+            Object.defineProperty(copy, key, {
+                ...descriptors[key],
+                value: cloneDeep(descriptors[key].value, map)
+            });
+        }
+        return copy;
+    }
+    // 处理普通对象和类实例
+    const copy = Object.create(Object.getPrototypeOf(source));
+    map.set(source, copy);
+    const descriptors = Object.getOwnPropertyDescriptors(source);
+    for (const key of Reflect.ownKeys(descriptors)) {
+        const descriptor = descriptors[key];
+        if ('value' in descriptor) {
+            // 克隆数据属性
+            descriptor.value = cloneDeep(descriptor.value, map);
+        }
+        else {
+            // 处理访问器属性 (getter/setter)
+            if (descriptor.get) {
+                descriptor.get = cloneDeep(descriptor.get, map);
+            }
+            if (descriptor.set) {
+                descriptor.set = cloneDeep(descriptor.set, map);
+            }
+        }
+        Object.defineProperty(copy, key, descriptor);
+    }
+    return copy;
 }
 
 export { cloneDeep, isPlainObject, objectAssign, objectEach, objectEachAsync, objectFill, objectGet, objectMap, objectAssign as objectMerge, objectOmit, objectPick };

package/lib/es/path.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/qs.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/random.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/string.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/tooltip.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/tree.js

@@ -1,14 +1,18 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */
 
+import { objectOmit } from './object.js';
+import { objectHas, isEmpty } from './type.js';
+
 const defaultFieldOptions = { keyField: 'key', childField: 'children', pidField: 'pid' };
 const defaultSearchTreeOptions = {
     childField: 'children',
     nameField: 'name',
-    ignoreEmptyChild: false
+    removeEmptyChild: false,
+    ignoreCase: true
 };
 /**
  * 深度优先遍历函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
@@ -65,14 +69,16 @@ function forEachDeep(tree, iterator, children = 'children', isReverse = false) {
     walk(tree, null);
 }
 /**
- * 深度优先遍历的Map函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+ * 创建一个新数组, 深度优先遍历的Map函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+ *
+ * 可遍历任何带有 length 属性和数字键的类数组对象
  * @param {ArrayLike<V>} tree  树形数据
  * @param {Function} iterator  迭代函数, 返回值为true时continue, 返回值为false时break
  * @param {string} children 定制子元素的key
  * @param {boolean} isReverse  是否反向遍历
  * @returns {any[]} 新的一棵树
  */
-function forEachMap(tree, iterator, children = 'children', isReverse = false) {
+function mapDeep(tree, iterator, children = 'children', isReverse = false) {
     let isBreak = false;
     const newTree = [];
     const walk = (arr, parent, newTree, level = 0) => {
@@ -89,7 +95,7 @@ function forEachMap(tree, iterator, children = 'children', isReverse = false) {
                 else if (re === true) {
                     continue;
                 }
-                newTree.push(re);
+                newTree.push(objectOmit(re, [children]));
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
                     newTree[newTree.length - 1][children] = [];
@@ -115,7 +121,7 @@ function forEachMap(tree, iterator, children = 'children', isReverse = false) {
                 else if (re === true) {
                     continue;
                 }
-                newTree.push(re);
+                newTree.push(objectOmit(re, [children]));
                 // @ts-ignore
                 if (arr[i] && Array.isArray(arr[i][children])) {
                     newTree[newTree.length - 1][children] = [];
@@ -301,20 +307,36 @@ function flatTree(treeList, options = defaultFieldOptions) {
 }
 /**
  * 模糊搜索函数，返回包含搜索字符的节点及其祖先节点, 适用于树型组件的字符过滤功能
- * @param {any[]} nodes
- * @param {string} query
+ * 以下搜索条件二选一，按先后优先级处理：
+ * 1. 过滤函数filter, 返回true/false
+ * 2. 匹配关键词，支持是否启用忽略大小写来判断
+ *
+ * 有以下特性：
+ * 1. 可配置removeEmptyChild字段，来决定是否移除搜索结果中的空children字段
+ * 2. 若无任何过滤条件或keyword模式匹配且keyword为空串，返回原对象；其他情况返回新数组
+ * @param {V[]} nodes
+ * @param {IFilterCondition} filterCondition
  * @param {ISearchTreeOpts} options
- * @returns {any[]}
+ * @returns {V[]}
  */
-function fuzzySearchTree(nodes, query, options = defaultSearchTreeOptions) {
+function fuzzySearchTree(nodes, filterCondition, options = defaultSearchTreeOptions) {
+    if (!objectHas(filterCondition, 'filter') &&
+        (!objectHas(filterCondition, 'keyword') || isEmpty(filterCondition.keyword))) {
+        return nodes;
+    }
     const result = [];
     for (const node of nodes) {
         // 递归检查子节点是否匹配
         const matchedChildren = node[options.childField] && node[options.childField].length > 0
-            ? fuzzySearchTree(node[options.childField] || [], query, options)
+            ? fuzzySearchTree(node[options.childField] || [], filterCondition, options)
             : [];
         // 检查当前节点是否匹配或者有匹配的子节点
-        if (node[options.nameField].toLowerCase().includes(query.toLowerCase()) || matchedChildren.length > 0) {
+        if ((objectHas(filterCondition, 'filter')
+            ? filterCondition.filter(node)
+            : !options.ignoreCase
+                ? node[options.nameField].includes(filterCondition.keyword)
+                : node[options.nameField].toLowerCase().includes(filterCondition.keyword.toLowerCase())) ||
+            matchedChildren.length > 0) {
             // 将当前节点加入结果中
             if (node[options.childField]) {
                 if (matchedChildren.length > 0) {
@@ -323,7 +345,7 @@ function fuzzySearchTree(nodes, query, options = defaultSearchTreeOptions) {
                         [options.childField]: matchedChildren // 包含匹配的子节点
                     });
                 }
-                else if (options.ignoreEmptyChild) {
+                else if (options.removeEmptyChild) {
                     node[options.childField] && delete node[options.childField];
                     result.push({
                         ...node
@@ -347,4 +369,4 @@ function fuzzySearchTree(nodes, query, options = defaultSearchTreeOptions) {
     return result;
 }
 
-export { buildTree, flatTree, forEachDeep, forEachMap, formatTree, fuzzySearchTree, searchTreeById };
+export { buildTree, flatTree, forEachDeep, formatTree, fuzzySearchTree, mapDeep, searchTreeById };

package/lib/es/type.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/unique.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/url.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/validator.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/variable.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/watermark.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/es/we-decode.js

@@ -1,5 +1,5 @@
 /*!
- * sculp-js v1.7.0
+ * sculp-js v1.7.2
  * (c) 2023-present chandq
  * Released under the MIT License.
  */

package/lib/index.d.ts

@@ -380,7 +380,7 @@ declare function objectMap<O extends AnyObject, T>(obj: O, iterator: (val: O[key
  */
 declare function objectPick<O extends AnyObject, K extends Extract<keyof O, string>[]>(obj: O, keys: K): Pick<O, ArrayElements<K>>;
 /**
- * 对象祛除
+ * 对象去除
  * @param {O} obj
  * @param {K} keys
  * @returns {Pick<O, ArrayElements<K>>}
@@ -410,11 +410,15 @@ declare function objectGet(obj: AnyObject, path: string, strict?: boolean): {
 };
 /**
  * 深拷贝堪称完全体 即：任何类型的数据都会被深拷贝
- * @param {AnyObject | AnyArray} obj
+ *
+ * 包含对null、原始值、对象循环引用的处理
+ *
+ * 对Map、Set、ArrayBuffer、Date、RegExp、Array、Object及原型链属性方法执行深拷贝
+ * @param {T} source
  * @param {WeakMap} map
- * @returns {AnyObject | AnyArray}
+ * @returns {T}
  */
-declare function cloneDeep(obj: Object, map?: WeakMap<object, any>): AnyObject | AnyArray;
+declare function cloneDeep<T>(source: T, map?: WeakMap<any, any>): T;
 
 /**
  * 标准化路径
@@ -762,7 +766,12 @@ interface IFieldOptions {
 interface ISearchTreeOpts {
     childField: string;
     nameField: string;
-    ignoreEmptyChild: boolean;
+    removeEmptyChild: boolean;
+    ignoreCase: boolean;
+}
+interface IFilterCondition<V> {
+    keyword?: string;
+    filter?: (args: V) => boolean;
 }
 /**
  * 深度优先遍历函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
@@ -774,14 +783,18 @@ interface ISearchTreeOpts {
  */
 declare function forEachDeep<V>(tree: ArrayLike<V>, iterator: (val: V, i: number, currentArr: ArrayLike<V>, tree: ArrayLike<V>, parent: V | null, level: number) => boolean | void, children?: string, isReverse?: boolean): void;
 /**
- * 深度优先遍历的Map函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+ * 创建一个新数组, 深度优先遍历的Map函数(支持continue和break操作), 可用于insert tree item 和 remove tree item
+ *
+ * 可遍历任何带有 length 属性和数字键的类数组对象
  * @param {ArrayLike<V>} tree  树形数据
  * @param {Function} iterator  迭代函数, 返回值为true时continue, 返回值为false时break
  * @param {string} children 定制子元素的key
  * @param {boolean} isReverse  是否反向遍历
  * @returns {any[]} 新的一棵树
  */
-declare function forEachMap<V>(tree: ArrayLike<V>, iterator: (val: V, i: number, currentArr: ArrayLike<V>, tree: ArrayLike<V>, parent: V | null, level: number) => boolean | any, children?: string, isReverse?: boolean): any[];
+declare function mapDeep<T>(tree: T[], iterator: (val: T, i: number, currentArr: T[], tree: T[], parent: T | null, level: number) => {
+    [k: string | number]: any;
+} | boolean, children?: string, isReverse?: boolean): any[];
 type IdLike = number | string;
 interface ITreeConf {
     id: string | number;
@@ -851,12 +864,19 @@ declare function formatTree(list: any[], options?: IFieldOptions): any[];
 declare function flatTree(treeList: any[], options?: IFieldOptions): any[];
 /**
  * 模糊搜索函数，返回包含搜索字符的节点及其祖先节点, 适用于树型组件的字符过滤功能
- * @param {any[]} nodes
- * @param {string} query
+ * 以下搜索条件二选一，按先后优先级处理：
+ * 1. 过滤函数filter, 返回true/false
+ * 2. 匹配关键词，支持是否启用忽略大小写来判断
+ *
+ * 有以下特性：
+ * 1. 可配置removeEmptyChild字段，来决定是否移除搜索结果中的空children字段
+ * 2. 若无任何过滤条件或keyword模式匹配且keyword为空串，返回原对象；其他情况返回新数组
+ * @param {V[]} nodes
+ * @param {IFilterCondition} filterCondition
  * @param {ISearchTreeOpts} options
- * @returns {any[]}
+ * @returns {V[]}
  */
-declare function fuzzySearchTree(nodes: any[], query: string, options?: ISearchTreeOpts): any[];
+declare function fuzzySearchTree<V>(nodes: V[], filterCondition: IFilterCondition<V>, options?: ISearchTreeOpts): V[];
 
 /**
  * 数值安全乘法
@@ -1057,4 +1077,4 @@ declare function replaceVarFromString(sourceStr: string, targetObj: Record<strin
  */
 declare function executeInScope(code: string, scope?: Record<string, any>): any;
 
-export { type AnyArray, type AnyFunc, type AnyObject, type ArrayElements, type DateObj, type DateValue, type DebounceFunc, EMAIL_REGEX, type FileType, HEX_POOL, HTTP_URL_REGEX, type ICanvasWM, type ICompressOptions, type IFieldOptions, IPV4_REGEX, IPV6_REGEX, type ISearchTreeOpts, type ITreeConf, type IdLike, type LooseParamValue, type LooseParams, type ObjectAssignItem, type OnceFunc, PHONE_REGEX, type Params, type PartialDeep, type RandomString, type ReadyCallback, type Replacer, STRING_ARABIC_NUMERALS, STRING_LOWERCASE_ALPHA, STRING_POOL, STRING_UPPERCASE_ALPHA, type SetStyle, type SmoothScrollOptions, type Style, type ThrottleFunc, UNIQUE_NUMBER_SAFE_LENGTH, URL_REGEX, type UniqueString, type Url, type WithChildren, add, addClass, arrayEach, arrayEachAsync, arrayInsertBefore, arrayLike, arrayRemove, asyncMap, buildTree, calculateDate, calculateDateTime, chooseLocalFile, cloneDeep, compressImg, cookieDel, cookieGet, cookieSet, copyText, crossOriginDownload, dateParse, dateToEnd, dateToStart, debounce, decodeFromBase64, divide, downloadBlob, downloadData, downloadHref, downloadURL, encodeToBase64, escapeRegExp, executeInScope, flatTree, forEachDeep, forEachMap, formatDate, formatNumber, formatTree, fuzzySearchTree, genCanvasWM, getComputedCssVal, getGlobal, getStrWidthPx, getStyle, hasClass, isArray, isBigInt, isBoolean, isDate, isDigit, isDomReady, isEmail, isEmpty, isError, isFloat, isFunction, isIdNo, isInteger, isIpV4, isIpV6, isJsonString, isNaN, isNull, isNullOrUnDef, isNumber, isNumerical, isObject, isPhone, isPlainObject, isPrimitive, isRegExp, isString, isSymbol, isUndefined, isUrl, isValidDate, multiply, numberAbbr, numberToHex, objectAssign, objectEach, objectEachAsync, objectFill, objectGet, objectHas, objectMap, objectAssign as objectMerge, objectOmit, objectPick, onDomReady, once, parseQueryParams, parseVarFromString, pathJoin, pathNormalize, qsParse, qsStringify, randomNumber, randomString, randomUuid, removeClass, replaceVarFromString, searchTreeById, setGlobal, setStyle, smoothScroll, stringAssign, stringCamelCase, stringEscapeHtml, stringFill, stringFormat, stringKebabCase, strip, subtract, supportCanvas, throttle, tooltipEvent, typeIs, uniqueNumber, uniqueString, uniqueSymbol, urlDelParams, urlParse, urlSetParams, urlStringify, wait, weAtob, weBtoa };
+export { type AnyArray, type AnyFunc, type AnyObject, type ArrayElements, type DateObj, type DateValue, type DebounceFunc, EMAIL_REGEX, type FileType, HEX_POOL, HTTP_URL_REGEX, type ICanvasWM, type ICompressOptions, type IFieldOptions, type IFilterCondition, IPV4_REGEX, IPV6_REGEX, type ISearchTreeOpts, type ITreeConf, type IdLike, type LooseParamValue, type LooseParams, type ObjectAssignItem, type OnceFunc, PHONE_REGEX, type Params, type PartialDeep, type RandomString, type ReadyCallback, type Replacer, STRING_ARABIC_NUMERALS, STRING_LOWERCASE_ALPHA, STRING_POOL, STRING_UPPERCASE_ALPHA, type SetStyle, type SmoothScrollOptions, type Style, type ThrottleFunc, UNIQUE_NUMBER_SAFE_LENGTH, URL_REGEX, type UniqueString, type Url, type WithChildren, add, addClass, arrayEach, arrayEachAsync, arrayInsertBefore, arrayLike, arrayRemove, asyncMap, buildTree, calculateDate, calculateDateTime, chooseLocalFile, cloneDeep, compressImg, cookieDel, cookieGet, cookieSet, copyText, crossOriginDownload, dateParse, dateToEnd, dateToStart, debounce, decodeFromBase64, divide, downloadBlob, downloadData, downloadHref, downloadURL, encodeToBase64, escapeRegExp, executeInScope, flatTree, forEachDeep, formatDate, formatNumber, formatTree, fuzzySearchTree, genCanvasWM, getComputedCssVal, getGlobal, getStrWidthPx, getStyle, hasClass, isArray, isBigInt, isBoolean, isDate, isDigit, isDomReady, isEmail, isEmpty, isError, isFloat, isFunction, isIdNo, isInteger, isIpV4, isIpV6, isJsonString, isNaN, isNull, isNullOrUnDef, isNumber, isNumerical, isObject, isPhone, isPlainObject, isPrimitive, isRegExp, isString, isSymbol, isUndefined, isUrl, isValidDate, mapDeep, multiply, numberAbbr, numberToHex, objectAssign, objectEach, objectEachAsync, objectFill, objectGet, objectHas, objectMap, objectAssign as objectMerge, objectOmit, objectPick, onDomReady, once, parseQueryParams, parseVarFromString, pathJoin, pathNormalize, qsParse, qsStringify, randomNumber, randomString, randomUuid, removeClass, replaceVarFromString, searchTreeById, setGlobal, setStyle, smoothScroll, stringAssign, stringCamelCase, stringEscapeHtml, stringFill, stringFormat, stringKebabCase, strip, subtract, supportCanvas, throttle, tooltipEvent, typeIs, uniqueNumber, uniqueString, uniqueSymbol, urlDelParams, urlParse, urlSetParams, urlStringify, wait, weAtob, weBtoa };