knt-shared 1.2.0 → 1.2.1

package/dist/index.esm.js

@@ -656,14 +656,10 @@ const IconFullscreen = Object.assign(_IconFullscreen, {
 });
 const _hoisted_1$3 = { class: "basic-upload" };
 const _hoisted_2$3 = {
-  key: 0,
-  class: "upload-card-button"
-};
-const _hoisted_3$2 = {
   key: 0,
   class: "upload-text"
 };
-const _hoisted_4$2 = { class: "upload-tip" };
+const _hoisted_3$2 = { class: "upload-tip" };
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   ...{
     name: "BasicUpload",
@@ -672,8 +668,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "BasicUpload",
   props: {
     modelValue: {},
-    accept: { default: "" },
-    maxSize: { default: 10 },
+    accept: { default: "image/*" },
+    maxSize: { default: 30 },
     maxCount: { default: 1 },
     multiple: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
@@ -697,6 +693,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     showPreviewButton: { type: Boolean, default: true },
     showUploadButton: { type: Boolean, default: true },
     tip: {},
+    cardSize: {},
     imagePreview: { type: Boolean, default: true },
     imageCrop: { type: Boolean, default: false },
     imageCompress: { type: Boolean, default: false },
@@ -704,7 +701,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     draggable: { type: Boolean, default: false },
     directory: { type: Boolean, default: false },
     autoUpload: { type: Boolean, default: true },
-    resultType: { default: "url" },
+    resultType: { default: "fileList" },
     uploadButtonText: {},
     uploadButtonType: { default: "primary" }
   },
@@ -715,6 +712,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const uploadRef = ref();
     const fileListRef = ref([]);
     const propsRef = ref({});
+    const hasShownActionError = ref(false);
+    const isInternalUpdate = ref(false);
+    const processedFiles = ref(/* @__PURE__ */ new Map());
     const getProps = computed(() => {
       return { ...props, ...unref(propsRef) };
     });
@@ -735,7 +735,15 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         showRemoveButton: propsData.showRemoveButton && !propsData.readonly,
         showUploadButton: !hideUploadButton.value,
         // 只有在没有自定义预览时才启用 imagePreview
-        imagePreview: propsData.imagePreview && !propsData.onPreview
+        imagePreview: propsData.imagePreview && !propsData.onPreview,
+        onRemove: async (fileItem) => {
+          if (propsData.onRemove) {
+            const canRemove = await propsData.onRemove(fileItem);
+            if (!canRemove) return false;
+          }
+          emit("remove", fileItem);
+          return true;
+        }
       };
     });
     const validateFileSize = (file) => {
@@ -816,18 +824,46 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
           action: propsData.action,
           withCredentials: propsData.withCredentials
         };
-        propsData.customRequest(customOptions);
-      } else {
-        defaultUpload(options);
+        return propsData.customRequest(customOptions);
       }
