From 6c134a7f4fcff8414ef568fdd734a21fdda940c0 Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Sat, 7 Jun 2025 14:12:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(image):=20=E4=BF=AE=E5=A4=8D=E5=86=85?= =?UTF-8?q?=E8=81=94=E6=A0=B7=E5=BC=8F=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/image/image.taro.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/packages/image/image.taro.tsx b/src/packages/image/image.taro.tsx index d609cbfd51..c89f33b013 100644 --- a/src/packages/image/image.taro.tsx +++ b/src/packages/image/image.taro.tsx @@ -1,4 +1,9 @@ -import React, { FunctionComponent, useCallback, useState } from 'react' +import React, { + CSSProperties, + FunctionComponent, + useCallback, + useState, +} from 'react' import Taro from '@tarojs/taro' import { Image as TImage, @@ -54,6 +59,7 @@ export const Image: FunctionComponent> = (props) => { } const containerStyle = { + ...(style as CSSProperties), ...(height ? { height: pxCheck(height) } : {}), ...(width ? { width: pxCheck(width) } : {}), ...(radius !== undefined && radius !== null From 83031562824aabd90f88cfd6a7d2ba0aacb9059d Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Sat, 7 Jun 2025 15:12:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(tabs):=20css=E5=8F=98=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/tabpane/tabpane.scss | 2 +- src/packages/tabs/doc.en-US.md | 2 +- src/packages/tabs/doc.md | 2 +- src/packages/tabs/doc.taro.md | 2 +- src/packages/tabs/doc.zh-TW.md | 2 +- src/styles/variables-jmapp.scss | 4 ++-- src/styles/variables-jrkf.scss | 4 ++-- src/styles/variables.scss | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/packages/tabpane/tabpane.scss b/src/packages/tabpane/tabpane.scss index eacc7bafaf..ba3befd7a6 100644 --- a/src/packages/tabpane/tabpane.scss +++ b/src/packages/tabpane/tabpane.scss @@ -2,7 +2,7 @@ width: 100%; flex-shrink: 0; display: block; - background-color: $tabs-tabpane-backgroundColor; + background-color: $tabs-tabpane-background-color; color: $color-title; padding: $tabs-tabpane-padding; box-sizing: border-box; diff --git a/src/packages/tabs/doc.en-US.md b/src/packages/tabs/doc.en-US.md index a5c0a1864f..adb3fe22ae 100644 --- a/src/packages/tabs/doc.en-US.md +++ b/src/packages/tabs/doc.en-US.md @@ -259,6 +259,6 @@ The component provides the following CSS variables, which can be used to customi | \--nutui-tabs-vertical-tab-line-width | Vertical title line width | `3px` | | \--nutui-tabs-vertical-tab-line-height | The height of the vertical title line | `12px` | | \--nutui-tabs-tabpane-padding | Padding of the Tabpane content | `24px 20px` | -| \--nutui-tabs-tabpane-backgroundColor | BackgroundColor of the Tabpane content | `#fff` | +| \--nutui-tabs-tabpane-background-color | BackgroundColor of the Tabpane content | `#fff` | diff --git a/src/packages/tabs/doc.md b/src/packages/tabs/doc.md index 086d689bf2..53448f5b56 100644 --- a/src/packages/tabs/doc.md +++ b/src/packages/tabs/doc.md @@ -259,6 +259,6 @@ import { Tabs } from '@nutui/nutui-react' | \--nutui-tabs-vertical-tab-line-width | 垂直方向标题线条的宽度 | `3px` | | \--nutui-tabs-vertical-tab-line-height | 垂直方向标题线条的高度 | `12px` | | \--nutui-tabs-tabpane-padding | Tabpane 的内边距 | `24px 20px` | -| \--nutui-tabs-tabpane-backgroundColor | Tabpane 的背景色 | `#fff` | +| \--nutui-tabs-tabpane-background-color | Tabpane 的背景色 | `#fff` | diff --git a/src/packages/tabs/doc.taro.md b/src/packages/tabs/doc.taro.md index 4b29a14e1d..789ca19516 100644 --- a/src/packages/tabs/doc.taro.md +++ b/src/packages/tabs/doc.taro.md @@ -257,6 +257,6 @@ import { Tabs } from '@nutui/nutui-react-taro' | \--nutui-tabs-vertical-tab-line-width | 垂直方向标题线条的宽度 | `3px` | | \--nutui-tabs-vertical-tab-line-height | 垂直方向标题线条的高度 | `12px` | | \--nutui-tabs-tabpane-padding | Tabpane 的内边距 | `24px 20px` | -| \--nutui-tabs-tabpane-backgroundColor | Tabpane 的背景色 | `#fff` | +| \--nutui-tabs-tabpane-background-color | Tabpane 的背景色 | `#fff` | diff --git a/src/packages/tabs/doc.zh-TW.md b/src/packages/tabs/doc.zh-TW.md index 62a5f20638..a9a0d4cd6b 100644 --- a/src/packages/tabs/doc.zh-TW.md +++ b/src/packages/tabs/doc.zh-TW.md @@ -257,6 +257,6 @@ import { Tabs } from '@nutui/nutui-react' | \--nutui-tabs-vertical-tab-line-width | 垂直方向標題線條的寬度 | `3px` | | \--nutui-tabs-vertical-tab-line-height | 垂直方向標題線條的高度 | `12px` | | \--nutui-tabs-tabpane-padding | Tabpane 的內邊距 | `24px 20px` | -| \--nutui-tabs-tabpane-backgroundColor | Tabpane 的背景色 | `#fff` | +| \--nutui-tabs-tabpane-background-color | Tabpane 的背景色 | `#fff` | diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss index 55b068d3cc..4ed86eb9e4 100644 --- a/src/styles/variables-jmapp.scss +++ b/src/styles/variables-jmapp.scss @@ -1981,8 +1981,8 @@ $tabs-titles-item-smile-bottom: var( -10px ) !default; $tabs-tabpane-padding: var(--nutui-tabs-tabpane-padding, 24px 20px) !default; -$tabs-tabpane-backgroundColor: var( - --nutui-tabs-tabpane-backgroundColor, +$tabs-tabpane-background-color: var( + --nutui-tabs-tabpane-background-color, #fff ) !default; // indicator（✅） diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss index d51ca41429..6cf459139f 100644 --- a/src/styles/variables-jrkf.scss +++ b/src/styles/variables-jrkf.scss @@ -2084,8 +2084,8 @@ $tabs-titles-item-smile-bottom: var( -10px ) !default; $tabs-tabpane-padding: var(--nutui-tabs-tabpane-padding, 24px 20px) !default; -$tabs-tabpane-backgroundColor: var( - --nutui-tabs-tabpane-backgroundColor, +$tabs-tabpane-background-color: var( + --nutui-tabs-tabpane-background-color, #fff ) !default; // indicator（✅） diff --git a/src/styles/variables.scss b/src/styles/variables.scss index aa6b6f0c1c..86ef86dfb5 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1876,8 +1876,8 @@ $tabs-titles-item-smile-bottom: var( -10% ) !default; $tabs-tabpane-padding: var(--nutui-tabs-tabpane-padding, 24px 20px) !default; -$tabs-tabpane-backgroundColor: var( - --nutui-tabs-tabpane-backgroundColor, +$tabs-tabpane-background-color: var( + --nutui-tabs-tabpane-background-color, #fff ) !default; // indicator（✅） From 69490d5cfcd35992a7ef6deb6ecbbe49c618a412 Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Sat, 7 Jun 2025 15:16:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(tabs):=20css=E5=8F=98=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/image/image.taro.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/packages/image/image.taro.tsx b/src/packages/image/image.taro.tsx index c89f33b013..d609cbfd51 100644 --- a/src/packages/image/image.taro.tsx +++ b/src/packages/image/image.taro.tsx @@ -1,9 +1,4 @@ -import React, { - CSSProperties, - FunctionComponent, - useCallback, - useState, -} from 'react' +import React, { FunctionComponent, useCallback, useState } from 'react' import Taro from '@tarojs/taro' import { Image as TImage, @@ -59,7 +54,6 @@ export const Image: FunctionComponent> = (props) => { } const containerStyle = { - ...(style as CSSProperties), ...(height ? { height: pxCheck(height) } : {}), ...(width ? { width: pxCheck(width) } : {}), ...(radius !== undefined && radius !== null