@element-plus/nightly 0.0.20250724 → 0.0.20250727

package/lib/components/upload/src/upload-list2.js

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

package/lib/components/upload/src/upload-list2.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-list2.js","sources":["../../../../../../packages/components/upload/src/upload-list.vue"],"sourcesContent":["<template>\n  <transition-group tag=\"ul\" :class=\"containerKls\" :name=\"nsList.b()\">\n    <li\n      v-for=\"(file, index) 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=\"focusing = false\"\n    >\n      <slot :file=\"file\" :index=\"index\">\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          :crossorigin=\"crossorigin\"\n          alt=\"\"\n        />\n        <div\n          v-if=\"file.status === 'uploading' || listType !== 'picture-card'\"\n          :class=\"nsUpload.be('list', 'item-info')\"\n        >\n          <a\n            :class=\"nsUpload.be('list', 'item-name')\"\n            @click.prevent=\"handlePreview(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('document')\">\n              <Document />\n            </el-icon>\n            <span\n              :class=\"nsUpload.be('list', 'item-file-name')\"\n              :title=\"file.name\"\n            >\n              {{ file.name }}\n            </span>\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')\">\n              <Delete />\n            </el-icon>\n          </span>\n        </span>\n      </slot>\n    </li>\n    <slot name=\"append\" />\n  </transition-group>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, 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'\nimport { useFormDisabled } from '@element-plus/components/form'\nimport { uploadListEmits, uploadListProps } from './upload-list'\n\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')\nconst disabled = useFormDisabled()\n\nconst focusing = ref(false)\n\nconst containerKls = computed(() => [\n  nsUpload.b('list'),\n  nsUpload.bm('list', props.listType),\n  nsUpload.is('disabled', props.disabled),\n])\n\nconst handleRemove = (file: UploadFile) => {\n  emit('remove', file)\n}\n</script>\n"],"names":["useLocale","useNamespace","useFormDisabled","ref","computed"],"mappings":";;;;;;;;;;;;;;uCA6Hc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAIA,eAAU,EAAA,CAAA;AACxB,IAAM,MAAA,QAAA,GAAWC,qBAAa,QAAQ,CAAA,CAAA;AACtC,IAAM,MAAA,MAAA,GAASA,qBAAa,MAAM,CAAA,CAAA;AAClC,IAAM,MAAA,MAAA,GAASA,qBAAa,MAAM,CAAA,CAAA;AAClC,IAAA,MAAM,WAAWC,kCAAgB,EAAA,CAAA;AAEjC,IAAM,MAAA,QAAA,GAAWC,QAAI,KAAK,CAAA,CAAA;AAE1B,IAAM,MAAA,YAAA,GAAeC,aAAS,MAAM;AAAA,MAClC,QAAA,CAAS,EAAE,MAAM,CAAA;AAAA,MACjB,QAAS,CAAA,EAAA,CAAG,MAAQ,EAAA,KAAA,CAAM,QAAQ,CAAA;AAAA,MAClC,QAAS,CAAA,EAAA,CAAG,UAAY,EAAA,KAAA,CAAM,QAAQ,CAAA;AAAA,KACvC,CAAA,CAAA;AAED,IAAM,MAAA,YAAA,GAAe,CAAC,IAAqB,KAAA;AACzC,MAAA,IAAA,CAAK,UAAU,IAAI,CAAA,CAAA;AAAA,KACrB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"upload-list2.js","sources":["../../../../../../packages/components/upload/src/upload-list.ts"],"sourcesContent":["import { NOOP, buildProps, definePropType, mutable } from '@element-plus/utils'\nimport { uploadListTypes } from './upload'\n\nimport type { ExtractPropTypes, __ExtractPublicPropTypes } 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: Boolean,\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  /**\n   * @description set HTML attribute: crossorigin.\n   */\n  crossorigin: {\n    type: definePropType<'anonymous' | 'use-credentials' | ''>(String),\n  },\n} as const)\n\nexport type UploadListProps = ExtractPropTypes<typeof uploadListProps>\nexport type UploadListPropsPublic = __ExtractPublicPropTypes<\n  typeof uploadListProps\n>\nexport const uploadListEmits = {\n  remove: (file: UploadFile) => !!file,\n}\nexport type UploadListEmits = typeof uploadListEmits\nexport type UploadListInstance = InstanceType<typeof UploadList> & unknown\n"],"names":["buildProps","definePropType","mutable","NOOP","uploadListTypes"],"mappings":";;;;;;;;;AAEY,MAAC,eAAe,GAAGA,kBAAU,CAAC;AAC1C,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAEC,sBAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAMC,kBAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEE,WAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAEC,sBAAe;AAC3B,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAEH,sBAAc,CAAC,MAAM,CAAC;AAChC,GAAG;AACH,CAAC,EAAE;AACS,MAAC,eAAe,GAAG;AAC/B,EAAE,MAAM,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;AAC1B;;;;;"}

