bi-eleme 2.1.2 → 2.4.1

package/lib/tree.js

@@ -82,12 +82,12 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 60);
+/******/ 	return __webpack_require__(__webpack_require__.s = 62);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 0:
+/***/ 1:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -213,7 +213,7 @@ module.exports = require("bi-eleme/lib/locale");
 
 /***/ }),
 
-/***/ 28:
+/***/ 29:
 /***/ (function(module, exports) {
 
 module.exports = require("bi-eleme/lib/transitions/collapse-transition");
@@ -234,7 +234,7 @@ module.exports = require("bi-eleme/lib/mixins/emitter");
 
 /***/ }),
 
-/***/ 60:
+/***/ 62:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1421,7 +1421,7 @@ tree_nodevue_type_template_id_2aa52095_render._withStripped = true
 // CONCATENATED MODULE: ./packages/tree/src/tree-node.vue?vue&type=template&id=2aa52095
 
 // EXTERNAL MODULE: external "bi-eleme/lib/transitions/collapse-transition"
-var collapse_transition_ = __webpack_require__(28);
+var collapse_transition_ = __webpack_require__(29);
 var collapse_transition_default = /*#__PURE__*/__webpack_require__.n(collapse_transition_);
 
 // EXTERNAL MODULE: external "bi-eleme/lib/checkbox"
@@ -1715,7 +1715,7 @@ var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
 // CONCATENATED MODULE: ./packages/tree/src/tree-node.vue?vue&type=script&lang=js
  /* harmony default export */ var src_tree_nodevue_type_script_lang_js = (tree_nodevue_type_script_lang_js); 
 // EXTERNAL MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(0);
+var componentNormalizer = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./packages/tree/src/tree-node.vue
 

package/lib/upload.js

@@ -82,12 +82,12 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 58);
+/******/ 	return __webpack_require__(__webpack_require__.s = 60);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 0:
+/***/ 1:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -192,14 +192,14 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 11:
+/***/ 12:
 /***/ (function(module, exports) {
 
 module.exports = require("bi-eleme/lib/mixins/migrating");
 
 /***/ }),
 
-/***/ 26:
+/***/ 27:
 /***/ (function(module, exports) {
 
 module.exports = require("babel-helper-vue-jsx-merge-props");
@@ -213,7 +213,14 @@ module.exports = require("bi-eleme/lib/progress");
 
 /***/ }),
 
-/***/ 58:
+/***/ 6:
+/***/ (function(module, exports) {
+
+module.exports = require("bi-eleme/lib/mixins/locale");
+
+/***/ }),
+
+/***/ 60:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -515,7 +522,7 @@ var progress_default = /*#__PURE__*/__webpack_require__.n(progress_);
 // CONCATENATED MODULE: ./packages/upload/src/upload-list.vue?vue&type=script&lang=js
  /* harmony default export */ var src_upload_listvue_type_script_lang_js = (upload_listvue_type_script_lang_js); 
 // EXTERNAL MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(0);
+var componentNormalizer = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./packages/upload/src/upload-list.vue
 
@@ -538,7 +545,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var upload_list = (component.exports);
 // EXTERNAL MODULE: external "babel-helper-vue-jsx-merge-props"
-var external_babel_helper_vue_jsx_merge_props_ = __webpack_require__(26);
+var external_babel_helper_vue_jsx_merge_props_ = __webpack_require__(27);
 var external_babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(external_babel_helper_vue_jsx_merge_props_);
 
 // CONCATENATED MODULE: ./packages/upload/src/ajax.js
@@ -1014,7 +1021,7 @@ var upload_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var src_upload = (upload_component.exports);
 // EXTERNAL MODULE: external "bi-eleme/lib/mixins/migrating"
-var migrating_ = __webpack_require__(11);
+var migrating_ = __webpack_require__(12);
 var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
 
 // CONCATENATED MODULE: ./node_modules/.store/babel-loader@7.1.5/node_modules/babel-loader/lib!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/index.vue?vue&type=script&lang=js
@@ -1388,13 +1395,6 @@ src.install = function (Vue) {
 
 /* harmony default export */ var packages_upload = __webpack_exports__["default"] = (src);
 
-/***/ }),
-
-/***/ 6:
-/***/ (function(module, exports) {
-
-module.exports = require("bi-eleme/lib/mixins/locale");
-
 /***/ })
 
 /******/ });

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.setDaysDiff = exports.getDaysDiff = 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);
 };
