@allahjs/utils 1.11.0 → 1.12.0

package/dist/core/diffUtils/index.cjs

@@ -0,0 +1,219 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var character = require('../../node_modules/.pnpm/diff@8.0.3/node_modules/diff/libesm/diff/character.cjs');
+var array = require('../../node_modules/.pnpm/diff@8.0.3/node_modules/diff/libesm/diff/array.cjs');
+var index = require('../arrayUtils/index.cjs');
+
+var _a;
+class DiffUtils {
+}
+_a = DiffUtils;
+/**
+ * 生成对象对数据
+ * @param oldObj 旧的对象
+ * @param newObj 新的对象
+ */
+DiffUtils.buildDiffObj = (oldObj, newObj) => {
+    const diffObj = {};
+    const keys = Object.keys(newObj);
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        // 如果两个相等
+        if (oldObj[key] === newObj[key]) {
+            continue;
+        }
+        // 都是null
+        if (oldObj[key] === null && newObj[key] === null) {
+            continue;
+        }
+        // 都是undefined
+        if (oldObj[key] === undefined && newObj[key] === undefined) {
+            continue;
+        }
+        if (typeof oldObj[key] === 'string') {
+            // 如果是空字符串和null或者undefined
+            if (oldObj[key] === '' && (newObj[key] === null || newObj[key] === undefined)) {
+                continue;
+            }
+            diffObj[key] = character.diffChars(oldObj[key], newObj[key] || '');
+        }
+        else if (typeof newObj[key] === 'number') {
+            diffObj[key] = [
+                {
+                    count: 1,
+                    removed: true,
+                    value: oldObj[key]
+                },
+                {
+                    count: 1,
+                    added: true,
+                    value: newObj[key]
+                }
+            ];
+        }
+        else if ((oldObj[key] === undefined || oldObj[key] === null) &&
+            typeof newObj[key] === 'string') {
+            diffObj[key] = character.diffChars('', newObj[key]);
+        }
+        else if (Array.isArray(oldObj[key]) || Array.isArray(newObj[key])) {
+            // 比较两个数组是否相同
+            const b = index.default.isEqual(oldObj[key], newObj[key]);
+            if (b) {
+                continue;
+            }
+            if (!oldObj?.[key]) {
+                oldObj[key] = [];
+            }
+            if (typeof oldObj[key][0] === 'string' || typeof newObj[key][0] === 'string') {
+                diffObj[key] = _a.buildDiffArray(oldObj[key], newObj[key]);
+            }
+            else {
+                // 智能对比对象数组：基于唯一标识字段判断新增、删除、修改
+                diffObj[key] = _a.buildDiffObjectArray(oldObj[key], newObj[key]);
+            }
+        }
+    }
+    return diffObj;
+};
+/**
+ * 构建全是添加的数据
+ * @param obj 操作的对象
+ */
+DiffUtils.buildNewDiffObj = (obj) => {
+    const changeDate = {};
+    Object.keys(obj).forEach(key => {
+        if (Array.isArray(obj[key])) {
+            changeDate[key] = {
+                added: obj[key],
+                removed: [],
+                noed: []
+            };
+        }
+        else {
+            changeDate[key] = [
+                {
+                    count: 1,
+                    added: true,
+                    value: obj[key]
+                }
+            ];
+        }
+    });
+    return changeDate;
+};
+DiffUtils.buildDiffArray = (oldArray, newArray) => {
+    const diffList = array.diffArrays(oldArray, newArray);
+    const diffObj = {
+        added: [],
+        removed: [],
+        noed: [],
+        change: false
+    };
+    diffList.forEach((item) => {
+        if (item.added) {
+            if (Array.isArray(item.value)) {
+                diffObj.added.push(...item.value);
+            }
+            else {
+                diffObj.added.push(item.value);
+            }
+        }
+        else if (item.removed) {
+            diffObj.change = true;
+            if (Array.isArray(item.value)) {
+                diffObj.removed.push(...item.value);
+            }
+            else {
+                diffObj.removed.push(item.value);
+            }
+        }
+        else {
+            diffObj.change = true;
+            if (Array.isArray(item.value)) {
+                diffObj.noed.push(...item.value);
+            }
+            else {
+                diffObj.noed.push(item.value);
+            }
+        }
+    });
+    return diffObj;
+};
+/**
+ * 比较对象数组，基于唯一标识字段判断新增、删除、无变化，，老的会存在同一组数据被误判为"删除+新增"
+ * @param oldArray 旧的对象数组
+ * @param newArray 新的对象数组
+ * @returns 包含added（新增）、removed（删除）、noed（无变化）的对象
+ */
+DiffUtils.buildDiffObjectArray = (oldArray, newArray) => {
+    // 常见的唯一标识字段名
+    const idFields = ['id', 'code', 'adminCode', 'disId', 'key', '_id'];
+    // 自动识别唯一标识字段
+    let idField = '';
+    if (newArray.length > 0) {
+        for (const field of idFields) {
+            if (newArray[0]?.[field] !== undefined) {
+                idField = field;
+                break;
+            }
+        }
+    }
+    // 如果没有找到唯一标识字段，降级为简单的 JSON 字符串比较
+    if (!idField) {
+        const oldStrList = oldArray.map((item) => JSON.stringify(item));
+        const newStrList = newArray.map((item) => JSON.stringify(item));
+        const diffList = array.diffArrays(oldStrList, newStrList);
+        const result = {
+            added: [],
+            removed: [],
+            noed: []
+        };
+        diffList.forEach(item => {
+            if (item.added) {
+                result.added.push(item.value.map((item2) => JSON.parse(item2)));
+            }
+            else if (item.removed) {
+                result.removed.push(item.value.map((item2) => JSON.parse(item2)));
+            }
+            else {
+                result.noed.push(item.value.map((item2) => JSON.parse(item2)));
+            }
+        });
+        return result;
+    }
+    // 基于唯一标识字段进行智能比较
+    const oldMap = new Map(oldArray.map(item => [item[idField], item]));
+    const newMap = new Map(newArray.map(item => [item[idField], item]));
+    const result = {
+        added: [],
+        removed: [],
+        noed: []
+    };
+    // 找出新增和无变化的记录
+    newArray.forEach(newItem => {
+        const idValue = newItem[idField];
+        const oldItem = oldMap.get(idValue);
+        if (!oldItem) {
+            // 新增的记录
+            result.added.push([newItem]);
+        }
+        else {
+            // 唯一标识相同即认为无变化（忽略字段值的变化）
+            result.noed.push([newItem]);
+        }
+    });
+    // 找出删除的记录
+    oldArray.forEach(oldItem => {
+        const idValue = oldItem[idField];
+        if (!newMap.has(idValue)) {
+            // 删除的记录
+            result.removed.push([oldItem]);
+        }
+    });
+    return result;
+};
+
+exports.default = DiffUtils;
+//# sourceMappingURL=index.cjs.map

