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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -2139,7 +2139,7 @@ defineExpose({
</div> </div>
</div> </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="隐藏条件切换" /> <el-checkbox v-model="curComponent.hideConditionSwitching" label="隐藏条件切换" />
</div> </div>
<condition-default-configuration <condition-default-configuration

8
core/core-frontend/src/views/visualized/data/dataset/form/UnionItemEdit.vue
View File

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