npm - qidian-vue-ui - Versions diffs - 2.0.53 → 2.0.55 - Mend

qidian-vue-ui 2.0.53 → 2.0.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/components/upload/file-flow-file-list-display/index.css CHANGED Viewed

@@ -1,4 +1,4 @@
-.qd-upload__flow-table-wrapper[data-v-ed2255b0] {
+.qd-upload__flow-table-wrapper[data-v-27becaca] {
   max-width: 100%;
   overflow-x: auto;
 }

package/dist/components/upload/file-flow-file-list-display/index.vue.mjs CHANGED Viewed

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdUploadFileFlowFileListDisplay = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ed2255b0"]]);
+const QdUploadFileFlowFileListDisplay = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-27becaca"]]);
 export {
   QdUploadFileFlowFileListDisplay as default
 };

package/dist/components/upload/file-flow-file-list-display/index.vue2.mjs CHANGED Viewed

@@ -126,7 +126,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, toDisplayString(getStatusText(file)), 3)
                   ])
                 ]),
-                !__props.disabled && (!__props.isBatchUpload || !allSuccess.value || index === 0) ? (openBlock(), createElementBlock("td", {
+                !__props.disabled && file.status !== "progress" && (!__props.isBatchUpload || !allSuccess.value || index === 0) ? (openBlock(), createElementBlock("td", {
                   key: 0,
                   rowspan: __props.isBatchUpload && allSuccess.value ? __props.files.length : void 0
                 }, [

package/dist/components/upload/image-flow-file-list-display/index.vue.mjs CHANGED Viewed

@@ -113,7 +113,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         onRemove: props.onRemove,
                         disabled: __props.disabled
                       }),
-                      !__props.disabled ? (openBlock(), createElementBlock("span", {
+                      !__props.disabled && file.status !== "progress" ? (openBlock(), createElementBlock("span", {
                         key: 1,
                         class: "t-upload__card-mask-item t-upload__delete",
                         onClick: _cache[1] || (_cache[1] = withModifiers(() => {

package/dist/components/upload/index.css CHANGED Viewed

@@ -1,100 +1,139 @@
-.qd-upload[data-v-44d65bb1] {
+.qd-upload[data-v-4684f8e9] {
   width: 100%;
   outline: none;
 }
-.qd-upload[data-v-44d65bb1] .t-image-viewer__trigger {
+.qd-upload[data-v-4684f8e9] .t-image-viewer__trigger {
   display: none;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__dragger {
+.qd-upload[data-v-4684f8e9] .t-upload__dragger {
   min-width: auto;
   min-height: 144px;
   width: 100%;
   height: 100%;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__dragger-btns > .t-size-s {
+.qd-upload[data-v-4684f8e9] .t-upload__dragger-btns > .t-size-s {
   display: inline-flex;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__flow {
+.qd-upload[data-v-4684f8e9] .t-upload__flow {
   width: 100%;
   min-width: auto;
   max-width: 100%;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__flow-empty {
+.qd-upload[data-v-4684f8e9] .t-upload__flow-empty {
   height: auto;
   min-height: 144px;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__flow-card-area,
-.qd-upload[data-v-44d65bb1] .t-upload__flow-table {
+.qd-upload[data-v-4684f8e9] .t-upload__flow-card-area,
+.qd-upload[data-v-4684f8e9] .t-upload__flow-table {
   margin-top: var(--td-comp-margin-s);
 }
-.qd-upload[data-v-44d65bb1] .t-upload__file-name__container {
+.qd-upload[data-v-4684f8e9] .t-upload__file-name__container {
   display: flex;
   align-items: center;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__file-name-text {
+.qd-upload[data-v-4684f8e9] .t-upload__file-name-text {
   cursor: pointer;
 }
-.qd-upload[data-v-44d65bb1] .t-upload__file-thumbnail {
+.qd-upload[data-v-4684f8e9] .t-upload__file-thumbnail {
   width: var(--td-comp-size-m);
   height: var(--td-comp-size-m);
 }
-.qd-upload[data-v-44d65bb1] .t-upload__card-image {
+.qd-upload[data-v-4684f8e9] .t-upload__card-image {
   width: 100%;
   height: 100%;
 }
-.qd-upload__popup-upload[data-v-44d65bb1] .t-image-viewer__trigger {
+.qd-upload__popup-upload[data-v-4684f8e9] .t-image-viewer__trigger {
   display: none;
 }
-.qd-upload__popup-upload[data-v-44d65bb1] .t-upload__flow-table {
+.qd-upload__popup-upload[data-v-4684f8e9] .t-upload__flow-table {
   margin-top: 0;
 }
-.qd-upload__popup-upload[data-v-44d65bb1] .t-upload__file-name__container {
+.qd-upload__popup-upload[data-v-4684f8e9] .t-upload__file-name__container {
   display: flex;
   align-items: center;
 }
-.qd-upload__popup-upload[data-v-44d65bb1] .t-upload__file-name-text {
+.qd-upload__popup-upload[data-v-4684f8e9] .t-upload__file-name-text {
   cursor: pointer;
 }
-.qd-upload__popup-upload[data-v-44d65bb1] .t-upload__file-thumbnail {
+.qd-upload__popup-upload[data-v-4684f8e9] .t-upload__file-thumbnail {
   width: var(--td-comp-size-m);
   height: var(--td-comp-size-m);
 }
-.qd-upload__popup-upload[data-v-44d65bb1] .t-upload__card-image {
+.qd-upload__popup-upload[data-v-4684f8e9] .t-upload__card-image {
   width: 100%;
   height: 100%;
 }
-.qd-upload__popup-upload--disabled[data-v-44d65bb1] .t-upload__flow-table th:last-child,
-.qd-upload__popup-upload--disabled[data-v-44d65bb1] .t-upload__flow-table td:last-child {
+.qd-upload__popup-upload--disabled[data-v-4684f8e9] .t-upload__flow-table th:last-child,
+.qd-upload__popup-upload--disabled[data-v-4684f8e9] .t-upload__flow-table td:last-child {
   display: none;
 }
-.qd-upload[data-v-44d65bb1]:focus .t-upload__flow-card-area,
-.qd-upload[data-v-44d65bb1]:focus .t-upload__flow-table {
+.qd-upload__popup-actions[data-v-4684f8e9] {
+  display: inline-flex;
+}
+.qd-upload__popup-drag-text[data-v-4684f8e9] {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  color: var(--td-text-color-placeholder);
+}
+.qd-upload[data-v-4684f8e9]:focus .t-upload__flow-card-area,
+.qd-upload[data-v-4684f8e9]:focus .t-upload__flow-table {
   border-color: var(--td-brand-color);
 }
-.qd-upload--only-view[data-v-44d65bb1] .t-upload__flow-empty,
-.qd-upload--only-view[data-v-44d65bb1] .t-upload__card-mask-item-divider {
+.qd-upload--btn-image-popup[data-v-4684f8e9],
+.qd-upload--btn-file-popup[data-v-4684f8e9] {
+  padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s);
+  border: 1px dashed var(--td-component-border);
+  transition: border 0.2s linear;
+}
+.qd-upload--btn-image-popup[data-v-4684f8e9] .t-upload__dragger,
+.qd-upload--btn-file-popup[data-v-4684f8e9] .t-upload__dragger {
+  min-height: auto;
+  padding: 0;
+  border: 0;
+  overflow: visible;
+  justify-content: flex-start;
+  align-items: flex-start;
+  cursor: default;
+}
+.qd-upload--btn-image-popup[data-v-4684f8e9] .t-upload__dragger > .t-upload__trigger,
+.qd-upload--btn-file-popup[data-v-4684f8e9] .t-upload__dragger > .t-upload__trigger {
+  width: 100%;
+  height: 100%;
+}
+.qd-upload--btn-image-popup[data-v-4684f8e9]:focus-within,
+.qd-upload--btn-file-popup[data-v-4684f8e9]:focus-within {
+  border-color: var(--td-brand-color);
+}
+.qd-upload--only-view[data-v-4684f8e9] .t-upload__flow-empty,
+.qd-upload--only-view[data-v-4684f8e9] .t-upload__card-mask-item-divider {
   display: none;
 }
-.qd-upload--only-view[data-v-44d65bb1] .t-upload__flow-card-area {
+.qd-upload--only-view[data-v-4684f8e9] .t-upload__flow-card-area {
   border-color: var(--td-component-border);
 }
-.qd-upload--only-view[data-v-44d65bb1]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-op,
-.qd-upload--only-view[data-v-44d65bb1]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__trigger,
-.qd-upload--only-view[data-v-44d65bb1]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-bottom {
+.qd-upload--only-view[data-v-4684f8e9]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-op,
+.qd-upload--only-view[data-v-4684f8e9]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__trigger,
+.qd-upload--only-view[data-v-4684f8e9]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-bottom {
   display: none;
 }
-.qd-upload--only-view[data-v-44d65bb1]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-table,
-.qd-upload--only-view[data-v-44d65bb1]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-card-area {
+.qd-upload--only-view[data-v-4684f8e9]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-table,
+.qd-upload--only-view[data-v-4684f8e9]:not(.qd-upload--btn-image-popup):not(.qd-upload--btn-file-popup) .t-upload__flow-card-area {
   margin-top: 0;
 }
-.qd-upload--hide-manual-upload[data-v-44d65bb1] .t-upload__flow-bottom {
+.qd-upload--uploading[data-v-4684f8e9] .t-upload__single-input-clear {
+  display: none;
+}
+.qd-upload--hide-manual-upload[data-v-4684f8e9] .t-upload__flow-bottom {
   display: none;
   margin-top: 0;
 }
-.qd-upload--hide-progress[data-v-44d65bb1] .t-upload__flow-table th:last-child,
-.qd-upload--hide-progress[data-v-44d65bb1] .t-upload__flow-table td:last-child {
+.qd-upload--hide-progress[data-v-4684f8e9] .t-upload__flow-table th:last-child,
+.qd-upload--hide-progress[data-v-4684f8e9] .t-upload__flow-table td:last-child {
   display: none;
 }
-.qd-upload--disabled[data-v-44d65bb1] .t-upload__flow-card-area {
+.qd-upload--disabled[data-v-4684f8e9] .t-upload__flow-card-area {
   border-color: var(--td-component-border);
 }

package/dist/components/upload/index.vue.mjs CHANGED Viewed

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.mjs";
-const QdUpload = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-44d65bb1"]]);
+const QdUpload = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4684f8e9"]]);
 export {
   QdUpload as default
 };

package/dist/components/upload/index.vue2.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 import './index.css'
-import { defineComponent, mergeDefaults, getCurrentInstance, ref, computed, inject, useTemplateRef, watch, nextTick, onMounted, onUnmounted, createBlock, openBlock, unref, mergeProps, createSlots, withCtx, createCommentVNode, createTextVNode, toDisplayString, createVNode, withModifiers, normalizeClass, createElementVNode, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, mergeDefaults, getCurrentInstance, ref, computed, inject, useTemplateRef, watch, nextTick, onMounted, onUnmounted, createBlock, openBlock, unref, mergeProps, createSlots, withCtx, renderList, renderSlot, createElementBlock, createCommentVNode, createTextVNode, toDisplayString, createVNode, withModifiers, normalizeClass, createElementVNode, normalizeProps, guardReactiveProps } from "vue";
 import { useVModel } from "../../node_modules/.pnpm/@vueuse_core@14.2.0_vue@3.5.26_typescript@5.9.3_/node_modules/@vueuse/core/dist/index.mjs";
 import dayjs from "../../_virtual/dayjs.min.mjs";
 import { isEmpty, useTimer, easyCopy, checkSameObject, abortWrapper, to, filterSlots, isTypeByName, suspectedWrapperPromise } from "qidian-shared";
@@ -20,6 +20,10 @@ import _sfc_main$3 from "./image-flow-file-list-display/index.vue.mjs";
 import { useReadonly } from "../../hooks/useReadonly.mjs";
 import { useDisabled } from "../../hooks/useDisabled.mjs";
 import { useModal } from "../../hooks/useModal.mjs";
+const _hoisted_1 = {
+  key: 1,
+  class: "qd-upload__popup-drag-text"
+};
 const tempOssIdPrefix = "__qd_upload_temp_";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
@@ -144,14 +148,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let isSyncingUploadModelValue = false;
     let isSyncingFiles = false;
     const tempUrlMap = /* @__PURE__ */ new WeakMap();
+    const removedUploadingFileValues = /* @__PURE__ */ new Set();
     const tempModelValueSet = /* @__PURE__ */ new Set();
     const ossListAbortReason = /* @__PURE__ */ Symbol("abort");
     let ossListAbort;
     const delList = ref([]);
+    const isUploading = computed(() => getDisplayFiles().some((file) => file.status === "progress"));
     const popupFileList = computed({
-      get: () => [...fileList.value],
+      get: () => [...getDisplayFiles()],
       set: (files) => {
-        fileList.value = files;
+        if (!props.autoUpload) {
+          fileList.value = files;
+          return;
+        }
+        const waitingFiles = waitingUploadFiles.value;
+        fileList.value = files.filter((file) => !waitingFiles.includes(file));
+        waitingUploadFiles.value = waitingFiles.filter((file) => files.includes(file));
       }
     });
     const popupVisible = ref(false);
@@ -202,6 +214,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...uploadOptions
       } = props;
       const globalUploadPropsV = globalUploadProps.value;
+      const uploadDisabled = onlyView || tdDisabled.value || tdReadonly.value;
+      const popupTheme = isPopupTheme(theme);
       const reAction = action || globalUploadPropsV?.action;
       const actionUrl = typeof reAction === "string" ? reAction : reAction?.(bucketConfigKey);
       const useUploadTimeout = timeout === void 0 || timeout > 0;
@@ -307,11 +321,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       };
       const reOnSuccess = (context) => {
+        const nextFileList = fileList.value.filter((file) => {
+          const fileValue = file.response?.[reProps.value.valueMode];
+          return typeof fileValue !== "string" || !removedUploadingFileValues.has(fileValue);
+        });
+        if (nextFileList.length !== fileList.value.length) fileList.value = nextFileList;
         onSuccess?.(context);
         revokeTempUrl(context.file);
         updateTempModelValue(fileList.value);
       };
       const reOnRemove = (context) => {
+        const fileValue = context.file?.response?.[reProps.value.valueMode];
+        if (isUploading.value && typeof fileValue === "string") {
+          removedUploadingFileValues.add(fileValue);
+        }
         onRemove?.(context);
         revokeTempUrl(context.file);
         const { ossId } = context.file?.response || {};
@@ -348,7 +371,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         sizeLimit: reSizeLimit,
         accept: acceptStr,
         multiple: multiple ?? props.max !== 1,
-        disabled: onlyView ? true : tdDisabled.value || tdReadonly.value,
+        disabled: uploadDisabled,
         beforeUpload: reBeforeUpload,
         onValidate: reOnValidate,
         formatResponse: useRequestMethod ? void 0 : reFormatResponse,
@@ -360,7 +383,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         showImageFileName: onlyView ? false : showImageFileName,
         showUploadProgress: onlyView ? false : showUploadProgress,
         showThumbnail: onlyView ? true : showThumbnail,
-        draggable: onlyView ? false : draggable
+        draggable: uploadDisabled ? false : popupTheme ? draggable ?? true : draggable
       };
       if (globalUploadPropsV) {
         const excludeKeys = ["action", "listOssByIds", "listOssByUrls", "del"];
@@ -407,6 +430,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     const expose = {};
+    function isPopupTheme(theme) {
+      return theme === "btn-file-popup" || theme === "btn-image-popup";
+    }
+    function handlePopupClickCapture(event) {
+      if (!isPopupTheme(props.theme)) return;
+      const target = event.target;
+      if (target instanceof Element && target.closest(".qd-upload__popup-upload-action, .qd-upload__popup-view-action")) {
+        return;
+      }
+      event.stopPropagation();
+    }
     const uploadFiles = (options) => {
       const currentUploadFiles = options?.files ?? (props.autoUpload ? waitingUploadFiles.value : fileList.value);
       currentUploadFiles.forEach((file) => {
@@ -582,6 +616,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function clear() {
       revokeAllTempUrls();
+      removedUploadingFileValues.clear();
       reModelValue.value = [];
       fileList.value = [];
       waitingUploadFiles.value = [];
@@ -693,6 +728,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         class: [
           "qd-upload",
           `qd-upload--${reProps.value.theme}`,
+          isUploading.value ? "qd-upload--uploading" : "",
           reProps.value.onlyView ? "qd-upload--only-view" : "",
           !reProps.value.uploadOptions.showUploadProgress && reProps.value.onlyView ? "qd-upload--hide-progress" : "",
           !reProps.value.uploadOptions.autoUpload && reProps.value.showManualButton ? "" : "qd-upload--hide-manual-upload",
@@ -701,127 +737,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         files: fileList.value,
         "onUpdate:files": _cache[3] || (_cache[3] = ($event) => fileList.value = $event),
         tabindex: reProps.value.onlyView || reProps.value.uploadOptions.disabled ? "" : "0"
-      }, reProps.value.uploadOptions), createSlots({
-        default: withCtx(() => [
-          ["btn-file-popup", "btn-image-popup"].includes(__props.theme) ? (openBlock(), createBlock(unref(Space), {
-            key: 0,
-            align: "center",
-            size: "small"
-          }, {
-            default: withCtx(() => [
-              !reProps.value.onlyView ? (openBlock(), createBlock(unref(Button), {
-                key: 0,
-                variant: "outline",
-                disabled: reProps.value.uploadOptions.disabled
-              }, {
-                icon: withCtx(() => [
-                  createVNode(unref(UploadIcon))
-                ]),
-                default: withCtx(() => [
-                  createTextVNode(" " + toDisplayString(autoTriggerUploadText.value), 1)
-                ]),
-                _: 1
-              }, 8, ["disabled"])) : createCommentVNode("", true),
-              fileList.value.length ? (openBlock(), createBlock(unref(Popup), {
-                key: 1,
-                visible: popupVisible.value,
-                "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => popupVisible.value = $event),
-                "show-arrow": "",
-                trigger: "click"
-              }, {
-                content: withCtx(() => [
-                  createVNode(unref(Upload), {
-                    class: normalizeClass([
-                      "qd-upload__popup-upload",
-                      reProps.value.uploadOptions.disabled ? "qd-upload__popup-upload--disabled" : ""
-                    ]),
-                    files: popupFileList.value,
-                    "onUpdate:files": _cache[1] || (_cache[1] = ($event) => popupFileList.value = $event),
-                    theme: popupUploadTheme.value,
-                    multiple: reProps.value.uploadOptions.multiple,
-                    disabled: reProps.value.uploadOptions.disabled,
-                    "on-remove": reProps.value.handlePopupRemove,
-                    "on-preview": reProps.value.uploadOptions.onPreview,
-                    "show-thumbnail": reProps.value.uploadOptions.showThumbnail,
-                    "show-image-file-name": reProps.value.uploadOptions.showImageFileName,
-                    "show-upload-progress": reProps.value.uploadOptions.showUploadProgress
-                  }, {
-                    trigger: withCtx(() => [..._cache[4] || (_cache[4] = [
-                      createElementVNode("span", { style: { "display": "none" } }, null, -1)
-                    ])]),
-                    "file-list-display": withCtx(({
-                      files,
-                      locale,
-                      onPreview,
-                      onRemove,
-                      dragEvents,
-                      triggerUpload
-                    }) => [
-                      popupUploadTheme.value === "image" ? (openBlock(), createBlock(unref(_sfc_main$1), {
-                        key: 0,
-                        locale,
-                        files,
-                        "show-upload-progress": reProps.value.uploadOptions.showUploadProgress,
-                        "show-image-file-name": reProps.value.uploadOptions.showImageFileName,
-                        "abridge-name": reProps.value.uploadOptions.abridgeName,
-                        disabled: reProps.value.uploadOptions.disabled,
-                        max: reProps.value.uploadOptions.max,
-                        multiple: reProps.value.uploadOptions.multiple,
-                        trigger: false,
-                        "trigger-upload": triggerUpload,
-                        "on-preview": onPreview,
-                        "on-remove": onRemove
-                      }, null, 8, ["locale", "files", "show-upload-progress", "show-image-file-name", "abridge-name", "disabled", "max", "multiple", "trigger-upload", "on-preview", "on-remove"])) : (openBlock(), createBlock(unref(QdUploadFileFlowFileListDisplay), {
-                        key: 1,
-                        locale,
-                        files,
-                        "show-thumbnail": reProps.value.uploadOptions.showThumbnail,
-                        "show-upload-progress": reProps.value.uploadOptions.showUploadProgress,
-                        "abridge-name": reProps.value.uploadOptions.abridgeName,
-                        "is-batch-upload": reProps.value.uploadOptions.isBatchUpload,
-                        disabled: reProps.value.uploadOptions.disabled,
-                        "drag-events": dragEvents,
-                        "on-preview": onPreview,
-                        "on-remove": onRemove
-                      }, null, 8, ["locale", "files", "show-thumbnail", "show-upload-progress", "abridge-name", "is-batch-upload", "disabled", "drag-events", "on-preview", "on-remove"])),
-                      createVNode(unref(_sfc_main$2), {
-                        ref: "multiFileViewer",
-                        files: viewerFiles.value
-                      }, null, 8, ["files"])
-                    ]),
-                    _: 1
-                  }, 8, ["class", "files", "theme", "multiple", "disabled", "on-remove", "on-preview", "show-thumbnail", "show-image-file-name", "show-upload-progress"])
-                ]),
-                default: withCtx(() => [
-                  createVNode(unref(Badge), {
-                    count: fileList.value.length,
-                    size: "small",
-                    offset: [2, 2],
-                    onClick: _cache[0] || (_cache[0] = withModifiers(() => {
-                    }, ["stop"]))
-                  }, {
-                    default: withCtx(() => [
-                      createVNode(unref(Button), { variant: "outline" }, {
-                        icon: withCtx(() => [
-                          createVNode(unref(BrowseIcon))
-                        ]),
-                        default: withCtx(() => [
-                          createTextVNode(" " + toDisplayString(unref(t)("viewFileText")), 1)
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  }, 8, ["count"])
-                ]),
-                _: 1
-              }, 8, ["visible"])) : createCommentVNode("", true)
-            ]),
-            _: 1
-          })) : createCommentVNode("", true)
-        ]),
-        _: 2
-      }, [
+      }, reProps.value.uploadOptions, { onClickCapture: handlePopupClickCapture }), createSlots({ _: 2 }, [
         _ctx.$slots.trigger ? {
           name: "trigger",
           fn: withCtx((slotProps) => [
@@ -832,6 +748,131 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           key: "0"
         } : void 0,
+        isPopupTheme(__props.theme) ? {
+          name: "default",
+          fn: withCtx(({ dragActive }) => [
+            !dragActive ? (openBlock(), createBlock(unref(Space), {
+              key: 0,
+              class: "qd-upload__popup-actions",
+              align: "center",
+              size: "small"
+            }, {
+              default: withCtx(() => [
+                !reProps.value.onlyView ? (openBlock(), createBlock(unref(Button), {
+                  key: 0,
+                  class: "qd-upload__popup-upload-action",
+                  variant: "outline",
+                  disabled: reProps.value.uploadOptions.disabled
+                }, {
+                  icon: withCtx(() => [
+                    createVNode(unref(UploadIcon))
+                  ]),
+                  default: withCtx(() => [
+                    createTextVNode(" " + toDisplayString(autoTriggerUploadText.value), 1)
+                  ]),
+                  _: 1
+                }, 8, ["disabled"])) : createCommentVNode("", true),
+                popupFileList.value.length ? (openBlock(), createBlock(unref(Popup), {
+                  key: 1,
+                  visible: popupVisible.value,
+                  "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => popupVisible.value = $event),
+                  "show-arrow": "",
+                  trigger: "click"
+                }, {
+                  content: withCtx(() => [
+                    createVNode(unref(Upload), {
+                      class: normalizeClass([
+                        "qd-upload__popup-upload",
+                        reProps.value.uploadOptions.disabled ? "qd-upload__popup-upload--disabled" : ""
+                      ]),
+                      files: popupFileList.value,
+                      "onUpdate:files": _cache[1] || (_cache[1] = ($event) => popupFileList.value = $event),
+                      theme: popupUploadTheme.value,
+                      multiple: reProps.value.uploadOptions.multiple,
+                      disabled: reProps.value.uploadOptions.disabled,
+                      "on-remove": reProps.value.handlePopupRemove,
+                      "on-preview": reProps.value.uploadOptions.onPreview,
+                      "show-thumbnail": reProps.value.uploadOptions.showThumbnail,
+                      "show-image-file-name": reProps.value.uploadOptions.showImageFileName,
+                      "show-upload-progress": reProps.value.uploadOptions.showUploadProgress
+                    }, {
+                      trigger: withCtx(() => [..._cache[4] || (_cache[4] = [
+                        createElementVNode("span", { style: { "display": "none" } }, null, -1)
+                      ])]),
+                      "file-list-display": withCtx(({
+                        files,
+                        locale,
+                        onPreview,
+                        onRemove,
+                        dragEvents,
+                        triggerUpload
+                      }) => [
+                        popupUploadTheme.value === "image" ? (openBlock(), createBlock(unref(_sfc_main$1), {
+                          key: 0,
+                          locale,
+                          files,
+                          "show-upload-progress": reProps.value.uploadOptions.showUploadProgress,
+                          "show-image-file-name": reProps.value.uploadOptions.showImageFileName,
+                          "abridge-name": reProps.value.uploadOptions.abridgeName,
+                          disabled: reProps.value.uploadOptions.disabled,
+                          max: reProps.value.uploadOptions.max,
+                          multiple: reProps.value.uploadOptions.multiple,
+                          trigger: false,
+                          "trigger-upload": triggerUpload,
+                          "on-preview": onPreview,
+                          "on-remove": onRemove
+                        }, null, 8, ["locale", "files", "show-upload-progress", "show-image-file-name", "abridge-name", "disabled", "max", "multiple", "trigger-upload", "on-preview", "on-remove"])) : (openBlock(), createBlock(unref(QdUploadFileFlowFileListDisplay), {
+                          key: 1,
+                          locale,
+                          files,
+                          "show-thumbnail": reProps.value.uploadOptions.showThumbnail,
+                          "show-upload-progress": reProps.value.uploadOptions.showUploadProgress,
+                          "abridge-name": reProps.value.uploadOptions.abridgeName,
+                          "is-batch-upload": reProps.value.uploadOptions.isBatchUpload,
+                          disabled: reProps.value.uploadOptions.disabled,
+                          "drag-events": dragEvents,
+                          "on-preview": onPreview,
+                          "on-remove": onRemove
+                        }, null, 8, ["locale", "files", "show-thumbnail", "show-upload-progress", "abridge-name", "is-batch-upload", "disabled", "drag-events", "on-preview", "on-remove"])),
+                        createVNode(unref(_sfc_main$2), {
+                          ref: "multiFileViewer",
+                          files: viewerFiles.value
+                        }, null, 8, ["files"])
+                      ]),
+                      _: 1
+                    }, 8, ["class", "files", "theme", "multiple", "disabled", "on-remove", "on-preview", "show-thumbnail", "show-image-file-name", "show-upload-progress"])
+                  ]),
+                  default: withCtx(() => [
+                    createVNode(unref(Badge), {
+                      class: "qd-upload__popup-view-action",
+                      count: popupFileList.value.length,
+                      size: "small",
+                      offset: [2, 2],
+                      onClick: _cache[0] || (_cache[0] = withModifiers(() => {
+                      }, ["stop"]))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(Button), { variant: "outline" }, {
+                          icon: withCtx(() => [
+                            createVNode(unref(BrowseIcon))
+                          ]),
+                          default: withCtx(() => [
+                            createTextVNode(" " + toDisplayString(unref(t)("viewFileText")), 1)
+                          ]),
+                          _: 1
+                        })
+                      ]),
+                      _: 1
+                    }, 8, ["count"])
+                  ]),
+                  _: 1
+                }, 8, ["visible"])) : createCommentVNode("", true)
+              ]),
+              _: 1
+            })) : (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(unref(t)("dragger").dragDropText), 1))
+          ]),
+          key: "1"
+        } : void 0,
         __props.theme === "image-flow" ? {
           name: "file-list-display",
           fn: withCtx(({ files, locale, onPreview, onRemove }) => [
@@ -858,7 +899,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               files: viewerFiles.value
             }, null, 8, ["files"])
           ]),
-          key: "1"
+          key: "2"
         } : __props.theme === "file-flow" ? {
           name: "file-list-display",
           fn: withCtx(({ files, locale, onPreview, onRemove, dragEvents }) => [
@@ -888,7 +929,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               files: viewerFiles.value
             }, null, 8, ["files"])
           ]),
-          key: "2"
+          key: "3"
         } : __props.theme === "image" ? {
           name: "file-list-display",
           fn: withCtx(({ files, locale, onPreview, onRemove, triggerUpload }) => [
@@ -920,7 +961,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               files: viewerFiles.value
             }, null, 8, ["files"])
           ]),
-          key: "3"
+          key: "4"
         } : void 0,
         renderList(unref(filterSlots)(_ctx.$slots, ["trigger"]), (name) => {
           return {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "qidian-vue-ui",
-  "version": "2.0.53",
+  "version": "2.0.55",
   "description": "基于 TDesign 的 QiDian Vue UI 组件库",
   "author": "qidian",
   "license": "MIT",