zartui 2.1.6 → 2.1.8

package/lib/datetime-picker/DatePicker.js

@@ -1,32 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.default = void 0;
-
 var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _utils = require("../utils");
-
 var _date = require("../utils/validate/date");
-
 var _string = require("../utils/format/string");
-
 var _utils2 = require("./utils");
-
 var _shared = require("./shared");
-
 var _dateUtil = require("../utils/format/date-util");
-
 var currentYear = new Date().getFullYear();
-
 var _createNamespace = (0, _utils.createNamespace)('date-picker'),
-    createComponent = _createNamespace[0];
-
-var _default2 = createComponent({
+  createComponent = _createNamespace[0];
+var _default2 = exports.default = createComponent({
   mixins: [_shared.TimePickerMixin],
   props: (0, _extends2.default)({}, _shared.sharedProps, {
     type: {
@@ -52,7 +40,6 @@ var _default2 = createComponent({
     filter: 'updateInnerValue',
     minDate: function minDate() {
       var _this = this;
-
       this.$nextTick(function () {
         _this.updateInnerValue();
       });
@@ -60,14 +47,12 @@ var _default2 = createComponent({
     maxDate: function maxDate(value) {
       var value1 = "";
       var value2 = "";
-
       try {
         value1 = this.innerValue.valueOf();
         value2 = value.valueOf();
       } catch (error) {
         console.warn("zartui datetime-picker maxDate valueOf error", error);
       }
-
       if (value1 && value2 && value1 >= value2) {
         this.innerValue = value;
       } else {
@@ -76,14 +61,12 @@ var _default2 = createComponent({
     },
     value: function value(val) {
       val = this.formatValue(val);
-
       try {
         if (val && val.valueOf() !== this.innerValue.valueOf()) {
           this.innerValue = val;
         }
       } catch (error) {
         console.warn("zartui datetime-picker value valueOf error", error);
-
         if (val && this.innerValue === null) {
           this.innerValue = val;
         }
@@ -93,19 +76,17 @@ var _default2 = createComponent({
   computed: {
     ranges: function ranges() {
       var _this$getBoundary = this.getBoundary('max', this.innerValue ? this.innerValue : this.minDate),
-          maxYear = _this$getBoundary.maxYear,
-          maxDate = _this$getBoundary.maxDate,
-          maxMonth = _this$getBoundary.maxMonth,
-          maxHour = _this$getBoundary.maxHour,
-          maxMinute = _this$getBoundary.maxMinute;
-
+        maxYear = _this$getBoundary.maxYear,
+        maxDate = _this$getBoundary.maxDate,
+        maxMonth = _this$getBoundary.maxMonth,
+        maxHour = _this$getBoundary.maxHour,
+        maxMinute = _this$getBoundary.maxMinute;
       var _this$getBoundary2 = this.getBoundary('min', this.innerValue ? this.innerValue : this.minDate),
-          minYear = _this$getBoundary2.minYear,
-          minDate = _this$getBoundary2.minDate,
-          minMonth = _this$getBoundary2.minMonth,
-          minHour = _this$getBoundary2.minHour,
-          minMinute = _this$getBoundary2.minMinute;
-
+        minYear = _this$getBoundary2.minYear,
+        minDate = _this$getBoundary2.minDate,
+        minMonth = _this$getBoundary2.minMonth,
+        minHour = _this$getBoundary2.minHour,
+        minMinute = _this$getBoundary2.minMinute;
       var result = [{
         type: 'year',
         range: [minYear, maxYear]
@@ -122,25 +103,20 @@ var _default2 = createComponent({
         type: 'minute',
         range: [minMinute, maxMinute]
       }];
-
       switch (this.type) {
         case 'date':
           result = result.slice(0, 3);
           break;
-
         case 'year-month':
           result = result.slice(0, 2);
           break;
-
         case 'month-day':
           result = result.slice(1, 3);
           break;
-
         case 'datehour':
           result = result.slice(0, 4);
           break;
       }
-
       if (this.columnsOrder) {
         var columnsOrder = this.columnsOrder.concat(result.map(function (column) {
           return column.type;
@@ -149,14 +125,12 @@ var _default2 = createComponent({
           return columnsOrder.indexOf(a.type) - columnsOrder.indexOf(b.type);
         });
       }
-
       return result;
     }
   },
   methods: {
     formatValue: function formatValue(value) {
       var _this2 = this;
-
       if (typeof value === "string") {
         try {
           value = value.replace(/-/g, "/");
@@ -165,11 +139,9 @@ var _default2 = createComponent({
           console.error("datetime-picker strToDate error", error);
         }
       }
-
       if (!(0, _date.isDate)(value)) {
         return null;
       }
-
       var minDate = new Date(this.minDate);
       var maxDate = new Date(this.maxDate);
       var dateMethods = {
@@ -179,11 +151,10 @@ var _default2 = createComponent({
         hour: 'getHours',
         minute: 'getMinutes'
       };
-
       if (this.originColumns) {
         var dateColumns = this.originColumns.map(function (_ref, index) {
           var type = _ref.type,
-              values = _ref.values;
+            values = _ref.values;
           var range = _this2.ranges[index].range;
           var minDateVal = minDate[dateMethods[type]]();
           var maxDateVal = maxDate[dateMethods[type]]();
@@ -194,7 +165,6 @@ var _default2 = createComponent({
             values: [minDateVal < range[0] ? Math.max(minDateVal, min) : min || minDateVal, maxDateVal > range[1] ? Math.min(maxDateVal, max) : max || maxDateVal]
           };
         });
-
         if (this.type === 'month-day') {
           var year = (this.innerValue || this.minDate).getFullYear();
           dateColumns.unshift({
@@ -202,10 +172,8 @@ var _default2 = createComponent({
             values: [year, year]
           });
         }
-
         var dates = Object.keys(dateMethods).map(function (type) {
           var _dateColumns$filter$;
-
           return (_dateColumns$filter$ = dateColumns.filter(function (item) {
             return item.type === type;
           })[0]) == null ? void 0 : _dateColumns$filter$.values;
@@ -219,73 +187,58 @@ var _default2 = createComponent({
           return (0, _utils2.getTrueValue)(val[1]);
         }));
       }
-
       value = Math.max(value, minDate.getTime());
       value = Math.min(value, maxDate.getTime());
       return new Date(value);
     },
     getBoundary: function getBoundary(type, value) {
       var _ref2;
-
       var boundary = this[type + "Date"];
       var year = boundary.getFullYear();
       var month = 1;
       var date = 1;
       var hour = 0;
       var minute = 0;
-
       if (type === 'max') {
         month = 12;
         date = (0, _utils2.getMonthEndDay)(value.getFullYear(), value.getMonth() + 1);
         hour = 23;
         minute = 59;
       }
-
       if (value.getFullYear() === year) {
         month = boundary.getMonth() + 1;
-
         if (value.getMonth() + 1 === month) {
           date = boundary.getDate();
-
           if (value.getDate() === date) {
             hour = boundary.getHours();
-
             if (value.getHours() === hour) {
               minute = boundary.getMinutes();
             }
           }
         }
       }
-
       return _ref2 = {}, _ref2[type + "Year"] = year, _ref2[type + "Month"] = month, _ref2[type + "Date"] = date, _ref2[type + "Hour"] = hour, _ref2[type + "Minute"] = minute, _ref2;
     },
     updateInnerValue: function updateInnerValue() {
       var _this3 = this;
-
       var type = this.type;
       var indexes = this.getPicker().getIndexes();
-
       if (!indexes || indexes.length === 0) {
         return;
       }
-
       var getValue = function getValue(type) {
         var index = 0;
-
         _this3.originColumns.forEach(function (column, columnIndex) {
           if (type === column.type) {
             index = columnIndex;
           }
         });
-
         var values = _this3.originColumns[index].values;
         return (0, _utils2.getTrueValue)(values[indexes[index]]);
       };
-
       var year;
       var month;
       var day;
-
       if (type === 'month-day') {
         year = (this.innerValue || this.minDate).getFullYear();
         month = getValue('month');
@@ -295,110 +248,89 @@ var _default2 = createComponent({
         month = getValue('month');
         day = type === 'year-month' ? 1 : getValue('day');
       }
-
       var maxDay = (0, _utils2.getMonthEndDay)(year, month);
       day = day > maxDay ? maxDay : day;
       var hour = 0;
       var minute = 0;
-
       if (type === 'datehour') {
         hour = getValue('hour');
       }
-
       if (type === 'datetime') {
         hour = getValue('hour');
         minute = getValue('minute');
       }
-
       var value = new Date(year, month - 1, day, hour, minute);
       this.innerValue = this.formatValue(value);
     },
     onChange: function onChange(picker) {
       var _this4 = this;
-
       this.updateInnerValue();
       this.$nextTick(function () {
         _this4.$nextTick(function () {
           // https://github.com/vant-ui/vant/issues/9775
           _this4.updateInnerValue();
-
           _this4.$emit('change', picker);
         });
       });
     },
     updateColumnValue: function updateColumnValue() {
       var _this5 = this;
-
       // 根据type将默认时间和最大最小时间转换后再比较
       // 如果调用者传入new Date(),与此处new Date()会有时间差，目前只支持到分钟，可以忽略时间差
       var now = new Date();
       var dStr = "";
       var minStr = "";
       var maxStr = "";
-
       switch (this.type) {
         case "date":
           dStr = (0, _dateUtil.formatDateByDate)(now, _dateUtil.FORMAT.FORMAT_YMD);
           minStr = (0, _dateUtil.formatDateByDate)(this.minDate, _dateUtil.FORMAT.FORMAT_YMD);
           maxStr = (0, _dateUtil.formatDateByDate)(this.maxDate, _dateUtil.FORMAT.FORMAT_YMD);
           break;
-
         case "year-month":
           dStr = (0, _dateUtil.formatDateByDate)(now, _dateUtil.FORMAT.FORMAT_YM);
           minStr = (0, _dateUtil.formatDateByDate)(this.minDate, _dateUtil.FORMAT.FORMAT_YM);
           maxStr = (0, _dateUtil.formatDateByDate)(this.maxDate, _dateUtil.FORMAT.FORMAT_YM);
           break;
-
         case "month-day":
           dStr = (0, _dateUtil.formatDateByDate)(now, _dateUtil.FORMAT.FORMAT_MD);
           minStr = (0, _dateUtil.formatDateByDate)(this.minDate, _dateUtil.FORMAT.FORMAT_MD);
           maxStr = (0, _dateUtil.formatDateByDate)(this.maxDate, _dateUtil.FORMAT.FORMAT_MD);
           break;
-
         case "datetime":
           dStr = (0, _dateUtil.formatDateByDate)(now, _dateUtil.FORMAT.FORMAT_YMDHM);
           minStr = (0, _dateUtil.formatDateByDate)(this.minDate, _dateUtil.FORMAT.FORMAT_YMDHM);
           maxStr = (0, _dateUtil.formatDateByDate)(this.maxDate, _dateUtil.FORMAT.FORMAT_YMDHM);
           break;
-
         case "datehour":
           // "2022/11/11 14"这种格式无法使用new Date
           dStr = (0, _dateUtil.formatDateByDate)(now, _dateUtil.FORMAT.FORMAT_YMDH) + ":00:00";
           minStr = (0, _dateUtil.formatDateByDate)(this.minDate, _dateUtil.FORMAT.FORMAT_YMDH) + ":00:00";
           maxStr = (0, _dateUtil.formatDateByDate)(this.maxDate, _dateUtil.FORMAT.FORMAT_YMDH) + ":00:00";
           break;
-
         default:
           break;
       }
-
       var defaultValue = new Date(dStr.replace(/-/g, "/"));
       var minDate = new Date(minStr.replace(/-/g, "/"));
       var maxDate = new Date(maxStr.replace(/-/g, "/"));
-
       if (defaultValue < minDate || defaultValue > maxDate) {
         defaultValue = this.minDate;
       }
-
       var value = this.innerValue ? this.innerValue : defaultValue;
       var formatter = this.formatter;
       var values = this.originColumns.map(function (column) {
         switch (column.type) {
           case 'year':
             return formatter('year', "" + value.getFullYear());
-
           case 'month':
             return formatter('month', (0, _string.padZero)(value.getMonth() + 1));
-
           case 'day':
             return formatter('day', (0, _string.padZero)(value.getDate()));
-
           case 'hour':
             return formatter('hour', (0, _string.padZero)(value.getHours()));
-
           case 'minute':
             return formatter('minute', (0, _string.padZero)(value.getMinutes()));
-
           default:
             // no default
             return null;
@@ -409,6 +341,4 @@ var _default2 = createComponent({
       });
     }
   }
-});
-
-exports.default = _default2;
+});

package/lib/datetime-picker/TimePicker.js

@@ -1,24 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
 exports.default = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _utils = require("../utils");
-
 var _string = require("../utils/format/string");
-
 var _number = require("../utils/format/number");
-
 var _shared = require("./shared");
-
 var _createNamespace = (0, _utils.createNamespace)('time-picker'),
-    createComponent = _createNamespace[0];
-
-var _default = createComponent({
+  createComponent = _createNamespace[0];
+var _default = exports.default = createComponent({
   mixins: [_shared.TimePickerMixin],
   props: (0, _extends2.default)({}, _shared.sharedProps, {
     type: {
@@ -57,16 +49,14 @@ var _default = createComponent({
     filter: 'updateInnerValue',
     minHour: function minHour() {
       var _this = this;
-
       this.$nextTick(function () {
         _this.updateInnerValue();
       });
     },
     maxHour: function maxHour(value) {
       var _this$innerValue$spli = this.innerValue.split(':'),
-          hour = _this$innerValue$spli[0],
-          minute = _this$innerValue$spli[1];
-
+        hour = _this$innerValue$spli[0],
+        minute = _this$innerValue$spli[1];
       if (hour >= value) {
         this.innerValue = this.formatValue(value + ":" + minute);
         this.updateColumnValue();
@@ -77,9 +67,8 @@ var _default = createComponent({
     minMinute: 'updateInnerValue',
     maxMinute: function maxMinute(value) {
       var _this$innerValue$spli2 = this.innerValue.split(':'),
-          hour = _this$innerValue$spli2[0],
-          minute = _this$innerValue$spli2[1];
-
+        hour = _this$innerValue$spli2[0],
+        minute = _this$innerValue$spli2[1];
       if (minute >= value) {
         this.innerValue = this.formatValue(hour + ":" + value);
         this.updateColumnValue();
@@ -89,7 +78,6 @@ var _default = createComponent({
     },
     value: function value(val) {
       val = this.formatValue(val);
-
       if (val !== this.innerValue) {
         this.innerValue = val;
         this.updateColumnValue();
@@ -101,27 +89,23 @@ var _default = createComponent({
       if (!value) {
         value = (0, _string.padZero)(this.minHour) + ":" + (0, _string.padZero)(this.minMinute);
       }
-
       var _value$split = value.split(':'),
-          hour = _value$split[0],
-          minute = _value$split[1];
-
+        hour = _value$split[0],
+        minute = _value$split[1];
       hour = (0, _string.padZero)((0, _number.range)(hour, this.minHour, this.maxHour));
       minute = (0, _string.padZero)((0, _number.range)(minute, this.minMinute, this.maxMinute));
       return hour + ":" + minute;
     },
     updateInnerValue: function updateInnerValue() {
       var indexes = this.getPicker().getIndexes();
-
       if (!indexes || indexes.length === 0) {
         return;
       }
-
       var hourIndex = indexes[0],
-          minuteIndex = indexes[1];
+        minuteIndex = indexes[1];
       var _this$originColumns = this.originColumns,
-          hourColumn = _this$originColumns[0],
-          minuteColumn = _this$originColumns[1];
+        hourColumn = _this$originColumns[0],
+        minuteColumn = _this$originColumns[1];
       var hour = hourColumn.values[hourIndex] || hourColumn.values[0];
       var minute = minuteColumn.values[minuteIndex] || minuteColumn.values[0];
       this.innerValue = this.formatValue(hour + ":" + minute);
@@ -129,20 +113,17 @@ var _default = createComponent({
     },
     onChange: function onChange(picker) {
       var _this2 = this;
-
       this.updateInnerValue();
       this.$nextTick(function () {
         _this2.$nextTick(function () {
           // https://github.com/vant-ui/vant/issues/9775
           _this2.updateInnerValue();
-
           _this2.$emit('change', picker);
         });
       });
     },
     updateColumnValue: function updateColumnValue() {
       var _this3 = this;
-
       var formatter = this.formatter;
       var pair = this.innerValue.split(':');
       var values = [formatter('hour', pair[0]), formatter('minute', pair[1])];
@@ -151,6 +132,4 @@ var _default = createComponent({
       });
     }
   }
-});
-
-exports.default = _default;
+});

package/lib/datetime-picker/index.js

@@ -1,38 +1,23 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 exports.__esModule = true;
-exports.default = exports.RANGE_END_PICKER = exports.RANGE_START_PICKER = void 0;
-
+exports.default = exports.RANGE_START_PICKER = exports.RANGE_END_PICKER = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _utils = require("../utils");
-
 var _TimePicker = _interopRequireDefault(require("./TimePicker"));
-
 var _DatePicker = _interopRequireDefault(require("./DatePicker"));
-
 var _date = require("../utils/validate/date");
-
 var _popup = _interopRequireDefault(require("../popup"));
-
 var _button = _interopRequireDefault(require("../button"));
-
 var _toast = _interopRequireDefault(require("../toast"));
-
 var _dayjs = _interopRequireDefault(require("dayjs"));
-
 var _createNamespace = (0, _utils.createNamespace)('datetime-picker'),
-    createComponent = _createNamespace[0],
-    bem = _createNamespace[1];
-
-var RANGE_START_PICKER = 0;
-exports.RANGE_START_PICKER = RANGE_START_PICKER;
-var RANGE_END_PICKER = 1;
-exports.RANGE_END_PICKER = RANGE_END_PICKER;
-
-var _default2 = createComponent({
+  createComponent = _createNamespace[0],
+  bem = _createNamespace[1];
+var RANGE_START_PICKER = exports.RANGE_START_PICKER = 0;
+var RANGE_END_PICKER = exports.RANGE_END_PICKER = 1;
+var _default2 = exports.default = createComponent({
   props: (0, _extends2.default)({}, _TimePicker.default.props, _DatePicker.default.props, {
     // 是否开启时间范围选择
     range: {
@@ -82,13 +67,11 @@ var _default2 = createComponent({
   watch: {
     showPicker: function showPicker(val) {
       var _this = this;
-
       // 在第一次打开popup时，需要初始化内部picker存储的时间列index，避免初次打开直接关闭，导致picker内部index丢失
       if (val && !this.confirmedPopupPickerIndex) {
         // 注意这里实际上是双层nextTick,为了解决picker组件setConfirmIndex也在nextTick中执行，导致无法正确设置index的问题
         this.$nextTick(function () {
           _this.updatePickerConfirm();
-
           _this.confirmedPopupPickerIndex = true;
         });
       }
@@ -100,20 +83,16 @@ var _default2 = createComponent({
       if (this.range) {
         return [this.$refs.rangeStart.getProxiedPicker(), this.$refs.rangeEnd.getProxiedPicker()];
       }
-
       return this.$refs.root.getProxiedPicker();
     },
     genValueText: function genValueText(dateValue, timeValue) {
       var text = '';
-
       if (dateValue.length > 0) {
         text += dateValue.join('/');
       }
-
       if (timeValue.length > 0) {
         text = text + ' ' + timeValue.join(':');
       }
-
       return text;
     },
     genOriginValueText: function genOriginValueText(values) {
@@ -122,11 +101,9 @@ var _default2 = createComponent({
       var dateTimeArr = dateTime.split(/[-T:]/);
       var dateValues = [];
       var timeValues = [];
-
       if (this.$refs.rangeStart && this.$refs.rangeStart.originColumns) {
         this.$refs.rangeStart.originColumns.forEach(function (_ref, index) {
           var type = _ref.type;
-
           if (index < dateTimeArr.length) {
             if (['year', 'month', 'day'].includes(type)) {
               dateValues.push(dateTimeArr[index]);
@@ -140,7 +117,6 @@ var _default2 = createComponent({
     },
     genRangeHeader: function genRangeHeader() {
       var _this2 = this;
-
       var h = this.$createElement;
       return h("div", {
         "class": bem('title-tab-bar')
@@ -216,23 +192,19 @@ var _default2 = createComponent({
     },
     genToolbar: function genToolbar() {
       var h = this.$createElement;
-
       if (this.showToolbar) {
         return h("div", {
           "class": bem('toolbar')
         }, [[this.genCancel(), this.genConfirm()]]);
       }
     },
-
     /**
      * 这里必须手动调用一次picker组件内部pureRecordConfirmIndex，保证picker组件内部confirmIndex是当前选中的时间项index
      */
     updatePickerConfirm: function updatePickerConfirm() {
       var _this3 = this;
-
       this.$nextTick(function () {
         var pickers = _this3.getPicker();
-
         if (Array.isArray(pickers)) {
           pickers.forEach(function (p) {
             return p.pureRecordConfirmIndex();
@@ -248,7 +220,6 @@ var _default2 = createComponent({
         (0, _toast.default)('结束日期不能早于开始日期');
         return;
       }
-
       this.updatePickerConfirm();
       this.$emit('update:startValue', this.innerStartValue);
       this.$emit('update:endValue', this.innerEndValue);
@@ -261,10 +232,8 @@ var _default2 = createComponent({
   },
   render: function render() {
     var _this4 = this;
-
     var h = arguments[0];
     var Component = this.type === 'time' ? _TimePicker.default : _DatePicker.default;
-
     if (this.range) {
       var props = (0, _extends2.default)({}, this.$props, {
         bem: bem,
@@ -331,7 +300,6 @@ var _default2 = createComponent({
         "on": (0, _extends2.default)({}, endListener)
       })]), this.genToolbar()]);
     }
-
     return h(Component, {
       "ref": "root",
       "class": bem(),
@@ -340,6 +308,4 @@ var _default2 = createComponent({
       "on": (0, _extends2.default)({}, this.$listeners)
     });
   }
-});
-
-exports.default = _default2;
+});