alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: add trailingComma

Browse Source
This commit is contained in:
陈嘉涵
2020-01-19 11:57:09 +08:00
parent e841175fe8
commit 389d68884d
269 changed files with 2706 additions and 2702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/datetime-picker/DatePicker.js
+16 -16
View File
@@ -14,18 +14,18 @@ export default createComponent({
...sharedProps,
type: {
type: String,
default: 'datetime'
default: 'datetime',
},
minDate: {
type: Date,
default: () => new Date(currentYear - 10, 0, 1),
validator: isDate
validator: isDate,
},
maxDate: {
type: Date,
default: () => new Date(currentYear + 10, 11, 31),
validator: isDate
}
validator: isDate,
},
},
watch: {
@@ -39,7 +39,7 @@ export default createComponent({
if (val.valueOf() !== this.innerValue.valueOf()) {
this.innerValue = val;
}
}
},
},
computed: {
@@ -57,30 +57,30 @@ export default createComponent({
const result = [
{
type: 'year',
range: [minYear, maxYear]
range: [minYear, maxYear],
},
{
type: 'month',
range: [minMonth, maxMonth]
range: [minMonth, maxMonth],
},
{
type: 'day',
range: [minDate, maxDate]
range: [minDate, maxDate],
},
{
type: 'hour',
range: [minHour, maxHour]
range: [minHour, maxHour],
},
{
type: 'minute',
range: [minMinute, maxMinute]
}
range: [minMinute, maxMinute],
},
];
if (this.type === 'date') result.splice(3, 2);
if (this.type === 'year-month') result.splice(2, 3);
return result;
}
},
},
methods: {
@@ -128,7 +128,7 @@ export default createComponent({
[`${type}Month`]: month,
[`${type}Date`]: date,
[`${type}Hour`]: hour,
[`${type}Minute`]: minute
[`${type}Minute`]: minute,
};
},
@@ -179,7 +179,7 @@ export default createComponent({
let values = [
formatter('year', `${value.getFullYear()}`),
formatter('month', padZero(value.getMonth() + 1)),
formatter('day', padZero(value.getDate()))
formatter('day', padZero(value.getDate())),
];
if (this.type === 'datetime') {
@@ -196,6 +196,6 @@ export default createComponent({
this.$nextTick(() => {
this.getPicker().setValues(values);
});
}
}
},
},
});
src/datetime-picker/TimePicker.js
+12 -12
View File
@@ -12,20 +12,20 @@ export default createComponent({
...sharedProps,
minHour: {
type: Number,
default: 0
default: 0,
},
maxHour: {
type: Number,
default: 23
default: 23,
},
minMinute: {
type: Number,
default: 0
default: 0,
},
maxMinute: {
type: Number,
default: 59
}
default: 59,
},
},
computed: {
@@ -33,14 +33,14 @@ export default createComponent({
return [
{
type: 'hour',
range: [this.minHour, this.maxHour]
range: [this.minHour, this.maxHour],
},
{
type: 'minute',
range: [this.minMinute, this.maxMinute]
}
range: [this.minMinute, this.maxMinute],
},
];
}
},
},
watch: {
@@ -57,7 +57,7 @@ export default createComponent({
this.innerValue = val;
this.updateColumnValue(val);
}
}
},
},
methods: {
@@ -100,6 +100,6 @@ export default createComponent({
this.$nextTick(() => {
this.getPicker().setValues(values);
});
}
}
},
},
});
src/datetime-picker/demo/index.vue
+5 -5
View File
@@ -57,7 +57,7 @@ export default {
title4: '选择时间',
year: '年',
month: '月',
optionFilter: '选项过滤器'
optionFilter: '选项过滤器',
},
'en-US': {
title1: 'Choose DateTime',
@@ -66,8 +66,8 @@ export default {
title4: 'Choose Time',
year: ' Year',
month: ' Month',
optionFilter: 'Option Filter'
}
optionFilter: 'Option Filter',
},
},
data() {
@@ -99,7 +99,7 @@ export default {
}
return values;
}
}
},
},
};
</script>
src/datetime-picker/index.js
+3 -3
View File
@@ -7,7 +7,7 @@ const [createComponent, bem] = createNamespace('datetime-picker');
export default createComponent({
props: {
...TimePicker.props,
...DatePicker.props
...DatePicker.props,
},
render() {
@@ -18,9 +18,9 @@ export default createComponent({
class={bem()}
{...{
props: this.$props,
on: this.$listeners
on: this.$listeners,
}}
/>
);
}
},
});
src/datetime-picker/shared.js
+10 -10
View File
@@ -9,18 +9,18 @@ export const sharedProps = {
filter: Function,
showToolbar: {
type: Boolean,
default: true
default: true,
},
formatter: {
type: Function,
default: (type, value) => value
}
default: (type, value) => value,
},
};
export const TimePickerMixin = {
data() {
return {
innerValue: this.formatValue(this.value)
innerValue: this.formatValue(this.value),
};
},
@@ -38,16 +38,16 @@ export const TimePickerMixin = {
return {
type,
values
values,
};
});
},
columns() {
return this.originColumns.map(column => ({
values: column.values.map(value => this.formatter(column.type, value))
values: column.values.map(value => this.formatter(column.type, value)),
}));
}
},
},
watch: {
@@ -55,7 +55,7 @@ export const TimePickerMixin = {
innerValue(val) {
this.$emit('input', val);
}
},
},
mounted() {
@@ -78,7 +78,7 @@ export const TimePickerMixin = {
onCancel() {
this.$emit('cancel');
}
},
},
render() {
@@ -97,5 +97,5 @@ export const TimePickerMixin = {
{...{ props }}
/>
);
}
},
};
src/datetime-picker/test/date-picker.spec.js
+15 -15
View File
@@ -16,8 +16,8 @@ test('filter prop', () => {
filter,
minDate: new Date(2020, 0, 1),
maxDate: new Date(2025, 10, 1),
value: new Date(2020, 10, 1, 0, 0)
}
value: new Date(2020, 10, 1, 0, 0),
},
});
expect(wrapper).toMatchSnapshot();
@@ -30,8 +30,8 @@ test('formatter prop', async () => {
formatter,
minDate: new Date(2010, 0, 1),
maxDate: new Date(2025, 10, 1),
value: new Date(2020, 10, 1, 0, 0)
}
value: new Date(2020, 10, 1, 0, 0),
},
});
expect(wrapper).toMatchSnapshot();
@@ -45,7 +45,7 @@ test('formatter prop', async () => {
'05 month',
'05 day',
'00 hour',
'00 minute'
'00 minute',
]);
});
@@ -56,8 +56,8 @@ test('confirm event', () => {
propsData: {
value: date,
minDate: new Date(2020, 0, 1),
maxDate: new Date(2025, 10, 1)
}
maxDate: new Date(2025, 10, 1),
},
});
wrapper.find('.van-picker__confirm').trigger('click');
@@ -80,8 +80,8 @@ test('max-date prop', () => {
const wrapper = mount(DatePicker, {
propsData: {
value: new Date(2020, 10, 30, 30, 30),
maxDate
}
maxDate,
},
});
wrapper.find('.van-picker__confirm').trigger('click');
@@ -93,8 +93,8 @@ test('min-date prop', () => {
const wrapper = mount(DatePicker, {
propsData: {
value: new Date(2020, 0, 0, 0, 0),
minDate
}
minDate,
},
});
wrapper.find('.van-picker__confirm').trigger('click');
@@ -104,8 +104,8 @@ test('min-date prop', () => {
test('dynamic set value', () => {
const wrapper = mount(DatePicker, {
propsData: {
value: new Date(2019, 1, 1)
}
value: new Date(2019, 1, 1),
},
});
wrapper.setProps({ value: new Date(2019, 1, 1) });
@@ -132,8 +132,8 @@ test('use min-date with filter', async () => {
}
return values;
}
}
},
},
});
await later();
src/datetime-picker/test/datetime-picker.spec.js
+4 -4
View File
@@ -8,8 +8,8 @@ test('confirm & cancel event', () => {
const wrapper = mount(DatetimePicker, {
listeners: {
confirm: onConfirm,
cancel: onCancel
}
cancel: onCancel,
},
});
wrapper.find('.van-picker__confirm').trigger('click');
@@ -24,8 +24,8 @@ test('time type', () => {
propsData: {
type: 'time',
minHour: 22,
minMinute: 58
}
minMinute: 58,
},
});
expect(wrapper).toMatchSnapshot();
src/datetime-picker/test/time-picker.spec.js
+13 -13
View File
@@ -14,8 +14,8 @@ test('format initial value', () => {
const wrapper = mount(TimePicker, {
propsData: {
minHour: 22,
minMinute: 58
}
minMinute: 58,
},
});
expect(wrapper).toMatchSnapshot();
@@ -26,8 +26,8 @@ test('max-hour & max-minute', () => {
propsData: {
value: '23:59',
maxHour: 2,
maxMinute: 2
}
maxMinute: 2,
},
});
expect(wrapper).toMatchSnapshot();
@@ -37,8 +37,8 @@ test('filter prop', () => {
const wrapper = mount(TimePicker, {
propsData: {
filter,
value: '12:00'
}
value: '12:00',
},
});
expect(wrapper).toMatchSnapshot();
@@ -49,8 +49,8 @@ test('formatter prop', async () => {
propsData: {
filter,
formatter,
value: '12:00'
}
value: '12:00',
},
});
expect(wrapper).toMatchSnapshot();
@@ -65,8 +65,8 @@ test('formatter prop', async () => {
test('confirm event', () => {
const wrapper = mount(TimePicker, {
propsData: {
value: '12:00'
}
value: '12:00',
},
});
triggerDrag(wrapper.find('.van-picker-column'), 0, -100);
@@ -97,8 +97,8 @@ test('change min-minute and emit correct value', async () => {
const wrapper = mount(TimePicker, {
propsData: {
value: '12:00',
minMinute: 0
}
minMinute: 0,
},
});
await later();
@@ -112,7 +112,7 @@ test('set max-hour & max-minute smaller than current then emit correct value', a
const wrapper = mount(TimePicker, {
propsData: {
value: '23:59',
}
},
});
await later();
wrapper.setProps({