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

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

@@ -21,9 +21,9 @@ 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'
 };
@@ -46,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;
     };

package/dist/cjs/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 {

package/dist/cjs/packages/griditem/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;

package/dist/cjs/packages/hoverbutton/hoverbutton.js

@@ -20,6 +20,7 @@ var _index = require("../configprovider/index");
 var _index1 = /*#__PURE__*/ _interop_require_default._(require("../hoverbuttonitem/index"));
 var _index2 = /*#__PURE__*/ _interop_require_default._(require("../safearea/index"));
 var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
+var _utils = require("./utils");
 var defaultProps = (0, _object_spread._)({}, _typings.ComponentDefaults);
 var classPrefix = 'nut-hoverbutton';
 var HoverButton = function HoverButton(props) {
@@ -27,7 +28,7 @@ var HoverButton = function HoverButton(props) {
     var rtl = (0, _index.useRtl)();
     var baseStyle = (0, _object_spread._)({}, style);
     if (tabbarHeight) {
-        baseStyle.bottom = (0, _pxtransform.default)(tabbarHeight + 16);
+        baseStyle.bottom = (0, _pxtransform.default)(tabbarHeight + _utils.UI_BOTTOM_DISTANCE);
     }
     if (typeof zIndex !== 'undefined') {
         baseStyle.zIndex = zIndex;

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

@@ -1,45 +1,70 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
-  width: 40px;
-  height: 40px;
-  border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
+  border-radius: var(--nutui-hoverbutton-item-size, 40px);
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }
 
 .nut-hoverbutton {
   display: flex;
   flex-direction: column;
-  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-container {
   position: fixed;
-  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
-  bottom: var(--nutui-hoverbutton-position-bottom, 48px);
+  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
+  bottom: var(--nutui-hoverbutton-position-bottom, 60px);
   z-index: 10;
 }
 .nut-hoverbutton-container-rn {
@@ -49,5 +74,5 @@
 [dir=rtl] .nut-hoverbutton-container,
 .nut-hoverbutton-container-rtl {
   right: auto;
-  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
+  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
 }

package/dist/cjs/packages/hoverbutton/utils.d.ts

@@ -0,0 +1 @@
+export declare const UI_BOTTOM_DISTANCE = 60;

package/dist/cjs/packages/hoverbutton/utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "UI_BOTTOM_DISTANCE", {
+    enumerable: true,
+    get: function() {
+        return UI_BOTTOM_DISTANCE;
+    }
+});
+var UI_BOTTOM_DISTANCE = 60;

package/dist/cjs/packages/hoverbuttonitem/hoverbuttonitem.js

@@ -19,6 +19,7 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _components = require("@tarojs/components");
 var _typings = require("../../utils/typings");
 var _platformtaro = require("../../utils/platform-taro");
+var _utils = require("./utils");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     icon: null,
     onClick: function onClick(value) {}
@@ -27,7 +28,7 @@ var classPrefix = 'nut-hoverbutton-item';
 var isHarmony = (0, _platformtaro.harmony)();
 var isNative = (0, _platformtaro.harmonyAndRn)();
 var HoverButtonItem = function HoverButtonItem(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick, children = _$_object_spread.children;
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isTouchStart = _useState[0], setTouchStart = _useState[1];
     // @TODO 待添加暗黑模式及样式变量功能
     var nativeProps = (0, _react.useMemo)(function() {
@@ -46,22 +47,29 @@ var HoverButtonItem = function HoverButtonItem(props) {
     var handleActiveEnd = function handleActiveEnd(event) {
         isNative && setTouchStart(false);
     };
+    var renderBody = function renderBody() {
+        if (icon && !children) return /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-icon")
+        }, (0, _utils.getIcon)(icon));
+        if (icon && children) {
+            return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
+                className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-text-icon"), true))
+            }), (0, _utils.getIcon)(icon), /*#__PURE__*/ _react.default.createElement(_components.View, {
+                className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-text"), true))
+            }, children));
+        }
+    };
     var _obj;
     return /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)([
             "".concat(classPrefix, "-container"),
             className
-        ], (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), (0, _define_property._)(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), _obj)),
+        ], (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), (0, _define_property._)(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), (0, _define_property._)(_obj, "".concat(classPrefix, "-container-icontext"), icon && children), _obj)),
         style: style,
         onTouchStart: handleActiveStart,
         onTouchEnd: handleActiveEnd,
         onTouchCancel: handleActiveEnd,
         onClick: handleClick
