@element-plus/nightly 0.0.20241227 → 0.0.20241228

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

@@ -2,204 +2,41 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var vue = require('vue');
-var lodashUnified = require('lodash-unified');
-var uploadDragger = require('./upload-dragger2.js');
-var uploadContent = require('./upload-content.js');
 var upload = require('./upload.js');
-var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
-var objects = require('../../../utils/objects.js');
-var index = require('../../../hooks/use-namespace/index.js');
-var useFormCommonProps = require('../../form/src/hooks/use-form-common-props.js');
+var runtime = require('../../../utils/vue/props/runtime.js');
 var shared = require('@vue/shared');
 
-const __default__ = vue.defineComponent({
-  name: "ElUploadContent",
-  inheritAttrs: false
-});
-const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...__default__,
-  props: uploadContent.uploadContentProps,
-  setup(__props, { expose }) {
-    const props = __props;
-    const ns = index.useNamespace("upload");
-    const disabled = useFormCommonProps.useFormDisabled();
-    const requests = vue.shallowRef({});
-    const inputRef = vue.shallowRef();
-    const uploadFiles = (files) => {
-      if (files.length === 0)
-        return;
-      const { autoUpload, limit, fileList, multiple, onStart, onExceed } = props;
-      if (limit && fileList.length + files.length > limit) {
-        onExceed(files, fileList);
-        return;
-      }
-      if (!multiple) {
-        files = files.slice(0, 1);
-      }
-      for (const file of files) {
-        const rawFile = file;
-        rawFile.uid = upload.genFileId();
-        onStart(rawFile);
-        if (autoUpload)
-          upload$1(rawFile);
-      }
-    };
-    const upload$1 = async (rawFile) => {
-      inputRef.value.value = "";
-      if (!props.beforeUpload) {
-        return doUpload(rawFile);
-      }
-      let hookResult;
-      let beforeData = {};
-      try {
-        const originData = props.data;
-        const beforeUploadPromise = props.beforeUpload(rawFile);
-        beforeData = shared.isPlainObject(props.data) ? lodashUnified.cloneDeep(props.data) : props.data;
-        hookResult = await beforeUploadPromise;
-        if (shared.isPlainObject(props.data) && lodashUnified.isEqual(originData, beforeData)) {
-          beforeData = lodashUnified.cloneDeep(props.data);
-        }
-      } catch (e) {
-        hookResult = false;
-      }
-      if (hookResult === false) {
-        props.onRemove(rawFile);
-        return;
-      }
-      let file = rawFile;
-      if (hookResult instanceof Blob) {
-        if (hookResult instanceof File) {
-          file = hookResult;
-        } else {
-          file = new File([hookResult], rawFile.name, {
-            type: rawFile.type
-          });
-        }
-      }
-      doUpload(Object.assign(file, {
-        uid: rawFile.uid
-      }), beforeData);
-    };
-    const resolveData = async (data, rawFile) => {
-      if (shared.isFunction(data)) {
-        return data(rawFile);
-      }
-      return data;
-    };
-    const doUpload = async (rawFile, beforeData) => {
-      const {
-        headers,
-        data,
-        method,
-        withCredentials,
-        name: filename,
-        action,
-        onProgress,
-        onSuccess,
-        onError,
-        httpRequest
-      } = props;
-      try {
-        beforeData = await resolveData(beforeData != null ? beforeData : data, rawFile);
-      } catch (e) {
-        props.onRemove(rawFile);
-        return;
-      }
-      const { uid } = rawFile;
-      const options = {
-        headers: headers || {},
-        withCredentials,
-        file: rawFile,
-        data: beforeData,
-        method,
-        filename,
-        action,
-        onProgress: (evt) => {
-          onProgress(evt, rawFile);
-        },
-        onSuccess: (res) => {
-          onSuccess(res, rawFile);
-          delete requests.value[uid];
-        },
-        onError: (err) => {
-          onError(err, rawFile);
-          delete requests.value[uid];
-        }
-      };
-      const request = httpRequest(options);
-      requests.value[uid] = request;
-      if (request instanceof Promise) {
-        request.then(options.onSuccess, options.onError);
-      }
-    };
-    const handleChange = (e) => {
-      const files = e.target.files;
-      if (!files)
-        return;
-      uploadFiles(Array.from(files));
-    };
-    const handleClick = () => {
-      if (!disabled.value) {
-        inputRef.value.value = "";
-        inputRef.value.click();
-      }
-    };
-    const handleKeydown = () => {
-      handleClick();
-    };
-    const abort = (file) => {
-      const _reqs = objects.entriesOf(requests.value).filter(file ? ([uid]) => String(file.uid) === uid : () => true);
-      _reqs.forEach(([uid, req]) => {
-        if (req instanceof XMLHttpRequest)
-          req.abort();
-        delete requests.value[uid];
-      });
-    };
-    expose({
-      abort,
-      upload: upload$1
-    });
-    return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", {
-        class: vue.normalizeClass([
-          vue.unref(ns).b(),
-          vue.unref(ns).m(_ctx.listType),
-          vue.unref(ns).is("drag", _ctx.drag),
-          vue.unref(ns).is("disabled", vue.unref(disabled))
-        ]),
-        tabindex: vue.unref(disabled) ? "-1" : "0",
-        onClick: handleClick,
-        onKeydown: vue.withKeys(vue.withModifiers(handleKeydown, ["self"]), ["enter", "space"])
-      }, [
-        _ctx.drag ? (vue.openBlock(), vue.createBlock(uploadDragger["default"], {
-          key: 0,
-          disabled: vue.unref(disabled),
-          onFile: uploadFiles
-        }, {
-          default: vue.withCtx(() => [
-            vue.renderSlot(_ctx.$slots, "default")
-          ]),
-          _: 3
-        }, 8, ["disabled"])) : vue.renderSlot(_ctx.$slots, "default", { key: 1 }),
-        vue.createElementVNode("input", {
-          ref_key: "inputRef",
-          ref: inputRef,
-          class: vue.normalizeClass(vue.unref(ns).e("input")),
-          name: _ctx.name,
-          disabled: vue.unref(disabled),
-          multiple: _ctx.multiple,
-          accept: _ctx.accept,
-          type: "file",
-          onChange: handleChange,
-          onClick: vue.withModifiers(() => {
-          }, ["stop"])
-        }, null, 42, ["name", "disabled", "multiple", "accept", "onClick"])
-      ], 42, ["tabindex", "onKeydown"]);
-    };
+const uploadContentProps = runtime.buildProps({
+  ...upload.uploadBaseProps,
+  beforeUpload: {
+    type: runtime.definePropType(Function),
+    default: shared.NOOP
+  },
+  onRemove: {
+    type: runtime.definePropType(Function),
+    default: shared.NOOP
+  },
+  onStart: {
+    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
   }
 });
