From 9681b4fb8abc4f393b60a8c0816f21cd2e556930 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Mon, 22 Sep 2025 15:30:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E6=96=B0=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E4=B8=8D=E5=A1=AB=E5=90=8D=E7=A7=B0=E6=97=B6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=94=A8=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/home/newProject/workspace.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index 20e99ae4..1a403a38 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -106,6 +106,7 @@ import { position } from 'html2canvas/dist/types/css/property-descriptors/positi import { id } from 'element-plus/es/locale'; import { message } from 'ant-design-vue'; import {projectList} from '@/tool/listData' +import { formatTime } from "@/tool/util"; export default defineComponent({ components:{ habitSetStyle,generalMenu,setBrandDNA @@ -202,7 +203,7 @@ export default defineComponent({ // } console.log(data.selectObject) let value = { - name:data.selectObject.name, + name:data.selectObject.name ? data.selectObject.name : formatTime(new Date().getTime() / 1000, 'YYYY-MM-DD hh:mm:ss'), process:props.httpWorkflowType, styleId:data.show.style?data.selectObject.styleId:null, id:data.selectObject.id == -1?'':data.selectObject.id, From d314a228ce0b8bf1cfe55399fafb2840e91805bc Mon Sep 17 00:00:00 2001 From: zhangyh Date: Mon, 22 Sep 2025 15:30:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BB=8E=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E4=B8=AD=E9=80=89=E6=8B=A9=E5=9B=BE=E7=89=87=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/CLibrary.svg | 1 + .../CanvasEditor/components/ToolsSidebar.vue | 12 + src/component/Canvas/CanvasEditor/index.vue | 7 + src/component/common/SelectImages.vue | 720 ++++++++++++++++++ src/component/home/design/tools.vue | 17 +- 5 files changed, 756 insertions(+), 1 deletion(-) create mode 100644 src/assets/icons/CLibrary.svg create mode 100644 src/component/common/SelectImages.vue diff --git a/src/assets/icons/CLibrary.svg b/src/assets/icons/CLibrary.svg new file mode 100644 index 00000000..b8524188 --- /dev/null +++ b/src/assets/icons/CLibrary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue index 678b8497..c3c2ab46 100644 --- a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue +++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue @@ -16,6 +16,7 @@ const emit = defineEmits([ "zoom-out", "toggle-red-green-mode", "undo-redo-status-changed", + "trigger-library" ]); const {t} = useI18n() const props = defineProps({ @@ -151,6 +152,13 @@ const normalToolsList = ref([ icon: { name: "CUpload", size: "26" }, class: "upload-btn", }, + { + id: "library", + title: t("LibraryPage.library"), + action: triggerLibrary, + icon: { name: "CLibrary", size: "26" }, + class: "library-btn", + }, { id: "addText", title: t("Canvas.AddText"), @@ -228,6 +236,10 @@ function triggerImageUpload() { emit("trigger-image-upload"); } +function triggerLibrary() { + emit("trigger-library"); +} + function addText() { emit("add-text"); } diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue index 632a8b44..4fab1a07 100644 --- a/src/component/Canvas/CanvasEditor/index.vue +++ b/src/component/Canvas/CanvasEditor/index.vue @@ -52,6 +52,7 @@ const emit = defineEmits([ "trigger-red-green-mouseup", // 红绿图模式鼠标抬起事件 "changeCanvas", // 画布变更事件 "canvasInit", // 画布初始化事件 + "trigger-library", // 触发打开Library选择图片事件 ]); const props = defineProps({ @@ -705,6 +706,11 @@ function handleImageUpload(event) { }); } +function triggerLibrary() { + console.log('打开收藏') + emit("trigger-library"); +} + function handleAddText() { if (toolManager && canvasManager && canvasManager.canvas) { // 在画布中央创建文本 @@ -1043,6 +1049,7 @@ defineExpose({ @zoom-in="zoomIn" @zoom-out="zoomOut" @undo-redo-status-changed="changeCanvas" + @trigger-library="triggerLibrary" >