Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

3 天以前 dea5820ad3ba037b674a750753755588bc25b56c

 packages/components/src/Input/ChooseInputWithDatePicker.vue

@@ -15,6 +15,9 @@

type Props = {
  modelValue: string | number;
  minDate?: Date;
  maxDate?: Date;
  type?: string;
};

const props = withDefaults(defineProps<Props>(), {});
@@ -43,10 +46,13 @@
                h(DatePicker, {
                  modelValue: _modelValue,
                  onCancel: onClose,
                  type: props.type,
                  maxDate: props.maxDate,
                  onConfirm: ({ selectedValue }) => {
                    emit('update:modelValue', dayjs(selectedValue).format('YYYY-MM-DD'));
                    emit('update:modelValue', dayjs(selectedValue.join('-')).format('YYYY-MM-DD'));
                    onClose();
                  },
                  minDate: props.minDate,
                }),
            }
          ),