+      return defaultUpload(options);
+    };
+    const extractUrlFromResponse = (response) => {
+      const urlPaths = ["url", "data.pathUrl", "data.url", "data.path", "pathUrl", "path"];
+      for (const path of urlPaths) {
+        const value = path.split(".").reduce((obj, key) => obj == null ? void 0 : obj[key], response);
+        if (value && typeof value === "string") {
+          return value;
+        }
+      }
+      if (response.data && typeof response.data === "string") {
+        return response.data;
+      }
+      return null;
+    };
+    const isDev = false;
+    const logger = {
+      debug: (...args) => isDev,
+      warn: (...args) => console.warn("[BasicUpload]", ...args),
+      error: (...args) => console.error("[BasicUpload]", ...args)
     };
     const defaultUpload = (options) => {
       const propsData = unref(getProps);
       const { fileItem, onProgress, onSuccess, onError } = options;
       if (!propsData.action) {
-        Message.error("请配置上传地址 action");
+        if (!hasShownActionError.value) {
+          Message.error("请配置上传地址 action");
+          hasShownActionError.value = true;
+          setTimeout(() => {
+            hasShownActionError.value = false;
+          }, 3e3);
+        }
         onError(new Error("上传地址未配置"));
-        return;
+        return {
+          abort() {
+            xhr.abort();
+          }
+        };
       }
       const formData = new FormData();
       formData.append(propsData.name || "file", fileItem.file);
@@ -847,15 +883,31 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         if (xhr.status >= 200 && xhr.status < 300) {
           try {
             const response = JSON.parse(xhr.responseText);
-            onSuccess(response);
+            const { code, message, data } = response;
+            if (code !== 200) {
+              const errorMsg = message ? `上传失败: ${message}` : "上传失败";
+              onError(new Error(errorMsg));
+              Message.error(errorMsg);
+              return;
+            }
+            const extractedUrl = extractUrlFromResponse(response);
+            const normalizedResponse = extractedUrl ? { url: extractedUrl, name: fileItem.name, ...data } : response;
+            if (!extractedUrl) {
+              logger.warn("响应中未找到 URL 字段，可能导致上传状态异常");
+            }
+            Message.success(`${fileItem.name} 上传成功`);
+            onSuccess(normalizedResponse);
           } catch (error) {
-            onSuccess(xhr.responseText);
+            onSuccess({ data: xhr.responseText });
           }
         } else {
-          onError(new Error(`上传失败: ${xhr.status}`));
+          const errorMsg = `上传失败: HTTP ${xhr.status}`;
+          Message.error(errorMsg);
+          onError(new Error(errorMsg));
         }
       });
       xhr.addEventListener("error", () => {
+        logger.error("上传网络错误");
         onError(new Error("网络错误"));
       });
       xhr.addEventListener("abort", () => {
@@ -871,32 +923,42 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         xhr.withCredentials = true;
       }
       xhr.send(formData);
+      return {
+        abort() {
+          xhr.abort();
+        }
+      };
     };
     const handleChange = (fileList, currentFile) => {
+      if (isInternalUpdate.value) return;
+      const oldLength = fileListRef.value.length;
+      const newLength = fileList.length;
       fileListRef.value = fileList;
       emit("change", fileList);
-      if (currentFile.status === "done") {
-        Message.success(`${currentFile.name} 上传成功`);
+      const isRemove = newLength < oldLength;
+      const fileKey = currentFile.uid;
+      const lastStatus = processedFiles.value.get(fileKey);
+      if (currentFile.status === "done" && lastStatus !== "done" && !isRemove) {
+        processedFiles.value.set(fileKey, "done");
         emit("success", currentFile.response, currentFile);
-        if (getProps.value.onSuccess) {
-          getProps.value.onSuccess(currentFile.response, currentFile);
-        }
-      } else if (currentFile.status === "error") {
-        Message.error(`${currentFile.name} 上传失败`);
+      } else if (currentFile.status === "error" && lastStatus !== "error") {
+        processedFiles.value.set(fileKey, "error");
         const error = new Error("上传失败");
         emit("error", error, currentFile);
-        if (getProps.value.onError) {
-          getProps.value.onError(error, currentFile);
-        }
+      }
+      if (isRemove) {
+        const fileUids = new Set(fileList.map((f) => f.uid));
+        processedFiles.value.forEach((_, uid) => {
+          if (!fileUids.has(uid)) {
+            processedFiles.value.delete(uid);
+          }
+        });
       }
       updateModelValue(fileList);
     };
     const handleProgress = (currentFile, event) => {
       const percent = currentFile.percent || 0;
       emit("progress", percent, currentFile);
-      if (getProps.value.onProgress) {
-        getProps.value.onProgress(percent, currentFile);
-      }
     };
     const handlePreview = (fileItem) => {
       const propsData = unref(getProps);
@@ -908,6 +970,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const updateModelValue = (fileList) => {
       var _a;
       const propsData = unref(getProps);
+      isInternalUpdate.value = true;
       switch (propsData.resultType) {
         case "fileList":
           emit("update:modelValue", fileList);
@@ -928,6 +991,11 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         default:
           emit("update:modelValue", fileList);
       }
+      nextTick(() => {
+        setTimeout(() => {
+          isInternalUpdate.value = false;
+        }, 50);
+      });
     };
     const parseModelValue = (value) => {
       if (!value) return [];
@@ -963,6 +1031,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
     const clearFiles = () => {
       fileListRef.value = [];
+      processedFiles.value.clear();
       emit("update:modelValue", []);
       emit("change", []);
     };
@@ -985,18 +1054,14 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       updateModelValue(fileListRef.value);
     };
     const removeFile = (fileItem) => {
-      const index = fileListRef.value.findIndex(
-        (item) => item.uid === fileItem.uid
-      );
+      const index = fileListRef.value.findIndex((item) => item.uid === fileItem.uid);
       if (index !== -1) {
         fileListRef.value.splice(index, 1);
         updateModelValue(fileListRef.value);
       }
     };
     const updateFile = (fileItem) => {
-      const index = fileListRef.value.findIndex(
-        (item) => item.uid === fileItem.uid
-      );
+      const index = fileListRef.value.findIndex((item) => item.uid === fileItem.uid);
       if (index !== -1) {
         fileListRef.value[index] = { ...fileListRef.value[index], ...fileItem };
         updateModelValue(fileListRef.value);
@@ -1016,7 +1081,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     });
     watch(
       () => props.modelValue,
-      (val) => {
+      (val, oldVal) => {
+        if (isInternalUpdate.value) return;
         fileListRef.value = parseModelValue(val);
       },
       { immediate: true }
@@ -1047,8 +1113,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         }, getBindValue.value, {
           "file-list": fileListRef.value,
           "custom-request": handleCustomRequest,
-          "before-upload": handleBeforeUpload,
           onChange: handleChange,
+          onBeforeUpload: handleBeforeUpload,
           onProgress: handleProgress,
           onPreview: handlePreview
         }), createSlots({ _: 2 }, [
@@ -1056,10 +1122,17 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
             name: "upload-button",
             fn: withCtx(() => [
               renderSlot(_ctx.$slots, "upload-button", {}, () => [
-                getProps.value.listType === "picture-card" ? (openBlock(), createElementBlock("div", _hoisted_2$3, [
+                getProps.value.listType === "picture-card" ? (openBlock(), createElementBlock("div", {
+                  key: 0,
+                  class: "upload-card-button",
+                  style: normalizeStyle({
+                    width: `${getProps.value.cardSize || 80}px`,
+                    height: `${getProps.value.cardSize || 80}px`
+                  })
+                }, [
                   createVNode(unref(IconPlus), { size: 16 }),
-                  getProps.value.uploadButtonText ? (openBlock(), createElementBlock("div", _hoisted_3$2, toDisplayString(getProps.value.uploadButtonText), 1)) : createCommentVNode("", true)
-                ])) : (openBlock(), createBlock(_component_a_button, {
+                  getProps.value.uploadButtonText ? (openBlock(), createElementBlock("div", _hoisted_2$3, toDisplayString(getProps.value.uploadButtonText), 1)) : createCommentVNode("", true)
+                ], 4)) : (openBlock(), createBlock(_component_a_button, {
                   key: 1,
                   type: getProps.value.uploadButtonType || "primary"
                 }, {
@@ -1086,7 +1159,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
             name: "tip",
             fn: withCtx(() => [
               renderSlot(_ctx.$slots, "tip", {}, () => [
-                createElementVNode("div", _hoisted_4$2, toDisplayString(getProps.value.tip), 1)
+                createElementVNode("div", _hoisted_3$2, toDisplayString(getProps.value.tip), 1)
               ], true)
             ]),
             key: "2"
@@ -1110,7 +1183,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BasicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-179e6d71"]]);
+const BasicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-10587859"]]);
 const componentMap = {
   Input,
   InputNumber,
@@ -2114,7 +2187,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         const indexColumn = {
           title: "序号",
           dataIndex: "__index__",
-          width: 80,
+          width: 60,
           align: "center",
           fixed: "left",
           slotName: "__index__",
@@ -2995,7 +3068,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicTable = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-f0b71ff8"]]);
+const BasicTable = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-04667d35"]]);
 function useTable(options = {}) {
   const tableRef = ref(null);
   const formRef = ref(null);