-    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "".concat(classPrefix, "-icon")
-    }, /*#__PURE__*/ _react.default.cloneElement(icon, (0, _object_spread._)({
-        className: 'nut-icon',
-        size: 20
-    }, nativeProps))));
+    }, renderBody());
 };
 HoverButtonItem.displayName = 'NutHoverButtonItem';

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

@@ -1,8 +1,8 @@
 .nut-hoverbutton-item {
   &-container {
-    width: 40px;
-    height: 40px;
-    border-radius: 20px;
+    width: $hoverbutton-item-size;
+    height: $hoverbutton-item-size;
+    border-radius: $hoverbutton-item-size;
     border: 1px solid $hoverbutton-item-border-color;
     background-color: $hoverbutton-item-background;
 
@@ -18,6 +18,19 @@
         margin-bottom: 0;
       }
     }
+
+    &-icontext {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .nut-icon {
+        display: block;
+        width: 14px;
+        height: 14px;
+        font-size: 14px;
+      }
+    }
   }
 
   &-icon {
@@ -31,6 +44,7 @@
       display: block;
       width: 20px;
       height: 20px;
+      font-size: 20px;
     }
   }
 
@@ -38,4 +52,15 @@
     color: $hoverbutton-item-icon-color-active;
     fill: $hoverbutton-item-icon-color-active;
   }
+
+  &-text-icon {
+    width: 14px;
+    height: 5px;
+  }
+
+  &-text {
+    font-size: 10px;
+    margin-top: 5px;
+    line-height: 9px;
+  }
 }

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

@@ -1,32 +1,57 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
-  width: 40px;
-  height: 40px;
-  border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
+  border-radius: var(--nutui-hoverbutton-item-size, 40px);
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }

package/dist/cjs/packages/hoverbuttonitem/utils.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const getIcon: (icon: React.ReactNode) => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;

package/dist/cjs/packages/hoverbuttonitem/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "getIcon", {
+    enumerable: true,
+    get: function() {
+        return getIcon;
+    }
+});
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+var getIcon = function getIcon(icon) {
+    return /*#__PURE__*/ _react.default.isValidElement(icon) ? /*#__PURE__*/ _react.default.cloneElement(icon, {
+        // @ts-ignore
+        className: 'nut-icon'
+    }) : icon;
+};

package/dist/cjs/packages/image/image.js

@@ -19,7 +19,7 @@ var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
 var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
-var _platformtaro = require("../../utils/platform-taro");
+var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
 var defaultProps = {
     src: '',
     error: true,
@@ -42,7 +42,7 @@ var Image = function Image(props) {
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(true), 2), innerLoading = _useState[0], setInnerLoading = _useState[1];
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isError = _useState1[0], setIsError = _useState1[1];
     var pxCheck = function pxCheck(value) {
-        return Number.isNaN(Number(value)) ? String(value) : "".concat(value, "px");
+        return Number.isNaN(Number(value)) ? String(value) : (0, _pxtransform.default)(+value);
     };
     // 图片加载
     var handleLoad = function handleLoad(e) {
@@ -59,9 +59,9 @@ var Image = function Image(props) {
     };
     var containerStyle = {
         // eslint-disable-next-line no-nested-ternary
-        height: height ? _taro.default.getEnv() === 'RN' ? height : pxCheck(height) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
+        height: height ? pxCheck(height) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
         // eslint-disable-next-line no-nested-ternary
-        width: width ? _taro.default.getEnv() === 'RN' ? width : pxCheck(width) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
+        width: width ? pxCheck(width) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
         overflow: radius !== undefined && radius !== null ? 'hidden' : '',
         borderRadius: radius !== undefined && radius != null ? _taro.default.getEnv() === 'RN' ? radius : pxCheck(radius) : ''
     };
@@ -117,6 +117,6 @@ var Image = function Image(props) {
         onError: function onError(e) {
             return handleError(e);
         }
-    })), !(0, _platformtaro.harmonyAndRn)() && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderLoading(), renderErrorImg()));
+    })), /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderLoading(), renderErrorImg()));
 };
 Image.displayName = 'NutImage';

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-image {
   display: block;
   position: relative;
@@ -21,7 +25,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -34,7 +38,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }
 

