fix: 修复image宽高处理函数,调整swipe版本号

xiaoyatong · Jun 27, 2024 · e7726a0 · e7726a0
1 parent 07b4858
commit e7726a0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/packages/nutui-taro-demo-rn/scripts/taro/adapted.js b/packages/nutui-taro-demo-rn/scripts/taro/adapted.js
@@ -33,5 +33,4 @@ exports = module.exports = [
   'configprovider',
   'input',
   'swipe',
-  'icon',
 ]
diff --git a/src/config.json b/src/config.json
@@ -861,7 +861,7 @@
           "author": "swag~jun"
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "Swipe",
           "type": "component",
           "cName": "滑动手势",

diff --git a/src/packages/image/image.taro.tsx b/src/packages/image/image.taro.tsx
@@ -14,7 +14,6 @@ import {
 import { Image as ImageIcon, ImageError } from '@nutui/icons-react-taro'
 import classNames from 'classnames'
 import { BaseEventOrig } from '@tarojs/components/types/common'
-import { pxCheck } from '@/utils/px-check'
 import { harmonyAndRn } from '@/utils/platform-taro'
 
 export interface ImageProps extends Omit<TImageProps, 'style'> {
@@ -50,6 +49,10 @@ export const Image: FunctionComponent<Partial<ImageProps>> = (props) => {
   const [innerLoading, setInnerLoading] = useState(true)
   const [isError, setIsError] = useState(false)
 
+  const pxCheck = (value: string | number): string => {
+    return Number.isNaN(Number(value)) ? String(value) : `${value}px`
+  }
+
   // 图片加载
   const handleLoad = (e: BaseEventOrig<TImageProps.onLoadEventDetail>) => {
     setIsError(false)
@@ -85,7 +88,11 @@ export const Image: FunctionComponent<Partial<ImageProps>> = (props) => {
     overflow: radius !== undefined && radius !== null ? 'hidden' : '',
     borderRadius:
       // eslint-disable-next-line no-nested-ternary
-      radius != null ? (Taro.getEnv() === 'RN' ? radius : pxCheck(radius)) : '',
+      radius !== undefined && radius != null
+        ? Taro.getEnv() === 'RN'
+          ? radius
+          : pxCheck(radius)
+        : '',
   }
 
   const imgStyle: any = {
@@ -127,7 +134,7 @@ export const Image: FunctionComponent<Partial<ImageProps>> = (props) => {
     <View className={classNames(classPrefix, className)} style={containerStyle}>
       <TImage
         {...rest}
-        className={`${classPrefix}-default ${className}-image`}
+        className={`${classPrefix}-default ${className ? `${className}-image` : ''}`}
         style={imgStyle}
         src={src}
         onLoad={(e) => handleLoad(e)}

diff --git a/src/packages/image/image.tsx b/src/packages/image/image.tsx
@@ -9,7 +9,6 @@ import React, {
 import { Image as ImageIcon, ImageError } from '@nutui/icons-react'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { pxCheck } from '@/utils/px-check'
 
 export interface ImageProps extends BasicComponent {
   src: string
@@ -82,6 +81,9 @@ export const Image: FunctionComponent<
   const [isError, setIsError] = useState(false)
   const [complete, setComplete] = useState(false)
   const imgRef = useRef<HTMLImageElement>(null)
+  const pxCheck = (value: string | number): string => {
+    return Number.isNaN(Number(value)) ? String(value) : `${value}px`
+  }
 
   useEffect(() => {
     if (imgRef.current && imgRef.current.complete && !lazy) {