@nutui/nutui-react 3.0.17 → 3.0.19-beta.2

package/dist/es/packages/countdown/style-jmapp/style.css

@@ -18,7 +18,7 @@
   font-weight: var(--nutui-countdown-font-weight, 400);
   font-size: var(--nutui-countdown-font-size, 14px);
   line-height: calc(var(--nutui-countdown-font-size, 14px) + 2px);
-  font-family: "JD";
+  font-family: "JDZH-Regular";
 }
 .nut-countdown-number, .nut-countdown-number-primary {
   position: relative;

package/dist/es/packages/countdown/style-jrkf/countdown.scss

@@ -16,7 +16,7 @@
     font-weight: $coutdown-font-weight;
     font-size: $countdown-font-size;
     line-height: calc($countdown-font-size + 2px);
-    font-family: 'JD';
+    font-family: 'JDZH-Regular';
   }
   &-number,
   &-number-primary {

package/dist/es/packages/countdown/style-jrkf/style.css

@@ -18,7 +18,7 @@
   font-weight: var(--nutui-countdown-font-weight, 400);
   font-size: var(--nutui-countdown-font-size, 14px);
   line-height: calc(var(--nutui-countdown-font-size, 14px) + 2px);
-  font-family: "JD";
+  font-family: "JDZH-Regular";
 }
 .nut-countdown-number, .nut-countdown-number-primary {
   position: relative;

package/dist/es/packages/datepicker/datepicker.js

@@ -149,7 +149,7 @@ var InternalPicker = function(props, ref) {
     return /*#__PURE__*/ React.createElement(React.Fragment, null, typeof children === 'function' && children(selectedDate), /*#__PURE__*/ React.createElement("div", _object_spread({
         className: cls,
         style: style
-    }, rest), pickerOptions.length && /*#__PURE__*/ React.createElement(Picker, _object_spread_props(_object_spread({}, pickerProps), {
+    }, rest), pickerOptions.length > 0 && /*#__PURE__*/ React.createElement(Picker, _object_spread_props(_object_spread({}, pickerProps), {
         title: title,
         visible: innerVisible,
         value: pickerValue,

package/dist/es/packages/dialog/dialog.js

@@ -58,8 +58,8 @@ var BaseDialog = function(props, ref) {
             if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
             onCancel();
         };
-        var handleOk = /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function(e) {
+        var handleOk = function(e) {
+            return _async_to_generator(function() {
                 var e1;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
@@ -99,11 +99,8 @@ var BaseDialog = function(props, ref) {
                             ];
                     }
                 });
-            });
-            return function handleOk(e) {
-                return _ref.apply(this, arguments);
-            };
-        }();
+            })();
+        };
         var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
         var renderCancelOfVertical = function() {
             return !hideCancelButton && /*#__PURE__*/ React.createElement("div", {

package/dist/es/packages/dialog/style/dialog.scss

@@ -16,7 +16,7 @@
   &-outer {
     position: fixed;
     max-height: 100%;
-    background-color: $white;
+    background-color: $dialog-background;
     transition:
       transform 0.2s,
       -webkit-transform 0.2s;
@@ -128,12 +128,20 @@
     &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
       background: $dialog-footer-cancel-bg;
+      color: $button-default-color;
+      .nut-button-children {
+        color: $button-default-color;
+      }
     }
 
     &-ok {
       max-width: $dialog-footer-ok-max-width;
       font-weight: $font-weight-bold;
+      .nut-button-children {
+        font-weight: $font-weight-bold;
+      }
     }
+
     &-block {
       &.nut-button {
         min-width: 100%;

package/dist/es/packages/dialog/style/style.css

@@ -18,7 +18,7 @@
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
-  background-color: #ffffff;
+  background-color: var(--nutui-dialog-background, var(--nutui-color-background-overlay, #ffffff));
   transition: transform 0.2s, -webkit-transform 0.2s;
   -webkit-overflow-scrolling: touch;
   top: 50%;
@@ -119,11 +119,18 @@
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
   background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, transparent));
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
+}
+.nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
   font-weight: var(--nutui-font-weight-bold, 600);
 }
+.nut-dialog-footer-ok .nut-button-children {
+  font-weight: var(--nutui-font-weight-bold, 600);
+}
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }

package/dist/es/packages/dialog/style-jmapp/dialog.scss

@@ -16,7 +16,7 @@
   &-outer {
     position: fixed;
     max-height: 100%;
-    background-color: $white;
+    background-color: $dialog-background;
     transition:
       transform 0.2s,
       -webkit-transform 0.2s;
@@ -128,12 +128,20 @@
     &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
       background: $dialog-footer-cancel-bg;
+      color: $button-default-color;
+      .nut-button-children {
+        color: $button-default-color;
+      }
     }
 
     &-ok {
       max-width: $dialog-footer-ok-max-width;
       font-weight: $font-weight-bold;
+      .nut-button-children {
+        font-weight: $font-weight-bold;
+      }
     }
+
     &-block {
       &.nut-button {
         min-width: 100%;

package/dist/es/packages/dialog/style-jmapp/style.css

@@ -18,7 +18,7 @@
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
-  background-color: #ffffff;
+  background-color: var(--nutui-dialog-background, var(--nutui-color-surface-2));
   transition: transform 0.2s, -webkit-transform 0.2s;
   -webkit-overflow-scrolling: touch;
   top: 50%;
@@ -119,11 +119,18 @@
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
   background: var(--nutui-dialog-footer-cancel-bg, transparent);
+  color: var(--nutui-button-default-color, var(--nutui-color-text));
+}
+.nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
+  color: var(--nutui-button-default-color, var(--nutui-color-text));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
   font-weight: var(--nutui-font-weight-bold);
 }
+.nut-dialog-footer-ok .nut-button-children {
+  font-weight: var(--nutui-font-weight-bold);
+}
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }

package/dist/es/packages/dialog/style-jrkf/dialog.scss

@@ -16,7 +16,7 @@
   &-outer {
     position: fixed;
     max-height: 100%;
-    background-color: $white;
+    background-color: $dialog-background;
     transition:
       transform 0.2s,
       -webkit-transform 0.2s;
@@ -128,12 +128,20 @@
     &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
       background: $dialog-footer-cancel-bg;
+      color: $button-default-color;
+      .nut-button-children {
+        color: $button-default-color;
+      }
     }
 
     &-ok {
       max-width: $dialog-footer-ok-max-width;
       font-weight: $font-weight-bold;
+      .nut-button-children {
+        font-weight: $font-weight-bold;
+      }
     }
+
     &-block {
       &.nut-button {
         min-width: 100%;

package/dist/es/packages/dialog/style-jrkf/style.css

@@ -18,7 +18,7 @@
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
-  background-color: #ffffff;
+  background-color: var(--nutui-dialog-background, var(--nutui-color-surface-2));
   transition: transform 0.2s, -webkit-transform 0.2s;
   -webkit-overflow-scrolling: touch;
   top: 50%;
@@ -119,11 +119,18 @@
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
   background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, var(--nutui-color-default)));
+  color: var(--nutui-button-default-color, var(--nutui-color-text));
+}
+.nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
+  color: var(--nutui-button-default-color, var(--nutui-color-text));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
   font-weight: var(--nutui-font-weight-bold);
 }
+.nut-dialog-footer-ok .nut-button-children {
+  font-weight: var(--nutui-font-weight-bold);
+}
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }

package/dist/es/packages/form/index.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { Form } from "./form";
 import { FormItem } from "../formitem/formitem";
 import { useForm, useWatch } from "./useform";

package/dist/es/packages/form/useform.js

@@ -18,7 +18,6 @@ export var SECRET = 'NUT_FORM_INTERNAL';
         var _this = this;
         var _this1 = this;
         _class_call_check(this, FormStore);
-        var _this2 = this;
         // 初始化数据
         _define_property(this, "initialValues", {});
         _define_property(this, "updateList", []);
@@ -106,8 +105,8 @@ export var SECRET = 'NUT_FORM_INTERNAL';
         _define_property(this, "setCallback", function(callback) {
             _this.callbacks = _object_spread({}, _this.callbacks, callback);
         });
-        _define_property(this, "validateEntities", /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function(entity, errs) {
+        _define_property(this, "validateEntities", function(entity, errs) {
+            return _async_to_generator(function() {
                 var _entity_props, name, _entity_props_rules, rules, descriptor, validator, _this_store, param, errors, _errs;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
@@ -142,7 +141,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                             ]);
                             return [
                                 4,
-                                validator.validate(_define_property({}, name, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
+                                validator.validate(_define_property({}, name, (_this_store = this.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
                             ];
                         case 2:
                             _state.sent();
@@ -156,7 +155,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                             if (errors) {
                                 ;
                                 (_errs = errs).push.apply(_errs, _to_consumable_array(errors));
-                                _this2.errors[name] = errors;
+                                this.errors[name] = errors;
                             }
                             return [
                                 3,
@@ -164,7 +163,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                             ];
                         case 4:
                             if (!errs || errs.length === 0) {
-                                _this2.errors[name] = [];
+                                this.errors[name] = [];
                             }
                             return [
                                 7
@@ -176,23 +175,21 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                             ];
                     }
                 });
-            });
-            return function(entity, errs) {
-                return _ref.apply(this, arguments);
-            };
-        }());
-        _define_property(this, "validateFields", /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function(nameList) {
-                var filterEntities, errs;
+            }).call(_this);
+        });
+        _define_property(this, "validateFields", function(nameList) {
+            return _async_to_generator(function() {
+                var _this, filterEntities, errs;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
+                            _this = this;
                             filterEntities = [];
                             // this.errors.length = 0
                             if (!nameList || nameList.length === 0) {
-                                filterEntities = _this2.fieldEntities;
+                                filterEntities = this.fieldEntities;
                             } else {
-                                filterEntities = _this2.fieldEntities.filter(function(param) {
+                                filterEntities = this.fieldEntities.filter(function(param) {
                                     var name = param.props.name;
                                     return nameList.includes(name);
                                 });
@@ -200,14 +197,14 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                             errs = [];
                             return [
                                 4,
-                                Promise.all(filterEntities.map(/*#__PURE__*/ function() {
-                                    var _ref = _async_to_generator(function(entity) {
+                                Promise.all(filterEntities.map(function(entity) {
+                                    return _async_to_generator(function() {
                                         return _ts_generator(this, function(_state) {
                                             switch(_state.label){
                                                 case 0:
                                                     return [
                                                         4,
-                                                        _this2.validateEntities(entity, errs)
+                                                        this.validateEntities(entity, errs)
                                                     ];
                                                 case 1:
                                                     _state.sent();
@@ -216,11 +213,8 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                                                     ];
                                             }
                                         });
-                                    });
-                                    return function(entity) {
-                                        return _ref.apply(this, arguments);
-                                    };
-                                }()))
+                                    }).call(_this);
+                                }))
                             ];
                         case 1:
                             _state.sent();
@@ -230,35 +224,34 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                             ];
                     }
                 });
-            });
-            return function(nameList) {
-                return _ref.apply(this, arguments);
-            };
-        }());
-        _define_property(this, "submit", /*#__PURE__*/ _async_to_generator(function() {
-            var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        return [
-                            4,
-                            _this2.validateFields()
-                        ];
-                    case 1:
-                        errors = _state.sent();
-                        if (errors.length === 0) {
-                            ;
-                            (_this_callbacks_onFinish = (_this_callbacks = _this2.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, _this2.store);
-                        } else if (errors.length > 0) {
-                            ;
-                            (_this_callbacks_onFinishFailed = (_this_callbacks1 = _this2.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, _this2.store, errors);
-                        }
-                        return [
-                            2
-                        ];
-                }
-            });
-        }));
+            }).call(_this);
+        });
+        _define_property(this, "submit", function() {
+            return _async_to_generator(function() {
+                var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                this.validateFields()
+                            ];
+                        case 1:
+                            errors = _state.sent();
+                            if (errors.length === 0) {
+                                ;
+                                (_this_callbacks_onFinish = (_this_callbacks = this.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, this.store);
+                            } else if (errors.length > 0) {
+                                ;
+                                (_this_callbacks_onFinishFailed = (_this_callbacks1 = this.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, this.store, errors);
+                            }
+                            return [
+                                2
+                            ];
+                    }
+                });
+            }).call(_this);
+        });
         _define_property(this, "resetFields", function(namePaths) {
             if (namePaths && namePaths.length) {
                 namePaths.forEach(function(path) {

package/dist/es/packages/infiniteloading/infiniteloading.js

@@ -88,8 +88,8 @@ export var InfiniteLoading = function(props) {
             transition: isTouching.current ? "height 0s cubic-bezier(0.25,0.1,0.25,1)" : "height 0.2s cubic-bezier(0.25,0.1,0.25,1)"
         };
     };
-    var handleScroll = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function() {
+    var handleScroll = function() {
+        return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -111,11 +111,8 @@ export var InfiniteLoading = function(props) {
                         ];
                 }
             });
-        });
-        return function handleScroll() {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var infiniteDone = function() {
         setIsInfiniting(false);
     };
@@ -151,8 +148,8 @@ export var InfiniteLoading = function(props) {
             isTouching.current = false;
         }
     };
-    var touchEnd = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function() {
+    var touchEnd = function() {
+        return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -182,11 +179,8 @@ export var InfiniteLoading = function(props) {
                         ];
                 }
             });
