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

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

@@ -51,6 +51,8 @@
     }
 
     &-fixed {
+      display: flex;
+      align-items: center;
       width: 100%;
       position: absolute;
       top: 0;
@@ -58,13 +60,14 @@
       z-index: 1;
       padding: $elevator-list-item-padding;
       height: $elevator-list-item-code-height;
-      line-height: $elevator-list-item-code-line-height;
-      font-size: $elevator-list-item-code-font-size;
-      color: $elevator-list-fixed-color;
-      font-weight: $elevator-list-item-code-font-weight;
       background-color: $elevator-list-fixed-bg-color;
       box-sizing: border-box;
       box-shadow: $elevator-list-fixed-box-shadow;
+      &-title {
+        font-size: $elevator-list-item-code-font-size;
+        color: $elevator-list-fixed-color;
+        font-weight: $elevator-list-item-code-font-weight;
+      }
     }
   }
 

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-elevator {
   width: 100%;
   display: block;
@@ -10,7 +14,7 @@
   top: 0;
   overflow: hidden;
   font-size: var(--nutui-elevator-list-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-elevator-list-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-elevator-list-color, var(--nutui-gray-7));
 }
 .nut-elevator-list-inner {
   height: 100%;
@@ -28,11 +32,11 @@
   height: var(--nutui-elevator-list-item-code-height, 35px);
   line-height: var(--nutui-elevator-list-item-code-line-height, 35px);
   font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-elevator-list-item-code-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-elevator-list-item-code-color, var(--nutui-gray-7));
   padding: var(--nutui-elevator-list-item-padding, 0 20px);
   font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
   box-sizing: border-box;
