Merge pull request #12539 from dataease/pr@dev-v2_st

fix(数据集): 数据集连表缺少标识
This commit is contained in:
dataeaseShu 2024-09-29 17:21:46 +08:00 committed by GitHub
commit cf2d3785a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View File

@ -2139,7 +2139,7 @@ defineExpose({
</div>
</div>
</div>
<div v-if="curComponent.displayType === '8'">
<div style="margin-bottom: 10.5px" v-if="curComponent.displayType === '8'">
<el-checkbox v-model="curComponent.hideConditionSwitching" label="隐藏条件切换" />
</div>
<condition-default-configuration

View File

@ -15,10 +15,10 @@ import { iconFieldMap } from '@/components/icon-group/field-list'
const unionTypeFromParent = ref('left')
const { t } = useI18n()
const iconName = {
left: 'icon_left-association',
right: 'icon_right-association',
inner: 'icon_intersect',
full: 'icon_full-association'
left: icon_leftAssociation,
right: icon_rightAssociation,
inner: icon_intersect,
full: icon_fullAssociation
}
const props = defineProps({
tableName: {