-var UploadContent = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "upload-content.vue"]]);
 
-exports["default"] = UploadContent;
+exports.uploadContentProps = uploadContentProps;
 //# sourceMappingURL=upload-content2.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"upload-content2.js","sources":["../../../../../../packages/components/upload/src/upload-content.vue"],"sourcesContent":["<template>\n  <div\n    :class=\"[\n      ns.b(),\n      ns.m(listType),\n      ns.is('drag', drag),\n      ns.is('disabled', disabled),\n    ]\"\n    :tabindex=\"disabled ? '-1' : '0'\"\n    @click=\"handleClick\"\n    @keydown.self.enter.space=\"handleKeydown\"\n  >\n    <template v-if=\"drag\">\n      <upload-dragger :disabled=\"disabled\" @file=\"uploadFiles\">\n        <slot />\n      </upload-dragger>\n    </template>\n    <template v-else>\n      <slot />\n    </template>\n    <input\n      ref=\"inputRef\"\n      :class=\"ns.e('input')\"\n      :name=\"name\"\n      :disabled=\"disabled\"\n      :multiple=\"multiple\"\n      :accept=\"accept\"\n      type=\"file\"\n      @change=\"handleChange\"\n      @click.stop\n    />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { shallowRef } from 'vue'\nimport { cloneDeep, isEqual } from 'lodash-unified'\nimport { entriesOf, isFunction, isPlainObject } from '@element-plus/utils'\nimport { useNamespace } from '@element-plus/hooks'\nimport { useFormDisabled } from '@element-plus/components/form'\nimport UploadDragger from './upload-dragger.vue'\nimport { uploadContentProps } from './upload-content'\nimport { genFileId } from './upload'\nimport type { UploadContentProps } from './upload-content'\n\nimport type {\n  UploadFile,\n  UploadHooks,\n  UploadRawFile,\n  UploadRequestOptions,\n} from './upload'\n\ndefineOptions({\n  name: 'ElUploadContent',\n  inheritAttrs: false,\n})\n\nconst props = defineProps(uploadContentProps)\nconst ns = useNamespace('upload')\nconst disabled = useFormDisabled()\n\nconst requests = shallowRef<Record<string, XMLHttpRequest | Promise<unknown>>>(\n  {}\n)\nconst inputRef = shallowRef<HTMLInputElement>()\n\nconst uploadFiles = (files: File[]) => {\n  if (files.length === 0) return\n\n  const { autoUpload, limit, fileList, multiple, onStart, onExceed } = props\n\n  if (limit && fileList.length + files.length > limit) {\n    onExceed(files, fileList)\n    return\n  }\n\n  if (!multiple) {\n    files = files.slice(0, 1)\n  }\n\n  for (const file of files) {\n    const rawFile = file as UploadRawFile\n    rawFile.uid = genFileId()\n    onStart(rawFile)\n    if (autoUpload) upload(rawFile)\n  }\n}\n\nconst upload = async (rawFile: UploadRawFile): Promise<void> => {\n  inputRef.value!.value = ''\n\n  if (!props.beforeUpload) {\n    return doUpload(rawFile)\n  }\n\n  let hookResult: Exclude<ReturnType<UploadHooks['beforeUpload']>, Promise<any>>\n  let beforeData: UploadContentProps['data'] = {}\n\n  try {\n    // origin data: Handle data changes after synchronization tasks are executed\n    const originData = props.data\n    const beforeUploadPromise = props.beforeUpload(rawFile)\n    beforeData = isPlainObject(props.data) ? cloneDeep(props.data) : props.data\n    hookResult = await beforeUploadPromise\n    if (isPlainObject(props.data) && isEqual(originData, beforeData)) {\n      beforeData = cloneDeep(props.data)\n    }\n  } catch {\n    hookResult = false\n  }\n\n  if (hookResult === false) {\n    props.onRemove(rawFile)\n    return\n  }\n\n  let file: File = rawFile\n  if (hookResult instanceof Blob) {\n    if (hookResult instanceof File) {\n      file = hookResult\n    } else {\n      file = new File([hookResult], rawFile.name, {\n        type: rawFile.type,\n      })\n    }\n  }\n\n  doUpload(\n    Object.assign(file, {\n      uid: rawFile.uid,\n    }),\n    beforeData\n  )\n}\n\nconst resolveData = async (\n  data: UploadContentProps['data'],\n  rawFile: UploadRawFile\n): Promise<Record<string, any>> => {\n  if (isFunction(data)) {\n    return data(rawFile)\n  }\n\n  return data\n}\n\nconst doUpload = async (\n  rawFile: UploadRawFile,\n  beforeData?: UploadContentProps['data']\n) => {\n  const {\n    headers,\n    data,\n    method,\n    withCredentials,\n    name: filename,\n    action,\n    onProgress,\n    onSuccess,\n    onError,\n    httpRequest,\n  } = props\n\n  try {\n    beforeData = await resolveData(beforeData ?? data, rawFile)\n  } catch {\n    props.onRemove(rawFile)\n    return\n  }\n\n  const { uid } = rawFile\n  const options: UploadRequestOptions = {\n    headers: headers || {},\n    withCredentials,\n    file: rawFile,\n    data: beforeData,\n    method,\n    filename,\n    action,\n    onProgress: (evt) => {\n      onProgress(evt, rawFile)\n    },\n    onSuccess: (res) => {\n      onSuccess(res, rawFile)\n      delete requests.value[uid]\n    },\n    onError: (err) => {\n      onError(err, rawFile)\n      delete requests.value[uid]\n    },\n  }\n  const request = httpRequest(options)\n  requests.value[uid] = request\n  if (request instanceof Promise) {\n    request.then(options.onSuccess, options.onError)\n  }\n}\n\nconst handleChange = (e: Event) => {\n  const files = (e.target as HTMLInputElement).files\n  if (!files) return\n  uploadFiles(Array.from(files))\n}\n\nconst handleClick = () => {\n  if (!disabled.value) {\n    inputRef.value!.value = ''\n    inputRef.value!.click()\n  }\n}\n\nconst handleKeydown = () => {\n  handleClick()\n}\n\nconst abort = (file?: UploadFile) => {\n  const _reqs = entriesOf(requests.value).filter(\n    file ? ([uid]) => String(file.uid) === uid : () => true\n  )\n  _reqs.forEach(([uid, req]) => {\n    if (req instanceof XMLHttpRequest) req.abort()\n    delete requests.value[uid]\n  })\n}\n\ndefineExpose({\n  abort,\n  upload,\n})\n</script>\n"],"names":["useNamespace","useFormDisabled","shallowRef","genFileId","upload","isPlainObject","cloneDeep","isEqual","isFunction","entriesOf","_openBlock","_createElementBlock","_normalizeClass"],"mappings":"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"}
