taro-ui 3.2.0 → 3.2.2

package/dist/index.js

@@ -3764,7 +3764,7 @@ var AtNoticebar = /** @class */ (function (_super) {
             animationData: {
                 actions: [{}]
             },
-            dura: 15,
+            dura: 0,
             isWEAPP: Taro__default["default"].getEnv() === Taro__default["default"].ENV_TYPE.WEAPP,
             isALIPAY: Taro__default["default"].getEnv() === Taro__default["default"].ENV_TYPE.ALIPAY,
             isWEB: Taro__default["default"].getEnv() === Taro__default["default"].ENV_TYPE.WEB
@@ -3862,8 +3862,12 @@ var AtNoticebar = /** @class */ (function (_super) {
         var innerClassName = ['at-noticebar__content-inner'];
         if (marquee) {
             close = false;
-            style['animation-duration'] = "".concat(dura, "s");
             innerClassName.push(animElemId);
+            style['animation-delay'] = '3s';
+            if (dura > 0) {
+                style['animation-duration'] = "".concat(dura, "s");
+                style['animation-delay'] = '1s';
+            }
         }
         var classObject = {
             'at-noticebar--marquee': marquee,
@@ -5579,6 +5583,12 @@ AtCountdownItem.propTypes = {
 };
 
 var toSeconds = function (day, hours, minutes, seconds) { return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds; };
+var defaultFormat = {
+    day: '天',
+    hours: '时',
+    minutes: '分',
+    seconds: '秒'
+};
 var AtCountdown = /** @class */ (function (_super) {
     __extends(AtCountdown, _super);
     function AtCountdown(props) {
@@ -5608,8 +5618,12 @@ var AtCountdown = /** @class */ (function (_super) {
         var _a = __read([0, 0, 0, 0], 4), day = _a[0], hours = _a[1], minutes = _a[2], seconds = _a[3];
         if (this.seconds > 0) {
             day = this.props.isShowDay ? Math.floor(this.seconds / (60 * 60 * 24)) : 0;
-            hours = Math.floor(this.seconds / (60 * 60)) - day * 24;
-            minutes = Math.floor(this.seconds / 60) - day * 24 * 60 - hours * 60;
+            hours = this.props.isShowHour
+                ? Math.floor(this.seconds / (60 * 60)) - day * 24
+                : 0;
+            minutes = this.props.isShowMinute
+                ? Math.floor(this.seconds / 60) - day * 24 * 60 - hours * 60
+                : 0;
             seconds =
                 Math.floor(this.seconds) -
                     day * 24 * 60 * 60 -
@@ -5663,12 +5677,7 @@ var AtCountdown = /** @class */ (function (_super) {
         this.setTimer();
     };
     AtCountdown.prototype.render = function () {
-        var _a = this.props, className = _a.className, customStyle = _a.customStyle, _b = _a.format, format = _b === void 0 ? {
-            day: '天',
-            hours: '时',
-            minutes: '分',
-            seconds: '秒'
-        } : _b, isShowDay = _a.isShowDay, isCard = _a.isCard, isShowHour = _a.isShowHour;
+        var _a = this.props, className = _a.className, customStyle = _a.customStyle, _b = _a.format, format = _b === void 0 ? defaultFormat : _b, isCard = _a.isCard, isShowDay = _a.isShowDay, isShowHour = _a.isShowHour, isShowMinute = _a.isShowMinute;
         var _c = this.state, _day = _c._day, _hours = _c._hours, _minutes = _c._minutes, _seconds = _c._seconds;
         return (React__default["default"].createElement(components.View, { className: classnames({
                 'at-countdown': true,
@@ -5676,7 +5685,7 @@ var AtCountdown = /** @class */ (function (_super) {
             }, className), style: customStyle },
             isShowDay && (React__default["default"].createElement(AtCountdownItem, { num: _day, separator: (format === null || format === void 0 ? void 0 : format.day) || '天' })),
             isShowHour && (React__default["default"].createElement(AtCountdownItem, { num: _hours, separator: (format === null || format === void 0 ? void 0 : format.hours) || '' })),
-            React__default["default"].createElement(AtCountdownItem, { num: _minutes, separator: (format === null || format === void 0 ? void 0 : format.minutes) || '' }),
+            isShowMinute && (React__default["default"].createElement(AtCountdownItem, { num: _minutes, separator: (format === null || format === void 0 ? void 0 : format.minutes) || '' })),
             React__default["default"].createElement(AtCountdownItem, { num: _seconds, separator: (format === null || format === void 0 ? void 0 : format.seconds) || '' })));
     };
     return AtCountdown;
@@ -5687,12 +5696,8 @@ AtCountdown.defaultProps = {
     isCard: false,
     isShowDay: false,
     isShowHour: true,
-    format: {
-        day: '天',
-        hours: '时',
-        minutes: '分',
-        seconds: '秒'
-    },
+    isShowMinute: true,
+    format: defaultFormat,
     day: 0,
     hours: 0,
     minutes: 0,
@@ -5704,6 +5709,7 @@ AtCountdown.propTypes = {
     isCard: propTypes.bool,
     isShowDay: propTypes.bool,
     isShowHour: propTypes.bool,
+    isShowMinute: propTypes.bool,
     format: propTypes.object,
     day: propTypes.number,
     hours: propTypes.number,