From ade35722f4e8784adc69331bb7d7e68486413ec7 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 24 Apr 2026 13:46:49 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix(Price):=20=E7=BB=84=E4=BB=B6=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=8E=9F=E6=A0=B7=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/packages/price/price.taro.tsx | 17 ++++++++++++++--- src/utils/should-render-price-raw.ts | 26 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 src/utils/should-render-price-raw.ts diff --git a/package.json b/package.json index 906280769c..7adf230c69 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22", + "version": "3.0.19-cpp.22-1", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/src/packages/price/price.taro.tsx b/src/packages/price/price.taro.tsx index f491494e08..2c9b3150e0 100644 --- a/src/packages/price/price.taro.tsx +++ b/src/packages/price/price.taro.tsx @@ -5,6 +5,7 @@ import { ComponentDefaults } from '@/utils/typings' import { useRtl } from '@/packages/configprovider/index.taro' import { TaroPriceProps, PriceColorEnum } from '@/types' import { harmony } from '@/utils/taro/platform' +import { shouldRenderPriceAsRaw } from '@/utils/should-render-price-raw' const defaultProps = { ...ComponentDefaults, @@ -38,9 +39,17 @@ export const Price: FunctionComponent> = (props) => { const rtl = useRtl() + const isRenderPriceRaw = useMemo( + () => + typeof originalPrice === 'string' && + shouldRenderPriceAsRaw(originalPrice), + [originalPrice] + ) + const price = useMemo(() => { + if (isRenderPriceRaw) return '' return originalPrice.toString().replace(/[^\d.]/g, '') - }, [originalPrice]) + }, [originalPrice, isRenderPriceRaw]) const isCustomPriceColor = useMemo(() => { const specificPriceColor = Object.values(PriceColorEnum) @@ -164,6 +173,8 @@ export const Price: FunctionComponent> = (props) => { ) } + const renderRawContent = () => <>{originalPrice} + return ( <> {harmony() || process.env.TARO_ENV === 'dynamic' ? ( @@ -171,14 +182,14 @@ export const Price: FunctionComponent> = (props) => { className={`${classPrefix} ${classPrefix}-${color} ${className}`} style={style} > - {renderInner()} + {isRenderPriceRaw ? renderRawContent() : renderInner()} ) : ( - {renderInner()} + {isRenderPriceRaw ? renderRawContent() : renderInner()} )} diff --git a/src/utils/should-render-price-raw.ts b/src/utils/should-render-price-raw.ts new file mode 100644 index 0000000000..7a8d43ea60 --- /dev/null +++ b/src/utils/should-render-price-raw.ts @@ -0,0 +1,26 @@ +const CJK = /[\u4E00-\u9FFF]/ +const RE_NUM = /\d+(?:\.\d+)?/g + +function hasNoExtractablePrice(s: string) { + const t = s.trim() + if (!t) return true + if (!/\d/.test(t)) return true + if (t.replace(/[^\d.]/g, '') === '') return true + return false +} + +export function shouldRenderPriceAsRaw(s: string) { + if (hasNoExtractablePrice(s)) { + return true + } + const t = s.trim() + if (!CJK.test(t)) return false + const matches = Array.from(t.matchAll(RE_NUM)) + if (matches.length < 2) return false + const a = matches[0] + const b = matches[1] + const i0 = a.index! + const i1 = b.index! + const between = t.slice(i0 + a[0].length, i1) + return CJK.test(between) +} From 01180e6238e97659a8c89441109767fedeb7fa8f Mon Sep 17 00:00:00 2001 From: xiaoyatong <84436086+xiaoyatong@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:35:39 +0800 Subject: [PATCH 02/11] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7adf230c69..4d1c6e2937 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-1", + "version": "3.0.19-cpp.22", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", @@ -244,4 +244,4 @@ "@tarojs/components": "4.0.12", "@nutui/icons-react-taro": "^3.0.2-cpp.1" } -} \ No newline at end of file +} From ae7cf7007d05ba243e5ca97729b8aaa9a113c5a2 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Mon, 27 Apr 2026 22:58:09 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix(Price):=20=E8=A7=A3=E5=86=B3digits?= =?UTF-8?q?=E4=B8=BAnull=E6=97=B60.00=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/packages/price/price.taro.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7adf230c69..7c5e5de8fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-1", + "version": "3.0.19-cpp.22-2", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/src/packages/price/price.taro.tsx b/src/packages/price/price.taro.tsx index 2c9b3150e0..565e77a15c 100644 --- a/src/packages/price/price.taro.tsx +++ b/src/packages/price/price.taro.tsx @@ -95,7 +95,7 @@ export const Price: FunctionComponent> = (props) => { } const formatDecimal = (decimalNum: any) => { - if (Number(decimalNum) === 0) { + if (Number(decimalNum) === 0 && !checkPoint(decimalNum)) { decimalNum = 0 } From fbc08c3c785f222551d959c700e17433b68cda5a Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Tue, 28 Apr 2026 12:53:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat(Price):=20=E6=94=AF=E6=8C=81price=20?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6=E5=8E=9F?= =?UTF-8?q?=E6=A0=B7=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/packages/price/price.taro.tsx | 16 ++++++++++++---- src/types/spec/price/base.ts | 1 + src/utils/should-render-price-raw.ts | 11 ++++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7c5e5de8fa..f2084fb6a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-2", + "version": "3.0.19-cpp.22-3", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/src/packages/price/price.taro.tsx b/src/packages/price/price.taro.tsx index 565e77a15c..4484d15af5 100644 --- a/src/packages/price/price.taro.tsx +++ b/src/packages/price/price.taro.tsx @@ -5,7 +5,10 @@ import { ComponentDefaults } from '@/utils/typings' import { useRtl } from '@/packages/configprovider/index.taro' import { TaroPriceProps, PriceColorEnum } from '@/types' import { harmony } from '@/utils/taro/platform' -import { shouldRenderPriceAsRaw } from '@/utils/should-render-price-raw' +import { + shouldRenderPriceAsRaw, + hasNonPriceChars, +} from '@/utils/should-render-price-raw' const defaultProps = { ...ComponentDefaults, @@ -17,6 +20,7 @@ const defaultProps = { position: 'before', size: 'normal', line: false, + raw: false, } as TaroPriceProps export const Price: FunctionComponent> = (props) => { const { @@ -28,6 +32,7 @@ export const Price: FunctionComponent> = (props) => { position, size, line, + raw, className, style, } = { @@ -41,9 +46,12 @@ export const Price: FunctionComponent> = (props) => { const isRenderPriceRaw = useMemo( () => - typeof originalPrice === 'string' && - shouldRenderPriceAsRaw(originalPrice), - [originalPrice] + (typeof originalPrice === 'string' && + shouldRenderPriceAsRaw(originalPrice)) || + (raw && + typeof originalPrice === 'string' && + hasNonPriceChars(originalPrice)), + [originalPrice, raw] ) const price = useMemo(() => { diff --git a/src/types/spec/price/base.ts b/src/types/spec/price/base.ts index 82d67de4b3..74a21693e4 100644 --- a/src/types/spec/price/base.ts +++ b/src/types/spec/price/base.ts @@ -19,4 +19,5 @@ export interface BasePrice extends BaseProps { position: string size: PriceSize line: boolean + raw: boolean } diff --git a/src/utils/should-render-price-raw.ts b/src/utils/should-render-price-raw.ts index 7a8d43ea60..35fa961a80 100644 --- a/src/utils/should-render-price-raw.ts +++ b/src/utils/should-render-price-raw.ts @@ -1,6 +1,8 @@ -const CJK = /[\u4E00-\u9FFF]/ const RE_NUM = /\d+(?:\.\d+)?/g +// 价格合法字符：数字、小数点、负号、大写货币代码（HK USD EUR 等）、常见货币符号 Unicode 区块（含全角 ￥） +const PRICE_CHARS = /^[\d.\-A-Z¥￥$€£₩₹₽₺₴₪฿\u20A0-\u20CF\uFE69\uFF04\uFFE5]*$/ + function hasNoExtractablePrice(s: string) { const t = s.trim() if (!t) return true @@ -14,7 +16,6 @@ export function shouldRenderPriceAsRaw(s: string) { return true } const t = s.trim() - if (!CJK.test(t)) return false const matches = Array.from(t.matchAll(RE_NUM)) if (matches.length < 2) return false const a = matches[0] @@ -22,5 +23,9 @@ export function shouldRenderPriceAsRaw(s: string) { const i0 = a.index! const i1 = b.index! const between = t.slice(i0 + a[0].length, i1) - return CJK.test(between) + return !PRICE_CHARS.test(between) +} + +export function hasNonPriceChars(s: string): boolean { + return !PRICE_CHARS.test(s) } From 98071a17af5b630bb8af9770af74a2185956f4b1 Mon Sep 17 00:00:00 2001 From: xiyehutao <1254524557@qq.com> Date: Wed, 29 Apr 2026 15:09:43 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dclendar=E4=B8=AD?= =?UTF-8?q?color=E5=B1=9E=E6=80=A7=E7=BB=A7=E6=89=BF=E9=97=AE=E9=A2=98&?= =?UTF-8?q?=E9=A1=B6=E9=83=A8svg=E4=BD=BF=E7=94=A8Image=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/packages/calendar/calendar.scss | 31 +++++++++++++++++++++ src/packages/calendarcard/calendarcard.scss | 13 +++++++++ src/packages/calendarcard/icon.taro.tsx | 9 ++---- 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index f2084fb6a4..62f4d7cd53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-3", + "version": "3.0.19-cpp.22-4", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/src/packages/calendar/calendar.scss b/src/packages/calendar/calendar.scss index 7a394555d6..9ac08b7527 100644 --- a/src/packages/calendar/calendar.scss +++ b/src/packages/calendar/calendar.scss @@ -127,9 +127,20 @@ font-weight: $calendar-day-font-weight; margin-bottom: 4px; + // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。 + &-day, + &-info-curr { + color: $color-title; + } + &:nth-child(7n + 0), &:nth-child(7n + 1) { color: $color-primary; + + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $color-primary; + } } &-info, @@ -173,11 +184,21 @@ .nut-calendar-day-info { color: $color-primary-text; } + + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $color-primary-text; + } } &-disabled { color: $calendar-disable-color !important; + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $calendar-disable-color; + } + .nut-calendar-day-info-curr { display: none; } @@ -187,10 +208,20 @@ background-color: $calendar-choose-background-color; color: $calendar-choose-color; + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $calendar-choose-color; + } + &-disabled { background-color: $calendar-choose-disable-background-color; color: $calendar-disable-color !important; + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $calendar-disable-color; + } + .nut-calendar-day-info-curr { display: none; } diff --git a/src/packages/calendarcard/calendarcard.scss b/src/packages/calendarcard/calendarcard.scss index 56042a0b92..b824150001 100644 --- a/src/packages/calendarcard/calendarcard.scss +++ b/src/packages/calendarcard/calendarcard.scss @@ -49,6 +49,13 @@ margin-bottom: 4px; text-align: center; + // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。 + &-top, + &-inner, + &-bottom { + color: $color-title; + } + &.header { cursor: auto; } @@ -66,6 +73,12 @@ &.weekend { color: $calendar-choose-color; + + .nut-calendarcard-day-top, + .nut-calendarcard-day-inner, + .nut-calendarcard-day-bottom { + color: $calendar-choose-color; + } } &.active { diff --git a/src/packages/calendarcard/icon.taro.tsx b/src/packages/calendarcard/icon.taro.tsx index 1223f86495..9ac1e4e3e3 100644 --- a/src/packages/calendarcard/icon.taro.tsx +++ b/src/packages/calendarcard/icon.taro.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react' -import { Image, View } from '@tarojs/components' +import { Image } from '@tarojs/components' let left = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==' @@ -30,15 +30,10 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') { const Icon: FC = ({ url }) => { const style = { - background: `url('${url}') no-repeat center`, - backgroundSize: '100% 100%', width: 18, height: 18, } - if (process.env.TARO_ENV === 'jdharmony_cpp') { - return - } - return + return } export const ArrowLeft: FC = () => From 8bd54999220ddc6d111e681c52bdaa480c6bb9d6 Mon Sep 17 00:00:00 2001 From: xiyehutao <1254524557@qq.com> Date: Wed, 29 Apr 2026 15:45:01 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dclendar=E4=B8=AD?= =?UTF-8?q?weekend=E6=A0=B7=E5=BC=8F=E9=80=89=E6=8B=A9=E5=99=A8=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/calendar/calendar.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/packages/calendar/calendar.scss b/src/packages/calendar/calendar.scss index 9ac08b7527..3ca26a783f 100644 --- a/src/packages/calendar/calendar.scss +++ b/src/packages/calendar/calendar.scss @@ -181,12 +181,12 @@ border-bottom-right-radius: $calendar-day-active-border-radius; } - .nut-calendar-day-info { + &.nut-calendar-day-active .nut-calendar-day-info { color: $color-primary-text; } - .nut-calendar-day-day, - .nut-calendar-day-info-curr { + &.nut-calendar-day-active .nut-calendar-day-day, + &.nut-calendar-day-active .nut-calendar-day-info-curr { color: $color-primary-text; } } @@ -194,8 +194,8 @@ &-disabled { color: $calendar-disable-color !important; - .nut-calendar-day-day, - .nut-calendar-day-info-curr { + &.nut-calendar-day-disabled .nut-calendar-day-day, + &.nut-calendar-day-disabled .nut-calendar-day-info-curr { color: $calendar-disable-color; } @@ -208,8 +208,8 @@ background-color: $calendar-choose-background-color; color: $calendar-choose-color; - .nut-calendar-day-day, - .nut-calendar-day-info-curr { + &.nut-calendar-day-choose .nut-calendar-day-day, + &.nut-calendar-day-choose .nut-calendar-day-info-curr { color: $calendar-choose-color; } @@ -217,8 +217,8 @@ background-color: $calendar-choose-disable-background-color; color: $calendar-disable-color !important; - .nut-calendar-day-day, - .nut-calendar-day-info-curr { + &.nut-calendar-day-choose-disabled .nut-calendar-day-day, + &.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr { color: $calendar-disable-color; } From 2c68438c4659f38454f357395e63b0c440935b0f Mon Sep 17 00:00:00 2001 From: xiyehutao <1254524557@qq.com> Date: Thu, 30 Apr 2026 17:15:43 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E5=B0=86calendar=E4=B8=ADicon?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=86=85=E7=BD=AE=E5=88=B0scss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/calendarcard/calendarcard.scss | 6 ++++++ src/packages/calendarcard/icon.taro.tsx | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/packages/calendarcard/calendarcard.scss b/src/packages/calendarcard/calendarcard.scss index b824150001..d9f24c8830 100644 --- a/src/packages/calendarcard/calendarcard.scss +++ b/src/packages/calendarcard/calendarcard.scss @@ -30,6 +30,12 @@ } } + &-icon { + width: 18px; + height: 18px; + display: block; + } + &-days { display: flex; flex-direction: row; diff --git a/src/packages/calendarcard/icon.taro.tsx b/src/packages/calendarcard/icon.taro.tsx index 9ac1e4e3e3..58eaa66fdb 100644 --- a/src/packages/calendarcard/icon.taro.tsx +++ b/src/packages/calendarcard/icon.taro.tsx @@ -29,11 +29,7 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') { } const Icon: FC = ({ url }) => { - const style = { - width: 18, - height: 18, - } - return + return } export const ArrowLeft: FC = () => From 09a6a38dd3a960ce260ffba0cde047fe795ca3c8 Mon Sep 17 00:00:00 2001 From: xiyehutao <1254524557@qq.com> Date: Thu, 30 Apr 2026 17:23:29 +0800 Subject: [PATCH 08/11] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 62f4d7cd53..94621125f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-4", + "version": "3.0.19-cpp.22-5", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", From d6806eacafb20924c063f95d17f09b3f8425df64 Mon Sep 17 00:00:00 2001 From: xiyehutao <1254524557@qq.com> Date: Wed, 6 May 2026 11:38:33 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat:=20calendarCard=E7=BB=84=E4=BB=B6Ico?= =?UTF-8?q?n=E5=86=85=E8=81=94=E6=A0=B7=E5=BC=8FpxTransform=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/packages/calendarcard/icon.taro.tsx | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 94621125f3..99b8d4ffe7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-5", + "version": "3.0.19-cpp.22-6", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/src/packages/calendarcard/icon.taro.tsx b/src/packages/calendarcard/icon.taro.tsx index 58eaa66fdb..3a9abeace1 100644 --- a/src/packages/calendarcard/icon.taro.tsx +++ b/src/packages/calendarcard/icon.taro.tsx @@ -1,5 +1,6 @@ import React, { FC } from 'react' import { Image } from '@tarojs/components' +import { pxTransform } from '@tarojs/taro' let left = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==' @@ -29,7 +30,15 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') { } const Icon: FC = ({ url }) => { - return + const iconStyle = { width: pxTransform(18), height: pxTransform(18) } + return ( + + ) } export const ArrowLeft: FC = () => From 90538138b94c0d38394d3be60c260712601f6d3f Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Wed, 6 May 2026 18:28:28 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E6=8A=BD=E7=A6=BBicon=E4=B8=BA=20?= =?UTF-8?q?svg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/calendarcard/icon.taro.tsx | 30 +++++++------------ .../calendarcard/icons/doubleLeft.svg | 4 +++ .../calendarcard/icons/doubleRight.svg | 4 +++ .../calendarcard/icons/singleLeft.svg | 4 +++ .../calendarcard/icons/singleRight.svg | 4 +++ 5 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 src/packages/calendarcard/icons/doubleLeft.svg create mode 100644 src/packages/calendarcard/icons/doubleRight.svg create mode 100644 src/packages/calendarcard/icons/singleLeft.svg create mode 100644 src/packages/calendarcard/icons/singleRight.svg diff --git a/src/packages/calendarcard/icon.taro.tsx b/src/packages/calendarcard/icon.taro.tsx index 3a9abeace1..2384f32c21 100644 --- a/src/packages/calendarcard/icon.taro.tsx +++ b/src/packages/calendarcard/icon.taro.tsx @@ -1,18 +1,15 @@ import React, { FC } from 'react' import { Image } from '@tarojs/components' -import { pxTransform } from '@tarojs/taro' +import { pxTransform } from '@nutui/nutui-react-taro' +import leftSVG from './icons/singleLeft.svg' +import rightSVG from './icons/singleRight.svg' +import doubleLeftSVG from './icons/doubleLeft.svg' +import doubleRightSVG from './icons/doubleRight.svg' -let left = - 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==' - -let right = - 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTEuMzk2IDkuNDlhLjc3MS43NzEgMCAwIDAgMC0uOThsLTMuNi00LjM3MmEuNzcxLjc3MSAwIDAgMC0xLjE5MS45ODFMOS44IDlsLTMuMTk2IDMuODgxYS43NzEuNzcxIDAgMCAwIDEuMTkuOThsMy42LTQuMzd6Ii8+PC9zdmc+' - -let doubleLeft = - 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTMuODUzIDQuMDI2YS43NzEuNzcxIDAgMCAxIC4xMiAxLjA4NUwxMC44NjQgOWwzLjExIDMuODg5YS43NzEuNzcxIDAgMSAxLTEuMjA0Ljk2M2wtMy40OTgtNC4zN2EuNzcxLjc3MSAwIDAgMSAwLS45NjRsMy40OTctNC4zNzFhLjc3MS43NzEgMCAwIDEgMS4wODQtLjEyem0tNS4yNDUgMGEuNzcxLjc3MSAwIDAgMSAuMTIgMS4wODVMNS42MTcgOWwzLjExMSAzLjg4OWEuNzcxLjc3MSAwIDAgMS0xLjIwNS45NjNsLTMuNDk3LTQuMzdhLjc3MS43NzEgMCAwIDEgMC0uOTY0bDMuNDk3LTQuMzcxYS43NzEuNzcxIDAgMCAxIDEuMDg1LS4xMnoiLz48L3N2Zz4=' - -let doubleRight = - 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNC4xNDcgMTMuOTc0YS43NzEuNzcxIDAgMCAxLS4xMi0xLjA4NUw3LjEzNiA5IDQuMDI4IDUuMTFhLjc3MS43NzEgMCAxIDEgMS4yMDQtLjk2M2wzLjQ5NyA0LjM3MWEuNzcxLjc3MSAwIDAgMSAwIC45NjRsLTMuNDk3IDQuMzcxYS43NzEuNzcxIDAgMCAxLTEuMDg0LjEyem01LjI0NSAwYS43NzEuNzcxIDAgMCAxLS4xMi0xLjA4NUwxMi4zODMgOSA5LjI3MiA1LjExYS43NzEuNzcxIDAgMSAxIDEuMjA1LS45NjNsMy40OTcgNC4zNzFhLjc3MS43NzEgMCAwIDEgMCAuOTY0bC0zLjQ5NyA0LjM3MWEuNzcxLjc3MSAwIDAgMS0xLjA4NS4xMnoiLz48L3N2Zz4=' +let left = leftSVG as string +let right = rightSVG as string +let doubleLeft = doubleLeftSVG as string +let doubleRight = doubleRightSVG as string interface IconProps { url: string @@ -31,14 +28,7 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') { const Icon: FC = ({ url }) => { const iconStyle = { width: pxTransform(18), height: pxTransform(18) } - return ( - - ) + return } export const ArrowLeft: FC = () => diff --git a/src/packages/calendarcard/icons/doubleLeft.svg b/src/packages/calendarcard/icons/doubleLeft.svg new file mode 100644 index 0000000000..10561de0c6 --- /dev/null +++ b/src/packages/calendarcard/icons/doubleLeft.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/packages/calendarcard/icons/doubleRight.svg b/src/packages/calendarcard/icons/doubleRight.svg new file mode 100644 index 0000000000..ac60c24227 --- /dev/null +++ b/src/packages/calendarcard/icons/doubleRight.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/packages/calendarcard/icons/singleLeft.svg b/src/packages/calendarcard/icons/singleLeft.svg new file mode 100644 index 0000000000..9342023bc4 --- /dev/null +++ b/src/packages/calendarcard/icons/singleLeft.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/packages/calendarcard/icons/singleRight.svg b/src/packages/calendarcard/icons/singleRight.svg new file mode 100644 index 0000000000..2f9ac7a883 --- /dev/null +++ b/src/packages/calendarcard/icons/singleRight.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file From b2d3e88e5b79fdc6dab88209659d4e73884ce412 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Wed, 6 May 2026 21:07:08 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9taro=E5=A4=9A?= =?UTF-8?q?=E7=AB=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/packages/calendarcard/icon.taro.tsx | 42 ++++++++++++------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 99b8d4ffe7..ef1266f904 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nutui/nutui-react-taro", - "version": "3.0.19-cpp.22-6", + "version": "3.0.19-cpp.22-7", "style": "dist/style.css", "main": "dist/nutui.react.umd.js", "module": "dist/es/packages/nutui.react.build.js", diff --git a/src/packages/calendarcard/icon.taro.tsx b/src/packages/calendarcard/icon.taro.tsx index 2384f32c21..f76c19c5cc 100644 --- a/src/packages/calendarcard/icon.taro.tsx +++ b/src/packages/calendarcard/icon.taro.tsx @@ -1,34 +1,32 @@ import React, { FC } from 'react' import { Image } from '@tarojs/components' -import { pxTransform } from '@nutui/nutui-react-taro' -import leftSVG from './icons/singleLeft.svg' -import rightSVG from './icons/singleRight.svg' -import doubleLeftSVG from './icons/doubleLeft.svg' -import doubleRightSVG from './icons/doubleRight.svg' - -let left = leftSVG as string -let right = rightSVG as string -let doubleLeft = doubleLeftSVG as string -let doubleRight = doubleRightSVG as string interface IconProps { url: string } -if (process.env.TARO_ENV === 'jdharmony_cpp') { - left = - 'https://img11.360buyimg.com/imagetools/jfs/t1/187031/35/51586/196/6731c464F9b9f8f00/5506e32bf15e29dc.png' - right = - 'https://img12.360buyimg.com/imagetools/jfs/t1/181006/25/51824/185/6731c452F9e252322/7493147dd6b4a88d.png' - doubleLeft = - 'https://img13.360buyimg.com/imagetools/jfs/t1/221244/29/45876/259/6731c6bdF515df0a2/624e8eee3c8494a2.png' - doubleRight = - 'https://img11.360buyimg.com/imagetools/jfs/t1/238382/25/24000/235/6731c6bdF0153286c/4a57e60b6e889af3.png' -} +const left = + 'https://storage.360buyimg.com/imgtools/6437a2b149-bb511b40-4942-11f1-b1e1-7158b9aae0a9.svg' +const right = + 'https://storage.360buyimg.com/imgtools/8aa060341d-baf78990-4942-11f1-9368-cd56fc5fadc6.svg' +const doubleLeft = + 'https://storage.360buyimg.com/imgtools/b5e798f4ed-bbe8c760-4942-11f1-b1e1-7158b9aae0a9.svg' +const doubleRight = + 'https://storage.360buyimg.com/imgtools/d6979fa16d-bbb4bf10-4942-11f1-9368-cd56fc5fadc6.svg' const Icon: FC = ({ url }) => { - const iconStyle = { width: pxTransform(18), height: pxTransform(18) } - return + const iconStyle = { + color: 'var(--nutui-color-text)', + } + return ( + + ) } export const ArrowLeft: FC = () =>