package/dist/cjs/packages/imagepreview/imagepreview.js

@@ -19,8 +19,9 @@ var _components = require("@tarojs/components");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
-var _index1 = /*#__PURE__*/ _interop_require_default._(require("../swiper/index"));
-var _index2 = /*#__PURE__*/ _interop_require_default._(require("../swiperitem/index"));
+var _index1 = /*#__PURE__*/ _interop_require_default._(require("../image/index"));
+var _index2 = /*#__PURE__*/ _interop_require_default._(require("../swiper/index"));
+var _index3 = /*#__PURE__*/ _interop_require_default._(require("../swiperitem/index"));
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../utils/use-props-value");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -203,7 +204,7 @@ var ImagePreview = function ImagePreview(props) {
         style: style,
         ref: ref,
         onTouchStart: onTouchStart
-    }, /*#__PURE__*/ _react.default.createElement(_index1.default, {
+    }, /*#__PURE__*/ _react.default.createElement(_index2.default, {
         autoPlay: autoPlay,
         className: "".concat(classPrefix, "-swiper"),
         loop: true,
@@ -237,7 +238,7 @@ var ImagePreview = function ImagePreview(props) {
     }).map(function(item, index) {
         if (item.type === 'video') {
             var _item_data = item.data, source = _item_data.source, options = _item_data.options;
-            return /*#__PURE__*/ _react.default.createElement(_index2.default, {
+            return /*#__PURE__*/ _react.default.createElement(_index3.default, {
                 key: index,
                 className: "nut-imagepreview-swiper-item"
             }, /*#__PURE__*/ _react.default.createElement(_components.Video, {
@@ -251,10 +252,10 @@ var ImagePreview = function ImagePreview(props) {
         }
         if (item.type === 'image') {
             var src = item.data.src;
-            return /*#__PURE__*/ _react.default.createElement(_index2.default, {
+            return /*#__PURE__*/ _react.default.createElement(_index3.default, {
                 key: index,
                 className: "nut-imagepreview-swiper-item"
-            }, "(", /*#__PURE__*/ _react.default.createElement(_components.Image, (0, _object_spread._)({
+            }, /*#__PURE__*/ _react.default.createElement(_index1.default, (0, _object_spread._)({
                 src: src,
                 mode: "widthFix",
                 onClick: closeOnImg,
@@ -263,7 +264,7 @@ var ImagePreview = function ImagePreview(props) {
                 }
             }, _taro.default.getEnv() !== 'WEB' && {
                 showMenuByLongpress: showMenuByLongpress
-            })), ")");
+            })));
         }
         return null;
     }))), pagination ? /*#__PURE__*/ _react.default.createElement(_components.View, {

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

@@ -34,6 +34,10 @@
     background: transparent;
     color: $white;
 
+    .nut-icon {
+      color: $white;
+    }
+
     &.top-right {
       top: 50px;
       right: 20px;
@@ -68,6 +72,13 @@
       justify-content: center;
       height: 100%;
 
+      .nut-image,
+      .nut-video {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
       .nut-image-preview-box {
         width: 100%;
       }