From cb2e43f6968a0011d26032cae501e1050a4e954e Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Tue, 6 Jun 2017 23:02:02 +0800 Subject: [PATCH] fix DatePicker and Select bug --- packages/date-picker/src/basic/date-table.vue | 4 +--- src/utils/resize-event.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/date-picker/src/basic/date-table.vue b/packages/date-picker/src/basic/date-table.vue index 651627fa2..50cbe7940 100644 --- a/packages/date-picker/src/basic/date-table.vue +++ b/packages/date-picker/src/basic/date-table.vue @@ -32,9 +32,7 @@ const WEEKS = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']; const clearHours = function(time) { const cloneDate = new Date(time); - const timeZoneOffset = cloneDate.getTimezoneOffset(); - const timeZone = timeZoneOffset >= 0 ? 24 - timeZoneOffset / 60 : Math.abs(timeZoneOffset) / 60; - cloneDate.setHours(timeZone, 0, 0, 0); + cloneDate.setHours(0, 0, 0, 0); return cloneDate.getTime(); }; diff --git a/src/utils/resize-event.js b/src/utils/resize-event.js index 092858475..75225e6b7 100644 --- a/src/utils/resize-event.js +++ b/src/utils/resize-event.js @@ -121,7 +121,7 @@ const createStyles = function() { // opacity: 0 works around a chrome bug https://code.google.com/p/chromium/issues/detail?id=286360 const css = `${animationKeyframes} .resize-triggers { ${animationStyle} visibility: hidden; opacity: 0; } - .resize-triggers, .resize-triggers > div, .contract-trigger:before { content: \" \"; display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden; } + .resize-triggers, .resize-triggers > div, .contract-trigger:before { content: \" \"; display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden; z-index: -1 } .resize-triggers > div { background: #eee; overflow: auto; } .contract-trigger:before { width: 200%; height: 200%; }`;