fix: locale not work

pull/3067/head
tangjinzhou 2020-10-28 22:04:12 +08:00
parent 21b4e6099b
commit a07acec2f4
1 changed files with 6 additions and 19 deletions

View File

@ -1,4 +1,4 @@
import { provide, App, defineComponent, VNode, PropType } from 'vue'; import { provide, App, defineComponent, VNode, PropType, reactive } from 'vue';
import PropTypes from '../_util/vue-types'; import PropTypes from '../_util/vue-types';
import moment from 'moment'; import moment from 'moment';
import interopDefault from '../_util/interopDefault'; import interopDefault from '../_util/interopDefault';
@ -43,38 +43,25 @@ const LocaleProvider = defineComponent({
}, },
ANT_MARK__: PropTypes.string, ANT_MARK__: PropTypes.string,
}, },
data() {
warning(
this.ANT_MARK__ === ANT_MARK,
'LocaleProvider',
'`LocaleProvider` is deprecated. Please use `locale` with `ConfigProvider` instead',
);
return {
antLocale: {
...this.locale,
exist: true,
},
};
},
setup(props) { setup(props) {
warning( warning(
props.ANT_MARK__ === ANT_MARK, props.ANT_MARK__ === ANT_MARK,
'LocaleProvider', 'LocaleProvider',
'`LocaleProvider` is deprecated. Please use `locale` with `ConfigProvider` instead', '`LocaleProvider` is deprecated. Please use `locale` with `ConfigProvider` instead',
); );
const data = { const state = reactive({
antLocale: { antLocale: {
...props.locale, ...props.locale,
exist: true, exist: true,
}, },
ANT_MARK__: ANT_MARK, ANT_MARK__: ANT_MARK,
}; });
provide('localeData', data); provide('localeData', state);
return data; return { state };
}, },
watch: { watch: {
locale(val) { locale(val) {
this.antLocale = { this.state.antLocale = {
...val, ...val,
exist: true, exist: true,
}; };