-        });
-        return function touchEnd() {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var getWindowScrollTop = function() {
         return window.scrollY !== undefined ? window.scrollY : (document.documentElement || document.body.parentNode || document.body).scrollTop;
     };

package/dist/es/packages/inputnumber/inputnumber.js

@@ -93,8 +93,8 @@ export var InputNumber = function(props) {
         var stepAmount = parseFloat(stepValue) * symbol;
         return (currentValue * dig + stepAmount * dig) / dig;
     };
-    var update = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(negative, e) {
+    var update = function(negative, e) {
+        return _async_to_generator(function() {
             var shouldOverBoundary, maybeResume, nextValue;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -125,13 +125,10 @@ export var InputNumber = function(props) {
                         ];
                 }
             });
-        });
-        return function update(negative, e) {
-            return _ref.apply(this, arguments);
-        };
-    }();
-    var handleReduce = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(e) {
+        })();
+    };
+    var handleReduce = function(e) {
+        return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -149,13 +146,10 @@ export var InputNumber = function(props) {
                         ];
                 }
             });
-        });
-        return function handleReduce(e) {
-            return _ref.apply(this, arguments);
-        };
-    }();
-    var handlePlus = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(e) {
+        })();
+    };
+    var handlePlus = function(e) {
+        return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -173,18 +167,15 @@ export var InputNumber = function(props) {
                         ];
                 }
             });
