@nutui/nutui-react 2.0.0-alpha.16 → 2.0.0-alpha.18

package/dist/esm/SearchBar.js

@@ -76,7 +76,7 @@ var SearchBar = function SearchBar2(props) {
   }, [autoFocus]);
   var renderField = function renderField2() {
     return React__default.createElement("input", {
-      className: "".concat(classPrefix, "__input ").concat(shape === "round" ? "".concat(classPrefix, "__round") : "", " ").concat(clearable ? "".concat(classPrefix, "__input-clear") : ""),
+      className: "".concat(classPrefix, "__input ").concat(clearable ? "".concat(classPrefix, "__input-clear") : ""),
       ref: searchRef,
       style: _objectSpread({}, props.style),
       value: value || "",
@@ -163,7 +163,7 @@ var SearchBar = function SearchBar2(props) {
     className: "".concat(classPrefix, " ").concat(disabled ? "".concat(classPrefix, "__disabled") : "", "  ").concat(className || ""),
     style: _objectSpread({}, props.style)
   }, renderLeft(), React__default.createElement("div", {
-    className: "".concat(classPrefix, "__content")
+    className: "".concat(classPrefix, "__content ").concat(shape === "round" ? "".concat(classPrefix, "__round") : "")
   }, renderLeftIn(), renderField(), renderRightIn(), clearable && value && handleClear()), renderRight());
 };
 SearchBar.defaultProps = defaultProps;

package/dist/esm/Swipe.js

@@ -23,10 +23,8 @@ function _objectSpread(target) {
 }
 import React__default, { forwardRef, useRef, useState, useCallback, useImperativeHandle, useEffect } from "react";
 import classNames from "classnames";
-import { c as cn } from "./bem.js";
 import { u as useTouch } from "./use-touch.js";
 import { g as getRect } from "./use-client-rect.js";
-import "@bem-react/classname";
 function preventDefault(event, isStopPropagation) {
   if (typeof event.cancelable !== "boolean" || event.cancelable) {
     event.preventDefault();
@@ -39,7 +37,7 @@ var defaultProps = {
   name: ""
 };
 var Swipe = forwardRef(function(props, instanceRef) {
-  var swipeBem = cn("swipe");
+  var classPrefix = "nut-swipe";
   var touch = useTouch();
   var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, className = _defaultProps$props.className, style = _defaultProps$props.style;
   var root = useRef();
@@ -173,7 +171,7 @@ var Swipe = forwardRef(function(props, instanceRef) {
     if (props["".concat(side, "Action")]) {
       return React__default.createElement("div", {
         ref: measuredRef,
-        className: "".concat(swipeBem(side)),
+        className: "".concat(classPrefix, "__").concat(side),
         onClick: function onClick(e) {
           return handleOperate(e, side);
         }
@@ -215,7 +213,7 @@ var Swipe = forwardRef(function(props, instanceRef) {
   }, []);
   return React__default.createElement("div", {
     ref: root,
-    className: classNames(swipeBem(), className),
+    className: classNames(classPrefix, className),
     onTouchStart: function onTouchStart(e) {
       return _onTouchStart(e);
     },
@@ -227,7 +225,7 @@ var Swipe = forwardRef(function(props, instanceRef) {
     },
     style
   }, React__default.createElement("div", {
-    className: "".concat(swipeBem("wrapper")),
+    className: "".concat(classPrefix, "__wrapper"),
     style: wrapperStyle
   }, renderActionContent("left", leftRef), children, renderActionContent("right", rightRef)));
 });

package/dist/esm/Tabbar/style/style.css

@@ -1 +1 @@
-.nut-tabbar-item{display:flex;flex-direction:column;justify-content:center;align-items:center;flex:1;text-align:center;text-decoration:none;color:var(--nutui-tabbar-inactive-color, var(--nutui-gray-1, #1a1a1a));height:100%}.nut-tabbar-item-active{color:var(--nutui-tabbar-active-color, var(--nutui-brand-color, #fa2c19))}.nut-tabbar-item__icon-box{padding:0;display:flex;flex-direction:column;align-items:center;position:relative}.nut-tabbar-item__icon-box-nav{display:block;font-size:var(--nutui-tabbar-text-font-size, var(--nutui-font-size-0, 10px));margin-top:var(--nutui-tabbar-text-margin-top, 3px)}.nut-tabbar-item__icon-box-large{font-size:var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-3, 16px));margin-top:0;line-height:var(--nutui-tabbar-text-line-height, 20px)}.nut-tabbar{border:0px;box-shadow:var(--nutui-tabbar-box-shadow, none);border-bottom:var(--nutui-tabbar-border-bottom, 1px solid #eee);border-top:var(--nutui-tabbar-border-top, 1px solid #eee);width:100%;display:flex;flex-direction:column;justify-content:center;align-items:center;box-sizing:border-box;background:var(--nutui-gray-6, #ffffff)}.nut-tabbar__wrap{width:100%;height:var(--nutui-tabbar-height, 50px);display:flex;flex-direction:row;justify-content:center;align-items:center}.nut-tabbar:last-child{border-right:0}.nut-tabbar__fixed{position:fixed;bottom:0px;left:0px}.nut-tabbar__safe-area{display:block;width:100%;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}
+.nut-badge{position:relative;display:inline-block}.nut-badge__icon{display:flex;position:absolute;background:var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-brand-color, #fa2c19) 0%, var(--nutui-brand-color-end, #fa2c19) 100%));top:-20%;right:-20%;padding:var(--nutui-badge-icon-padding, 3px);text-align:center;border:var(--nutui-badge-border, 0px solid var(--nutui-brand-text-color, #ffffff));border-radius:var(--nutui-badge-border-radius, 14px);z-index:var(--nutui-badge-z-index, 1)}.nut-badge__sup{position:absolute;background:var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-brand-color, #fa2c19) 0%, var(--nutui-brand-color-end, #fa2c19) 100%));color:var(--nutui-badge-color, #fff);padding:var(--nutui-badge-padding, 0 5px);font-size:var(--nutui-badge-font-size, var(--nutui-font-size-1, 12px));font-weight:400;text-align:center;line-height:16px;border:var(--nutui-badge-border, 0px solid var(--nutui-brand-text-color, #ffffff));border-radius:var(--nutui-badge-border-radius, 14px)}.nut-badge__content{transform:var(--nutui-badge-content-transform, translateY(-50%) translateX(100%))}.nut-badge__dot{width:var(--nutui-badge-dot-width, 7px);height:var(--nutui-badge-dot-width, 7px);border:var(--nutui-badge-border, 0px solid var(--nutui-brand-text-color, #ffffff));border-radius:var(--nutui-badge-dot-width, 7px);padding:0}.nut-tabbar-item{display:flex;flex-direction:column;justify-content:center;align-items:center;flex:1;text-align:center;text-decoration:none;color:var(--nutui-tabbar-inactive-color, var(--nutui-gray-1, #1a1a1a));height:100%}.nut-tabbar-item-active{color:var(--nutui-tabbar-active-color, var(--nutui-brand-color, #fa2c19))}.nut-tabbar-item__icon-box{padding:0;display:flex;flex-direction:column;align-items:center;position:relative}.nut-tabbar-item__icon-box-nav{display:block;font-size:var(--nutui-tabbar-text-font-size, var(--nutui-font-size-0, 10px));margin-top:var(--nutui-tabbar-text-margin-top, 3px)}.nut-tabbar-item__icon-box-large{font-size:var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-3, 16px));margin-top:0;line-height:var(--nutui-tabbar-text-line-height, 20px)}.nut-tabbar{border:0px;box-shadow:var(--nutui-tabbar-box-shadow, none);border-bottom:var(--nutui-tabbar-border-bottom, 1px solid #eee);border-top:var(--nutui-tabbar-border-top, 1px solid #eee);width:100%;display:flex;flex-direction:column;justify-content:center;align-items:center;box-sizing:border-box;background:var(--nutui-gray-6, #ffffff)}.nut-tabbar__wrap{width:100%;height:var(--nutui-tabbar-height, 50px);display:flex;flex-direction:row;justify-content:center;align-items:center}.nut-tabbar:last-child{border-right:0}.nut-tabbar__fixed{position:fixed;bottom:0px;left:0px}.nut-tabbar__safe-area{display:block;width:100%;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}

package/dist/esm/TabbarItem/style/index.js

@@ -1,2 +1,2 @@
-
+import '../../Badge/style'
 import '../../../packages/tabbaritem/tabbaritem.scss'

package/dist/esm/TabbarItem/style/style.css

@@ -1 +1 @@
-.nut-tabbar-item{display:flex;flex-direction:column;justify-content:center;align-items:center;flex:1;text-align:center;text-decoration:none;color:var(--nutui-tabbar-inactive-color, var(--nutui-gray-1, #1a1a1a));height:100%}.nut-tabbar-item-active{color:var(--nutui-tabbar-active-color, var(--nutui-brand-color, #fa2c19))}.nut-tabbar-item__icon-box{padding:0;display:flex;flex-direction:column;align-items:center;position:relative}.nut-tabbar-item__icon-box-nav{display:block;font-size:var(--nutui-tabbar-text-font-size, var(--nutui-font-size-0, 10px));margin-top:var(--nutui-tabbar-text-margin-top, 3px)}.nut-tabbar-item__icon-box-large{font-size:var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-3, 16px));margin-top:0;line-height:var(--nutui-tabbar-text-line-height, 20px)}
+.nut-badge{position:relative;display:inline-block}.nut-badge__icon{display:flex;position:absolute;background:var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-brand-color, #fa2c19) 0%, var(--nutui-brand-color-end, #fa2c19) 100%));top:-20%;right:-20%;padding:var(--nutui-badge-icon-padding, 3px);text-align:center;border:var(--nutui-badge-border, 0px solid var(--nutui-brand-text-color, #ffffff));border-radius:var(--nutui-badge-border-radius, 14px);z-index:var(--nutui-badge-z-index, 1)}.nut-badge__sup{position:absolute;background:var(--nutui-badge-background-color, linear-gradient(135deg, var(--nutui-brand-color, #fa2c19) 0%, var(--nutui-brand-color-end, #fa2c19) 100%));color:var(--nutui-badge-color, #fff);padding:var(--nutui-badge-padding, 0 5px);font-size:var(--nutui-badge-font-size, var(--nutui-font-size-1, 12px));font-weight:400;text-align:center;line-height:16px;border:var(--nutui-badge-border, 0px solid var(--nutui-brand-text-color, #ffffff));border-radius:var(--nutui-badge-border-radius, 14px)}.nut-badge__content{transform:var(--nutui-badge-content-transform, translateY(-50%) translateX(100%))}.nut-badge__dot{width:var(--nutui-badge-dot-width, 7px);height:var(--nutui-badge-dot-width, 7px);border:var(--nutui-badge-border, 0px solid var(--nutui-brand-text-color, #ffffff));border-radius:var(--nutui-badge-dot-width, 7px);padding:0}.nut-tabbar-item{display:flex;flex-direction:column;justify-content:center;align-items:center;flex:1;text-align:center;text-decoration:none;color:var(--nutui-tabbar-inactive-color, var(--nutui-gray-1, #1a1a1a));height:100%}.nut-tabbar-item-active{color:var(--nutui-tabbar-active-color, var(--nutui-brand-color, #fa2c19))}.nut-tabbar-item__icon-box{padding:0;display:flex;flex-direction:column;align-items:center;position:relative}.nut-tabbar-item__icon-box-nav{display:block;font-size:var(--nutui-tabbar-text-font-size, var(--nutui-font-size-0, 10px));margin-top:var(--nutui-tabbar-text-margin-top, 3px)}.nut-tabbar-item__icon-box-large{font-size:var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-3, 16px));margin-top:0;line-height:var(--nutui-tabbar-text-line-height, 20px)}

package/dist/esm/formitem2.js

@@ -57,86 +57,107 @@ function _objectSpread(target) {
 import React__default, { createContext } from "react";
 import Cell from "./Cell.js";
 import { C as ComponentDefaults } from "./typings.js";
-var FormItemContext = createContext({});
+var Context = createContext({});
+function isForwardRefComponent(component) {
+  return component.type && component.type.$$typeof && // eslint-disable-next-line react/display-name
+  React__default.forwardRef(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    function() {
+    }
+  ).$$typeof === component.type.$$typeof;
+}
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
+  required: false,
   name: "",
   label: "",
-  className: "",
   rules: [{
     required: false,
     message: ""
   }],
-  disabled: false,
-  labelWidth: 90,
-  errorMessageAlign: "left",
-  showErrorLine: true,
-  showErrorMessage: true,
-  initialValue: ""
+  errorMessageAlign: "left"
 });
 var FormItem = /* @__PURE__ */ function(_React__default$Compo) {
   _inherits(FormItem2, _React__default$Compo);
   var _super = _createSuper(FormItem2);
-  function FormItem2() {
+  function FormItem2(props) {
     var _this;
     _classCallCheck(this, FormItem2);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props);
     _defineProperty(_assertThisInitialized(_this), "cancelRegister", void 0);
-    _defineProperty(_assertThisInitialized(_this), "isInitialValue", false);
+    _defineProperty(_assertThisInitialized(_this), "componentRef", void 0);
     _defineProperty(_assertThisInitialized(_this), "getControlled", function(children) {
-      var _children$props, _children$props2;
-      var _this$context = _this.context, getFieldValue = _this$context.getFieldValue, setFieldsValue = _this$context.setFieldsValue;
+      var _children$props, _objectSpread2;
+      var _this$context = _this.context, setFieldsValue = _this$context.setFieldsValue, getFieldValue = _this$context.getFieldValue;
       var name = _this.props.name;
-      var type = children.type.NAME;
-      var defaultvalue = _this.props.initialValue || ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.defaultValue) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.value);
-      if (defaultvalue && !_this.isInitialValue) {
-        setFieldsValue(_defineProperty({}, name, defaultvalue));
-        _this.isInitialValue = true;
+      if (children !== null && children !== void 0 && (_children$props = children.props) !== null && _children$props !== void 0 && _children$props.defaultValue) {
+        console.warn("通过 initialValue 设置初始值");
       }
-      return {
-        value: getFieldValue(name),
-        defaultValue: getFieldValue(name),
-        onChange: function onChange(event) {
-          var originOnChange = children.props.onChange;
-          if (originOnChange) {
-            originOnChange(event);
-          }
-          var newValue = event;
-          switch (type) {
-            case "checkbox":
-              newValue = event.target.value;
-              break;
-          }
-          setFieldsValue(_defineProperty({}, name, newValue));
+      var controlled = _objectSpread(_objectSpread({}, children.props), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, _this.props.valuePropName || "value", getFieldValue(name) || _this.props.initialValue), _defineProperty(_objectSpread2, _this.props.trigger || "onChange", function() {
+        var originOnChange = children.props[_this.props.trigger || "onChange"];
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
         }
-      };
+        if (originOnChange) {
+          originOnChange.apply(void 0, args);
+        }
+        var next = args[0];
+        if (_this.props.getValueFromEvent) {
+          var _this$props;
+          next = (_this$props = _this.props).getValueFromEvent.apply(_this$props, args);
+        }
+        setFieldsValue(_defineProperty({}, name, next));
+      }), _objectSpread2));
+      if (isForwardRefComponent(children)) {
+        controlled.ref = function(componentInstance) {
+          var originRef = children.ref;
+          if (originRef) {
+            if (typeof originRef === "function") {
+              originRef(componentInstance);
+            }
+            if ("current" in originRef) {
+              originRef.current = componentInstance;
+            }
+          }
+          _this.componentRef = componentInstance;
+        };
+      }
+      return controlled;
     });
-    _defineProperty(_assertThisInitialized(_this), "onStoreChange", function() {
-      _this.forceUpdate();
+    _defineProperty(_assertThisInitialized(_this), "refresh", function() {
+      _this.setState(function(_ref) {
+        var resetCount = _ref.resetCount;
+        return {
+          resetCount: resetCount + 1
+        };
+      });
+    });
+    _defineProperty(_assertThisInitialized(_this), "onStoreChange", function(type) {
+      if (type === "reset") {
+        _this.refresh();
+      } else {
+        _this.forceUpdate();
+      }
     });
     _defineProperty(_assertThisInitialized(_this), "renderLayout", function(childNode) {
-      var _this$context$errList, _this$context$errList2;
-      var _defaultProps$_this$p = _objectSpread(_objectSpread({}, defaultProps), _this.props), label = _defaultProps$_this$p.label, name = _defaultProps$_this$p.name, _defaultProps$_this$p2 = _defaultProps$_this$p.rules, rules = _defaultProps$_this$p2 === void 0 ? [{
-        required: false,
-        message: ""
-      }] : _defaultProps$_this$p2, className = _defaultProps$_this$p.className, labelWidth = _defaultProps$_this$p.labelWidth, errorMessageAlign = _defaultProps$_this$p.errorMessageAlign, showErrorLine = _defaultProps$_this$p.showErrorLine, showErrorMessage = _defaultProps$_this$p.showErrorMessage;
-      var item = ((_this$context$errList = _this.context.errList) === null || _this$context$errList === void 0 ? void 0 : _this$context$errList.length) > 0 && ((_this$context$errList2 = _this.context.errList) === null || _this$context$errList2 === void 0 ? void 0 : _this$context$errList2.filter(function(item2) {
+      var _this$context$errors, _this$context$errors2;
+      var _defaultProps$_this$p = _objectSpread(_objectSpread({}, defaultProps), _this.props), label = _defaultProps$_this$p.label, name = _defaultProps$_this$p.name, required = _defaultProps$_this$p.required, className = _defaultProps$_this$p.className, style = _defaultProps$_this$p.style, errorMessageAlign = _defaultProps$_this$p.errorMessageAlign;
+      var item = ((_this$context$errors = _this.context.errors) === null || _this$context$errors === void 0 ? void 0 : _this$context$errors.length) > 0 && ((_this$context$errors2 = _this.context.errors) === null || _this$context$errors2 === void 0 ? void 0 : _this$context$errors2.filter(function(item2) {
         return item2.field === name;
       }));
-      var starPositon = _this.context.starPositon;
-      var renderStar = rules.length > 0 && rules[0].required && React__default.createElement("i", {
+      var starPosition = _this.context.starPosition;
+      var renderStar = required && React__default.createElement("i", {
         className: "required"
       });
-      var renderLabel = starPositon === "Right" ? React__default.createElement(React__default.Fragment, null, label, renderStar) : React__default.createElement(React__default.Fragment, null, renderStar, label);
+      var renderLabel = React__default.createElement(React__default.Fragment, null, starPosition === "left" ? renderStar : null, label, starPosition === "right" ? renderStar : null);
       return React__default.createElement(Cell, {
-        className: "nut-form-item ".concat(className)
-      }, label ? React__default.createElement("div", {
-        className: "nut-cell__title nut-form-item__label",
-        style: {
-          width: _this.pxCheck(labelWidth)
+        className: "nut-form-item ".concat(className),
+        style,
+        onClick: function onClick(e) {
+          return _this.props.onClick && _this.props.onClick(e, _this.componentRef);
         }
+      }, label ? React__default.createElement("div", {
+        className: "nut-cell__title nut-form-item__label"
       }, renderLabel) : null, React__default.createElement("div", {
         className: "nut-cell__value nut-form-item__body"
       }, React__default.createElement("div", {
@@ -148,9 +169,10 @@ var FormItem = /* @__PURE__ */ function(_React__default$Compo) {
         }
       }, item[0].message)));
     });
-    _defineProperty(_assertThisInitialized(_this), "pxCheck", function(value) {
-      return Number.isNaN(Number(value)) ? String(value) : "".concat(value, "px");
-    });
+    _this.componentRef = React__default.createRef();
+    _this.state = {
+      resetCount: 1
+    };
     return _this;
   }
   _createClass(FormItem2, [{
@@ -168,23 +190,19 @@ var FormItem = /* @__PURE__ */ function(_React__default$Compo) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props = this.props, children = _this$props.children, initialValue = _this$props.initialValue;
-      var c = Array.isArray(children) ? children[0] : children;
-      var restCNode = c;
-      if (initialValue) {
-        restCNode = React__default.cloneElement(c, {
-          defaultValue: initialValue
-        });
-      }
-      var returnChildNode = React__default.cloneElement(restCNode, this.getControlled(restCNode));
-      return this.renderLayout(returnChildNode);
+      var children = this.props.children;
+      var child = Array.isArray(children) ? children[0] : children;
+      var returnChildNode = React__default.cloneElement(child, this.getControlled(child));
+      return React__default.createElement(React__default.Fragment, {
+        key: this.state.resetCount
+      }, this.renderLayout(returnChildNode));
     }
   }]);
   return FormItem2;
 }(React__default.Component);
 _defineProperty(FormItem, "defaultProps", defaultProps);
-_defineProperty(FormItem, "contextType", FormItemContext);
+_defineProperty(FormItem, "contextType", Context);
 export {
-  FormItemContext as F,
-  FormItem as a
+  Context as C,
+  FormItem as F
 };

package/dist/esm/tabbaritem2.js

@@ -1,6 +1,4 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["className", "style", "title", "icon", "active", "activeColor", "inactiveColor", "index", "handleClick"];
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
   if (Object.getOwnPropertySymbols) {
@@ -31,28 +29,39 @@ var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   icon: null,
   active: false,
   index: 0,
-  handleClick: function handleClick(idx) {
-  }
+  value: "",
+  dot: false,
+  max: 99,
+  top: "0",
+  right: "5"
 });
 var TabbarItem = function TabbarItem2(props) {
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, style = _defaultProps$props.style, title = _defaultProps$props.title, icon = _defaultProps$props.icon, active = _defaultProps$props.active, activeColor = _defaultProps$props.activeColor, inactiveColor = _defaultProps$props.inactiveColor, index = _defaultProps$props.index, handleClick2 = _defaultProps$props.handleClick, rest = _objectWithoutProperties(_defaultProps$props, _excluded);
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, style = _defaultProps$props.style, title = _defaultProps$props.title, icon = _defaultProps$props.icon, active = _defaultProps$props.active, activeColor = _defaultProps$props.activeColor, inactiveColor = _defaultProps$props.inactiveColor, index = _defaultProps$props.index, value = _defaultProps$props.value, dot = _defaultProps$props.dot, max = _defaultProps$props.max, top = _defaultProps$props.top, right = _defaultProps$props.right, handleClick = _defaultProps$props.handleClick;
   var classPrefix = "nut-tabbar-item";
   var tabbarItemClass = classNames(className, classPrefix, _defineProperty({}, "".concat(classPrefix, "-active"), active));
   var boxPrefix = "".concat(classPrefix, "__icon-box");
   var titleClass = classNames(boxPrefix, "".concat(boxPrefix, "-nav"), _defineProperty({}, "".concat(boxPrefix, "-large"), !icon));
+  var badgeProps = {
+    value,
+    dot,
+    max,
+    top,
+    right,
+    color: activeColor
+  };
   return React__default.createElement("div", {
     className: tabbarItemClass,
     style: _objectSpread({
       color: active ? activeColor : inactiveColor
     }, style),
     onClick: function onClick() {
-      return handleClick2(index);
+      return handleClick(index);
     }
-  }, icon ? React__default.createElement(React__default.Fragment, null, React__default.createElement(Badge, _objectSpread({}, rest), React__default.createElement("div", {
+  }, icon ? React__default.createElement(React__default.Fragment, null, React__default.createElement(Badge, _objectSpread({}, badgeProps), React__default.createElement("div", {
     className: boxPrefix
   }, icon)), React__default.createElement("div", {
     className: titleClass
-  }, title)) : React__default.createElement(Badge, _objectSpread({}, rest), React__default.createElement("div", {
+  }, title)) : React__default.createElement(Badge, _objectSpread({}, badgeProps), React__default.createElement("div", {
     className: titleClass
   }, title)));
 };

package/dist/esm/types/src/packages/button/button.d.ts

@@ -15,6 +15,7 @@ export interface ButtonProps extends BasicComponent {
     disabled: boolean;
     icon: React.ReactNode;
     id: string;
+    nativeType: 'submit' | 'reset' | 'button';
     onClick: (e: MouseEvent) => void;
 }
 export declare const Button: React.ForwardRefExoticComponent<Partial<ButtonProps> & React.RefAttributes<HTMLButtonElement>>;

package/dist/esm/types/src/packages/elevator/elevator.d.ts

@@ -9,7 +9,6 @@ export interface ElevatorProps extends BasicComponent {
     spaceHeight: number;
     titleHeight: number;
     showKeys: boolean;
-    children: React.ReactNode;
     onClickItem: (key: string, item: ElevatorData) => void;
     onClickIndex: (key: string) => void;
 }

package/dist/esm/types/src/packages/elevator/elevator.taro.d.ts

@@ -9,7 +9,6 @@ export interface ElevatorProps extends BasicComponent {
     spaceHeight: number;
     titleHeight: number;
     showKeys: boolean;
-    children: React.ReactNode;
     onClickItem: (key: string, item: ElevatorData) => void;
     onClickIndex: (key: string) => void;
 }

package/dist/esm/types/src/packages/form/__tests__/form.spec.d.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/dist/esm/types/src/packages/form/context.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export declare const Context: import("react").Context<{
+    [key: string]: any;
+}>;

package/dist/esm/types/src/packages/form/form.d.ts

@@ -1,9 +1,16 @@
-import React, { FunctionComponent } from 'react';
-import { useForm } from './useForm';
+import React, { FunctionComponent, ReactNode } from 'react';
+import { useForm } from './useform';
 import { BasicComponent } from '@/utils/typings';
 import { FormItem } from '../formitem/formitem';
-import { BaseForm } from './types';
-export interface FormProps extends BasicComponent, BaseForm {
+export interface FormProps extends BasicComponent {
+    footer: ReactNode;
+    initialValues: any;
+    name: string;
+    form: any;
+    labelPosition: 'top' | 'left' | 'right';
+    starPosition: 'left' | 'right';
+    onFinish: (values: any) => void;
+    onFinishFailed: (values: any, errorFields: any) => void;
 }
 export declare const Form: FunctionComponent<Partial<FormProps> & React.HTMLAttributes<HTMLFormElement>> & {
     Item: typeof FormItem;

package/dist/esm/types/src/packages/form/form.taro.d.ts

@@ -1,9 +1,19 @@
-import React, { FunctionComponent } from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import { BasicComponent } from '@/utils/typings';
-import FormItem from '@/packages/formitem/index.taro';
-import { BaseForm } from './types';
-export interface FormProps extends BasicComponent, BaseForm {
+import { useForm } from './useform.taro';
+import { FormItem } from '../formitem/formitem.taro';
+export interface FormProps extends BasicComponent {
+    footer: ReactNode;
+    initialValues: any;
+    name: string;
+    form: any;
+    labelPosition: 'top' | 'left' | 'right';
+    starPosition: 'left' | 'right';
+    onFinish: (values: any) => void;
+    onFinishFailed: (values: any, errorFields: any) => void;
 }
 export declare const Form: FunctionComponent<Partial<FormProps> & React.HTMLAttributes<HTMLFormElement>> & {
     Item: typeof FormItem;
+} & {
+    useForm: typeof useForm;
 };

package/dist/esm/types/src/packages/form/index.d.ts

@@ -1,2 +1,3 @@
 import { Form } from './form';
+export type { FormItemRuleWithoutValidator, StoreValue, NamePath, FormInstance, FieldEntity, } from './types';
 export default Form;

package/dist/esm/types/src/packages/form/index.taro.d.ts

@@ -1,2 +1,3 @@
 import { Form } from './form.taro';
+export type { FormItemRuleWithoutValidator, StoreValue, NamePath, FormInstance, FieldEntity, } from './types';
 export default Form;

package/dist/esm/types/src/packages/form/types.d.ts

@@ -1,63 +1,18 @@
-export interface BaseForm {
-    /**
-     * 经 Form.useForm() 创建的 form 控制实例，不提供时会自动创建
-     */
-    form: any;
-    /**
-     * label的位置
-     * 可选值 top/left/right
-     */
-    labelPosition: string | number;
-    /**
-     * 表单分组名称
-     */
-    formGroupTitle: string;
-    starPositon: string;
-    /**
-     * 表单校验成功回调
-     */
-    onFinish: (obj: object) => void;
-    /**
-     * 表单校验失败回调
-     */
-    onFinishFailed: (value: []) => void;
-}
 export interface FormItemRuleWithoutValidator {
     [key: string]: any;
     regex?: RegExp;
     required?: boolean;
     message?: string;
 }
-export interface FormItemRule extends FormItemRuleWithoutValidator {
-    validator?: (value: any, ruleCfg: FormItemRuleWithoutValidator) => boolean | string | Promise<boolean | string>;
-}
-export interface BaseFormField {
-    /**
-     * 字段名
-     */
-    name: string;
-    /**
-     * label 标签的文本
-     */
-    label: string;
-    /**
-     * 校验规则，设置字段的校验逻辑
-     */
-    rules: FormItemRule[];
-    /**
-     * 是否禁用表单项
-     */
-    disabled: boolean;
-}
-export type StoreValue = string | number;
+export type StoreValue = any;
 export type NamePath = string | number;
 export interface Callbacks<Values = any> {
     onValuesChange?: (values: Values) => void;
     onFinish?: (values: Values) => void;
-    onFinishFailed?: (Values: Values) => void;
+    onFinishFailed?: (values: Values, errorFields: any) => void;
 }
 export interface Store {
-    [name: string]: StoreValue;
+    [name: string]: any;
 }
 export interface FormInstance<Values = any> {
     registerField: (entity: FieldEntity) => () => void;
@@ -68,7 +23,7 @@ export interface FormInstance<Values = any> {
     setCallback: (callbacks: Callbacks) => void;
 }
 export interface FieldEntity {
-    onStoreChange: () => void;
+    onStoreChange: (type?: string) => void;
     getNamePath: () => NamePath;
     props: {
         name: NamePath;
@@ -77,6 +32,3 @@ export interface FieldEntity {
         initialValue?: any;
     };
 }
-export interface IDescriptor {
-    [name: string]: string;
-}

package/dist/esm/types/src/packages/formitem/formitem.d.ts

@@ -1,33 +1,34 @@
 import React from 'react';
 import { BaseFormField } from './types';
-import { FormItemContext } from './formitemcontext';
+import { Context } from '../form/context';
 import { BasicComponent } from '@/utils/typings';
 type TextAlign = 'start' | 'end' | 'left' | 'right' | 'center' | 'justify' | 'match-parent';
 export interface FormItemProps extends BasicComponent, BaseFormField {
-    labelWidth: string | number;
+    required: boolean;
+    initialValue: any;
+    trigger: string;
+    valuePropName: string;
+    getValueFromEvent: (...args: any) => any;
+    onClick: (event: React.MouseEvent, componentRef: React.MutableRefObject<any>) => void;
     errorMessageAlign: TextAlign;
-    showErrorLine: boolean;
-    showErrorMessage: boolean;
-    initialValue: string;
 }
 declare const defaultProps: FormItemProps;
 export type FieldProps = typeof defaultProps & Partial<BaseFormField>;
-export declare class FormItem extends React.Component<FieldProps> {
+export declare class FormItem extends React.Component<FieldProps, {
+    resetCount: number;
+}> {
     static defaultProps: FormItemProps;
     static contextType: any;
-    context: React.ContextType<typeof FormItemContext>;
+    context: React.ContextType<typeof Context>;
     private cancelRegister;
-    private isInitialValue;
+    private componentRef;
+    constructor(props: FieldProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    getControlled: (children: React.ReactElement) => {
-        value: any;
-        defaultValue: any;
-        onChange: (event: React.ChangeEvent<HTMLInputElement> | number | string | string[]) => void;
-    };
-    onStoreChange: () => void;
+    getControlled: (children: React.ReactElement) => any;
+    refresh: () => void;
+    onStoreChange: (type?: string) => void;
     renderLayout: (childNode: React.ReactNode) => JSX.Element;
-    pxCheck: (value: string | number) => string;
     render(): JSX.Element;
 }
 export {};

package/dist/esm/types/src/packages/formitem/formitem.taro.d.ts

@@ -1,30 +1,34 @@
 import React from 'react';
 import { BaseFormField } from './types';
-import { FormItemContext } from './formitemcontext';
+import { Context } from '../form/context';
 import { BasicComponent } from '@/utils/typings';
 type TextAlign = 'start' | 'end' | 'left' | 'right' | 'center' | 'justify' | 'match-parent';
 export interface FormItemProps extends BasicComponent, BaseFormField {
-    labelWidth: string | number;
+    required: boolean;
+    initialValue: any;
+    trigger: string;
+    valuePropName: string;
+    getValueFromEvent: (...args: any) => any;
+    onClick: (event: React.MouseEvent, componentRef: React.MutableRefObject<any>) => void;
     errorMessageAlign: TextAlign;
-    showErrorLine: boolean;
-    showErrorMessage: boolean;
 }
 declare const defaultProps: FormItemProps;
 export type FieldProps = typeof defaultProps & Partial<BaseFormField>;
-export declare class FormItem extends React.Component<FieldProps> {
+export declare class FormItem extends React.Component<FieldProps, {
+    resetCount: number;
+}> {
     static defaultProps: FormItemProps;
     static contextType: any;
-    context: React.ContextType<typeof FormItemContext>;
+    context: React.ContextType<typeof Context>;
     private cancelRegister;
+    private componentRef;
+    constructor(props: FieldProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    getControlled: (children: React.ReactElement) => {
-        value: any;
-        onChange: (event: React.ChangeEvent<HTMLInputElement> | number | string | string[]) => void;
-    };
-    onStoreChange: () => void;
+    getControlled: (children: React.ReactElement) => any;
+    refresh: () => void;
+    onStoreChange: (type?: string) => void;
     renderLayout: (childNode: React.ReactNode) => JSX.Element;
-    pxCheck: (value: string | number) => string;
     render(): JSX.Element;
 }
 export {};

package/dist/esm/types/src/packages/formitem/index.d.ts

@@ -1,2 +1,3 @@
 import { FormItem } from './formitem';
+export type { FormItemRuleWithoutValidator, FormItemRule, FormInstance, } from './types';
 export default FormItem;

package/dist/esm/types/src/packages/formitem/index.taro.d.ts

@@ -1,2 +1,3 @@
 import { FormItem } from './formitem.taro';
+export type { FormItemRuleWithoutValidator, FormItemRule, FormInstance, } from './types';
 export default FormItem;