package/lib/components/upload/src/upload.js

@@ -2,109 +2,134 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var ajax = require('./ajax.js');
-var runtime = require('../../../utils/vue/props/runtime.js');
-var typescript = require('../../../utils/typescript.js');
-var shared = require('@vue/shared');
+var vue = require('vue');
+var constants = require('./constants.js');
+var uploadList = require('./upload-list.js');
+var uploadContent = require('./upload-content.js');
+var useHandlers = require('./use-handlers.js');
+var upload = require('./upload2.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var useFormCommonProps = require('../../form/src/hooks/use-form-common-props.js');
 
-const uploadListTypes = ["text", "picture", "picture-card"];
-let fileId = 1;
-const genFileId = () => Date.now() + fileId++;
-const uploadBaseProps = runtime.buildProps({
-  action: {
-    type: String,
-    default: "#"
-  },
-  headers: {
-    type: runtime.definePropType(Object)
-  },
-  method: {
-    type: String,
-    default: "post"
-  },
-  data: {
-    type: runtime.definePropType([Object, Function, Promise]),
-    default: () => typescript.mutable({})
-  },
-  multiple: Boolean,
-  name: {
-    type: String,
-    default: "file"
-  },
-  drag: Boolean,
-  withCredentials: Boolean,
-  showFileList: {
-    type: Boolean,
-    default: true
-  },
-  accept: {
-    type: String,
-    default: ""
-  },
-  fileList: {
-    type: runtime.definePropType(Array),
-    default: () => typescript.mutable([])
-  },
-  autoUpload: {
-    type: Boolean,
-    default: true
-  },
-  listType: {
-    type: String,
-    values: uploadListTypes,
-    default: "text"
-  },
-  httpRequest: {
-    type: runtime.definePropType(Function),
-    default: ajax.ajaxUpload
-  },
-  disabled: Boolean,
-  limit: Number
+const __default__ = vue.defineComponent({
+  name: "ElUpload"
 });
-const uploadProps = runtime.buildProps({
-  ...uploadBaseProps,
-  beforeUpload: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  beforeRemove: {
-    type: runtime.definePropType(Function)
-  },
-  onRemove: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onChange: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onPreview: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onSuccess: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onProgress: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onError: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onExceed: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  crossorigin: {
-    type: runtime.definePropType(String)
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...__default__,
+  props: upload.uploadProps,
+  setup(__props, { expose }) {
+    const props = __props;
+    const disabled = useFormCommonProps.useFormDisabled();
+    const uploadRef = vue.shallowRef();
+    const {
+      abort,
+      submit,
+      clearFiles,
+      uploadFiles,
+      handleStart,
+      handleError,
+      handleRemove,
+      handleSuccess,
+      handleProgress,
+      revokeFileObjectURL
+    } = useHandlers.useHandlers(props, uploadRef);
+    const isPictureCard = vue.computed(() => props.listType === "picture-card");
+    const uploadContentProps = vue.computed(() => ({
+      ...props,
+      fileList: uploadFiles.value,
+      onStart: handleStart,
+      onProgress: handleProgress,
+      onSuccess: handleSuccess,
+      onError: handleError,
+      onRemove: handleRemove
+    }));
+    vue.onBeforeUnmount(() => {
+      uploadFiles.value.forEach(revokeFileObjectURL);
+    });
+    vue.provide(constants.uploadContextKey, {
+      accept: vue.toRef(props, "accept")
+    });
+    expose({
+      abort,
+      submit,
+      clearFiles,
+      handleStart,
+      handleRemove
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", null, [
+        vue.unref(isPictureCard) && _ctx.showFileList ? (vue.openBlock(), vue.createBlock(uploadList["default"], {
+          key: 0,
+          disabled: vue.unref(disabled),
+          "list-type": _ctx.listType,
+          files: vue.unref(uploadFiles),
+          crossorigin: _ctx.crossorigin,
+          "handle-preview": _ctx.onPreview,
+          onRemove: vue.unref(handleRemove)
+        }, vue.createSlots({
+          append: vue.withCtx(() => [
+            vue.createVNode(uploadContent["default"], vue.mergeProps({
+              ref_key: "uploadRef",
+              ref: uploadRef
+            }, vue.unref(uploadContentProps)), {
+              default: vue.withCtx(() => [
+                _ctx.$slots.trigger ? vue.renderSlot(_ctx.$slots, "trigger", { key: 0 }) : vue.createCommentVNode("v-if", true),
+                !_ctx.$slots.trigger && _ctx.$slots.default ? vue.renderSlot(_ctx.$slots, "default", { key: 1 }) : vue.createCommentVNode("v-if", true)
+              ]),
+              _: 3
+            }, 16)
+          ]),
+          _: 2
+        }, [
+          _ctx.$slots.file ? {
+            name: "default",
+            fn: vue.withCtx(({ file, index }) => [
+              vue.renderSlot(_ctx.$slots, "file", {
+                file,
+                index
+              })
+            ])
+          } : void 0
+        ]), 1032, ["disabled", "list-type", "files", "crossorigin", "handle-preview", "onRemove"])) : vue.createCommentVNode("v-if", true),
+        !vue.unref(isPictureCard) || vue.unref(isPictureCard) && !_ctx.showFileList ? (vue.openBlock(), vue.createBlock(uploadContent["default"], vue.mergeProps({
+          key: 1,
+          ref_key: "uploadRef",
+          ref: uploadRef
+        }, vue.unref(uploadContentProps)), {
+          default: vue.withCtx(() => [
+            _ctx.$slots.trigger ? vue.renderSlot(_ctx.$slots, "trigger", { key: 0 }) : vue.createCommentVNode("v-if", true),
+            !_ctx.$slots.trigger && _ctx.$slots.default ? vue.renderSlot(_ctx.$slots, "default", { key: 1 }) : vue.createCommentVNode("v-if", true)
+          ]),
+          _: 3
+        }, 16)) : vue.createCommentVNode("v-if", true),
+        _ctx.$slots.trigger ? vue.renderSlot(_ctx.$slots, "default", { key: 2 }) : vue.createCommentVNode("v-if", true),
+        vue.renderSlot(_ctx.$slots, "tip"),
+        !vue.unref(isPictureCard) && _ctx.showFileList ? (vue.openBlock(), vue.createBlock(uploadList["default"], {
+          key: 3,
+          disabled: vue.unref(disabled),
+          "list-type": _ctx.listType,
+          files: vue.unref(uploadFiles),
+          crossorigin: _ctx.crossorigin,
+          "handle-preview": _ctx.onPreview,
+          onRemove: vue.unref(handleRemove)
+        }, vue.createSlots({
+          _: 2
+        }, [
+          _ctx.$slots.file ? {
+            name: "default",
+            fn: vue.withCtx(({ file, index }) => [
+              vue.renderSlot(_ctx.$slots, "file", {
+                file,
+                index
+              })
+            ])
+          } : void 0
+        ]), 1032, ["disabled", "list-type", "files", "crossorigin", "handle-preview", "onRemove"])) : vue.createCommentVNode("v-if", true)
+      ]);
+    };
   }
 });
+var Upload = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "upload.vue"]]);
 
