@jhqn/utils-core 0.0.3-beta.1 → 0.0.3-beta.10

package/dist/index.d.ts

@@ -7,6 +7,59 @@ import { ConfigType } from 'dayjs';
 export { Dayjs, default as dayjs } from 'dayjs';
 export { detect } from 'detect-browser';
 
+/**
+ * 数字或字符串
+ */
+type Numeric = number | string;
+/**
+ * 可 Null
+ */
+type Nullable<T> = T | null;
+/**
+ * 可 Undefined
+ */
+type Undefinable<T> = T | undefined;
+/**
+ * 可 Null 或 Undefined
+ */
+type NullOrUndefinable<T> = Nullable<Undefinable<T>>;
+/**
+ * alias for NullOrUndefinable
+ */
+type UnDef<T> = NullOrUndefinable<T>;
+/**
+ * 请求结果
+ */
+type Res<T = any> = Service.Response<T>;
+/**
+ * 分页请求结果数据
+ */
+type PageResData<T = any> = Service.PageResponseData<T>;
+/**
+ * 分页请求结果
+ */
+type PageRes<T = any> = Service.PageResponse<T>;
+/**
+ * 分页请求参数
+ */
+type PageReq<T extends Record<string, any> = NonNullable<unknown>> = Service.PageRequestParams<T>;
+/**
+ * 可能是数组
+ */
+type MaybeArray<T = any> = T | Array<T>;
+/**
+ * 枚举键值对
+ */
+type VK<T = string> = Record<string | number, T>;
+/**
+ * 字典
+ */
+type Dict<T = string> = Record<string, T>;
+/**
+ * 使某键可选
+ */
+type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+
 /**
  * snake2Kebab
  * @param {string} str 字符串
@@ -217,43 +270,6 @@ declare const jLogDedupe: (...args: any[]) => void;
  */
 declare const jLogOnce: (...args: any[]) => void;
 
-/**
- * 数字或字符串
- */
-declare type Numeric = number | string;
-/**
- * 可 Null
- */
-declare type Nullable<T> = T | null;
-/**
- * 可 Undefined
- */
-declare type Undefinable<T> = T | undefined;
-/**
- * 可 Null 或 Undefined
- */
-declare type NullOrUndefinable<T> = Nullable<Undefinable<T>>;
-/**
- * alias for NullOrUndefinable
- */
-declare type UnDef<T> = NullOrUndefinable<T>;
-/**
- * 请求结果
- */
-declare type Res<T = any> = Service.Response<T>;
-/**
- * 分页请求结果数据
- */
-declare type PageResData<T = any> = Service.PageResponseData<T>;
-/**
- * 分页请求结果
- */
-declare type PageRes<T = any> = Service.PageResponse<T>;
-/**
- * 可能是数组
- */
-declare type MaybeArray<T = any> = T | Array<T>;
-
 /**
  * 隐藏中间部分
  * @param {string} str 需要隐藏的字符串
@@ -327,6 +343,10 @@ interface HostEnv {
    * 是否是浙政钉
    */
   readonly zzd: boolean
+  /**
+   * 是否是钉钉/专有钉/浙政钉
+   */
+  readonly dd: boolean
   /**
    * 是否是微信
    */
@@ -362,6 +382,16 @@ declare const fixiOSInputAutoZoomIn: () => void;
 declare const userAgent: string;
 /**
  * 获取宿主环境信息
+ * @returns {HostEnv} 宿主环境信息
+ * @example
+ * const hostEnv = getHostEnv()
+ * hostEnv.zlb // 浙里办
+ * hostEnv.zyd // 专有钉
+ * hostEnv.zzd // 浙政钉
+ * hostEnv.dd // 钉钉/专有钉/浙政钉
+ * hostEnv.wx // 微信
+ * hostEnv.zfb // 支付宝
+ * hostEnv.mini // 小程序
  */
 declare const getHostEnv: () => HostEnv;
 
@@ -378,12 +408,22 @@ declare const getCodeOfDate: () => number;
  */
 declare const getCodeOfMonth: () => number;
 
