element-pe 2.0.3 → 2.0.6

package/es/components/upload/src/upload-list.vue.d.ts

@@ -14,7 +14,7 @@ declare const _default: import("vue").DefineComponent<{
         onRemove?: ((file: UploadFile) => any) | undefined;
     }>>;
     emit: (event: "remove", file: UploadFile) => void;
-    t: import("element-pe/hooks").Translator;
+    t: import("element-pe/es/hooks").Translator;
     nsUpload: {
         namespace: import("vue").ComputedRef<string>;
         b: (blockSuffix?: string) => string;

package/es/components/upload/src/upload-list2.mjs

@@ -1,31 +1,181 @@
-import { NOOP } from '@vue/shared';
-import '../../../utils/index.mjs';
-import { uploadListTypes } from './upload2.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props.mjs';
-import { mutable } from '../../../utils/typescript.mjs';
+import { defineComponent, ref, openBlock, createBlock, TransitionGroup, normalizeClass, unref, withCtx, createElementBlock, Fragment, renderList, withKeys, renderSlot, createCommentVNode, createElementVNode, createVNode, createTextVNode, toDisplayString, normalizeStyle } from 'vue';
+import { ElIcon } from '../../icon/index.mjs';
+import { Document, CircleCheck, Check, Close, ZoomIn, Delete } from '@element-plus/icons-vue';
+import '../../../hooks/index.mjs';
+import { ElProgress } from '../../progress/index.mjs';
+import { uploadListProps, uploadListEmits } from './upload-list.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useLocale } from '../../../hooks/use-locale/index.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 
-const uploadListProps = buildProps({
-  files: {
-    type: definePropType(Array),
-    default: () => mutable([])
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  handlePreview: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  listType: {
-    type: String,
-    values: uploadListTypes,
-    default: "text"
+const _hoisted_1 = ["onKeydown"];
+const _hoisted_2 = ["src"];
+const _hoisted_3 = ["onClick"];
+const _hoisted_4 = ["onClick"];
+const _hoisted_5 = ["onClick"];
+const __default__ = {
+  name: "ElUploadList"
+};
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: uploadListProps,
+  emits: uploadListEmits,
+  setup(__props, { emit }) {
+    const props = __props;
+    const { t } = useLocale();
+    const nsUpload = useNamespace("upload");
+    const nsIcon = useNamespace("icon");
+    const nsList = useNamespace("list");
+    const focusing = ref(false);
+    const handleClick = (file) => {
+      props.handlePreview(file);
+    };
+    const onFileClicked = (e) => {
+      ;
+      e.target.focus();
+    };
+    const handleRemove = (file) => {
+      emit("remove", file);
+    };
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(TransitionGroup, {
+        tag: "ul",
+        class: normalizeClass([
+          unref(nsUpload).b("list"),
+          unref(nsUpload).bm("list", _ctx.listType),
+          unref(nsUpload).is("disabled", _ctx.disabled)
+        ]),
+        name: unref(nsList).b()
+      }, {
+        default: withCtx(() => [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.files, (file) => {
+            return openBlock(), createElementBlock("li", {
+              key: file.uid || file.name,
+              class: normalizeClass([
+                unref(nsUpload).be("list", "item"),
+                unref(nsUpload).is(file.status),
+                { focusing: focusing.value }
+              ]),
+              tabindex: "0",
+              onKeydown: withKeys(($event) => !_ctx.disabled && handleRemove(file), ["delete"]),
+              onFocus: _cache[0] || (_cache[0] = ($event) => focusing.value = true),
+              onBlur: _cache[1] || (_cache[1] = ($event) => focusing.value = false),
+              onClick: onFileClicked
+            }, [
+              renderSlot(_ctx.$slots, "default", { file }, () => [
+                _ctx.listType === "picture" || file.status !== "uploading" && _ctx.listType === "picture-card" ? (openBlock(), createElementBlock("img", {
+                  key: 0,
+                  class: normalizeClass(unref(nsUpload).be("list", "item-thumbnail")),
+                  src: file.url,
+                  alt: ""
+                }, null, 10, _hoisted_2)) : createCommentVNode("v-if", true),
+                _ctx.listType !== "picture" && (file.status === "uploading" || _ctx.listType !== "picture-card") ? (openBlock(), createElementBlock("div", {
+                  key: 1,
+                  class: normalizeClass(unref(nsUpload).be("list", "item-info"))
+                }, [
+                  createElementVNode("a", {
+                    class: normalizeClass(unref(nsUpload).be("list", "item-name")),
+                    onClick: ($event) => handleClick(file)
+                  }, [
+                    createVNode(unref(ElIcon), {
+                      class: normalizeClass(unref(nsIcon).m("document"))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(Document))
+                      ]),
+                      _: 1
+                    }, 8, ["class"]),
+                    createTextVNode(" " + toDisplayString(file.name), 1)
+                  ], 10, _hoisted_3),
+                  file.status === "uploading" ? (openBlock(), createBlock(unref(ElProgress), {
+                    key: 0,
+                    type: _ctx.listType === "picture-card" ? "circle" : "line",
+                    "stroke-width": _ctx.listType === "picture-card" ? 6 : 2,
+                    percentage: Number(file.percentage),
+                    style: normalizeStyle(_ctx.listType === "picture-card" ? "" : "margin-top: 0.5rem")
+                  }, null, 8, ["type", "stroke-width", "percentage", "style"])) : createCommentVNode("v-if", true)
+                ], 2)) : createCommentVNode("v-if", true),
+                createElementVNode("label", {
+                  class: normalizeClass(unref(nsUpload).be("list", "item-status-label"))
+                }, [
+                  _ctx.listType === "text" ? (openBlock(), createBlock(unref(ElIcon), {
+                    key: 0,
+                    class: normalizeClass([unref(nsIcon).m("upload-success"), unref(nsIcon).m("circle-check")])
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(CircleCheck))
+                    ]),
+                    _: 1
+                  }, 8, ["class"])) : ["picture-card", "picture"].includes(_ctx.listType) ? (openBlock(), createBlock(unref(ElIcon), {
+                    key: 1,
+                    class: normalizeClass([unref(nsIcon).m("upload-success"), unref(nsIcon).m("check")])
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Check))
+                    ]),
+                    _: 1
+                  }, 8, ["class"])) : createCommentVNode("v-if", true)
+                ], 2),
+                !_ctx.disabled ? (openBlock(), createBlock(unref(ElIcon), {
+                  key: 2,
+                  class: normalizeClass(unref(nsIcon).m("close")),
+                  onClick: ($event) => handleRemove(file)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(Close))
+                  ]),
+                  _: 2
+                }, 1032, ["class", "onClick"])) : createCommentVNode("v-if", true),
+                createCommentVNode(" Due to close btn only appears when li gets focused disappears after li gets blurred, thus keyboard navigation can never reach close btn"),
+                createCommentVNode(" This is a bug which needs to be fixed "),
+                createCommentVNode(" TODO: Fix the incorrect navigation interaction "),
+                !_ctx.disabled ? (openBlock(), createElementBlock("i", {
+                  key: 3,
+                  class: normalizeClass(unref(nsIcon).m("close-tip"))
+                }, toDisplayString(unref(t)("el.upload.deleteTip")), 3)) : createCommentVNode("v-if", true),
+                _ctx.listType === "picture-card" ? (openBlock(), createElementBlock("span", {
+                  key: 4,
+                  class: normalizeClass(unref(nsUpload).be("list", "item-actions"))
+                }, [
+                  createElementVNode("span", {
+                    class: normalizeClass(unref(nsUpload).be("list", "item-preview")),
+                    onClick: ($event) => _ctx.handlePreview(file)
+                  }, [
+                    createVNode(unref(ElIcon), {
+                      class: normalizeClass(unref(nsIcon).m("zoom-in"))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(ZoomIn))
+                      ]),
+                      _: 1
+                    }, 8, ["class"])
+                  ], 10, _hoisted_4),
+                  !_ctx.disabled ? (openBlock(), createElementBlock("span", {
+                    key: 0,
+                    class: normalizeClass(unref(nsUpload).be("list", "item-delete")),
+                    onClick: ($event) => handleRemove(file)
+                  }, [
+                    createVNode(unref(ElIcon), {
+                      class: normalizeClass(unref(nsIcon).m("delete"))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(Delete))
+                      ]),
+                      _: 1
+                    }, 8, ["class"])
+                  ], 10, _hoisted_5)) : createCommentVNode("v-if", true)
+                ], 2)) : createCommentVNode("v-if", true)
+              ])
+            ], 42, _hoisted_1);
+          }), 128)),
+          renderSlot(_ctx.$slots, "append")
+        ]),
+        _: 3
+      }, 8, ["class", "name"]);
+    };
   }
 });
