yuang-framework-ui-pc 1.1.75 → 1.1.77

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

@@ -1,35 +1,22 @@
-import { FrameworkAttachmentComponentParam } from 'yuang-framework-ui-common/lib/interface/component/ComponentParam';
 import { FrameworkAttachment } from 'yuang-framework-ui-common/lib/interface/framework/frameworkAttachment';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<any>;
+    modelValue: import('vue').PropType<string>;
     param: {
-        type: import('vue').PropType<FrameworkAttachmentComponentParam>;
-        required: true;
-        default: {
-            type: string;
-            mode: string;
-            maxCount: number;
-            maxSize: number;
-        };
+        type: import('vue').PropType<{}>;
+        default: any;
     };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (frameworkAttachment: FrameworkAttachment) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<any>;
+    modelValue: import('vue').PropType<string>;
     param: {
-        type: import('vue').PropType<FrameworkAttachmentComponentParam>;
-        required: true;
-        default: {
-            type: string;
-            mode: string;
-            maxCount: number;
-            maxSize: number;
-        };
+        type: import('vue').PropType<{}>;
+        default: any;
     };
 }>> & Readonly<{
     onChange?: ((frameworkAttachment: FrameworkAttachment) => any) | undefined;
 }>, {
-    param: FrameworkAttachmentComponentParam;
+    param: {};
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,20 +1,15 @@
-import { defineComponent, mergeModels, ref, useModel, onMounted, watch, resolveComponent, createBlock, openBlock } from "vue";
+import { defineComponent, mergeModels, useModel, computed, ref, onMounted, watch, resolveComponent, createBlock, openBlock } from "vue";
 import { ElMessageBox } from "element-plus/es";
 import { EleMessage } from "../utils/message";
 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";
+import require$$0 from "/Users/mac/Work/yuang-union/source-code/yuang-framework/yuang-framework-ui-pc/node_modules/image-conversion/build/conversion.js";
+var imageConversion = require$$0;
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "YuFrameworkAttachmentUpload" },
   __name: "index",
   props: /* @__PURE__ */ mergeModels({
-    modelValue: {},
-    param: { default: {
-      type: "edit",
-      mode: "file",
-      maxCount: 5,
-      maxSize: 5
-    } }
+    param: { default: {} }
   }, {
     "modelValue": {},
     "modelModifiers": {}
@@ -23,31 +18,44 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const modelValue = useModel(__props, "modelValue");
+    const componentParam = computed(() => ({
+      modelValue: modelValue.value,
+      // 类型，默认值：edit
+      type: "edit",
+      // 模式，默认值：file
+      mode: "file",
+      // 最大数量，默认值：5
+      maxCount: 5,
+      // 最大大小，默认值：5，单位：M
+      maxSize: 5,
+      // 是否压缩图片，默认值：false
+      isCompressImage: false,
+      ...props.param
+    }));
     const fileList = ref([]);
-    const listType = ref(props.param.mode);
+    const listType = ref(componentParam.value.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";
+    if (componentParam.value.mode == "file") {
+      accept.value = [".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".wps", ".dps", ".et", ".htm", ".html", ".js", ".css", ".svg", ".txt", ".sql", ".zip", ".rar", ".gz", ".bz2", ".mp3", ".mp4", ".mov", ".gif", ".jpg", ".jpeg", ".png", ".bmp"].join(",");
+    } else if (componentParam.value.mode == "image") {
+      accept.value = [".gif", ".jpg", ".jpeg", ".png", ".bmp"].join(",");
     }
     const isLoading = ref(false);
     const checkFile = (file) => {
       if (!file) {
         return;
       }
-      if (props.param.mode === "image" && !file.type.startsWith("image")) {
+      if (componentParam.value.mode === "image" && !file.type.startsWith("image")) {
         EleMessage.error("只能选择图片");
         return;
       }
-      if (file.size / 1024 / 1024 > props.param.maxSize) {
-        EleMessage.error(`图片大小不能超过${props.param.maxSize}MB`);
+      if (file.size / 1024 / 1024 > componentParam.value.maxSize) {
+        EleMessage.error(`图片大小不能超过${componentParam.value.maxSize}MB`);
         return;
       }
       return true;
     };
-    const model = useModel(__props, "modelValue");
-    model.value = model.value ?? getShortUuid();
     let isExecuting = false;
     let pendingExecute = false;
     onMounted(() => {
@@ -60,7 +68,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       isExecuting = true;
       fileList.value = [];
-      http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: model.value, pageSize: 100 }).then((res) => {
+      if (!modelValue.value) {
+        EleMessage.error("参数[modelValue]为空");
+        return;
+      }
+      http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: modelValue.value, pageSize: 100 }).then((res) => {
         let attachemtList = res.data.data.records;
         for (let i = 0; i < attachemtList.length; i++) {
           fileList.value.push({
@@ -79,7 +91,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    const handleUpload = (uploadItem, retry) => {
+    const handleUpload = async (uploadItem, retry) => {
       if (!checkFile(uploadItem.file)) {
         return;
       }
@@ -93,9 +105,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       item.status = "uploading";
       item.progress = 0;
+      let uploadFile = uploadItem.file;
+      if (componentParam.value.mode === "image" && componentParam.value.isCompressImage && uploadFile) {
+        let beforeCompressSize = uploadFile.size;
+        try {
+          const compressBlob = await imageConversion.compressAccurately(uploadFile, 512);
+          uploadFile = new File([compressBlob], uploadFile.name, { type: uploadFile.type });
+          console.log(`压缩前：${(beforeCompressSize / 1024).toFixed(2)}KB | 压缩后：${(uploadFile.size / 1024).toFixed(2)}KB`);
+        } catch (error) {
+          EleMessage.warning("图片压缩失败，将上传原图");
+          console.error("图片压缩异常：", error);
+        }
+      }
       let formData = new FormData();
-      formData.append("code", model.value);
-      formData.append("multipartFile", uploadItem.file, uploadItem.file.name);
+      formData.append("code", modelValue.value);
+      formData.append("multipartFile", uploadFile, uploadFile.name);
       http({
         url: `${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/uploadAttachment`,
         method: "post",
@@ -115,7 +139,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         EleMessage.error(e.message);
       });
     };
-    const handleEditUpload = ({ item, newItem }) => {
+    const handleEditUpload = async ({ item, newItem }) => {
       if (!checkFile(newItem.file)) {
         return;
       }
@@ -123,10 +147,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       console.log("newItem", newItem);
       newItem.status = "uploading";
       newItem.progress = 0;
+      let uploadFile = newItem.file;
+      if (componentParam.value.mode === "image" && componentParam.value.isCompressImage && uploadFile) {
+        let beforeCompressSize = uploadFile.size;
+        try {
+          const compressBlob = await imageConversion.compressAccurately(uploadFile, 512);
+          uploadFile = new File([compressBlob], uploadFile.name, { type: uploadFile.type });
+          console.log(`压缩前：${(beforeCompressSize / 1024).toFixed(2)}KB | 压缩后：${(uploadFile.size / 1024).toFixed(2)}KB`);
+        } catch (error) {
+          EleMessage.warning("图片压缩失败，将上传原图");
+          console.error("图片压缩异常：", error);
+        }
+      }
       let formData = new FormData();
       formData.append("id", item.id);
-      formData.append("code", model.value);
-      formData.append("multipartFile", newItem.file, newItem.file.name);
+      formData.append("code", modelValue.value);
+      formData.append("multipartFile", uploadFile, uploadFile.name);
       http({
         url: `${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/uploadAttachment`,
         method: "post",
@@ -151,7 +187,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const emitChange = () => {
-      http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: model.value, pageSize: 100 }).then((res) => {
+      if (!modelValue.value) {
+        EleMessage.error("参数[modelValue]为空");
+        return;
+      }
+      http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: modelValue.value, pageSize: 100 }).then((res) => {
         let attachemtList = res.data.data.records;
         emit("change", attachemtList);
       });
@@ -176,7 +216,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     watch(
-      () => props.param,
+      () => componentParam,
       () => {
         init();
       },

package/es/yu-uims-user-dialog/components/user-list.js

@@ -150,6 +150,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...queryParam,
         ...pageParam,
         orderParamList,
+        queryForMode: "organization",
         organizationIdForEqual: props.uimsOrganization.id,
         // 查询用户存在的角色id
         selectUserExistsRoleIdForEqual: ((_a = props.param) == null ? void 0 : _a.isDisableSelectUserOfExistsRole) && ((_b = props.param) == null ? void 0 : _b.selectUserExistsRoleId)

package/lib/yu-framework-attachment-upload/index.cjs

@@ -3,19 +3,14 @@ const vue = require("vue");
 const es = require("element-plus/es");
 const message = require("../utils/message");
 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 require$$0 = require("/Users/mac/Work/yuang-union/source-code/yuang-framework/yuang-framework-ui-pc/node_modules/image-conversion/build/conversion.js");
+var imageConversion = require$$0;
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "YuFrameworkAttachmentUpload" },
   __name: "index",
   props: /* @__PURE__ */ vue.mergeModels({
-    modelValue: {},
-    param: { default: {
-      type: "edit",
-      mode: "file",
-      maxCount: 5,
-      maxSize: 5
-    } }
+    param: { default: {} }
   }, {
     "modelValue": {},
     "modelModifiers": {}
@@ -24,31 +19,44 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const modelValue = vue.useModel(__props, "modelValue");
+    const componentParam = vue.computed(() => ({
+      modelValue: modelValue.value,
+      // 类型，默认值：edit
+      type: "edit",
+      // 模式，默认值：file
+      mode: "file",
+      // 最大数量，默认值：5
+      maxCount: 5,
+      // 最大大小，默认值：5，单位：M
+      maxSize: 5,
+      // 是否压缩图片，默认值：false
+      isCompressImage: false,
+      ...props.param
+    }));
     const fileList = vue.ref([]);
-    const listType = vue.ref(props.param.mode);
+    const listType = vue.ref(componentParam.value.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";
+    if (componentParam.value.mode == "file") {
+      accept.value = [".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".wps", ".dps", ".et", ".htm", ".html", ".js", ".css", ".svg", ".txt", ".sql", ".zip", ".rar", ".gz", ".bz2", ".mp3", ".mp4", ".mov", ".gif", ".jpg", ".jpeg", ".png", ".bmp"].join(",");
+    } else if (componentParam.value.mode == "image") {
+      accept.value = [".gif", ".jpg", ".jpeg", ".png", ".bmp"].join(",");
     }
     const isLoading = vue.ref(false);
     const checkFile = (file) => {
       if (!file) {
         return;
       }
-      if (props.param.mode === "image" && !file.type.startsWith("image")) {
+      if (componentParam.value.mode === "image" && !file.type.startsWith("image")) {
         message.EleMessage.error("只能选择图片");
         return;
       }
-      if (file.size / 1024 / 1024 > props.param.maxSize) {
-        message.EleMessage.error(`图片大小不能超过${props.param.maxSize}MB`);
+      if (file.size / 1024 / 1024 > componentParam.value.maxSize) {
+        message.EleMessage.error(`图片大小不能超过${componentParam.value.maxSize}MB`);
         return;
       }
       return true;
     };
-    const model = vue.useModel(__props, "modelValue");
-    model.value = model.value ?? uuidUtils.getShortUuid();
     let isExecuting = false;
     let pendingExecute = false;
     vue.onMounted(() => {
@@ -61,7 +69,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       isExecuting = true;
       fileList.value = [];
-      httpConfig.http.post(`${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: model.value, pageSize: 100 }).then((res) => {
+      if (!modelValue.value) {
+        message.EleMessage.error("参数[modelValue]为空");
+        return;
+      }
+      httpConfig.http.post(`${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: modelValue.value, pageSize: 100 }).then((res) => {
         let attachemtList = res.data.data.records;
         for (let i = 0; i < attachemtList.length; i++) {
           fileList.value.push({
@@ -80,7 +92,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       });
     };
-    const handleUpload = (uploadItem, retry) => {
+    const handleUpload = async (uploadItem, retry) => {
       if (!checkFile(uploadItem.file)) {
         return;
       }
@@ -94,9 +106,21 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       item.status = "uploading";
       item.progress = 0;
+      let uploadFile = uploadItem.file;
+      if (componentParam.value.mode === "image" && componentParam.value.isCompressImage && uploadFile) {
+        let beforeCompressSize = uploadFile.size;
+        try {
+          const compressBlob = await imageConversion.compressAccurately(uploadFile, 512);
+          uploadFile = new File([compressBlob], uploadFile.name, { type: uploadFile.type });
+          console.log(`压缩前：${(beforeCompressSize / 1024).toFixed(2)}KB | 压缩后：${(uploadFile.size / 1024).toFixed(2)}KB`);
+        } catch (error) {
+          message.EleMessage.warning("图片压缩失败，将上传原图");
+          console.error("图片压缩异常：", error);
+        }
+      }
       let formData = new FormData();
-      formData.append("code", model.value);
-      formData.append("multipartFile", uploadItem.file, uploadItem.file.name);
+      formData.append("code", modelValue.value);
+      formData.append("multipartFile", uploadFile, uploadFile.name);
       httpConfig.http({
         url: `${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/uploadAttachment`,
         method: "post",
@@ -116,7 +140,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         message.EleMessage.error(e.message);
       });
     };
-    const handleEditUpload = ({ item, newItem }) => {
+    const handleEditUpload = async ({ item, newItem }) => {
       if (!checkFile(newItem.file)) {
         return;
       }
@@ -124,10 +148,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       console.log("newItem", newItem);
       newItem.status = "uploading";
       newItem.progress = 0;
+      let uploadFile = newItem.file;
+      if (componentParam.value.mode === "image" && componentParam.value.isCompressImage && uploadFile) {
+        let beforeCompressSize = uploadFile.size;
+        try {
+          const compressBlob = await imageConversion.compressAccurately(uploadFile, 512);
+          uploadFile = new File([compressBlob], uploadFile.name, { type: uploadFile.type });
+          console.log(`压缩前：${(beforeCompressSize / 1024).toFixed(2)}KB | 压缩后：${(uploadFile.size / 1024).toFixed(2)}KB`);
+        } catch (error) {
+          message.EleMessage.warning("图片压缩失败，将上传原图");
+          console.error("图片压缩异常：", error);
+        }
+      }
       let formData = new FormData();
       formData.append("id", item.id);
-      formData.append("code", model.value);
-      formData.append("multipartFile", newItem.file, newItem.file.name);
+      formData.append("code", modelValue.value);
+      formData.append("multipartFile", uploadFile, uploadFile.name);
       httpConfig.http({
         url: `${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/uploadAttachment`,
         method: "post",
@@ -152,7 +188,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const emitChange = () => {
-      httpConfig.http.post(`${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: model.value, pageSize: 100 }).then((res) => {
+      if (!modelValue.value) {
+        message.EleMessage.error("参数[modelValue]为空");
+        return;
+      }
+      httpConfig.http.post(`${applicationConfig.application.gatewayServerBaseUrl}/framework-api/core/framework-attachment/selectPage`, { codeForEqual: modelValue.value, pageSize: 100 }).then((res) => {
         let attachemtList = res.data.data.records;
         emit("change", attachemtList);
       });
@@ -177,7 +217,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     );
     vue.watch(
-      () => props.param,
+      () => componentParam,
       () => {
         init();
       },

package/lib/yu-framework-attachment-upload/index.d.ts

@@ -1,35 +1,22 @@
-import { FrameworkAttachmentComponentParam } from 'yuang-framework-ui-common/lib/interface/component/ComponentParam';
 import { FrameworkAttachment } from 'yuang-framework-ui-common/lib/interface/framework/frameworkAttachment';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<any>;
+    modelValue: import('vue').PropType<string>;
     param: {
-        type: import('vue').PropType<FrameworkAttachmentComponentParam>;
-        required: true;
-        default: {
-            type: string;
-            mode: string;
-            maxCount: number;
-            maxSize: number;
-        };
+        type: import('vue').PropType<{}>;
+        default: any;
     };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (frameworkAttachment: FrameworkAttachment) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modelValue: import('vue').PropType<any>;
+    modelValue: import('vue').PropType<string>;
     param: {
-        type: import('vue').PropType<FrameworkAttachmentComponentParam>;
-        required: true;
-        default: {
-            type: string;
-            mode: string;
-            maxCount: number;
-            maxSize: number;
-        };
+        type: import('vue').PropType<{}>;
+        default: any;
     };
 }>> & Readonly<{
     onChange?: ((frameworkAttachment: FrameworkAttachment) => any) | undefined;
 }>, {
-    param: FrameworkAttachmentComponentParam;
+    param: {};
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/yu-uims-user-dialog/components/user-list.cjs

@@ -151,6 +151,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         ...queryParam,
         ...pageParam,
         orderParamList,
+        queryForMode: "organization",
         organizationIdForEqual: props.uimsOrganization.id,
         // 查询用户存在的角色id
         selectUserExistsRoleIdForEqual: ((_a = props.param) == null ? void 0 : _a.isDisableSelectUserOfExistsRole) && ((_b = props.param) == null ? void 0 : _b.selectUserExistsRoleId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-pc",
-  "version": "1.1.75",
+  "version": "1.1.77",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts --mode dev",
@@ -188,6 +188,7 @@
   "repository": "",
   "license": "",
   "dependencies": {
+    "image-conversion": "^2.1.1",
     "yuang-framework-ui-common": "^1.0.86"
   }
 }