@jnrs/shared 1.1.6 → 1.1.7

package/README.md

@@ -33,10 +33,10 @@ import { uuidv4 } from '@jnrs/shared/uuid'
   - User
   - DictItem
   - Dict
+  - FileItem
   - Locale
   - ThemeMode
 
-
 类
   - Fullscreen
 

package/dist/index.js

@@ -1,10 +1,9 @@
-export { blobToUrl } from './utils/index.js';
-export { getDictColor, getDictLabel, getDictValue, getOneDictList } from './utils/dict.js';
+export { getDictColor, getDictLabel, getDictList, getDictValue } from './utils/dict.js';
 export { formatDateTime, formatWeekday, setDefaultLocale } from './utils/date.js';
 export { Fullscreen } from './utils/fullscreen.js';
 export { hasPermissionWithSuffix } from './utils/permissions.js';
-export { objectToFormData } from './utils/objectToFormData.js';
-export { downloadFile } from './utils/file.js';
+export { objectMatchAssign, objectToFormData } from './utils/object.js';
+export { blobToUrl, downloadByBlob, downloadByUrl } from './utils/file.js';
 
 console.log('%c✨ 欢迎使用 @jnrs/shared', 'background: #8061BF; color: #f2f2f2; font-weight: bold; padding: 4px 8px; border-radius: 4px; font-family: "Helvetica Neue", sans-serif;');
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;AAGA,OAAO,CAAC,GAAG,CACT,uBAAuB,EACvB,0IAA0I,CAC3I"}
+{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAGA,OAAO,CAAC,GAAG,CACT,uBAAuB,EACvB,0IAA0I,CAC3I"}

package/dist/styles/theme.scss

@@ -5,18 +5,12 @@
 // // 系统自动适配 - 浅色模式
 // @media (prefers-color-scheme: light) {
 //   :root {
-//     --jnrs-font-primary: oklch(0.3 0.01 264);
-//     --jnrs-card-primary: oklch(1 0 0);
-//     --jnrs-background-primary: oklch(0.96 0 0);
 //   }
 // }
 
 // // 系统自动适配 - 深色模式
 // @media (prefers-color-scheme: dark) {
 //   :root {
-//     --jnrs-font-primary: oklch(0.9 0 265);
-//     --jnrs-card-primary: oklch(0.24 0 0);
-//     --jnrs-background-primary: oklch(0 0 0);
 //   }
 // }
 

package/dist/types/base.d.ts

@@ -44,6 +44,19 @@ export interface Role {
     permissions?: string[];
     [key: string]: unknown;
 }
+/**
+ * 文件项
+ */
+export type FileItem = {
+    /**
+     * 文件地址
+     */
+    src: string;
+    /**
+     * 文件名称
+     */
+    fileName: string;
+};
 /**
  * 语言
  */

package/dist/types/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/types/base.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAElC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/types/base.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IACX;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAElC;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA"}

package/dist/utils/dict.d.ts

@@ -12,7 +12,7 @@ import type { Dict, DictItem } from '../types/base';
  * @param dictData 字典总数据
  * @returns 某字典名称所对应的字典列表数据
  */
-export declare const getOneDictList: (name: string, dictData: Dict) => DictItem[];
+export declare const getDictList: (name: string, dictData: Dict) => DictItem[];
 /**
  * 根据字典名称和字典值获取字典标签
  * @param name 字典名称

package/dist/utils/dict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../src/utils/dict.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,UAAU,IAAI,KAAG,QAAQ,EAGrE,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,GAAG,MAAM,EAAE,UAAU,IAAI,KAAG,MAInF,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,MAAM,EACZ,OAAO,MAAM,EACb,UAAU,IAAI,KACb,MAAM,GAAG,MAAM,GAAG,SAIpB,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,GAAG,MAAM,EAAE,UAAU,IAAI,KAAG,MAGnF,CAAA"}
+{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../src/utils/dict.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,UAAU,IAAI,KAAG,QAAQ,EAGlE,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,GAAG,MAAM,EAAE,UAAU,IAAI,KAAG,MAInF,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,UAAU,IAAI,KAAG,MAAM,GAAG,MAAM,GAAG,SAI5F,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,GAAG,MAAM,EAAE,UAAU,IAAI,KAAG,MAGnF,CAAA"}

package/dist/utils/dict.js

@@ -11,7 +11,7 @@
  * @param dictData 字典总数据
  * @returns 某字典名称所对应的字典列表数据
  */
-const getOneDictList = (name, dictData) => {
+const getDictList = (name, dictData) => {
     if (!name || !Object.hasOwn(dictData, name))
         return [];
     return dictData[name];
@@ -57,5 +57,5 @@ const getDictColor = (name, value, dictData) => {
     return dictData[name].find((d) => String(d.value) === String(value))?.displayColor || '';
 };
 
-export { getDictColor, getDictLabel, getDictValue, getOneDictList };
+export { getDictColor, getDictLabel, getDictList, getDictValue };
 //# sourceMappingURL=dict.js.map

package/dist/utils/dict.js.map

@@ -1 +1 @@
-{"version":3,"file":"dict.js","sources":["../../src/utils/dict.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;AAMG;AAIH;;;;;AAKG;MACU,cAAc,GAAG,CAAC,IAAY,EAAE,QAAc,KAAgB;IACzE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,EAAE;AACtD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB;AAEA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,KAAsB,EAAE,QAAc,KAAY;AAC3F,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,MAAM,CAAC,KAAK,CAAC;AACxD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;AAC9F;AAEA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAC1B,IAAY,EACZ,KAAa,EACb,QAAc,KACiB;AAC/B,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,SAAS;AACpD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,IAAI,SAAS;AAC1F;AAEA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,KAAsB,EAAE,QAAc,KAAY;IAC3F,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,EAAE;AACtD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,IAAI,EAAE;AAC1F;;;;"}
+{"version":3,"file":"dict.js","sources":["../../src/utils/dict.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;AAMG;AAIH;;;;;AAKG;MACU,WAAW,GAAG,CAAC,IAAY,EAAE,QAAc,KAAgB;IACtE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,EAAE;AACtD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB;AAEA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,KAAsB,EAAE,QAAc,KAAY;AAC3F,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,MAAM,CAAC,KAAK,CAAC;AACxD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;AAC9F;AAEA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,QAAc,KAAiC;AACvG,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,SAAS;AACpD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,IAAI,SAAS;AAC1F;AAEA;;;;;;AAMG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,KAAsB,EAAE,QAAc,KAAY;IAC3F,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;AAAE,QAAA,OAAO,EAAE;AACtD,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,IAAI,EAAE;AAC1F;;;;"}

package/dist/utils/file.d.ts

@@ -1,7 +1,23 @@
 /**
- * 根据文件下载接口返回的二进制数据进行下载
- * @param blob 二进制数据
+ * Blob 转为 URL（有副作用）
+ * @param blob Blob 数据
+ * @returns url URL 对象
+ * @returns revoke URL 对象清理函数
+ */
+export declare const blobToUrl: (blob: Blob) => {
+    url: string;
+    revoke: () => void;
+};
+/**
+ * 根据 Url 数据进行下载
+ * @param url URL 数据
+ * @param filename 文件名
+ */
+export declare const downloadByUrl: (url: string, filename: string) => Promise<void>;
+/**
+ * 根据 Blob 数据进行下载（自动清理副作用）
+ * @param blob Blob 数据
  * @param filename 文件名
  */
-export declare const downloadFile: (blob: Blob, filename: string) => Promise<void>;
+export declare const downloadByBlob: (blob: Blob, filename: string) => Promise<void>;
 //# sourceMappingURL=file.d.ts.map

package/dist/utils/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAU,MAAM,IAAI,EAAE,UAAU,MAAM,kBAO9D,CAAA"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,IAAI;;;CAInC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAU,KAAK,MAAM,EAAE,UAAU,MAAM,kBAOhE,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAU,MAAM,IAAI,EAAE,UAAU,MAAM,kBAIhE,CAAA"}

package/dist/utils/file.js

@@ -1,16 +1,37 @@
 /**
- * 根据文件下载接口返回的二进制数据进行下载
- * @param blob 二进制数据
+ * Blob 转为 URL（有副作用）
+ * @param blob Blob 数据
+ * @returns url URL 对象
+ * @returns revoke URL 对象清理函数
+ */
+const blobToUrl = (blob) => {
+    const url = URL.createObjectURL(blob);
+    const revoke = () => URL.revokeObjectURL(url);
+    return { url, revoke };
+};
+/**
+ * 根据 Url 数据进行下载
+ * @param url URL 数据
  * @param filename 文件名
  */
-const downloadFile = async (blob, filename) => {
-    const blobUrl = URL.createObjectURL(blob);
+const downloadByUrl = async (url, filename) => {
     const a = document.createElement('a');
-    a.href = blobUrl;
+    a.href = url;
     a.download = filename;
+    document.body.appendChild(a);
     a.click();
-    URL.revokeObjectURL(blobUrl);
+    document.body.removeChild(a);
+};
+/**
+ * 根据 Blob 数据进行下载（自动清理副作用）
+ * @param blob Blob 数据
+ * @param filename 文件名
+ */
+const downloadByBlob = async (blob, filename) => {
+    const { url, revoke } = blobToUrl(blob);
+    downloadByUrl(url, filename);
+    setTimeout(revoke, 100);
 };
 
-export { downloadFile };
+export { blobToUrl, downloadByBlob, downloadByUrl };
 //# sourceMappingURL=file.js.map

package/dist/utils/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sources":["../../src/utils/file.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;AAIG;AACI,MAAM,YAAY,GAAG,OAAO,IAAU,EAAE,QAAgB,KAAI;IACjE,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC;IACzC,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC;AACrC,IAAA,CAAC,CAAC,IAAI,GAAG,OAAO;AAChB,IAAA,CAAC,CAAC,QAAQ,GAAG,QAAQ;IACrB,CAAC,CAAC,KAAK,EAAE;AACT,IAAA,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC;AAC9B;;;;"}
+{"version":3,"file":"file.js","sources":["../../src/utils/file.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;AAKG;AACI,MAAM,SAAS,GAAG,CAAC,IAAU,KAAI;IACtC,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC;AAC7C,IAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE;AACxB;AAEA;;;;AAIG;AACI,MAAM,aAAa,GAAG,OAAO,GAAW,EAAE,QAAgB,KAAI;IACnE,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC;AACrC,IAAA,CAAC,CAAC,IAAI,GAAG,GAAG;AACZ,IAAA,CAAC,CAAC,QAAQ,GAAG,QAAQ;AACrB,IAAA,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,KAAK,EAAE;AACT,IAAA,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;AAC9B;AAEA;;;;AAIG;AACI,MAAM,cAAc,GAAG,OAAO,IAAU,EAAE,QAAgB,KAAI;IACnE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC;AACvC,IAAA,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC;AAC5B,IAAA,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC;AACzB;;;;"}

package/dist/utils/index.d.ts

@@ -2,16 +2,6 @@ export * from './dict';
 export * from './date';
 export * from './fullscreen';
 export * from './permissions';
-export * from './objectToFormData';
+export * from './object';
 export * from './file';
-/**
- * Blob 转为 URL，有副作用
- * @param blob Blob 对象
- * @returns url：URL 对象
- * @returns revoke：URL 对象清理函数
- */
-export declare const blobToUrl: (blob: Blob) => {
-    url: string;
-    revoke: () => void;
-};
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,QAAQ,CAAA;AAEtB;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,IAAI;;;CAInC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA"}

package/dist/utils/object.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 深拷贝合并对象中已有的键值，排除 null、undefined
+ * @param target 赋值对象
+ * @param source 取值对象
+ * @returns 被赋值后的对象 target
+ */
+export declare const objectMatchAssign: <T extends Record<string, any>>(target: T, source: Partial<T> | null | undefined) => T;
+/**
+ * 对象转 FormData
+ * @param obj
+ * @param mapConfig 字段映射关系
+ * - key: 映射匹配字段
+ * - finallyKey: 最终请求的键名
+ * - valueKey: 最终请求的键值
+ * @returns FormData
+ * @example
+ * objectToFormData(obj, {
+ *   newField: { finallyKey: 'originField', valueKey: 'uniqueFileName' }
+ * })
+ * 即最终请求中：键名为 originField，键值为 newField.uniqueFileName
+ */
+export declare const objectToFormData: (obj: Record<string, unknown>, mapConfig: Record<string, {
+    finallyKey: string;
+    valueKey: string;
+}>) => FormData;
+//# sourceMappingURL=object.d.ts.map

package/dist/utils/object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7D,QAAQ,CAAC,EACT,QAAQ,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,KACpC,CAyBF,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB,GAC3B,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,WAAW,MAAM,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,KAClE,QAgCF,CAAA"}

package/dist/utils/object.js

@@ -0,0 +1,82 @@
+import { cloneDeep, has, isPlainObject, mergeWith } from 'lodash-es';
+
+/**
+ * 深拷贝合并对象中已有的键值，排除 null、undefined
+ * @param target 赋值对象
+ * @param source 取值对象
+ * @returns 被赋值后的对象 target
+ */
+const objectMatchAssign = (target, source) => {
+    if (!source) {
+        return cloneDeep(target);
+    }
+    const result = cloneDeep(target);
+    for (const key in target) {
+        if (!has(target, key))
+            continue;
+        const sourceVal = source[key];
+        if (sourceVal === null || sourceVal === undefined) {
+            continue;
+        }
+        const targetVal = target[key];
+        if (isPlainObject(targetVal) && isPlainObject(sourceVal)) {
+            result[key] = mergeWith(cloneDeep(targetVal), cloneDeep(sourceVal));
+        }
+        else {
+            result[key] = cloneDeep(sourceVal);
+        }
+    }
+    return result;
+};
+/**
+ * 对象转 FormData
+ * @param obj
+ * @param mapConfig 字段映射关系
+ * - key: 映射匹配字段
+ * - finallyKey: 最终请求的键名
+ * - valueKey: 最终请求的键值
+ * @returns FormData
+ * @example
+ * objectToFormData(obj, {
+ *   newField: { finallyKey: 'originField', valueKey: 'uniqueFileName' }
+ * })
+ * 即最终请求中：键名为 originField，键值为 newField.uniqueFileName
+ */
+const objectToFormData = (obj, mapConfig) => {
+    const formData = new FormData();
+    for (const key in obj) {
+        if (!Object.hasOwn(obj, key))
+            continue;
+        const value = obj[key];
+        if (Array.isArray(value)) {
+            value.forEach((arrayItem) => {
+                if (arrayItem instanceof File) {
+                    // 当数组内匹配到了 File 类型数据，则直接按照当前键名存储 File
+                    formData.append(key, arrayItem);
+                }
+                else if (key in mapConfig) {
+                    // 当数组内匹配到了非 File 类型数据，则按照映射关系的 finallyKey 作为键名，valueKey 作为值
+                    const { finallyKey, valueKey } = mapConfig[key];
+                    formData.append(finallyKey, arrayItem[valueKey]);
+                }
+                else {
+                    // 当数组内没有匹配到 File 类型数据，也不属于照映射关系内，则存储为 JSON 字符串
+                    formData.append(key, JSON.stringify(arrayItem));
+                }
+            });
+        }
+        else if (value instanceof File) {
+            formData.append(key, value);
+        }
+        else if (typeof value === 'string') {
+            formData.append(key, value.trim());
+        }
+        else {
+            formData.append(key, JSON.stringify(value));
+        }
+    }
+    return formData;
+};
+
+export { objectMatchAssign, objectToFormData };
+//# sourceMappingURL=object.js.map

package/dist/utils/object.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.js","sources":["../../src/utils/object.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAEA;;;;;AAKG;MACU,iBAAiB,GAAG,CAC/B,MAAS,EACT,MAAqC,KAChC;IACL,IAAI,CAAC,MAAM,EAAE;AACX,QAAA,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B;AAEA,IAAA,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;AAEhC,IAAA,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;AACxB,QAAA,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;YAAE;AAEvB,QAAA,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC;QAC7B,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE;YACjD;QACF;AAEA,QAAA,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC;QAE7B,IAAI,aAAa,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE;AACxD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QACrE;aAAO;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC;QACpC;IACF;AAEA,IAAA,OAAO,MAAM;AACf;AAEA;;;;;;;;;;;;;AAaG;MACU,gBAAgB,GAAG,CAC9B,GAA4B,EAC5B,SAAmE,KACvD;AACZ,IAAA,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE;AAE/B,IAAA,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;QACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE;AAE9B,QAAA,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC;AAEtB,QAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,YAAA,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,KAAI;AAC1B,gBAAA,IAAI,SAAS,YAAY,IAAI,EAAE;;AAE7B,oBAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC;gBACjC;AAAO,qBAAA,IAAI,GAAG,IAAI,SAAS,EAAE;;oBAE3B,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC;oBAC/C,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAClD;qBAAO;;AAEL,oBAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBACjD;AACF,YAAA,CAAC,CAAC;QACJ;AAAO,aAAA,IAAI,KAAK,YAAY,IAAI,EAAE;AAChC,YAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC;QAC7B;AAAO,aAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACpC;aAAO;AACL,YAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C;IACF;AAEA,IAAA,OAAO,QAAQ;AACjB;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jnrs/shared",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "巨能前端工程化开发，通用工具包，与框架无关的纯逻辑、类型、常量、工具函数，完全不依赖任何 UI 框架或运行时环境。",
   "keywords": [
     "jnrs",

package/dist/utils/index.js

@@ -1,17 +0,0 @@
-export { formatDateTime, formatWeekday, setDefaultLocale } from './date.js';
-import '../locales/i18next.js';
-
-/**
- * Blob 转为 URL，有副作用
- * @param blob Blob 对象
- * @returns url：URL 对象
- * @returns revoke：URL 对象清理函数
- */
-const blobToUrl = (blob) => {
-    const url = URL.createObjectURL(blob);
-    const revoke = () => URL.revokeObjectURL(url);
-    return { url, revoke };
-};
-
-export { blobToUrl };
-//# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAOA;;;;;AAKG;AACI,MAAM,SAAS,GAAG,CAAC,IAAU,KAAI;IACtC,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC;AAC7C,IAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE;AACxB;;;;"}

package/dist/utils/objectToFormData.d.ts

@@ -1,18 +0,0 @@
-/**
- * 对象转 FormData
- * @param obj
- * @param mapConfig 字段映射关系
- * - key: 映射字段
- * - finallyKey: 最终字段名
- * - valueKey: 映射字段对应的值
- * @returns FormData
- * @example
- * objectToFormData(obj, {
- *   newField: { finallyKey: 'originField', valueKey: 'uniqueFileName' }
- * })
- */
-export declare const objectToFormData: (obj: Record<string, unknown>, mapConfig: Record<string, {
-    finallyKey: string;
-    valueKey: string;
-}>) => FormData;
-//# sourceMappingURL=objectToFormData.d.ts.map

package/dist/utils/objectToFormData.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"objectToFormData.d.ts","sourceRoot":"","sources":["../../src/utils/objectToFormData.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,GAC3B,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,WAAW,MAAM,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,KAClE,QA2BF,CAAA"}

package/dist/utils/objectToFormData.js

@@ -1,46 +0,0 @@
-/**
- * 对象转 FormData
- * @param obj
- * @param mapConfig 字段映射关系
- * - key: 映射字段
- * - finallyKey: 最终字段名
- * - valueKey: 映射字段对应的值
- * @returns FormData
- * @example
- * objectToFormData(obj, {
- *   newField: { finallyKey: 'originField', valueKey: 'uniqueFileName' }
- * })
- */
-const objectToFormData = (obj, mapConfig) => {
-    const formData = new FormData();
-    for (const key in obj) {
-        if (!Object.hasOwn(obj, key))
-            continue;
-        const value = obj[key];
-        if (Array.isArray(value)) {
-            if (value.every((v) => v instanceof File)) {
-                value.forEach((file) => formData.append(key, file));
-            }
-            else if (key in mapConfig) {
-                const { finallyKey, valueKey } = mapConfig[key];
-                value.forEach((item) => formData.append(finallyKey, item[valueKey]));
-            }
-            else {
-                formData.append(key, JSON.stringify(value));
-            }
-        }
-        else if (value instanceof File) {
-            formData.append(key, value);
-        }
-        else if (typeof value === 'string') {
-            formData.append(key, value.trim());
-        }
-        else {
-            formData.append(key, JSON.stringify(value));
-        }
-    }
-    return formData;
-};
-
-export { objectToFormData };
-//# sourceMappingURL=objectToFormData.js.map

package/dist/utils/objectToFormData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"objectToFormData.js","sources":["../../src/utils/objectToFormData.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;;;;;;;AAYG;MACU,gBAAgB,GAAG,CAC9B,GAA4B,EAC5B,SAAmE,KACvD;AACZ,IAAA,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE;AAE/B,IAAA,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;QACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE;AAE9B,QAAA,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC;AAEtB,QAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,YAAA,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,EAAE;AACzC,gBAAA,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACrD;AAAO,iBAAA,IAAI,GAAG,IAAI,SAAS,EAAE;gBAC3B,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC;gBAC/C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtE;iBAAO;AACL,gBAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7C;QACF;AAAO,aAAA,IAAI,KAAK,YAAY,IAAI,EAAE;AAChC,YAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC;QAC7B;AAAO,aAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACpC;aAAO;AACL,YAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C;IACF;AAEA,IAAA,OAAO,QAAQ;AACjB;;;;"}