+/**
+ * 设置文件基本路径
+ * @param baseUrl
+ */
+declare function setBaseAttachUrl(baseUrl: string): void;
+/**
+ * 获取文件基本路径
+ */
+declare function getBaseAttachUrl(): string;
+
 /**
  * Json字符串转对象
  * @param str
  * @param reviver
  */
-declare const parseToJSON: <T = any>(str: string, reviver?: ((this: any, key: string, value: any) => any) | undefined) => Nullable<T>;
+declare const parseToJSON: <T = any>(str: string, reviver?: (this: any, key: string, value: any) => any) => Nullable<T>;
 /**
  * JSON.stringify() second param
  * @param _
@@ -406,13 +446,25 @@ declare const filterObj: (obj: Record<string, any>, keys: string[], reverse?: bo
     [k: string]: any;
 };
 
+/**
+ * 千位分隔符
+ * @param num
+ */
+declare const toThousands: (num: number) => string | undefined;
+/**
+ * 货币格式化
+ * @param {number | string | bigint} currency - 金额
+ * @param {number} [maximumFractionDigits] - 小数位数
+ */
+declare const currencyFmt: (currency: UnDef<Numeric | bigint>, maximumFractionDigits?: number) => string;
+
 /**
  * 格式化时间
  * @param {import('dayjs').ConfigType} date 时间
  * @param {string} format 格式
  * @returns {string} 格式化后的时间
  */
-declare const dateFmt: (date: ConfigType, format?: string | 'date' | 'datetime') => string;
+declare const dateFmt: (date: ConfigType, format?: string | "date" | "datetime") => string;
 /**
  * 格式化时间间隔
  * @param {import('dayjs').ConfigType} start 开始时间
@@ -420,29 +472,6 @@ declare const dateFmt: (date: ConfigType, format?: string | 'date' | 'datetime')
  */
 declare const dateDuration: (start: ConfigType, end: ConfigType) => string;
 
-/**
- * 设置文件基本路径
- * @param key
- * @param baseUrl
- */
-declare function setBaseAttachUrl(baseUrl: string): void;
-/**
- * 获取文件基本路径
- */
-declare function getBaseAttachUrl(): string;
-
-/**
- * 千位分隔符
- * @param num
- */
-declare const toThousands: (num: number) => string | undefined;
-/**
- * 货币格式化
- * @param {number | string | bigint} currency - 金额
- * @param {number} [maximumFractionDigits] - 小数位数
- */
-declare const currencyFmt: (currency: UnDef<Numeric | bigint>, maximumFractionDigits?: number) => string;
-
 type VantUploadFileStatus = '' | 'uploading' | 'done' | 'failed'
 type AntdUploadFileStatus = 'removed' | 'uploading' | 'done' | 'error'
 type ElementPlusUploadFileStatus = 'ready' | 'uploading' | 'success' | 'fail'
@@ -491,16 +520,16 @@ declare const recoverFile: (resource: Resource) => {
     group: string;
     id: string;
     name: string;
-    size?: number | undefined;
-    uid?: string | undefined;
-    objectUrl?: string | undefined;
-    isImage?: boolean | undefined;
-    message?: string | undefined;
-    deletable?: boolean | undefined;
-    reupload?: boolean | undefined;
-    fileName?: string | undefined;
-    thumbUrl?: string | undefined;
-    percentage?: number | undefined;
+    size?: number;
+    uid?: string;
+    objectUrl?: string;
+    isImage?: boolean;
+    message?: string;
+    deletable?: boolean;
+    reupload?: boolean;
+    fileName?: string;
+    thumbUrl?: string;
+    percentage?: number;
 };
 /**
  * 附件格式
@@ -515,18 +544,32 @@ declare const attachFmt: (data: UnDef<MaybeArray<Resource>> | string) => {
     group: string;
     id: string;
     name: string;
-    size?: number | undefined;
-    uid?: string | undefined;
-    objectUrl?: string | undefined;
-    isImage?: boolean | undefined;
-    message?: string | undefined;
-    deletable?: boolean | undefined;
-    reupload?: boolean | undefined;
-    fileName?: string | undefined;
-    thumbUrl?: string | undefined;
-    percentage?: number | undefined;
+    size?: number;
+    uid?: string;
+    objectUrl?: string;
+    isImage?: boolean;
+    message?: string;
+    deletable?: boolean;
+    reupload?: boolean;
+    fileName?: string;
+    thumbUrl?: string;
+    percentage?: number;
 }[];
 
+/**
+ * 自然排序
+ * @param {UnDef<string>[] | UnDef<number>[]} arr - 数字或字符串数组
+ * @returns {UnDef<string>[] | UnDef<number>[]} - 排序后的数组
+ */
+declare const naturalSort: (arr: UnDef<string>[] | UnDef<number>[]) => UnDef<string>[] | UnDef<number>[];
+/**
+ * 根据 key 自然排序
+ * @param arr - 数组
+ * @param {string} key - 键名
+ * @returns {any[]} - 排序后的数组
+ */
+declare const naturalSortBy: <T extends Record<string, UnDef<Numeric>>>(arr: T[], key: keyof T) => T[];
+
 /**
  * 检测变量类型
  * @param {any} val 检测的目标
@@ -576,7 +619,7 @@ declare const isObject: (val: any) => val is Record<any, any>;
  * 是否是数组
  * @param {any} val 检测的目标
  */
