center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2

Browse Source
This commit is contained in:
wangjiahao 2024-07-01 17:42:32 +08:00
commit 96506afebb
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
View File

@ -349,7 +349,7 @@ onMounted(() => {
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
</el-space> </el-space>
<div v-if="showProperty('showFields')"> <div v-if="showProperty('showFields') && !batchOptStatus">
<el-form-item :label="t('chart.label')" class="form-item" :class="'form-item-' + themes"> <el-form-item :label="t('chart.label')" class="form-item" :class="'form-item-' + themes">
<el-select <el-select
size="small" size="small"

2
core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
View File

@ -464,7 +464,7 @@ onMounted(() => {
</el-form-item> </el-form-item>
</el-space> </el-space>
<div v-if="showProperty('showFields')"> <div v-if="showProperty('showFields') && !batchOptStatus">
<el-form-item :label="t('chart.tooltip')" class="form-item" :class="'form-item-' + themes"> <el-form-item :label="t('chart.tooltip')" class="form-item" :class="'form-item-' + themes">
<el-select <el-select
size="small" size="small"

13
core/core-frontend/src/views/data-visualization/PreviewHead.vue
View File

@ -21,17 +21,8 @@ const embeddedStore = useEmbedded()
const favorited = ref(false) const favorited = ref(false)
const fullScreeRef = ref(null) const fullScreeRef = ref(null)
const preview = () => { const preview = () => {
if (isDataEaseBi.value) { const baseUrl = isDataEaseBi.value ? embeddedStore.baseUrl : ''
embeddedStore.clearState() const url = baseUrl + '#/preview?dvId=' + dvInfo.value.id
if (dvInfo.value.type === 'dataV') {
embeddedStore.setDvId(dvInfo.value.id)
} else {
embeddedStore.setResourceId(dvInfo.value.id)
}
useEmitt().emitter.emit('changeCurrentComponent', 'Preview')
return
}
const url = '#/preview?dvId=' + dvInfo.value.id
const newWindow = window.open(url, '_blank') const newWindow = window.open(url, '_blank')
initOpenHandler(newWindow) initOpenHandler(newWindow)
} }