JLNTV_IPD/tmagic-editor
4
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2025-04-06 03:57:56 +08:00
Code Issues Projects Releases Wiki Activity

fix(form): datarange组件如果传入utc时间,显示会出错

Browse Source
This commit is contained in:
roymondchen 2024-09-06 23:36:29 +08:00 committed by roymondchen
parent d3f5b2ec91
commit e6239af7d8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/form/src/fields/Daterange.vue
View File

@ -22,6 +22,7 @@ import { ref, watch } from 'vue';
import { TMagicDatePicker } from '@tmagic/design'; import { TMagicDatePicker } from '@tmagic/design';
import type { DaterangeConfig, FieldProps } from '../schema'; import type { DaterangeConfig, FieldProps } from '../schema';
import { datetimeFormatter } from '../utils/form';
import { useAddField } from '../utils/useAddField'; import { useAddField } from '../utils/useAddField';
defineOptions({ defineOptions({
@ -35,7 +36,7 @@ const emit = defineEmits(['change']);
useAddField(props.prop); useAddField(props.prop);
const { names } = props.config; const { names } = props.config;
const value = ref<(Date | undefined)[] | null>([]); const value = ref<(Date | string | undefined)[] | null>([]);
if (props.model !== undefined) { if (props.model !== undefined) {
if (names?.length) { if (names?.length) {
@ -45,9 +46,11 @@ if (props.model !== undefined) {
if (!value.value) { if (!value.value) {
value.value = []; value.value = [];
} }
const format = `${props.config.dateFormat || 'YYYY/MM/DD'} ${props.config.timeFormat || 'HH:mm:ss'}`;
if (!start || !end) value.value = []; if (!start || !end) value.value = [];
if (start !== preStart) value.value[0] = start; if (start !== preStart) value.value[0] = datetimeFormatter(start, '', format) as string;
if (end !== preEnd) value.value[1] = end; if (end !== preEnd) value.value[1] = datetimeFormatter(end, '', format) as string;
}, },
{ {
immediate: true, immediate: true,
@ -56,8 +59,13 @@ if (props.model !== undefined) {
} else if (props.name && props.model[props.name]) { } else if (props.name && props.model[props.name]) {
watch( watch(
() => props.model[props.name], () => props.model[props.name],
(start) => { (start, preStart) => {
value.value = start; const format = `${props.config.dateFormat || 'YYYY/MM/DD'} ${props.config.timeFormat || 'HH:mm:ss'}`;
if (start !== preStart)
value.value = start.map((item: string) =>
item ? (datetimeFormatter(item, '', format) as string) : undefined,
);
}, },
{ {
immediate: true, immediate: true,