giime 0.6.35 → 0.6.37

package/es/hooks/base/useUploadFile/index.mjs

@@ -4,20 +4,25 @@ import '../../../api/resource/controller/index.mjs';
 import { fileValidType, fileMd5 } from '../../../utils/src/file.mjs';
 import { GmMessage } from '../../../components/src/plugins/message/index.mjs';
 import { useGlobalConfig } from '../useGlobalConfig/index.mjs';
+import { genFileId } from 'element-plus';
 import { postV1ResourcesUrl } from '../../../api/resource/controller/ZiYuanGuanLi/postV1ResourcesUrl.mjs';
 
 const useUploadFile = () => {
   const isLoading = ref(false);
   const domainCode = useGlobalConfig("domainCode");
+  const abortControllers = ref(/* @__PURE__ */ new Map());
   const uploadFile = async (file, options) => {
-    const uploadDomainCode = options.domainCode ?? domainCode.value;
+    const uploadDomainCode = options?.domainCode ?? domainCode.value;
     if (!uploadDomainCode) {
       GmMessage.error("\u9886\u57DF\u7F16\u7801\u4E0D\u80FD\u4E3A\u7A7A");
       throw new Error("\u9886\u57DF\u7F16\u7801\u4E0D\u80FD\u4E3A\u7A7A");
     }
+    const abortController = new AbortController();
+    const fileKey = file.uid ?? genFileId();
+    abortControllers.value.set(fileKey, abortController);
     try {
       isLoading.value = true;
-      if (options.accept && options.accept !== "*") {
+      if (options?.accept && options?.accept !== "*") {
         const isValidType = fileValidType(file, options.accept);
         if (!isValidType) {
           GmMessage.error(`\u6587\u4EF6\u7C7B\u578B\u4E0D\u652F\u6301\uFF0C\u8BF7\u4E0A\u4F20 ${options.accept} \u683C\u5F0F\u7684\u6587\u4EF6`);
@@ -25,11 +30,11 @@ const useUploadFile = () => {
         }
       }
       const md5 = await fileMd5(file);
-      const acl = options.acl || "default";
+      const acl = options?.acl || "default";
       const { data } = await postV1ResourcesUrl({
         domainCode: uploadDomainCode,
         // 领域编码
-        sceneCode: options.sceneCode || "internal_oss",
+        sceneCode: options?.sceneCode || "internal_oss",
         // 场景编码
         fileName: file.name,
         contentType: file.type,
@@ -44,21 +49,47 @@ const useUploadFile = () => {
             headers: {
               "Content-Type": file.type,
               "x-oss-object-acl ": acl
+            },
+            signal: abortController.signal,
+            onUploadProgress: (progressEvent) => {
+              const progressEvt = progressEvent.event;
+              progressEvt.percent = progressEvt.total > 0 ? progressEvt.loaded / progressEvt.total * 100 : 0;
+              options?.elOptions?.onProgress(progressEvent.event);
             }
           });
         } catch (error) {
+          if (axios.isCancel(error) || error?.name === "AbortError") {
+            console.log("\u4E0A\u4F20\u8BF7\u6C42\u5DF2\u53D6\u6D88");
+            throw error;
+          }
           GmMessage.error("\u63A8\u9001\u81F3\u5B58\u50A8\u6876\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
           throw error;
         }
       }
       return data.data;
     } finally {
+      abortControllers.value.delete(fileKey);
       isLoading.value = false;
     }
   };
+  const cancelUpload = (fileUid) => {
+    const abortController = abortControllers.value.get(fileUid);
+    if (abortController) {
+      abortController.abort();
+      abortControllers.value.delete(fileUid);
+    }
+  };
+  const cancelAllUploads = () => {
+    abortControllers.value.forEach((controller) => {
+      controller.abort();
+    });
+    abortControllers.value.clear();
+  };
   return {
     isLoading,
-    uploadFile
+    uploadFile,
+    cancelUpload,
+    cancelAllUploads
   };
 };
 

package/es/hooks/base/useUploadFile/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../../packages/hooks/base/useUploadFile/index.ts"],"sourcesContent":["import axios from 'axios';\nimport { ref } from 'vue';\nimport { postV1ResourcesUrl } from '@giime/api/resource/controller';\nimport { fileMd5, fileValidType } from '@giime/utils/src/file';\nimport { GmMessage } from '@giime/components/src/plugins/message';\nimport { useGlobalConfig } from '@giime/hooks/base/useGlobalConfig';\n\nexport interface UseUploadFileOptions {\n  /**领域编码 */\n  domainCode?: string;\n  /**场景编码 */\n  sceneCode?: string;\n  /**接受上传的文件类型 */\n  accept?: string;\n  /**文件权限,默认继承桶 */\n  acl?: string;\n}\n\nexport const useUploadFile = () => {\n  const isLoading = ref(false);\n  const domainCode = useGlobalConfig('domainCode');\n\n  const uploadFile = async (file: File, options: UseUploadFileOptions) => {\n    // 领域编码\n    const uploadDomainCode = options.domainCode ?? domainCode.value;\n    if (!uploadDomainCode) {\n      GmMessage.error('领域编码不能为空');\n      throw new Error('领域编码不能为空');\n    }\n    try {\n      isLoading.value = true;\n      // 验证文件类型\n      if (options.accept && options.accept !== '*') {\n        const isValidType = fileValidType(file, options.accept);\n        if (!isValidType) {\n          GmMessage.error(`文件类型不支持，请上传 ${options.accept} 格式的文件`);\n          throw new Error(`文件类型不支持，请上传 ${options.accept} 格式的文件`);\n        }\n      }\n      const md5 = await fileMd5(file);\n      const acl = options.acl || 'default';\n      const { data } = await postV1ResourcesUrl({\n        domainCode: uploadDomainCode, // 领域编码\n        sceneCode: options.sceneCode || 'internal_oss', // 场景编码\n        fileName: file.name,\n        contentType: file.type,\n        md5,\n        size: file.size,\n        acl, // 文件权限\n      });\n\n      if (data.data.uploadUrl) {\n        try {\n          await axios.put(data.data.uploadUrl, file, {\n            headers: {\n              'Content-Type': file.type,\n              'x-oss-object-acl ': acl,\n            },\n          });\n        } catch (error) {\n          GmMessage.error('推送至存储桶失败，请重试');\n          throw error;\n        }\n      }\n\n      return data.data;\n    } finally {\n      isLoading.value = false;\n    }\n  };\n  return {\n    isLoading,\n    uploadFile,\n  };\n};\n"],"names":[],"mappings":";;;;;;;;AAkBO,MAAM,gBAAgB,MAAM;AACjC,EAAM,MAAA,SAAA,GAAY,IAAI,KAAK,CAAA,CAAA;AAC3B,EAAM,MAAA,UAAA,GAAa,gBAAgB,YAAY,CAAA,CAAA;AAE/C,EAAM,MAAA,UAAA,GAAa,OAAO,IAAA,EAAY,OAAkC,KAAA;AAEtE,IAAM,MAAA,gBAAA,GAAmB,OAAQ,CAAA,UAAA,IAAc,UAAW,CAAA,KAAA,CAAA;AAC1D,IAAA,IAAI,CAAC,gBAAkB,EAAA;AACrB,MAAA,SAAA,CAAU,MAAM,kDAAU,CAAA,CAAA;AAC1B,MAAM,MAAA,IAAI,MAAM,kDAAU,CAAA,CAAA;AAAA,KAC5B;AACA,IAAI,IAAA;AACF,MAAA,SAAA,CAAU,KAAQ,GAAA,IAAA,CAAA;AAElB,MAAA,IAAI,OAAQ,CAAA,MAAA,IAAU,OAAQ,CAAA,MAAA,KAAW,GAAK,EAAA;AAC5C,QAAA,MAAM,WAAc,GAAA,aAAA,CAAc,IAAM,EAAA,OAAA,CAAQ,MAAM,CAAA,CAAA;AACtD,QAAA,IAAI,CAAC,WAAa,EAAA;AAChB,UAAA,SAAA,CAAU,KAAM,CAAA,CAAA,mEAAA,EAAe,OAAQ,CAAA,MAAM,CAAQ,+BAAA,CAAA,CAAA,CAAA;AACrD,UAAA,MAAM,IAAI,KAAA,CAAM,CAAe,mEAAA,EAAA,OAAA,CAAQ,MAAM,CAAQ,+BAAA,CAAA,CAAA,CAAA;AAAA,SACvD;AAAA,OACF;AACA,MAAM,MAAA,GAAA,GAAM,MAAM,OAAA,CAAQ,IAAI,CAAA,CAAA;AAC9B,MAAM,MAAA,GAAA,GAAM,QAAQ,GAAO,IAAA,SAAA,CAAA;AAC3B,MAAA,MAAM,EAAE,IAAA,EAAS,GAAA,MAAM,kBAAmB,CAAA;AAAA,QACxC,UAAY,EAAA,gBAAA;AAAA;AAAA,QACZ,SAAA,EAAW,QAAQ,SAAa,IAAA,cAAA;AAAA;AAAA,QAChC,UAAU,IAAK,CAAA,IAAA;AAAA,QACf,aAAa,IAAK,CAAA,IAAA;AAAA,QAClB,GAAA;AAAA,QACA,MAAM,IAAK,CAAA,IAAA;AAAA,QACX,GAAA;AAAA;AAAA,OACD,CAAA,CAAA;AAED,MAAI,IAAA,IAAA,CAAK,KAAK,SAAW,EAAA;AACvB,QAAI,IAAA;AACF,UAAA,MAAM,KAAM,CAAA,GAAA,CAAI,IAAK,CAAA,IAAA,CAAK,WAAW,IAAM,EAAA;AAAA,YACzC,OAAS,EAAA;AAAA,cACP,gBAAgB,IAAK,CAAA,IAAA;AAAA,cACrB,mBAAqB,EAAA,GAAA;AAAA,aACvB;AAAA,WACD,CAAA,CAAA;AAAA,iBACM,KAAO,EAAA;AACd,UAAA,SAAA,CAAU,MAAM,0EAAc,CAAA,CAAA;AAC9B,UAAM,MAAA,KAAA,CAAA;AAAA,SACR;AAAA,OACF;AAEA,MAAA,OAAO,IAAK,CAAA,IAAA,CAAA;AAAA,KACZ,SAAA;AACA,MAAA,SAAA,CAAU,KAAQ,GAAA,KAAA,CAAA;AAAA,KACpB;AAAA,GACF,CAAA;AACA,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,UAAA;AAAA,GACF,CAAA;AACF;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../../../../../packages/hooks/base/useUploadFile/index.ts"],"sourcesContent":["import axios from 'axios';\nimport { ref } from 'vue';\nimport { postV1ResourcesUrl } from '@giime/api/resource/controller';\nimport { fileMd5, fileValidType, genFileId } from '@giime/utils/src/file';\nimport { GmMessage } from '@giime/components/src/plugins/message';\nimport { useGlobalConfig } from '@giime/hooks/base/useGlobalConfig';\nimport type { UploadProgressEvent, UploadRawFile, UploadRequestOptions } from 'element-plus';\n\nexport interface UseUploadFileOptions {\n  /**领域编码 */\n  domainCode?: string;\n  /**场景编码 */\n  sceneCode?: string;\n  /**接受上传的文件类型 */\n  accept?: string;\n  /**文件权限,默认继承桶 */\n  acl?: string;\n  /**是否禁止上传文件到存储桶 */\n  disablePutFile?: boolean;\n  /** */\n  elOptions?: UploadRequestOptions;\n}\n\nexport const useUploadFile = () => {\n  const isLoading = ref(false);\n  const domainCode = useGlobalConfig('domainCode');\n  // 存储每个文件的取消控制器\n  const abortControllers = ref<Map<number, AbortController>>(new Map());\n\n  const uploadFile = async (file: UploadRawFile, options?: UseUploadFileOptions) => {\n    // 领域编码\n    const uploadDomainCode = options?.domainCode ?? domainCode.value;\n    if (!uploadDomainCode) {\n      GmMessage.error('领域编码不能为空');\n      throw new Error('领域编码不能为空');\n    }\n\n    // 创建取消控制器\n    const abortController = new AbortController();\n    const fileKey = file.uid ?? genFileId();\n    abortControllers.value.set(fileKey, abortController);\n\n    try {\n      isLoading.value = true;\n      // 验证文件类型\n      if (options?.accept && options?.accept !== '*') {\n        const isValidType = fileValidType(file, options.accept);\n        if (!isValidType) {\n          GmMessage.error(`文件类型不支持，请上传 ${options.accept} 格式的文件`);\n          throw new Error(`文件类型不支持，请上传 ${options.accept} 格式的文件`);\n        }\n      }\n      const md5 = await fileMd5(file);\n      const acl = options?.acl || 'default';\n      const { data } = await postV1ResourcesUrl({\n        domainCode: uploadDomainCode, // 领域编码\n        sceneCode: options?.sceneCode || 'internal_oss', // 场景编码\n        fileName: file.name,\n        contentType: file.type,\n        md5,\n        size: file.size,\n        acl, // 文件权限\n      });\n\n      if (data.data.uploadUrl) {\n        try {\n          await axios.put(data.data.uploadUrl, file, {\n            headers: {\n              'Content-Type': file.type,\n              'x-oss-object-acl ': acl,\n            },\n            signal: abortController.signal,\n            onUploadProgress: progressEvent => {\n              const progressEvt = progressEvent.event as UploadProgressEvent;\n              progressEvt.percent = progressEvt.total > 0 ? (progressEvt.loaded / progressEvt.total) * 100 : 0;\n              options?.elOptions?.onProgress(progressEvent.event);\n            },\n          });\n        } catch (error: any) {\n          // 如果是取消请求，不显示错误信息\n          if (axios.isCancel(error) || error?.name === 'AbortError') {\n            console.log('上传请求已取消');\n            throw error;\n          }\n          GmMessage.error('推送至存储桶失败，请重试');\n          throw error;\n        }\n      }\n\n      return data.data;\n    } finally {\n      // 清理取消控制器\n      abortControllers.value.delete(fileKey);\n      isLoading.value = false;\n    }\n  };\n  // 取消上传请求\n  const cancelUpload = (fileUid: number) => {\n    const abortController = abortControllers.value.get(fileUid);\n    if (abortController) {\n      abortController.abort();\n      abortControllers.value.delete(fileUid);\n    }\n  };\n\n  // 取消所有上传请求\n  const cancelAllUploads = () => {\n    abortControllers.value.forEach(controller => {\n      controller.abort();\n    });\n    abortControllers.value.clear();\n  };\n\n  return {\n    isLoading,\n    uploadFile,\n    cancelUpload,\n    cancelAllUploads,\n  };\n};\n"],"names":[],"mappings":"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"}

package/es/index.css

@@ -873,16 +873,97 @@ video {
 .gm-group:hover .group-hover\:gm-block {
   display: block;
 }
+.gm-flex-center[data-v-c17deec9] {
+  align-items: center;
+}
+
+.gm-flex-justify-between[data-v-c17deec9] {
+  justify-content: space-between;
+}
+.gm-upload-preview-dialog[data-v-8077ce51] [data-v-8077ce51] .el-dialog__body {
+  padding: 0;
+}
+
+.gm-upload-file-picture-card[data-v-8077ce51] [data-v-8077ce51] .el-upload-list__item, .gm-upload-file-picture-card[data-v-8077ce51] [data-v-8077ce51] .el-upload--picture-card {
+  width: auto;
+  height: auto;
+}
+.gm-upload-file {
+  line-height: normal;
+}
+.gm-upload-file .el-checkbox {
+  position: absolute;
+  left: 10px;
+  top: 0;
+  z-index: 9;
+}
+.gm-upload-file .el-upload-list--picture-card {
+  gap: 10px;
+}
+.gm-upload-file .el-upload-list__item {
+  margin: 0;
+}
+.gm-upload-file .el-upload-list__item-file-name {
+  line-height: normal;
+}
+.gm-upload-file .el-upload-dragger {
+  padding: 0;
+  border: none;
+  width: 100%;
+  height: 100%;
+  display: flex;
+}
+.gm-upload-file .el-upload--picture-card {
+  border: none;
+}
+
+.gm-upload-file-disabled .el-upload--picture-card {
+  display: none;
+}
+.gm-upload-file-disabled .el-upload-list__item-status-label {
+  display: none;
+}
+.circular[data-v-d7b04fae] {
+  animation: loading-rotate-d7b04fae 2s linear infinite;
+}
+
+.path[data-v-d7b04fae] {
+  animation: loading-dash-d7b04fae 1.5s ease-in-out infinite;
+  stroke-dasharray: 90, 150;
+  stroke-dashoffset: 0;
+  stroke: var(--el-color-primary);
+  stroke-linecap: round;
+}
+
+@keyframes loading-rotate-d7b04fae {
+  to {
+    transform: rotate(360deg);
+  }
+}
+@keyframes loading-dash-d7b04fae {
+  0% {
+    stroke-dasharray: 1, 200;
+    stroke-dashoffset: 0;
+  }
+  50% {
+    stroke-dasharray: 90, 150;
+    stroke-dashoffset: -40px;
+  }
+  100% {
+    stroke-dasharray: 90, 150;
+    stroke-dashoffset: -120px;
+  }
+}
 
 .gm-range-number .el-form-item[data-v-1ae16d96] {
   margin: 0;
 }
 
-.gm-upload-pro-preview-dialog[data-v-2c95bde6] [data-v-2c95bde6] .el-dialog__body {
+.gm-upload-pro-preview-dialog[data-v-ca99928c] [data-v-ca99928c] .el-dialog__body {
   padding: 0;
 }
 
-.gm-upload-pro-file-picture-card[data-v-2c95bde6] [data-v-2c95bde6] .el-upload-list__item, .gm-upload-pro-file-picture-card[data-v-2c95bde6] [data-v-2c95bde6] .el-upload--picture-card {
+.gm-upload-pro-file-picture-card[data-v-ca99928c] [data-v-ca99928c] .el-upload-list__item, .gm-upload-pro-file-picture-card[data-v-ca99928c] [data-v-ca99928c] .el-upload--picture-card {
   width: auto;
   height: auto;
 }
@@ -924,13 +1005,9 @@ video {
 .gm-upload-pro-file-disabled .el-upload-list__item-status-label {
   display: none;
 }
-.gm-upload-preview-dialog[data-v-8077ce51] [data-v-8077ce51] .el-dialog__body {
-  padding: 0;
-}
-
-.gm-upload-file-picture-card[data-v-8077ce51] [data-v-8077ce51] .el-upload-list__item, .gm-upload-file-picture-card[data-v-8077ce51] [data-v-8077ce51] .el-upload--picture-card {
-  width: auto;
-  height: auto;
+[data-v-488ca110] .gmSearchForm .el-form-item {
+  margin-right: 0;
+  margin-bottom: 4px;
 }
 [data-v-2c351ff8] .gmTableNoBorder .el-table__body .el-table__cell {
   border-right: none;
@@ -955,68 +1032,15 @@ video {
 [data-v-2c351ff8] .gmTableNoBorder .el-table__border-left-patch {
   height: 0;
 }
-[data-v-98c2e804] .gmTableNoBorder .el-table__body .el-table__cell {
-  border-right: none;
-}
-
-[data-v-98c2e804] .gmTableNoBorder .el-table__inner-wrapper:before {
-  height: 0;
-}
-
-[data-v-98c2e804] .gmTableNoBorder.el-table--border .el-table__inner-wrapper:after {
-  height: 0;
-}
-
-[data-v-98c2e804] .gmTableNoBorder.el-table--border:after {
-  height: 0;
-}
-
-[data-v-98c2e804] .gmTableNoBorder.el-table--border:before {
-  height: 0;
-}
-
-[data-v-98c2e804] .gmTableNoBorder .el-table__border-left-patch {
-  height: 0;
-}
-.gm-upload-file {
-  line-height: normal;
-}
-.gm-upload-file .el-checkbox {
-  position: absolute;
-  left: 10px;
-  top: 0;
-  z-index: 9;
-}
-.gm-upload-file .el-upload-list--picture-card {
-  gap: 10px;
-}
-.gm-upload-file .el-upload-list__item {
-  margin: 0;
-}
-.gm-upload-file .el-upload-list__item-file-name {
-  line-height: normal;
-}
-.gm-upload-file .el-upload-dragger {
-  padding: 0;
-  border: none;
-  width: 100%;
-  height: 100%;
-  display: flex;
-}
-.gm-upload-file .el-upload--picture-card {
-  border: none;
-}
 
-.gm-upload-file-disabled .el-upload--picture-card {
-  display: none;
+.pagination-container[data-v-47d35e7b] {
+  background: #fff;
+  padding-top: 12px;
 }
-.gm-upload-file-disabled .el-upload-list__item-status-label {
+.pagination-container.hidden[data-v-47d35e7b] {
   display: none;
 }
-[data-v-488ca110] .gmSearchForm .el-form-item {
-  margin-right: 0;
-  margin-bottom: 4px;
-}
+
 .gm-number-interval-single[data-v-4e6f4d6f] {
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
@@ -1035,160 +1059,136 @@ video {
 .gm-number-interval-single[data-v-4e6f4d6f]:hover .gm-number-interval-close[data-v-4e6f4d6f] {
   display: flex;
 }
-.gm-flex-center[data-v-c17deec9] {
-  align-items: center;
-}
-
-.gm-flex-justify-between[data-v-c17deec9] {
-  justify-content: space-between;
-}
-.circular[data-v-d7b04fae] {
-  animation: loading-rotate-d7b04fae 2s linear infinite;
-}
-
-.path[data-v-d7b04fae] {
-  animation: loading-dash-d7b04fae 1.5s ease-in-out infinite;
-  stroke-dasharray: 90, 150;
-  stroke-dashoffset: 0;
-  stroke: var(--el-color-primary);
-  stroke-linecap: round;
-}
-
-@keyframes loading-rotate-d7b04fae {
-  to {
-    transform: rotate(360deg);
-  }
-}
-@keyframes loading-dash-d7b04fae {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0;
-  }
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40px;
-  }
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120px;
-  }
-}
-
-.pagination-container[data-v-47d35e7b] {
-  background: #fff;
-  padding-top: 12px;
-}
-.pagination-container.hidden[data-v-47d35e7b] {
-  display: none;
-}
-
 @charset "UTF-8";
-.table-custom-header-drawer .el-drawer__header {
+.custom-operate-drawer .el-drawer__header {
   padding: 10px 15px;
   margin: 0;
   border-bottom: 1px solid #ebeef5;
 }
-.table-custom-header-drawer .el-drawer__title {
+.custom-operate-drawer .el-drawer__title {
   font-size: 14px;
   color: #333;
 }
-.table-custom-header-drawer .el-drawer__body {
+.custom-operate-drawer .el-drawer__body {
   padding: 15px;
 }
-.table-custom-header-drawer .el-drawer__footer {
+.custom-operate-drawer .el-drawer__footer {
   padding: 10px 15px;
   border-top: 1px solid #ebeef5;
 }
-.table-custom-header-drawer .el-checkbox {
+.custom-operate-drawer .el-checkbox {
   display: flex;
   align-items: center;
 }
-.table-custom-header-drawer .el-input__inner {
+.custom-operate-drawer .el-input__inner {
   text-align: center;
 }
-.table-custom-header-drawer .el-input__suffix {
+.custom-operate-drawer .el-input__suffix {
   position: absolute;
   right: 10px;
 }
-.table-custom-header-drawer .custom-content li {
+.custom-operate-drawer .custom-content li {
   display: flex;
   align-items: center;
   justify-content: center;
   height: 44px;
 }
-.table-custom-header-drawer .custom-group {
+.custom-operate-drawer .custom-group {
   max-height: calc(100vh - 226px);
   overflow-y: auto;
 }
-.table-custom-header-drawer .custom-group::-webkit-scrollbar {
+.custom-operate-drawer .custom-group::-webkit-scrollbar {
   /*滚动条整体样式*/
   width: 4px;
   /*高宽分别对应横竖滚动条的尺寸*/
   height: 1px;
 }
-.table-custom-header-drawer .custom-group::-webkit-scrollbar-thumb {
+.custom-operate-drawer .custom-group::-webkit-scrollbar-thumb {
   /*滚动条里面小方块*/
   border-radius: 10px;
   box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.1);
   background: #999;
 }
-.table-custom-header-drawer .custom-group::-webkit-scrollbar-track {
+.custom-operate-drawer .custom-group::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
   box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1);
   border-radius: 10px;
   background: #eee;
 }
+[data-v-98c2e804] .gmTableNoBorder .el-table__body .el-table__cell {
+  border-right: none;
+}
+
+[data-v-98c2e804] .gmTableNoBorder .el-table__inner-wrapper:before {
+  height: 0;
+}
+
+[data-v-98c2e804] .gmTableNoBorder.el-table--border .el-table__inner-wrapper:after {
+  height: 0;
+}
+
+[data-v-98c2e804] .gmTableNoBorder.el-table--border:after {
+  height: 0;
+}
+
+[data-v-98c2e804] .gmTableNoBorder.el-table--border:before {
+  height: 0;
+}
+
+[data-v-98c2e804] .gmTableNoBorder .el-table__border-left-patch {
+  height: 0;
+}
 @charset "UTF-8";
-.custom-operate-drawer .el-drawer__header {
+.table-custom-header-drawer .el-drawer__header {
   padding: 10px 15px;
   margin: 0;
   border-bottom: 1px solid #ebeef5;
 }
-.custom-operate-drawer .el-drawer__title {
+.table-custom-header-drawer .el-drawer__title {
   font-size: 14px;
   color: #333;
 }
-.custom-operate-drawer .el-drawer__body {
+.table-custom-header-drawer .el-drawer__body {
   padding: 15px;
 }
-.custom-operate-drawer .el-drawer__footer {
+.table-custom-header-drawer .el-drawer__footer {
   padding: 10px 15px;
   border-top: 1px solid #ebeef5;
 }
-.custom-operate-drawer .el-checkbox {
+.table-custom-header-drawer .el-checkbox {
   display: flex;
   align-items: center;
 }
-.custom-operate-drawer .el-input__inner {
+.table-custom-header-drawer .el-input__inner {
   text-align: center;
 }
-.custom-operate-drawer .el-input__suffix {
+.table-custom-header-drawer .el-input__suffix {
   position: absolute;
   right: 10px;
 }
-.custom-operate-drawer .custom-content li {
+.table-custom-header-drawer .custom-content li {
   display: flex;
   align-items: center;
   justify-content: center;
   height: 44px;
 }
-.custom-operate-drawer .custom-group {
+.table-custom-header-drawer .custom-group {
   max-height: calc(100vh - 226px);
   overflow-y: auto;
 }
-.custom-operate-drawer .custom-group::-webkit-scrollbar {
+.table-custom-header-drawer .custom-group::-webkit-scrollbar {
   /*滚动条整体样式*/
   width: 4px;
   /*高宽分别对应横竖滚动条的尺寸*/
   height: 1px;
 }
-.custom-operate-drawer .custom-group::-webkit-scrollbar-thumb {
+.table-custom-header-drawer .custom-group::-webkit-scrollbar-thumb {
   /*滚动条里面小方块*/
   border-radius: 10px;
   box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.1);
   background: #999;
 }
-.custom-operate-drawer .custom-group::-webkit-scrollbar-track {
+.table-custom-header-drawer .custom-group::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
   box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1);
   border-radius: 10px;

package/es/utils/index.mjs

@@ -5,7 +5,7 @@ import './src/http/index.mjs';
 export { getModifiedData, hasOwn, keysOf, resetObject } from './src/objects.mjs';
 import './src/types.mjs';
 import './src/date/index.mjs';
-export { base64ToBlob, base64ToFile, blobToBase64, blobToFile, downloadFile, fileMd5, fileToBase64, fileToBlob, fileToUrl, fileValidType, getImageInfo, getVideoInfo, urlToBlob, urlToFile } from './src/file.mjs';
+export { base64ToBlob, base64ToFile, blobToBase64, blobToFile, fileMd5, fileToBase64, fileToBlob, fileToUrl, fileValidType, getImageInfo, getVideoInfo, urlToBlob, urlToFile } from './src/file.mjs';
 export { compareVersions, isVersionGreaterOrEqual, omitOnEvents, remove } from './src/general.mjs';
 import './src/crypto/index.mjs';
 export { formatNumberWithCommas } from './src/number.mjs';
@@ -25,6 +25,7 @@ export { req401Interceptors, res401Interceptors } from './src/http/interceptors.
 export { giimeDevProxy } from './src/http/devProxy.mjs';
 export { getDomain } from './src/http/url.mjs';
 export { getDateShortcuts } from './src/date/dateShortcuts.mjs';
+export { genFileId } from 'element-plus';
 export { b64_hmac_md5, b64_md5, hex_hmac_md5, hex_md5, str_hmac_md5, str_md5, ts_md5_file } from './src/crypto/md5.mjs';
 export { any_hmac_sha1, any_sha1, b64_hmac_sha1, b64_sha1, hex_hmac_sha1, hex_sha1 } from './src/crypto/sha1.mjs';
 export { filterTreeByName } from './src/tree/filterTreeByName.mjs';

package/es/utils/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/utils/src/date/dateShortcuts.d.ts

@@ -5,8 +5,8 @@
  */
 export declare const getDateShortcuts: (type: string) => {
     text: string;
-    value: () => Date;
+    value: () => Date[];
 }[] | {
     text: string;
-    value: () => Date[];
+    value: () => Date;
 }[];