From c03632fa872114c5f96ed1889c85d3f73327e287 Mon Sep 17 00:00:00 2001 From: mengxiong10 <15623530290@163.com> Date: Wed, 13 Nov 2019 15:25:09 +0800 Subject: [PATCH] fix: compatible with vue old version inject --- src/mixin/format.js | 8 ++------ src/mixin/locale.js | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/mixin/format.js b/src/mixin/format.js index 5cb42dbf..c65de04d 100644 --- a/src/mixin/format.js +++ b/src/mixin/format.js @@ -1,12 +1,8 @@ import { format } from 'date-format-parse'; -import { getLocale } from '../locale'; +import LocaleMixin from './locale'; export default { - inject: { - locale: { - default: getLocale(), - }, - }, + mixins: [LocaleMixin], methods: { formatDate(date, fmt) { return format(date, fmt, { locale: this.t('formatLocale') }); diff --git a/src/mixin/locale.js b/src/mixin/locale.js index 6ec74175..b6a085aa 100644 --- a/src/mixin/locale.js +++ b/src/mixin/locale.js @@ -9,7 +9,7 @@ export default { methods: { t(path) { const arr = path.split('.'); - let current = this.locale; + let current = this.locale || getLocale(); let value; for (let i = 0, len = arr.length; i < len; i++) { const prop = arr[i];