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

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,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/es/packages/griditem/griditem.js

@@ -5,19 +5,17 @@ import React, { useContext } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import pxTransform from "../../utils/px-transform";
-import { useConfig } from "../configprovider/index";
 import GridContext from "../grid/context";
 var defaultProps = {
     text: '',
     columns: 4,
-    gap: 0,
+    gap: 9,
     center: true,
-    square: false,
+    square: true,
     reverse: false,
     direction: 'vertical'
 };
 export var GridItem = function(props) {
-    var locale = useConfig().locale;
     var _ref = _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 = _object_without_properties(_ref, [
         "children",
         "style",
@@ -36,17 +34,23 @@ export var GridItem = function(props) {
     var classes = classNames(classPrefix, className);
     var context = useContext(GridContext);
     var rootStyle = function() {
+        var width = "calc(".concat(100 / Number(columns), "% - ").concat(pxTransform(Number(gap) * (Number(columns) - 1) / Number(columns)), ")");
         var styles = _object_spread({
-            width: "".concat(100 / +columns, "%"),
+            width: width,
             overflow: 'hidden'
         }, style);
         if (square) {
-            styles.paddingTop = "".concat(100 / +columns, "%");
-        } else if (gap) {
-            styles.paddingRight = pxTransform(typeof gap === 'number' ? gap : parseFloat(gap));
+            styles.paddingTop = width;
+        }
+        if (gap) {
+            if ((index + 1) % Number(columns)) {
+                styles.marginRight = pxTransform(typeof gap === 'number' ? gap : parseFloat(gap));
+            }
             if (index >= Number(columns)) {
                 styles.marginTop = pxTransform(typeof gap === 'number' ? gap : parseFloat(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 {

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

package/dist/es/packages/hoverbutton/hoverbutton.js

@@ -9,6 +9,7 @@ import { useRtl } from "../configprovider/index";
 import HoverButtonItem from "../hoverbuttonitem/index";
 import SafeArea from "../safearea/index";
 import pxTransform from "../../utils/px-transform";
+import { UI_BOTTOM_DISTANCE } from "./utils";
 var defaultProps = _object_spread({}, ComponentDefaults);
 var classPrefix = 'nut-hoverbutton';
 export var HoverButton = function(props) {
@@ -16,7 +17,7 @@ export var HoverButton = function(props) {
     var rtl = useRtl();
     var baseStyle = _object_spread({}, style);
     if (tabbarHeight) {
-        baseStyle.bottom = pxTransform(tabbarHeight + 16);
+        baseStyle.bottom = pxTransform(tabbarHeight + UI_BOTTOM_DISTANCE);
     }
     if (typeof zIndex !== 'undefined') {
         baseStyle.zIndex = zIndex;

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

@@ -1,4 +1,8 @@
 .nut-hoverbutton {
+  display: flex;
+  flex-direction: column;
+  gap: $hoverbutton-spacing;
+
   &-container {
     position: fixed;
     right: $hoverbutton-position-right;
@@ -9,10 +13,6 @@
   &-container-rn {
     position: absolute;
   }
-
-  display: flex;
-  flex-direction: column;
-  gap: $hoverbutton-spacing;
 }
 
 [dir='rtl'] .nut-hoverbutton-container,

package/dist/es/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/es/packages/hoverbutton/utils.d.ts

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

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

@@ -0,0 +1 @@
+export var UI_BOTTOM_DISTANCE = 60;

package/dist/es/packages/hoverbuttonitem/hoverbuttonitem.js

@@ -2,11 +2,12 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 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 React, { useState, useMemo } from "react";
+import React, { useMemo, useState } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
 import { harmony, harmonyAndRn } from "../../utils/platform-taro";
+import { getIcon } from "./utils";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     icon: null,
     onClick: function(value) {}
@@ -15,7 +16,7 @@ var classPrefix = 'nut-hoverbutton-item';
 var isHarmony = harmony();
 var isNative = harmonyAndRn();
 export var HoverButtonItem = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var _$_object_spread = _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 = _sliced_to_array(useState(false), 2), isTouchStart = _useState[0], setTouchStart = _useState[1];
     // @TODO 待添加暗黑模式及样式变量功能
     var nativeProps = useMemo(function() {
@@ -34,22 +35,29 @@ export var HoverButtonItem = function(props) {
     var handleActiveEnd = function(event) {
         isNative && setTouchStart(false);
     };
+    var renderBody = function() {
+        if (icon && !children) return /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-icon")
+        }, getIcon(icon));
+        if (icon && children) {
+            return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
+                className: classNames(_define_property({}, "".concat(classPrefix, "-text-icon"), true))
+            }), getIcon(icon), /*#__PURE__*/ React.createElement(View, {
+                className: classNames(_define_property({}, "".concat(classPrefix, "-text"), true))
+            }, children));
+        }
+    };
     var _obj;
     return /*#__PURE__*/ React.createElement(View, {
         className: classNames([
             "".concat(classPrefix, "-container"),
             className
-        ], (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), _define_property(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), _obj)),
+        ], (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), _define_property(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), _define_property(_obj, "".concat(classPrefix, "-container-icontext"), icon && children), _obj)),
         style: style,
         onTouchStart: handleActiveStart,
         onTouchEnd: handleActiveEnd,
         onTouchCancel: handleActiveEnd,
         onClick: handleClick
-    }, /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-icon")
-    }, /*#__PURE__*/ React.cloneElement(icon, _object_spread({
-        className: 'nut-icon',
-        size: 20
-    }, nativeProps))));
+    }, renderBody());
 };
 HoverButtonItem.displayName = 'NutHoverButtonItem';

package/dist/es/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/es/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/es/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/es/packages/hoverbuttonitem/utils.js

@@ -0,0 +1,7 @@
+import React from "react";
+export var getIcon = function(icon) {
+    return React.isValidElement(icon) ? React.cloneElement(icon, {
+        // @ts-ignore
+        className: 'nut-icon'
+    }) : icon;
+};

package/dist/es/packages/image/image.js

@@ -7,7 +7,7 @@ import Taro from "@tarojs/taro";
 import { Image as TImage, View } from "@tarojs/components";
 import { Image as ImageIcon, ImageError } from "@nutui/icons-react-taro";
 import classNames from "classnames";
-import { harmonyAndRn } from "../../utils/platform-taro";
+import pxTransform from "../../utils/px-transform";
 var defaultProps = {
     src: '',
     error: true,
@@ -30,7 +30,7 @@ export var Image = function(props) {
     var _useState = _sliced_to_array(useState(true), 2), innerLoading = _useState[0], setInnerLoading = _useState[1];
     var _useState1 = _sliced_to_array(useState(false), 2), isError = _useState1[0], setIsError = _useState1[1];
     var pxCheck = function(value) {
-        return Number.isNaN(Number(value)) ? String(value) : "".concat(value, "px");
+        return Number.isNaN(Number(value)) ? String(value) : pxTransform(+value);
     };
     // 图片加载
     var handleLoad = function(e) {
@@ -38,7 +38,6 @@ export var Image = function(props) {
         setInnerLoading(false);
         onLoad && onLoad(e);
     };
-    // 图片加载失败
     var handleError = function(e) {
         if (src) {
             setIsError(true);
@@ -48,9 +47,9 @@ export var Image = function(props) {
     };
     var containerStyle = {
         // eslint-disable-next-line no-nested-ternary
-        height: height ? Taro.getEnv() === 'RN' ? height : pxCheck(height) : Taro.getEnv() === 'WEB' ? '' : '100%',
+        height: height ? pxCheck(height) : Taro.getEnv() === 'WEB' ? '' : '100%',
         // eslint-disable-next-line no-nested-ternary
-        width: width ? Taro.getEnv() === 'RN' ? width : pxCheck(width) : Taro.getEnv() === 'WEB' ? '' : '100%',
+        width: width ? pxCheck(width) : Taro.getEnv() === 'WEB' ? '' : '100%',
         overflow: radius !== undefined && radius !== null ? 'hidden' : '',
         borderRadius: // eslint-disable-next-line no-nested-ternary
         radius !== undefined && radius != null ? Taro.getEnv() === 'RN' ? radius : pxCheck(radius) : ''
@@ -107,6 +106,6 @@ export var Image = function(props) {
         onError: function(e) {
             return handleError(e);
         }
-    })), !harmonyAndRn() && /*#__PURE__*/ React.createElement(React.Fragment, null, renderLoading(), renderErrorImg()));
+    })), /*#__PURE__*/ React.createElement(React.Fragment, null, renderLoading(), renderErrorImg()));
 };
 Image.displayName = 'NutImage';

package/dist/es/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-gray-3, #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-gray-3, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }