Merge branch '2.x' into dev

2020-11-26 21:05:57 +08:00
parent ea44d636ba 1855cffeb2
commit 52fdf99c69
21 changed files with 240 additions and 62 deletions
@@ -36,7 +36,7 @@ export default createComponent({

  emits: ['confirm', 'cancel', 'change', 'update:modelValue'],

-  setup(props, { emit }) {
+  setup(props, { emit, slots }) {
    const formatValue = (value) => {
      if (!isDate(value)) {
        value = props.minDate;
@@ -299,6 +299,7 @@ export default createComponent({

    return () => (
      <Picker
+        v-slots={slots}
        ref={picker}
        columns={columns.value}
        readonly={props.readonly}