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

fix(仪表板): 脱敏字段制作图表逻辑恢复

Browse Source
This commit is contained in:
dataeaseShu 2024-07-03 10:49:41 +08:00
parent 1fe2eba381
commit e62161e775
4 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue
View File

@ -159,10 +159,6 @@ const removeItem = () => {
}
const getItemTagType = () => {
if (props.chart.type !== 'table-info' && props.item.desensitized) {
tagType.value = '#F54A45'
return
}
tagType.value = getItemType(props.dimensionData, props.quotaData, props.item)
}
@ -213,10 +209,7 @@ onMounted(() => {
:content="item.chartShowName ? item.chartShowName : item.name"
>
<span class="item-span-style">
<span class="item-name"
>{{ item.chartShowName ? item.chartShowName : item.name
}}{{ item.desensitized ? '(已脱敏)' : '' }}</span
>
<span class="item-name">{{ item.chartShowName ? item.chartShowName : item.name }}</span>
</span>
</el-tooltip>

8
core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue
View File

@ -74,10 +74,6 @@ const removeItem = () => {
emit('onDimensionItemRemove', item.value)
}
const getItemTagType = () => {
if (props.chart.type !== 'table-info' && props.item.desensitized) {
tagType.value = '#F54A45'
return
}
tagType.value = getItemType(props.dimensionData, props.quotaData, props.item)
}
onMounted(() => {
@ -101,9 +97,7 @@ onMounted(() => {
></Icon>
</el-icon>
</span>
<span class="item-span-style" :title="item.name"
>{{ item.name }}{{ item.desensitized ? '(已脱敏)' : '' }}</span
>
<span class="item-span-style" :title="item.name">{{ item.name }}</span>
<el-icon class="child remove-icon" size="14px">
<Icon name="icon_delete-trash_outlined" class-name="inner-class" @click="removeItem" />
</el-icon>

9
core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
View File

@ -214,10 +214,6 @@ const removeItem = () => {
}
const getItemTagType = () => {
if (props.chart.type !== 'table-info' && props.item.desensitized) {
tagType.value = '#F54A45'
return
}
tagType.value = getItemType(props.dimensionData, props.quotaData, props.item)
}
@ -308,10 +304,7 @@ onMounted(() => {
:content="item.chartShowName ? item.chartShowName : item.name"
>
<span class="item-span-style">
<span class="item-name"
>{{ item.chartShowName ? item.chartShowName : item.name
}}{{ item.desensitized ? '(已脱敏)' : '' }}</span
>
<span class="item-name">{{ item.chartShowName ? item.chartShowName : item.name }}</span>
<span v-if="item.summary !== ''" class="item-right-summary">
({{ t('chart.' + item.summary) }})
</span>

10
core/core-frontend/src/views/chart/components/editor/index.vue
View File

@ -1555,16 +1555,10 @@ const dragOver = (ev: MouseEvent) => {
}
const drop = (ev: MouseEvent, type = 'xAxis') => {
let hasSesensitized = false
ev.preventDefault()
const arr = activeDimension.value.length ? activeDimension.value : activeQuota.value
for (let i = 0; i < arr.length; i++) {
const obj = cloneDeep(arr[i])
if (obj.desensitized && view.value.type !== 'table-info') {
hasSesensitized = true
continue
}
state.moveId = obj.id as unknown as number
view.value[type].push(obj)
const e = { newDraggableIndex: view.value[type].length - 1 }
@ -1575,10 +1569,6 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
addAxis(e, type as AxisType)
}
}
if (hasSesensitized) {
ElMessage.error('脱敏字段不能用于制作该图表!')
}
}
const fieldLoading = ref(false)