mcrm-mobile 1.1.0 → 1.1.3

package/es/badge/index.js

@@ -18,9 +18,7 @@ export default create({
         dot: _vm.dot,
         fixed: !!_vm.$slots['default']
       }),
-      style: {
-        background: _vm.color
-      }
+      style: _vm.style
     }, [_vm._t("content", function () {
       return [_vm._v("\n      " + _vm._s(_vm.renderContent()) + "\n    ")];
     })], 2) : _vm._e()], 2) : _c('div', {
@@ -28,9 +26,7 @@ export default create({
         dot: _vm.dot,
         fixed: !!_vm.$slots['default']
       }),
-      style: {
-        background: _vm.color
-      }
+      style: _vm.style
     }, [_vm._t("content", function () {
       return [_vm._v("\n    " + _vm._s(_vm.renderContent()) + "\n  ")];
     })], 2);
@@ -43,6 +39,7 @@ export default create({
     dot: Boolean,
     max: [Number, String],
     color: String,
+    textColor: String,
     content: [Number, String],
     tag: {
       type: String,
@@ -66,5 +63,15 @@ export default create({
         return content;
       }
     }
+  },
+  computed: {
+    style: function style() {
+      var textColor = this.textColor,
+          color = this.color;
+      return {
+        color: textColor,
+        background: color
+      };
+    }
   }
 });

package/es/biz/style/index.js

@@ -14,5 +14,7 @@ import '../../menu/index.css';
 import '../../menus/index.css';
 import '../../sticky/index.css';
 import '../../tabs/index.css';
+import '../../tag/index.css';
+import '../../badge/index.css';
 import '../../tab/index.css';
 import '../index.css';

package/es/biz/style/less.js

@@ -14,5 +14,7 @@ import '../../menu/index.less';
 import '../../menus/index.less';
 import '../../sticky/index.less';
 import '../../tabs/index.less';
+import '../../tag/index.less';
+import '../../badge/index.less';
 import '../../tab/index.less';
 import '../index.less';

package/es/calendar/components/Month.js

