fix: 优化物模型属性-指标值
This commit is contained in:
parent
1e71f066cc
commit
4da460a703
|
@ -43,7 +43,7 @@
|
|||
>
|
||||
<template #bodyCell="{column, record}">
|
||||
<span v-if="column.dataIndex === 'value'">
|
||||
{{ record.range === 'true' ? record.value?.join('-') : record.value }}
|
||||
{{ record.range === true ? record.value?.join('-') : record.value }}
|
||||
</span>
|
||||
</template>
|
||||
</j-table>
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
ref="tableRef"
|
||||
>
|
||||
<template #range="{data}">
|
||||
{{ data.record.range === 'true' ? '范围值' : '固定值'}}
|
||||
{{ data.record.range === true ? '范围值' : '固定值'}}
|
||||
</template>
|
||||
<template #value="{data}">
|
||||
{{ data.record.range === 'true' ? data.record.value?.join('-') : data.record.value }}
|
||||
{{ data.record.range === true ? data.record.value?.join('-') : data.record.value }}
|
||||
</template>
|
||||
<template #action="{data}">
|
||||
<j-button
|
||||
|
@ -92,9 +92,9 @@ const newColumns = computed(() => {
|
|||
components: {
|
||||
props: {
|
||||
trueText: '范围值',
|
||||
trueValue: 'true',
|
||||
trueValue: true,
|
||||
falseText: '固定值',
|
||||
falseValue: 'false',
|
||||
falseValue: false,
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -59,8 +59,8 @@ const formData = reactive<{
|
|||
value: ValueType;
|
||||
rangeValue: ValueType;
|
||||
}>({
|
||||
value: props.value.range === 'false' ? props.value.value : undefined,
|
||||
rangeValue: props.value.range === 'true'
|
||||
value: props.value.range === false ? props.value.value : undefined,
|
||||
rangeValue: props.value.range === true
|
||||
? props.value.value || [undefined, undefined]
|
||||
: [undefined, undefined],
|
||||
});
|
||||
|
@ -68,7 +68,7 @@ const formData = reactive<{
|
|||
const formRef = ref()
|
||||
|
||||
const showText = computed(() => {
|
||||
if (props.value.range === 'false') {
|
||||
if (props.value.range === false) {
|
||||
return props.value.value || ''
|
||||
} else {
|
||||
return props.value.value?.[0] ? props.value.value.join('-') : ''
|
||||
|
@ -78,7 +78,7 @@ const showText = computed(() => {
|
|||
const confirm = () => {
|
||||
return new Promise((resolve, reject) => {
|
||||
formRef.value.validate().then(() => {
|
||||
const value = props.value.range === 'true' ? formData.rangeValue : formData.value
|
||||
const value = props.value.range === true ? formData.rangeValue : formData.value
|
||||
emit('update:value', {
|
||||
...props.value,
|
||||
value: value
|
||||
|
@ -93,7 +93,7 @@ const confirm = () => {
|
|||
|
||||
watch(() => props.value.range,(value, oldValue) => {
|
||||
if (value !== oldValue ) {
|
||||
if (value === 'false') {
|
||||
if (value === false) {
|
||||
formData.value = undefined
|
||||
} else {
|
||||
formData.rangeValue = [undefined, undefined]
|
||||
|
|
Loading…
Reference in New Issue