bi-eleme 2.1.2 → 2.2.1

package/lib/time-picker.js

@@ -631,7 +631,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=0b6babce
+// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=8f8c7f3a
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -809,7 +809,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=0b6babce
+// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=8f8c7f3a
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(7);
@@ -1228,6 +1228,7 @@ var validator = function validator(val) {
       validator: validator
     },
     popperClass: String,
+    utc: Number,
     editable: {
       type: Boolean,
       default: true
@@ -1667,6 +1668,7 @@ var validator = function validator(val) {
       this.picker.defaultValue = this.defaultValue;
       this.picker.defaultTime = this.defaultTime;
       this.picker.popperClass = this.popperClass;
+      this.picker.utc = this.utc;
       this.popperElm = this.picker.$el;
       this.picker.width = this.reference.getBoundingClientRect().width;
       this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange';

package/lib/time-select.js

@@ -232,7 +232,7 @@ module.exports = require("bi-eleme/lib/utils/scroll-into-view");
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=0b6babce
+// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=8f8c7f3a
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -410,7 +410,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=0b6babce
+// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=8f8c7f3a
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(7);
@@ -829,6 +829,7 @@ var validator = function validator(val) {
       validator: validator
     },
     popperClass: String,
+    utc: Number,
     editable: {
       type: Boolean,
       default: true
@@ -1268,6 +1269,7 @@ var validator = function validator(val) {
       this.picker.defaultValue = this.defaultValue;
       this.picker.defaultTime = this.defaultTime;
       this.picker.popperClass = this.popperClass;
+      this.picker.utc = this.utc;
       this.popperElm = this.picker.$el;
       this.picker.width = this.reference.getBoundingClientRect().width;
       this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange';

package/lib/utils/date-util.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.validateRangeInOneMonth = exports.extractTimeFormat = exports.extractDateFormat = exports.nextYear = exports.prevYear = exports.nextMonth = exports.prevMonth = exports.changeYearMonthAndClampDate = exports.timeWithinRange = exports.limitTimeRange = exports.clearMilliseconds = exports.clearTime = exports.modifyWithTimeString = exports.modifyTime = exports.modifyDate = exports.range = exports.getRangeMinutes = exports.getMonthDays = exports.getPrevMonthLastDays = exports.getRangeHours = exports.getWeekNumber = exports.getStartDateOfMonth = exports.nextDate = exports.prevDate = exports.getFirstDayOfMonth = exports.getDayCountOfYear = exports.getDayCountOfMonth = exports.parseDate = exports.formatDate = exports.isDateObject = exports.isDate = exports.toDate = exports.getI18nSettings = undefined;
+exports.validateRangeInOneMonth = exports.extractTimeFormat = exports.extractDateFormat = exports.nextYear = exports.prevYear = exports.nextMonth = exports.prevMonth = exports.changeYearMonthAndClampDate = exports.timeWithinRange = exports.limitTimeRange = exports.clearMilliseconds = exports.getTimestampInTimezone = exports.clearTime = exports.modifyWithTimeString = exports.modifyTime = exports.modifyDate = exports.range = exports.getRangeMinutes = exports.getMonthDays = exports.getPrevMonthLastDays = exports.getRangeHours = exports.getWeekNumber = exports.getStartDateOfMonth = exports.nextDate = exports.prevDate = exports.getFirstDayOfMonth = exports.getDayCountOfYear = exports.getDayCountOfMonth = exports.parseDate = exports.formatDate = exports.isDateObject = exports.isDate = exports.toDate = exports.getI18nSettings = undefined;
 
 var _date = require('bi-eleme/lib/utils/date');
 
@@ -222,6 +222,15 @@ var clearTime = exports.clearTime = function clearTime(date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate());
 };
 
+var getTimestampInTimezone = exports.getTimestampInTimezone = function getTimestampInTimezone(date) {
+  var timezoneOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 8;
+
+  // 将日期转换为指定时区的时间
+  var targetDate = new Date(date.getTime() + (date.getTimezoneOffset() + timezoneOffset * 60) * 60000);
+  // 返回时间戳
+  return targetDate;
+};
+
 var clearMilliseconds = exports.clearMilliseconds = function clearMilliseconds(date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bi-eleme",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "description": "A Component Library for Vue.js.from element-ui@2.15.10",
   "main": "lib/element-ui.common.js",
   "files": [

package/packages/date-picker/src/basic/date-table.vue

@@ -38,16 +38,16 @@
 </template>
 
 <script>
-import { getFirstDayOfMonth, getDayCountOfMonth, getWeekNumber, getStartDateOfMonth, prevDate, nextDate, isDate, clearTime as _clearTime } from 'bi-eleme/src/utils/date-util'
+import { getFirstDayOfMonth, getDayCountOfMonth, getWeekNumber, getStartDateOfMonth, prevDate, nextDate, isDate, clearTime as _clearTime, getTimestampInTimezone } from 'bi-eleme/src/utils/date-util'
 import Locale from 'bi-eleme/src/mixins/locale'
 import { arrayFindIndex, arrayFind, coerceTruthyValueToArray } from 'bi-eleme/src/utils/util'
 
 const WEEKS = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
-const getDateTimestamp = function (time) {
+const getDateTimestamp = function (time, utc = 8) {
   if (typeof time === 'number' || typeof time === 'string') {
-    return _clearTime(new Date(time)).getTime()
+    return _clearTime(getTimestampInTimezone(new Date(time), utc)).getTime()
   } else if (time instanceof Date) {
-    return _clearTime(time).getTime()
+    return _clearTime(getTimestampInTimezone(time, utc)).getTime()
   } else {
     return NaN
   }
@@ -71,6 +71,11 @@ export default {
       validator: (val) => val >= 1 && val <= 7
     },
 
+    utc: {
+      default: 8,
+      type: Number
+    },
+
     value: {},
 
     defaultValue: {
@@ -150,7 +155,7 @@ export default {
       const disabledDate = this.disabledDate
       const cellClassName = this.cellClassName
       const selectedDate = this.selectionMode === 'dates' ? coerceTruthyValueToArray(this.value) : []
-      const now = getDateTimestamp(new Date())
+      const now = getDateTimestamp(new Date(), this.utc)
 
       for (let i = 0; i < 6; i++) {
         const row = rows[i]

package/packages/date-picker/src/basic/month-table.vue

@@ -25,7 +25,7 @@
 
 <script type="text/babel">
 import Locale from 'bi-eleme/src/mixins/locale'
-import { isDate, range, getDayCountOfMonth, nextDate } from 'bi-eleme/src/utils/date-util'
+import { isDate, range, getDayCountOfMonth, nextDate, getTimestampInTimezone } from 'bi-eleme/src/utils/date-util'
 import { hasClass } from 'bi-eleme/src/utils/dom'
 import { arrayFindIndex, coerceTruthyValueToArray, arrayFind } from 'bi-eleme/src/utils/util'
 
@@ -39,11 +39,11 @@ const clearDate = (date) => {
   return new Date(date.getFullYear(), date.getMonth())
 }
 
-const getMonthTimestamp = function (time) {
+const getMonthTimestamp = function (time, utc = 8) {
   if (typeof time === 'number' || typeof time === 'string') {
-    return clearDate(new Date(time)).getTime()
+    return clearDate(getTimestampInTimezone(new Date(time), utc)).getTime()
   } else if (time instanceof Date) {
-    return clearDate(time).getTime()
+    return clearDate(getTimestampInTimezone(time, utc)).getTime()
   } else {
     return NaN
   }
@@ -64,7 +64,10 @@ export default {
       default: 'month'
     },
     minDate: {},
-
+    utc: {
+      default: 8,
+      type: Number
+    },
     maxDate: {},
     defaultValue: {
       validator(val) {
@@ -238,7 +241,7 @@ export default {
       const rows = this.tableRows
       const disabledDate = this.disabledDate
       const selectedDate = []
-      const now = getMonthTimestamp(new Date())
+      const now = getMonthTimestamp(new Date(), this.utc)
 
       for (let i = 0; i < 3; i++) {
         const row = rows[i]

package/packages/date-picker/src/basic/year-table.vue

@@ -78,7 +78,7 @@
 
 <script type="text/babel">
 import { hasClass } from 'bi-eleme/src/utils/dom'
-import { isDate, range, nextDate, getDayCountOfYear } from 'bi-eleme/src/utils/date-util'
+import { isDate, range, nextDate, getDayCountOfYear, getTimestampInTimezone } from 'bi-eleme/src/utils/date-util'
 import { arrayFindIndex, coerceTruthyValueToArray } from 'bi-eleme/src/utils/util'
 
 const datesInYear = (year) => {
@@ -97,6 +97,10 @@ export default {
         return val === null || (val instanceof Date && isDate(val))
       }
     },
+    utc: {
+      default: 8,
+      type: Number
+    },
     date: {},
     selectionMode: {}
   },
@@ -110,7 +114,7 @@ export default {
   methods: {
     getCellStyle(year) {
       const style = {}
-      const today = new Date()
+      const today = getTimestampInTimezone(new Date(), this.utc)
 
       style.disabled = typeof this.disabledDate === 'function' ? datesInYear(year).every(this.disabledDate) : false
       style.current = arrayFindIndex(coerceTruthyValueToArray(this.value), (date) => date.getFullYear() === year) >= 0

package/packages/date-picker/src/panel/date.vue

@@ -128,6 +128,7 @@
               :date="date"
               :cell-class-name="cellClassName"
               :disabled-date="disabledDate"
+              :utc="utc"
             >
             </date-table>
             <year-table
@@ -138,6 +139,7 @@
               :default-value="defaultValue ? new Date(defaultValue) : null"
               :date="date"
               :disabled-date="disabledDate"
+              :utc="utc"
             >
             </year-table>
             <month-table
@@ -148,6 +150,7 @@
               :default-value="defaultValue ? new Date(defaultValue) : null"
               :date="date"
               :disabled-date="disabledDate"
+              :utc="utc"
             >
             </month-table>
           </div>
@@ -556,6 +559,7 @@ export default {
       popperClass: '',
       date: new Date(),
       value: '',
+      utc: 8,
       defaultValue: null, // use getDefaultValue() for time computation
       defaultTime: null,
       showTime: false,

package/packages/date-picker/src/picker.vue

@@ -370,6 +370,7 @@ export default {
       validator
     },
     popperClass: String,
+    utc: Number,
     editable: {
       type: Boolean,
       default: true
@@ -825,6 +826,7 @@ export default {
       this.picker.defaultValue = this.defaultValue
       this.picker.defaultTime = this.defaultTime
       this.picker.popperClass = this.popperClass
+      this.picker.utc = this.utc
       this.popperElm = this.picker.$el
       this.picker.width = this.reference.getBoundingClientRect().width
       this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange'

package/src/index.js

@@ -210,7 +210,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.1.2',
+  version: '2.2.1',
   locale: locale.use,
   i18n: locale.i18n,
   install,

package/src/utils/date-util.js

@@ -194,6 +194,13 @@ export const clearTime = function (date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate())
 }
 
+export const getTimestampInTimezone = function (date, timezoneOffset = 8) {
+  // 将日期转换为指定时区的时间
+  const targetDate = new Date(date.getTime() + (date.getTimezoneOffset() + timezoneOffset * 60) * 60000)
+  // 返回时间戳
+  return targetDate
+}
+
 export const clearMilliseconds = function (date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0)
 }