Merge pull request #12654 from dataease/pr@dev-v2@refactor_dataset-select

refactor(数据大屏、仪表板): 图表编辑数据集选择样式调整
This commit is contained in:
王嘉豪 2024-10-12 14:03:32 +08:00 committed by GitHub
commit 43815fa9a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions

View File

@ -48,7 +48,7 @@
effect="dark" effect="dark"
:placement="showBarTooltipPosition" :placement="showBarTooltipPosition"
content="查看数据" content="查看数据"
v-if="element.innerType !== 'rich-text' && barShowCheck('details')" v-if="!['picture-group', 'rich-text'].includes(element.innerType) && barShowCheck('details')"
> >
<span> <span>
<el-icon class="bar-base-icon" @click="userViewEnlargeOpen($event, 'details')"> <el-icon class="bar-base-icon" @click="userViewEnlargeOpen($event, 'details')">
@ -113,12 +113,19 @@
> >
<el-dropdown-item <el-dropdown-item
@click="userViewEnlargeOpen($event, 'details')" @click="userViewEnlargeOpen($event, 'details')"
v-if="element.innerType !== 'rich-text' && barShowCheck('details')" v-if="
!['picture-group', 'rich-text'].includes(element.innerType) &&
barShowCheck('details')
"
>查看数据</el-dropdown-item >查看数据</el-dropdown-item
> >
<el-dropdown-item <el-dropdown-item
style="padding: 0" style="padding: 0"
v-if="element.innerType !== 'rich-text' && barShowCheck('download') && showDownload" v-if="
!['picture-group', 'rich-text'].includes(element.innerType) &&
barShowCheck('download') &&
showDownload
"
@click.prevent @click.prevent
> >
<el-dropdown style="width: 100%" trigger="hover" placement="right-start"> <el-dropdown style="width: 100%" trigger="hover" placement="right-start">
@ -162,7 +169,7 @@
trigger="click" trigger="click"
placement="right-start" placement="right-start"
v-if=" v-if="
element.innerType !== 'rich-text' && !['picture-group', 'rich-text'].includes(element.innerType) &&
barShowCheck('previewDownload') && barShowCheck('previewDownload') &&
authShow && authShow &&
showDownload showDownload

View File

@ -52,6 +52,7 @@ const onDatasetUpdate = () => {
style="flex: 1" style="flex: 1"
:view-id="view.id" :view-id="view.id"
:themes="themes" :themes="themes"
:disabled="!view.senior.threshold.enable"
@on-dataset-change="onDatasetUpdate" @on-dataset-change="onDatasetUpdate"
:state-obj="state" :state-obj="state"
/> />

View File

@ -24,13 +24,15 @@ const props = withDefaults(
themes?: EditorTheme themes?: EditorTheme
modelValue?: string | number modelValue?: string | number
stateObj: any stateObj: any
disabled: boolean
viewId: string viewId: string
sourceType: string sourceType: string
}>(), }>(),
{ {
datasetTree: () => [], datasetTree: () => [],
themes: 'dark', themes: 'dark',
sourceType: 'dataset' sourceType: 'dataset',
disabled: false
} }
) )
@ -268,6 +270,7 @@ onMounted(() => {
v-model="selectedNodeName" v-model="selectedNodeName"
class="data-set-dark" class="data-set-dark"
@focus="handleFocus" @focus="handleFocus"
:disabled="disabled"
:placeholder="'请选择' + sourceName" :placeholder="'请选择' + sourceName"
> >
<template #suffix> <template #suffix>