diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue index 5350515d..05daf835 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue @@ -147,7 +147,11 @@ export default { }, // 组件联动 changeValue (val) { - console.log(val) + // 判断如果val是数组,需要将它转成字符串 + if (Array.isArray(val)) { + val = val.join(',') + } + console.log('val', val) this.linkage({ [this.config.code]: val }) }, focusEvent () { diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue index 920abe17..7dd1e16c 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue @@ -218,27 +218,7 @@ export default { }, watch: {}, mounted () {}, - methods: { - // selectFormatType (type) { - // if (type === 'timestamp') { - // this.config.customize.value = 0 - // this.config.customize.valueFormat = 'timestamp' - // } else if (type === 'custom') { - // this.config.customize.value = '' - // this.config.customize.valueFormat = 'YYYY-MM-DD HH:mm:ss' - // } - // }, - // selectDisplayType (val) { - // if (['year', 'month', 'date', 'week', 'datetime'].includes(val)) { - // this.config.customize.value = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - // } else { - // this.config.customize.value = [ - // moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD HH:mm:ss'), - // moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - // ] - // } - // } - } + methods: { } } diff --git a/data-room-ui/packages/BasicComponents/TimePicker/index.vue b/data-room-ui/packages/BasicComponents/TimePicker/index.vue index 0a3024d8..c77788f4 100644 --- a/data-room-ui/packages/BasicComponents/TimePicker/index.vue +++ b/data-room-ui/packages/BasicComponents/TimePicker/index.vue @@ -1,13 +1,13 @@