@wzyjs/utils 0.0.17 → 0.0.21

package/dist/cjs/common/index.d.ts

@@ -1,5 +1,5 @@
-import { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError } from 'lodash';
-export { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, };
+import { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, find, groupBy } from 'lodash';
+export { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, find, groupBy };
 export * as consola from 'consola';
 export * from './tools';
 export * from './types';

package/dist/cjs/common/tools/index.d.ts

@@ -1,3 +1,4 @@
 export * from './string';
 export * from './object';
 export * from './other';
+export * from './number';

package/dist/cjs/common/tools/number.d.ts

@@ -0,0 +1,3 @@
+export declare const getRandomNum: (min: number, max: number) => number;
+export declare const limitDecimals: (v: string, num: number | undefined, isForce: boolean) => string;
+export declare const getFileSize: (size: number) => string;

package/dist/cjs/common/tools/number.js

@@ -0,0 +1,34 @@
+'use strict';
+
+// 取指定范围内的随机数
+const getRandomNum = (min, max) => {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+};
+// 指定小数点的位数
+const limitDecimals = (v, num = 2, isForce) => {
+    let value = parseFloat(v);
+    if (isNaN(value)) {
+        if (isForce) {
+            value = 0;
+        }
+        else {
+            return '';
+        }
+    }
+    return value.toFixed(num).toString();
+};
+// 转换成更易读的尺寸单位
+const getFileSize = (size) => {
+    let d = 'G';
+    let s = size / 1024 / 1024 / 1024;
+    if (s < 1) {
+        d = 'M';
+        s *= 1024;
+    }
+    // @ts-ignore
+    return `${(s.toFixed(1) / 1).toString()}${d}`;
+};
+
+exports.getFileSize = getFileSize;
+exports.getRandomNum = getRandomNum;
+exports.limitDecimals = limitDecimals;

package/dist/cjs/common/tools/object.d.ts

@@ -1 +1,10 @@
-export declare const checkAttr: <I>(list: I[], attr: keyof I, value?: I[keyof I] | undefined) => boolean;
+export declare const findItem: <I>(list: I[], attr: keyof I, value?: I[keyof I] | undefined) => I | undefined;
+export declare const filterParams: (params: {
+    [key: string]: any;
+}) => {};
+export declare const watch: {
+    observe(obj: {
+        [key: string]: any;
+    }, key: string, watchFun: (value: any, val: any) => undefined): void;
+    setWatcher(data?: {}, watch?: {}): void;
+};

package/dist/cjs/common/tools/object.js

@@ -1,8 +1,43 @@
 'use strict';
 
 // 判断是否有包含指定属性的对象，第三个参数可以指定具体的值
