From 0828d7376b452b5e34f3466845122c303ec9d769 Mon Sep 17 00:00:00 2001 From: YuanFeng <770153798@qq.com> Date: Wed, 9 Oct 2024 09:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=A8=BF=E4=BB=B6?= =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/core/utils/FileTypeUtils.java | 2 -- .../DraftDesign/components/DesignPropEdit.vue | 21 ++++++++++++- .../DraftDesign/components/DesignPropEdit.vue | 31 ++++++++++++------- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/hangtag-module-infra/hangtag-module-infra-biz/src/main/java/cn/hangtag/module/infra/framework/file/core/utils/FileTypeUtils.java b/hangtag-module-infra/hangtag-module-infra-biz/src/main/java/cn/hangtag/module/infra/framework/file/core/utils/FileTypeUtils.java index 72a150b..82d3259 100644 --- a/hangtag-module-infra/hangtag-module-infra-biz/src/main/java/cn/hangtag/module/infra/framework/file/core/utils/FileTypeUtils.java +++ b/hangtag-module-infra/hangtag-module-infra-biz/src/main/java/cn/hangtag/module/infra/framework/file/core/utils/FileTypeUtils.java @@ -59,8 +59,6 @@ public class FileTypeUtils { * @param content 附件内容 */ public static void writeAttachment(HttpServletResponse response, String filename, byte[] content) throws IOException { - System.out.println("filename@@"+filename); - System.out.println("filename@@length"+content.length); // 设置 header 和 contentType response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); String contentType = getMineType(content, filename); diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue index 84ecb79..d67f4c6 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue @@ -102,7 +102,26 @@ size="large" style="min-width: 280px;width: 100%" /> - +
+
+ + +
占比
+ + + + + +
%
+ + +
+
diff --git a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue index 2196d1e..d67f4c6 100644 --- a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue +++ b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue @@ -102,7 +102,26 @@ size="large" style="min-width: 280px;width: 100%" /> - +
+
+ + +
占比
+ + + + + +
%
+ + +
+
@@ -599,13 +618,6 @@ const changeType = () => { previewByDraftDesignId(that.draftDesignId, that.propInfo) } const getPropInfo = () => { - let draftDesignInfo = {}; - for (let i = 0; i < that.draftDesignList.length; i++) { - if (that.draftDesignList[i].id === that.draftDesignId) { - draftDesignInfo = that.draftDesignList[i]; - break; - } - } if (that.changeCount > 0) { return new Promise((resolve) => { draftDesignEditRef.value.init(false, that.pageConfig, that.data, that.propInfo).then(() => { @@ -613,14 +625,12 @@ const getPropInfo = () => { // 成功后再获取图片 draftDesignEditRef.value.toPngUrl((url) => { that.previewData = url - const info = draftDesignEditRef.value.getPropInfo(); resolve({ draftDesignData: draftDesignEditRef.value.getJson(), propOrderByList: info.propOrderByList, // 设计稿id draftDesignId: that.draftDesignId, - draftDesignInfo: draftDesignInfo, previewImage: that.previewData, propInfo: that.propInfo }) @@ -643,7 +653,6 @@ const getPropInfo = () => { propOrderByList: info.propOrderByList, // 设计稿id draftDesignId: that.draftDesignId, - draftDesignInfo: draftDesignInfo, previewImage: that.previewData, propInfo: that.propInfo })