drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6327 from demi798/2.0

Browse source 
fix bug #6326
This commit is contained in:
debugIsFalse 2019-10-29 11:10:46 +08:00 committed by GitHub
commit d241b8fe7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/carousel/carousel.vue
View file

@ -201,7 +201,7 @@
child.width = this.listWidth;
child.height = typeof this.height === 'number' ? `${this.height}px` : this.height;
});
const slidesLength = this.slides.length || 0
const slidesLength = this.slides.length || 0;
this.trackWidth = slidesLength * this.listWidth;
},
// use when slot changed

3
src/components/date-picker/base/date-table.vue
View file

@ -75,7 +75,8 @@
return this.calendar(tableYear, tableMonth, (cell) => {
// normalize date offset from the dates provided by jsCalendar
if (cell.date instanceof Date) cell.date.setTime(cell.date.getTime() + cell.date.getTimezoneOffset() * 60000);
// Comment out this code to fix daylight saving time bug
// if (cell.date instanceof Date) cell.date.setTime(cell.date.getTime() + cell.date.getTimezoneOffset() * 60000);
const time = cell.date && clearHours(cell.date);
const dateIsInCurrentMonth = cell.date && tableMonth === cell.date.getMonth();

4
src/utils/assist.js
View file

@ -214,7 +214,7 @@ export function findComponentDownward (context, componentName) {
// Find components downward
export function findComponentsDownward (context, componentName, ignoreComponentNames = []) {
if (!Array.isArray(ignoreComponentNames)) {
ignoreComponentNames = [ignoreComponentNames]
ignoreComponentNames = [ignoreComponentNames];
}
return context.$children.reduce((components, child) => {
if (child.$options.name === componentName) components.push(child);
@ -222,7 +222,7 @@ export function findComponentsDownward (context, componentName, ignoreComponentN
const foundChilds = findComponentsDownward(child, componentName);
return components.concat(foundChilds);
} else {
return components
return components;
}
}, []);
}