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

package/dist/cjs/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/cjs/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/cjs/packages/form/useform.js

@@ -31,7 +31,9 @@ var SECRET = 'NUT_FORM_INTERNAL';
  */ var FormStore = function FormStore() {
     "use strict";
     var _this = this;
+    var _this1 = this;
     (0, _class_call_check._)(this, FormStore);
+    var _this2 = this;
     // 初始化数据
     (0, _define_property._)(this, "initialValues", {});
     (0, _define_property._)(this, "updateList", []);
@@ -89,8 +91,9 @@ var SECRET = 'NUT_FORM_INTERNAL';
    * 存储组件数据
    * @param newStore { [name]: newValue }
    */ (0, _define_property._)(this, "setFieldsValue", function(newStore) {
-        _this.store = (0, _object_spread._)({}, _this.store, newStore);
-        _this.fieldEntities.forEach(function(entity) {
+        var needValidate = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
+        _this1.store = (0, _object_spread._)({}, _this1.store, newStore);
+        _this1.fieldEntities.forEach(function(entity) {
             var name = entity.props.name;
             Object.keys(newStore).forEach(function(key) {
                 if (key === name) {
@@ -98,7 +101,7 @@ 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();
@@ -107,13 +110,12 @@ var SECRET = 'NUT_FORM_INTERNAL';
                 item.entity.onStoreChange('update');
             }
         });
-        _this.validateFields();
+        needValidate && _this1.validateFields();
     });
     (0, _define_property._)(this, "setCallback", function(callback) {
         _this.callbacks = (0, _object_spread._)({}, _this.callbacks, callback);
     });
-    var _this1 = this;
-    (0, _define_property._)(this, "validateEntities", function() {
+    (0, _define_property._)(this, "validateEntities", /*#__PURE__*/ function() {
         var _ref = (0, _async_to_generator._)(function(entity, errs) {
             var _entity_props, name, _entity_props_rules, rules, descriptor, validator, _this_store, param, errors, _errs;
             return (0, _ts_generator._)(this, function(_state) {
@@ -143,7 +145,7 @@ var SECRET = 'NUT_FORM_INTERNAL';
                         ]);
                         return [
                             4,
-                            validator.validate((0, _define_property._)({}, name, (_this_store = _this1.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
+                            validator.validate((0, _define_property._)({}, name, (_this_store = _this2.store) === null || _this_store === void 0 ? void 0 : _this_store[name]))
                         ];
                     case 2:
                         _state.sent();
@@ -155,8 +157,9 @@ var SECRET = 'NUT_FORM_INTERNAL';
                         param = _state.sent();
                         errors = param.errors;
                         if (errors) {
+                            ;
                             (_errs = errs).push.apply(_errs, (0, _to_consumable_array._)(errors));
-                            _this1.errors[name] = errors;
+                            _this2.errors[name] = errors;
                         }
                         return [
                             3,
@@ -164,7 +167,7 @@ var SECRET = 'NUT_FORM_INTERNAL';
                         ];
                     case 4:
                         if (!errs || errs.length === 0) {
-                            _this1.errors[name] = [];
+                            _this2.errors[name] = [];
                         }
                         return [
                             7
@@ -181,8 +184,7 @@ var SECRET = 'NUT_FORM_INTERNAL';
             return _ref.apply(this, arguments);
         };
     }());
-    var _this2 = this;
-    (0, _define_property._)(this, "validateFields", function() {
+    (0, _define_property._)(this, "validateFields", /*#__PURE__*/ function() {
         var _ref = (0, _async_to_generator._)(function(nameList) {
             var filterEntities, errs;
             return (0, _ts_generator._)(this, function(_state) {
@@ -201,7 +203,7 @@ var SECRET = 'NUT_FORM_INTERNAL';
                         errs = [];
                         return [
                             4,
-                            Promise.all(filterEntities.map(function() {
+                            Promise.all(filterEntities.map(/*#__PURE__*/ function() {
                                 var _ref = (0, _async_to_generator._)(function(entity) {
                                     return (0, _ts_generator._)(this, function(_state) {
                                         switch(_state.label){
@@ -236,7 +238,6 @@ var SECRET = 'NUT_FORM_INTERNAL';
             return _ref.apply(this, arguments);
         };
     }());
-    var _this3 = this;
     (0, _define_property._)(this, "submit", /*#__PURE__*/ (0, _async_to_generator._)(function() {
         var errors, _this_callbacks_onFinish, _this_callbacks, _this_callbacks_onFinishFailed, _this_callbacks1;
         return (0, _ts_generator._)(this, function(_state) {
@@ -244,14 +245,16 @@ 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/cjs/packages/formitem/formitem.d.ts

@@ -15,6 +15,7 @@ export interface FormItemProps extends Omit<BasicComponent, 'children'>, BaseFor
     shouldUpdate: boolean;
     noStyle: boolean;
     children: ReactNode | ((obj: any) => React.ReactNode);
+    align?: 'flex-start' | 'center' | 'flex-end';
 }
 export declare class FormItem extends React.Component<Partial<FormItemProps>, {
     resetCount: number;

package/dist/cjs/packages/formitem/formitem.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "FormItem", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-var _assert_this_initialized = require("@swc/helpers/_/_assert_this_initialized");
+var _call_super = require("@swc/helpers/_/_call_super");
 var _class_call_check = require("@swc/helpers/_/_class_call_check");
 var _create_class = require("@swc/helpers/_/_create_class");
 var _define_property = require("@swc/helpers/_/_define_property");
@@ -18,8 +18,8 @@ var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
-var _create_super = require("@swc/helpers/_/_create_super");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+var _components = require("@tarojs/components");
 var _context = require("../form/context");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../cell/index"));
 var _typings = require("../../utils/typings");
@@ -44,16 +44,12 @@ var _React_Component;
 var FormItem = /*#__PURE__*/ function(_superClass) {
     "use strict";
     (0, _inherits._)(FormItem, _superClass);
-    var _super = (0, _create_super._)(FormItem);
     function FormItem(props) {
         (0, _class_call_check._)(this, FormItem);
         var _this;
-        _this = _super.call(this, props);
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "cancelRegister", void 0);
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "componentRef", void 0);
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "eventOff", void 0);
-        // children添加value属性和onChange事件
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "getControlled", function(children) {
+        _this = (0, _call_super._)(this, FormItem, [
+            props
+        ]), (0, _define_property._)(_this, "cancelRegister", void 0), (0, _define_property._)(_this, "componentRef", void 0), (0, _define_property._)(_this, "eventOff", void 0), (0, _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(_useform.SECRET).dispatch;
@@ -77,7 +73,7 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
                     var _this_props;
                     next = (_this_props = _this.props).getValueFromEvent.apply(_this_props, (0, _to_consumable_array._)(args));
                 }
-                setFieldsValue((0, _define_property._)({}, name, next));
+                setFieldsValue((0, _define_property._)({}, name, next), false);
             }), _obj));
             var validateTrigger = _this.props.validateTrigger;
             var validateTriggers = [
@@ -119,26 +115,23 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
                 };
             }
             return controlled;
-        });
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "refresh", function() {
+        }), (0, _define_property._)(_this, "refresh", function() {
             _this.setState(function(param) {
                 var resetCount = param.resetCount;
                 return {
                     resetCount: resetCount + 1
                 };
             });
-        });
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "onStoreChange", function(type) {
+        }), (0, _define_property._)(_this, "onStoreChange", function(type) {
             if (type === 'reset') {
                 _this.context.errors[_this.props.name] = [];
                 _this.refresh();
             } else {
                 _this.forceUpdate();
             }
-        });
-        (0, _define_property._)((0, _assert_this_initialized._)(_this), "renderLayout", function(childNode) {
+        }), (0, _define_property._)(_this, "renderLayout", function(childNode) {
             var _item_;
-            var _$_object_spread = (0, _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 = (0, _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;
             });
@@ -151,16 +144,17 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
             return /*#__PURE__*/ _react.default.createElement(_index.default, {
                 className: "nut-form-item ".concat(className),
                 style: style,
+                align: align,
                 onClick: function onClick(e) {
                     return _this.props.onClick && _this.props.onClick(e, _this.componentRef);
                 }
-            }, label ? /*#__PURE__*/ _react.default.createElement("div", {
+            }, label ? /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "nut-cell-title nut-form-item-label"
-            }, renderLabel) : null, /*#__PURE__*/ _react.default.createElement("div", {
+            }, renderLabel) : null, /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "nut-cell-value nut-form-item-body"
-            }, /*#__PURE__*/ _react.default.createElement("div", {
+            }, /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "nut-form-item-body-slots"
-            }, childNode), /*#__PURE__*/ _react.default.createElement("div", {
+            }, childNode), /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "nut-form-item-body-tips",
                 style: {
                     textAlign: errorMessageAlign,

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

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

package/dist/cjs/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/cjs/packages/grid/grid.js

@@ -17,12 +17,11 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _components = require("@tarojs/components");
 var _context = /*#__PURE__*/ _interop_require_default._(require("./context"));
 var _griditem = require("../griditem/griditem");
-var _pxcheck = require("../../utils/px-check");
 var defaultProps = {
     columns: 4,
-    gap: 0,
+    gap: 9,
     center: true,
-    square: false,
+    square: true,
     reverse: false,
     direction: 'vertical'
 };
@@ -49,9 +48,6 @@ var Grid = function Grid(props) {
         if (style) {
             styleSelf = style;
         }
-        if (gap) {
-            styleSelf.paddingLeft = (0, _pxcheck.pxCheck)(gap);
-        }
         return styleSelf;
     };
     return(// @ts-ignore

package/dist/cjs/packages/grid/style/grid.scss

@@ -6,8 +6,8 @@
   border: 0 solid $grid-border-color;
 
   &-border {
-    border-top-width: 1px;
-    border-left-width: 1px;
+    border-top-width: $grid-border-width;
+    border-left-width: $grid-border-width;
   }
 }
 

package/dist/cjs/packages/grid/style/style.css

@@ -1,13 +1,18 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   flex-direction: column;
   position: relative;
   box-sizing: border-box;
-  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7));
+  overflow: hidden;
 }
 .nut-grid-item-text {
-  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-2, 12px));
+  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7));
+  font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-s, 12px));
   word-break: break-all;
   margin: var(--nutui-grid-item-text-margin, 8px) 0 0 0;
 }
@@ -27,16 +32,17 @@
   flex-direction: column;
   width: 100%;
   padding: var(--nutui-grid-item-content-padding, 16px 8px);
-  background: var(--nutui-grid-item-content-bg-color, #ffffff);
-  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  background: var(--nutui-grid-item-content-bg-color, var(--nutui-gray-1));
+  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3));
 }
 .nut-grid-item-content-border {
-  border-right-width: 1px;
-  border-bottom-width: 1px;
+  border-right-width: var(--nutui-grid-border-width, 0px);
+  border-bottom-width: var(--nutui-grid-border-width, 0px);
 }
 .nut-grid-item-content-surround {
-  border-top-width: 1px;
-  border-left-width: 1px;
+  border-top-width: var(--nutui-grid-border-width, 0px);
+  border-left-width: var(--nutui-grid-border-width, 0px);
+  border-radius: var(--nutui-grid-item-border-radius, var(--nutui-radius-l, 8px));
 }
 .nut-grid-item-content-center {
   align-items: center;
@@ -63,9 +69,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  background-color: var(--nutui-black-10);
   border: inherit;
-  border-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  border-color: var(--nutui-black-10);
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;
@@ -105,11 +111,11 @@
   flex-direction: row;
   align-items: stretch;
   flex-wrap: wrap;
-  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3));
 }
 .nut-grid-border {
-  border-top-width: 1px;
-  border-left-width: 1px;
+  border-top-width: var(--nutui-grid-border-width, 0px);
+  border-left-width: var(--nutui-grid-border-width, 0px);
 }
 
 [dir=rtl] .nut-grid-border,

package/dist/cjs/packages/griditem/griditem.js

@@ -17,19 +17,17 @@ var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
 var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
-var _index = require("../configprovider/index");
 var _context = /*#__PURE__*/ _interop_require_default._(require("../grid/context"));
 var defaultProps = {
     text: '',
     columns: 4,
-    gap: 0,
+    gap: 9,
     center: true,
-    square: false,
+    square: true,
     reverse: false,
     direction: 'vertical'
 };
 var GridItem = function GridItem(props) {
-    var locale = (0, _index.useConfig)().locale;
     var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, style = _ref.style, columns = _ref.columns, index = _ref.index, gap = _ref.gap, square = _ref.square, text = _ref.text, center = _ref.center, reverse = _ref.reverse, direction = _ref.direction, className = _ref.className, onClick = _ref.onClick, rest = (0, _object_without_properties._)(_ref, [
         "children",
         "style",
@@ -48,17 +46,23 @@ var GridItem = function GridItem(props) {
     var classes = (0, _classnames.default)(classPrefix, className);
     var context = (0, _react.useContext)(_context.default);
     var rootStyle = function rootStyle() {
+        var width = "calc(".concat(100 / Number(columns), "% - ").concat((0, _pxtransform.default)(Number(gap) * (Number(columns) - 1) / Number(columns)), ")");
         var styles = (0, _object_spread._)({
-            width: "".concat(100 / +columns, "%"),
+            width: width,
             overflow: 'hidden'
         }, style);
         if (square) {
-            styles.paddingTop = "".concat(100 / +columns, "%");
-        } else if (gap) {
-            styles.paddingRight = (0, _pxtransform.default)(typeof gap === 'number' ? gap : parseFloat(gap));
+            styles.paddingTop = width;
+        }
+        if (gap) {
+            if ((index + 1) % Number(columns)) {
+                styles.marginRight = (0, _pxtransform.default)(typeof gap === 'number' ? gap : parseFloat(gap));
+            }
             if (index >= Number(columns)) {
                 styles.marginTop = (0, _pxtransform.default)(typeof gap === 'number' ? gap : parseFloat(gap));
             }
+        } else {
+            styles.borderRadius = 0;
         }
         return styles;
     };