giime 0.6.35 → 0.6.37

package/es/utils/src/date/dateShortcuts.mjs

@@ -1,6 +1,88 @@
 import dayjs from 'dayjs';
 
 const getDateShortcuts = (type) => {
+  const daterangeShortcutValue = [
+    {
+      text: "\u672C\u5468",
+      value: () => {
+        const start = dayjs().startOf("week").toDate();
+        const end = dayjs().endOf("week").toDate();
+        return [start, end];
+      }
+    },
+    {
+      text: "\u672C\u6708",
+      value: () => {
+        const start = dayjs().startOf("month").toDate();
+        const end = dayjs().endOf("month").toDate();
+        return [start, end];
+      }
+    },
+    {
+      text: "\u4E0A\u6708",
+      value: () => {
+        const now = dayjs();
+        const startOfThisMonth = now.startOf("month");
+        const endOfLastMonth = startOfThisMonth.subtract(1, "day");
+        const startOfLastMonth = endOfLastMonth.startOf("month");
+        return [startOfLastMonth.toDate(), endOfLastMonth.toDate()];
+      }
+    },
+    {
+      text: "\u8FD13\u5929",
+      value: () => {
+        const end = /* @__PURE__ */ new Date();
+        const start = /* @__PURE__ */ new Date();
+        start.setTime(start.getTime() - 3600 * 1e3 * 24 * 2);
+        return [start, end];
+      }
+    },
+    {
+      text: "\u8FD17\u5929",
+      value: () => {
+        const end = /* @__PURE__ */ new Date();
+        const start = /* @__PURE__ */ new Date();
+        start.setTime(start.getTime() - 3600 * 1e3 * 24 * 6);
+        return [start, end];
+      }
+    },
+    {
+      text: "\u8FD115\u5929",
+      value: () => {
+        const end = /* @__PURE__ */ new Date();
+        const start = /* @__PURE__ */ new Date();
+        start.setTime(start.getTime() - 3600 * 1e3 * 24 * 14);
+        return [start, end];
+      }
+    },
+    {
+      text: "\u8FD130\u5929",
+      value: () => {
+        const end = /* @__PURE__ */ new Date();
+        const start = /* @__PURE__ */ new Date();
+        start.setTime(start.getTime() - 3600 * 1e3 * 24 * 29);
+        return [start, end];
+      }
+    },
+    {
+      text: "\u8FD160\u5929",
+      value: () => {
+        const end = /* @__PURE__ */ new Date();
+        const start = /* @__PURE__ */ new Date();
+        start.setTime(start.getTime() - 3600 * 1e3 * 24 * 59);
+        return [start, end];
+      }
+    },
+    {
+      text: "\u8FD190\u5929",
+      value: () => {
+        const end = /* @__PURE__ */ new Date();
+        const start = /* @__PURE__ */ new Date();
+        start.setTime(start.getTime() - 3600 * 1e3 * 24 * 89);
+        return [start, end];
+      }
+    }
+  ];
   const shortcuts = [
     {
       type: "date",
@@ -29,88 +111,11 @@ const getDateShortcuts = (type) => {
     },
     {
       type: "daterange",
-      values: [
-        {
-          text: "\u672C\u5468",
-          value: () => {
-            const start = dayjs().startOf("week").toDate();
-            const end = dayjs().endOf("week").toDate();
-            return [start, end];
-          }
-        },
-        {
-          text: "\u672C\u6708",
-          value: () => {
-            const start = dayjs().startOf("month").toDate();
-            const end = dayjs().endOf("month").toDate();
-            return [start, end];
-          }
-        },
-        {
-          text: "\u4E0A\u6708",
-          value: () => {
-            const now = dayjs();
-            const startOfThisMonth = now.startOf("month");
-            const endOfLastMonth = startOfThisMonth.subtract(1, "day");
-            const startOfLastMonth = endOfLastMonth.startOf("month");
-            return [startOfLastMonth.toDate(), endOfLastMonth.toDate()];
-          }
-        },
-        {
-          text: "\u8FD13\u5929",
-          value: () => {
-            const end = /* @__PURE__ */ new Date();
-            const start = /* @__PURE__ */ new Date();
-            start.setTime(start.getTime() - 3600 * 1e3 * 24 * 2);
-            return [start, end];
-          }
-        },
-        {
-          text: "\u8FD17\u5929",
-          value: () => {
-            const end = /* @__PURE__ */ new Date();
-            const start = /* @__PURE__ */ new Date();
-            start.setTime(start.getTime() - 3600 * 1e3 * 24 * 6);
-            return [start, end];
-          }
-        },
-        {
-          text: "\u8FD115\u5929",
-          value: () => {
-            const end = /* @__PURE__ */ new Date();
-            const start = /* @__PURE__ */ new Date();
-            start.setTime(start.getTime() - 3600 * 1e3 * 24 * 14);
-            return [start, end];
-          }
-        },
-        {
-          text: "\u8FD130\u5929",
-          value: () => {
-            const end = /* @__PURE__ */ new Date();
-            const start = /* @__PURE__ */ new Date();
-            start.setTime(start.getTime() - 3600 * 1e3 * 24 * 29);
-            return [start, end];
-          }
-        },
-        {
-          text: "\u8FD160\u5929",
-          value: () => {
-            const end = /* @__PURE__ */ new Date();
-            const start = /* @__PURE__ */ new Date();
-            start.setTime(start.getTime() - 3600 * 1e3 * 24 * 59);
-            return [start, end];
-          }
-        },
-        {
-          text: "\u8FD190\u5929",
-          value: () => {
-            const end = /* @__PURE__ */ new Date();
-            const start = /* @__PURE__ */ new Date();
-            start.setTime(start.getTime() - 3600 * 1e3 * 24 * 89);
-            return [start, end];
-          }
-        }
-      ]
+      values: daterangeShortcutValue
+    },
+    {
+      type: "datetimerange",
+      values: daterangeShortcutValue
     }
   ];
   return shortcuts.find((it) => it.type === type)?.values ?? [];

package/es/utils/src/date/dateShortcuts.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dateShortcuts.mjs","sources":["../../../../../../packages/utils/src/date/dateShortcuts.ts"],"sourcesContent":["import dayjs from 'dayjs';\n/**\n * 日期快捷选项\n * @param type\n * @returns\n */\nexport const getDateShortcuts = (type: string) => {\n  const shortcuts = [\n    {\n      type: 'date',\n      values: [\n        {\n          text: '今天',\n          value: () => new Date(),\n        },\n        {\n          text: '昨天',\n          value: () => {\n            const date = new Date();\n            date.setTime(date.getTime() - 3600 * 1000 * 24);\n            return date;\n          },\n        },\n        {\n          text: '一周前',\n          value: () => {\n            const date = new Date();\n            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);\n            return date;\n          },\n        },\n      ],\n    },\n    {\n      type: 'daterange',\n      values: [\n        {\n          text: '本周',\n          value: () => {\n            const start = dayjs().startOf('week').toDate(); // 本周开始日期\n            const end = dayjs().endOf('week').toDate(); // 本周结束日期\n            return [start, end];\n          },\n        },\n        {\n          text: '本月',\n          value: () => {\n            const start = dayjs().startOf('month').toDate(); // 本周开始日期\n            const end = dayjs().endOf('month').toDate(); // 本周结束日期\n            return [start, end];\n          },\n        },\n        {\n          text: '上月',\n          value: () => {\n            // 获取当前日期\n            const now = dayjs();\n\n            // 获取当前月份的第一天\n            const startOfThisMonth = now.startOf('month');\n\n            // 获取上个月的最后一天（即这个月的第一天的前一天）\n            const endOfLastMonth = startOfThisMonth.subtract(1, 'day');\n\n            // 获取上个月的第一天\n            const startOfLastMonth = endOfLastMonth.startOf('month');\n            return [startOfLastMonth.toDate(), endOfLastMonth.toDate()];\n          },\n        },\n        {\n          text: '近3天',\n          value: () => {\n            const end = new Date();\n            const start = new Date();\n            start.setTime(start.getTime() - 3600 * 1000 * 24 * 2);\n            return [start, end];\n          },\n        },\n\n        {\n          text: '近7天',\n          value: () => {\n            const end = new Date();\n            const start = new Date();\n            start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);\n            return [start, end];\n          },\n        },\n        {\n          text: '近15天',\n          value: () => {\n            const end = new Date();\n            const start = new Date();\n            start.setTime(start.getTime() - 3600 * 1000 * 24 * 14);\n            return [start, end];\n          },\n        },\n\n        {\n          text: '近30天',\n          value: () => {\n            const end = new Date();\n            const start = new Date();\n            start.setTime(start.getTime() - 3600 * 1000 * 24 * 29);\n            return [start, end];\n          },\n        },\n        {\n          text: '近60天',\n          value: () => {\n            const end = new Date();\n            const start = new Date();\n            start.setTime(start.getTime() - 3600 * 1000 * 24 * 59);\n            return [start, end];\n          },\n        },\n        {\n          text: '近90天',\n          value: () => {\n            const end = new Date();\n            const start = new Date();\n            start.setTime(start.getTime() - 3600 * 1000 * 24 * 89);\n            return [start, end];\n          },\n        },\n      ],\n    },\n  ];\n  return shortcuts.find(it => it.type === type)?.values ?? [];\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"dateShortcuts.mjs","sources":["../../../../../../packages/utils/src/date/dateShortcuts.ts"],"sourcesContent":["import dayjs from 'dayjs';\n/**\n * 日期快捷选项\n * @param type\n * @returns\n */\nexport const getDateShortcuts = (type: string) => {\n  const daterangeShortcutValue = [\n    {\n      text: '本周',\n      value: () => {\n        const start = dayjs().startOf('week').toDate(); // 本周开始日期\n        const end = dayjs().endOf('week').toDate(); // 本周结束日期\n        return [start, end];\n      },\n    },\n    {\n      text: '本月',\n      value: () => {\n        const start = dayjs().startOf('month').toDate(); // 本周开始日期\n        const end = dayjs().endOf('month').toDate(); // 本周结束日期\n        return [start, end];\n      },\n    },\n    {\n      text: '上月',\n      value: () => {\n        // 获取当前日期\n        const now = dayjs();\n\n        // 获取当前月份的第一天\n        const startOfThisMonth = now.startOf('month');\n\n        // 获取上个月的最后一天（即这个月的第一天的前一天）\n        const endOfLastMonth = startOfThisMonth.subtract(1, 'day');\n\n        // 获取上个月的第一天\n        const startOfLastMonth = endOfLastMonth.startOf('month');\n        return [startOfLastMonth.toDate(), endOfLastMonth.toDate()];\n      },\n    },\n    {\n      text: '近3天',\n      value: () => {\n        const end = new Date();\n        const start = new Date();\n        start.setTime(start.getTime() - 3600 * 1000 * 24 * 2);\n        return [start, end];\n      },\n    },\n\n    {\n      text: '近7天',\n      value: () => {\n        const end = new Date();\n        const start = new Date();\n        start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);\n        return [start, end];\n      },\n    },\n    {\n      text: '近15天',\n      value: () => {\n        const end = new Date();\n        const start = new Date();\n        start.setTime(start.getTime() - 3600 * 1000 * 24 * 14);\n        return [start, end];\n      },\n    },\n\n    {\n      text: '近30天',\n      value: () => {\n        const end = new Date();\n        const start = new Date();\n        start.setTime(start.getTime() - 3600 * 1000 * 24 * 29);\n        return [start, end];\n      },\n    },\n    {\n      text: '近60天',\n      value: () => {\n        const end = new Date();\n        const start = new Date();\n        start.setTime(start.getTime() - 3600 * 1000 * 24 * 59);\n        return [start, end];\n      },\n    },\n    {\n      text: '近90天',\n      value: () => {\n        const end = new Date();\n        const start = new Date();\n        start.setTime(start.getTime() - 3600 * 1000 * 24 * 89);\n        return [start, end];\n      },\n    },\n  ];\n  const shortcuts = [\n    {\n      type: 'date',\n      values: [\n        {\n          text: '今天',\n          value: () => new Date(),\n        },\n        {\n          text: '昨天',\n          value: () => {\n            const date = new Date();\n            date.setTime(date.getTime() - 3600 * 1000 * 24);\n            return date;\n          },\n        },\n        {\n          text: '一周前',\n          value: () => {\n            const date = new Date();\n            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);\n            return date;\n          },\n        },\n      ],\n    },\n    {\n      type: 'daterange',\n      values: daterangeShortcutValue,\n    },\n    {\n      type: 'datetimerange',\n      values: daterangeShortcutValue,\n    },\n  ];\n  return shortcuts.find(it => it.type === type)?.values ?? [];\n};\n"],"names":[],"mappings":"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"}

package/es/utils/src/file.d.ts

@@ -1,3 +1,4 @@
+export { genFileId } from 'element-plus';
 export interface FileConversionOptions {
     mimeType?: string;
 }
@@ -89,9 +90,3 @@ export declare const getVideoInfo: (url: string) => Promise<{
     height: number;
     duration: number;
 }>;
-/**
- * 下载文件
- * @param url 文件链接
- * @param filename 文件名
- */
-export declare const downloadFile: (url: string, filename?: string) => void;

package/es/utils/src/file.mjs

@@ -1,4 +1,5 @@
 import { md5 } from 'js-md5';
+export { genFileId } from 'element-plus';
 
 async function urlToBlob(url) {
   const response = await fetch(url);
@@ -103,14 +104,6 @@ const getVideoInfo = (url) => {
     video.src = url;
   });
 };
-const downloadFile = (url, filename = "\u4E0B\u8F7D\u6587\u4EF6") => {
-  fetch(url).then((response) => response.blob()).then((blob) => {
-    const a = document.createElement("a");
-    a.href = URL.createObjectURL(blob);
-    a.download = filename;
-    a.click();
-  });
-};
 
-export { base64ToBlob, base64ToFile, blobToBase64, blobToFile, downloadFile, fileMd5, fileToBase64, fileToBlob, fileToUrl, fileValidType, getImageInfo, getVideoInfo, urlToBlob, urlToFile };
+export { base64ToBlob, base64ToFile, blobToBase64, blobToFile, fileMd5, fileToBase64, fileToBlob, fileToUrl, fileValidType, getImageInfo, getVideoInfo, urlToBlob, urlToFile };
 //# sourceMappingURL=file.mjs.map

package/es/utils/src/file.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"file.mjs","sources":["../../../../../packages/utils/src/file.ts"],"sourcesContent":["import { md5 } from 'js-md5';\n\nexport interface FileConversionOptions {\n  mimeType?: string;\n}\n/**\n * 将 URL 转换为 Blob\n * @param url\n * @returns\n */\nexport async function urlToBlob(url: string): Promise<Blob> {\n  const response = await fetch(url);\n  return response.blob();\n}\n\n/**\n * 将 URL 转换为 File\n * @param url\n * @param filename\n * @param options\n * @returns\n */\nexport async function urlToFile(url: string, filename: string, options?: FileConversionOptions): Promise<File> {\n  const blob = await urlToBlob(url);\n  return new File([blob], filename, { type: options?.mimeType ?? blob.type });\n}\n\n/**\n * 将 Base64 字符串转换为 File\n * @param base64\n * @param filename\n * @param options\n * @returns\n */\nexport function base64ToFile(base64: string, filename: string, options?: FileConversionOptions): File {\n  const bolb = base64ToBlob(base64, { mimeType: options?.mimeType });\n  return blobToFile(bolb, filename);\n}\n\n/**\n * 将 File 转换为 Base64 字符串\n * @param file\n * @returns\n */\nexport function fileToBase64(file: File): Promise<string> {\n  return new Promise((resolve, reject) => {\n    const reader = new FileReader();\n    reader.onloadend = () => resolve(reader.result as string);\n    reader.onerror = reject;\n    reader.readAsDataURL(file);\n  });\n}\n\n/**\n * 将 Blob 转换为 Base64 字符串\n * @param blob\n * @returns\n */\nexport function blobToBase64(blob: Blob): Promise<string> {\n  return new Promise((resolve, reject) => {\n    const reader = new FileReader();\n    reader.onloadend = () => resolve(reader.result as string);\n    reader.onerror = reject;\n    reader.readAsDataURL(blob);\n  });\n}\n\n/**\n * 将 File 转换为 Blob\n * @param file\n * @param options\n * @returns\n */\nexport function fileToBlob(file: File, options?: FileConversionOptions): Blob {\n  return new Blob([file], { type: options?.mimeType ?? file.type });\n}\n\n/**\n * 将 Blob 转换为 File\n * @param blob\n * @param filename\n * @param options\n * @returns\n */\nexport function blobToFile(blob: Blob, filename: string, options?: FileConversionOptions): File {\n  return new File([blob], filename, { type: options?.mimeType ?? blob.type });\n}\n\n/**\n * 将 Base64 字符串转换为 Blob\n * @param base64\n * @param options\n * @returns\n */\nexport function base64ToBlob(base64: string, options?: FileConversionOptions): Blob {\n  const matches = base64.match(/^data:(.+);base64,(.*)$/);\n\n  if (!matches || matches.length !== 3) {\n    throw new Error('Invalid Base64 string');\n  }\n\n  const mimeType = options?.mimeType ?? matches[1];\n  const byteString = atob(matches[2]);\n  const arrayBuffer = new ArrayBuffer(byteString.length);\n  const intArray = new Uint8Array(arrayBuffer);\n\n  for (let i = 0; i < byteString.length; i++) {\n    intArray[i] = byteString.charCodeAt(i);\n  }\n\n  return new Blob([intArray], { type: mimeType });\n}\n/**\n * 文件转本地url\n * @param file\n * @returns\n */\nexport function fileToUrl(file: File | Blob) {\n  return URL.createObjectURL(file);\n}\n\n// 导出一个函数，用于检查文件类型是否合法\nexport function fileValidType(file: File, validTypes: string) {\n  // 获取文件的 MIME 类型\n  const fileType = file.type || '';\n  // 获取文件的扩展名\n  const fileExtension = file.name.slice(Math.max(0, file.name.lastIndexOf('.')));\n  // 将合法的文件类型字符串分割成数组\n  const acceptTypes = validTypes.split(',').map(type => type.trim());\n  // 遍历合法的文件类型数组，检查文件类型是否合法\n  return acceptTypes.some(type => {\n    // 如果文件类型以 . 开头，则检查文件扩展名\n    if (type.startsWith('.')) {\n      // 检查文件扩展名是否与合法的文件类型匹配\n      return fileExtension.toLowerCase() === type.toLowerCase();\n      // 如果文件类型包含 /*，则检查 MIME 类型组，如 image/*\n    } else if (type.includes('/*')) {\n      // 检查 MIME 类型组，如 image/*\n      const [mainType] = type.split('/');\n      return fileType.startsWith(`${mainType}/`);\n    } else {\n      // 检查具体 MIME 类型\n      return fileType === type;\n    }\n  });\n}\n\n/**\n * 计算文件的MD5哈希值\n * @param file 要计算哈希值的文件\n * @returns 文件的MD5哈希值\n */\nexport const fileMd5 = (file: File): Promise<string> => {\n  return new Promise<string>((resolve, reject) => {\n    const reader = new FileReader();\n\n    reader.onload = e => {\n      try {\n        const binary = (e.target as FileReader).result;\n        if (binary) {\n          resolve(md5(binary));\n        } else {\n          reject(new Error('读取文件内容失败'));\n        }\n      } catch (error) {\n        reject(new Error(`计算MD5失败: ${error instanceof Error ? error.message : String(error)}`));\n      }\n    };\n\n    reader.onerror = () => {\n      reject(new Error('读取文件失败'));\n    };\n\n    reader.readAsArrayBuffer(file);\n  });\n};\n\n/**\n * 获取图片宽高信息\n * @param url 图片链接\n * @returns 图片宽高信息\n */\nexport const getImageInfo = (url: string): Promise<{ width: number; height: number }> => {\n  return new Promise((resolve, reject) => {\n    const img = new Image();\n    img.onload = () => resolve({ width: img.width, height: img.height });\n    img.onerror = reject;\n    img.src = url;\n  });\n};\n\n/**\n * 获取视频信息\n * @param url 视频链接\n * @returns 视频宽高信息\n */\nexport const getVideoInfo = (url: string): Promise<{ width: number; height: number; duration: number }> => {\n  return new Promise((resolve, reject) => {\n    const video = document.createElement('video');\n    video.onloadedmetadata = () => resolve({ width: video.videoWidth, height: video.videoHeight, duration: video.duration });\n    video.onerror = reject;\n    video.src = url;\n  });\n};\n\n/**\n * 下载文件\n * @param url 文件链接\n * @param filename 文件名\n */\nexport const downloadFile = (url: string, filename: string = '下载文件') => {\n  fetch(url)\n    .then(response => response.blob())\n    .then(blob => {\n      const a = document.createElement('a');\n      a.href = URL.createObjectURL(blob);\n      a.download = filename;\n      a.click();\n    });\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.mjs","sources":["../../../../../packages/utils/src/file.ts"],"sourcesContent":["import { md5 } from 'js-md5';\n\nexport { genFileId } from 'element-plus';\n\nexport interface FileConversionOptions {\n  mimeType?: string;\n}\n/**\n * 将 URL 转换为 Blob\n * @param url\n * @returns\n */\nexport async function urlToBlob(url: string): Promise<Blob> {\n  const response = await fetch(url);\n  return response.blob();\n}\n\n/**\n * 将 URL 转换为 File\n * @param url\n * @param filename\n * @param options\n * @returns\n */\nexport async function urlToFile(url: string, filename: string, options?: FileConversionOptions): Promise<File> {\n  const blob = await urlToBlob(url);\n  return new File([blob], filename, { type: options?.mimeType ?? blob.type });\n}\n\n/**\n * 将 Base64 字符串转换为 File\n * @param base64\n * @param filename\n * @param options\n * @returns\n */\nexport function base64ToFile(base64: string, filename: string, options?: FileConversionOptions): File {\n  const bolb = base64ToBlob(base64, { mimeType: options?.mimeType });\n  return blobToFile(bolb, filename);\n}\n\n/**\n * 将 File 转换为 Base64 字符串\n * @param file\n * @returns\n */\nexport function fileToBase64(file: File): Promise<string> {\n  return new Promise((resolve, reject) => {\n    const reader = new FileReader();\n    reader.onloadend = () => resolve(reader.result as string);\n    reader.onerror = reject;\n    reader.readAsDataURL(file);\n  });\n}\n\n/**\n * 将 Blob 转换为 Base64 字符串\n * @param blob\n * @returns\n */\nexport function blobToBase64(blob: Blob): Promise<string> {\n  return new Promise((resolve, reject) => {\n    const reader = new FileReader();\n    reader.onloadend = () => resolve(reader.result as string);\n    reader.onerror = reject;\n    reader.readAsDataURL(blob);\n  });\n}\n\n/**\n * 将 File 转换为 Blob\n * @param file\n * @param options\n * @returns\n */\nexport function fileToBlob(file: File, options?: FileConversionOptions): Blob {\n  return new Blob([file], { type: options?.mimeType ?? file.type });\n}\n\n/**\n * 将 Blob 转换为 File\n * @param blob\n * @param filename\n * @param options\n * @returns\n */\nexport function blobToFile(blob: Blob, filename: string, options?: FileConversionOptions): File {\n  return new File([blob], filename, { type: options?.mimeType ?? blob.type });\n}\n\n/**\n * 将 Base64 字符串转换为 Blob\n * @param base64\n * @param options\n * @returns\n */\nexport function base64ToBlob(base64: string, options?: FileConversionOptions): Blob {\n  const matches = base64.match(/^data:(.+);base64,(.*)$/);\n\n  if (!matches || matches.length !== 3) {\n    throw new Error('Invalid Base64 string');\n  }\n\n  const mimeType = options?.mimeType ?? matches[1];\n  const byteString = atob(matches[2]);\n  const arrayBuffer = new ArrayBuffer(byteString.length);\n  const intArray = new Uint8Array(arrayBuffer);\n\n  for (let i = 0; i < byteString.length; i++) {\n    intArray[i] = byteString.charCodeAt(i);\n  }\n\n  return new Blob([intArray], { type: mimeType });\n}\n/**\n * 文件转本地url\n * @param file\n * @returns\n */\nexport function fileToUrl(file: File | Blob) {\n  return URL.createObjectURL(file);\n}\n\n// 导出一个函数，用于检查文件类型是否合法\nexport function fileValidType(file: File, validTypes: string) {\n  // 获取文件的 MIME 类型\n  const fileType = file.type || '';\n  // 获取文件的扩展名\n  const fileExtension = file.name.slice(Math.max(0, file.name.lastIndexOf('.')));\n  // 将合法的文件类型字符串分割成数组\n  const acceptTypes = validTypes.split(',').map(type => type.trim());\n  // 遍历合法的文件类型数组，检查文件类型是否合法\n  return acceptTypes.some(type => {\n    // 如果文件类型以 . 开头，则检查文件扩展名\n    if (type.startsWith('.')) {\n      // 检查文件扩展名是否与合法的文件类型匹配\n      return fileExtension.toLowerCase() === type.toLowerCase();\n      // 如果文件类型包含 /*，则检查 MIME 类型组，如 image/*\n    } else if (type.includes('/*')) {\n      // 检查 MIME 类型组，如 image/*\n      const [mainType] = type.split('/');\n      return fileType.startsWith(`${mainType}/`);\n    } else {\n      // 检查具体 MIME 类型\n      return fileType === type;\n    }\n  });\n}\n\n/**\n * 计算文件的MD5哈希值\n * @param file 要计算哈希值的文件\n * @returns 文件的MD5哈希值\n */\nexport const fileMd5 = (file: File): Promise<string> => {\n  return new Promise<string>((resolve, reject) => {\n    const reader = new FileReader();\n\n    reader.onload = e => {\n      try {\n        const binary = (e.target as FileReader).result;\n        if (binary) {\n          resolve(md5(binary));\n        } else {\n          reject(new Error('读取文件内容失败'));\n        }\n      } catch (error) {\n        reject(new Error(`计算MD5失败: ${error instanceof Error ? error.message : String(error)}`));\n      }\n    };\n\n    reader.onerror = () => {\n      reject(new Error('读取文件失败'));\n    };\n\n    reader.readAsArrayBuffer(file);\n  });\n};\n\n/**\n * 获取图片宽高信息\n * @param url 图片链接\n * @returns 图片宽高信息\n */\nexport const getImageInfo = (url: string): Promise<{ width: number; height: number }> => {\n  return new Promise((resolve, reject) => {\n    const img = new Image();\n    img.onload = () => resolve({ width: img.width, height: img.height });\n    img.onerror = reject;\n    img.src = url;\n  });\n};\n\n/**\n * 获取视频信息\n * @param url 视频链接\n * @returns 视频宽高信息\n */\nexport const getVideoInfo = (url: string): Promise<{ width: number; height: number; duration: number }> => {\n  return new Promise((resolve, reject) => {\n    const video = document.createElement('video');\n    video.onloadedmetadata = () => resolve({ width: video.videoWidth, height: video.videoHeight, duration: video.duration });\n    video.onerror = reject;\n    video.src = url;\n  });\n};\n"],"names":[],"mappings":"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"}

package/es/utils/src/http/interceptors.d.ts

@@ -1,3 +1,3 @@
 import type { AxiosInstance, InternalAxiosRequestConfig } from 'axios';
-export declare const res401Interceptors: (service: AxiosInstance, config: InternalAxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const res401Interceptors: (service?: AxiosInstance, config?: InternalAxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const req401Interceptors: () => boolean;

package/es/utils/src/http/interceptors.mjs

@@ -21,7 +21,10 @@ const res401Interceptors = async (service, config) => {
   if (!res) {
     return Promise.reject({ code: 400, data: null, message: "\u767B\u5F55\u5F39\u7A97\u5DF2\u5173\u95ED" });
   }
-  return service(config);
+  if (service && config) {
+    return service(config);
+  }
+  return Promise.reject("\u672C\u6B21\u8BF7\u6C42\u7ED3\u675F");
 };
 const req401Interceptors = () => {
   const logingStore = useLoginStore();

package/es/utils/src/http/interceptors.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"interceptors.mjs","sources":["../../../../../../packages/utils/src/http/interceptors.ts"],"sourcesContent":["import Cookie from 'js-cookie';\nimport { ElMessage } from 'element-plus';\nimport { useLoginStore } from '@giime/hooks/store/useLogin';\nimport type { AxiosInstance, InternalAxiosRequestConfig } from 'axios';\n\n// 响应拦截器中 401时 展示登录弹窗\nexport const res401Interceptors = async (service: AxiosInstance, config: InternalAxiosRequestConfig) => {\n  const logingStore = useLoginStore();\n  Cookie.remove('token', { domain: '.giikin.com' });\n  Cookie.remove('token', { domain: '.giikin.cn' });\n  Cookie.remove('token');\n  logingStore.userToken = undefined;\n  logingStore.userId = undefined;\n  // Vue.prototype.$hideLoading();\n  logingStore.showLogin = true;\n  ElMessage({\n    message: '请在弹框中重新登录',\n    type: 'error',\n    duration: 5 * 1000,\n    grouping: true,\n    showClose: true,\n  });\n  // 登录成功后重新发起请求\n  // 等待登录 或 等待关闭登录弹窗\n  const res = await Promise.race([logingStore.onLoginResultPromise(), logingStore.onCloseLoginResultPromise()]);\n  if (!res) {\n    return Promise.reject({ code: 400, data: null, message: '登录弹窗已关闭' });\n  }\n  // 重新发送请求\n  return service(config);\n  // return Promise.resolve({ code: 400, data: null, message: '请重新登录' });\n  // return Promise.reject('请重新登录');\n};\n// 请求拦截器中，没有token时 展示登录弹窗\nexport const req401Interceptors = () => {\n  const logingStore = useLoginStore();\n  // Vue.prototype.$hideLoading();\n  ElMessage({\n    message: '请在弹框中重新登录',\n    type: 'error',\n    duration: 5 * 1000,\n    grouping: true,\n    showClose: true,\n  });\n  return (logingStore.showLogin = true);\n};\n"],"names":["Cookie"],"mappings":";;;;AAMa,MAAA,kBAAA,GAAqB,OAAO,OAAA,EAAwB,MAAuC,KAAA;AACtG,EAAA,MAAM,cAAc,aAAc,EAAA,CAAA;AAClC,EAAAA,OAAA,CAAO,MAAO,CAAA,OAAA,EAAS,EAAE,MAAA,EAAQ,eAAe,CAAA,CAAA;AAChD,EAAAA,OAAA,CAAO,MAAO,CAAA,OAAA,EAAS,EAAE,MAAA,EAAQ,cAAc,CAAA,CAAA;AAC/C,EAAAA,OAAA,CAAO,OAAO,OAAO,CAAA,CAAA;AACrB,EAAA,WAAA,CAAY,SAAY,GAAA,KAAA,CAAA,CAAA;AACxB,EAAA,WAAA,CAAY,MAAS,GAAA,KAAA,CAAA,CAAA;AAErB,EAAA,WAAA,CAAY,SAAY,GAAA,IAAA,CAAA;AACxB,EAAU,SAAA,CAAA;AAAA,IACR,OAAS,EAAA,wDAAA;AAAA,IACT,IAAM,EAAA,OAAA;AAAA,IACN,UAAU,CAAI,GAAA,GAAA;AAAA,IACd,QAAU,EAAA,IAAA;AAAA,IACV,SAAW,EAAA,IAAA;AAAA,GACZ,CAAA,CAAA;AAGD,EAAM,MAAA,GAAA,GAAM,MAAM,OAAA,CAAQ,IAAK,CAAA,CAAC,WAAY,CAAA,oBAAA,EAAwB,EAAA,WAAA,CAAY,yBAA0B,EAAC,CAAC,CAAA,CAAA;AAC5G,EAAA,IAAI,CAAC,GAAK,EAAA;AACR,IAAO,OAAA,OAAA,CAAQ,OAAO,EAAE,IAAA,EAAM,KAAK,IAAM,EAAA,IAAA,EAAM,OAAS,EAAA,4CAAA,EAAW,CAAA,CAAA;AAAA,GACrE;AAEA,EAAA,OAAO,QAAQ,MAAM,CAAA,CAAA;AAGvB,EAAA;AAEO,MAAM,qBAAqB,MAAM;AACtC,EAAA,MAAM,cAAc,aAAc,EAAA,CAAA;AAElC,EAAU,SAAA,CAAA;AAAA,IACR,OAAS,EAAA,wDAAA;AAAA,IACT,IAAM,EAAA,OAAA;AAAA,IACN,UAAU,CAAI,GAAA,GAAA;AAAA,IACd,QAAU,EAAA,IAAA;AAAA,IACV,SAAW,EAAA,IAAA;AAAA,GACZ,CAAA,CAAA;AACD,EAAA,OAAQ,YAAY,SAAY,GAAA,IAAA,CAAA;AAClC;;;;"}
+{"version":3,"file":"interceptors.mjs","sources":["../../../../../../packages/utils/src/http/interceptors.ts"],"sourcesContent":["import Cookie from 'js-cookie';\nimport { ElMessage } from 'element-plus';\nimport { useLoginStore } from '@giime/hooks/store/useLogin';\nimport type { AxiosInstance, InternalAxiosRequestConfig } from 'axios';\n\n// 响应拦截器中 401时 展示登录弹窗\nexport const res401Interceptors = async (service?: AxiosInstance, config?: InternalAxiosRequestConfig) => {\n  const logingStore = useLoginStore();\n  Cookie.remove('token', { domain: '.giikin.com' });\n  Cookie.remove('token', { domain: '.giikin.cn' });\n  Cookie.remove('token');\n  logingStore.userToken = undefined;\n  logingStore.userId = undefined;\n  // Vue.prototype.$hideLoading();\n  logingStore.showLogin = true;\n  ElMessage({\n    message: '请在弹框中重新登录',\n    type: 'error',\n    duration: 5 * 1000,\n    grouping: true,\n    showClose: true,\n  });\n  // 登录成功后重新发起请求\n  // 等待登录 或 等待关闭登录弹窗\n  const res = await Promise.race([logingStore.onLoginResultPromise(), logingStore.onCloseLoginResultPromise()]);\n  if (!res) {\n    return Promise.reject({ code: 400, data: null, message: '登录弹窗已关闭' });\n  }\n  // 重新发送请求\n  if (service && config) {\n    return service(config);\n  }\n  return Promise.reject('本次请求结束');\n  // return Promise.reject('请重新登录');\n};\n// 请求拦截器中，没有token时 展示登录弹窗\nexport const req401Interceptors = () => {\n  const logingStore = useLoginStore();\n  // Vue.prototype.$hideLoading();\n  ElMessage({\n    message: '请在弹框中重新登录',\n    type: 'error',\n    duration: 5 * 1000,\n    grouping: true,\n    showClose: true,\n  });\n  return (logingStore.showLogin = true);\n};\n"],"names":["Cookie"],"mappings":";;;;AAMa,MAAA,kBAAA,GAAqB,OAAO,OAAA,EAAyB,MAAwC,KAAA;AACxG,EAAA,MAAM,cAAc,aAAc,EAAA,CAAA;AAClC,EAAAA,OAAA,CAAO,MAAO,CAAA,OAAA,EAAS,EAAE,MAAA,EAAQ,eAAe,CAAA,CAAA;AAChD,EAAAA,OAAA,CAAO,MAAO,CAAA,OAAA,EAAS,EAAE,MAAA,EAAQ,cAAc,CAAA,CAAA;AAC/C,EAAAA,OAAA,CAAO,OAAO,OAAO,CAAA,CAAA;AACrB,EAAA,WAAA,CAAY,SAAY,GAAA,KAAA,CAAA,CAAA;AACxB,EAAA,WAAA,CAAY,MAAS,GAAA,KAAA,CAAA,CAAA;AAErB,EAAA,WAAA,CAAY,SAAY,GAAA,IAAA,CAAA;AACxB,EAAU,SAAA,CAAA;AAAA,IACR,OAAS,EAAA,wDAAA;AAAA,IACT,IAAM,EAAA,OAAA;AAAA,IACN,UAAU,CAAI,GAAA,GAAA;AAAA,IACd,QAAU,EAAA,IAAA;AAAA,IACV,SAAW,EAAA,IAAA;AAAA,GACZ,CAAA,CAAA;AAGD,EAAM,MAAA,GAAA,GAAM,MAAM,OAAA,CAAQ,IAAK,CAAA,CAAC,WAAY,CAAA,oBAAA,EAAwB,EAAA,WAAA,CAAY,yBAA0B,EAAC,CAAC,CAAA,CAAA;AAC5G,EAAA,IAAI,CAAC,GAAK,EAAA;AACR,IAAO,OAAA,OAAA,CAAQ,OAAO,EAAE,IAAA,EAAM,KAAK,IAAM,EAAA,IAAA,EAAM,OAAS,EAAA,4CAAA,EAAW,CAAA,CAAA;AAAA,GACrE;AAEA,EAAA,IAAI,WAAW,MAAQ,EAAA;AACrB,IAAA,OAAO,QAAQ,MAAM,CAAA,CAAA;AAAA,GACvB;AACA,EAAO,OAAA,OAAA,CAAQ,OAAO,sCAAQ,CAAA,CAAA;AAEhC,EAAA;AAEO,MAAM,qBAAqB,MAAM;AACtC,EAAA,MAAM,cAAc,aAAc,EAAA,CAAA;AAElC,EAAU,SAAA,CAAA;AAAA,IACR,OAAS,EAAA,wDAAA;AAAA,IACT,IAAM,EAAA,OAAA;AAAA,IACN,UAAU,CAAI,GAAA,GAAA;AAAA,IACd,QAAU,EAAA,IAAA;AAAA,IACV,SAAW,EAAA,IAAA;AAAA,GACZ,CAAA,CAAA;AACD,EAAA,OAAQ,YAAY,SAAY,GAAA,IAAA,CAAA;AAClC;;;;"}

package/lib/components/src/base/datePicker/DatePicker.vue.d.ts

@@ -1,7 +1,7 @@
 import type { DatePickerInstance } from 'element-plus';
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     type: {
-        type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+        type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
         default: "date";
     };
     shortcuts: {
@@ -107,7 +107,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     "visible-change": (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     type: {
-        type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+        type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
         default: "date";
     };
     shortcuts: {
@@ -207,7 +207,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     "onPanel-change"?: ((...args: any[]) => any) | undefined;
     "onVisible-change"?: ((...args: any[]) => any) | undefined;
 }, {
-    type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange";
+    type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange";
     name: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>) | ((new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>))[], unknown, unknown>;
     disabled: boolean;
     modelValue: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType) | ((new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType))[], unknown, unknown>;

package/lib/components/src/base/datePicker/datePicker.d.ts

@@ -4,7 +4,7 @@ export type DateModelType = number | string | Date;
 export type ModelValueType = SingleOrRange<DateModelType>;
 export declare const datePickerProps: {
     type: {
-        type: PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+        type: PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
         default: "date";
     };
     shortcuts: {

package/lib/components/src/base/datePicker/index.d.ts

@@ -2,7 +2,7 @@ import DatePicker from './DatePicker.vue';
 export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
     new (...args: any[]): import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
         type: {
-            type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+            type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
             default: "date";
         };
         shortcuts: {
@@ -116,7 +116,7 @@ export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
         "visible-change": (...args: any[]) => void;
     }, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         type: {
-            type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+            type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
             default: "date";
         };
         shortcuts: {
@@ -216,7 +216,7 @@ export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
         "onPanel-change"?: ((...args: any[]) => any) | undefined;
         "onVisible-change"?: ((...args: any[]) => any) | undefined;
     }, {
-        type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange";
+        type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange";
         name: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>) | ((new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>))[], unknown, unknown>;
         disabled: boolean;
         modelValue: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType) | ((new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType))[], unknown, unknown>;
@@ -243,7 +243,7 @@ export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
         Defaults: {};
     }, Readonly<import("vue").ExtractPropTypes<{
         type: {
-            type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+            type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
             default: "date";
         };
         shortcuts: {
@@ -348,7 +348,7 @@ export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
         handleClose: () => void;
         elRef: import("vue").Ref<import("element-plus").DatePickerInstance | undefined>;
     }, {}, {}, {}, {
-        type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange";
+        type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange";
         name: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>) | ((new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>))[], unknown, unknown>;
         disabled: boolean;
         modelValue: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType) | ((new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType))[], unknown, unknown>;
@@ -372,7 +372,7 @@ export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
     __isSuspense?: undefined;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
     type: {
-        type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange">;
+        type: import("vue").PropType<"date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange">;
         default: "date";
     };
     shortcuts: {
@@ -485,7 +485,7 @@ export declare const GmDatePicker: import("../../../../utils").SFCWithInstall<{
     "panel-change": (...args: any[]) => void;
     "visible-change": (...args: any[]) => void;
 }, string, {
-    type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetime" | "datetimerange" | "monthrange" | "yearrange";
+    type: "date" | "daterange" | "month" | "year" | "months" | "years" | "dates" | "week" | "datetimerange" | "datetime" | "monthrange" | "yearrange";
     name: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>) | ((new (...args: any[]) => string | [string, string]) | (() => import("element-plus").SingleOrRange<string>))[], unknown, unknown>;
     disabled: boolean;
     modelValue: import("element-plus/es/utils/index.js").EpPropMergeType<(new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType) | ((new (...args: any[]) => string | number | Date | string[] | [import("element-plus").DateModelType, import("element-plus").DateModelType]) | (() => import("element-plus").ModelValueType))[], unknown, unknown>;

package/lib/components/src/business/uploadPro/UploadPro.vue.js

@@ -7,7 +7,7 @@ require('./UploadPro.vue3.js');
 require('./UploadPro.vue4.js');
 var _pluginVue_exportHelper = require('../../../../_virtual/_plugin-vue_export-helper.js');
 
-var UploadPro = /* @__PURE__ */ _pluginVue_exportHelper.default(UploadPro_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-2c95bde6"]]);
+var UploadPro = /* @__PURE__ */ _pluginVue_exportHelper.default(UploadPro_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-ca99928c"]]);
 
 exports.default = UploadPro;
 //# sourceMappingURL=UploadPro.vue.js.map

package/lib/components/src/business/uploadPro/UploadPro.vue2.js

@@ -13,7 +13,7 @@ var uploadPro = require('./uploadPro.js');
 var exports$1 = require('../../../../utils/src/elementPlus/exports.js');
 var index = require('../../../../hooks/base/useUploadFile/index.js');
 
-const _withScopeId = (n) => (vue.pushScopeId("data-v-2c95bde6"), n = n(), vue.popScopeId(), n);
+const _withScopeId = (n) => (vue.pushScopeId("data-v-ca99928c"), n = n(), vue.popScopeId(), n);
 const _hoisted_1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode(
   "div",
   { class: "el-upload__text gm-text-center !gm-text-xs gm-text-gray-500" },
@@ -46,12 +46,18 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const emit = __emit;
     const fileList = vue.useModel(__props, "fileList");
     const checkoutFiles = vue.useModel(__props, "checkoutFiles");
-    const { uploadFile } = index.useUploadFile();
+    const { uploadFile, cancelUpload } = index.useUploadFile();
     const loadingUids = vue.ref(/* @__PURE__ */ new Set());
     const uploadLoading = vue.computed(() => props.showLoading && loadingUids.value.size > 0);
     const httpRequest = async (options) => {
       loadingUids.value.add(options.file.uid);
-      return uploadFile(options.file, { domainCode: props.domainCode, sceneCode: props.sceneCode, accept: props.accept, acl: props.acl });
+      return uploadFile(options.file, {
+        domainCode: props.domainCode,
+        sceneCode: props.sceneCode,
+        accept: props.accept,
+        acl: props.acl,
+        elOptions: options
+      });
     };
     const coverFileSuccess = (response, uploadFile2, uploadFiles) => {
       loadingUids.value.delete(uploadFile2.uid);
@@ -61,13 +67,25 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       loadingUids.value.delete(uploadFile2.uid);
       props.onError?.(error, uploadFile2, uploadFiles);
     };
-    const beforeRemove = (file, files) => {
+    const beforeRemove = async (file, files) => {
       if (props.disabled) {
         return false;
       }
+      if (props.deleteTip) {
+        await index$1.GmConfirmBox({ message: "\u786E\u5B9A\u5220\u9664\u8BE5\u6587\u4EF6\u5417\uFF1F" }, async () => {
+        });
+      }
+      if (file.status === "uploading" || loadingUids.value.has(file.uid)) {
+        cancelUpload(file.uid);
+        loadingUids.value.delete(file.uid);
+      }
       return props.beforeRemove?.(file, files) ?? true;
     };
     const removeFile = (file, uploadFiles) => {
+      if (file.status === "uploading" || loadingUids.value.has(file.uid)) {
+        cancelUpload(file.uid);
+        loadingUids.value.delete(file.uid);
+      }
       const index = fileList.value.indexOf(file);
       if (index > -1) {
         fileList.value.splice(index, 1);
@@ -123,6 +141,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const _component_el_icon = vue.resolveComponent("el-icon");
       const _component_el_button = vue.resolveComponent("el-button");
       const _component_el_checkbox = vue.resolveComponent("el-checkbox");
+      const _component_el_progress = vue.resolveComponent("el-progress");
       const _component_el_upload = vue.resolveComponent("el-upload");
       const _component_el_checkbox_group = vue.resolveComponent("el-checkbox-group");
       const _directive_loading = vue.resolveDirective("loading");
@@ -207,12 +226,25 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                             style: vue.normalizeStyle({ width: _ctx.width + "px", height: _ctx.height + "px" })
                           },
                           [
-                            vue.createVNode(vue.unref(index$3.GmFileComponent), {
+                            file.status === "uploading" || loadingUids.value.has(file.uid) ? (vue.openBlock(), vue.createBlock(_component_el_progress, {
+                              key: 0,
+                              type: _ctx.listType === "picture-card" ? "circle" : "line",
+                              "stroke-width": _ctx.listType === "picture-card" ? 6 : 2,
+                              percentage: Number(file.percentage),
+                              style: vue.normalizeStyle(
+                                _ctx.listType === "picture-card" ? {
+                                  width: _ctx.width - 20 + "px",
+                                  height: _ctx.width - 20 + "px"
+                                } : "margin-top: 0.5rem"
+                              ),
+                              width: _ctx.width - 20
+                            }, null, 8, ["type", "stroke-width", "percentage", "style", "width"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$3.GmFileComponent), {
+                              key: 1,
                               file,
                               size: _ctx.width - 40,
                               controls: false,
                               "show-icon": true
-                            }, null, 8, ["file", "size"])
+                            }, null, 8, ["file", "size"]))
                           ],
                           4
                           /* STYLE */