package/dist/core/diffUtils/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sources":["../../../src/core/diffUtils/index.ts"],"sourcesContent":[null],"names":["diffChars","arrayUtils","diffArrays"],"mappings":"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"}

package/dist/core/diffUtils/index.d.ts

@@ -0,0 +1,32 @@
+declare class DiffUtils {
+    /**
+     * 生成对象对数据
+     * @param oldObj 旧的对象
+     * @param newObj 新的对象
+     */
+    static buildDiffObj: (oldObj: any, newObj: any) => any;
+    /**
+     * 构建全是添加的数据
+     * @param obj 操作的对象
+     */
+    static buildNewDiffObj: (obj: any) => any;
+    static buildDiffArray: (oldArray: any[], newArray: any[]) => {
+        added: any[];
+        removed: any[];
+        noed: any[];
+        change: boolean;
+    };
+    /**
+     * 比较对象数组，基于唯一标识字段判断新增、删除、无变化，，老的会存在同一组数据被误判为"删除+新增"
+     * @param oldArray 旧的对象数组
+     * @param newArray 新的对象数组
+     * @returns 包含added（新增）、removed（删除）、noed（无变化）的对象
+     */
+    static buildDiffObjectArray: (oldArray: any[], newArray: any[]) => {
+        added: any[][];
+        removed: any[][];
+        noed: any[][];
+    };
+}
+
+export { DiffUtils as default };

