2
0
mirror of https://github.com/tenrok/vue2-datepicker.git synced 2026-06-21 06:40:36 +03:00

fix: 默认语言,修复测试

This commit is contained in:
mxie
2018-06-19 14:28:16 +08:00
parent 0b424e60cd
commit 62dc6a7a2e
2 changed files with 17 additions and 19 deletions
+16 -14
View File
@@ -1,3 +1,6 @@
import Languages from '@/locale/languages'
const defaultLang = Languages.zh
export default { export default {
methods: { methods: {
@@ -10,21 +13,20 @@ export default {
name = component.$options.name name = component.$options.name
} }
} }
if (component && component.language) { const lang = component && component.language || defaultLang
const arr = path.split('.') const arr = path.split('.')
let current = component.language let current = lang
let value let value
for (let i = 0, len = arr.length; i < len; i++) { for (let i = 0, len = arr.length; i < len; i++) {
const prop = arr[i] const prop = arr[i]
value = current[prop] value = current[prop]
if (i === len - 1) { if (i === len - 1) {
return value return value
}
if (!value) {
return ''
}
current = value
} }
if (!value) {
return ''
}
current = value
} }
return '' return ''
} }
+1 -5
View File
@@ -1,15 +1,11 @@
import Vue from 'vue' import Vue from 'vue'
import { mount, shallowMount } from '@vue/test-utils' import { mount, shallowMount } from '@vue/test-utils'
import { use } from '../src/locale/index'
import DatePicker from '../src/index.vue' import DatePicker from '../src/index.vue'
import CalendarPanel from '../src/calendar.vue' import CalendarPanel from '../src/calendar.vue'
import DatePanel from '../src/panel/date' import DatePanel from '../src/panel/date'
import TimePanel from '../src/panel/time' import TimePanel from '../src/panel/time'
import YearPanel from '../src/panel/year' import YearPanel from '../src/panel/year'
use('zh')
let wrapper let wrapper
afterEach(() => { afterEach(() => {
@@ -191,7 +187,7 @@ describe('datepicker', () => {
expect(el.getAttribute('placeholder')).toBe('hehe') expect(el.getAttribute('placeholder')).toBe('hehe')
}) })
it.only('prop: lang', () => { it('prop: lang', () => {
wrapper = mount(DatePicker, { wrapper = mount(DatePicker, {
propsData: { propsData: {
lang: 'en', lang: 'en',