@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

package/dist/es/packages/fixednav/fixednav.js

@@ -4,6 +4,7 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import React from "react";
 import classNames from "classnames";
 import { ArrowLeft } from "@nutui/icons-react-taro";
+import { View } from "@tarojs/components";
 import Overlay from "../overlay/index";
 import { useConfig } from "../configprovider/configprovider";
 import { ComponentDefaults } from "../../utils/typings";
@@ -55,12 +56,12 @@ export var FixedNav = function(props) {
         onClick: function() {
             return onUpdateValue(false);
         }
-    }), /*#__PURE__*/ React.createElement("div", {
+    }), /*#__PURE__*/ React.createElement(View, {
         className: "list"
-    }, children || /*#__PURE__*/ React.createElement("div", {
+    }, children || /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list")
     }, list.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-list-item"),
             onClick: function(event) {
                 return handleClick(item, event);
@@ -69,19 +70,19 @@ export var FixedNav = function(props) {
         }, /*#__PURE__*/ React.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ React.createElement("img", {
             src: item.icon,
             alt: ""
-        }), /*#__PURE__*/ React.createElement("div", {
+        }), /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-list-text")
-        }, item.text), item.num && /*#__PURE__*/ React.createElement("div", {
+        }, item.text), item.num && /*#__PURE__*/ React.createElement(View, {
             className: "b"
         }, item.num));
-    }))), /*#__PURE__*/ React.createElement("div", {
+    }))), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-btn"),
         onClick: function() {
             return onUpdateValue();
         }
     }, content || /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(ArrowLeft, {
         color: "#fff"
-    }), /*#__PURE__*/ React.createElement("div", {
+    }), /*#__PURE__*/ React.createElement(View, {
         className: "text"
     }, visible ? activeText || locale.fixednav.activeText : inactiveText || locale.fixednav.inactiveText))));
 };

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