package/dist/core/fileUtils/index.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const fileUtils = {
+    /**
+     * 判断是否为图片文件
+     * @param filename 文件名
+     * @returns 是否为图片文件
+     */
+    isImageFile(filename) {
+        const rgx = '(JPEG|jpeg|JPG|jpg|gif|GIF|HEIC|heic|BMP|bmp|PNG|png)$';
+        const re = new RegExp(rgx, 'i');
+        const fileExt = filename.replace(/.+\./, '');
+        return re.test(fileExt);
+    }
+};
+
+exports.default = fileUtils;
+exports.fileUtils = fileUtils;
+//# sourceMappingURL=index.cjs.map

package/dist/core/fileUtils/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sources":["../../../src/core/fileUtils/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAAO,MAAM,SAAS,GAAG;AACvB;;;;AAIG;AACH,IAAA,WAAW,CAAC,QAAgB,EAAA;QAC1B,MAAM,GAAG,GAAG,wDAAwD;QACpE,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;QAC/B,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;AAC5C,QAAA,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IACzB;;;;;;"}

package/dist/core/fileUtils/index.d.ts

@@ -0,0 +1,10 @@
+declare const fileUtils: {
+    /**
+     * 判断是否为图片文件
+     * @param filename 文件名
+     * @returns 是否为图片文件
+     */
+    isImageFile(filename: string): boolean;
+};
+
+export { fileUtils as default, fileUtils };

package/dist/core/index.cjs

@@ -2,12 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index$9 = require('./arrayUtils/index.cjs');
-var index$8 = require('./stringUtils/index.cjs');
-var index$7 = require('./objectUtils/index.cjs');
-var index$6 = require('./numberUtils/index.cjs');
+var index$e = require('./arrayUtils/index.cjs');
+var index$d = require('./stringUtils/index.cjs');
+var index$c = require('./objectUtils/index.cjs');
+var index$b = require('./numberUtils/index.cjs');
 var index$4 = require('./colorUtils/index.cjs');
-var index$5 = require('./dateUtils/index.cjs');
+var index$a = require('./dateUtils/index.cjs');
+var index$9 = require('./diffUtils/index.cjs');
+var index$8 = require('./fileUtils/index.cjs');
+var index$7 = require('./cryptoUtils/index.cjs');
+var index$6 = require('./pageUtils/index.cjs');
+var index$5 = require('./storageUtils/index.cjs');
 var index$2 = require('./asyncUtils/index.cjs');
 var index$1 = require('./constants/index.cjs');
 var index$3 = require('./validationUtils/index.cjs');
@@ -20,11 +25,16 @@ var index$3 = require('./validationUtils/index.cjs');
  * 默认导出所有工具对象的集合
  */
 var index = {
-    arrayUtils: index$9.default,
-    stringUtils: index$8.default,
-    objectUtils: index$7.default,
-    numberUtils: index$6.default,
-    dateUtils: index$5.default,
+    arrayUtils: index$e.default,
+    stringUtils: index$d.default,
+    objectUtils: index$c.default,
+    numberUtils: index$b.default,
+    dateUtils: index$a.default,
+    diffUtils: index$9.default,
+    fileUtils: index$8.default,
+    cryptoUtils: index$7.default,
+    pageUtils: index$6.default,
+    storageUtils: index$5.default,
     asyncUtils: index$2.default,
     colorUtils: index$4.default,
     validationUtils: index$3.default,

package/dist/core/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/core/index.ts"],"sourcesContent":[null],"names":["arrayUtils","stringUtils","objectUtils","numberUtils","dateUtils","asyncUtils","colorUtils","validationUtils","AsyncQueue","constants"],"mappings":";;;;;;;;;;;;;;AAAA;;;AAGG;AAYH;;AAEG;AACH,YAAe;gBACbA,eAAU;iBACVC,eAAW;iBACXC,eAAW;iBACXC,eAAW;eACXC,eAAS;gBACTC,eAAU;gBACVC,eAAU;qBACVC,eAAe;gBACfC,kBAAU;eACVC;CACD;;;;"}
+{"version":3,"file":"index.cjs","sources":["../../src/core/index.ts"],"sourcesContent":[null],"names":["arrayUtils","stringUtils","objectUtils","numberUtils","dateUtils","diffUtils","fileUtils","cryptoUtils","pageUtils","storageUtils","asyncUtils","colorUtils","validationUtils","AsyncQueue","constants"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;;AAGG;AAiBH;;AAEG;AACH,YAAe;gBACbA,eAAU;iBACVC,eAAW;iBACXC,eAAW;iBACXC,eAAW;eACXC,eAAS;eACTC,eAAS;eACTC,eAAS;iBACTC,eAAW;eACXC,eAAS;kBACTC,eAAY;gBACZC,eAAU;gBACVC,eAAU;qBACVC,eAAe;gBACfC,kBAAU;eACVC;CACD;;;;"}

package/dist/core/index.d.ts

@@ -1,7 +1,9 @@
+import { ITablePage } from './pageUtils/index.js';
 import * as dayjs from 'dayjs';
 import { IListChangeVo } from './arrayUtils/index.js';
 import { IEnumObj } from '../form/types.js';
 import { IOptions2, ITreeNode, IOptions } from '../types/data/index.js';
+import DiffUtils from './diffUtils/index.js';
 import { AsyncQueue } from './asyncUtils/index.js';
 import * as index from './constants/index.js';
 
@@ -114,6 +116,47 @@ declare const _default: {
             endDay: number | undefined;
         };
     };
+    diffUtils: typeof DiffUtils;
+    fileUtils: {
+        isImageFile(filename: string): boolean;
+    };
+    cryptoUtils: {
+        uuid(): Promise<string>;
+        md5(input: string, salt?: string): string;
+        miniUuid(): string;
+        isValidUUID(uuid: string): Promise<boolean>;
+        rsaEncrypt(text: string, publicKey: string): Promise<string | false>;
+        rsaDecrypt(encryptedText: string, privateKey: string): Promise<string | false>;
+        generateRSAKeyPair(keySize?: number): Promise<{
+            publicKey: string;
+            privateKey: string;
+        } | null>;
+        aesEncrypt(text: string, key: string): string;
+        aesDecrypt(encryptedText: string, key: string): string;
+    };
+    pageUtils: {
+        isLastPageData: (data: ITablePage<any>) => boolean;
+        buildPageConfig: (data?: ITablePage<any>) => {
+            current: number;
+            pageSize: number;
+            total: number;
+            showQuickJumper: boolean;
+            showSizeChanger: boolean;
+            showTotal: (total: number, range: number[]) => string;
+        };
+        defaultTableData: ITablePage<any>;
+        handleReqListParams: (v: any, sort: any) => any;
+    };
+    storageUtils: {
+        getItem: <T = any>(key: string, cacheType?: "local" | "session") => T;
+        getSItem: <T = any>(key: string) => T;
+        setItem: (key: string, value: any, cacheType?: "local" | "session") => void;
+        setSItem: (key: string, value: any) => void;
+        removeItem: (key: string, cacheType?: "local" | "session") => void;
+        removeSItem: (key: string) => void;
+        existsItem: (key: string, cacheType?: "local" | "session") => boolean;
+        existsSItem: (key: string) => boolean;
+    };
     asyncUtils: {
         delay(ms: number): Promise<void>;
         withTimeout<T>(promise: Promise<T>, timeout: number, timeoutMessage?: string): Promise<T>;

package/dist/esm/core/diffUtils/index.d.ts

@@ -0,0 +1,32 @@
+declare class DiffUtils {
+    /**
+     * 生成对象对数据
+     * @param oldObj 旧的对象
+     * @param newObj 新的对象
+     */
+    static buildDiffObj: (oldObj: any, newObj: any) => any;
+    /**
+     * 构建全是添加的数据
+     * @param obj 操作的对象
+     */
+    static buildNewDiffObj: (obj: any) => any;
+    static buildDiffArray: (oldArray: any[], newArray: any[]) => {
+        added: any[];
+        removed: any[];
+        noed: any[];
+        change: boolean;
+    };
+    /**
+     * 比较对象数组，基于唯一标识字段判断新增、删除、无变化，，老的会存在同一组数据被误判为"删除+新增"
+     * @param oldArray 旧的对象数组
+     * @param newArray 新的对象数组
+     * @returns 包含added（新增）、removed（删除）、noed（无变化）的对象
+     */
+    static buildDiffObjectArray: (oldArray: any[], newArray: any[]) => {
+        added: any[][];
+        removed: any[][];
+        noed: any[][];
+    };
+}
+
+export { DiffUtils as default };

package/dist/esm/core/diffUtils/index.js

@@ -0,0 +1,215 @@
+import { diffChars } from '../../node_modules/.pnpm/diff@8.0.3/node_modules/diff/libesm/diff/character.js';
+import { diffArrays } from '../../node_modules/.pnpm/diff@8.0.3/node_modules/diff/libesm/diff/array.js';
+import arrayUtils from '../arrayUtils/index.js';
+
+var _a;
+class DiffUtils {
+}
+_a = DiffUtils;
+/**
+ * 生成对象对数据
+ * @param oldObj 旧的对象
+ * @param newObj 新的对象
+ */
+DiffUtils.buildDiffObj = (oldObj, newObj) => {
+    const diffObj = {};
+    const keys = Object.keys(newObj);
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        // 如果两个相等
+        if (oldObj[key] === newObj[key]) {
+            continue;
+        }
+        // 都是null
+        if (oldObj[key] === null && newObj[key] === null) {
+            continue;
+        }
+        // 都是undefined
+        if (oldObj[key] === undefined && newObj[key] === undefined) {
+            continue;
+        }
+        if (typeof oldObj[key] === 'string') {
+            // 如果是空字符串和null或者undefined
+            if (oldObj[key] === '' && (newObj[key] === null || newObj[key] === undefined)) {
+                continue;
+            }
+            diffObj[key] = diffChars(oldObj[key], newObj[key] || '');
+        }
+        else if (typeof newObj[key] === 'number') {
+            diffObj[key] = [
+                {
+                    count: 1,
+                    removed: true,
+                    value: oldObj[key]
+                },
+                {
+                    count: 1,
+                    added: true,
+                    value: newObj[key]
+                }
+            ];
+        }
+        else if ((oldObj[key] === undefined || oldObj[key] === null) &&
+            typeof newObj[key] === 'string') {
+            diffObj[key] = diffChars('', newObj[key]);
+        }
+        else if (Array.isArray(oldObj[key]) || Array.isArray(newObj[key])) {
+            // 比较两个数组是否相同
+            const b = arrayUtils.isEqual(oldObj[key], newObj[key]);
+            if (b) {
+                continue;
+            }
+            if (!oldObj?.[key]) {
+                oldObj[key] = [];
+            }
+            if (typeof oldObj[key][0] === 'string' || typeof newObj[key][0] === 'string') {
+                diffObj[key] = _a.buildDiffArray(oldObj[key], newObj[key]);
+            }
+            else {
+                // 智能对比对象数组：基于唯一标识字段判断新增、删除、修改
+                diffObj[key] = _a.buildDiffObjectArray(oldObj[key], newObj[key]);
+            }
+        }
+    }
+    return diffObj;
+};
+/**
+ * 构建全是添加的数据
+ * @param obj 操作的对象
+ */
+DiffUtils.buildNewDiffObj = (obj) => {
+    const changeDate = {};
+    Object.keys(obj).forEach(key => {
+        if (Array.isArray(obj[key])) {
+            changeDate[key] = {
+                added: obj[key],
+                removed: [],
+                noed: []
+            };
+        }
+        else {
+            changeDate[key] = [
+                {
+                    count: 1,
+                    added: true,
+                    value: obj[key]
+                }
+            ];
+        }
+    });
+    return changeDate;
+};
+DiffUtils.buildDiffArray = (oldArray, newArray) => {
+    const diffList = diffArrays(oldArray, newArray);
+    const diffObj = {
+        added: [],
+        removed: [],
+        noed: [],
+        change: false
+    };
+    diffList.forEach((item) => {
+        if (item.added) {
+            if (Array.isArray(item.value)) {
+                diffObj.added.push(...item.value);
+            }
+            else {
+                diffObj.added.push(item.value);
+            }
+        }
+        else if (item.removed) {
+            diffObj.change = true;
+            if (Array.isArray(item.value)) {
+                diffObj.removed.push(...item.value);
+            }
+            else {
+                diffObj.removed.push(item.value);
+            }
+        }
+        else {
+            diffObj.change = true;
+            if (Array.isArray(item.value)) {
+                diffObj.noed.push(...item.value);
+            }
+            else {
+                diffObj.noed.push(item.value);
+            }
+        }
+    });
+    return diffObj;
+};
+/**
+ * 比较对象数组，基于唯一标识字段判断新增、删除、无变化，，老的会存在同一组数据被误判为"删除+新增"
+ * @param oldArray 旧的对象数组
+ * @param newArray 新的对象数组
+ * @returns 包含added（新增）、removed（删除）、noed（无变化）的对象
+ */
+DiffUtils.buildDiffObjectArray = (oldArray, newArray) => {
+    // 常见的唯一标识字段名
+    const idFields = ['id', 'code', 'adminCode', 'disId', 'key', '_id'];
+    // 自动识别唯一标识字段
+    let idField = '';
+    if (newArray.length > 0) {
+        for (const field of idFields) {
+            if (newArray[0]?.[field] !== undefined) {
+                idField = field;
+                break;
+            }
+        }
+    }
+    // 如果没有找到唯一标识字段，降级为简单的 JSON 字符串比较
+    if (!idField) {
+        const oldStrList = oldArray.map((item) => JSON.stringify(item));
+        const newStrList = newArray.map((item) => JSON.stringify(item));
+        const diffList = diffArrays(oldStrList, newStrList);
+        const result = {
+            added: [],
+            removed: [],
+            noed: []
+        };
+        diffList.forEach(item => {
+            if (item.added) {
+                result.added.push(item.value.map((item2) => JSON.parse(item2)));
+            }
+            else if (item.removed) {
+                result.removed.push(item.value.map((item2) => JSON.parse(item2)));
+            }
+            else {
+                result.noed.push(item.value.map((item2) => JSON.parse(item2)));
+            }
+        });
+        return result;
+    }
+    // 基于唯一标识字段进行智能比较
+    const oldMap = new Map(oldArray.map(item => [item[idField], item]));
+    const newMap = new Map(newArray.map(item => [item[idField], item]));
+    const result = {
+        added: [],
+        removed: [],
+        noed: []
+    };
+    // 找出新增和无变化的记录
+    newArray.forEach(newItem => {
+        const idValue = newItem[idField];
+        const oldItem = oldMap.get(idValue);
+        if (!oldItem) {
+            // 新增的记录
+            result.added.push([newItem]);
+        }
+        else {
+            // 唯一标识相同即认为无变化（忽略字段值的变化）
+            result.noed.push([newItem]);
+        }
+    });
+    // 找出删除的记录
+    oldArray.forEach(oldItem => {
+        const idValue = oldItem[idField];
+        if (!newMap.has(idValue)) {
+            // 删除的记录
+            result.removed.push([oldItem]);
+        }
+    });
+    return result;
+};
+
+export { DiffUtils as default };
+//# sourceMappingURL=index.js.map

package/dist/esm/core/diffUtils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../../../../src/core/diffUtils/index.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}