Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wangjiahao 2022-08-25 16:50:37 +08:00
commit ca133ccc64

View File

@ -15,6 +15,7 @@
:size="size" :size="size"
:editable="false" :editable="false"
:picker-options="pickerOptions" :picker-options="pickerOptions"
:default-time="defaultRangeTime"
@change="dateChange" @change="dateChange"
@focus="toFocus" @focus="toFocus"
@blur="onBlur" @blur="onBlur"
@ -119,6 +120,12 @@ export default {
} }
} }
return null return null
},
defaultRangeTime() {
if (this.element.options.attrs.type === 'daterange' && this.element.options.attrs.showTime) {
return ['00:00:00', '23:59:59']
}
return null
} }
}, },