From 2670f4ff19159870759415fae9ed387ba72dccf6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sat, 12 Oct 2024 14:02:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E9=9B=86=E9=80=89=E6=8B=A9?= =?UTF-8?q?=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 --- .../components/visualization/ComponentEditBar.vue | 15 +++++++++++---- .../picture-group/PictureGroupDatasetSelect.vue | 1 + .../editor/dataset-select/DatasetSelect.vue | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue index 3e4d986f08..b4adb45c34 100644 --- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue +++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue @@ -48,7 +48,7 @@ effect="dark" :placement="showBarTooltipPosition" content="查看数据" - v-if="element.innerType !== 'rich-text' && barShowCheck('details')" + v-if="!['picture-group', 'rich-text'].includes(element.innerType) && barShowCheck('details')" > @@ -113,12 +113,19 @@ > 查看数据 @@ -162,7 +169,7 @@ trigger="click" placement="right-start" v-if=" - element.innerType !== 'rich-text' && + !['picture-group', 'rich-text'].includes(element.innerType) && barShowCheck('previewDownload') && authShow && showDownload diff --git a/core/core-frontend/src/custom-component/picture-group/PictureGroupDatasetSelect.vue b/core/core-frontend/src/custom-component/picture-group/PictureGroupDatasetSelect.vue index 1334b8c1b2..f5041d84a9 100644 --- a/core/core-frontend/src/custom-component/picture-group/PictureGroupDatasetSelect.vue +++ b/core/core-frontend/src/custom-component/picture-group/PictureGroupDatasetSelect.vue @@ -52,6 +52,7 @@ const onDatasetUpdate = () => { style="flex: 1" :view-id="view.id" :themes="themes" + :disabled="!view.senior.threshold.enable" @on-dataset-change="onDatasetUpdate" :state-obj="state" /> diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue index b2784153e1..95b4c4eb5c 100644 --- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue @@ -24,13 +24,15 @@ const props = withDefaults( themes?: EditorTheme modelValue?: string | number stateObj: any + disabled: boolean viewId: string sourceType: string }>(), { datasetTree: () => [], themes: 'dark', - sourceType: 'dataset' + sourceType: 'dataset', + disabled: false } ) @@ -268,6 +270,7 @@ onMounted(() => { v-model="selectedNodeName" class="data-set-dark" @focus="handleFocus" + :disabled="disabled" :placeholder="'请选择' + sourceName" >