-const checkAttr = (list, attr, value) => {
-    return list.some((item) => value === undefined ? item[attr] : item[attr] === value);
+const findItem = (list, attr, value) => {
+    return list.find((item) => value === undefined ? item[attr] : item[attr] === value);
+};
+// 过滤对象中为undefined的属性
+const filterParams = (params) => {
+    return Object.entries(params || {}).reduce((obj, [key, value]) => {
+        if (value !== undefined) {
+            obj[key] = value;
+        }
+        return obj;
+    }, {});
+};
+// 监听属性
+const watch = {
+    observe(obj, key, watchFun) {
+        // 给该属性设默认值
+        const val = obj[key];
+        Object.defineProperty(obj, key, {
+            configurable: true,
+            enumerable: true,
+            set(value) {
+                obj[key] = value;
+                // 赋值(set)时，调用对应函数
+                watchFun(value, val);
+            },
+            get() {
+                return val;
+            },
+        });
+    },
+    setWatcher(data = {}, watch = {}) {
+        Object.keys(watch).forEach(v => {
+            this.observe(data, v, watch[v]); // 监听data内的v属性，传入watch内对应函数以调用
+        });
+    },
 };
 
-exports.checkAttr = checkAttr;
+exports.filterParams = filterParams;
+exports.findItem = findItem;
+exports.watch = watch;

package/dist/cjs/common/tools/other.d.ts

@@ -1,8 +1,11 @@
 import { KeyValue, OrderParams, Pagination, SortParams } from '../types';
 export declare const handleParams: (params?: Pagination & KeyValue, sort?: SortParams) => {
-    page: Pagination;
+    page: {
+        size?: number | undefined;
+        current?: number | undefined;
+    };
     where: KeyValue<string, string | number | boolean | RegExp>;
-    order?: OrderParams;
+    order?: OrderParams<string> | undefined;
 };
 export declare const handleRes2List: <D>(reqPromise: any) => Promise<{
     label: string;
@@ -12,3 +15,12 @@ export declare const executePromise: (promise: Promise<any>) => Promise<{
     result: any;
     time: number;
 }>;
+export declare const locationFn: {
+    url2Params: (url?: string) => {};
+    params2Url: (params: {
+        [key: string]: any;
+    }) => string;
+    setUrlParams: (key: string, value: any, keepName: string) => void;
+    urlGetPath: (url?: string) => string;
+};
+export declare const delay: (time?: number) => Promise<unknown>;

package/dist/cjs/common/tools/other.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var lodash = require('lodash');
+
 // 处理 ProComponents 中 ProTable 参数中的 page 和 where 和 sort
 const handleParams = (params, sort) => {
     if (!params) {
@@ -12,7 +14,7 @@ const handleParams = (params, sort) => {
     return {
         page: {
             current: current || 1,
-            pageSize: pageSize || 10,
+            size: pageSize || 10,
         },
         where: Object.entries(other).reduce((acc, [key, value]) => {
             if (key && value) {
@@ -31,7 +33,7 @@ const handleRes2List = async (reqPromise) => {
     const { data } = await reqPromise();
     return (data?.list || []).map((item) => ({
         label: item.name,
-        value: item.key,
+        value: item._id || item.key,
     }));
 };
 // 计算执行 promise 花费的时间
@@ -43,8 +45,70 @@ const executePromise = async (promise) => {
         result,
         time,
     };
+};
+// 地址栏方面的操作
+const locationFn = {
+    // url地址的query转为query对象
+    url2Params: (url = location.href) => {
+        url = decodeURIComponent(url);
+        let jsonList = {};
+        if (url.indexOf('?') > -1) {
+            let str = url.slice(url.indexOf('?') + 1);
+            let strs = str.split('&');
+            for (let i = 0; i < strs.length; i++) {
+                jsonList[strs[i].split('=')[0]] = strs[i].split('=')[1]; // 如果出现乱码的话，可以用decodeURI()进行解码
+            }
+        }
+        return jsonList || {};
+    },
+    // 参数对象转换为url
+    params2Url: (params) => {
+        let url = '';
+        for (let k in params) {
+            if (k) {
+                url += `${k}=${params[k]}&`;
+            }
+        }
+        return url.substr(0, url.length - 1);
+    },
+    // 设置地址栏参数
+    setUrlParams: (key, value, keepName) => {
+        if (key === undefined || value === undefined)
+            return;
+        // 给地址栏参数对象添加指定参数
+        let allParams = locationFn.url2Params();
+        if (keepName) {
+            allParams = lodash.pick(allParams, keepName) || {};
+        }
+        allParams[key] = encodeURIComponent(value);
+        // 域名和路径
+        const url = location.href;
+        const sliceEnd = url.indexOf('?') === -1 ? url.length : url.indexOf('?');
+        const domainPath = url.slice(0, sliceEnd);
+        // 参数
+        const params = locationFn.params2Url(allParams);
+        // 修改地址栏url
+        location.replace(`${domainPath}?${params}`);
+    },
+    // 取地址栏的path部分
+    urlGetPath: (url = location.href) => {
+        // 计算要截取的最后一位
+        let lastIndex = url.indexOf('?');
+        if (lastIndex === -1) {
+            lastIndex = url.length;
+        }
+        return url.slice(0, lastIndex);
+    },
+};
+// 延迟指定毫秒数
+const delay = (time = 1000) => {
+    return new Promise(resolve => {
+        setTimeout(resolve, time);
+    });
 };
 
+exports.delay = delay;
 exports.executePromise = executePromise;
 exports.handleParams = handleParams;
 exports.handleRes2List = handleRes2List;
+exports.locationFn = locationFn;

package/dist/cjs/common/tools/string.d.ts

@@ -2,4 +2,15 @@ export declare const getChineseByStr: (str: string) => string;
 export declare const getStrLength: (value: string) => number;
 export declare const replaceAll: (str: string, searchValue: string, replaceValue: string) => string;
 export declare const replaceByRules: (str: string, rules: [string, string][]) => string;
-export declare const jsonParse: (value: string | object) => object | any[];
+export declare const getType: (value: any) => string;
+export declare const amount: (str: string) => string;
+export declare const jsonParse: (value: string | object) => object;
+export declare const isJson: (str: string) => boolean;
+export declare const toString: (value: any) => string;
+export declare const getRandomColor: () => string;
+export declare const getRandomString: (length?: number) => string;
+export declare const getChinese: (str: string) => string;
+export declare const getSliceStr: (str: string, before: string, after: string) => string;
+export declare const getProxyUrl: (url: string) => string;
+export declare const getLength: (value: string) => number;
+export declare const getCookie: (name: string) => string | null;

package/dist/cjs/common/tools/string.js

@@ -37,7 +37,16 @@ const replaceByRules = (str, rules) => {
     });
     return str;
 };
-// JSON.parse
+// 获取变量的类型
+const getType = (value) => {
+    return Object.prototype.toString.call(value).slice(8, -1);
+};
+// 金钱格式化，每三位加,
+const amount = (str) => {
+    const reg = /(?=(?!\b)(\d{3})+$)/g;
+    return str.replace(reg, ',');
+};
+// 更安全的 JSON.parse
 const jsonParse = (value) => {
     if (typeof value === 'object') {
         return value;
@@ -48,10 +57,81 @@ const jsonParse = (value) => {
     catch (err) {
         return {};
     }
+};
+// 是否为json字符串
+const isJson = (str) => {
+    try {
+        if (getType(JSON.parse(str)) === 'Object') {
+            return true;
+        }
+    }
+    catch (e) {
+    }
+    return false;
+};
+// 将变量转为字符串
+const toString = (value) => {
+    return Object.prototype.toString.call(value).slice(8, -1) === 'object' ? JSON.stringify(value) : String(value);
+};
+// 生成随机颜色
+const getRandomColor = () => {
+    const color = Math.floor(Math.random() * 16777215).toString(16);
+    if (color.length === 6) {
+        return color;
+    }
+    else {
+        return getRandomColor();
+    }
+};
+// 生成随机字符串
+const getRandomString = (length = 4) => {
+    return Math.random().toString(36).substr(2, length);
+};
+// 获取字符串内的中文
+const getChinese = (str) => {
+    if (str == null || str === '') {
+        return '';
+    }
+    const res = str.match(/[\u4e00-\u9fa5]/g);
+    if (!res) {
+        return '';
+    }
+    return res.join('');
+};
+// 截取指定两个文本之间的字符串 (不好用)
+const getSliceStr = (str, before, after) => {
+    return str.slice(str.indexOf(before) + before.length, str.lastIndexOf(after));
+};
+// 获取代理后的url
+const getProxyUrl = (url) => {
+    const beforeUrl = 'https://1141871752167714.cn-hangzhou.fc.aliyuncs.com/2016-08-15/proxy/a.LATEST/proxy/?url=';
+    return beforeUrl + url;
+};
+// 获取字符串的长度
+const getLength = (value) => {
+    const chineseLength = getChinese(value).length;
+    return (value.length - chineseLength) + chineseLength * 2;
+};
+// 获取指定cookie
+const getCookie = (name) => {
+    const reg = new RegExp(`(^| )${name}=([^;]*)(;|$)`);
+    const arr = document.cookie.match(reg);
+    return arr ? unescape(arr[2]) : null;
 };
 
+exports.amount = amount;
+exports.getChinese = getChinese;
 exports.getChineseByStr = getChineseByStr;
+exports.getCookie = getCookie;
+exports.getLength = getLength;
+exports.getProxyUrl = getProxyUrl;
+exports.getRandomColor = getRandomColor;
+exports.getRandomString = getRandomString;
+exports.getSliceStr = getSliceStr;
 exports.getStrLength = getStrLength;
+exports.getType = getType;
+exports.isJson = isJson;
 exports.jsonParse = jsonParse;
 exports.replaceAll = replaceAll;
 exports.replaceByRules = replaceByRules;
+exports.toString = toString;

package/dist/cjs/index_all.d.ts

@@ -0,0 +1,3 @@
+export * from './common';
+export * from './fe';
+export * from './rd';

package/dist/cjs/{index_c.js → index_rd.js}

@@ -5,7 +5,10 @@ var consola = require('consola');
 var string = require('./common/tools/string.js');
 var object = require('./common/tools/object.js');
 var other = require('./common/tools/other.js');
+var number = require('./common/tools/number.js');
 var Database = require('./rd/database/Database.js');
+var index = require('./rd/jsonFile/index.js');
+var index$1 = require('./rd/mail/index.js');
 
 function _interopNamespaceDefault(e) {
 	var n = Object.create(null);
@@ -36,6 +39,14 @@ Object.defineProperty(exports, 'debounce', {
 	enumerable: true,
 	get: function () { return lodash.debounce; }
 });
+Object.defineProperty(exports, 'find', {
+	enumerable: true,
+	get: function () { return lodash.find; }
+});
+Object.defineProperty(exports, 'groupBy', {
+	enumerable: true,
+	get: function () { return lodash.groupBy; }
+});
 Object.defineProperty(exports, 'isBoolean', {
 	enumerable: true,
 	get: function () { return lodash.isBoolean; }
@@ -94,13 +105,33 @@ Object.defineProperty(exports, 'uniqWith', {
 	get: function () { return lodash.uniqWith; }
 });
 exports.consola = consola__namespace;
+exports.amount = string.amount;
+exports.getChinese = string.getChinese;
 exports.getChineseByStr = string.getChineseByStr;
+exports.getCookie = string.getCookie;
+exports.getLength = string.getLength;
+exports.getProxyUrl = string.getProxyUrl;
+exports.getRandomColor = string.getRandomColor;
+exports.getRandomString = string.getRandomString;
+exports.getSliceStr = string.getSliceStr;
 exports.getStrLength = string.getStrLength;
+exports.getType = string.getType;
+exports.isJson = string.isJson;
 exports.jsonParse = string.jsonParse;
 exports.replaceAll = string.replaceAll;
 exports.replaceByRules = string.replaceByRules;
-exports.checkAttr = object.checkAttr;
+exports.toString = string.toString;
+exports.filterParams = object.filterParams;
+exports.findItem = object.findItem;
+exports.watch = object.watch;
+exports.delay = other.delay;
 exports.executePromise = other.executePromise;
 exports.handleParams = other.handleParams;
 exports.handleRes2List = other.handleRes2List;
+exports.locationFn = other.locationFn;
+exports.getFileSize = number.getFileSize;
+exports.getRandomNum = number.getRandomNum;
+exports.limitDecimals = number.limitDecimals;
 exports.Database = Database.Database;
+exports.JsonFile = index.JsonFile;
+exports.sendMail = index$1.sendMail;

package/dist/cjs/rd/index.d.ts

@@ -1 +1,3 @@
 export * from './database';
+export * from './jsonFile';
+export * from './mail';

package/dist/cjs/rd/jsonFile/index.d.ts

@@ -0,0 +1,6 @@
+export declare class JsonFile {
+    filePath: string;
+    constructor(filePath: string);
+    get(key: string): Promise<unknown>;
+    set(key: string, value: string): void;
+}

package/dist/cjs/rd/jsonFile/index.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+// 实现一个文件系统读写数据库
+class JsonFile {
+    filePath;
+    constructor(filePath) {
+        this.filePath = path.resolve(__dirname, filePath);
+    }
+    get(key) {
+        return new Promise((resolve) => {
+            fs.readFile(this.filePath, (err, data) => {
+                const json = data ? JSON.parse(data) : {};
+                resolve(json[key]);
+            });
+        });
+    }
+    set(key, value) {
+        fs.readFile(this.filePath, { encoding: 'utf-8' }, (err, data) => {
+            const json = data ? JSON.parse(data || '{}') : {};
+            json[key] = value;
+            fs.writeFile(this.filePath, JSON.stringify(json), () => {
+            });
+        });
+    }
+}
+
+exports.JsonFile = JsonFile;

package/dist/cjs/rd/jsonFile.d.ts

@@ -0,0 +1,6 @@
+export declare class JsonFile {
+    filePath: string;
+    constructor(filePath: string);
+    get(key: string): Promise<unknown>;
+    set(key: string, value: string): void;
+}

package/dist/cjs/rd/jsonFile.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+// 实现一个文件系统读写数据库
+class JsonFile {
+    filePath;
+    constructor(filePath) {
+        this.filePath = path.resolve(__dirname, filePath);
+    }
+    get(key) {
+        return new Promise((resolve) => {
+            fs.readFile(this.filePath, (err, data) => {
+                const json = data ? JSON.parse(data) : {};
+                resolve(json[key]);
+            });
+        });
+    }
+    set(key, value) {
+        fs.readFile(this.filePath, { encoding: 'utf-8' }, (err, data) => {
+            const json = data ? JSON.parse(data || '{}') : {};
+            json[key] = value;
+            fs.writeFile(this.filePath, JSON.stringify(json), () => {
+            });
+        });
+    }
+}
+
+exports.JsonFile = JsonFile;

package/dist/cjs/rd/mail/index.d.ts

@@ -0,0 +1 @@
+export declare const sendMail: (title: string, content: string) => Promise<string>;

package/dist/cjs/rd/mail/index.js

@@ -0,0 +1,32 @@
+'use strict';
+
+var nodemailer = require('nodemailer');
+
+const fromEmail = '15835196981@163.com';
+const fromPass = 'REGDSGDETFECIGKE';
+const toEmail = '657189555@qq.com';
+const transporter = nodemailer.createTransport({
+    host: 'smtp.163.com',
+    port: 465,
+    secure: true,
+    auth: {
+        user: fromEmail,
+        pass: fromPass
+    }
+});
+const sendMail = async (title, content) => {
+    try {
+        await transporter.sendMail({
+            from: fromEmail,
+            to: toEmail,
+            subject: title,
+            text: content // 邮件正文
+        });
+        return title + ' 邮件通知成功';
+    }
+    catch (error) {
+        return title + '邮件通知失败' + JSON.stringify(error);
+    }
+};
+
+exports.sendMail = sendMail;

package/dist/esm/common/index.d.ts

@@ -1,5 +1,5 @@
-import { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError } from 'lodash';
-export { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, };
+import { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, find, groupBy } from 'lodash';
+export { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, find, groupBy };
 export * as consola from 'consola';
 export * from './tools';
 export * from './types';

package/dist/esm/common/tools/index.d.ts

@@ -1,3 +1,4 @@
 export * from './string';
 export * from './object';
 export * from './other';
+export * from './number';

package/dist/esm/common/tools/number.d.ts

@@ -0,0 +1,3 @@
+export declare const getRandomNum: (min: number, max: number) => number;
+export declare const limitDecimals: (v: string, num: number | undefined, isForce: boolean) => string;
+export declare const getFileSize: (size: number) => string;

package/dist/esm/common/tools/number.js

@@ -0,0 +1,30 @@
+// 取指定范围内的随机数
+const getRandomNum = (min, max) => {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+};
+// 指定小数点的位数
+const limitDecimals = (v, num = 2, isForce) => {
+    let value = parseFloat(v);
+    if (isNaN(value)) {
+        if (isForce) {
+            value = 0;
+        }
+        else {
+            return '';
+        }
+    }
+    return value.toFixed(num).toString();
+};
+// 转换成更易读的尺寸单位
+const getFileSize = (size) => {
+    let d = 'G';
+    let s = size / 1024 / 1024 / 1024;
+    if (s < 1) {
+        d = 'M';
+        s *= 1024;
+    }
+    // @ts-ignore
+    return `${(s.toFixed(1) / 1).toString()}${d}`;
+};
+
+export { getFileSize, getRandomNum, limitDecimals };

package/dist/esm/common/tools/object.d.ts

@@ -1 +1,10 @@
-export declare const checkAttr: <I>(list: I[], attr: keyof I, value?: I[keyof I] | undefined) => boolean;
+export declare const findItem: <I>(list: I[], attr: keyof I, value?: I[keyof I] | undefined) => I | undefined;
+export declare const filterParams: (params: {
+    [key: string]: any;
+}) => {};
+export declare const watch: {
+    observe(obj: {
+        [key: string]: any;
+    }, key: string, watchFun: (value: any, val: any) => undefined): void;
+    setWatcher(data?: {}, watch?: {}): void;
+};

package/dist/esm/common/tools/object.js

@@ -1,6 +1,39 @@
 // 判断是否有包含指定属性的对象，第三个参数可以指定具体的值
-const checkAttr = (list, attr, value) => {
-    return list.some((item) => value === undefined ? item[attr] : item[attr] === value);
+const findItem = (list, attr, value) => {
+    return list.find((item) => value === undefined ? item[attr] : item[attr] === value);
+};
+// 过滤对象中为undefined的属性
+const filterParams = (params) => {
+    return Object.entries(params || {}).reduce((obj, [key, value]) => {
+        if (value !== undefined) {
+            obj[key] = value;
+        }
+        return obj;
+    }, {});
+};
+// 监听属性
+const watch = {
+    observe(obj, key, watchFun) {
+        // 给该属性设默认值
+        const val = obj[key];
+        Object.defineProperty(obj, key, {
+            configurable: true,
+            enumerable: true,
+            set(value) {
+                obj[key] = value;
+                // 赋值(set)时，调用对应函数
+                watchFun(value, val);
+            },
+            get() {
+                return val;
+            },
+        });
+    },
+    setWatcher(data = {}, watch = {}) {
+        Object.keys(watch).forEach(v => {
+            this.observe(data, v, watch[v]); // 监听data内的v属性，传入watch内对应函数以调用
+        });
+    },
 };
 
-export { checkAttr };
+export { filterParams, findItem, watch };

package/dist/esm/common/tools/other.d.ts

@@ -1,8 +1,11 @@
 import { KeyValue, OrderParams, Pagination, SortParams } from '../types';
 export declare const handleParams: (params?: Pagination & KeyValue, sort?: SortParams) => {
-    page: Pagination;
+    page: {
+        size?: number | undefined;
+        current?: number | undefined;
+    };
     where: KeyValue<string, string | number | boolean | RegExp>;
-    order?: OrderParams;
+    order?: OrderParams<string> | undefined;
 };
 export declare const handleRes2List: <D>(reqPromise: any) => Promise<{
     label: string;
@@ -12,3 +15,12 @@ export declare const executePromise: (promise: Promise<any>) => Promise<{
     result: any;
     time: number;
 }>;
+export declare const locationFn: {
+    url2Params: (url?: string) => {};
+    params2Url: (params: {
+        [key: string]: any;
+    }) => string;
+    setUrlParams: (key: string, value: any, keepName: string) => void;
+    urlGetPath: (url?: string) => string;
+};
+export declare const delay: (time?: number) => Promise<unknown>;

package/dist/esm/common/tools/other.js

@@ -1,3 +1,5 @@
+import { pick } from 'lodash';
+
 // 处理 ProComponents 中 ProTable 参数中的 page 和 where 和 sort
 const handleParams = (params, sort) => {
     if (!params) {
@@ -10,7 +12,7 @@ const handleParams = (params, sort) => {
     return {
         page: {
             current: current || 1,
-            pageSize: pageSize || 10,
+            size: pageSize || 10,
         },
         where: Object.entries(other).reduce((acc, [key, value]) => {
             if (key && value) {
@@ -29,7 +31,7 @@ const handleRes2List = async (reqPromise) => {
     const { data } = await reqPromise();
     return (data?.list || []).map((item) => ({
         label: item.name,
-        value: item.key,
+        value: item._id || item.key,
     }));
 };
 // 计算执行 promise 花费的时间
@@ -41,6 +43,66 @@ const executePromise = async (promise) => {
         result,
         time,
     };
+};
+// 地址栏方面的操作
+const locationFn = {
+    // url地址的query转为query对象
+    url2Params: (url = location.href) => {
+        url = decodeURIComponent(url);
+        let jsonList = {};
+        if (url.indexOf('?') > -1) {
+            let str = url.slice(url.indexOf('?') + 1);
+            let strs = str.split('&');
+            for (let i = 0; i < strs.length; i++) {
+                jsonList[strs[i].split('=')[0]] = strs[i].split('=')[1]; // 如果出现乱码的话，可以用decodeURI()进行解码
+            }
+        }
+        return jsonList || {};
+    },
+    // 参数对象转换为url
+    params2Url: (params) => {
+        let url = '';
+        for (let k in params) {
+            if (k) {
+                url += `${k}=${params[k]}&`;
+            }
+        }
+        return url.substr(0, url.length - 1);
+    },
+    // 设置地址栏参数
+    setUrlParams: (key, value, keepName) => {
+        if (key === undefined || value === undefined)
+            return;
+        // 给地址栏参数对象添加指定参数
+        let allParams = locationFn.url2Params();
+        if (keepName) {
+            allParams = pick(allParams, keepName) || {};
+        }
+        allParams[key] = encodeURIComponent(value);
+        // 域名和路径
+        const url = location.href;
+        const sliceEnd = url.indexOf('?') === -1 ? url.length : url.indexOf('?');
+        const domainPath = url.slice(0, sliceEnd);
+        // 参数
+        const params = locationFn.params2Url(allParams);
+        // 修改地址栏url
+        location.replace(`${domainPath}?${params}`);
+    },
+    // 取地址栏的path部分
+    urlGetPath: (url = location.href) => {
+        // 计算要截取的最后一位
+        let lastIndex = url.indexOf('?');
+        if (lastIndex === -1) {
+            lastIndex = url.length;
+        }
+        return url.slice(0, lastIndex);
+    },
+};
+// 延迟指定毫秒数
+const delay = (time = 1000) => {
+    return new Promise(resolve => {
+        setTimeout(resolve, time);
+    });
 };
 
-export { executePromise, handleParams, handleRes2List };
+export { delay, executePromise, handleParams, handleRes2List, locationFn };

package/dist/esm/common/tools/string.d.ts

@@ -2,4 +2,15 @@ export declare const getChineseByStr: (str: string) => string;
 export declare const getStrLength: (value: string) => number;
 export declare const replaceAll: (str: string, searchValue: string, replaceValue: string) => string;
 export declare const replaceByRules: (str: string, rules: [string, string][]) => string;
-export declare const jsonParse: (value: string | object) => object | any[];
+export declare const getType: (value: any) => string;
+export declare const amount: (str: string) => string;
+export declare const jsonParse: (value: string | object) => object;
+export declare const isJson: (str: string) => boolean;
+export declare const toString: (value: any) => string;
+export declare const getRandomColor: () => string;
+export declare const getRandomString: (length?: number) => string;
+export declare const getChinese: (str: string) => string;
+export declare const getSliceStr: (str: string, before: string, after: string) => string;
+export declare const getProxyUrl: (url: string) => string;
+export declare const getLength: (value: string) => number;
+export declare const getCookie: (name: string) => string | null;

package/dist/esm/common/tools/string.js

@@ -35,7 +35,16 @@ const replaceByRules = (str, rules) => {
     });
     return str;
 };
-// JSON.parse
+// 获取变量的类型
+const getType = (value) => {
+    return Object.prototype.toString.call(value).slice(8, -1);
+};
+// 金钱格式化，每三位加,
+const amount = (str) => {
+    const reg = /(?=(?!\b)(\d{3})+$)/g;
+    return str.replace(reg, ',');
+};
+// 更安全的 JSON.parse
 const jsonParse = (value) => {
     if (typeof value === 'object') {
         return value;
@@ -46,6 +55,66 @@ const jsonParse = (value) => {
     catch (err) {
         return {};
     }
+};
+// 是否为json字符串
+const isJson = (str) => {
+    try {
+        if (getType(JSON.parse(str)) === 'Object') {
+            return true;
+        }
+    }
+    catch (e) {
+    }
+    return false;
+};
+// 将变量转为字符串
+const toString = (value) => {
+    return Object.prototype.toString.call(value).slice(8, -1) === 'object' ? JSON.stringify(value) : String(value);
+};
+// 生成随机颜色
+const getRandomColor = () => {
+    const color = Math.floor(Math.random() * 16777215).toString(16);
+    if (color.length === 6) {
+        return color;
+    }
+    else {
+        return getRandomColor();
+    }
+};
+// 生成随机字符串
+const getRandomString = (length = 4) => {
+    return Math.random().toString(36).substr(2, length);
+};
+// 获取字符串内的中文
+const getChinese = (str) => {
+    if (str == null || str === '') {
+        return '';
+    }
+    const res = str.match(/[\u4e00-\u9fa5]/g);
+    if (!res) {
+        return '';
+    }
+    return res.join('');
+};
+// 截取指定两个文本之间的字符串 (不好用)
+const getSliceStr = (str, before, after) => {
+    return str.slice(str.indexOf(before) + before.length, str.lastIndexOf(after));
+};
+// 获取代理后的url
+const getProxyUrl = (url) => {
+    const beforeUrl = 'https://1141871752167714.cn-hangzhou.fc.aliyuncs.com/2016-08-15/proxy/a.LATEST/proxy/?url=';
+    return beforeUrl + url;
+};
+// 获取字符串的长度
+const getLength = (value) => {
+    const chineseLength = getChinese(value).length;
+    return (value.length - chineseLength) + chineseLength * 2;
+};
+// 获取指定cookie
+const getCookie = (name) => {
+    const reg = new RegExp(`(^| )${name}=([^;]*)(;|$)`);
+    const arr = document.cookie.match(reg);
+    return arr ? unescape(arr[2]) : null;
 };
 
-export { getChineseByStr, getStrLength, jsonParse, replaceAll, replaceByRules };
+export { amount, getChinese, getChineseByStr, getCookie, getLength, getProxyUrl, getRandomColor, getRandomString, getSliceStr, getStrLength, getType, isJson, jsonParse, replaceAll, replaceByRules, toString };

package/dist/esm/index_all.d.ts

@@ -0,0 +1,3 @@
+export * from './common';
+export * from './fe';
+export * from './rd';

package/dist/esm/index_fe.js

@@ -0,0 +1,16 @@
+export { cloneDeep, debounce, find, groupBy, isBoolean, isEmpty, isEqual, isError, isFunction, isNumber, isObject, isString, default as lodash, merge, omit, pick, uniq, uniqBy, uniqWith } from 'lodash';
+import * as consola from 'consola';
+export { consola };
+export { amount, getChinese, getChineseByStr, getCookie, getLength, getProxyUrl, getRandomColor, getRandomString, getSliceStr, getStrLength, getType, isJson, jsonParse, replaceAll, replaceByRules, toString } from './common/tools/string.js';
+export { filterParams, findItem, watch } from './common/tools/object.js';
+export { delay, executePromise, handleParams, handleRes2List, locationFn } from './common/tools/other.js';
+export { getFileSize, getRandomNum, limitDecimals } from './common/tools/number.js';
+export { localforage } from './fe/index.js';
+import './fe/dayjs.js';
+export { default as dayjs } from 'dayjs';
+export { flashBackground, flashBorder, hexToRgba } from './fe/style.js';
+export { getElement, isElementInViewport, scrollIntoView } from './fe/element.js';
+export { default as copy } from 'copy-to-clipboard';
+export { default as classnames } from 'classnames';
+export { default as md5 } from 'md5';
+export { default as anime } from 'animejs';

package/dist/esm/rd/index.d.ts

@@ -1 +1,2 @@
 export * from './database';
+export * from './jsonFile';

package/dist/esm/rd/jsonFile.d.ts

@@ -0,0 +1,6 @@
+export declare class JsonFile {
+    filePath: string;
+    constructor(filePath: string);
+    get(key: string): Promise<unknown>;
+    set(key: string, value: string): void;
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@wzyjs/utils",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
-  "main": "dist/cjs/index_c.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/cjs/index_c.d.ts",
+  "main": "dist/cjs/index_rd.js",
+  "module": "dist/esm/index_fe.js",
+  "typings": "dist/esm/index_all.d.ts",
   "scripts": {
     "dev": "rollup -c -w --bundleConfigAsCjs",
     "build": "rollup -c --bundleConfigAsCjs"
@@ -17,6 +17,7 @@
   "dependencies": {
     "@cloudbase/node-sdk": "^2.9.1",
     "@types/animejs": "^3.1.6",
+    "@types/nodemailer": "^6.4.7",
     "animejs": "^3.2.1",
     "classnames": "^2.3.2",
     "consola": "^2.15.3",
@@ -25,6 +26,7 @@
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
+    "nodemailer": "^6.9.1",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
@@ -44,5 +46,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/app.git"
   },
-  "gitHead": "f07be747da894f607f30c2be97c23abac5712bc2"
+  "gitHead": "e9f0222770f1a8a3b3365e9fadd8f65a069a3ef5"
 }

package/dist/esm/index.js

@@ -1,15 +0,0 @@
-export { cloneDeep, debounce, isBoolean, isEmpty, isEqual, isError, isFunction, isNumber, isObject, isString, default as lodash, merge, omit, pick, uniq, uniqBy, uniqWith } from 'lodash';
-import * as consola from 'consola';
-export { consola };
-export { getChineseByStr, getStrLength, jsonParse, replaceAll, replaceByRules } from './common/tools/string.js';
-export { checkAttr } from './common/tools/object.js';
-export { executePromise, handleParams, handleRes2List } from './common/tools/other.js';
-export { localforage } from './fe/index.js';
-import './fe/dayjs.js';
-export { default as dayjs } from 'dayjs';
-export { flashBackground, flashBorder, hexToRgba } from './fe/style.js';
-export { getElement, isElementInViewport, scrollIntoView } from './fe/element.js';
-export { default as copy } from 'copy-to-clipboard';
-export { default as classnames } from 'classnames';
-export { default as md5 } from 'md5';
-export { default as anime } from 'animejs';