+{"version":3,"file":"upload-content2.js","sources":["../../../../../../packages/components/upload/src/upload-content.ts"],"sourcesContent":["import { NOOP, buildProps, definePropType } from '@element-plus/utils'\nimport { uploadBaseProps } from './upload'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type {\n  UploadFile,\n  UploadHooks,\n  UploadProgressEvent,\n  UploadRawFile,\n} from './upload'\nimport type UploadContent from './upload-content.vue'\nimport type { UploadAjaxError } from './ajax'\n\nexport const uploadContentProps = buildProps({\n  ...uploadBaseProps,\n\n  beforeUpload: {\n    type: definePropType<UploadHooks['beforeUpload']>(Function),\n    default: NOOP,\n  },\n  onRemove: {\n    type: definePropType<\n      (file: UploadFile | UploadRawFile, rawFile?: UploadRawFile) => void\n    >(Function),\n    default: NOOP,\n  },\n  onStart: {\n    type: definePropType<(rawFile: UploadRawFile) => void>(Function),\n    default: NOOP,\n  },\n  onSuccess: {\n    type: definePropType<(response: any, rawFile: UploadRawFile) => unknown>(\n      Function\n    ),\n    default: NOOP,\n  },\n  onProgress: {\n    type: definePropType<\n      (evt: UploadProgressEvent, rawFile: UploadRawFile) => void\n    >(Function),\n    default: NOOP,\n  },\n  onError: {\n    type: definePropType<\n      (err: UploadAjaxError, rawFile: UploadRawFile) => void\n    >(Function),\n    default: NOOP,\n  },\n  onExceed: {\n    type: definePropType<UploadHooks['onExceed']>(Function),\n    default: NOOP,\n  },\n} as const)\n\nexport type UploadContentProps = ExtractPropTypes<typeof uploadContentProps>\n\nexport type UploadContentInstance = InstanceType<typeof UploadContent>\n"],"names":["buildProps","uploadBaseProps","definePropType","NOOP"],"mappings":";;;;;;;;AAEY,MAAC,kBAAkB,GAAGA,kBAAU,CAAC;AAC7C,EAAE,GAAGC,sBAAe;AACpB,EAAE,YAAY,EAAE;AAChB,IAAI,IAAI,EAAEC,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAED,sBAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAEC,WAAI;AACjB,GAAG;AACH,CAAC;;;;"}

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

