github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'next' of github.com:vueComponent/ant-design-vue into next

feat-dayjs
tangjinzhou 2020-10-19 22:21:26 +08:00
parent bdd569f019 6b8cebc25f
commit 889ae305df
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/pagination/Pagination.tsx
View File

@ -1,3 +1,9 @@
import { defineComponent, inject } from 'vue';
import LeftOutlined from '@ant-design/icons-vue/LeftOutlined';
import RightOutlined from '@ant-design/icons-vue/RightOutlined';
import DoubleLeftOutlined from '@ant-design/icons-vue/DoubleLeftOutlined';
import DoubleRightOutlined from '@ant-design/icons-vue/DoubleRightOutlined';
import { tuple } from '../_util/type';
import PropTypes, { withUndefined } from '../_util/vue-types'; import PropTypes, { withUndefined } from '../_util/vue-types';
import VcSelect from '../select'; import VcSelect from '../select';
import MiniSelect from './MiniSelect'; import MiniSelect from './MiniSelect';
@ -5,14 +11,8 @@ import LocaleReceiver from '../locale-provider/LocaleReceiver';
import { getOptionProps } from '../_util/props-util'; import { getOptionProps } from '../_util/props-util';
import VcPagination from '../vc-pagination'; import VcPagination from '../vc-pagination';
import enUS from '../vc-pagination/locale/en_US'; import enUS from '../vc-pagination/locale/en_US';
import LeftOutlined from '@ant-design/icons-vue/LeftOutlined';
import RightOutlined from '@ant-design/icons-vue/RightOutlined';
import DoubleLeftOutlined from '@ant-design/icons-vue/DoubleLeftOutlined';
import DoubleRightOutlined from '@ant-design/icons-vue/DoubleRightOutlined';
import { defaultConfigProvider } from '../config-provider'; import { defaultConfigProvider } from '../config-provider';
import { defineComponent, inject } from 'vue';
import classNames from '../_util/classNames'; import classNames from '../_util/classNames';
import { tuple } from '../_util/type';
export const PaginationProps = () => ({ export const PaginationProps = () => ({
total: PropTypes.number, total: PropTypes.number,
@ -129,7 +129,7 @@ export default defineComponent({
componentName="Pagination" componentName="Pagination"
defaultLocale={enUS} defaultLocale={enUS}
children={this.renderPagination} children={this.renderPagination}
></LocaleReceiver> />
); );
}, },
}); });

2
components/vc-select/index.ts
View File

@ -3,7 +3,7 @@ import Option from './Option';
import OptGroup from './OptGroup'; import OptGroup from './OptGroup';
import { BaseProps } from './generate'; import { BaseProps } from './generate';
export type SelectProps<T> = ExportedSelectProps<T>; export type SelectProps<T = any> = ExportedSelectProps<T>;
export { Option, OptGroup, BaseProps }; export { Option, OptGroup, BaseProps };
export default Select; export default Select;