@@ -305,4 +314,7 @@ var extractTimeFormat = exports.extractTimeFormat = function extractTimeFormat(f
 
 var validateRangeInOneMonth = exports.validateRangeInOneMonth = function validateRangeInOneMonth(start, end) {
   return start.getMonth() === end.getMonth() && start.getFullYear() === end.getFullYear();
-};
+};
+
+var getDaysDiff = exports.getDaysDiff = _date2.default.getDaysDiff;
+var setDaysDiff = exports.setDaysDiff = _date2.default.setDaysDiff;

package/lib/utils/date.js

@@ -27,7 +27,7 @@
 
 /*eslint-disable*/
 // 把 YYYY-MM-DD 改成了 yyyy-MM-dd
-(function (main) {
+;(function (main) {
   'use strict';
 
   /**
@@ -251,15 +251,14 @@
     shortTime: 'HH:mm',
     mediumTime: 'HH:mm:ss',
     longTime: 'HH:mm:ss.SSS'
-  };
 
-  /***
-   * Format a date
-   * @method format
-   * @param {Date|number} dateObj
-   * @param {string} mask Format of the date, i.e. 'mm-dd-yy' or 'shortDate'
-   */
-  fecha.format = function (dateObj, mask, i18nSettings) {
+    /***
+     * Format a date
+     * @method format
+     * @param {Date|number} dateObj
+     * @param {string} mask Format of the date, i.e. 'mm-dd-yy' or 'shortDate'
+     */
+  };fecha.format = function (dateObj, mask, i18nSettings) {
     var i18n = i18nSettings || fecha.i18n;
 
     if (typeof dateObj === 'number') {
@@ -356,6 +355,65 @@
     return date;
   };
 
+  /**
+   * Calculate days difference between two dates
+   * @param {Date|string} date1 First date
+   * @param {Date|string} date2 Second date (optional, defaults to current date)
+   * @returns {number} Days difference
+   */
+  fecha.getDaysDiff = function (date1, date2) {
+    // Convert to Date objects if strings
+    if (typeof date1 === 'string') {
+      date1 = fecha.parse(date1, 'yyyy-MM-dd');
+    }
+    if (!date2) {
+      date2 = new Date();
+    } else if (typeof date2 === 'string') {
+      date2 = fecha.parse(date2, 'yyyy-MM-dd');
+    }
+
+    // Validate dates
+    if (!date1 || !date2 || isNaN(date1.getTime()) || isNaN(date2.getTime())) {
+      throw new Error('Invalid date in fecha.getDaysDiff');
+    }
+
+    // Reset time to midnight to ensure accurate day calculation
+    date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+    date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+
+    // Calculate difference in days
+    var timeDiff = date2.getTime() - date1.getTime();
+    return Math.round(timeDiff / (1000 * 60 * 60 * 24));
+  };
+
+  /**
+   * Calculate the date that is a specified number of days before the given date
+   * @param {Date|string} date The reference date
+   * @param {number} diff Number of days to subtract (must be positive)
+   * @returns {Date} The resulting date
+   */
+  fecha.setDaysDiff = function (date, diff) {
+    // Validate diff parameter
+    if (typeof diff !== 'number' || diff < 0) {
+      throw new Error('diff parameter must be a positive number in fecha.setDaysDiff');
+    }
+
+    // Convert to Date object if string
+    if (typeof date === 'string') {
+      date = fecha.parse(date, 'yyyy-MM-dd');
+    }
+
+    // Validate date
+    if (!date || isNaN(date.getTime())) {
+      throw new Error('Invalid date in fecha.setDaysDiff');
+    }
+
+    // Reset time to midnight to ensure accurate day calculation
+    var result = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+    result.setDate(result.getDate() - diff);
+    return result;
+  };
+
   /* istanbul ignore next */
   if (typeof module !== 'undefined' && module.exports) {
     module.exports = fecha;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bi-eleme",
-  "version": "2.1.2",
+  "version": "2.4.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/packages/super-date/index.js

@@ -0,0 +1,8 @@
+import DatePicker from './src/picker/date-picker';
+
+/* istanbul ignore next */
+DatePicker.install = function install(Vue) {
+  Vue.component(DatePicker.name, DatePicker);
+};
+
+export default DatePicker;