forked from github/dataease
fix: 过滤组件上一个规则开启参数化再次添加规则时参数化选项自动开启但没有弹窗显示
This commit is contained in:
parent
751051d293
commit
017af37bfe
@ -192,7 +192,7 @@ const dragover = () => {
|
|||||||
|
|
||||||
const infoFormat = (obj: ComponentInfo) => {
|
const infoFormat = (obj: ComponentInfo) => {
|
||||||
const { id, name, deType, type, datasetId } = obj
|
const { id, name, deType, type, datasetId } = obj
|
||||||
const base = {
|
return {
|
||||||
id: guid(),
|
id: guid(),
|
||||||
name,
|
name,
|
||||||
showError: true,
|
showError: true,
|
||||||
@ -205,7 +205,6 @@ const infoFormat = (obj: ComponentInfo) => {
|
|||||||
deType
|
deType
|
||||||
},
|
},
|
||||||
auto: false,
|
auto: false,
|
||||||
operator: deType === 1 ? 'between' : 'eq',
|
|
||||||
defaultValue: undefined,
|
defaultValue: undefined,
|
||||||
selectValue: undefined,
|
selectValue: undefined,
|
||||||
optionValueSource: 0,
|
optionValueSource: 0,
|
||||||
@ -220,12 +219,11 @@ const infoFormat = (obj: ComponentInfo) => {
|
|||||||
multiple: false,
|
multiple: false,
|
||||||
displayType: '0',
|
displayType: '0',
|
||||||
checkedFields: [],
|
checkedFields: [],
|
||||||
|
parameters: [],
|
||||||
|
parametersCheck: false,
|
||||||
|
parametersList: [],
|
||||||
checkedFieldsMap: {}
|
checkedFieldsMap: {}
|
||||||
}
|
}
|
||||||
if (deType === 1) {
|
|
||||||
return base
|
|
||||||
}
|
|
||||||
return { ...base, parameters: [], parametersCheck: false, parametersList: [] }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const drop = e => {
|
const drop = e => {
|
||||||
|
@ -245,7 +245,6 @@ const multipleChange = (val: boolean, isMultipleChange = false) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
curComponent.value.multiple = val
|
curComponent.value.multiple = val
|
||||||
curComponent.value.operator = val ? 'in' : 'eq'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const validate = () => {
|
const validate = () => {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<script lang="tsx" setup>
|
<script lang="tsx" setup>
|
||||||
import { useI18n } from '@/hooks/web/useI18n'
|
import { useI18n } from '@/hooks/web/useI18n'
|
||||||
import { defineProps, reactive, toRefs, watch } from 'vue'
|
import { reactive, toRefs, watch } from 'vue'
|
||||||
import {
|
import {
|
||||||
compareYearList,
|
compareYearList,
|
||||||
compareMonthList,
|
compareMonthList,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<script lang="tsx" setup>
|
<script lang="tsx" setup>
|
||||||
import { useI18n } from '@/hooks/web/useI18n'
|
import { useI18n } from '@/hooks/web/useI18n'
|
||||||
import { defineProps, reactive, toRefs } from 'vue'
|
import { reactive, toRefs } from 'vue'
|
||||||
import { formatterType, unitType, valueFormatter } from '@/views/chart/components/js/formatter'
|
import { formatterType, unitType, valueFormatter } from '@/views/chart/components/js/formatter'
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
|
Loading…
Reference in New Issue
Block a user