-declare const isArray: (val: any) => val is any[];
+declare const isArray: (val: any) => val is Array<any>;
 /**
  * 是否是函数，但也有可能是Class
  * @param {any} val 检测的目标
@@ -664,7 +707,7 @@ declare const isArrStr: (str: UnDef<string>) => boolean;
  * ```
  * @returns {boolean} boolean
  */
-declare const isValidKey: (key: string | number | symbol, object: object) => key is never;
+declare const isValidKey: (key: string | number | symbol, object: object) => key is keyof typeof object;
 /**
  * 是否是空值/空数组/空对象 null undefined '' [] {} Set Map
  * @param val
@@ -672,30 +715,15 @@ declare const isValidKey: (key: string | number | symbol, object: object) => key
 declare const isEmpty: (val: UnDef<Numeric | boolean | Record<any, any> | Array<any> | Set<any> | Map<any, any>>) => boolean;
 
 /**
- * 校验接口返回code
- * @param res
- * @param code
- */
-declare const isValidResCode: (res: Res, code?: number) => boolean;
-/**
- * 校验接口返回内容
- * @param res
- * @param code
- */
-declare const isValidRes: (res: Res, code?: number) => boolean;
-/**
- * 校验接口数组返回内容
- * @param res
- * @param code
- */
-declare const isValidArrRes: (res: Res<any[]>, code?: number) => boolean;
-/**
- * 校验接口分页返回内容
- * @param res
- * @param code
+ * 是否是[统一社会信用代码](https://zh.wikipedia.org/zh-cn/%E7%BB%9F%E4%B8%80%E7%A4%BE%E4%BC%9A%E4%BF%A1%E7%94%A8%E4%BB%A3%E7%A0%81)
+ * @example
+ * ```ts
+ * isUSCI('91350100M000100Y43') // true
+ * ```
+ * @param {UnDef<string>} val - 待校验的值
+ * @returns {boolean} 是否是统一社会信用代码
  */
-declare const isValidPageRes: (res: PageRes, code?: number) => boolean;
-
+declare const isUSCI: (val: UnDef<string>) => boolean;
 /**
  * 是否是中国手机号
  * @param val
@@ -740,4 +768,29 @@ declare const nonASCII: (text: string) => boolean;
  */
 declare const isValidFileType: (file: File, type: string) => boolean;
 