@@ -2,37 +2,181 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var upload = require('./upload.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 index$2 = require('../../icon/index.js');
+var iconsVue = require('@element-plus/icons-vue');
+var index$3 = require('../../progress/index.js');
+var uploadList = require('./upload-list2.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');
 
-const uploadListProps = runtime.buildProps({
-  files: {
-    type: runtime.definePropType(Array),
-    default: () => typescript.mutable([])
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  handlePreview: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  listType: {
-    type: String,
-    values: upload.uploadListTypes,
-    default: "text"
-  },
-  crossorigin: {
-    type: runtime.definePropType(String)
+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 uploadListEmits = {
-  remove: (file) => !!file
-};
+var UploadList = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "upload-list.vue"]]);
 
-exports.uploadListEmits = uploadListEmits;
-exports.uploadListProps = uploadListProps;
+exports["default"] = UploadList;
 //# sourceMappingURL=upload-list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"upload-list.js","sources":["../../../../../../packages/components/upload/src/upload-list.ts"],"sourcesContent":["import { NOOP, 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  /**\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 const uploadListEmits = {\n  remove: (file: UploadFile) => !!file,\n}\nexport type UploadListEmits = typeof uploadListEmits\nexport type UploadListInstance = InstanceType<typeof UploadList>\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;AACZ,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,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;;;;;"}
+{"version":3,"file":"upload-list.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<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'\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')\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":";;;;;;;;;;;;;;uCA4Hc,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}