@zcrkey/js-utils 0.0.7 → 0.0.9

package/dist/cjs/color.d.ts

@@ -101,10 +101,10 @@ export default class CrColorUtil {
      */
     static numberToHex(num: number): string;
     /**
-   * ARGB颜色字符串 转 十进制数值（8位带透明通道，专用于带透明的颜色运算）
-   * @param argb 支持 #AARRGGBB / AARRGGBB 格式 例：#80FFFFFF、80FFFFFF
-   * @returns 十进制数值 例：#80FFFFFF → 2147483647，非法入参/格式错误返回 0
-   */
+     * ARGB颜色字符串 转 十进制数值（8位带透明通道，专用于带透明的颜色运算）
+     * @param argb 支持 #AARRGGBB / AARRGGBB 格式 例：#80FFFFFF、80FFFFFF
+     * @returns 十进制数值 例：#80FFFFFF → 2147483647，非法入参/格式错误返回 0
+     */
     static argbToNumber(argb: string): number;
     /**
      * 十进制数值 转回 ARGB颜色字符串（8位带透明通道，标准#AARRGGBB格式）

package/dist/cjs/color.js

@@ -116,7 +116,11 @@ var CrColorUtil = class {
    */
   static hsvToHex(h, s, v) {
     const [r, g, b] = this.hsv2rgb(h, s, v);
-    return this.rgbToHex(Math.round(r * 255), Math.round(g * 255), Math.round(b * 255));
+    return this.rgbToHex(
+      Math.round(r * 255),
+      Math.round(g * 255),
+      Math.round(b * 255)
+    );
   }
   /**
    * hex 转 hsv 格式
@@ -200,10 +204,10 @@ var CrColorUtil = class {
     return `#${r}${g}${b}`;
   }
   /**
-  * ARGB颜色字符串 转 十进制数值（8位带透明通道，专用于带透明的颜色运算）
-  * @param argb 支持 #AARRGGBB / AARRGGBB 格式 例：#80FFFFFF、80FFFFFF
-  * @returns 十进制数值 例：#80FFFFFF → 2147483647，非法入参/格式错误返回 0
-  */
+   * ARGB颜色字符串 转 十进制数值（8位带透明通道，专用于带透明的颜色运算）
+   * @param argb 支持 #AARRGGBB / AARRGGBB 格式 例：#80FFFFFF、80FFFFFF
+   * @returns 十进制数值 例：#80FFFFFF → 2147483647，非法入参/格式错误返回 0
+   */
   static argbToNumber(argb) {
     const pureArgb = argb.replace("#", "");
     if (!/^[0-9a-fA-F]{8}$/.test(pureArgb)) {

package/dist/cjs/index.d.ts

@@ -1,3 +1,4 @@
+export { default as CrColorUtil } from './color';
 export type * from './eventCenter';
 export { default as CrEventCenter } from './eventCenter';
 export type * from './obj';
@@ -6,4 +7,3 @@ export { default as CrStorage } from './storage';
 export type * from './tree';
 export { default as CrTreeUtil } from './tree';
 export { default as CrUtil } from './util';
-export { default as CrColorUtil } from './color';

package/dist/cjs/index.js

@@ -37,12 +37,12 @@ __export(src_exports, {
   CrUtil: () => import_util.default
 });
 module.exports = __toCommonJS(src_exports);
+var import_color = __toESM(require("./color"));
 var import_eventCenter = __toESM(require("./eventCenter"));
 var import_obj = __toESM(require("./obj"));
 var import_storage = __toESM(require("./storage"));
 var import_tree = __toESM(require("./tree"));
 var import_util = __toESM(require("./util"));
-var import_color = __toESM(require("./color"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CrColorUtil,

package/dist/cjs/tree.d.ts

@@ -21,13 +21,17 @@ export default class CrTreeUtil {
      * 树形数据转列表数据
      * @param tree
      * @param options
+     * @param options.idField 默认值 id
+     * @param options.parentIdField 默认值 parentId
      * @param options.childrenField 默认值 children
-     * @param options.isCloneDeep 是否需要深拷贝, 默认值为 true
+     * @param options.rootParentValue 根节点的父值，默认值 null
      * @returns
      */
     static treeToList<T extends Record<string, any>>(tree: T[], options?: {
+        idField?: string;
+        parentIdField?: string;
         childrenField?: string;
-        isCloneDeep?: boolean;
+        rootParentValue?: any;
     }): T[];
     /**
      * 获取扁平化父数据(包含自身)

package/dist/cjs/tree.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/tree.ts
@@ -23,6 +33,7 @@ __export(tree_exports, {
 });
 module.exports = __toCommonJS(tree_exports);
 var import_lodash = require("lodash");
+var import_util = __toESM(require("./util"));
 var CrTreeUtil = class {
   /**
    * 列表数据转树形数据
@@ -83,24 +94,47 @@ var CrTreeUtil = class {
    * 树形数据转列表数据
    * @param tree
    * @param options
+   * @param options.idField 默认值 id
+   * @param options.parentIdField 默认值 parentId
    * @param options.childrenField 默认值 children
-   * @param options.isCloneDeep 是否需要深拷贝, 默认值为 true
+   * @param options.rootParentValue 根节点的父值，默认值 null
    * @returns
    */
   static treeToList(tree, options) {
-    const { childrenField = "children", isCloneDeep = true } = options || {};
+    const {
+      idField = "id",
+      parentIdField = "parentId",
+      childrenField = "children",
+      rootParentValue = null
+    } = options || {};
     const result = [];
-    const queue = [...tree];
+    const originQueue = (0, import_lodash.cloneDeep)([...tree]);
+    const queue = originQueue.map((node) => ({
+      node,
+      parentId: rootParentValue
+    }));
     while (queue.length) {
-      const node = queue.shift();
+      const { node, parentId } = queue.shift();
+      if (!node || !import_util.default.isObject(node)) {
+        continue;
+      }
       const children = node[childrenField];
+      const nodeId = node[idField];
       const { [childrenField]: _, ...rest } = node;
-      result.push(rest);
-      if (children && children.length) {
-        queue.push(...children);
+      const flatNode = {
+        ...rest,
+        [parentIdField]: parentId
+      };
+      result.push(flatNode);
+      if (children && import_util.default.isArray(children) && children.length > 0) {
+        const childQueue = children.map((childNode) => ({
+          node: childNode,
+          parentId: nodeId
+        }));
+        queue.push(...childQueue);
       }
     }
-    return isCloneDeep ? (0, import_lodash.cloneDeep)(result) : result;
+    return result;
   }
   /**
    * 获取扁平化父数据(包含自身)

package/dist/cjs/util.d.ts

@@ -10,7 +10,7 @@ export default class CrUtil {
      * @param value
      * @returns boolean
      */
-    static isObject<T = any>(value: T): value is T extends object ? (T extends any[] ? never : T) : never;
+    static isObject(value: unknown): value is Record<string | number, unknown>;
     /**
      * 判断是否为空对象
      * @param value
@@ -201,9 +201,21 @@ export default class CrUtil {
      */
     static compareDataDiff(data1: any, data2: any): Record<string, "added" | "removed" | "modified">;
     /**
-     * 格式化为千分位
+     * 格式化为千分位，主要用于展示格式化
      * @param value
      * @returns 12345.6789 => 12,345.6789
      */
     static fmtThousands(value: number | string | undefined): string;
+    /**
+     * 格式化为千分位格式
+     * @param value
+     * @returns
+     */
+    static formatThousands(value?: string | number): string;
+    /**
+     * 解析千分位格式
+     * @param value
+     * @returns
+     */
+    static parseThousands(value?: string | number): string;
 }

package/dist/cjs/util.js

@@ -557,7 +557,7 @@ var CrUtil = class {
     return diffFieldSet;
   }
   /**
-   * 格式化为千分位
+   * 格式化为千分位，主要用于展示格式化
    * @param value
    * @returns 12345.6789 => 12,345.6789
    */
@@ -569,4 +569,39 @@ var CrUtil = class {
     const formattedInt = intPart.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
     return decimalPart ? `${formattedInt}.${decimalPart}` : formattedInt;
   }
+  /**
+   * 格式化为千分位格式
+   * @param value 
+   * @returns 
+   */
+  static formatThousands(value) {
+    if (value == null)
+      return "";
+    const raw = String(value).trim();
+    if (!raw)
+      return "";
+    const hasTrailingDot = raw.endsWith(".");
+    let str = raw.replace(/[^\d.-]/g, "");
+    const sign = str.startsWith("-") ? "-" : "";
+    str = str.replace(/-/g, "");
+    const [intRaw, decRaw = ""] = str.split(".", 2);
+    const intPart = intRaw.replace(/,/g, "").replace(/^0+(?=\d)/, "");
+    const formattedInt = intPart ? intPart.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : "";
+    let result = sign + formattedInt;
+    if (decRaw || hasTrailingDot)
+      result += ".";
+    if (decRaw)
+      result += decRaw;
+    return result;
+  }
+  /**
+   * 解析千分位格式
+   * @param value 
+   * @returns 
+   */
+  static parseThousands(value) {
+    if (value == null)
+      return "";
+    return String(value).trim().replace(/,/g, "").replace(/[^\d.-]/g, "").replace(/(?!^)-/g, "").replace(/(\..*)\./g, "$1");
+  }
 };

package/dist/esm/color.d.ts

@@ -101,10 +101,10 @@ export default class CrColorUtil {
      */
     static numberToHex(num: number): string;
     /**
-   * ARGB颜色字符串 转 十进制数值（8位带透明通道，专用于带透明的颜色运算）
-   * @param argb 支持 #AARRGGBB / AARRGGBB 格式 例：#80FFFFFF、80FFFFFF
-   * @returns 十进制数值 例：#80FFFFFF → 2147483647，非法入参/格式错误返回 0
-   */
+     * ARGB颜色字符串 转 十进制数值（8位带透明通道，专用于带透明的颜色运算）
+     * @param argb 支持 #AARRGGBB / AARRGGBB 格式 例：#80FFFFFF、80FFFFFF
+     * @returns 十进制数值 例：#80FFFFFF → 2147483647，非法入参/格式错误返回 0
+     */
     static argbToNumber(argb: string): number;
     /**
      * 十进制数值 转回 ARGB颜色字符串（8位带透明通道，标准#AARRGGBB格式）