-export { type MaybeArray, type NullOrUndefinable, type Nullable, type Numeric, type PageRes, type PageResData, type Res, type UnDef, type Undefinable, attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, currencyFmt, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, hideName, hidePhone, hideSurname, hideTail, hideThird, inBrowser, isArrStr, isArray, isBigInt, isBlob, isBoolean, isDate, isDef, isEmail, isEmpty, isError, isFile, isFunction, isIdCard, isJSONStr, isMap, isNull, isNumber, isNumeric, isObject, isPhone, isPromise, isRegExp, isSet, isString, isSymbol, isTel, isURL, isUndefined, isValidArrRes, isValidFileType, isValidKey, isValidPageRes, isValidRes, isValidResCode, isWeakMap, isWeakSet, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jLogDedupe, jLogOnce, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, toThousands, userAgent, waitTime };
+/**
+ * 校验接口返回code
+ * @param res
+ * @param code
+ */
+declare const isValidResCode: (res: Res, code?: number) => boolean;
+/**
+ * 校验接口返回内容
+ * @param res
+ * @param code
+ */
+declare const isValidRes: (res: Res, code?: number) => boolean;
+/**
+ * 校验接口数组返回内容
+ * @param res
+ * @param code
+ */
+declare const isValidArrRes: (res: Res<any[]>, code?: number) => boolean;
+/**
+ * 校验接口分页返回内容
+ * @param res
+ * @param code
+ */
+declare const isValidPageRes: (res: PageRes, code?: number) => boolean;
+
+export { type Dict, type MaybeArray, type NullOrUndefinable, type Nullable, type Numeric, type PageReq, type PageRes, type PageResData, type PartialBy, type Res, type UnDef, type Undefinable, type VK, attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, currencyFmt, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, hideName, hidePhone, hideSurname, hideTail, hideThird, inBrowser, isArrStr, isArray, isBigInt, isBlob, isBoolean, isDate, isDef, isEmail, isEmpty, isError, isFile, isFunction, isIdCard, isJSONStr, isMap, isNull, isNumber, isNumeric, isObject, isPhone, isPromise, isRegExp, isSet, isString, isSymbol, isTel, isURL, isUSCI, isUndefined, isValidArrRes, isValidFileType, isValidKey, isValidPageRes, isValidRes, isValidResCode, isWeakMap, isWeakSet, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jLogDedupe, jLogOnce, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, naturalSort, naturalSortBy, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, toThousands, userAgent, waitTime };

package/dist/index.mjs

@@ -1,12 +1,12 @@
 export { detect } from 'detect-browser';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
-import localeData from 'dayjs/plugin/localeData';
-import duration from 'dayjs/plugin/duration';
-import relativeTime from 'dayjs/plugin/relativeTime';
+import zhCN from 'dayjs/locale/zh-cn';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+import duration from 'dayjs/plugin/duration';
+import localeData from 'dayjs/plugin/localeData';
 import objectSupport from 'dayjs/plugin/objectSupport';
-import zhCN from 'dayjs/locale/zh-cn';
+import relativeTime from 'dayjs/plugin/relativeTime';
 
 const snake2Kebab = (str) => str.replace(/_([a-z])/g, (_, letter) => `-${letter.toLowerCase()}`);
 const snake2Pascal = (str) => str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()).replace(/^[a-z]/, (letter) => letter.toUpperCase());
@@ -104,22 +104,26 @@ const isURL = (val) => getVariableType(val) === "url";
 const isError = (val) => getVariableType(val) === "error";
 const isDef = (val) => !isNull(val) && !isUndefined(val);
 const isJSONStr = (str) => {
-  if (isDef(str))
+  if (isDef(str)) {
     try {
       JSON.parse(str);
       return true;
     } catch (e) {
+      jError("isJSONStr", e);
       return false;
     }
+  }
   return false;
 };
 const isArrStr = (str) => {
-  if (isDef(str))
+  if (isDef(str)) {
     try {
       return Array.isArray(JSON.parse(str));
     } catch (e) {
+      jError("isArrStr", e);
       return false;
     }
+  }
   return false;
 };
 const isValidKey = (key, object) => key in object;
@@ -127,13 +131,14 @@ const isEmpty = (val) => {
   return !isDef(val) || val === "" || isArray(val) && val.length === 0 || isObject(val) && Object.keys(val).length === 0 || isMap(val) && val.size === 0 || isSet(val) && val.size === 0;
 };
 
-const isValidResCode = (res, code = 200) => res.code === code;
-const isValidRes = (res, code) => isValidResCode(res, code) && isDef(res.data);
-const isValidArrRes = (res, code) => isValidResCode(res, code) && Array.isArray(res.data);
-const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && Array.isArray(res.data.list || res.data.records);
-
 const cnPhoneRE = /^1[3-9]\d{9}$/;
 const cnTelRE = /^0\d{9,11}$/;