@@ -41,7 +41,7 @@
     .text {
       width: 24px;
       line-height: 13px;
-      font-size: $font-size-small;
+      font-size: $font-size-s;
       color: #fff;
       flex-shrink: 0;
     }

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -11,22 +15,13 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -61,6 +56,12 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-fixednav {
   position: fixed;
   z-index: var(--nutui-fixednav-index, 900);
@@ -84,7 +85,7 @@
   z-index: var(--nutui-fixednav-index, 900);
   width: 70px;
   height: 100%;
-  background: var(--nutui-fixednav-button-background, var(--nutui-color-primary, #ff0f23));
+  background: var(--nutui-fixednav-button-background, var(--nutui-brand-6));
   border-radius: 45px 0px 0px 45px;
   box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.2);
   display: flex;
@@ -94,7 +95,7 @@
 .nut-fixednav-btn .text {
   width: 24px;
   line-height: 13px;
-  font-size: var(--nutui-font-size-2, 12px);
+  font-size: var(--nutui-font-size-s, 12px);
   color: #fff;
   flex-shrink: 0;
 }
@@ -149,7 +150,7 @@
   font-size: 10px;
   padding: 0 3px;
   color: white;
-  background: var(--nutui-color-primary, #ff0f23);
+  background: var(--nutui-brand-6);
   border-radius: 7px;
   text-align: center;
   min-width: 12px;

package/dist/es/packages/form/form.d.ts

@@ -25,7 +25,7 @@ export interface FormProps extends BasicComponent {
     divider: boolean;
     /**
     * 表单项 label 的位置
-    * @default 'left'\
+    * @default right
     */
     labelPosition: 'top' | 'left' | 'right'
     /**

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

@@ -26,6 +26,8 @@ export var Form = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     if (form !== undefined) {
         formInstance = form;
     } else {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        ;
         var _$ref;
         _$ref = _sliced_to_array(useForm(), 1), formInstance = _$ref[0], _$ref;
     }

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

@@ -1,11 +1,15 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-cell-group {
   display: block;
 }
 .nut-cell-group-title {
   display: inherit;
   padding: var(--nutui-cell-group-title-padding, 0 10px);
-  color: var(--nutui-cell-group-title-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-cell-group-title-font-size, var(--nutui-font-size-3, 14px));
+  color: var(--nutui-cell-group-title-color, var(--nutui-gray-7));
+  font-size: var(--nutui-cell-group-title-font-size, var(--nutui-font-size-base, 14px));
   line-height: var(--nutui-cell-group-title-line-height, 20px);
   margin-top: 30px;
   margin-bottom: 10px;
@@ -13,8 +17,8 @@
 .nut-cell-group-description {
   display: inherit;
   padding: var(--nutui-cell-group-description-padding, 0 10px);
-  color: var(--nutui-cell-group-description-color, var(--nutui-gray-6, #505259));
-  font-size: var(--nutui-cell-group-description-font-size, var(--nutui-font-size-2, 12px));
+  color: var(--nutui-cell-group-description-color, var(--nutui-gray-6));
+  font-size: var(--nutui-cell-group-description-font-size, var(--nutui-font-size-s, 12px));
   line-height: var(--nutui-cell-group-description-line-height, 16px);
   margin-top: 10px;
   margin-bottom: 10px;
@@ -22,7 +26,7 @@
 .nut-cell-group-wrap {
   border-radius: var(--nutui-cell-border-radius, 6px);
   overflow: hidden;
-  background-color: var(--nutui-cell-group-background-color, var(--nutui-gray-1, #ffffff));
+  background-color: var(--nutui-cell-group-background-color, var(--nutui-gray-1));
   margin-bottom: var(--nutui-cell-group-wrap-margin, 10px);
 }
 
@@ -32,8 +36,8 @@
 .nut-cell-group-title {
   display: inherit;
   padding: var(--nutui-cell-group-title-padding, 0 10px);
-  color: var(--nutui-cell-group-title-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-cell-group-title-font-size, var(--nutui-font-size-3, 14px));
+  color: var(--nutui-cell-group-title-color, var(--nutui-gray-7));
+  font-size: var(--nutui-cell-group-title-font-size, var(--nutui-font-size-base, 14px));
   line-height: var(--nutui-cell-group-title-line-height, 20px);
   margin-top: 30px;
   margin-bottom: 10px;
@@ -41,8 +45,8 @@
 .nut-cell-group-description {
   display: inherit;
   padding: var(--nutui-cell-group-description-padding, 0 10px);
-  color: var(--nutui-cell-group-description-color, var(--nutui-gray-6, #505259));
-  font-size: var(--nutui-cell-group-description-font-size, var(--nutui-font-size-2, 12px));
+  color: var(--nutui-cell-group-description-color, var(--nutui-gray-6));
+  font-size: var(--nutui-cell-group-description-font-size, var(--nutui-font-size-s, 12px));
   line-height: var(--nutui-cell-group-description-line-height, 16px);
   margin-top: 10px;
   margin-bottom: 10px;
@@ -50,7 +54,7 @@
 .nut-cell-group-wrap {
   border-radius: var(--nutui-cell-border-radius, 6px);
   overflow: hidden;
-  background-color: var(--nutui-cell-group-background-color, var(--nutui-gray-1, #ffffff));
+  background-color: var(--nutui-cell-group-background-color, var(--nutui-gray-1));
   margin-bottom: var(--nutui-cell-group-wrap-margin, 10px);
 }
 
@@ -61,11 +65,11 @@
   width: 100%;
   line-height: var(--nutui-cell-line-height, 20px);
   padding: var(--nutui-cell-padding, 13px 16px);
-  background-color: var(--nutui-cell-background-color, var(--nutui-gray-1, #ffffff));
+  background-color: var(--nutui-cell-background-color, var(--nutui-gray-1));
   border-radius: var(--nutui-cell-border-radius, 6px);
   box-shadow: var(--nutui-cell-box-shadow, 0px 1px 7px 0px rgb(237, 238, 241));
-  font-size: var(--nutui-cell-title-font-size, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-cell-title-color, var(--nutui-gray-7, #1a1a1a));
+  font-size: var(--nutui-cell-title-font-size, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-cell-title-color, var(--nutui-gray-7));
   margin-bottom: 10px;
   box-sizing: border-box;
 }
@@ -84,8 +88,8 @@
   line-height: var(--nutui-cell-line-height, 20px);
 }
 .nut-cell-description {
-  font-size: var(--nutui-cell-description-font-size, var(--nutui-font-size-2, 12px));
-  color: var(--nutui-cell-description-color, var(--nutui-gray-6, #505259));
+  font-size: var(--nutui-cell-description-font-size, var(--nutui-font-size-s, 12px));
+  color: var(--nutui-cell-description-color, var(--nutui-gray-6));
 }
 .nut-cell-extra {
   display: flex;
@@ -96,8 +100,28 @@
   flex-shrink: 0;
   min-width: 0;
   word-break: break-all;
-  font-size: var(--nutui-cell-extra-font-size, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-cell-extra-color, var(--nutui-gray-6, #505259));
+  font-size: var(--nutui-cell-extra-font-size, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-cell-extra-color, var(--nutui-gray-6));
+}
+.nut-cell:active::before {
+  opacity: 0.1;
+}
+.nut-cell-clickable {
+  cursor: pointer;
+}
+.nut-cell-clickable::before {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 100%;
+  height: 100%;
+  background-color: #000000;
+  border: inherit;
+  border-color: #000000;
+  border-radius: inherit;
+  transform: translate(-50%, -50%);
+  opacity: 0;
+  content: " ";
 }
 .nut-cell-divider {
   display: flex;
@@ -109,7 +133,7 @@
   display: flex;
   height: 1px;
   width: 100%;
-  border-top: var(--nutui-cell-divider-border-bottom, 1px solid var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border-top: var(--nutui-cell-divider-border-bottom, 1px solid var(--nutui-black-3));
 }
 .nut-cell-divider-rtl {
   padding-left: var(--nutui-cell-divider-right, 16px);
@@ -118,14 +142,16 @@
 
 .nut-form-item {
   display: flex;
+  align-items: center;
+  padding: 4px 12px;
 }
 .nut-form-item.error.line::before {
-  border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-color-primary, #ff0f23));
+  border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-brand-6));
   transform: scaleX(1);
   transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
 }
 .nut-form-item-label {
-  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-base, 14px));
   font-weight: normal;
   width: var(--nutui-form-item-label-width, 90px);
   margin-right: var(--nutui-form-item-label-margin-right, 10px);
@@ -136,7 +162,7 @@
 }
 .nut-form-item-label .required::before {
   content: "*";
-  color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-form-item-required-color, var(--nutui-brand-6));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
 }
 .nut-form-item-body {
@@ -152,9 +178,9 @@
   border: 0;
 }
 .nut-form-item-body-slots .nut-input-text {
-  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, 14px));
   text-align: var(--nutui-form-item-body-input-text-align, left);
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-gray-7);
   width: 100%;
   outline: 0 none;
   border: 0;
@@ -173,8 +199,8 @@
 }
 .nut-form-item-body-tips {
   text-align: var(--nutui-form-item-tip-text-align, left);
-  font-size: var(--nutui-form-item-tip-font-size, var(--nutui-font-size-1, 10px));
-  color: var(--nutui-form-item-error-message-color, var(--nutui-color-primary, #ff0f23));
+  font-size: var(--nutui-form-item-tip-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-form-item-error-message-color, var(--nutui-brand-6));
 }
 
 [dir=rtl] .nut-form-item-label,

package/dist/es/packages/form/types.d.ts

@@ -23,6 +23,7 @@ export interface FormInstance<Values = any> {
     resetFields: (fields?: NamePath[]) => void;
     submit: () => void;
     getInternal: (secret: string) => any;
+    validateFields: (nameList?: NamePath[]) => Promise<any[]>;
 }
 export interface FormFieldEntity {
     onStoreChange: (type?: string) => void;

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

@@ -12,7 +12,9 @@ export var SECRET = 'NUT_FORM_INTERNAL';
  */ var FormStore = function FormStore() {
     "use strict";
     var _this = this;
+    var _this1 = this;
     _class_call_check(this, FormStore);
+    var _this2 = this;
     // 初始化数据
     _define_property(this, "initialValues", {});
     _define_property(this, "updateList", []);
@@ -70,8 +72,9 @@ export var SECRET = 'NUT_FORM_INTERNAL';
    * 存储组件数据
    * @param newStore { [name]: newValue }
    */ _define_property(this, "setFieldsValue", function(newStore) {
-        _this.store = _object_spread({}, _this.store, newStore);
-        _this.fieldEntities.forEach(function(entity) {
+        var needValidate = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
+        _this1.store = _object_spread({}, _this1.store, newStore);
+        _this1.fieldEntities.forEach(function(entity) {
             var name = entity.props.name;
             Object.keys(newStore).forEach(function(key) {
                 if (key === name) {
@@ -79,7 +82,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                 }
             });
         });
-        _this.updateList.forEach(function(item) {
+        _this1.updateList.forEach(function(item) {
             var shouldUpdate = item.condition;
             if (typeof item.condition === 'function') {
                 shouldUpdate = item.condition();
@@ -88,13 +91,12 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                 item.entity.onStoreChange('update');
             }
         });
-        _this.validateFields();
+        needValidate && _this1.validateFields();
     });
     _define_property(this, "setCallback", function(callback) {
         _this.callbacks = _object_spread({}, _this.callbacks, callback);
     });
-    var _this1 = this;
-    _define_property(this, "validateEntities", function() {
+    _define_property(this, "validateEntities", /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(entity, errs) {
             var _entity_props, name, _entity_props_rules, rules, descriptor, validator, _this_store, param, errors, _errs;
             return _ts_generator(this, function(_state) {
@@ -124,7 +126,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                         ]);
                         return [
                             4,
-                            validator.validate(_define_property({}, name, (_this_store = _this1.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
+                            validator.validate(_define_property({}, name, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
                         ];
                     case 2:
                         _state.sent();
@@ -138,7 +140,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                         if (errors) {
                             ;
                             (_errs = errs).push.apply(_errs, _to_consumable_array(errors));
-                            _this1.errors[name] = errors;
+                            _this2.errors[name] = errors;
                         }
                         return [
                             3,
@@ -146,7 +148,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                         ];
                     case 4:
                         if (!errs || errs.length === 0) {
-                            _this1.errors[name] = [];
+                            _this2.errors[name] = [];
                         }
                         return [
                             7
@@ -163,8 +165,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
             return _ref.apply(this, arguments);
         };
     }());
-    var _this2 = this;
-    _define_property(this, "validateFields", function() {
+    _define_property(this, "validateFields", /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(nameList) {
             var filterEntities, errs;
             return _ts_generator(this, function(_state) {
@@ -183,7 +184,7 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                         errs = [];
                         return [
                             4,
-                            Promise.all(filterEntities.map(function() {
+                            Promise.all(filterEntities.map(/*#__PURE__*/ function() {
                                 var _ref = _async_to_generator(function(entity) {
                                     return _ts_generator(this, function(_state) {
                                         switch(_state.label){
@@ -218,7 +219,6 @@ export var SECRET = 'NUT_FORM_INTERNAL';
             return _ref.apply(this, arguments);
         };
     }());
-    var _this3 = this;
     _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) {
@@ -226,16 +226,16 @@ export var SECRET = 'NUT_FORM_INTERNAL';
                 case 0:
                     return [
                         4,
-                        _this3.validateFields()
+                        _this2.validateFields()
                     ];
                 case 1:
                     errors = _state.sent();
                     if (errors.length === 0) {
                         ;
-                        (_this_callbacks_onFinish = (_this_callbacks = _this3.callbacks).onFinish) === null || _this_callbacks_onFinish === void 0 ? void 0 : _this_callbacks_onFinish.call(_this_callbacks, _this3.store);
+                        (_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 = _this3.callbacks).onFinishFailed) === null || _this_callbacks_onFinishFailed === void 0 ? void 0 : _this_callbacks_onFinishFailed.call(_this_callbacks1, _this3.store, errors);
+                        (_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

package/dist/es/packages/formitem/formitem.d.ts

@@ -55,6 +55,11 @@ export interface FormItemProps extends Omit<BasicComponent, 'children'>, BaseFor
     */
     noStyle: boolean
     children: ReactNode | ((obj: any) => React.ReactNode);
+    /**
+    * 对齐方式
+    * @default flex-start
+    */
+    align?: 'flex-start' | 'center' | 'flex-end'
 }
 export declare class FormItem extends React.Component<Partial<FormItemProps>, {
     resetCount: number;

package/dist/es/packages/formitem/formitem.js

@@ -1,4 +1,4 @@
-import { _ as _assert_this_initialized } from "@swc/helpers/_/_assert_this_initialized";
+import { _ as _call_super } from "@swc/helpers/_/_call_super";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
@@ -7,8 +7,8 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import React from "react";
+import { View } from "@tarojs/components";
 import { Context } from "../form/context";
 import Cell from "../cell/index";
 import { ComponentDefaults } from "../../utils/typings";
@@ -33,16 +33,13 @@ var _React_Component;
 export var FormItem = /*#__PURE__*/ function(_superClass) {
     "use strict";
     _inherits(FormItem, _superClass);
-    var _super = _create_super(FormItem);
     function FormItem(props) {
         _class_call_check(this, FormItem);
         var _this;
-        _this = _super.call(this, props);
-        _define_property(_assert_this_initialized(_this), "cancelRegister", void 0);
-        _define_property(_assert_this_initialized(_this), "componentRef", void 0);
-        _define_property(_assert_this_initialized(_this), "eventOff", void 0);
-        // children添加value属性和onChange事件
-        _define_property(_assert_this_initialized(_this), "getControlled", function(children) {
+        _this = _call_super(this, FormItem, [
+            props
+        ]), _define_property(_this, "cancelRegister", void 0), _define_property(_this, "componentRef", void 0), _define_property(_this, "eventOff", void 0), // children添加value属性和onChange事件
+        _define_property(_this, "getControlled", function(children) {
             var _children_props;
             var _this_context = _this.context, setFieldsValue = _this_context.setFieldsValue, getFieldValue = _this_context.getFieldValue;
             var dispatch = _this.context.getInternal(SECRET).dispatch;
@@ -66,7 +63,7 @@ export var FormItem = /*#__PURE__*/ function(_superClass) {
                     var _this_props;
                     next = (_this_props = _this.props).getValueFromEvent.apply(_this_props, _to_consumable_array(args));
                 }
-                setFieldsValue(_define_property({}, name, next));
+                setFieldsValue(_define_property({}, name, next), false);
             }), _obj));
             var validateTrigger = _this.props.validateTrigger;
             var validateTriggers = [
@@ -108,26 +105,23 @@ export var FormItem = /*#__PURE__*/ function(_superClass) {
                 };
             }
             return controlled;
-        });
-        _define_property(_assert_this_initialized(_this), "refresh", function() {
+        }), _define_property(_this, "refresh", function() {
             _this.setState(function(param) {
                 var resetCount = param.resetCount;
                 return {
                     resetCount: resetCount + 1
                 };
             });
-        });
-        _define_property(_assert_this_initialized(_this), "onStoreChange", function(type) {
+        }), _define_property(_this, "onStoreChange", function(type) {
             if (type === 'reset') {
                 _this.context.errors[_this.props.name] = [];
                 _this.refresh();
             } else {
                 _this.forceUpdate();
             }
-        });
-        _define_property(_assert_this_initialized(_this), "renderLayout", function(childNode) {
+        }), _define_property(_this, "renderLayout", function(childNode) {
             var _item_;
-            var _$_object_spread = _object_spread({}, defaultProps, _this.props), label = _$_object_spread.label, name = _$_object_spread.name, required = _$_object_spread.required, rules = _$_object_spread.rules, className = _$_object_spread.className, style = _$_object_spread.style, errorMessageAlign = _$_object_spread.errorMessageAlign;
+            var _$_object_spread = _object_spread({}, defaultProps, _this.props), label = _$_object_spread.label, name = _$_object_spread.name, required = _$_object_spread.required, rules = _$_object_spread.rules, className = _$_object_spread.className, style = _$_object_spread.style, align = _$_object_spread.align, errorMessageAlign = _$_object_spread.errorMessageAlign;
             var requiredInRules = rules === null || rules === void 0 ? void 0 : rules.some(function(rule) {
                 return rule.required;
             });
@@ -140,16 +134,17 @@ export var FormItem = /*#__PURE__*/ function(_superClass) {
             return /*#__PURE__*/ React.createElement(Cell, {
                 className: "nut-form-item ".concat(className),
                 style: style,
+                align: align,
                 onClick: function(e) {
                     return _this.props.onClick && _this.props.onClick(e, _this.componentRef);
                 }
-            }, label ? /*#__PURE__*/ React.createElement("div", {
+            }, label ? /*#__PURE__*/ React.createElement(View, {
                 className: "nut-cell-title nut-form-item-label"
-            }, renderLabel) : null, /*#__PURE__*/ React.createElement("div", {
+            }, renderLabel) : null, /*#__PURE__*/ React.createElement(View, {
                 className: "nut-cell-value nut-form-item-body"
-            }, /*#__PURE__*/ React.createElement("div", {
+            }, /*#__PURE__*/ React.createElement(View, {
                 className: "nut-form-item-body-slots"
-            }, childNode), /*#__PURE__*/ React.createElement("div", {
+            }, childNode), /*#__PURE__*/ React.createElement(View, {
                 className: "nut-form-item-body-tips",
                 style: {
                     textAlign: errorMessageAlign,

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

@@ -1,5 +1,7 @@
 .nut-form-item {
   display: flex;
+  align-items: center;
+  padding: 4px 12px;
 
   &.error {
     &.line {

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

@@ -1,13 +1,19 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-form-item {
   display: flex;
+  align-items: center;
+  padding: 4px 12px;
 }
 .nut-form-item.error.line::before {
-  border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-color-primary, #ff0f23));
+  border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-brand-6));
   transform: scaleX(1);
   transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
 }
 .nut-form-item-label {
-  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-base, 14px));
   font-weight: normal;
   width: var(--nutui-form-item-label-width, 90px);
   margin-right: var(--nutui-form-item-label-margin-right, 10px);
@@ -18,7 +24,7 @@
 }
 .nut-form-item-label .required::before {
   content: "*";
-  color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-form-item-required-color, var(--nutui-brand-6));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
 }
 .nut-form-item-body {
@@ -34,9 +40,9 @@
   border: 0;
 }
 .nut-form-item-body-slots .nut-input-text {
-  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-3, 14px));
+  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, 14px));
   text-align: var(--nutui-form-item-body-input-text-align, left);
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-gray-7);
   width: 100%;
   outline: 0 none;
   border: 0;
@@ -55,8 +61,8 @@
 }
 .nut-form-item-body-tips {
   text-align: var(--nutui-form-item-tip-text-align, left);
-  font-size: var(--nutui-form-item-tip-font-size, var(--nutui-font-size-1, 10px));
-  color: var(--nutui-form-item-error-message-color, var(--nutui-color-primary, #ff0f23));
+  font-size: var(--nutui-form-item-tip-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-form-item-error-message-color, var(--nutui-brand-6));
 }
 
 [dir=rtl] .nut-form-item-label,

package/dist/es/packages/grid/grid.js

@@ -6,12 +6,11 @@ import classNames from "classnames";
 import { View } from "@tarojs/components";
 import GridContext from "./context";
 import { GridItem } from "../griditem/griditem";
-import { pxCheck } from "../../utils/px-check";
 var defaultProps = {
     columns: 4,
-    gap: 0,
+    gap: 9,
     center: true,
-    square: false,
+    square: true,
     reverse: false,
     direction: 'vertical'
 };
@@ -38,9 +37,6 @@ export var Grid = function(props) {
         if (style) {
             styleSelf = style;
         }
-        if (gap) {
-            styleSelf.paddingLeft = pxCheck(gap);
-        }
         return styleSelf;
     };
     return (