@@ -11,29 +11,25 @@ export default {
 
     return _c('div', {
       ref: "month",
-      class: _vm.b('month'),
-      style: _vm.monthStyle
+      class: _vm.b('month')
     }, [_vm.showMonthTitle ? _c('div', {
       class: _vm.b('month-title')
-    }, [_vm._v("\n    " + _vm._s(_vm.title) + "\n  ")]) : _vm._e(), _vm.shouldRender ? _c('div', {
+    }, [_vm._v("\n    " + _vm._s(_vm.title) + "\n  ")]) : _vm._e(), _c('div', {
       ref: "days",
       class: _vm.b('days'),
       attrs: {
         "role": "grid"
       }
-    }, [_vm.showMark ? _c('div', {
+    }, [_vm.showMark && _vm.shouldRender ? _c('div', {
       class: _vm.b('month-mark')
-    }, [_vm._v("\n      " + _vm._s(_vm.date.getMonth() + 1) + "\n    ")]) : _vm._e(), _vm._l(_vm.days, function (item, index) {
-      return _c('div', {
+    }, [_vm._v("\n      " + _vm._s(_vm.date.getMonth() + 1) + "\n    ")]) : _vm._e(), _vm._l(_vm.newDats, function (item, index) {
+      return [item.type === 'selected' ? _c('div', {
         key: index + '' + item.text,
-        ref: "day",
-        refInFor: true,
-        class: [_vm.b('day', item.type), item.className],
+        class: [_vm.b('day'), item.className],
         style: _vm.getDayStyle(item.type, index),
         attrs: {
-          "refInFor": "",
           "role": "gridcell",
-          "tabindex": _vm.type === 'disabled' ? null : -1
+          "tabindex": -1
         },
         on: {
           "click": function click($event) {
@@ -41,16 +37,35 @@ export default {
           }
         }
       }, [_c('div', {
-        class: item.type === 'selected' ? _vm.b('selected-day') : '',
-        style: item.type === 'selected' ? _vm.selectedStyle : null
+        class: _vm.b('selected-day'),
+        style: _vm.selectedStyle
+      }, [item.topInfo || _vm.$slots['top-info'] ? _c('div', {
+        class: _vm.b('top-info')
+      }, [_vm._t("top-info", function () {
+        return [_vm._v("\n              " + _vm._s(item.topInfo) + "\n            ")];
+      }, null, item)], 2) : _vm._e(), _vm._v("\n          " + _vm._s(item.text) + "\n          "), item.bottomInfo || _vm.$slots['bottom-info'] ? _c('div', {
+        class: _vm.b('bottom-info')
+      }, [_vm._t("bottom-info", function () {
+        return [_vm._v("\n              " + _vm._s(item.bottomInfo) + "\n            ")];
+      }, null, item)], 2) : _vm._e()])]) : _c('div', {
+        key: index + '' + item.text,
+        class: [_vm.b('day', item.type), item.className],
+        style: _vm.getDayStyle(item.type, index),
+        attrs: {
+          "role": "gridcell",
+          "tabindex": item.type === 'disabled' ? null : -1
+        },
+        on: {
+          "click": function click($event) {
+            return _vm.onClick(item);
+          }
+        }
       }, [item.topInfo ? _c('div', {
         class: _vm.b('top-info')
       }, [_vm._v("\n          " + _vm._s(item.topInfo) + "\n        ")]) : _vm._e(), _vm._v("\n        " + _vm._s(item.text) + "\n        "), item.bottomInfo ? _c('div', {
         class: _vm.b('bottom-info')
-      }, [_vm._v("\n          " + _vm._s(item.bottomInfo) + "\n        ")]) : _vm._e()])]);
-    })], 2) : _c('div', {
-      ref: "days"
-    })]);
+      }, [_vm._v("\n          " + _vm._s(item.bottomInfo) + "\n        ")]) : _vm._e()])];
+    })], 2)]);
   },
   name: "month",
   props: {
@@ -67,29 +82,9 @@ export default {
     currentDate: [Date, Array],
     allowSameDay: Boolean,
     showSubtitle: Boolean,
-    realRowHeight: Number,
     showMonthTitle: Boolean,
     firstDayOfWeek: Number
   },
-  watch: {
-    shouldRender: function shouldRender(value) {
-      var _this = this;
-
-      if (value) {
-        this.$nextTick(function () {
-          if (_this.$refs.day[0] && !_this.realRowHeight) {
-            var _this$$refs$day$0$get = _this.$refs.day[0].getBoundingClientRect(),
-                height = _this$$refs$day$0$get.height;
-
-            _this.$emit("update-height", height);
-          }
-        });
-      }
-    },
-    realRowHeight: function realRowHeight() {
-      this.height = null;
-    }
-  },
   data: function data() {
     return {
       visible: false
@@ -117,10 +112,10 @@ export default {
       Scroll.setScrollTop(body, scrollTop);
     },
     getMultipleDayType: function getMultipleDayType(day) {
-      var _this2 = this;
+      var _this = this;
 
       var isSelected = function isSelected(date) {
-        return _this2.currentDate.some(function (item) {
+        return _this.currentDate.some(function (item) {
           return compareDay(item, date) === 0;
         });
       };
@@ -225,6 +220,11 @@ export default {
         height: this.rowHeightWithUnit
       };
 
+      if (type === "placeholder") {
+        style.width = "100%";
+        return style;
+      }
+
       if (index === 0) {
         style.marginLeft = 100 * this.offset / 7 + "%";
       }
@@ -270,15 +270,17 @@ export default {
     shouldRender: function shouldRender() {
       return this.visible || !this.lazyRender;
     },
-    monthStyle: function monthStyle() {
-      if (!this.shouldRender) {
-        var padding = Math.ceil((this.totalDay + this.offset) / 7) * this.realRowHeight;
-        return {
-          paddingBottom: padding + "px"
-        };
+    placeholders: function placeholders() {
+      var rows = [];
+      var count = Math.ceil((this.totalDay + this.offset) / 7);
+
+      for (var day = 1; day <= count; day++) {
+        rows.push({
+          type: "placeholder"
+        });
       }
 
-      return {};
+      return rows;
     },
     days: function days() {
       var days = [];
@@ -303,6 +305,9 @@ export default {
       }
 
       return days;
+    },
+    newDats: function newDats() {
+      return this.shouldRender ? this.days : this.placeholders;
     }
   }
 };

package/es/calendar/index.css

@@ -330,14 +330,10 @@
   display: flex;
   -ms-flex-wrap: wrap;
       flex-wrap: wrap;
-  -webkit-appearance: none;
-  -webkit-tap-highlight-color: transparent;
-  outline: none;
   -webkit-user-select: none;
      -moz-user-select: none;
       -ms-user-select: none;
           user-select: none;
-  border: 0;
 }
 .mm-calendar-month-mark {
   position: absolute;
@@ -369,13 +365,6 @@
   height: 64px;
   font-size: 16px;
   cursor: pointer;
-  -webkit-appearance: none;
-  -webkit-tap-highlight-color: transparent;
-  outline: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
 }
 .mm-calendar-day-end,
 .mm-calendar-day-start,
@@ -383,7 +372,7 @@
 .mm-calendar-day-multiple-middle,
 .mm-calendar-day-multiple-selected {
   color: #fff;
-  background-color: #ff3b30;
+  background-color: #0095fd;
 }
 .mm-calendar-day-start {
   border-radius: 4px 0 0 4px;
@@ -396,7 +385,7 @@
   border-radius: 4px;
 }
 .mm-calendar-day-middle {
-  color: #ff3b30;
+  color: #0095fd;
 }
 .mm-calendar-day-middle::after {
   position: absolute;
@@ -436,7 +425,7 @@
   width: 54px;
   height: 54px;
   color: #fff;
-  background-color: #ff3b30;
+  background-color: #0095fd;
   border-radius: 4px;
 }
 .mm-calendar-footer {

package/es/calendar/index.js

@@ -9,6 +9,7 @@ import Header from "./components/Header"; // Utils
 import { isDate } from "../utils/validate/date";
 import Scroll from "../utils/dom/scroll";
 import { copyDate, copyDates, getNextDay, compareDay, calcDateNum, compareMonth, getDayByOffset, rangePromptFn } from "./utils";
+import { raf } from "../utils/dom/raf";
 export default create({
   render: function render() {
     var _vm = this;
@@ -31,16 +32,16 @@ export default create({
       on: {
         "input": _vm.togglePopup,
         "open": function open($event) {
-          return _vm.onOpen('open');
+          return _vm.createListener('open');
         },
         "opened": function opened($event) {
-          return _vm.onOpen('opened');
+          return _vm.createListener('opened');
         },
         "close": function close($event) {
-          return _vm.onOpen('close');
+          return _vm.createListener('close');
         },
         "closed": function closed($event) {
-          return _vm.onOpen('closed');
+          return _vm.createListener('closed');
         }
       }
     }, [_c('div', {
@@ -80,13 +81,11 @@ export default create({
           "currentDate": _vm.currentDate,
           "showSubtitle": _vm.showSubtitle,
           "allowSameDay": _vm.allowSameDay,
-          "realRowHeight": _vm.realRowHeight,
           "showMonthTitle": index !== 0 || !_vm.showSubtitle,
           "firstDayOfWeek": _vm.dayOffset
         },
         on: {
-          "click": _vm.onClickDay,
-          "update-height": _vm.onUpdateHeight
+          "click": _vm.onClickDay
         }
       });
     }), 1), _c('div', {
@@ -95,14 +94,12 @@ export default create({
       })
     }, [_vm._t("footer", function () {
       return [_vm.showConfirm ? _c('Button', {
-        staticClass: "bg-red",
+        staticClass: "bg-blue",
         class: _vm.b('confirm'),
         attrs: {
           "radius": "mc",
           "block": "",
-          "type": "danger",
-          "color": _vm.color,
-          "background": _vm.background,
+          "background": _vm.btnBackground,
           "disabled": _vm.buttonDisabled,
           "nativeType": "button"
         },
@@ -147,13 +144,11 @@ export default create({
           "currentDate": _vm.currentDate,
           "showSubtitle": _vm.showSubtitle,
           "allowSameDay": _vm.allowSameDay,
-          "realRowHeight": _vm.realRowHeight,
           "showMonthTitle": index !== 0 || !_vm.showSubtitle,
           "firstDayOfWeek": _vm.dayOffset
         },
         on: {
-          "click": _vm.onClickDay,
-          "update-height": _vm.onUpdateHeight
+          "click": _vm.onClickDay
         }
       });
     }), 1), _c('div', {
@@ -162,14 +157,12 @@ export default create({
       })
     }, [_vm._t("footer", function () {
       return [_vm.showConfirm ? _c('Button', {
-        staticClass: "bg-red",
+        staticClass: "bg-blue",
         class: _vm.b('confirm'),
         attrs: {
           "radius": "mc",
           "block": "",
-          "type": "danger",
-          "color": _vm.color,
-          "background": _vm.background,
+          "background": _vm.btnBackground,
           "disabled": _vm.buttonDisabled,
           "nativeType": "button"
         },
@@ -190,7 +183,7 @@ export default create({
   props: {
     title: String,
     color: String,
-    background: String,
+    btnBackground: String,
     value: Boolean,
     readonly: Boolean,
     formatter: Function,
@@ -277,8 +270,10 @@ export default create({
     }
   },
   watch: {
-    type: "reset",
     value: "init",
+    type: function type() {
+      this.reset();
+    },
     defaultDate: function defaultDate(val) {
       this.currentDate = val;
       this.scrollIntoView();
@@ -287,8 +282,7 @@ export default create({
   data: function data() {
     return {
       subtitle: "",
-      currentDate: this.getInitialDate(),
-      realRowHeight: 0
+      currentDate: this.getInitialDate()
     };
   },
   mounted: function mounted() {
@@ -301,8 +295,12 @@ export default create({
   },
   methods: {
     // @exposed-api
-    reset: function reset() {
-      this.currentDate = this.getInitialDate();
+    reset: function reset(date) {
+      if (date === void 0) {
+        date = this.getInitialDate();
+      }
+
+      this.currentDate = date;
       this.scrollIntoView();
     },
     init: function init() {
@@ -318,21 +316,15 @@ export default create({
         _this.bodyHeight = Math.floor(_this.$refs.body.getBoundingClientRect().height);
 
         _this.onScroll();
+
+        _this.scrollIntoView();
       });
-      this.scrollIntoView();
     },
-    // scroll to current month
-    scrollIntoView: function scrollIntoView() {
+    // @exposed-api
+    scrollToDate: function scrollToDate(targetDate) {
       var _this2 = this;
 
-      this.$nextTick(function () {
-        var currentDate = _this2.currentDate;
-
-        if (!currentDate) {
-          return;
-        }
-
-        var targetDate = _this2.type === "single" ? currentDate : currentDate[0];
+      raf(function () {
         var displayed = _this2.value || !_this2.poppable;
         /* istanbul ignore if */
 
@@ -351,8 +343,19 @@ export default create({
 
           return false;
         });
+
+        _this2.onScroll();
       });
     },
+    // scroll to current month
+    scrollIntoView: function scrollIntoView() {
+      var currentDate = this.currentDate;
+
+      if (currentDate) {
+        var targetDate = this.type === "single" ? currentDate : currentDate[0];
+        this.scrollToDate(targetDate);
+      }
+    },
     getInitialDate: function getInitialDate() {
       var type = this.type,
           minDate = this.minDate,
@@ -392,6 +395,7 @@ export default create({
           body = _this$$refs.body,
           months = _this$$refs.months;
       var top = Scroll.getScrollTop(body);
+      var bottom = top + this.bodyHeight;
       var heights = months.map(function (item) {
         return item.getHeight();
       });
@@ -399,39 +403,41 @@ export default create({
         return a + b;
       }, 0); // iOS scroll bounce may exceed the range
 
-      var bottom = top + this.bodyHeight;
-
       if (bottom > heightSum && top > 0) {
-        bottom = heightSum;
+        return;
       }
 
       var height = 0;
-      var currentMonth; // add offset to avoid rem accuracy issues
-      // see: https://github.com/youzan/vant/issues/6929
-
-      var viewportOffset = 50;
-      var viewportTop = top - viewportOffset;
-      var viewportBottom = bottom + viewportOffset;
+      var currentMonth;
+      var visibleRange = [-1, -1];
 
       for (var i = 0; i < months.length; i++) {
-        var visible = height <= viewportBottom && height + heights[i] >= viewportTop;
+        var visible = height <= bottom && height + heights[i] >= top;
 
-        if (visible && !currentMonth) {
-          currentMonth = months[i];
-        }
+        if (visible) {
+          visibleRange[1] = i;
 
-        if (!months[i].visible && visible) {
-          this.$emit("month-show", {
-            date: months[i].date,
-            title: months[i].title
-          });
+          if (!currentMonth) {
+            currentMonth = months[i];
+            visibleRange[0] = i;
+          }
+
+          if (!months[i].showed) {
+            months[i].showed = true;
+            this.$emit("month-show", {
+              date: months[i].date,
+              title: months[i].title
+            });
+          }
         }
 
-        months[i].visible = visible;
         height += heights[i];
       }
-      /* istanbul ignore else */
 
+      months.forEach(function (month, index) {
+        month.visible = index >= visibleRange[0] - 1 && index <= visibleRange[1] + 1;
+      });
+      /* istanbul ignore else */
 
       if (currentMonth) {
         this.subtitle = currentMonth.title;
@@ -465,6 +471,8 @@ export default create({
           } else if (this.allowSameDay) {
             this.select([date, date], true);
           }
+        } else if (endDay && date.getTime() > endDay.getTime()) {
+          this.select([startDay, date], true);
         } else {
           this.select([date, null]);
         }
@@ -502,7 +510,7 @@ export default create({
     togglePopup: function togglePopup(val) {
       this.$emit("input", val);
     },
-    onOpen: function onOpen(name) {
+    createListener: function createListener(name) {
       this.$emit(name);
     },
     select: function select(date, complete) {
@@ -548,9 +556,6 @@ export default create({
     },
     onConfirm: function onConfirm() {
       this.$emit("confirm", copyDates(this.currentDate));
-    },
-    onUpdateHeight: function onUpdateHeight(height) {
-      this.realRowHeight = height;
     }
   },
   computed: {

package/es/calendar/index.less

@@ -69,11 +69,7 @@
     position: relative;
     display: flex;
     flex-wrap: wrap;
-    -webkit-appearance: none;
-    -webkit-tap-highlight-color: transparent;
-    outline: none;
     user-select: none;
-    border: 0;
   }
 
   &-month-mark {
@@ -101,10 +97,6 @@
     height: @calendar-day-height;
     font-size: @calendar-day-font-size;
     cursor: pointer;
-    -webkit-appearance: none;
-    -webkit-tap-highlight-color: transparent;
-    outline: none;
-    user-select: none;
 
     &-end,
     &-start,

package/es/card/index.js

@@ -20,9 +20,11 @@ export default create({
         on: {
           "click": _vm.onClick
         }
-      }, [_c('span', {
-        class: _vm.b('header-title')
-      }, [_vm._v(_vm._s(_vm.title))]), _vm._t("right-op", function () {
+      }, [_vm._t("title", function () {
+        return [_c('span', {
+          class: _vm.b('header-title')
+        }, [_vm._v(_vm._s(_vm.title))])];
+      }), _vm._t("right-op", function () {
         return [_vm.isLink ? _c('mm-icon', {
           attrs: {
             "name": _vm.icon

package/es/common-utils/index.js

@@ -87,6 +87,7 @@ CommonUtils.formattingTime = function (date, format) {
   var hour = date.getHours();
   var min = date.getMinutes();
   var seconds = date.getSeconds();
+  var milliseconds = date.getMilliseconds();
   var monthS = CommonUtils.zeroPadding(function (val) {
     return val < 10;
   }, month);
@@ -102,7 +103,10 @@ CommonUtils.formattingTime = function (date, format) {
   var secondsS = CommonUtils.zeroPadding(function (val) {
     return val < 10;
   }, seconds);
-  var desc = format.replace("yyyy", year).replace("MM", monthS).replace("dd", dayS).replace("hh", hourS).replace("mm", minS).replace("ss", secondsS);
+  var millisecondsS = CommonUtils.zeroPadding(function (val) {
+    return val < 10;
+  }, milliseconds);
+  var desc = format.replace("yyyy", year).replace("MM", monthS).replace("dd", dayS).replace("hh", hourS).replace("mm", minS).replace("ss", secondsS).replace("SSS", millisecondsS);
   return {
     date: date,
     desc: desc,
@@ -111,7 +115,8 @@ CommonUtils.formattingTime = function (date, format) {
     day: day,
     hour: hour,
     min: min,
-    seconds: seconds
+    seconds: seconds,
+    milliseconds: milliseconds
   };
 };
 
@@ -133,9 +138,16 @@ CommonUtils.getMonthBefore = function (monthBefore, currDate) {
     month = currMonth - monthBefore;
     year = currYear;
 
-    if (month <= 0) {
-      month += 12;
-      year--;
+    if (monthBefore > 0) {
+      if (month <= 0) {
+        month += 12;
+        year--;
+      }
+    } else {
+      if (month > 12) {
+        month -= 12;
+        year++;
+      }
     }
 
     day = CommonUtils.getNumForMonth(year, month);