bi-eleme 2.2.1 → 2.4.2

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.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;
+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');
 
@@ -314,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.2.1",
+  "version": "2.4.2",
   "description": "A Component Library for Vue.js.from element-ui@2.15.10",
   "main": "lib/element-ui.common.js",
   "files": [

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;

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

@@ -0,0 +1,448 @@
+<template>
+  <table
+    cellspacing="0"
+    cellpadding="0"
+    class="el-date-table"
+    @click="handleClick"
+    @mousemove="handleMouseMove"
+    :class="{ 'is-week-mode': selectionMode === 'week' }"
+  >
+    <tbody>
+      <tr>
+        <th v-if="showWeekNumber">{{ t('el.datepicker.week') }}</th>
+        <th
+          v-for="(week, key) in WEEKS"
+          :key="key"
+        >{{ t('el.datepicker.weeks.' + week) }}</th>
+      </tr>
+      <tr
+        class="el-date-table__row"
+        v-for="(row, key) in rows"
+        :class="{ current: isWeekActive(row[1]) }"
+        :key="key"
+      >
+        <td
+          v-for="(cell, key) in row"
+          :class="getCellClasses(cell)"
+          :key="key"
+        >
+          <div>
+            <span>
+              {{ cell.text }}
+            </span>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</template>
+
+<script>
+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, utc = 8) {
+  if (typeof time === 'number' || typeof time === 'string') {
+    return _clearTime(getTimestampInTimezone(new Date(time), utc)).getTime()
+  } else if (time instanceof Date) {
+    return _clearTime(getTimestampInTimezone(time, utc)).getTime()
+  } else {
+    return NaN
+  }
+}
+
+// remove the first element that satisfies `pred` from arr
+// return a new array if modification occurs
+// return the original array otherwise
+const removeFromArray = function (arr, pred) {
+  const idx = typeof pred === 'function' ? arrayFindIndex(arr, pred) : arr.indexOf(pred)
+  return idx >= 0 ? [...arr.slice(0, idx), ...arr.slice(idx + 1)] : arr
+}
+
+export default {
+  mixins: [Locale],
+
+  props: {
+    firstDayOfWeek: {
+      default: 7,
+      type: Number,
+      validator: (val) => val >= 1 && val <= 7
+    },
+
+    utc: {
+      default: 8,
+      type: Number
+    },
+
+    value: {},
+
+    defaultValue: {
+      validator(val) {
+        // either: null, valid Date object, Array of valid Date objects
+        return val === null || isDate(val) || (Array.isArray(val) && val.every(isDate))
+      }
+    },
+
+    date: {},
+
+    selectionMode: {
+      default: 'day'
+    },
+
+    showWeekNumber: {
+      type: Boolean,
+      default: false
+    },
+
+    disabledDate: {},
+
+    cellClassName: {},
+
+    minDate: {},
+
+    maxDate: {},
+
+    rangeState: {
+      default() {
+        return {
+          endDate: null,
+          selecting: false
+        }
+      }
+    }
+  },
+
+  computed: {
+    offsetDay() {
+      const week = this.firstDayOfWeek
+      // 周日为界限，左右偏移的天数，3217654 例如周一就是 -1，目的是调整前两行日期的位置
+      return week > 3 ? 7 - week : -week
+    },
+
+    WEEKS() {
+      const week = this.firstDayOfWeek
+      return WEEKS.concat(WEEKS).slice(week, week + 7)
+    },
+
+    year() {
+      return this.date.getFullYear()
+    },
+
+    month() {
+      return this.date.getMonth()
+    },
+
+    startDate() {
+      return getStartDateOfMonth(this.year, this.month)
+    },
+
+    rows() {
+      // TODO: refactory rows / getCellClasses
+      const date = new Date(this.year, this.month, 1)
+      let day = getFirstDayOfMonth(date) // day of first day
+      const dateCountOfMonth = getDayCountOfMonth(date.getFullYear(), date.getMonth())
+      const dateCountOfLastMonth = getDayCountOfMonth(date.getFullYear(), date.getMonth() === 0 ? 11 : date.getMonth() - 1)
+
+      day = day === 0 ? 7 : day
+
+      const offset = this.offsetDay
+      const rows = this.tableRows
+      let count = 1
+
+      const startDate = this.startDate
+      const disabledDate = this.disabledDate
+      const cellClassName = this.cellClassName
+      const selectedDate = this.selectionMode === 'dates' ? coerceTruthyValueToArray(this.value) : []
+      const now = getDateTimestamp(new Date(), this.utc)
+
+      for (let i = 0; i < 6; i++) {
+        const row = rows[i]
+
+        if (this.showWeekNumber) {
+          if (!row[0]) {
+            row[0] = { type: 'week', text: getWeekNumber(nextDate(startDate, i * 7 + 1)) }
+          }
+        }
+
+        for (let j = 0; j < 7; j++) {
+          let cell = row[this.showWeekNumber ? j + 1 : j]
+          if (!cell) {
+            cell = { row: i, column: j, type: 'normal', inRange: false, start: false, end: false }
+          }
+
+          cell.type = 'normal'
+
+          const index = i * 7 + j
+          const time = nextDate(startDate, index - offset).getTime()
+          cell.inRange = time >= getDateTimestamp(this.minDate) && time <= getDateTimestamp(this.maxDate)
+          cell.start = this.minDate && time === getDateTimestamp(this.minDate)
+          cell.end = this.maxDate && time === getDateTimestamp(this.maxDate)
+          const isToday = time === now
+
+          if (isToday) {
+            cell.type = 'today'
+          }
+
+          if (i >= 0 && i <= 1) {
+            const numberOfDaysFromPreviousMonth = day + offset < 0 ? 7 + day + offset : day + offset
+
+            if (j + i * 7 >= numberOfDaysFromPreviousMonth) {
+              cell.text = count++
+            } else {
+              cell.text = dateCountOfLastMonth - (numberOfDaysFromPreviousMonth - (j % 7)) + 1 + i * 7
+              cell.type = 'prev-month'
+            }
+          } else {
+            if (count <= dateCountOfMonth) {
+              cell.text = count++
+            } else {
+              cell.text = count++ - dateCountOfMonth
+              cell.type = 'next-month'
+            }
+          }
+
+          let cellDate = new Date(time)
+          cell.disabled = typeof disabledDate === 'function' && disabledDate(cellDate)
+          cell.selected = arrayFind(selectedDate, (date) => date.getTime() === cellDate.getTime())
+          cell.customClass = typeof cellClassName === 'function' && cellClassName(cellDate)
+          this.$set(row, this.showWeekNumber ? j + 1 : j, cell)
+        }
+
+        if (this.selectionMode === 'week') {
+          const start = this.showWeekNumber ? 1 : 0
+          const end = this.showWeekNumber ? 7 : 6
+          const isWeekActive = this.isWeekActive(row[start + 1])
+
+          row[start].inRange = isWeekActive
+          row[start].start = isWeekActive
+          row[end].inRange = isWeekActive
+          row[end].end = isWeekActive
+        }
+      }
+
+      return rows
+    }
+  },
+
+  watch: {
+    'rangeState.endDate'(newVal) {
+      this.markRange(this.minDate, newVal)
+    },
+
+    minDate(newVal, oldVal) {
+      if (getDateTimestamp(newVal) !== getDateTimestamp(oldVal)) {
+        this.markRange(this.minDate, this.maxDate)
+      }
+    },
+
+    maxDate(newVal, oldVal) {
+      if (getDateTimestamp(newVal) !== getDateTimestamp(oldVal)) {
+        this.markRange(this.minDate, this.maxDate)
+      }
+    }
+  },
+
+  data() {
+    return {
+      tableRows: [[], [], [], [], [], []],
+      lastRow: null,
+      lastColumn: null
+    }
+  },
+
+  methods: {
+    cellMatchesDate(cell, date) {
+      const value = new Date(date)
+      return this.year === value.getFullYear() && this.month === value.getMonth() && Number(cell.text) === value.getDate()
+    },
+
+    getCellClasses(cell) {
+      const selectionMode = this.selectionMode
+      const defaultValue = this.defaultValue ? (Array.isArray(this.defaultValue) ? this.defaultValue : [this.defaultValue]) : []
+
+      let classes = []
+      if ((cell.type === 'normal' || cell.type === 'today') && !cell.disabled) {
+        classes.push('available')
+        if (cell.type === 'today') {
+          classes.push('today')
+        }
+      } else {
+        classes.push(cell.type)
+      }
+
+      if (cell.type === 'normal' && defaultValue.some((date) => this.cellMatchesDate(cell, date))) {
+        classes.push('default')
+      }
+
+      if (selectionMode === 'day' && (cell.type === 'normal' || cell.type === 'today') && this.cellMatchesDate(cell, this.value)) {
+        classes.push('current')
+      }
+
+      if (cell.inRange && (cell.type === 'normal' || cell.type === 'today' || this.selectionMode === 'week')) {
+        classes.push('in-range')
+
+        if (cell.start) {
+          classes.push('start-date')
+        }
+
+        if (cell.end) {
+          classes.push('end-date')
+        }
+      }
+
+      if (cell.disabled) {
+        classes.push('disabled')
+      }
+
+      if (cell.selected) {
+        classes.push('selected')
+      }
+
+      if (cell.customClass) {
+        classes.push(cell.customClass)
+      }
+
+      return classes.join(' ')
+    },
+
+    getDateOfCell(row, column) {
+      const offsetFromStart = row * 7 + (column - (this.showWeekNumber ? 1 : 0)) - this.offsetDay
+      return nextDate(this.startDate, offsetFromStart)
+    },
+
+    isWeekActive(cell) {
+      if (this.selectionMode !== 'week') return false
+      const newDate = new Date(this.year, this.month, 1)
+      const year = newDate.getFullYear()
+      const month = newDate.getMonth()
+
+      if (cell.type === 'prev-month') {
+        newDate.setMonth(month === 0 ? 11 : month - 1)
+        newDate.setFullYear(month === 0 ? year - 1 : year)
+      }
+
+      if (cell.type === 'next-month') {
+        newDate.setMonth(month === 11 ? 0 : month + 1)
+        newDate.setFullYear(month === 11 ? year + 1 : year)
+      }
+
+      newDate.setDate(parseInt(cell.text, 10))
+
+      if (isDate(this.value)) {
+        const dayOffset = ((this.value.getDay() - this.firstDayOfWeek + 7) % 7) - 1
+        const weekDate = prevDate(this.value, dayOffset)
+        return weekDate.getTime() === newDate.getTime()
+      }
+      return false
+    },
+
+    markRange(minDate, maxDate) {
+      minDate = getDateTimestamp(minDate)
+      maxDate = getDateTimestamp(maxDate) || minDate
+      ;[minDate, maxDate] = [Math.min(minDate, maxDate), Math.max(minDate, maxDate)]
+
+      const startDate = this.startDate
+      const rows = this.rows
+      for (let i = 0, k = rows.length; i < k; i++) {
+        const row = rows[i]
+        for (let j = 0, l = row.length; j < l; j++) {
+          if (this.showWeekNumber && j === 0) continue
+
+          const cell = row[j]
+          const index = i * 7 + j + (this.showWeekNumber ? -1 : 0)
+          const time = nextDate(startDate, index - this.offsetDay).getTime()
+
+          cell.inRange = minDate && time >= minDate && time <= maxDate
+          cell.start = minDate && time === minDate
+          cell.end = maxDate && time === maxDate
+        }
+      }
+    },
+
+    handleMouseMove(event) {
+      if (!this.rangeState.selecting) return
+
+      let target = event.target
+      if (target.tagName === 'SPAN') {
+        target = target.parentNode.parentNode
+      }
+      if (target.tagName === 'DIV') {
+        target = target.parentNode
+      }
+      if (target.tagName !== 'TD') return
+
+      const row = target.parentNode.rowIndex - 1
+      const column = target.cellIndex
+
+      // can not select disabled date
+      if (this.rows[row][column].disabled) return
+
+      // only update rangeState when mouse moves to a new cell
+      // this avoids frequent Date object creation and improves performance
+      if (row !== this.lastRow || column !== this.lastColumn) {
+        this.lastRow = row
+        this.lastColumn = column
+        this.$emit('changerange', {
+          minDate: this.minDate,
+          maxDate: this.maxDate,
+          rangeState: {
+            selecting: true,
+            endDate: this.getDateOfCell(row, column)
+          }
+        })
+      }
+    },
+
+    handleClick(event) {
+      let target = event.target
+      if (target.tagName === 'SPAN') {
+        target = target.parentNode.parentNode
+      }
+      if (target.tagName === 'DIV') {
+        target = target.parentNode
+      }
+
+      if (target.tagName !== 'TD') return
+
+      const row = target.parentNode.rowIndex - 1
+      const column = this.selectionMode === 'week' ? 1 : target.cellIndex
+      const cell = this.rows[row][column]
+
+      if (cell.disabled || cell.type === 'week') return
+
+      const newDate = this.getDateOfCell(row, column)
+
+      if (this.selectionMode === 'range') {
+        if (!this.rangeState.selecting) {
+          this.$emit('pick', { minDate: newDate, maxDate: null })
+          this.rangeState.selecting = true
+        } else {
+          if (newDate >= this.minDate) {
+            this.$emit('pick', { minDate: this.minDate, maxDate: newDate })
+          } else {
+            this.$emit('pick', { minDate: newDate, maxDate: this.minDate })
+          }
+          this.rangeState.selecting = false
+        }
+      } else if (this.selectionMode === 'day') {
+        this.$emit('pick', newDate)
+      } else if (this.selectionMode === 'week') {
+        const weekNumber = getWeekNumber(newDate)
+        const value = newDate.getFullYear() + 'w' + weekNumber
+        this.$emit('pick', {
+          year: newDate.getFullYear(),
+          week: weekNumber,
+          value: value,
+          date: newDate
+        })
+      } else if (this.selectionMode === 'dates') {
+        const value = this.value || []
+        const newValue = cell.selected ? removeFromArray(value, (date) => date.getTime() === newDate.getTime()) : [...value, newDate]
+        this.$emit('pick', newValue)
+      }
+    }
+  }
+}
+</script>