-        });
-        return function handlePlus(e) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var parseValue = function(text) {
         if (text === '') return null;
         if (text === '-') return null;
         return text;
     };
-    var handleInputChange = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(e) {
+    var handleInputChange = function(e) {
+        return _async_to_generator(function() {
             var valueStr, maybeResume;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -213,11 +204,8 @@ export var InputNumber = function(props) {
                         ];
                 }
             });
-        });
-        return function handleInputChange(e) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var handleFocus = function(e) {
         setFocused(true);
         setInputValue(shadowValue !== undefined && shadowValue !== null ? bound(Number(shadowValue), Number(min), Number(max)).toString() : '');

package/dist/es/packages/lottie/types.js

@@ -1 +1 @@
-import React from "react";
+export { };

package/dist/es/packages/noticebar/style/noticebar.scss

@@ -51,6 +51,9 @@
       min-width: $noticebar-left-icon-width;
       margin-right: $noticebar-icon-gap;
       background-size: 100% 100%;
+      .nut-icon {
+        color: $noticebar-color;
+      }
     }
 
     &-right-icon {
@@ -63,12 +66,14 @@
       .nut-icon {
         width: 12px;
         height: 12px;
+        color: $noticebar-color;
       }
     }
 
     &-wrap {
       display: flex;
       flex: 1;
+      align-items: center;
       height: $noticebar-line-height;
       line-height: $noticebar-line-height;
       overflow: hidden;
@@ -77,6 +82,7 @@
       .nut-noticebar-box-wrap-content {
         position: absolute;
         white-space: nowrap;
+        color: $noticebar-color;
 
         &.nut-ellipsis {
           max-width: 100%;

package/dist/es/packages/noticebar/style/style.css

@@ -45,6 +45,9 @@
   margin-right: var(--nutui-noticebar-icon-gap, 4px);
   background-size: 100% 100%;
 }
+.nut-noticebar .nut-noticebar-box-left-icon .nut-icon {
+  color: var(--nutui-noticebar-color, #d9500b);
+}
 .nut-noticebar .nut-noticebar-box-right-icon {
   display: flex;
   align-items: center;
@@ -55,10 +58,12 @@
 .nut-noticebar .nut-noticebar-box-right-icon .nut-icon {
   width: 12px;
   height: 12px;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap {
   display: flex;
   flex: 1;
+  align-items: center;
   height: var(--nutui-noticebar-line-height, 24px);
   line-height: var(--nutui-noticebar-line-height, 24px);
   overflow: hidden;
@@ -67,6 +72,7 @@
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
   position: absolute;
   white-space: nowrap;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content.nut-ellipsis {
   max-width: 100%;