From 75f06e4a9d95056dc353f28065088d4893d9eda5 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 27 Dec 2023 09:22:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E5=88=86=E7=BB=84=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=87=AA=E9=80=82=E5=BA=94=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/data-visualization/canvas/Shape.vue | 8 ++++++++ .../src/store/modules/data-visualization/compose.ts | 3 +++ 2 files changed, 11 insertions(+) diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index 936e4e1a9d..a6c2234383 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -529,6 +529,7 @@ const handleMouseDownOnShape = e => { eventBus.emit('onTabMoveOut-' + tabMoveOutComponentId.value, deepCopy(element.value)) dvMainStore.setTabMoveOutComponentId(null) } + handleGroupComponent() } document.addEventListener('mousemove', move) @@ -648,6 +649,7 @@ const handleMouseDownOnPoint = (point, e) => { document.removeEventListener('mousemove', move) document.removeEventListener('mouseup', up) needSave && snapshotStore.recordSnapshotCache('shape-handleMouseDownOnPoint-up') + handleGroupComponent() } document.addEventListener('mousemove', move) @@ -847,6 +849,12 @@ const htmlToImage = () => { }, 200) } +const handleGroupComponent = () => { + if (element.value.canvasId.includes('Group')) { + composeStore.updateGroupBorder() + } +} + onMounted(() => { parentNode.value = document.querySelector('#editor-' + canvasId.value) // 用于 Group 组件 diff --git a/core/core-frontend/src/store/modules/data-visualization/compose.ts b/core/core-frontend/src/store/modules/data-visualization/compose.ts index cb92dca7b5..f5bca7ae78 100644 --- a/core/core-frontend/src/store/modules/data-visualization/compose.ts +++ b/core/core-frontend/src/store/modules/data-visualization/compose.ts @@ -52,6 +52,9 @@ export const composeStore = defineStore('compose', { setAreaData(data) { this.areaData = data }, + updateGroupBorder() { + // do updateGroupBorder + }, compose: function (canvasId = 'canvas-main') { const editor = this.editorMap[canvasId] From 84e5067528e46decd67c1a46da35f5fafa94a214 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 27 Dec 2023 09:55:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20maven=E6=89=93=E5=8C=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml index a844bbe46e..3493e54e38 100644 --- a/core/core-backend/pom.xml +++ b/core/core-backend/pom.xml @@ -263,15 +263,15 @@ **/*.xlsx - static + static/**/*.* src/main/resources - - static - false + + static/**/*.* + From a5b061d74b77b51112883add901daac42f006d73 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 27 Dec 2023 10:36:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=87=8D=E5=91=BD=E5=90=8D=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/component/DeTemplateList.vue | 8 ++--- .../src/views/template/index.vue | 34 +++++-------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/core/core-frontend/src/views/template/component/DeTemplateList.vue b/core/core-frontend/src/views/template/component/DeTemplateList.vue index 6466fc7e8e..21f770b083 100644 --- a/core/core-frontend/src/views/template/component/DeTemplateList.vue +++ b/core/core-frontend/src/views/template/component/DeTemplateList.vue @@ -55,7 +55,7 @@ const emits = defineEmits([ 'showCurrentTemplate', 'showTemplateEditDialog', 'categoryDelete', - 'templateEdit', + 'categoryEdit', 'templateImport' ]) @@ -86,7 +86,7 @@ const templateListComputed = computed(() => { const clickMore = (type, data) => { switch (type) { case 'edit': - templateEdit(data) + categoryEdit(data) break case 'delete': categoryDelete(data) @@ -114,8 +114,8 @@ const categoryDelete = template => { emits('categoryDelete', template.id) }) } -const templateEdit = template => { - emits('templateEdit', template) +const categoryEdit = template => { + emits('categoryEdit', template) } const templateImport = template => { emits('templateImport', template.id) diff --git a/core/core-frontend/src/views/template/index.vue b/core/core-frontend/src/views/template/index.vue index ed64f808c9..cd1ebd4067 100644 --- a/core/core-frontend/src/views/template/index.vue +++ b/core/core-frontend/src/views/template/index.vue @@ -34,9 +34,8 @@ :template-type="state.currentTemplateType" :template-list="state.templateCategories" @categoryDelete="categoryDelete" - @templateEdit="templateEdit" + @categoryEdit="categoryEdit" @showCurrentTemplate="showCurrentTemplate" - @templateImport="templateImport" @showTemplateEditDialog="showTemplateEditDialog" /> @@ -143,27 +142,6 @@ - - - - - { state.editTemplate = true } +const categoryEdit = templateInfo => { + showTemplateEditDialog('edit', templateInfo) +} + const templateEdit = templateInfo => { state.templateDialog.visible = true state.templateDialog.title = '编辑模版' @@ -482,9 +464,10 @@ const categoryClick = params => { const saveTemplateEdit = templateEditForm => { templateEditFormRef.value.validate(valid => { if (valid) { - save(templateEditForm).then(response => { - close() + save({ ...templateEditForm }).then(response => { + state.currentTemplateLabel = templateEditForm.name getTree() + close() }) } else { return false @@ -492,7 +475,6 @@ const saveTemplateEdit = templateEditForm => { }) } const close = () => { - templateEditFormRef.value.resetFields() state.editTemplate = false } const getTree = () => {