-exports.genFileId = genFileId;
-exports.uploadBaseProps = uploadBaseProps;
-exports.uploadListTypes = uploadListTypes;
-exports.uploadProps = uploadProps;
+exports["default"] = Upload;
 //# sourceMappingURL=upload.js.map

package/lib/components/upload/src/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sources":["../../../../../../packages/components/upload/src/upload.ts"],"sourcesContent":["import { NOOP, buildProps, definePropType, mutable } from '@element-plus/utils'\nimport { ajaxUpload } from './ajax'\n\nimport type { Awaitable, Mutable } from '@element-plus/utils'\nimport type { UploadAjaxError } from './ajax'\nimport type { ExtractPropTypes, __ExtractPublicPropTypes } from 'vue'\nimport type Upload from './upload.vue'\n\nexport const uploadListTypes = ['text', 'picture', 'picture-card'] as const\n\nlet fileId = 1\nexport const genFileId = () => Date.now() + fileId++\n\nexport type UploadStatus = 'ready' | 'uploading' | 'success' | 'fail'\nexport interface UploadProgressEvent extends ProgressEvent {\n  percent: number\n}\n\nexport interface UploadRequestOptions {\n  action: string\n  method: string\n  data: Record<string, string | Blob | [Blob, string]>\n  filename: string\n  file: UploadRawFile\n  headers: Headers | Record<string, string | number | null | undefined>\n  onError: (evt: UploadAjaxError) => void\n  onProgress: (evt: UploadProgressEvent) => void\n  onSuccess: (response: any) => void\n  withCredentials: boolean\n}\nexport interface UploadFile {\n  name: string\n  percentage?: number\n  status: UploadStatus\n  size?: number\n  response?: unknown\n  uid: number\n  url?: string\n  raw?: UploadRawFile\n}\nexport type UploadUserFile = Omit<UploadFile, 'status' | 'uid'> &\n  Partial<Pick<UploadFile, 'status' | 'uid'>>\n\nexport type UploadFiles = UploadFile[]\nexport interface UploadRawFile extends File {\n  uid: number\n  isDirectory?: boolean\n}\nexport type UploadRequestHandler = (\n  options: UploadRequestOptions\n) => XMLHttpRequest | Promise<unknown>\nexport interface UploadHooks {\n  beforeUpload: (\n    rawFile: UploadRawFile\n  ) => Awaitable<void | undefined | null | boolean | File | Blob>\n  beforeRemove: (\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => Awaitable<boolean>\n  onRemove: (uploadFile: UploadFile, uploadFiles: UploadFiles) => void\n  onChange: (uploadFile: UploadFile, uploadFiles: UploadFiles) => void\n  onPreview: (uploadFile: UploadFile) => void\n  onSuccess: (\n    response: any,\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => void\n  onProgress: (\n    evt: UploadProgressEvent,\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => void\n  onError: (\n    error: Error,\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => void\n  onExceed: (files: File[], uploadFiles: UploadUserFile[]) => void\n}\n\nexport type UploadData = Mutable<Record<string, any>>\n\nexport const uploadBaseProps = buildProps({\n  /**\n   * @description request URL\n   */\n  action: {\n    type: String,\n    default: '#',\n  },\n  /**\n   * @description request headers\n   */\n  headers: {\n    type: definePropType<Headers | Record<string, any>>(Object),\n  },\n  /**\n   * @description set upload request method\n   */\n  method: {\n    type: String,\n    default: 'post',\n  },\n  /**\n   * @description additions options of request\n   */\n  data: {\n    type: definePropType<\n      | Awaitable<UploadData>\n      | ((rawFile: UploadRawFile) => Awaitable<UploadData>)\n    >([Object, Function, Promise]),\n    default: () => mutable({} as const),\n  },\n  /**\n   * @description whether uploading multiple files is permitted\n   */\n  multiple: Boolean,\n  /**\n   * @description key name for uploaded file\n   */\n  name: {\n    type: String,\n    default: 'file',\n  },\n  /**\n   * @description whether to activate drag and drop mode\n   */\n  drag: Boolean,\n  /**\n   * @description whether cookies are sent\n   */\n  withCredentials: Boolean,\n  /**\n   * @description whether to show the uploaded file list\n   */\n  showFileList: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description accepted [file types](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept), will not work when `thumbnail-mode === true`\n   */\n  accept: {\n    type: String,\n    default: '',\n  },\n  /**\n   * @description default uploaded files\n   */\n  fileList: {\n    type: definePropType<UploadUserFile[]>(Array),\n    default: () => mutable([] as const),\n  },\n  /**\n   * @description whether to auto upload file\n   */\n  autoUpload: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description type of file list\n   */\n  listType: {\n    type: String,\n    values: uploadListTypes,\n    default: 'text',\n  },\n  /**\n   * @description override default xhr behavior, allowing you to implement your own upload-file's request\n   */\n  httpRequest: {\n    type: definePropType<UploadRequestHandler>(Function),\n    default: ajaxUpload,\n  },\n  /**\n   * @description whether to disable upload\n   */\n  disabled: Boolean,\n  /**\n   * @description maximum number of uploads allowed\n   */\n  limit: Number,\n} as const)\n\nexport const uploadProps = buildProps({\n  ...uploadBaseProps,\n  /**\n   * @description hook function before uploading with the file to be uploaded as its parameter. If `false` is returned or a `Promise` is returned and then is rejected, uploading will be aborted\n   */\n  beforeUpload: {\n    type: definePropType<UploadHooks['beforeUpload']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function before removing a file with the file and file list as its parameters. If `false` is returned or a `Promise` is returned and then is rejected, removing will be aborted\n   */\n  beforeRemove: {\n    type: definePropType<UploadHooks['beforeRemove']>(Function),\n  },\n  /**\n   * @description hook function when files are removed\n   */\n  onRemove: {\n    type: definePropType<UploadHooks['onRemove']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when select file or upload file success or upload file fail\n   */\n  onChange: {\n    type: definePropType<UploadHooks['onChange']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when clicking the uploaded files\n   */\n  onPreview: {\n    type: definePropType<UploadHooks['onPreview']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when uploaded successfully\n   */\n  onSuccess: {\n    type: definePropType<UploadHooks['onSuccess']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when some progress occurs\n   */\n  onProgress: {\n    type: definePropType<UploadHooks['onProgress']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when some errors occurs\n   */\n  onError: {\n    type: definePropType<UploadHooks['onError']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when limit is exceeded\n   */\n  onExceed: {\n    type: definePropType<UploadHooks['onExceed']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description set HTML attribute: crossorigin.\n   */\n  crossorigin: {\n    type: definePropType<'anonymous' | 'use-credentials' | ''>(String),\n  },\n} as const)\n\nexport type UploadProps = ExtractPropTypes<typeof uploadProps>\nexport type UploadPropsPublic = __ExtractPublicPropTypes<typeof uploadProps>\n\nexport type UploadInstance = InstanceType<typeof Upload> & unknown\n"],"names":["buildProps","definePropType","mutable","ajaxUpload","NOOP"],"mappings":"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"}
+{"version":3,"file":"upload.js","sources":["../../../../../../packages/components/upload/src/upload.vue"],"sourcesContent":["<template>\n  <div>\n    <upload-list\n      v-if=\"isPictureCard && showFileList\"\n      :disabled=\"disabled\"\n      :list-type=\"listType\"\n      :files=\"uploadFiles\"\n      :crossorigin=\"crossorigin\"\n      :handle-preview=\"onPreview\"\n      @remove=\"handleRemove\"\n    >\n      <template v-if=\"$slots.file\" #default=\"{ file, index }\">\n        <slot name=\"file\" :file=\"file\" :index=\"index\" />\n      </template>\n      <template #append>\n        <upload-content ref=\"uploadRef\" v-bind=\"uploadContentProps\">\n          <slot v-if=\"$slots.trigger\" name=\"trigger\" />\n          <slot v-if=\"!$slots.trigger && $slots.default\" />\n        </upload-content>\n      </template>\n    </upload-list>\n\n    <upload-content\n      v-if=\"!isPictureCard || (isPictureCard && !showFileList)\"\n      ref=\"uploadRef\"\n      v-bind=\"uploadContentProps\"\n    >\n      <slot v-if=\"$slots.trigger\" name=\"trigger\" />\n      <slot v-if=\"!$slots.trigger && $slots.default\" />\n    </upload-content>\n\n    <slot v-if=\"$slots.trigger\" />\n    <slot name=\"tip\" />\n    <upload-list\n      v-if=\"!isPictureCard && showFileList\"\n      :disabled=\"disabled\"\n      :list-type=\"listType\"\n      :files=\"uploadFiles\"\n      :crossorigin=\"crossorigin\"\n      :handle-preview=\"onPreview\"\n      @remove=\"handleRemove\"\n    >\n      <template v-if=\"$slots.file\" #default=\"{ file, index }\">\n        <slot name=\"file\" :file=\"file\" :index=\"index\" />\n      </template>\n    </upload-list>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, onBeforeUnmount, provide, shallowRef, toRef } from 'vue'\nimport { useFormDisabled } from '@element-plus/components/form'\nimport { uploadContextKey } from './constants'\nimport UploadList from './upload-list.vue'\nimport UploadContent from './upload-content.vue'\nimport { useHandlers } from './use-handlers'\nimport { uploadProps } from './upload'\n\nimport type {\n  UploadContentInstance,\n  UploadContentProps,\n} from './upload-content'\n\ndefineOptions({\n  name: 'ElUpload',\n})\n\nconst props = defineProps(uploadProps)\n\nconst disabled = useFormDisabled()\n\nconst uploadRef = shallowRef<UploadContentInstance>()\nconst {\n  abort,\n  submit,\n  clearFiles,\n  uploadFiles,\n  handleStart,\n  handleError,\n  handleRemove,\n  handleSuccess,\n  handleProgress,\n  revokeFileObjectURL,\n} = useHandlers(props, uploadRef)\n\nconst isPictureCard = computed(() => props.listType === 'picture-card')\n\nconst uploadContentProps = computed<UploadContentProps>(() => ({\n  ...props,\n  fileList: uploadFiles.value,\n  onStart: handleStart,\n  onProgress: handleProgress,\n  onSuccess: handleSuccess,\n  onError: handleError,\n  onRemove: handleRemove,\n}))\n\nonBeforeUnmount(() => {\n  uploadFiles.value.forEach(revokeFileObjectURL)\n})\n\nprovide(uploadContextKey, {\n  accept: toRef(props, 'accept'),\n})\n\ndefineExpose({\n  /** @description cancel upload request */\n  abort,\n  /** @description upload the file list manually */\n  submit,\n  /** @description clear the file list  */\n  clearFiles,\n  /** @description select the file manually */\n  handleStart,\n  /** @description remove the file manually */\n  handleRemove,\n})\n</script>\n"],"names":["useFormDisabled","shallowRef","useHandlers","computed","onBeforeUnmount","provide","uploadContextKey","toRef","_openBlock","_createElementBlock","_unref","_createBlock","UploadList"],"mappings":";;;;;;;;;;;;;uCA+Dc,CAAA;AAAA,EACZ,IAAM,EAAA,UAAA;AACR,CAAA,CAAA,CAAA;;;;;;AAIA,IAAA,MAAM,WAAWA,kCAAgB,EAAA,CAAA;AAEjC,IAAA,MAAM,YAAYC,cAAkC,EAAA,CAAA;AACpD,IAAM,MAAA;AAAA,MACJ,KAAA;AAAA,MACA,MAAA;AAAA,MACA,UAAA;AAAA,MACA,WAAA;AAAA,MACA,WAAA;AAAA,MACA,WAAA;AAAA,MACA,YAAA;AAAA,MACA,aAAA;AAAA,MACA,cAAA;AAAA,MACA,mBAAA;AAAA,KACF,GAAIC,uBAAY,CAAA,KAAA,EAAO,SAAS,CAAA,CAAA;AAEhC,IAAA,MAAM,aAAgB,GAAAC,YAAA,CAAS,MAAM,KAAA,CAAM,aAAa,cAAc,CAAA,CAAA;AAEtE,IAAM,MAAA,kBAAA,GAAqBA,aAA6B,OAAO;AAAA,MAC7D,GAAG,KAAA;AAAA,MACH,UAAU,WAAY,CAAA,KAAA;AAAA,MACtB,OAAS,EAAA,WAAA;AAAA,MACT,UAAY,EAAA,cAAA;AAAA,MACZ,SAAW,EAAA,aAAA;AAAA,MACX,OAAS,EAAA,WAAA;AAAA,MACT,QAAU,EAAA,YAAA;AAAA,KACV,CAAA,CAAA,CAAA;AAEF,IAAAC,mBAAA,CAAgB,MAAM;AACpB,MAAY,WAAA,CAAA,KAAA,CAAM,QAAQ,mBAAmB,CAAA,CAAA;AAAA,KAC9C,CAAA,CAAA;AAED,IAAAC,WAAA,CAAQC,0BAAkB,EAAA;AAAA,MACxB,MAAA,EAAQC,SAAM,CAAA,KAAA,EAAO,QAAQ,CAAA;AAAA,KAC9B,CAAA,CAAA;AAED,IAAa,MAAA,CAAA;AAAA,MAAA,KAAA;AAAA,MAEX,MAAA;AAAA,MAAA,UAAA;AAAA,MAEA,WAAA;AAAA,MAAA,YAAA;AAAA,KAEA,CAAA,CAAA;AAAA,IAAA,OAAA,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MAEA,OAAAC,aAAA,EAAA,EAAAC,sBAAA,CAAA,KAAA,EAAA,IAAA,EAAA;AAAA,QAAAC,SAAA,CAAA,aAAA,CAAA,IAAA,IAAA,CAAA,YAAA,IAAAF,aAAA,EAAA,EAAAG,eAAA,CAAAC,qBAAA,EAAA;AAAA,UAEA,GAAA,EAAA,CAAA;AAAA,UACD,QAAA,EAAAF,SAAA,CAAA,QAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}