mini-antui - npm Package Compare versions

Comparing version 0.3.14-alpha.3 to 0.3.14-alpha.4

es/calendar/index.js

@@ -55,3 +55,3 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
   didMount: function didMount() {
-    this.tapTimes = 0;
+    this.tapTimes = 1;
     var date = new Date();
@@ -144,3 +144,3 @@ date.setHours(0);
     refreshdates: function refreshdates(month, year) {
-      this.tapTimes = 0;
+      this.tapTimes = 1;
       var _data3 = this.data,
@@ -264,2 +264,3 @@ selectedYear = _data3.selectedYear,
           dateObj.color = COLOR_MAP[item.tagColor];
+          dateObj.disable = item.disable;
           return true;
@@ -290,5 +291,4 @@ } else {
       if (type === 'range') {
-        this.tapTimes += 1;
-
         if (this.tapTimes % 2 === 0) {
+          this.tapTimes += 1;
           this.endDate = { year: year, month: month, date: date };
@@ -303,2 +303,3 @@ var dateGap = this.getDateGap(this.startDate, this.endDate);
 
+          var hasDisable = false;
           for (var i = 0; i < dates.length; i++) {
@@ -313,3 +314,11 @@ for (var j = 0; j < dates[i].length; j++) {
               var endDateGap = this.getDateGap(dateObj, this.endDate);
+
+              if (dateObj.year === year && dateObj.month === month && dateObj.date === date && dateObj.disable) {
+                hasDisable = true;
+              }
               if (startDateGap > 0 && endDateGap < 0) {
+                if (dateObj.disable) {
+                  hasDisable = true;
+                }
+
                 if (dateGap !== 0) {
@@ -345,2 +354,7 @@ if (j === 0) {
           }
+          if (hasDisable) {
+            this.props.onSelectHasDisableDate([this.makeDate(this.startDate), this.makeDate(this.endDate)]);
+            return;
+          }
+
           if (this.props.onSelect) {
@@ -350,2 +364,3 @@ this.props.onSelect([this.makeDate(this.startDate), this.makeDate(this.endDate)]);
         } else {
+          var isDisable = false;
           for (var _i5 = 0; _i5 < dates.length; _i5++) {
@@ -355,3 +370,9 @@ for (var _j = 0; _j < dates[_i5].length; _j++) {
               if (_dateObj.year === year && _dateObj.month === month && _dateObj.date === date) {
-                _dateObj.isSelected = true;
+                if (_dateObj.disable) {
+                  console.log(1111);
+                  isDisable = true;
+                  _dateObj.isSelected = false;
+                } else {
+                  _dateObj.isSelected = true;
+                }
                 _dateObj.isStart = false;
@@ -368,2 +389,5 @@ _dateObj.isMiddle = false;
           }
+          if (!isDisable) {
+            this.tapTimes += 1;
+          }
           this.startDate = { year: year, month: month, date: date };
@@ -376,2 +400,3 @@ }
       } else {
+        var _isDisable = false;
         for (var _i6 = 0; _i6 < dates.length; _i6++) {
@@ -382,2 +407,5 @@ for (var _j2 = 0; _j2 < dates[_i6].length; _j2++) {
               _dateObj2.isSelected = true;
+              if (_dateObj2.disable) {
+                _isDisable = true;
+              }
             } else {
@@ -389,2 +417,6 @@ _dateObj2.isSelected = false;
 
+        if (_isDisable) {
+          return;
+        }
+
         this.setData({
@@ -391,0 +423,0 @@ dates: dates

es/tabs/index.js

@@ -14,3 +14,4 @@ var _my$getSystemInfoSync = my.getSystemInfoSync(),
     swipeable: true,
-    activeTab: 0 // 当前激活tab
+    activeTab: 0, // 当前激活tab
+    animation: true
   },
@@ -25,7 +26,9 @@ data: {
   didMount: function didMount() {
-    var tabs = this.props.tabs;
+    var _props = this.props,
+        tabs = _props.tabs,
+        animation = _props.animation;
 
     this.setData({
       tabWidth: tabs.length > 3 ? 0.25 : 1 / tabs.length,
-      animation: true,
+      animation: animation,
       autoplay: true
@@ -32,0 +35,0 @@ });

package.json

 {
   "name": "mini-antui",
-  "version": "0.3.14-alpha.3",
+  "version": "0.3.14-alpha.4",
   "description": "小程序版AntUI",
@@ -5,0 +5,0 @@ "repository": {

No alert changes

Improved metrics

Total package byte prevSize

119038

increased by1.07%

Lines of code

1603

increased by2.04%

No dependency changes