From ea55a5c5516a886355b566a728d7c323e5b68a74 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 29 Oct 2024 17:37:16 +0800 Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BB=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom-component/component-group/MediaGroup.vue | 2 +- .../src/custom-component/component-list.ts | 1 + .../src/custom-component/picture-group/Component.vue | 11 +++++++++-- .../picture-group/PictureGroupUploadAttr.vue | 7 +------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/core/core-frontend/src/custom-component/component-group/MediaGroup.vue b/core/core-frontend/src/custom-component/component-group/MediaGroup.vue index b63e8fcd1d..1e1f5e5112 100644 --- a/core/core-frontend/src/custom-component/component-group/MediaGroup.vue +++ b/core/core-frontend/src/custom-component/component-group/MediaGroup.vue @@ -88,6 +88,6 @@ const handleDragEnd = e => { } .media-component { float: left; - margin: 0 6px !important; + margin: 0 6px 12px 6px !important; } diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts index a5307e9ce2..897ada7af9 100644 --- a/core/core-frontend/src/custom-component/component-list.ts +++ b/core/core-frontend/src/custom-component/component-list.ts @@ -318,6 +318,7 @@ const list = [ sizeX: 36, sizeY: 14, style: { + adaptation: 'adaptation', width: 600, height: 300 }, diff --git a/core/core-frontend/src/custom-component/picture-group/Component.vue b/core/core-frontend/src/custom-component/picture-group/Component.vue index 81ad517b91..c95e3d2afb 100644 --- a/core/core-frontend/src/custom-component/picture-group/Component.vue +++ b/core/core-frontend/src/custom-component/picture-group/Component.vue @@ -1,11 +1,17 @@ @@ -28,8 +34,9 @@ import { getData } from '@/api/chart' import { parseJson } from '@/views/chart/components/js/util' import { mappingColor } from '@/views/chart/components/js/panel/common/common_table' import { storeToRefs } from 'pinia' +import ChartEmptyInfo from '@/views/chart/components/views/components/ChartEmptyInfo.vue' const dvMainStore = dvMainStoreWithOut() -const { canvasViewInfo, editMode, mobileInPc } = storeToRefs(dvMainStore) +const { canvasViewInfo, editMode, mobileInPc, canvasStyleData } = storeToRefs(dvMainStore) const state = reactive({ emptyValue: '-', data: null, diff --git a/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue b/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue index 97088a63fa..58a8c94c3e 100644 --- a/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue +++ b/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue @@ -140,12 +140,7 @@ onBeforeUnmount(() => { - + 支持JPG、PNG、GIF、SVG