+const cnUSCIRE = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/;
+const isUSCI = (val) => {
+  if (!isDef(val))
+    return false;
+  return cnUSCIRE.test(val);
+};
 const isPhone = (val) => {
   if (!isDef(val))
     return false;
@@ -147,14 +152,14 @@ const isTel = (val) => {
 const isEmail = (val) => {
   if (!isDef(val))
     return false;
-  const reg = /^[a-zA-Z\d](?:\w|-)+@[a-zA-Z\d]+\.[a-zA-Z]{2,5}$/;
+  const reg = /^[a-z\d](?:\w|-)+@[a-z\d]+\.[a-z]{2,5}$/i;
   return reg.test(val);
 };
 const isIdCard = (val, compatible = true) => {
   if (!isDef(val))
     return false;
-  const card15 = /^[1-9]\d{7}(?:0[1-9]|10|11|12)(?:[0-2][1-9]|10|20|30|31)\d{2}[\dXx]$/;
-  const card18 = /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|1[0-2])(?:[0-2][1-9]|10|20|30|31)\d{3}[\dXx]$/;
+  const card15 = /^[1-9]\d{7}(?:0[1-9]|10|11|12)(?:[0-2][1-9]|10|20|30|31)\d{2}[\dX]$/i;
+  const card18 = /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|1[0-2])(?:[0-2][1-9]|10|20|30|31)\d{3}[\dX]$/i;
   return card18.test(val) || (compatible ? card15.test(val) : false);
 };
 const isNumeric = (val) => {
@@ -190,10 +195,17 @@ const isValidFileType = (file, type) => {
   return validate(type);
 };
 
+const isValidResCode = (res, code = 200) => res.code === code;
+const isValidRes = (res, code) => isValidResCode(res, code) && isDef(res.data);
+const isValidArrRes = (res, code) => isValidResCode(res, code) && Array.isArray(res.data);
+const isValidPageRes = (res, code) => isValidResCode(res, code) && isDef(res.data) && Array.isArray(res.data.list || res.data.records);
+
 const hideMiddle = (str) => {
   if (!isDef(str))
     return "";
   const len = str.length;
+  if (len === 0)
+    return "";
   if (len === 1)
     return "*";
   if (len === 2)
@@ -216,6 +228,8 @@ const hideHead = (str, count) => {
     return "";
   const len = str.length;
   const cnt = count !== void 0 ? Math.max(Math.min(len, count), 0) : len - 1;
+  if (len === 0)
+    return "";
   if (len === 1)
     return "*";
   return "*".repeat(cnt) + str.substring(cnt);
@@ -225,6 +239,8 @@ const hideTail = (str, count) => {
     return "";
   const len = str.length;
   const cnt = count !== void 0 ? Math.max(Math.min(len, count), 0) : len - 1;
+  if (len === 0)
+    return "";
   if (len === 1)
     return "*";
   return str.substring(0, len - cnt) + "*".repeat(cnt);
@@ -300,14 +316,34 @@ const hideBankCard = (bankCard) => {
   return "";
 };
 
+let __BASE_ATTACH_URL__;
+function setBaseAttachUrl(baseUrl) {
+  __BASE_ATTACH_URL__ = baseUrl;
+}
+function getBaseAttachUrl() {
+  return __BASE_ATTACH_URL__;
+}
+
 const parseToJSON = (str, reviver2) => isJSONStr(str) ? JSON.parse(str, reviver2) : null;
 const replacer = (_, value) => {
-  if (value instanceof Map) {
+  if (isMap(value)) {
     return {
       dataType: "Map",
       value: [...value]
     };
   }
+  if (isSet(value)) {
+    return {
+      dataType: "Set",
+      value: [...value]
+    };
+  }
+  if (isDate(value)) {
+    return {
+      dataType: "Date",
+      value: value.toISOString()
+    };
+  }
   return value;
 };
 const reviver = (_, value) => {
@@ -315,11 +351,33 @@ const reviver = (_, value) => {
     if (value.dataType === "Map") {
       return new Map(value.value);
     }
+    if (value.dataType === "Set") {
+      return new Set(value.value);
+    }
+    if (value.dataType === "Date") {
+      return new Date(value.value);
+    }
   }
   return value;
 };
 const filterObj = (obj, keys, reverse = false) => Object.fromEntries(Object.entries(obj).filter(([key]) => reverse ? !keys.includes(key) : keys.includes(key)));
 
+const toThousands = (num) => {
+  const arr = num.toString().split(".");
+  const integer = arr[0]?.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
+  if (arr.length > 1)
+    return `${integer}.${arr[1]}`;
+  return integer;
+};
+const currencyFmt = (currency, maximumFractionDigits = 2) => {
+  if (!isDef(currency))
+    return "";
+  const num = Number(currency);
+  if (Number.isNaN(num))
+    return "";
+  return new Intl.NumberFormat("zh-CN", { style: "currency", currency: "CNY", maximumFractionDigits }).format(num);
+};
+
 dayjs.extend(localeData).locale("zh-cn", zhCN);
 dayjs.extend(duration);
 dayjs.extend(relativeTime);
@@ -353,34 +411,10 @@ const dateDuration = (start, end) => {
   return dd.format(format);
 };
 
-let __BASE_ATTACH_URL__;
-function setBaseAttachUrl(baseUrl) {
-  __BASE_ATTACH_URL__ = baseUrl;
-}
-function getBaseAttachUrl() {
-  return __BASE_ATTACH_URL__;
-}
-
-const toThousands = (num) => {
-  const arr = num.toString().split(".");
-  const integer = arr[0]?.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
-  if (arr.length > 1)
-    return `${integer}.${arr[1]}`;
-  return integer;
-};
-const currencyFmt = (currency, maximumFractionDigits = 2) => {
-  if (!isDef(currency))
-    return "";
-  const num = Number(currency);
-  if (Number.isNaN(num))
-    return "";
-  return new Intl.NumberFormat("zh-CN", { style: "currency", currency: "CNY", maximumFractionDigits }).format(num);
-};
-
 const resUrl = (url) => {
   if (!isDef(url))
     return void 0;
-  if (/^https?:\/\//.test(url) || /^blob:/.test(url) || /^data:/.test(url)) {
+  if (/^https?:\/\//.test(url) || url.startsWith("blob:") || url.startsWith("data:")) {
     return url;
   }
   const baseUrl = getBaseAttachUrl();
@@ -404,11 +438,11 @@ const recoverFile = (resource) => {
 const attachFmt = (data) => {
   let attachList = [];
   const prototype = Object.prototype.toString.call(data);
-  if (!data)
+  if (!data) {
     attachList = [];
-  else if (Array.isArray(data))
+  } else if (Array.isArray(data)) {
     attachList = data.filter(Boolean);
-  else if (typeof data === "string") {
+  } else if (typeof data === "string") {
     if (isArrStr(data)) {
       attachList = (parseToJSON(data) || []).filter(Boolean);
     } else {
@@ -419,11 +453,29 @@ const attachFmt = (data) => {
       else
         attachList = [{ id: data, name: "name", uri: data, group: "default" }];
     }
-  } else if (prototype === "[object Object]")
+  } else if (prototype === "[object Object]") {
     attachList = [data];
+  }
   return attachList.map(recoverFile);
 };
 
+const isNumberArray = (arr) => arr.every((item) => typeof item === "number");
+const isStringArray = (arr) => arr.every((item) => typeof item === "string");
+const naturalSort = (arr) => {
+  if (isNumberArray(arr))
+    return [...arr].sort((a, b) => a - b);
+  if (isStringArray(arr)) {
+    return [...arr].sort((a, b) => a.localeCompare(b, "zh-CN")).sort((a, b) => a.length - b.length);
+  }
+  const newArr = [...arr].sort();
+  const validArr = newArr.filter((a) => isDef(a));
+  const invalidArr = newArr.filter((a) => !isDef(a));
+  return naturalSort(validArr).concat(invalidArr);
+};
+const naturalSortBy = (arr, key) => {
+  return [...arr].sort((a, b) => naturalSort([a[key], b[key]])[0] === a[key] ? -1 : 1);
+};
+
 const inBrowser = typeof window !== "undefined";
 const waitTime = (time = 100) => {
   return new Promise((resolve) => {
@@ -445,7 +497,8 @@ const getHostEnv = () => {
   const ua = userAgent.toLowerCase();
   const zlb = ua.includes("@zlb");
   const zyd = ua.includes("saas");
-  const zzd = ua.includes("zhejiang") || ua.includes("tauruszjd");
+  const zzd = ua.includes("zhejiang") || ua.includes("tauruszjd") || ua.includes("dingtalk-win");
+  const dd = ua.includes("taurusapp");
   const wx = ua.includes("micromessenger");
   const zfb = ua.includes("alipay");
   const mini = ua.includes("miniprogram");
@@ -453,6 +506,7 @@ const getHostEnv = () => {
     zlb,
     zyd,
     zzd,
+    dd,
     wx,
     zfb,
     mini
@@ -465,4 +519,4 @@ const getCodeOfHour = () => getCodeOfTime(`${dateFmt( new Date(), "YYYY-MM-DD HH
 const getCodeOfDate = () => getCodeOfTime(dateFmt(/* @__PURE__ */ new Date(), "date"));
 const getCodeOfMonth = () => getCodeOfTime(dateFmt(dayjs().endOf("month"), "date"));
 
-export { attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, currencyFmt, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, hideName, hidePhone, hideSurname, hideTail, hideThird, inBrowser, isArrStr, isArray, isBigInt, isBlob, isBoolean, isDate, isDef, isEmail, isEmpty, isError, isFile, isFunction, isIdCard, isJSONStr, isMap, isNull, isNumber, isNumeric, isObject, isPhone, isPromise, isRegExp, isSet, isString, isSymbol, isTel, isURL, isUndefined, isValidArrRes, isValidFileType, isValidKey, isValidPageRes, isValidRes, isValidResCode, isWeakMap, isWeakSet, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jLogDedupe, jLogOnce, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, toThousands, userAgent, waitTime };
+export { attachFmt, camel2Kebab, camel2Pascal, camel2Snake, camel2Title, checkImg, currencyFmt, dateDuration, dateFmt, filterObj, fixiOSInputAutoZoomIn, getBaseAttachUrl, getCodeOfDate, getCodeOfHour, getCodeOfMonth, getHostEnv, getVariableType, hideBankCard, hideCardNo, hideEmail, hideFirstName, hideHead, hideMiddle, hideName, hidePhone, hideSurname, hideTail, hideThird, inBrowser, isArrStr, isArray, isBigInt, isBlob, isBoolean, isDate, isDef, isEmail, isEmpty, isError, isFile, isFunction, isIdCard, isJSONStr, isMap, isNull, isNumber, isNumeric, isObject, isPhone, isPromise, isRegExp, isSet, isString, isSymbol, isTel, isURL, isUSCI, isUndefined, isValidArrRes, isValidFileType, isValidKey, isValidPageRes, isValidRes, isValidResCode, isWeakMap, isWeakSet, jClear, jDebug, jError, jGroup, jGroupC, jGroupE, jInfo, jLog, jLogDedupe, jLogOnce, jTime, jTimeEnd, jWarn, kebab2Camel, kebab2Pascal, kebab2Snake, kebab2Title, naturalSort, naturalSortBy, nonASCII, parseToJSON, pascal2Camel, pascal2Kebab, pascal2Snake, pascal2Title, recoverFile, replacer, resUrl, reviver, setBaseAttachUrl, snake2Camel, snake2Kebab, snake2Pascal, snake2Title, title2Camel, title2Kebab, title2Pascal, title2Snake, toThousands, userAgent, waitTime };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jhqn/utils-core",
   "type": "module",
-  "version": "0.0.3-beta.1",
+  "version": "0.0.3-beta.10",
   "author": "jade-gjz <jiangang.zhang@jaderd.com>",
   "license": "MIT",
   "homepage": "https://github.com/jaderd-jh/utils/tree/main/packages/core#readme",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "dependencies": {
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.13",
     "detect-browser": "^5.3.0"
   },
   "scripts": {