-const uploadListEmits = {
-  remove: (file) => !!file
-};
+var UploadList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/meng/workspace/element-pe/packages/components/upload/src/upload-list.vue"]]);
 
-export { uploadListEmits, uploadListProps };
+export { UploadList as default };
 //# sourceMappingURL=upload-list2.mjs.map

package/es/components/upload/src/upload-list2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"upload-list2.mjs","sources":["../../../../../../packages/components/upload/src/upload-list.ts"],"sourcesContent":["import { NOOP } from '@vue/shared'\nimport { buildProps, definePropType, mutable } from '@element-plus/utils'\nimport { uploadListTypes } from './upload'\nimport type { ExtractPropTypes } from 'vue'\nimport type { UploadFile, UploadFiles, UploadHooks } from './upload'\nimport type UploadList from './upload-list.vue'\n\nexport const uploadListProps = buildProps({\n  files: {\n    type: definePropType<UploadFiles>(Array),\n    default: () => mutable([]),\n  },\n  disabled: {\n    type: Boolean,\n    default: false,\n  },\n  handlePreview: {\n    type: definePropType<UploadHooks['onPreview']>(Function),\n    default: NOOP,\n  },\n  listType: {\n    type: String,\n    values: uploadListTypes,\n    default: 'text',\n  },\n} as const)\n\nexport type UploadListProps = ExtractPropTypes<typeof uploadListProps>\nexport const uploadListEmits = {\n  remove: (file: UploadFile) => !!file,\n}\nexport type UploadListEmits = typeof uploadListEmits\nexport type UploadListInstance = InstanceType<typeof UploadList>\n"],"names":[],"mappings":";;;;;;AAGY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAM,OAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,eAAe;AAC3B,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,eAAe,GAAG;AAC/B,EAAE,MAAM,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;AAC1B;;;;"}
+{"version":3,"file":"upload-list2.mjs","sources":["../../../../../../packages/components/upload/src/upload-list.vue"],"sourcesContent":["<template>\n  <transition-group\n    tag=\"ul\"\n    :class=\"[\n      nsUpload.b('list'),\n      nsUpload.bm('list', listType),\n      nsUpload.is('disabled', disabled),\n    ]\"\n    :name=\"nsList.b()\"\n  >\n    <li\n      v-for=\"file in files\"\n      :key=\"file.uid || file.name\"\n      :class=\"[\n        nsUpload.be('list', 'item'),\n        nsUpload.is(file.status),\n        { focusing },\n      ]\"\n      tabindex=\"0\"\n      @keydown.delete=\"!disabled && handleRemove(file)\"\n      @focus=\"focusing = true\"\n      @blur=\"focusing = false\"\n      @click=\"onFileClicked\"\n    >\n      <slot :file=\"file\">\n        <img\n          v-if=\"\n            listType === 'picture' ||\n            (file.status !== 'uploading' && listType === 'picture-card')\n          \"\n          :class=\"nsUpload.be('list', 'item-thumbnail')\"\n          :src=\"file.url\"\n          alt=\"\"\n        />\n        <div\n          v-if=\"\n            listType !== 'picture' &&\n            (file.status === 'uploading' || listType !== 'picture-card')\n          \"\n          :class=\"nsUpload.be('list', 'item-info')\"\n        >\n          <a\n            :class=\"nsUpload.be('list', 'item-name')\"\n            @click=\"handleClick(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('document')\"><Document /></el-icon>\n            {{ file.name }}\n          </a>\n          <el-progress\n            v-if=\"file.status === 'uploading'\"\n            :type=\"listType === 'picture-card' ? 'circle' : 'line'\"\n            :stroke-width=\"listType === 'picture-card' ? 6 : 2\"\n            :percentage=\"Number(file.percentage)\"\n            :style=\"listType === 'picture-card' ? '' : 'margin-top: 0.5rem'\"\n          />\n        </div>\n\n        <label :class=\"nsUpload.be('list', 'item-status-label')\">\n          <el-icon\n            v-if=\"listType === 'text'\"\n            :class=\"[nsIcon.m('upload-success'), nsIcon.m('circle-check')]\"\n          >\n            <circle-check />\n          </el-icon>\n          <el-icon\n            v-else-if=\"['picture-card', 'picture'].includes(listType)\"\n            :class=\"[nsIcon.m('upload-success'), nsIcon.m('check')]\"\n          >\n            <Check />\n          </el-icon>\n        </label>\n        <el-icon\n          v-if=\"!disabled\"\n          :class=\"nsIcon.m('close')\"\n          @click=\"handleRemove(file)\"\n        >\n          <Close />\n        </el-icon>\n        <!-- Due to close btn only appears when li gets focused disappears after li gets blurred, thus keyboard navigation can never reach close btn-->\n        <!-- This is a bug which needs to be fixed -->\n        <!-- TODO: Fix the incorrect navigation interaction -->\n        <i v-if=\"!disabled\" :class=\"nsIcon.m('close-tip')\">{{\n          t('el.upload.deleteTip')\n        }}</i>\n        <span\n          v-if=\"listType === 'picture-card'\"\n          :class=\"nsUpload.be('list', 'item-actions')\"\n        >\n          <span\n            :class=\"nsUpload.be('list', 'item-preview')\"\n            @click=\"handlePreview(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('zoom-in')\"><zoom-in /></el-icon>\n          </span>\n          <span\n            v-if=\"!disabled\"\n            :class=\"nsUpload.be('list', 'item-delete')\"\n            @click=\"handleRemove(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('delete')\"><Delete /></el-icon>\n          </span>\n        </span>\n      </slot>\n    </li>\n    <slot name=\"append\" />\n  </transition-group>\n</template>\n<script lang=\"ts\" setup>\nimport { ref } from 'vue'\nimport { ElIcon } from '@element-plus/components/icon'\nimport {\n  Check,\n  CircleCheck,\n  Close,\n  Delete,\n  Document,\n  ZoomIn,\n} from '@element-plus/icons-vue'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport ElProgress from '@element-plus/components/progress'\n\nimport { uploadListEmits, uploadListProps } from './upload-list'\nimport type { UploadFile } from './upload'\n\ndefineOptions({\n  name: 'ElUploadList',\n})\n\nconst props = defineProps(uploadListProps)\nconst emit = defineEmits(uploadListEmits)\n\nconst { t } = useLocale()\nconst nsUpload = useNamespace('upload')\nconst nsIcon = useNamespace('icon')\nconst nsList = useNamespace('list')\n\nconst focusing = ref(false)\n\nconst handleClick = (file: UploadFile) => {\n  props.handlePreview(file)\n}\n\nconst onFileClicked = (e: Event) => {\n  ;(e.target as HTMLElement).focus()\n}\n\nconst handleRemove = (file: UploadFile) => {\n  emit('remove', file)\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAmIA,IAAA,MAAA,EAAA,MAAA,SAAA,EAAA,CAAA;AACA,IAAA,MAAA,QAAA,GAAA,aAAA,QAAA,CAAA,CAAA;AACA,IAAA,MAAA,MAAA,GAAA,aAAA,MAAA,CAAA,CAAA;AACA,IAAA,MAAA,MAAA,GAAA,aAAA,MAAA,CAAA,CAAA;AAEA,IAAA,MAAA,QAAA,GAAA,IAAA,KAAA,CAAA,CAAA;AAEA,IAAA,MAAA,WAAA,GAAA,CAAA,IAAA,KAAA;AACA,MAAA,KAAA,CAAA,cAAA,IAAA,CAAA,CAAA;AAAA,KACA,CAAA;AAEA,IAAA,MAAA,aAAA,GAAA,CAAA,CAAA,KAAA;AACA,MAAA,CAAA;AAAA,MAAA,CAAA,CAAA,OAAA,KAAA,EAAA,CAAA;AAAA,KACA,CAAA;AAEA,IAAA,MAAA,YAAA,GAAA,CAAA,IAAA,KAAA;AACA,MAAA,IAAA,CAAA,UAAA,IAAA,CAAA,CAAA;AAAA,KACA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/upload/src/upload.d.ts

@@ -1,5 +1,5 @@
 import type { UploadAjaxError } from './ajax';
-import type { Awaitable } from 'element-pe/utils';
+import type { Awaitable } from 'element-pe/es/utils';
 import type { ExtractPropTypes } from 'vue';
 import type Upload from './upload.vue';
 export declare const uploadListTypes: readonly ["text", "picture", "picture-card"];
@@ -48,49 +48,49 @@ export interface UploadHooks {
     onExceed: (files: File[], uploadFiles: UploadUserFile[]) => void;
 }
 export declare const uploadBaseProps: {
-    readonly action: import("element-pe/utils").BuildPropReturn<StringConstructor, unknown, true, unknown, unknown>;
-    readonly headers: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<Record<string, any> | Headers>, unknown, unknown, unknown, unknown>;
-    readonly method: import("element-pe/utils").BuildPropReturn<StringConstructor, "post", unknown, unknown, unknown>;
-    readonly data: import("element-pe/utils").BuildPropReturn<ObjectConstructor, () => import("element-pe/utils").Mutable<{}>, unknown, unknown, unknown>;
-    readonly multiple: import("element-pe/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
-    readonly name: import("element-pe/utils").BuildPropReturn<StringConstructor, "file", unknown, unknown, unknown>;
-    readonly drag: import("element-pe/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
+    readonly action: import("element-pe/es/utils").BuildPropReturn<StringConstructor, unknown, true, unknown, unknown>;
+    readonly headers: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<Record<string, any> | Headers>, unknown, unknown, unknown, unknown>;
+    readonly method: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "post", unknown, unknown, unknown>;
+    readonly data: import("element-pe/es/utils").BuildPropReturn<ObjectConstructor, () => import("element-pe/es/utils").Mutable<{}>, unknown, unknown, unknown>;
+    readonly multiple: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
+    readonly name: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "file", unknown, unknown, unknown>;
+    readonly drag: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly withCredentials: BooleanConstructor;
-    readonly showFileList: import("element-pe/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
-    readonly accept: import("element-pe/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
-    readonly type: import("element-pe/utils").BuildPropReturn<StringConstructor, "select", unknown, unknown, unknown>;
-    readonly fileList: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<UploadUserFile[]>, () => [], unknown, unknown, unknown>;
-    readonly autoUpload: import("element-pe/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
-    readonly listType: import("element-pe/utils").BuildPropReturn<StringConstructor, "text", unknown, "text" | "picture" | "picture-card", unknown>;
-    readonly httpRequest: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<UploadRequestHandler>, UploadRequestHandler, unknown, unknown, unknown>;
+    readonly showFileList: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
+    readonly accept: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
+    readonly type: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "select", unknown, unknown, unknown>;
+    readonly fileList: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<UploadUserFile[]>, () => [], unknown, unknown, unknown>;
+    readonly autoUpload: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
+    readonly listType: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "text", unknown, "text" | "picture" | "picture-card", unknown>;
+    readonly httpRequest: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<UploadRequestHandler>, UploadRequestHandler, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly limit: NumberConstructor;
 };
 export declare const uploadProps: {
-    readonly beforeUpload: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(rawFile: UploadRawFile) => Awaitable<void | undefined | null | boolean | File | Blob>>, () => void, unknown, unknown, unknown>;
-    readonly beforeRemove: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(uploadFile: UploadFile, uploadFiles: UploadFiles) => Awaitable<boolean>>, unknown, unknown, unknown, unknown>;
-    readonly onRemove: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
-    readonly onChange: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
-    readonly onPreview: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(uploadFile: UploadFile) => void>, () => void, unknown, unknown, unknown>;
-    readonly onSuccess: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
-    readonly onProgress: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(evt: UploadProgressEvent, uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
-    readonly onError: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
-    readonly onExceed: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<(files: File[], uploadFiles: UploadUserFile[]) => void>, () => void, unknown, unknown, unknown>;
-    readonly action: import("element-pe/utils").BuildPropReturn<StringConstructor, unknown, true, unknown, unknown>;
-    readonly headers: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<Record<string, any> | Headers>, unknown, unknown, unknown, unknown>;
-    readonly method: import("element-pe/utils").BuildPropReturn<StringConstructor, "post", unknown, unknown, unknown>;
-    readonly data: import("element-pe/utils").BuildPropReturn<ObjectConstructor, () => import("element-pe/utils").Mutable<{}>, unknown, unknown, unknown>;
-    readonly multiple: import("element-pe/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
-    readonly name: import("element-pe/utils").BuildPropReturn<StringConstructor, "file", unknown, unknown, unknown>;
-    readonly drag: import("element-pe/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
+    readonly beforeUpload: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(rawFile: UploadRawFile) => Awaitable<void | undefined | null | boolean | File | Blob>>, () => void, unknown, unknown, unknown>;
+    readonly beforeRemove: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(uploadFile: UploadFile, uploadFiles: UploadFiles) => Awaitable<boolean>>, unknown, unknown, unknown, unknown>;
+    readonly onRemove: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
+    readonly onChange: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
+    readonly onPreview: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(uploadFile: UploadFile) => void>, () => void, unknown, unknown, unknown>;
+    readonly onSuccess: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
+    readonly onProgress: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(evt: UploadProgressEvent, uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
+    readonly onError: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) => void>, () => void, unknown, unknown, unknown>;
+    readonly onExceed: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<(files: File[], uploadFiles: UploadUserFile[]) => void>, () => void, unknown, unknown, unknown>;
+    readonly action: import("element-pe/es/utils").BuildPropReturn<StringConstructor, unknown, true, unknown, unknown>;
+    readonly headers: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<Record<string, any> | Headers>, unknown, unknown, unknown, unknown>;
+    readonly method: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "post", unknown, unknown, unknown>;
+    readonly data: import("element-pe/es/utils").BuildPropReturn<ObjectConstructor, () => import("element-pe/es/utils").Mutable<{}>, unknown, unknown, unknown>;
+    readonly multiple: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
+    readonly name: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "file", unknown, unknown, unknown>;
+    readonly drag: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly withCredentials: BooleanConstructor;
-    readonly showFileList: import("element-pe/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
-    readonly accept: import("element-pe/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
-    readonly type: import("element-pe/utils").BuildPropReturn<StringConstructor, "select", unknown, unknown, unknown>;
-    readonly fileList: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<UploadUserFile[]>, () => [], unknown, unknown, unknown>;
-    readonly autoUpload: import("element-pe/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
-    readonly listType: import("element-pe/utils").BuildPropReturn<StringConstructor, "text", unknown, "text" | "picture" | "picture-card", unknown>;
-    readonly httpRequest: import("element-pe/utils").BuildPropReturn<import("element-pe/utils").PropWrapper<UploadRequestHandler>, UploadRequestHandler, unknown, unknown, unknown>;
+    readonly showFileList: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
+    readonly accept: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
+    readonly type: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "select", unknown, unknown, unknown>;
+    readonly fileList: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<UploadUserFile[]>, () => [], unknown, unknown, unknown>;
+    readonly autoUpload: import("element-pe/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
+    readonly listType: import("element-pe/es/utils").BuildPropReturn<StringConstructor, "text", unknown, "text" | "picture" | "picture-card", unknown>;
+    readonly httpRequest: import("element-pe/es/utils").BuildPropReturn<import("element-pe/es/utils").PropWrapper<UploadRequestHandler>, UploadRequestHandler, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly limit: NumberConstructor;
 };

package/es/components/upload/src/upload.mjs

@@ -1,126 +1,111 @@
-import { defineComponent, useSlots, shallowRef, computed, onBeforeUnmount, provide, toRef, openBlock, createElementBlock, unref, createBlock, createSlots, withCtx, mergeProps, renderSlot, createCommentVNode } from 'vue';
-import '../../../tokens/index.mjs';
-import '../../../hooks/index.mjs';
-import UploadList from './upload-list.mjs';
-import UploadContent from './upload-content2.mjs';
-import { useHandlers } from './use-handlers.mjs';
-import { uploadProps } from './upload2.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useDisabled } from '../../../hooks/use-common-props/index.mjs';
-import { uploadContextKey } from '../../../tokens/upload.mjs';
+import { NOOP } from '@vue/shared';
+import '../../../utils/index.mjs';
+import { ajaxUpload } from './ajax.mjs';
+import { buildProps, definePropType } from '../../../utils/vue/props.mjs';
+import { mutable } from '../../../utils/typescript.mjs';
 
-const __default__ = {
-  name: "ElUpload"
-};
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: uploadProps,
-  setup(__props, { expose }) {
-    const props = __props;
-    const slots = useSlots();
-    const disabled = useDisabled();
-    const uploadRef = shallowRef();
-    const {
-      abort,
-      submit,
-      clearFiles,
-      uploadFiles,
-      handleStart,
-      handleError,
-      handleRemove,
-      handleSuccess,
-      handleProgress
-    } = useHandlers(props, uploadRef);
-    const isPictureCard = computed(() => props.listType === "picture-card");
-    const uploadContentProps = computed(() => ({
-      ...props,
-      onStart: handleStart,
-      onProgress: handleProgress,
-      onSuccess: handleSuccess,
-      onError: handleError,
-      onRemove: handleRemove
-    }));
-    onBeforeUnmount(() => {
-      uploadFiles.value.forEach(({ url }) => {
-        if (url == null ? void 0 : url.startsWith("blob:"))
-          URL.revokeObjectURL(url);
-      });
-    });
-    provide(uploadContextKey, {
-      accept: toRef(props, "accept")
-    });
-    expose({
-      abort,
-      submit,
-      clearFiles,
-      handleStart,
-      handleRemove
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", null, [
-        unref(isPictureCard) && _ctx.showFileList ? (openBlock(), createBlock(UploadList, {
-          key: 0,
-          disabled: unref(disabled),
-          "list-type": _ctx.listType,
-          files: unref(uploadFiles),
-          "handle-preview": _ctx.onPreview,
-          onRemove: unref(handleRemove)
-        }, createSlots({
-          append: withCtx(() => [
-            _ctx.listType === "picture-card" ? (openBlock(), createBlock(UploadContent, mergeProps({
-              key: 0,
-              ref_key: "uploadRef",
-              ref: uploadRef
-            }, unref(uploadContentProps)), {
-              default: withCtx(() => [
-                unref(slots).trigger ? renderSlot(_ctx.$slots, "trigger", { key: 0 }) : createCommentVNode("v-if", true),
-                !unref(slots).trigger && unref(slots).default ? renderSlot(_ctx.$slots, "default", { key: 1 }) : createCommentVNode("v-if", true)
-              ]),
-              _: 3
-            }, 16)) : createCommentVNode("v-if", true)
-          ]),
-          _: 2
-        }, [
-          _ctx.$slots.file ? {
-            name: "default",
-            fn: withCtx(({ file }) => [
-              renderSlot(_ctx.$slots, "file", { file })
-            ])
-          } : void 0
-        ]), 1032, ["disabled", "list-type", "files", "handle-preview", "onRemove"])) : createCommentVNode("v-if", true),
-        _ctx.listType !== "picture-card" ? (openBlock(), createBlock(UploadContent, mergeProps({
-          key: 1,
-          ref_key: "uploadRef",
-          ref: uploadRef
-        }, unref(uploadContentProps)), {
-          default: withCtx(() => [
-            unref(slots).trigger ? renderSlot(_ctx.$slots, "trigger", { key: 0 }) : createCommentVNode("v-if", true),
-            !unref(slots).trigger && unref(slots).default ? renderSlot(_ctx.$slots, "default", { key: 1 }) : createCommentVNode("v-if", true)
-          ]),
-          _: 3
-        }, 16)) : createCommentVNode("v-if", true),
-        _ctx.$slots.trigger ? renderSlot(_ctx.$slots, "default", { key: 2 }) : createCommentVNode("v-if", true),
-        renderSlot(_ctx.$slots, "tip"),
-        !unref(isPictureCard) && _ctx.showFileList ? (openBlock(), createBlock(UploadList, {
-          key: 3,
-          disabled: unref(disabled),
-          "list-type": _ctx.listType,
-          files: unref(uploadFiles),
-          "handle-preview": _ctx.onPreview,
-          onRemove: unref(handleRemove)
-        }, createSlots({ _: 2 }, [
-          _ctx.$slots.file ? {
-            name: "default",
-            fn: withCtx(({ file }) => [
-              renderSlot(_ctx.$slots, "file", { file })
-            ])
-          } : void 0
-        ]), 1032, ["disabled", "list-type", "files", "handle-preview", "onRemove"])) : createCommentVNode("v-if", true)
-      ]);
-    };
+const uploadListTypes = ["text", "picture", "picture-card"];
+let fileId = 1;
+const genFileId = () => Date.now() + fileId++;
+const uploadBaseProps = buildProps({
+  action: {
+    type: String,
+    required: true
+  },
+  headers: {
+    type: definePropType(Object)
+  },
+  method: {
+    type: String,
+    default: "post"
+  },
+  data: {
+    type: Object,
+    default: () => mutable({})
+  },
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+  name: {
+    type: String,
+    default: "file"
+  },
+  drag: {
+    type: Boolean,
+    default: false
+  },
+  withCredentials: Boolean,
+  showFileList: {
+    type: Boolean,
+    default: true
+  },
+  accept: {
+    type: String,
+    default: ""
+  },
+  type: {
+    type: String,
+    default: "select"
+  },
+  fileList: {
+    type: definePropType(Array),
+    default: () => mutable([])
+  },
+  autoUpload: {
+    type: Boolean,
+    default: true
+  },
+  listType: {
+    type: String,
+    values: uploadListTypes,
+    default: "text"
+  },
+  httpRequest: {
+    type: definePropType(Function),
+    default: ajaxUpload
+  },
+  disabled: Boolean,
+  limit: Number
+});
+const uploadProps = buildProps({
+  ...uploadBaseProps,
+  beforeUpload: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  beforeRemove: {
+    type: definePropType(Function)
+  },
+  onRemove: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  onChange: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  onPreview: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  onSuccess: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  onProgress: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  onError: {
+    type: definePropType(Function),
+    default: NOOP
+  },
+  onExceed: {
+    type: definePropType(Function),
+    default: NOOP
   }
 });
-var Upload = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/meng/workspace/element-pe/packages/components/upload/src/upload.vue"]]);
 
-export { Upload as default };
+export { genFileId, uploadBaseProps, uploadListTypes, uploadProps };
 //# sourceMappingURL=upload.mjs.map