refactor: calendar

pull/4499/head
tangjinzhou 2021-08-09 14:09:45 +08:00
parent 16f0d49c84
commit 75f7f3feaa
5 changed files with 35 additions and 25 deletions

View File

@ -140,7 +140,7 @@ function generateCalendar<DateType>(generateConfig: GenerateConfig<DateType>) {
() => value.value || generateConfig.getNow(),
{
defaultValue: defaultValue.value,
value: value,
value,
},
);

View File

@ -179,7 +179,7 @@ export default function generatePicker<DateType>(
const pre = prefixCls.value;
return (
<RCPicker
monthCellRender={props.monthCellRender}
monthCellRender={monthCellRender}
dateRender={dateRender}
renderExtraFooter={renderExtraFooter}
ref={pickerRef}

View File

@ -1,5 +1,5 @@
import type { VNodeTypes, PropType, ComputedRef } from 'vue';
import { toRefs, unref } from 'vue';
import { unref } from 'vue';
import { inject, defineComponent, computed } from 'vue';
import PropTypes from '../_util/vue-types';
import defaultLocaleData from './default';

View File

@ -1,29 +1,39 @@
<template>
<a-alert :message="`You selected date: ${selectedValue && selectedValue.format('YYYY-MM-DD')}`" />
<a-calendar :value="date" @select="onSelect" @panelChange="onPanelChange" />
<div>
<demo />
</div>
</template>
<script lang="ts">
import { defineComponent, ref } from 'vue';
import dayjs, { Dayjs } from 'dayjs';
<script>
import { defineComponent } from 'vue';
import demo from '../v2-doc/src/docs/calendar/demo/index.vue';
// import Affix from '../components/affix';
export default defineComponent({
setup() {
const date = ref(dayjs('2017-01-25'));
const selectedValue = ref(dayjs('2017-01-25'));
const onSelect = (value: Dayjs) => {
date.value = value;
selectedValue.value = value;
};
const onPanelChange = (value: Dayjs) => {
date.value = value;
};
components: {
demo,
// Affix,
},
data() {
return {
date,
selectedValue,
onSelect,
onPanelChange,
visible: false,
pStyle: {
fontSize: '16px',
color: 'rgba(0,0,0,0.85)',
lineHeight: '24px',
display: 'block',
marginBottom: '16px',
},
pStyle2: {
marginBottom: '24px',
},
};
},
methods: {
showDrawer() {
this.visible = true;
},
onClose() {
this.visible = false;
},
},
});
</script>

2
v2-doc

@ -1 +1 @@
Subproject commit be726a08199f185f8445b1cc068b8c6533151db2
Subproject commit c54ecff46419ab3c9dafc204df37369c011ce422