-  border-bottom: var(--nutui-elevator-list-item-code-border-bottom, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border-bottom: var(--nutui-elevator-list-item-code-border-bottom, 1px solid var(--nutui-black-3));
   background-color: var(--nutui-elevator-list-item-code-background-color, inherit);
 }
 .nut-elevator-list-item-name {
@@ -43,9 +47,11 @@
   line-height: var(--nutui-elevator-list-item-name-line-height, 30px);
 }
 .nut-elevator-list-item-name-highcolor {
-  color: var(--nutui-color-primary, #ff0f23);
+  color: var(--nutui-brand-6);
 }
 .nut-elevator-list-fixed {
+  display: flex;
+  align-items: center;
   width: 100%;
   position: absolute;
   top: 0;
@@ -53,14 +59,15 @@
   z-index: 1;
   padding: var(--nutui-elevator-list-item-padding, 0 20px);
   height: var(--nutui-elevator-list-item-code-height, 35px);
-  line-height: var(--nutui-elevator-list-item-code-line-height, 35px);
-  font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-elevator-list-fixed-color, var(--nutui-color-primary, #ff0f23));
-  font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
   background-color: var(--nutui-elevator-list-fixed-bg-color, #ffffff);
   box-sizing: border-box;
   box-shadow: var(--nutui-elevator-list-fixed-box-shadow, 0 0 10px #eee);
 }
+.nut-elevator-list-fixed-title {
+  font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-elevator-list-fixed-color, var(--nutui-brand-6));
+  font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
+}
 .nut-elevator-code-current {
   position: absolute;
   right: var(--nutui-elevator-list-item-code-current-right, 60px);
@@ -78,11 +85,11 @@
   position: absolute;
   right: var(--nutui-elevator-bars-right, 10px);
   top: var(--nutui-elevator-bars-top, 50%);
-  color: var(--nutui-color-text-help, #888b94);
+  color: var(--nutui-gray-5);
   font-size: var(--nutui-elevator-bars-font-size, var(--nutui-font-size-s, 12px));
   transform: var(--nutui-elevator-bars-transform, translateY(-50%));
   padding: var(--nutui-elevator-bars-padding, 15px 0);
-  background-color: var(--nutui-elevator-bars-background-color, var(--nutui-color-background, #f5f6fa));
+  background-color: var(--nutui-elevator-bars-background-color, var(--nutui-gray-3));
   border-radius: var(--nutui-elevator-bars-border-radius, 6px);
   text-align: center;
   z-index: var(--nutui-elevator-bars-z-index, 1);
@@ -94,7 +101,7 @@
 }
 .nut-elevator-bars-inner-item-active {
   font-weight: var(--nutui-font-weight-bold, 600);
-  color: var(--nutui-elevator-bars-active-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-elevator-bars-active-color, var(--nutui-brand-6));
 }
 
 [dir=rtl] .nut-elevator-list-fixed,

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

@@ -38,7 +38,7 @@ export interface EllipsisProps extends BasicComponent {
     */
     lineHeight: number | string
     /**
-    * 文本点击是触发
+    * 文本点击时触发
     * @default -
     */
     onClick: () => void

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-ellipsis {
   display: flex;
 }

package/dist/es/packages/empty/empty.js

@@ -73,7 +73,7 @@ export var Empty = function(props) {
     }, title) : title, typeof description === 'string' ? /*#__PURE__*/ React.createElement("div", {
         className: "".concat(classPrefix, "-description")
     }, description) : description, actions.length ? /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-actions")
+        className: "".concat(classPrefix, "-actions-").concat(size)
     }, actions.map(function(action, index) {
         var text = action.text, rest = _object_without_properties(action, [
             "text"

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

@@ -32,20 +32,24 @@
 
   &-title {
     margin-top: $empty-title-margin-top;
+    font-weight: $font-weight-bold;
     margin-bottom: $empty-title-margin-bottom;
     color: $color-title;
-    font-size: $font-size-base;
+    font-size: $font-size-l;
     line-height: $empty-title-line-height;
   }
 
   &-description {
-    margin-top: $empty-description-margin-top;
-    color: $color-text-help;
+    color: $color-text;
     font-size: $font-size-s;
     line-height: $empty-description-line-height;
   }
-
-  &-actions {
+  &-actions-base {
+    display: flex;
+    flex-direction: row;
+    margin-top: 24px;
+  }
+  &-actions-small {
     display: flex;
     flex-direction: row;
     margin-top: 16px;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-empty {
   box-sizing: border-box;
   width: 100%;
@@ -6,7 +10,7 @@
   flex-direction: column;
   justify-content: center;
   padding: var(--nutui-empty-padding, 32px 40px);
-  background-color: var(--nutui-empty-background-color, #fff);
+  background-color: var(--nutui-empty-background-color, var(--nutui-gray-1));
 }
 .nut-empty-base {
   width: var(--nutui-empty-image-size, 160px);
@@ -28,18 +32,23 @@
 }
 .nut-empty-title {
   margin-top: var(--nutui-empty-title-margin-top, 0px);
-  margin-bottom: var(--nutui-empty-title-margin-bottom, 8px);
-  color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-font-size-base, 14px);
-  line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-base, 14px));
+  font-weight: var(--nutui-font-weight-bold, 600);
+  margin-bottom: var(--nutui-empty-title-margin-bottom, 12px);
+  color: var(--nutui-gray-7);
+  font-size: var(--nutui-font-size-l, 16px);
+  line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 16px));
 }
 .nut-empty-description {
-  margin-top: var(--nutui-empty-description-margin-top, 0px);
-  color: var(--nutui-color-text-help, #888b94);
+  color: var(--nutui-gray-6);
   font-size: var(--nutui-font-size-s, 12px);
-  line-height: var(--nutui-empty-description-line-height, 1.2);
+  line-height: var(--nutui-empty-description-line-height, 1);
 }
-.nut-empty-actions {
+.nut-empty-actions-base {
+  display: flex;
+  flex-direction: row;
+  margin-top: 24px;
+}
+.nut-empty-actions-small {
   display: flex;
   flex-direction: row;
   margin-top: 16px;

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,16 +15,10 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, 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;
 }
@@ -58,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);
@@ -81,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;
@@ -146,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/style/style.css

@@ -1,10 +1,14 @@
+/* #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-color-title, #1a1a1a));
+  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;
@@ -13,7 +17,7 @@
 .nut-cell-group-description {
   display: inherit;
   padding: var(--nutui-cell-group-description-padding, 0 10px);
-  color: var(--nutui-cell-group-description-color, var(--nutui-color-text, #505259));
+  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;
@@ -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-color-background-overlay, #ffffff));
+  background-color: var(--nutui-cell-group-background-color, var(--nutui-gray-1));
   margin-bottom: var(--nutui-cell-group-wrap-margin, 10px);
 }
 
@@ -32,7 +36,7 @@
 .nut-cell-group-title {
   display: inherit;
   padding: var(--nutui-cell-group-title-padding, 0 10px);
-  color: var(--nutui-cell-group-title-color, var(--nutui-color-title, #1a1a1a));
+  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;
@@ -41,7 +45,7 @@
 .nut-cell-group-description {
   display: inherit;
   padding: var(--nutui-cell-group-description-padding, 0 10px);
-  color: var(--nutui-cell-group-description-color, var(--nutui-color-text, #505259));
+  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;
@@ -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-color-background-overlay, #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-color-background-overlay, #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-base, 14px));
-  color: var(--nutui-cell-title-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-cell-title-color, var(--nutui-gray-7));
   margin-bottom: 10px;
   box-sizing: border-box;
 }
@@ -85,7 +89,7 @@
 }
 .nut-cell-description {
   font-size: var(--nutui-cell-description-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-cell-description-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-cell-description-color, var(--nutui-gray-6));
 }
 .nut-cell-extra {
   display: flex;
@@ -97,7 +101,7 @@
   min-width: 0;
   word-break: break-all;
   font-size: var(--nutui-cell-extra-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-cell-extra-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-cell-extra-color, var(--nutui-gray-6));
 }
 .nut-cell:active::before {
   opacity: 0.1;
@@ -111,9 +115,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-color-title, #1a1a1a);
+  background-color: #000000;
   border: inherit;
-  border-color: var(--nutui-color-title, #1a1a1a);
+  border-color: #000000;
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;
@@ -129,7 +133,7 @@
   display: flex;
   height: 1px;
   width: 100%;
-  border-top: var(--nutui-cell-divider-border-bottom, 1px solid var(--nutui-color-border, 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);
@@ -138,9 +142,11 @@
 
 .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;
 }
@@ -156,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 {
@@ -174,7 +180,7 @@
 .nut-form-item-body-slots .nut-input-text {
   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-color-title, #1a1a1a);
+  color: var(--nutui-gray-7);
   width: 100%;
   outline: 0 none;
   border: 0;
@@ -194,7 +200,7 @@
 .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-xs, 11px));
-  color: var(--nutui-form-item-error-message-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-form-item-error-message-color, var(--nutui-brand-6));
 }
 
 [dir=rtl] .nut-form-item-label,

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,8 +1,14 @@
+/* #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;
 }
@@ -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 {
@@ -36,7 +42,7 @@
 .nut-form-item-body-slots .nut-input-text {
   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-color-title, #1a1a1a);
+  color: var(--nutui-gray-7);
   width: 100%;
   outline: 0 none;
   border: 0;
@@ -56,7 +62,7 @@
 .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-xs, 11px));
-  color: var(--nutui-form-item-error-message-color, var(--nutui-color-primary, #ff0f23));
+  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

@@ -5,12 +5,11 @@ import React from "react";
 import classNames from "classnames";
 import { GridItem } from "../griditem/griditem";
 import GridContext from "./context";
-import { pxCheck } from "../../utils/px-check";
 var defaultProps = {
     columns: 4,
-    gap: 0,
+    gap: 9,
     center: true,
-    square: false,
+    square: true,
     reverse: false,
     direction: 'vertical'
 };
@@ -37,9 +36,6 @@ export var Grid = function(props) {
         if (style) {
             styleSelf = style;
         }
-        if (gap) {
-            styleSelf.paddingLeft = pxCheck(gap);
-        }
         return styleSelf;
     };
     return /*#__PURE__*/ React.createElement("div", _object_spread({

package/dist/es/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/es/packages/grid/style/style.css

@@ -1,12 +1,17 @@
+/* #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-color-title, #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-color-title, #1a1a1a));
+  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-color-border, 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-color-mask, rgba(0, 0, 0, 0.7));
+  background-color: var(--nutui-black-10);
   border: inherit;
-  border-color: var(--nutui-color-mask, 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-color-border, 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/es/packages/griditem/griditem.js

@@ -9,9 +9,9 @@ import { pxCheck } from "../../utils/px-check";
 var defaultProps = {
     text: '',
     columns: 4,
-    gap: 0,
+    gap: 9,
     center: true,
-    square: false,
+    square: true,
     reverse: false,
     direction: 'vertical'
 };
@@ -34,16 +34,22 @@ export var GridItem = function(props) {
     var classes = classNames(classPrefix, className);
     var context = useContext(GridContext);
     var rootStyle = function() {
+        var width = "calc((100% - ".concat(Number(gap) * (Number(columns) - 1), "px) / ").concat(Number(columns), ")");
         var styles = _object_spread({
-            flexBasis: "".concat(100 / +columns, "%")
+            flexBasis: width
         }, style);
         if (square) {
-            styles.paddingTop = "".concat(100 / +columns, "%");
-        } else if (gap) {
-            styles.paddingRight = pxCheck(gap);
+            styles.paddingTop = width;
+        }
+        if (gap) {
+            if ((index + 1) % Number(columns)) {
+                styles.marginRight = pxCheck(gap);
+            }
             if (index >= Number(columns)) {
                 styles.marginTop = pxCheck(gap);
             }
+        } else {
+            styles.borderRadius = 0;
         }
         return styles;
     };

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

@@ -4,6 +4,7 @@
   position: relative;
   box-sizing: border-box;
   color: $grid-item-text-color;
+  overflow: hidden;
 
   &-text {
     color: $grid-item-text-color;
@@ -35,13 +36,14 @@
     border: 0 solid $grid-border-color;
 
     &-border {
-      border-right-width: 1px;
-      border-bottom-width: 1px;
+      border-right-width: $grid-border-width;
+      border-bottom-width: $grid-border-width;
     }
 
     &-surround {
-      border-top-width: 1px;
-      border-left-width: 1px;
+      border-top-width: $grid-border-width;
+      border-left-width: $grid-border-width;
+      border-radius: $grid-item-border-radius;
     }
 
     &-center {