giime 0.0.30 → 0.1.0

package/README.md

@@ -49,7 +49,7 @@ Giime遵循MIT许可证发布，请查阅LICENSE文件以获取更多信息。
 
 ## 版本发布
 ```bash
-git tag v0.0.3
+git tag v0.1.1
 git push origin --tags
 git tag --sort=-creatordate
 git log tag1..tag2

package/dist/index.css

@@ -1,7 +1,3 @@
-[data-v-512cf874] .gmSearchForm .el-form-item {
-  margin-right: 8px;
-  margin-bottom: 8px;
-}
 .gm-flex-center[data-v-d1c6dac0] {
   align-items: center;
 }
@@ -9,27 +5,31 @@
 .gm-flex-justify-between[data-v-d1c6dac0] {
   justify-content: space-between;
 }
-[data-v-9f72778f] .gmTableNoBorder .el-table__body .el-table__cell {
+[data-v-512cf874] .gmSearchForm .el-form-item {
+  margin-right: 8px;
+  margin-bottom: 8px;
+}
+[data-v-e38c9d81] .gmTableNoBorder .el-table__body .el-table__cell {
   border-right: none;
 }
 
-[data-v-9f72778f] .gmTableNoBorder .el-table__inner-wrapper:before {
+[data-v-e38c9d81] .gmTableNoBorder .el-table__inner-wrapper:before {
   height: 0;
 }
 
-[data-v-9f72778f] .gmTableNoBorder.el-table--border .el-table__inner-wrapper:after {
+[data-v-e38c9d81] .gmTableNoBorder.el-table--border .el-table__inner-wrapper:after {
   height: 0;
 }
 
-[data-v-9f72778f] .gmTableNoBorder.el-table--border:after {
+[data-v-e38c9d81] .gmTableNoBorder.el-table--border:after {
   height: 0;
 }
 
-[data-v-9f72778f] .gmTableNoBorder.el-table--border:before {
+[data-v-e38c9d81] .gmTableNoBorder.el-table--border:before {
   height: 0;
 }
 
-[data-v-9f72778f] .gmTableNoBorder .el-table__border-left-patch {
+[data-v-e38c9d81] .gmTableNoBorder .el-table__border-left-patch {
   height: 0;
 }
 /*

package/es/components/src/composite/tablePro/TablePro.vue.d.ts

@@ -1,9 +1,9 @@
 import type { Sort } from 'element-plus';
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     sortValue: import("vue").PropType<{
-        ascs: string;
-        descs: string;
-    }>;
+        field: string;
+        order: "asc" | "desc";
+    }[]>;
     headerCellStyle: {
         type: ObjectConstructor;
         default: () => {
@@ -283,17 +283,17 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     clearSort: () => void | undefined;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:sortValue": (sortValue: {
-        ascs: string;
-        descs: string;
-    }) => void;
+        field: string;
+        order: "asc" | "desc";
+    }[]) => void;
     tableOperate: (btn: Record<string, any>, row: Record<string, any>) => void;
     selectionChange: (value: Record<string, any>[]) => void;
     sortChange: (value: Sort) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     sortValue: import("vue").PropType<{
-        ascs: string;
-        descs: string;
-    }>;
+        field: string;
+        order: "asc" | "desc";
+    }[]>;
     headerCellStyle: {
         type: ObjectConstructor;
         default: () => {
@@ -413,9 +413,9 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "appendTo" | "effect" | "placement" | "popperClass" | "popperOptions" | "hideAfter" | "transition" | "enterable" | "showAfter" | "showArrow">> | undefined>;
 }>> & {
     "onUpdate:sortValue"?: ((sortValue: {
-        ascs: string;
-        descs: string;
-    }) => any) | undefined;
+        field: string;
+        order: "asc" | "desc";
+    }[]) => any) | undefined;
     onTableOperate?: ((btn: Record<string, any>, row: Record<string, any>) => any) | undefined;
     onSelectionChange?: ((value: Record<string, any>[]) => any) | undefined;
     onSortChange?: ((value: Sort) => any) | undefined;

package/es/components/src/composite/tablePro/TablePro.vue.mjs

@@ -2,7 +2,7 @@ import _sfc_main from './TablePro.vue2.mjs';
 import './TablePro.vue3.mjs';
 import _export_sfc from '../../../../_virtual/_plugin-vue_export-helper.mjs';
 
-var TablePro = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9f72778f"], ["__file", "TablePro.vue"]]);
+var TablePro = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e38c9d81"], ["__file", "TablePro.vue"]]);
 
 export { TablePro as default };
 //# sourceMappingURL=TablePro.vue.mjs.map

package/es/components/src/composite/tablePro/TablePro.vue2.mjs

@@ -7,7 +7,7 @@ import { tableProProps, tableProEmits } from './tablePro.mjs';
 import { getVnodesByGmName } from './tableHelper.mjs';
 import { TableColumnProName, tableColumnProProps } from './tableColumnPro/tableColumnPro.mjs';
 
-const _withScopeId = (n) => (pushScopeId("data-v-9f72778f"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-e38c9d81"), n = n(), popScopeId(), n);
 const _hoisted_1 = { class: "gm-text-center" };
 const _hoisted_2 = {
   key: 0,
@@ -108,14 +108,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const sortValue = useModel(__props, "sortValue");
     const handleSortChange = (sort) => {
       if (sortValue.value) {
-        sortValue.value.ascs = "";
-        sortValue.value.descs = "";
+        sortValue.value = [];
         switch (sort.order) {
           case "ascending":
-            sortValue.value.ascs = sort.prop;
+            sortValue.value.push({ field: sort.prop, order: "asc" });
             break;
           case "descending":
-            sortValue.value.descs = sort.prop;
+            sortValue.value.push({ field: sort.prop, order: "desc" });
             break;
         }
       }

package/es/components/src/composite/tablePro/TablePro.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"TablePro.vue2.mjs","sources":["../../../../../../../packages/components/src/composite/tablePro/TablePro.vue"],"sourcesContent":["<template>\r\n  <div>\r\n    <gm-table\r\n      ref=\"GmTbaleRef\"\r\n      v-bind=\"props\"\r\n      border\r\n      class=\"gmTablePro\"\r\n      :class=\"[props.border ? '' : 'gmTableNoBorder']\"\r\n      @selection-change=\"(value: TableColumnProProps[]) => $emit('selectionChange', value)\"\r\n      @sort-change=\"handleSortChange\"\r\n      @header-dragend=\"headerDragend\"\r\n    >\r\n      <template v-if=\"props.selection\">\r\n        <gm-table-column :key=\"999999\" type=\"selection\" width=\"50\" />\r\n      </template>\r\n      <template v-if=\"gmTableHeaderRef?.isInited\">\r\n        <TableColumnVNodeRenderer :vnode=\"tableColumnVnode\" :propsList=\"colPropsList\" />\r\n      </template>\r\n      <!-- 操作 -->\r\n      <gm-table-column\r\n        v-if=\"customHeader || customOperate\"\r\n        prop=\"gmEdit\"\r\n        min-width=\"100\"\r\n        :width=\"editProps?.width\"\r\n        :fixed=\"operateFixed ? 'right' : false\"\r\n      >\r\n        <template #header>\r\n          <div class=\"gm-text-center\">\r\n            <gm-button v-if=\"customHeader\" type=\"primary\" link size=\"small\" @click=\"setTable('header')\"> 表头 </gm-button>\r\n            <gm-button v-if=\"customOperate\" type=\"primary\" link size=\"small\" @click=\"setTable('operate')\"> 操作 </gm-button>\r\n          </div>\r\n        </template>\r\n        <template #default=\"slotValue\">\r\n          <!-- <VNodeRenderer :vnode=\"customVNodes\" /> -->\r\n          <div v-if=\"tableOperateVnode && gmCustomOperationsRef && gmCustomOperationsRef.isInited\" class=\"gm-flex gm-flex-wrap gm-justify-center\">\r\n            <TableOperateVNodeRenderer :vnode=\"tableOperateVnode.children?.default(slotValue)\" :customPropsList=\"customBtnPropsList\" />\r\n          </div>\r\n        </template>\r\n      </gm-table-column>\r\n    </gm-table>\r\n  </div>\r\n\r\n  <gm-table-header-form\r\n    ref=\"gmTableHeaderRef\"\r\n    v-model:isShowDrawer=\"drawerHeaderVisible\"\r\n    v-model:colPropsList=\"colPropsList\"\r\n    :colDefaultPropsList=\"colDefaultPropsList\"\r\n    :keyWord=\"props.page\"\r\n    type=\"HeaderList\"\r\n  />\r\n\r\n  <gm-operate-button-form\r\n    ref=\"gmCustomOperationsRef\"\r\n    v-model:isShowDrawer=\"drawerOperateVisible\"\r\n    v-model:customBtnPropsList=\"customBtnPropsList\"\r\n    :customDefaultPropsList=\"customDefaultPropsList\"\r\n    :keyWord=\"props.page\"\r\n    type=\"OperateList\"\r\n  />\r\n</template>\r\n\r\n<script setup lang=\"ts\">\r\nimport { computed, nextTick, ref } from 'vue';\r\nimport { hasOwn } from '@giime/utils/src/objects';\r\n// import { cloneDeep } from 'lodash-es';\r\nimport { operateButtonProps } from '../operateButton/operateButton';\r\nimport TableOperateVNodeRenderer from './TableOperateVNodeRenderer';\r\nimport TableColumnVNodeRenderer from './TableColumnVNodeRenderer';\r\nimport { tableProEmits, tableProProps } from './tablePro';\r\nimport { getVnodesByGmName } from './tableHelper';\r\nimport { TableColumnProName, type TableColumnProProps, tableColumnProProps } from './tableColumnPro/tableColumnPro';\r\nimport type { OperateButtonFormInstance } from '../operateButton/operateButtonForm';\r\nimport type { TableHeaderFormInstance } from './tableHeaderForm';\r\nimport type { OperateButtonProps } from '../operateButton/operateButton';\r\nimport type { Sort, TableInstance } from 'element-plus';\r\n\r\ndefineOptions({\r\n  name: 'GmTablePro',\r\n});\r\nconst GmTbaleRef = ref<TableInstance>();\r\nconst gmCustomOperationsRef = ref<OperateButtonFormInstance>();\r\nconst gmTableHeaderRef = ref<TableHeaderFormInstance>();\r\n\r\nconst emit = defineEmits(tableProEmits);\r\nconst props = defineProps(tableProProps);\r\n\r\nconst slots = defineSlots<{\r\n  default(data?: any): any[];\r\n}>();\r\n// 列 当前原始vnode\r\nconst tableColumnVnode = computed(() => {\r\n  const vNodes = slots.default?.() || [];\r\n  // const nodes = vNodes.filter(vNode => vNode.props && vNode.props.type !== 'edit');\r\n  return vNodes;\r\n});\r\n// 默认表头Props列表\r\nconst colDefaultPropsList = computed(() => {\r\n  const vNodes = slots.default?.() || [];\r\n  const children = getVnodesByGmName(vNodes, TableColumnProName);\r\n  // const result = children.filter(vNode => vNode.props && vNode.props.type !== 'edit');\r\n\r\n  const colProps: TableColumnProProps[] = children.map((vNode: { props: any }) => vNode.props) ?? [];\r\n  // 循环插入props所需的默认值\r\n  colProps.forEach(it => {\r\n    for (const key in tableColumnProProps) {\r\n      // 如果当前props含有默认值\r\n      if (hasOwn(it, key)) {\r\n        continue;\r\n      }\r\n      if (hasOwn(tableColumnProProps, key)) {\r\n        const element = tableColumnProProps[key as keyof TableColumnProProps];\r\n        // 如果btn 定义中含有默认值 则赋值给props\r\n        if (hasOwn(element, 'default')) {\r\n          Reflect.set(it, key, Reflect.get(element, 'default'));\r\n        }\r\n      }\r\n    }\r\n  });\r\n  return colProps;\r\n});\r\n// 已选中表头\r\nconst colPropsList = ref<TableColumnProProps[]>(colDefaultPropsList.value);\r\nconst editProps = computed(() => colPropsList.value.find(it => it.type === 'edit'));\r\n\r\n// 操作按钮组 当前原始vnode\r\nconst tableOperateVnode = computed(() => {\r\n  const vNodes = slots.default?.() || [];\r\n  const nodes = vNodes.find(vNode => vNode.props && vNode.props.type === 'edit');\r\n  return nodes;\r\n});\r\n\r\nconst customDefaultPropsList = computed(() => {\r\n  const defaultVnodes = tableOperateVnode.value?.children?.default?.(tableOperateVnode.value?.ctx.scope);\r\n  const children = getVnodesByGmName(defaultVnodes, 'GmOperateButton');\r\n\r\n  const btnProps: OperateButtonProps[] = children.map((vNode: { props: any }) => vNode.props) ?? [];\r\n  // 循环插入props所需的默认值\r\n  btnProps.forEach(it => {\r\n    for (const key in operateButtonProps) {\r\n      // 如果当前props含有默认值\r\n      if (hasOwn(it, key)) {\r\n        continue;\r\n      }\r\n      if (hasOwn(operateButtonProps, key)) {\r\n        const element = operateButtonProps[key as keyof OperateButtonProps];\r\n        // 如果btn 定义中含有默认值 则赋值给props\r\n        if (hasOwn(element, 'default')) {\r\n          Reflect.set(it, key, Reflect.get(element, 'default'));\r\n        }\r\n      }\r\n    }\r\n  });\r\n  return btnProps;\r\n});\r\nconst customBtnPropsList = ref<OperateButtonProps[]>(customDefaultPropsList.value);\r\n\r\n// 表格头部弹层\r\nconst drawerHeaderVisible = ref(false); // 表头设置弹层\r\nconst drawerOperateVisible = ref(false); // 按钮设置弹层\r\nconst setTable = (event: string) => {\r\n  if (event === 'header') {\r\n    drawerHeaderVisible.value = true;\r\n  }\r\n  if (event === 'operate') {\r\n    drawerOperateVisible.value = true;\r\n  }\r\n};\r\n\r\n/**\r\n * 表头拖动，修改width\r\n */\r\nconst headerDragend = async (newWidth: number, oldWidth: number, column: any) => {\r\n  const findItem = colPropsList.value.find(it => it.prop === column.property);\r\n  const editItem = column.property === 'gmEdit' ? colPropsList.value.find(it => it.type === 'edit') : null;\r\n  if (!findItem && !editItem) {\r\n    return;\r\n  }\r\n  if (findItem) {\r\n    findItem.width = newWidth;\r\n  }\r\n  if (editItem) {\r\n    editItem.width = newWidth;\r\n  }\r\n  // 设置列宽\r\n  await nextTick();\r\n  gmTableHeaderRef.value?.submitSettings();\r\n};\r\n/**\r\n * 搜索模块\r\n */\r\nconst sortValue = defineModel<{\r\n  ascs: string;\r\n  descs: string;\r\n}>('sortValue');\r\n\r\nconst handleSortChange = (sort: Sort) => {\r\n  if (sortValue.value) {\r\n    sortValue.value.ascs = '';\r\n    sortValue.value.descs = '';\r\n    switch (sort.order) {\r\n      case 'ascending':\r\n        sortValue.value.ascs = sort.prop;\r\n        break;\r\n      case 'descending':\r\n        sortValue.value.descs = sort.prop;\r\n        break;\r\n    }\r\n  }\r\n\r\n  emit('sortChange', sort);\r\n};\r\ndefineExpose({\r\n  colPropsList,\r\n  clearSort: () => GmTbaleRef.value?.clearSort(),\r\n});\r\n</script>\r\n\r\n<style lang=\"scss\" scoped>\r\n:deep(.gmTableNoBorder .el-table__body .el-table__cell) {\r\n  border-right: none;\r\n}\r\n:deep(.gmTableNoBorder .el-table__inner-wrapper:before) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder.el-table--border .el-table__inner-wrapper:after) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder.el-table--border:after) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder.el-table--border:before) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder .el-table__border-left-patch) {\r\n  height: 0;\r\n}\r\n</style>\r\n"],"names":["_useSlots","_useModel"],"mappings":"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"}
+{"version":3,"file":"TablePro.vue2.mjs","sources":["../../../../../../../packages/components/src/composite/tablePro/TablePro.vue"],"sourcesContent":["<template>\r\n  <div>\r\n    <gm-table\r\n      ref=\"GmTbaleRef\"\r\n      v-bind=\"props\"\r\n      border\r\n      class=\"gmTablePro\"\r\n      :class=\"[props.border ? '' : 'gmTableNoBorder']\"\r\n      @selection-change=\"(value: TableColumnProProps[]) => $emit('selectionChange', value)\"\r\n      @sort-change=\"handleSortChange\"\r\n      @header-dragend=\"headerDragend\"\r\n    >\r\n      <template v-if=\"props.selection\">\r\n        <gm-table-column :key=\"999999\" type=\"selection\" width=\"50\" />\r\n      </template>\r\n      <template v-if=\"gmTableHeaderRef?.isInited\">\r\n        <TableColumnVNodeRenderer :vnode=\"tableColumnVnode\" :propsList=\"colPropsList\" />\r\n      </template>\r\n      <!-- 操作 -->\r\n      <gm-table-column\r\n        v-if=\"customHeader || customOperate\"\r\n        prop=\"gmEdit\"\r\n        min-width=\"100\"\r\n        :width=\"editProps?.width\"\r\n        :fixed=\"operateFixed ? 'right' : false\"\r\n      >\r\n        <template #header>\r\n          <div class=\"gm-text-center\">\r\n            <gm-button v-if=\"customHeader\" type=\"primary\" link size=\"small\" @click=\"setTable('header')\"> 表头 </gm-button>\r\n            <gm-button v-if=\"customOperate\" type=\"primary\" link size=\"small\" @click=\"setTable('operate')\"> 操作 </gm-button>\r\n          </div>\r\n        </template>\r\n        <template #default=\"slotValue\">\r\n          <!-- <VNodeRenderer :vnode=\"customVNodes\" /> -->\r\n          <div v-if=\"tableOperateVnode && gmCustomOperationsRef && gmCustomOperationsRef.isInited\" class=\"gm-flex gm-flex-wrap gm-justify-center\">\r\n            <TableOperateVNodeRenderer :vnode=\"tableOperateVnode.children?.default(slotValue)\" :customPropsList=\"customBtnPropsList\" />\r\n          </div>\r\n        </template>\r\n      </gm-table-column>\r\n    </gm-table>\r\n  </div>\r\n\r\n  <gm-table-header-form\r\n    ref=\"gmTableHeaderRef\"\r\n    v-model:isShowDrawer=\"drawerHeaderVisible\"\r\n    v-model:colPropsList=\"colPropsList\"\r\n    :colDefaultPropsList=\"colDefaultPropsList\"\r\n    :keyWord=\"props.page\"\r\n    type=\"HeaderList\"\r\n  />\r\n\r\n  <gm-operate-button-form\r\n    ref=\"gmCustomOperationsRef\"\r\n    v-model:isShowDrawer=\"drawerOperateVisible\"\r\n    v-model:customBtnPropsList=\"customBtnPropsList\"\r\n    :customDefaultPropsList=\"customDefaultPropsList\"\r\n    :keyWord=\"props.page\"\r\n    type=\"OperateList\"\r\n  />\r\n</template>\r\n\r\n<script setup lang=\"ts\">\r\nimport { computed, nextTick, ref } from 'vue';\r\nimport { hasOwn } from '@giime/utils/src/objects';\r\n// import { cloneDeep } from 'lodash-es';\r\nimport { operateButtonProps } from '../operateButton/operateButton';\r\nimport TableOperateVNodeRenderer from './TableOperateVNodeRenderer';\r\nimport TableColumnVNodeRenderer from './TableColumnVNodeRenderer';\r\nimport { tableProEmits, tableProProps } from './tablePro';\r\nimport { getVnodesByGmName } from './tableHelper';\r\nimport { TableColumnProName, type TableColumnProProps, tableColumnProProps } from './tableColumnPro/tableColumnPro';\r\nimport type { OperateButtonFormInstance } from '../operateButton/operateButtonForm';\r\nimport type { TableHeaderFormInstance } from './tableHeaderForm';\r\nimport type { OperateButtonProps } from '../operateButton/operateButton';\r\nimport type { Sort, TableInstance } from 'element-plus';\r\n\r\ndefineOptions({\r\n  name: 'GmTablePro',\r\n});\r\nconst GmTbaleRef = ref<TableInstance>();\r\nconst gmCustomOperationsRef = ref<OperateButtonFormInstance>();\r\nconst gmTableHeaderRef = ref<TableHeaderFormInstance>();\r\n\r\nconst emit = defineEmits(tableProEmits);\r\nconst props = defineProps(tableProProps);\r\n\r\nconst slots = defineSlots<{\r\n  default(data?: any): any[];\r\n}>();\r\n// 列 当前原始vnode\r\nconst tableColumnVnode = computed(() => {\r\n  const vNodes = slots.default?.() || [];\r\n  // const nodes = vNodes.filter(vNode => vNode.props && vNode.props.type !== 'edit');\r\n  return vNodes;\r\n});\r\n// 默认表头Props列表\r\nconst colDefaultPropsList = computed(() => {\r\n  const vNodes = slots.default?.() || [];\r\n  const children = getVnodesByGmName(vNodes, TableColumnProName);\r\n  // const result = children.filter(vNode => vNode.props && vNode.props.type !== 'edit');\r\n\r\n  const colProps: TableColumnProProps[] = children.map((vNode: { props: any }) => vNode.props) ?? [];\r\n  // 循环插入props所需的默认值\r\n  colProps.forEach(it => {\r\n    for (const key in tableColumnProProps) {\r\n      // 如果当前props含有默认值\r\n      if (hasOwn(it, key)) {\r\n        continue;\r\n      }\r\n      if (hasOwn(tableColumnProProps, key)) {\r\n        const element = tableColumnProProps[key as keyof TableColumnProProps];\r\n        // 如果btn 定义中含有默认值 则赋值给props\r\n        if (hasOwn(element, 'default')) {\r\n          Reflect.set(it, key, Reflect.get(element, 'default'));\r\n        }\r\n      }\r\n    }\r\n  });\r\n  return colProps;\r\n});\r\n// 已选中表头\r\nconst colPropsList = ref<TableColumnProProps[]>(colDefaultPropsList.value);\r\nconst editProps = computed(() => colPropsList.value.find(it => it.type === 'edit'));\r\n\r\n// 操作按钮组 当前原始vnode\r\nconst tableOperateVnode = computed(() => {\r\n  const vNodes = slots.default?.() || [];\r\n  const nodes = vNodes.find(vNode => vNode.props && vNode.props.type === 'edit');\r\n  return nodes;\r\n});\r\n\r\nconst customDefaultPropsList = computed(() => {\r\n  const defaultVnodes = tableOperateVnode.value?.children?.default?.(tableOperateVnode.value?.ctx.scope);\r\n  const children = getVnodesByGmName(defaultVnodes, 'GmOperateButton');\r\n\r\n  const btnProps: OperateButtonProps[] = children.map((vNode: { props: any }) => vNode.props) ?? [];\r\n  // 循环插入props所需的默认值\r\n  btnProps.forEach(it => {\r\n    for (const key in operateButtonProps) {\r\n      // 如果当前props含有默认值\r\n      if (hasOwn(it, key)) {\r\n        continue;\r\n      }\r\n      if (hasOwn(operateButtonProps, key)) {\r\n        const element = operateButtonProps[key as keyof OperateButtonProps];\r\n        // 如果btn 定义中含有默认值 则赋值给props\r\n        if (hasOwn(element, 'default')) {\r\n          Reflect.set(it, key, Reflect.get(element, 'default'));\r\n        }\r\n      }\r\n    }\r\n  });\r\n  return btnProps;\r\n});\r\nconst customBtnPropsList = ref<OperateButtonProps[]>(customDefaultPropsList.value);\r\n\r\n// 表格头部弹层\r\nconst drawerHeaderVisible = ref(false); // 表头设置弹层\r\nconst drawerOperateVisible = ref(false); // 按钮设置弹层\r\nconst setTable = (event: string) => {\r\n  if (event === 'header') {\r\n    drawerHeaderVisible.value = true;\r\n  }\r\n  if (event === 'operate') {\r\n    drawerOperateVisible.value = true;\r\n  }\r\n};\r\n\r\n/**\r\n * 表头拖动，修改width\r\n */\r\nconst headerDragend = async (newWidth: number, oldWidth: number, column: any) => {\r\n  const findItem = colPropsList.value.find(it => it.prop === column.property);\r\n  const editItem = column.property === 'gmEdit' ? colPropsList.value.find(it => it.type === 'edit') : null;\r\n  if (!findItem && !editItem) {\r\n    return;\r\n  }\r\n  if (findItem) {\r\n    findItem.width = newWidth;\r\n  }\r\n  if (editItem) {\r\n    editItem.width = newWidth;\r\n  }\r\n  // 设置列宽\r\n  await nextTick();\r\n  gmTableHeaderRef.value?.submitSettings();\r\n};\r\n/**\r\n * 搜索模块\r\n */\r\nconst sortValue = defineModel<\r\n  {\r\n    field: string;\r\n    order: 'asc' | 'desc';\r\n  }[]\r\n>('sortValue');\r\n\r\nconst handleSortChange = (sort: Sort) => {\r\n  if (sortValue.value) {\r\n    sortValue.value = [];\r\n    switch (sort.order) {\r\n      case 'ascending':\r\n        sortValue.value.push({ field: sort.prop, order: 'asc' });\r\n        break;\r\n      case 'descending':\r\n        sortValue.value.push({ field: sort.prop, order: 'desc' });\r\n        break;\r\n    }\r\n  }\r\n\r\n  emit('sortChange', sort);\r\n};\r\ndefineExpose({\r\n  colPropsList,\r\n  clearSort: () => GmTbaleRef.value?.clearSort(),\r\n});\r\n</script>\r\n\r\n<style lang=\"scss\" scoped>\r\n:deep(.gmTableNoBorder .el-table__body .el-table__cell) {\r\n  border-right: none;\r\n}\r\n:deep(.gmTableNoBorder .el-table__inner-wrapper:before) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder.el-table--border .el-table__inner-wrapper:after) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder.el-table--border:after) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder.el-table--border:before) {\r\n  height: 0;\r\n}\r\n:deep(.gmTableNoBorder .el-table__border-left-patch) {\r\n  height: 0;\r\n}\r\n</style>\r\n"],"names":["_useSlots","_useModel"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AA+EA,IAAA,MAAM,aAAa,GAAmB,EAAA,CAAA;AACtC,IAAA,MAAM,wBAAwB,GAA+B,EAAA,CAAA;AAC7D,IAAA,MAAM,mBAAmB,GAA6B,EAAA,CAAA;AAEtD,IAAA,MAAM,IAAO,GAAA,MAAA,CAAA;AACb,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AAEd,IAAA,MAAM,QAAQA,QAAA,EAAA,CAAA;AAId,IAAM,MAAA,gBAAA,GAAmB,SAAS,MAAM;AACtC,MAAA,MAAM,MAAS,GAAA,KAAA,CAAM,OAAU,IAAA,IAAK,EAAC,CAAA;AAErC,MAAO,OAAA,MAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,mBAAA,GAAsB,SAAS,MAAM;AACzC,MAAA,MAAM,MAAS,GAAA,KAAA,CAAM,OAAU,IAAA,IAAK,EAAC,CAAA;AACrC,MAAM,MAAA,QAAA,GAAW,iBAAkB,CAAA,MAAA,EAAQ,kBAAkB,CAAA,CAAA;AAG7D,MAAM,MAAA,QAAA,GAAkC,SAAS,GAAI,CAAA,CAAC,UAA0B,KAAM,CAAA,KAAK,KAAK,EAAC,CAAA;AAEjG,MAAA,QAAA,CAAS,QAAQ,CAAM,EAAA,KAAA;AACrB,QAAA,KAAA,MAAW,OAAO,mBAAqB,EAAA;AAErC,UAAI,IAAA,MAAA,CAAO,EAAI,EAAA,GAAG,CAAG,EAAA;AACnB,YAAA,SAAA;AAAA,WACF;AACA,UAAI,IAAA,MAAA,CAAO,mBAAqB,EAAA,GAAG,CAAG,EAAA;AACpC,YAAM,MAAA,OAAA,GAAU,oBAAoB,GAAgC,CAAA,CAAA;AAEpE,YAAI,IAAA,MAAA,CAAO,OAAS,EAAA,SAAS,CAAG,EAAA;AAC9B,cAAA,OAAA,CAAQ,IAAI,EAAI,EAAA,GAAA,EAAK,QAAQ,GAAI,CAAA,OAAA,EAAS,SAAS,CAAC,CAAA,CAAA;AAAA,aACtD;AAAA,WACF;AAAA,SACF;AAAA,OACD,CAAA,CAAA;AACD,MAAO,OAAA,QAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,YAAA,GAAe,GAA2B,CAAA,mBAAA,CAAoB,KAAK,CAAA,CAAA;AACzE,IAAM,MAAA,SAAA,GAAY,QAAS,CAAA,MAAM,YAAa,CAAA,KAAA,CAAM,KAAK,CAAM,EAAA,KAAA,EAAA,CAAG,IAAS,KAAA,MAAM,CAAC,CAAA,CAAA;AAGlF,IAAM,MAAA,iBAAA,GAAoB,SAAS,MAAM;AACvC,MAAA,MAAM,MAAS,GAAA,KAAA,CAAM,OAAU,IAAA,IAAK,EAAC,CAAA;AACrC,MAAM,MAAA,KAAA,GAAQ,OAAO,IAAK,CAAA,CAAA,KAAA,KAAS,MAAM,KAAS,IAAA,KAAA,CAAM,KAAM,CAAA,IAAA,KAAS,MAAM,CAAA,CAAA;AAC7E,MAAO,OAAA,KAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,sBAAA,GAAyB,SAAS,MAAM;AAC5C,MAAM,MAAA,aAAA,GAAgB,kBAAkB,KAAO,EAAA,QAAA,EAAU,UAAU,iBAAkB,CAAA,KAAA,EAAO,IAAI,KAAK,CAAA,CAAA;AACrG,MAAM,MAAA,QAAA,GAAW,iBAAkB,CAAA,aAAA,EAAe,iBAAiB,CAAA,CAAA;AAEnE,MAAM,MAAA,QAAA,GAAiC,SAAS,GAAI,CAAA,CAAC,UAA0B,KAAM,CAAA,KAAK,KAAK,EAAC,CAAA;AAEhG,MAAA,QAAA,CAAS,QAAQ,CAAM,EAAA,KAAA;AACrB,QAAA,KAAA,MAAW,OAAO,kBAAoB,EAAA;AAEpC,UAAI,IAAA,MAAA,CAAO,EAAI,EAAA,GAAG,CAAG,EAAA;AACnB,YAAA,SAAA;AAAA,WACF;AACA,UAAI,IAAA,MAAA,CAAO,kBAAoB,EAAA,GAAG,CAAG,EAAA;AACnC,YAAM,MAAA,OAAA,GAAU,mBAAmB,GAA+B,CAAA,CAAA;AAElE,YAAI,IAAA,MAAA,CAAO,OAAS,EAAA,SAAS,CAAG,EAAA;AAC9B,cAAA,OAAA,CAAQ,IAAI,EAAI,EAAA,GAAA,EAAK,QAAQ,GAAI,CAAA,OAAA,EAAS,SAAS,CAAC,CAAA,CAAA;AAAA,aACtD;AAAA,WACF;AAAA,SACF;AAAA,OACD,CAAA,CAAA;AACD,MAAO,OAAA,QAAA,CAAA;AAAA,KACR,CAAA,CAAA;AACD,IAAM,MAAA,kBAAA,GAAqB,GAA0B,CAAA,sBAAA,CAAuB,KAAK,CAAA,CAAA;AAGjF,IAAM,MAAA,mBAAA,GAAsB,IAAI,KAAK,CAAA,CAAA;AACrC,IAAM,MAAA,oBAAA,GAAuB,IAAI,KAAK,CAAA,CAAA;AACtC,IAAM,MAAA,QAAA,GAAW,CAAC,KAAkB,KAAA;AAClC,MAAA,IAAI,UAAU,QAAU,EAAA;AACtB,QAAA,mBAAA,CAAoB,KAAQ,GAAA,IAAA,CAAA;AAAA,OAC9B;AACA,MAAA,IAAI,UAAU,SAAW,EAAA;AACvB,QAAA,oBAAA,CAAqB,KAAQ,GAAA,IAAA,CAAA;AAAA,OAC/B;AAAA,KACF,CAAA;AAKA,IAAA,MAAM,aAAgB,GAAA,OAAO,QAAkB,EAAA,QAAA,EAAkB,MAAgB,KAAA;AAC/E,MAAM,MAAA,QAAA,GAAW,aAAa,KAAM,CAAA,IAAA,CAAK,QAAM,EAAG,CAAA,IAAA,KAAS,OAAO,QAAQ,CAAA,CAAA;AAC1E,MAAM,MAAA,QAAA,GAAW,MAAO,CAAA,QAAA,KAAa,QAAW,GAAA,YAAA,CAAa,KAAM,CAAA,IAAA,CAAK,CAAM,EAAA,KAAA,EAAA,CAAG,IAAS,KAAA,MAAM,CAAI,GAAA,IAAA,CAAA;AACpG,MAAI,IAAA,CAAC,QAAY,IAAA,CAAC,QAAU,EAAA;AAC1B,QAAA,OAAA;AAAA,OACF;AACA,MAAA,IAAI,QAAU,EAAA;AACZ,QAAA,QAAA,CAAS,KAAQ,GAAA,QAAA,CAAA;AAAA,OACnB;AACA,MAAA,IAAI,QAAU,EAAA;AACZ,QAAA,QAAA,CAAS,KAAQ,GAAA,QAAA,CAAA;AAAA,OACnB;AAEA,MAAA,MAAM,QAAS,EAAA,CAAA;AACf,MAAA,gBAAA,CAAiB,OAAO,cAAe,EAAA,CAAA;AAAA,KACzC,CAAA;AAIA,IAAM,MAAA,SAAA,GAAYC,QAKhB,CAAA,OAAA,EAAA,WAAW,CAAA,CAAA;AAEb,IAAM,MAAA,gBAAA,GAAmB,CAAC,IAAe,KAAA;AACvC,MAAA,IAAI,UAAU,KAAO,EAAA;AACnB,QAAA,SAAA,CAAU,QAAQ,EAAC,CAAA;AACnB,QAAA,QAAQ,KAAK,KAAO;AAAA,UAClB,KAAK,WAAA;AACH,YAAU,SAAA,CAAA,KAAA,CAAM,KAAK,EAAE,KAAA,EAAO,KAAK,IAAM,EAAA,KAAA,EAAO,OAAO,CAAA,CAAA;AACvD,YAAA,MAAA;AAAA,UACF,KAAK,YAAA;AACH,YAAU,SAAA,CAAA,KAAA,CAAM,KAAK,EAAE,KAAA,EAAO,KAAK,IAAM,EAAA,KAAA,EAAO,QAAQ,CAAA,CAAA;AACxD,YAAA,MAAA;AAAA,SACJ;AAAA,OACF;AAEA,MAAA,IAAA,CAAK,cAAc,IAAI,CAAA,CAAA;AAAA,KACzB,CAAA;AACA,IAAa,QAAA,CAAA;AAAA,MACX,YAAA;AAAA,MACA,SAAW,EAAA,MAAM,UAAW,CAAA,KAAA,EAAO,SAAU,EAAA;AAAA,KAC9C,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/src/composite/tablePro/index.d.ts

@@ -2,9 +2,9 @@ import TablePro from './TablePro.vue';
 export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     new (...args: any[]): import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
         sortValue: import("vue").PropType<{
-            ascs: string;
-            descs: string;
-        }>;
+            field: string;
+            order: "asc" | "desc";
+        }[]>;
         headerCellStyle: {
             type: ObjectConstructor;
             default: () => {
@@ -124,9 +124,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "appendTo" | "effect" | "placement" | "popperClass" | "popperOptions" | "hideAfter" | "transition" | "enterable" | "showAfter" | "showArrow">> | undefined>;
     }>> & {
         "onUpdate:sortValue"?: ((sortValue: {
-            ascs: string;
-            descs: string;
-        }) => any) | undefined;
+            field: string;
+            order: "asc" | "desc";
+        }[]) => any) | undefined;
         onTableOperate?: ((btn: Record<string, any>, row: Record<string, any>) => any) | undefined;
         onSelectionChange?: ((value: Record<string, any>[]) => any) | undefined;
         onSortChange?: ((value: import("element-plus/es/components/table/src/table/defaults.js").Sort) => any) | undefined;
@@ -292,17 +292,17 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         clearSort: () => void | undefined;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
         "update:sortValue": (sortValue: {
-            ascs: string;
-            descs: string;
-        }) => void;
+            field: string;
+            order: "asc" | "desc";
+        }[]) => void;
         tableOperate: (btn: Record<string, any>, row: Record<string, any>) => void;
         selectionChange: (value: Record<string, any>[]) => void;
         sortChange: (value: import("element-plus/es/components/table/src/table/defaults.js").Sort) => void;
     }, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         sortValue: import("vue").PropType<{
-            ascs: string;
-            descs: string;
-        }>;
+            field: string;
+            order: "asc" | "desc";
+        }[]>;
         headerCellStyle: {
             type: ObjectConstructor;
             default: () => {
@@ -422,9 +422,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "appendTo" | "effect" | "placement" | "popperClass" | "popperOptions" | "hideAfter" | "transition" | "enterable" | "showAfter" | "showArrow">> | undefined>;
     }>> & {
         "onUpdate:sortValue"?: ((sortValue: {
-            ascs: string;
-            descs: string;
-        }) => any) | undefined;
+            field: string;
+            order: "asc" | "desc";
+        }[]) => any) | undefined;
         onTableOperate?: ((btn: Record<string, any>, row: Record<string, any>) => any) | undefined;
         onSelectionChange?: ((value: Record<string, any>[]) => any) | undefined;
         onSortChange?: ((value: import("element-plus/es/components/table/src/table/defaults.js").Sort) => any) | undefined;
@@ -464,9 +464,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         Defaults: {};
     }, Readonly<import("vue").ExtractPropTypes<{
         sortValue: import("vue").PropType<{
-            ascs: string;
-            descs: string;
-        }>;
+            field: string;
+            order: "asc" | "desc";
+        }[]>;
         headerCellStyle: {
             type: ObjectConstructor;
             default: () => {
@@ -586,9 +586,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
         showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "appendTo" | "effect" | "placement" | "popperClass" | "popperOptions" | "hideAfter" | "transition" | "enterable" | "showAfter" | "showArrow">> | undefined>;
     }>> & {
         "onUpdate:sortValue"?: ((sortValue: {
-            ascs: string;
-            descs: string;
-        }) => any) | undefined;
+            field: string;
+            order: "asc" | "desc";
+        }[]) => any) | undefined;
         onTableOperate?: ((btn: Record<string, any>, row: Record<string, any>) => any) | undefined;
         onSelectionChange?: ((value: Record<string, any>[]) => any) | undefined;
         onSortChange?: ((value: import("element-plus/es/components/table/src/table/defaults.js").Sort) => any) | undefined;
@@ -785,9 +785,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     __isSuspense?: undefined;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
     sortValue: import("vue").PropType<{
-        ascs: string;
-        descs: string;
-    }>;
+        field: string;
+        order: "asc" | "desc";
+    }[]>;
     headerCellStyle: {
         type: ObjectConstructor;
         default: () => {
@@ -907,9 +907,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "appendTo" | "effect" | "placement" | "popperClass" | "popperOptions" | "hideAfter" | "transition" | "enterable" | "showAfter" | "showArrow">> | undefined>;
 }>> & {
     "onUpdate:sortValue"?: ((sortValue: {
-        ascs: string;
-        descs: string;
-    }) => any) | undefined;
+        field: string;
+        order: "asc" | "desc";
+    }[]) => any) | undefined;
     onTableOperate?: ((btn: Record<string, any>, row: Record<string, any>) => any) | undefined;
     onSelectionChange?: ((value: Record<string, any>[]) => any) | undefined;
     onSortChange?: ((value: import("element-plus/es/components/table/src/table/defaults.js").Sort) => any) | undefined;
@@ -1075,9 +1075,9 @@ export declare const GmTablePro: import("../../../../utils").SFCWithInstall<{
     clearSort: () => void | undefined;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:sortValue": (sortValue: {
-        ascs: string;
-        descs: string;
-    }) => void;
+        field: string;
+        order: "asc" | "desc";
+    }[]) => void;
     tableOperate: (btn: Record<string, any>, row: Record<string, any>) => void;
     selectionChange: (value: Record<string, any>[]) => void;
     sortChange: (value: import("element-plus/es/components/table/src/table/defaults.js").Sort) => void;

package/es/giime/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.0.30";
+export declare const version = "0.1.0";

package/es/giime/version.mjs

@@ -1,4 +1,4 @@
-const version = "0.0.29";
+const version = "0.0.30";
 
 export { version };
 //# sourceMappingURL=version.mjs.map

package/es/giime/version.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"version.mjs","sources":["../../../../packages/giime/version.ts"],"sourcesContent":["export const version = '0.0.29';\n"],"names":[],"mappings":"AAAO,MAAM,OAAU,GAAA;;;;"}
+{"version":3,"file":"version.mjs","sources":["../../../../packages/giime/version.ts"],"sourcesContent":["export const version = '0.0.30';\n"],"names":[],"mappings":"AAAO,MAAM,OAAU,GAAA;;;;"}

package/es/hooks/base/useDownload/index.d.ts

@@ -1,9 +1,13 @@
-export interface OptionsType {
+import type { AxiosResponse } from 'axios';
+export interface DownloadOptions {
+    filename?: string;
+}
+export interface DateownloadZipItem {
     url: string;
-    fileName: string;
-    fileType?: string;
+    filename?: string;
 }
 export declare const useDownload: () => {
-    downloadFile: (options: OptionsType) => Promise<void>;
-    downloadZip: (fileList: OptionsType[], fileName: string) => Promise<void>;
+    downloadByUrl: (url: string, options?: DownloadOptions) => Promise<void>;
+    downloadByRes: (res: AxiosResponse<any, any>, options?: DownloadOptions) => Promise<void>;
+    downloadToZip: (fileList: DateownloadZipItem[], filename: string) => Promise<void>;
 };

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

@@ -1,87 +1,48 @@
-import { ref, onBeforeUnmount, h } from 'vue';
+import { h, ref } from 'vue';
+import FileSaver from 'file-saver';
 import { GmNotification } from '../../../components/src/plugins/notification/index.mjs';
+import { v4 } from 'uuid';
 import JSZip from 'jszip';
 
 const useDownload = () => {
-  let xhrInstance;
-  let downloading = false;
-  const progress = ref(0);
-  const currentClass = `class${Date.now()}`;
-  onBeforeUnmount(() => {
-    if (xhrInstance) {
-      xhrInstance.abort();
-      xhrInstance = null;
-    }
-  });
-  const downloadBlob = (options) => {
-    return new Promise((resolve, reject) => {
-      xhrInstance = new XMLHttpRequest();
-      xhrInstance.responseType = "blob";
-      xhrInstance.open("get", options.url, true);
-      xhrInstance.onprogress = (e) => {
-        progress.value = Math.floor(e.loaded / e.total * 100);
-        if (!options.isZip) {
-          editElementContent(currentClass, `\u5F53\u524D\u4E0B\u8F7D\u8FDB\u5EA6 ${progress.value}%`);
-        }
-        if (progress.value == 100) {
-          progress.value = 0;
-          downloading = false;
-        }
-      };
-      xhrInstance.onloadend = (e) => {
-        const eventTarget = e.target;
-        if ([200, 304].includes(eventTarget.status)) {
-          const blob = eventTarget.response;
-          if (!options.isZip) {
-            createDownload(blob, options.fileName, options.fileType);
-            GmNotification({
-              type: "success",
-              title: "\u6E29\u99A8\u63D0\u793A",
-              message: "\u4E0B\u8F7D\u5B8C\u6210",
-              duration: 3e3
-            });
-          }
-          xhrInstance = null;
-          resolve(blob);
-        }
-      };
-      xhrInstance.onerror = function(e) {
-        downloading = false;
-        GmNotification({
-          type: "error",
-          title: "\u6E29\u99A8\u63D0\u793A",
-          message: "\u4E0B\u8F7D\u5F02\u5E38\uFF0C\u8BF7\u91CD\u8BD5",
-          duration: 1500
-        });
-        reject(e);
-      };
-      xhrInstance.send();
+  const getUrlFilename = (url) => {
+    const filename = url.split("/").pop()?.split("?")[0] || "file";
+    return filename;
+  };
+  const downloadByUrl = async (url, options) => {
+    const filename = options?.filename || getUrlFilename(url);
+    const curId = v4();
+    const modalInfo = GmNotification({
+      title: "\u4E0B\u8F7D\u4E2D",
+      message: h("div", { className: curId }, [`\u5F53\u524D\u4E0B\u8F7D\u8FDB\u5EA6 0%`]),
+      duration: 0
+    });
+    await createDownload({
+      url,
+      filename,
+      uuid: curId
     });
+    modalInfo.close();
   };
-  const downloadFile = async (options) => {
-    try {
-      if (downloading || !options.url || !options.fileName)
-        return;
-      downloading = true;
-      const fileType = options.fileType || options.url.split(".").pop();
-      const modalInfo = GmNotification({
-        title: "\u4E0B\u8F7D\u4E2D",
-        message: h("div", { className: currentClass }, [`\u5F53\u524D\u4E0B\u8F7D\u8FDB\u5EA6 ${progress.value}%`]),
-        duration: 0
-      });
-      const downblobOptions = {
-        url: options.url,
-        fileName: options.fileName,
-        fileType,
-        isZip: false
-      };
-      await downloadBlob(downblobOptions);
-      modalInfo.close();
-    } catch (error) {
-      console.error(error);
-    }
+  const downloadByRes = async (res, options) => {
+    const filename = options?.filename || res.headers["Content-Disposition"]?.split("filename=")[1] || "file";
+    const resBlob = await res.data;
+    const curId = v4();
+    const modalInfo = GmNotification({
+      title: "\u4E0B\u8F7D\u4E2D",
+      message: h("div", { className: curId }, [`\u5F53\u524D\u4E0B\u8F7D\u8FDB\u5EA6 0%`]),
+      duration: 0
+    });
+    const blob = new Blob([resBlob]);
+    const fileUrl = window.URL.createObjectURL(blob);
+    await createDownload({
+      url: fileUrl,
+      filename,
+      uuid: curId
+    });
+    modalInfo.close();
   };
-  const downloadZip = async (fileList, fileName) => {
+  const downloadToZip = async (fileList, filename) => {
     try {
       const currentContentClass = `message${Date.now()}`;
       const downloadCount = ref(0);
@@ -94,28 +55,21 @@ const useDownload = () => {
       const zipInstance = new JSZip();
       for (let i = 0; i < len; i++) {
         const currentItem = fileList[i];
-        const currentFileType = currentItem.fileType || currentItem.url.split(".").pop();
         const downblobOptions = {
           url: currentItem.url,
-          fileName: currentItem.fileName,
-          fileType: currentFileType,
+          filename: currentItem.filename ?? getUrlFilename(currentItem.url),
           isZip: true
         };
-        downloadBlob(downblobOptions).then((res) => {
-          zipInstance.file(`${currentItem.fileName}.${currentFileType}`, res);
+        createDownload(downblobOptions).then((res) => {
+          zipInstance.file(downblobOptions.filename, res);
           downloadCount.value++;
           editElementContent(currentContentClass, `\u603B\u4E0B\u8F7D\u6587\u4EF6\u6570\uFF1A${len}\uFF0C\u5DF2\u4E0B\u8F7D\u6587\u4EF6\u6570\uFF1A${downloadCount.value}`);
           if (downloadCount.value == len) {
-            downloading = false;
-            modalInfo.close();
-            GmNotification({
-              type: "success",
-              title: "\u6E29\u99A8\u63D0\u793A",
-              message: "\u4E0B\u8F7D\u5B8C\u6210",
-              duration: 3e3
-            });
+            editElementContent(currentContentClass, `\u6B63\u5728\u5408\u5E76...`);
             zipInstance.generateAsync({ type: "blob" }).then((res2) => {
-              createDownload(res2, fileName, "zip");
+              modalInfo.close();
+              const fileUrl = window.URL.createObjectURL(res2);
+              downloadByUrl(fileUrl, { filename });
             }).catch((error) => {
               console.error(error);
             });
@@ -126,23 +80,43 @@ const useDownload = () => {
       console.error(error);
     }
   };
-  return {
-    downloadFile,
-    downloadZip
+  const createDownload = (options) => {
+    return new Promise((resolve, reject) => {
+      const xhr = new XMLHttpRequest();
+      xhr.open("GET", options.url, true);
+      xhr.responseType = "blob";
+      xhr.onprogress = function(event) {
+        if (event.lengthComputable) {
+          const percentComplete = Math.floor(event.loaded / event.total * 100);
+          if (options.uuid) {
+            editElementContent(options.uuid, `\u5F53\u524D\u4E0B\u8F7D\u8FDB\u5EA6 ${percentComplete}%`);
+          }
+        }
+      };
+      xhr.onload = function(e) {
+        const eventTarget = e.target;
+        if ([200, 304].includes(eventTarget.status)) {
+          const blob = eventTarget.response;
+          if (!options.isZip) {
+            FileSaver.saveAs(blob, options.filename);
+            GmNotification({
+              type: "success",
+              title: "\u6E29\u99A8\u63D0\u793A",
+              message: "\u4E0B\u8F7D\u5B8C\u6210",
+              duration: 3e3
+            });
+          }
+          resolve(blob);
+        }
+      };
+      xhr.onerror = function(e) {
+        GmMessage.error("\u4E0B\u8F7D\u5F02\u5E38\uFF0C\u8BF7\u91CD\u8BD5");
+        reject(e);
+      };
+      xhr.send();
+    });
   };
-};
-const createDownload = (blob, fileName, fileType) => {
-  if (!blob || !fileName || !fileType)
-    return;
-  const ele = document.createElement("a");
-  const url = window.URL.createObjectURL(blob);
-  ele.style.display = "none";
-  ele.href = url;
-  ele.download = `${fileName}.${fileType}`;
-  document.body.appendChild(ele);
-  ele.click();
-  window.URL.revokeObjectURL(url);
-  document.body.removeChild(ele);
+  return { downloadByUrl, downloadByRes, downloadToZip };
 };
 const editElementContent = (className, content) => {
   const currentEle = document.getElementsByClassName(className)[0];