yuang-framework-ui-pc 1.1.50 → 1.1.52

package/lib/{yu-framework-attachment-image-upload → yu-framework-attachment-upload}/index.cjs

@@ -6,7 +6,7 @@ const httpConfig = require("yuang-framework-ui-common/lib/config/httpConfig");
 const uuidUtils = require("yuang-framework-ui-common/lib/utils/uuidUtils");
 const applicationConfig = require("yuang-framework-ui-common/lib/config/applicationConfig");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...{ name: "YuFrameworkAttachmentImageUpload" },
+  ...{ name: "YuFrameworkAttachmentUpload" },
   __name: "index",
   props: /* @__PURE__ */ vue.mergeModels({
     modelValue: {},
@@ -17,19 +17,30 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   }),
   emits: /* @__PURE__ */ vue.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 = vue.ref([]);
+    const listType = vue.ref(props.param.mode);
+    const accept = vue.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 = vue.ref(false);
     const checkFile = (file) => {
       if (!file) {
         return;
       }
-      if (!file.type.startsWith("image")) {
+      if (props.param.mode === "image" && !file.type.startsWith("image")) {
         message.EleMessage.error("只能选择图片");
         return;
       }
-      if (file.size / 1024 / 1024 > 2) {
-        message.EleMessage.error("大小不能超过 2MB");
+      if (file.size / 1024 / 1024 > props.param.maxSize) {
+        message.EleMessage.error(`图片大小不能超过${props.param.maxSize}MB`);
         return;
       }
       return true;
@@ -37,6 +48,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const model = vue.useModel(__props, "modelValue");
     model.value = model.value ?? uuidUtils.getShortUuid();
     vue.onMounted(() => {
+      init();
+    });
+    const init = () => {
+      images.value = [];
       httpConfig.http.post(`${applicationConfig.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++) {
@@ -49,15 +64,15 @@ const _sfc_main = /* @__PURE__ */ vue.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;
@@ -66,7 +81,7 @@ const _sfc_main = /* @__PURE__ */ vue.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);
       httpConfig.http({
         url: `${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/uploadAttachment`,
         method: "post",
@@ -78,11 +93,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         message.EleMessage.success(res.data.message);
         item.progress = 100;
         item.status = "done";
+        item.id = res.data.data.id;
         item.url = res.data.data.fullUrl;
-        httpConfig.http.post(`${applicationConfig.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";
         message.EleMessage.error(e.message);
@@ -117,56 +130,30 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           oldItem.status = void 0;
           oldItem.progress = 0;
         }
+        emitChange();
       }).catch((e) => {
         item.status = "exception";
         message.EleMessage.error(e.message);
       });
     };
-    const handleRemove = (uploadItem2) => {
-      let id = uploadItem2.id;
+    const emitChange = () => {
+      httpConfig.http.post(`${applicationConfig.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;
       es.ElMessageBox.confirm("确定要删除吗?", "系统提示", { type: "warning", draggable: true }).then(() => {
         httpConfig.http.get(`${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/deleteInfo`, { params: { id } }).then((res) => {
           message.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";
-            message.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 = () => {
-      message.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 = vue.resolveComponent("ele-upload-list");
@@ -176,14 +163,17 @@ const _sfc_main = /* @__PURE__ */ vue.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/lib/yu-framework-slider-captcha-dialog/{SliderCaptcha.cjs → components/SliderCaptcha.cjs}

@@ -3,7 +3,7 @@ const vue = require("vue");
 const httpConfig = require("yuang-framework-ui-common/lib/config/httpConfig");
 const applicationConfig = require("yuang-framework-ui-common/lib/config/applicationConfig");
 const iconsVue = require("@element-plus/icons-vue");
-const icons = require("../icons");
+const icons = require("../../icons");
 const _hoisted_1 = { class: "yu-framework-slider-captcha" };
 const _hoisted_2 = { class: "yu-framework-slider-captcha-title" };
 const _hoisted_3 = ["width", "height"];

package/lib/yu-framework-slider-captcha-dialog/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 const vue = require("vue");
-const SliderCaptcha = require("./SliderCaptcha");
+const SliderCaptcha = require("./components/SliderCaptcha");
 const _hoisted_1 = {
   key: 0,
   class: "yu-framework-slider-captcha-dialog"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-pc",
-  "version": "1.1.50",
+  "version": "1.1.52",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts --mode dev",
@@ -188,6 +188,6 @@
   "repository": "",
   "license": "",
   "dependencies": {
-    "yuang-framework-ui-common": "^1.0.61"
+    "yuang-framework-ui-common": "^1.0.62"
   }
 }

package/typings/global.d.ts

@@ -60,8 +60,7 @@ declare module '@vue/runtime-core' {
     EleVirtualTable: (typeof import('yuang-framework-ui-pc'))['EleVirtualTable'];
     EleWatermark: (typeof import('yuang-framework-ui-pc'))['EleWatermark'];
     EleXgPlayer: (typeof import('yuang-framework-ui-pc'))['EleXgPlayer'];
-    YuFrameworkAttachmentFileUpload: (typeof import('yuang-framework-ui-pc'))['YuFrameworkAttachmentFileUpload'];
-    YuFrameworkAttachmentImageUpload: (typeof import('yuang-framework-ui-pc'))['YuFrameworkAttachmentImageUpload'];
+    YuFrameworkAttachmentUpload: (typeof import('yuang-framework-ui-pc'))['YuFrameworkAttachmentUpload'];
     YuFrameworkSliderCaptchaDialog: (typeof import('yuang-framework-ui-pc'))['YuFrameworkSliderCaptchaDialog'];
     YuTest: (typeof import('yuang-framework-ui-pc'))['YuTest'];
   }

package/es/yu-framework-attachment-file-upload/CommonUpload/index.d.ts

@@ -1,161 +0,0 @@
-import { CSSProperties } from 'vue';
-import { ElProgressProps, ElImageProps } from '../../ele-app/el';
-import { EleImageViewerProps } from '../../ele-app/plus';
-import { UploadItem, ListType, BeforeUploadClick, BeforeItemEdit, UploadLocale } from '../../ele-upload-list/types';
-
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
-declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<UploadItem[]>;
-    drag: {
-        type: import('vue').PropType<boolean>;
-        default: boolean;
-    };
-    disabled: {
-        type: import('vue').PropType<boolean>;
-    };
-    readonly: {
-        type: import('vue').PropType<boolean>;
-    };
-    sortable: {
-        type: import('vue').PropType<boolean | Record<string | number | symbol, any>>;
-        default: () => {
-            forceFallback: boolean;
-        };
-    };
-    multiple: {
-        type: import('vue').PropType<boolean>;
-    };
-    preview: {
-        type: import('vue').PropType<boolean>;
-        default: boolean;
-    };
-    accept: {
-        type: import('vue').PropType<string>;
-        default: string;
-    };
-    tools: {
-        type: import('vue').PropType<boolean>;
-        default: boolean;
-    };
-    beforeUploadClick: {
-        type: import('vue').PropType<BeforeUploadClick>;
-    };
-    locale: {
-        type: import('vue').PropType<Partial<UploadLocale>>;
-    };
-    imageProps: {
-        type: import('vue').PropType<ElImageProps>;
-    };
-    progressProps: {
-        type: import('vue').PropType<ElProgressProps>;
-    };
-    listType: {
-        type: import('vue').PropType<ListType>;
-    };
-    limit: {
-        type: import('vue').PropType<number>;
-    };
-    itemStyle: {
-        type: import('vue').PropType<CSSProperties>;
-    };
-    buttonStyle: {
-        type: import('vue').PropType<CSSProperties>;
-    };
-    previewProps: {
-        type: import('vue').PropType<EleImageViewerProps>;
-    };
-    beforeItemEdit: {
-        type: import('vue').PropType<BeforeItemEdit>;
-    };
-    fileLimit: {
-        type: import('vue').PropType<number>;
-        default: number;
-    };
-}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    itemClick: (item: UploadItem) => void;
-    preview: (item: UploadItem) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<UploadItem[]>;
-    drag: {
-        type: import('vue').PropType<boolean>;
-        default: boolean;
-    };
-    disabled: {
-        type: import('vue').PropType<boolean>;
-    };
-    readonly: {
-        type: import('vue').PropType<boolean>;
-    };
-    sortable: {
-        type: import('vue').PropType<boolean | Record<string | number | symbol, any>>;
-        default: () => {
-            forceFallback: boolean;
-        };
-    };
-    multiple: {
-        type: import('vue').PropType<boolean>;
-    };
-    preview: {
-        type: import('vue').PropType<boolean>;
-        default: boolean;
-    };
-    accept: {
-        type: import('vue').PropType<string>;
-        default: string;
-    };
-    tools: {
-        type: import('vue').PropType<boolean>;
-        default: boolean;
-    };
-    beforeUploadClick: {
-        type: import('vue').PropType<BeforeUploadClick>;
-    };
-    locale: {
-        type: import('vue').PropType<Partial<UploadLocale>>;
-    };
-    imageProps: {
-        type: import('vue').PropType<ElImageProps>;
-    };
-    progressProps: {
-        type: import('vue').PropType<ElProgressProps>;
-    };
-    listType: {
-        type: import('vue').PropType<ListType>;
-    };
-    limit: {
-        type: import('vue').PropType<number>;
-    };
-    itemStyle: {
-        type: import('vue').PropType<CSSProperties>;
-    };
-    buttonStyle: {
-        type: import('vue').PropType<CSSProperties>;
-    };
-    previewProps: {
-        type: import('vue').PropType<EleImageViewerProps>;
-    };
-    beforeItemEdit: {
-        type: import('vue').PropType<BeforeItemEdit>;
-    };
-    fileLimit: {
-        type: import('vue').PropType<number>;
-        default: number;
-    };
-}>> & Readonly<{
-    onItemClick?: ((item: UploadItem) => any) | undefined;
-    onPreview?: ((item: UploadItem) => any) | undefined;
-}>, {
-    drag: boolean;
-    sortable: boolean | Record<keyof any, any>;
-    preview: boolean;
-    accept: string;
-    tools: boolean;
-    fileLimit: number;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
-export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};

package/es/yu-framework-attachment-file-upload/CommonUpload/index.js

@@ -1,173 +0,0 @@
-import { defineComponent, mergeModels, useModel, resolveComponent, createBlock, openBlock, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps } from "vue";
-import { EleMessage } from "../../utils/message";
-import { ElMessageBox } from "element-plus/es";
-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: "CommonUpload" },
-  __name: "index",
-  props: /* @__PURE__ */ mergeModels({
-    fileLimit: { default: 100 },
-    readonly: { type: Boolean },
-    disabled: { type: Boolean },
-    preview: { type: Boolean, default: true },
-    limit: {},
-    multiple: { type: Boolean },
-    drag: { type: Boolean, default: true },
-    accept: { default: "" },
-    itemStyle: {},
-    buttonStyle: {},
-    sortable: { type: [Boolean, Object], default: () => ({ forceFallback: true }) },
-    imageProps: {},
-    progressProps: {},
-    previewProps: {},
-    tools: { type: Boolean, default: true },
-    listType: {},
-    beforeUploadClick: {},
-    beforeItemEdit: {},
-    locale: {}
-  }, {
-    "modelValue": {
-      type: Array,
-      default: () => []
-    },
-    "modelModifiers": {}
-  }),
-  emits: /* @__PURE__ */ mergeModels(["itemClick", "preview"], ["update:modelValue"]),
-  setup(__props, { emit: __emit }) {
-    const props = __props;
-    const emit = __emit;
-    const images = useModel(__props, "modelValue");
-    const checkFile = (file) => {
-      if (!file) {
-        return;
-      }
-      if (props.accept === "image/*") {
-        if (!file.type.startsWith("image")) {
-          EleMessage.error("只能选择图片");
-          return;
-        }
-      } else if (props.accept === ".xls,.xlsx") {
-        if (![
-          "application/vnd.ms-excel",
-          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-        ].includes(file.type)) {
-          EleMessage.error("只能选择 excel 文件");
-          return;
-        }
-      }
-      if (props.fileLimit && file.size / 1024 / 1024 > props.fileLimit) {
-        EleMessage.error(`大小不能超过 ${props.fileLimit}MB`);
-        return;
-      }
-      return true;
-    };
-    const handleItemUpload = (uploadItem, retry) => {
-      if (!uploadItem.file || !checkFile(uploadItem.file)) {
-        return;
-      }
-      if (!retry) {
-        images.value.push({ ...uploadItem });
-      }
-      const item = images.value.find((t) => t.key === uploadItem.key);
-      if (!item) {
-        return;
-      }
-      item.status = "uploading";
-      item.progress = 0;
-      debugger;
-      let formData = new FormData();
-      formData.append("code", getShortUuid());
-      formData.append("multipartFile", uploadItem.file, uploadItem.file.name);
-      http({
-        url: `/framework-api/core/framework-attachment/uploadAttachment`,
-        method: "post",
-        headers: {
-          "Content-Type": "multipart/form-data"
-        },
-        data: formData
-      }).then((res) => {
-        EleMessage.success(res.data.message);
-        item.progress = 100;
-        item.status = "done";
-        item.url = res.data.data.fullUrl;
-      }).catch((e) => {
-        item.status = "exception";
-        EleMessage.error(e.message);
-      });
-    };
-    const handleItemEditUpload = ({ item, newItem }) => {
-      if (!checkFile(newItem.file)) {
-        return;
-      }
-      const oldItem = images.value.find((t) => t.key === item.key);
-      if (oldItem) {
-        oldItem.url = void 0;
-        oldItem.name = newItem.name;
-        oldItem.file = newItem.file;
-        oldItem.progress = 0;
-        oldItem.status = void 0;
-        handleItemUpload(oldItem, true);
-      }
-    };
-    const handleItemRemove = (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(uploadItem), 1);
-        });
-      });
-    };
-    const handleItemClick = (item) => {
-      emit("itemClick", item);
-    };
-    const handleItemPreview = (item) => {
-      emit("preview", item);
-    };
-    return (_ctx, _cache) => {
-      const _component_EleUploadList = resolveComponent("EleUploadList");
-      return openBlock(), createBlock(_component_EleUploadList, {
-        modelValue: images.value,
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => images.value = $event),
-        readonly: _ctx.readonly,
-        disabled: _ctx.disabled,
-        preview: _ctx.preview,
-        limit: _ctx.limit,
-        multiple: _ctx.multiple,
-        drag: _ctx.drag,
-        accept: _ctx.accept,
-        itemStyle: _ctx.itemStyle,
-        buttonStyle: _ctx.buttonStyle,
-        sortable: _ctx.sortable,
-        imageProps: _ctx.imageProps,
-        progressProps: _ctx.progressProps,
-        previewProps: _ctx.previewProps,
-        tools: _ctx.tools,
-        listType: _ctx.listType,
-        beforeUploadClick: _ctx.beforeUploadClick,
-        beforeItemEdit: _ctx.beforeItemEdit,
-        locale: _ctx.locale,
-        onUpload: handleItemUpload,
-        onRetry: _cache[1] || (_cache[1] = (item) => handleItemUpload(item, true)),
-        onRemove: handleItemRemove,
-        onEditUpload: handleItemEditUpload,
-        onItemClick: handleItemClick,
-        onPreview: handleItemPreview
-      }, createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots), (name) => {
-          return {
-            name,
-            fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1032, ["modelValue", "readonly", "disabled", "preview", "limit", "multiple", "drag", "accept", "itemStyle", "buttonStyle", "sortable", "imageProps", "progressProps", "previewProps", "tools", "listType", "beforeUploadClick", "beforeItemEdit", "locale"]);
-    };
-  }
-});
-export {
-  _sfc_main as default
-};