yuang-framework-ui-pc 1.1.50 → 1.1.52

package/es/core-components.d.ts

@@ -53,5 +53,4 @@ export { default as EleWatermark } from './ele-watermark/index';
 export { default as EleTest } from './ele-test/index';
 export { default as YuTest } from './yu-test/index';
 export { default as YuFrameworkSliderCaptchaDialog } from './yu-framework-slider-captcha-dialog/index';
-export { default as YuFrameworkAttachmentFileUpload } from './yu-framework-attachment-file-upload/index';
-export { default as YuFrameworkAttachmentImageUpload } from './yu-framework-attachment-image-upload/index';
+export { default as YuFrameworkAttachmentUpload } from './yu-framework-attachment-upload/index';

package/es/core-components.js

@@ -53,8 +53,7 @@ import { default as default53 } from "./ele-watermark/index";
 import { default as default54 } from "./ele-test/index";
 import { default as default55 } from "./yu-test/index";
 import { default as default56 } from "./yu-framework-slider-captcha-dialog/index";
-import { default as default57 } from "./yu-framework-attachment-file-upload/index";
-import { default as default58 } from "./yu-framework-attachment-image-upload/index";
+import { default as default57 } from "./yu-framework-attachment-upload/index";
 export {
   default2 as EleAdminLayout,
   default3 as EleAlert,
@@ -109,8 +108,7 @@ export {
   default51 as EleUploadList,
   default52 as EleVirtualTable,
   default53 as EleWatermark,
-  default57 as YuFrameworkAttachmentFileUpload,
-  default58 as YuFrameworkAttachmentImageUpload,
+  default57 as YuFrameworkAttachmentUpload,
   default56 as YuFrameworkSliderCaptchaDialog,
   default55 as YuTest
 };

package/es/ele-upload-list/components/list-item.d.ts

@@ -37,6 +37,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     handleEdit: () => void;
     handlePreview: () => void;
     handleRetry: () => void;
+    isImage: (url?: string) => boolean | "" | undefined;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     itemClick: (_item: UploadItem) => true;
     remove: (_item: UploadItem) => true;

package/es/ele-upload-list/components/list-item.js

@@ -81,6 +81,12 @@ const _sfc_main = defineComponent({
     const handleRetry = () => {
       emit("retry", props.item);
     };
+    const isImage = (url) => {
+      var _a, _b;
+      const parts = url ? url.split(".") : [];
+      const suffix = parts.length <= 1 || parts[0] === "" && parts.length === 2 ? "" : (_b = (_a = parts.pop()) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+      return suffix && ["png", "jpg", "jpeg", "gif", "svg"].includes(suffix);
+    };
     return {
       imageUrl,
       uploadProgress,
@@ -88,7 +94,8 @@ const _sfc_main = defineComponent({
       handleRemove,
       handleEdit,
       handlePreview,
-      handleRetry
+      handleRetry,
+      isImage
     };
   }
 });
@@ -182,7 +189,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 8, _hoisted_6)) : createCommentVNode("", true)
       ])
     ])) : _ctx.tools && !_ctx.readonly && !_ctx.disabled && !_ctx.item.readonly ? (openBlock(), createElementBlock("div", _hoisted_8, [
-      createElementVNode("div", {
+      _ctx.isImage(_ctx.item.url) ? (openBlock(), createElementBlock("div", {
+        key: 0,
         title: _ctx.locale.preview,
         class: "ele-upload-tool",
         onClick: _cache[1] || (_cache[1] = withModifiers((...args) => _ctx.handlePreview && _ctx.handlePreview(...args), ["stop"]))
@@ -194,7 +202,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _: 1
         }),
         createElementVNode("div", _hoisted_10, toDisplayString(_ctx.locale.preview), 1)
-      ], 8, _hoisted_9),
+      ], 8, _hoisted_9)) : createCommentVNode("", true),
       createElementVNode("div", {
         title: _ctx.locale.edit,
         class: "ele-upload-tool",

package/es/ele-upload-list/index.d.ts

@@ -79,6 +79,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     handleInputChange: (e: Event) => void;
     handleUploadClick: (e: MouseEvent) => void;
     openImagePreview: (urls: string[], index: number) => void;
+    isImage: (url?: string) => boolean | "" | undefined;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:modelValue': (_value: UploadItem[]) => boolean;
     itemClick: (_item: UploadItem) => boolean;
@@ -1594,6 +1595,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         handleEdit: () => void;
         handlePreview: () => void;
         handleRetry: () => void;
+        isImage: (url?: string) => boolean | "" | undefined;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
         itemClick: (_item: UploadItem) => true;
         remove: (_item: UploadItem) => true;

package/es/ele-upload-list/index.js

@@ -88,7 +88,11 @@ const _sfc_main = defineComponent({
     };
     const handleItemClick = (item) => {
       if (props.preview) {
-        previewItem(item);
+        if (isImage(item.url)) {
+          previewItem(item);
+        } else {
+          window.open(item.url);
+        }
       }
       emit("itemClick", item);
     };
@@ -107,7 +111,9 @@ const _sfc_main = defineComponent({
       }
     };
     const handleItemPreview = (item) => {
-      previewItem(item);
+      if (isImage(item.url)) {
+        previewItem(item);
+      }
       emit("preview", item);
     };
     const handleItemRetry = (item) => {
@@ -128,6 +134,12 @@ const _sfc_main = defineComponent({
         e.preventDefault();
       }
     };
+    const isImage = (url) => {
+      var _a, _b;
+      const parts = url ? url.split(".") : [];
+      const suffix = parts.length <= 1 || parts[0] === "" && parts.length === 2 ? "" : (_b = (_a = parts.pop()) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+      return suffix && ["png", "jpg", "jpeg", "gif", "svg"].includes(suffix);
+    };
     watch(
       () => props.modelValue,
       () => {
@@ -166,7 +178,8 @@ const _sfc_main = defineComponent({
       handleItemRetry,
       handleInputChange,
       handleUploadClick,
-      openImagePreview
+      openImagePreview,
+      isImage
     };
   }
 });

package/es/ele-upload-list/types.d.ts

@@ -4,6 +4,8 @@
 export interface UploadItem extends Record<keyof any, any> {
   /** 唯一标识 */
   key: string | number | symbol;
+  /** id */
+  id: string;
   /** 显示的图片地址, 为空时显示文件图标 */
   url?: string;
   /** 文件名称 */

package/es/{yu-framework-attachment-image-upload → yu-framework-attachment-upload}/index.js

@@ -5,7 +5,7 @@ import { http } from "yuang-framework-ui-common/lib/config/httpConfig";
 import { getShortUuid } from "yuang-framework-ui-common/lib/utils/uuidUtils";
 import { application } from "yuang-framework-ui-common/lib/config/applicationConfig";
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...{ name: "YuFrameworkAttachmentImageUpload" },
+  ...{ name: "YuFrameworkAttachmentUpload" },
   __name: "index",
   props: /* @__PURE__ */ mergeModels({
     modelValue: {},
@@ -16,19 +16,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   }),
   emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
   setup(__props, { emit: __emit }) {
+    const props = __props;
     const emit = __emit;
+    props.param.mode = props.param.mode ?? "file";
+    props.param.maxCount = props.param.maxCount ?? 5;
+    props.param.maxSize = props.param.maxSize ?? 5;
     const images = ref([]);
+    const listType = ref(props.param.mode);
+    const accept = ref("");
+    if (props.param.mode == "file") {
+      accept.value = ".txt,.xlsx";
+    } else if (props.param.mode == "image") {
+      accept.value = ".png,.jpg,.jpeg,.gif,.svg";
+    }
     const isLoading = ref(false);
     const checkFile = (file) => {
       if (!file) {
         return;
       }
-      if (!file.type.startsWith("image")) {
+      if (props.param.mode === "image" && !file.type.startsWith("image")) {
         EleMessage.error("只能选择图片");
         return;
       }
-      if (file.size / 1024 / 1024 > 2) {
-        EleMessage.error("大小不能超过 2MB");
+      if (file.size / 1024 / 1024 > props.param.maxSize) {
+        EleMessage.error(`图片大小不能超过${props.param.maxSize}MB`);
         return;
       }
       return true;
@@ -36,6 +47,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const model = useModel(__props, "modelValue");
     model.value = model.value ?? getShortUuid();
     onMounted(() => {
+      init();
+    });
+    const init = () => {
+      images.value = [];
       http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { code: model.value, pageSize: 100 }).then((res) => {
         let attachemtList = res.data.data.records;
         for (let i = 0; i < attachemtList.length; i++) {
@@ -48,15 +63,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           });
         }
       });
-    });
-    const handleUpload = (uploadItem2, retry) => {
-      if (!checkFile(uploadItem2.file)) {
+    };
+    const handleUpload = (uploadItem, retry) => {
+      if (!checkFile(uploadItem.file)) {
         return;
       }
       if (!retry) {
-        images.value.push({ ...uploadItem2 });
+        images.value.push({ ...uploadItem });
       }
-      const item = images.value.find((t) => t.key === uploadItem2.key);
+      const item = images.value.find((t) => t.key === uploadItem.key);
       console.log(JSON.parse(JSON.stringify(item)));
       if (!item) {
         return;
@@ -65,7 +80,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       item.progress = 0;
       let formData = new FormData();
       formData.append("code", model.value);
-      formData.append("multipartFile", uploadItem2.file, uploadItem2.file.name);
+      formData.append("multipartFile", uploadItem.file, uploadItem.file.name);
       http({
         url: `${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/uploadAttachment`,
         method: "post",
@@ -77,11 +92,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         EleMessage.success(res.data.message);
         item.progress = 100;
         item.status = "done";
+        item.id = res.data.data.id;
         item.url = res.data.data.fullUrl;
-        http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { code: model.value, pageSize: 100 }).then((res2) => {
-          let attachemtList = res2.data.data.records;
-          emit("change", attachemtList);
-        });
+        emitChange();
       }).catch((e) => {
         item.status = "exception";
         EleMessage.error(e.message);
@@ -116,56 +129,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           oldItem.status = void 0;
           oldItem.progress = 0;
         }
+        emitChange();
       }).catch((e) => {
         item.status = "exception";
         EleMessage.error(e.message);
       });
     };
-    const handleRemove = (uploadItem2) => {
-      let id = uploadItem2.id;
+    const emitChange = () => {
+      http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { code: model.value, pageSize: 100 }).then((res) => {
+        let attachemtList = res.data.data.records;
+        emit("change", attachemtList);
+      });
+    };
+    const handleRemove = (uploadItem) => {
+      let id = uploadItem.id;
       ElMessageBox.confirm("确定要删除吗?", "系统提示", { type: "warning", draggable: true }).then(() => {
         http.get(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/deleteInfo`, { params: { id } }).then((res) => {
           EleMessage.success(res.data.message);
-          images.value.splice(images.value.indexOf(uploadItem2), 1);
+          images.value.splice(images.value.indexOf(uploadItem), 1);
+          emitChange();
         });
       });
     };
-    const uploadItem = (item) => {
-      item.status = "uploading";
-      if (item.progress == null) {
-        item.progress = 20;
-      }
-      const timer = setInterval(
-        () => {
-          if (Math.round(Math.random() * 10) < 3) {
-            item.status = "exception";
-            EleMessage.error("上传失败, 服务器繁忙，请重试");
-            clearInterval(timer);
-            return;
-          }
-          if (item.progress == null) {
-            item.progress = 20;
-          } else {
-            item.progress += 20;
-          }
-          if (item.progress === 100) {
-            item.status = "done";
-            clearInterval(timer);
-            if (checkDone()) {
-              submitForm();
-            }
-          }
-        },
-        Math.round(Math.random() * 2500) + 500
-      );
-    };
-    const checkDone = () => {
-      return !images.value.some((d) => d.status !== "done");
-    };
-    const submitForm = () => {
-      EleMessage.success("已全部上传完毕");
-      console.log(JSON.parse(JSON.stringify(images.value)));
-      isLoading.value = false;
+    const handleRetryUpload = (uploadItem) => {
+      handleUpload(uploadItem, true);
     };
     return (_ctx, _cache) => {
       const _component_ele_upload_list = resolveComponent("ele-upload-list");
@@ -175,14 +162,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           tools: true,
           modelValue: images.value,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => images.value = $event),
+          limit: _ctx.param.maxCount,
+          listType: listType.value,
+          accept: accept.value,
           readonly: isLoading.value,
           disabled: _ctx.param.type != "edit",
           sortable: { forceFallback: true },
           onUpload: handleUpload,
-          onRetry: uploadItem,
+          onRetry: handleRetryUpload,
           onRemove: handleRemove,
           onEditUpload: handleEditUpload
-        }, null, 8, ["modelValue", "readonly", "disabled"])
+        }, null, 8, ["modelValue", "limit", "listType", "accept", "readonly", "disabled"])
       ]);
     };
   }

package/es/yu-framework-slider-captcha-dialog/{SliderCaptcha.js → components/SliderCaptcha.js}

@@ -2,7 +2,7 @@ import { defineComponent, ref, onMounted, nextTick, createElementBlock, openBloc
 import { http } from "yuang-framework-ui-common/lib/config/httpConfig";
 import { application } from "yuang-framework-ui-common/lib/config/applicationConfig";
 import { RefreshRight, CircleClose } from "@element-plus/icons-vue";
-import { SliderArrowStatic, SliderArrowSlide } from "../icons";
+import { SliderArrowStatic, SliderArrowSlide } from "../../icons";
 const _hoisted_1 = { class: "yu-framework-slider-captcha" };
 const _hoisted_2 = { class: "yu-framework-slider-captcha-title" };
 const _hoisted_3 = ["width", "height"];

package/es/yu-framework-slider-captcha-dialog/index.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, createElementBlock, createCommentVNode, openBlock, createElementVNode, createVNode } from "vue";
-import SliderCaptcha from "./SliderCaptcha";
+import SliderCaptcha from "./components/SliderCaptcha";
 const _hoisted_1 = {
   key: 0,
   class: "yu-framework-slider-captcha-dialog"

package/lib/core-components.cjs

@@ -55,8 +55,7 @@ const index$P = require("./ele-watermark/index");
 const index$Q = require("./ele-test/index");
 const index$R = require("./yu-test/index");
 const index$S = require("./yu-framework-slider-captcha-dialog/index");
-const index$T = require("./yu-framework-attachment-file-upload/index");
-const index$U = require("./yu-framework-attachment-image-upload/index");
+const index$T = require("./yu-framework-attachment-upload/index");
 exports.EleAdminLayout = index;
 exports.EleAlert = index$1;
 exports.EleApp = index$2;
@@ -112,5 +111,4 @@ exports.EleWatermark = index$P;
 exports.EleTest = index$Q;
 exports.YuTest = index$R;
 exports.YuFrameworkSliderCaptchaDialog = index$S;
-exports.YuFrameworkAttachmentFileUpload = index$T;
-exports.YuFrameworkAttachmentImageUpload = index$U;
+exports.YuFrameworkAttachmentUpload = index$T;

package/lib/core-components.d.ts

@@ -53,5 +53,4 @@ export { default as EleWatermark } from './ele-watermark/index';
 export { default as EleTest } from './ele-test/index';
 export { default as YuTest } from './yu-test/index';
 export { default as YuFrameworkSliderCaptchaDialog } from './yu-framework-slider-captcha-dialog/index';
-export { default as YuFrameworkAttachmentFileUpload } from './yu-framework-attachment-file-upload/index';
-export { default as YuFrameworkAttachmentImageUpload } from './yu-framework-attachment-image-upload/index';
+export { default as YuFrameworkAttachmentUpload } from './yu-framework-attachment-upload/index';

package/lib/ele-upload-list/components/list-item.cjs

@@ -82,6 +82,12 @@ const _sfc_main = vue.defineComponent({
     const handleRetry = () => {
       emit("retry", props.item);
     };
+    const isImage = (url) => {
+      var _a, _b;
+      const parts = url ? url.split(".") : [];
+      const suffix = parts.length <= 1 || parts[0] === "" && parts.length === 2 ? "" : (_b = (_a = parts.pop()) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+      return suffix && ["png", "jpg", "jpeg", "gif", "svg"].includes(suffix);
+    };
     return {
       imageUrl,
       uploadProgress,
@@ -89,7 +95,8 @@ const _sfc_main = vue.defineComponent({
       handleRemove,
       handleEdit,
       handlePreview,
-      handleRetry
+      handleRetry,
+      isImage
     };
   }
 });
@@ -183,7 +190,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 8, _hoisted_6)) : vue.createCommentVNode("", true)
       ])
     ])) : _ctx.tools && !_ctx.readonly && !_ctx.disabled && !_ctx.item.readonly ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_8, [
-      vue.createElementVNode("div", {
+      _ctx.isImage(_ctx.item.url) ? (vue.openBlock(), vue.createElementBlock("div", {
+        key: 0,
         title: _ctx.locale.preview,
         class: "ele-upload-tool",
         onClick: _cache[1] || (_cache[1] = vue.withModifiers((...args) => _ctx.handlePreview && _ctx.handlePreview(...args), ["stop"]))
@@ -195,7 +203,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _: 1
         }),
         vue.createElementVNode("div", _hoisted_10, vue.toDisplayString(_ctx.locale.preview), 1)
-      ], 8, _hoisted_9),
+      ], 8, _hoisted_9)) : vue.createCommentVNode("", true),
       vue.createElementVNode("div", {
         title: _ctx.locale.edit,
         class: "ele-upload-tool",

package/lib/ele-upload-list/components/list-item.d.ts

@@ -37,6 +37,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     handleEdit: () => void;
     handlePreview: () => void;
     handleRetry: () => void;
+    isImage: (url?: string) => boolean | "" | undefined;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     itemClick: (_item: UploadItem) => true;
     remove: (_item: UploadItem) => true;

package/lib/ele-upload-list/index.cjs

@@ -89,7 +89,11 @@ const _sfc_main = vue.defineComponent({
     };
     const handleItemClick = (item) => {
       if (props2.preview) {
-        previewItem(item);
+        if (isImage(item.url)) {
+          previewItem(item);
+        } else {
+          window.open(item.url);
+        }
       }
       emit("itemClick", item);
     };
@@ -108,7 +112,9 @@ const _sfc_main = vue.defineComponent({
       }
     };
     const handleItemPreview = (item) => {
-      previewItem(item);
+      if (isImage(item.url)) {
+        previewItem(item);
+      }
       emit("preview", item);
     };
     const handleItemRetry = (item) => {
@@ -129,6 +135,12 @@ const _sfc_main = vue.defineComponent({
         e.preventDefault();
       }
     };
+    const isImage = (url) => {
+      var _a, _b;
+      const parts = url ? url.split(".") : [];
+      const suffix = parts.length <= 1 || parts[0] === "" && parts.length === 2 ? "" : (_b = (_a = parts.pop()) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+      return suffix && ["png", "jpg", "jpeg", "gif", "svg"].includes(suffix);
+    };
     vue.watch(
       () => props2.modelValue,
       () => {
@@ -167,7 +179,8 @@ const _sfc_main = vue.defineComponent({
       handleItemRetry,
       handleInputChange,
       handleUploadClick,
-      openImagePreview
+      openImagePreview,
+      isImage
     };
   }
 });

package/lib/ele-upload-list/index.d.ts

@@ -79,6 +79,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     handleInputChange: (e: Event) => void;
     handleUploadClick: (e: MouseEvent) => void;
     openImagePreview: (urls: string[], index: number) => void;
+    isImage: (url?: string) => boolean | "" | undefined;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:modelValue': (_value: UploadItem[]) => boolean;
     itemClick: (_item: UploadItem) => boolean;
@@ -1594,6 +1595,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         handleEdit: () => void;
         handlePreview: () => void;
         handleRetry: () => void;
+        isImage: (url?: string) => boolean | "" | undefined;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
         itemClick: (_item: UploadItem) => true;
         remove: (_item: UploadItem) => true;

package/lib/ele-upload-list/types.d.ts

@@ -4,6 +4,8 @@
 export interface UploadItem extends Record<keyof any, any> {
   /** 唯一标识 */
   key: string | number | symbol;
+  /** id */
+  id: string;
   /** 显示的图片地址, 为空时显示文件图标 */
   url?: string;
   /** 文件名称 */