From 56f8ae2e8489382cfab5232ad64482d79f30320e Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Mon, 30 Dec 2024 19:03:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20rate=20=E7=9A=84=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.json | 6 ++++-- src/packages/configprovider/demos/h5/demo2.tsx | 2 +- src/packages/configprovider/demos/taro/demo2.tsx | 2 +- src/packages/overlay/demos/h5/demo5.tsx | 1 - src/styles/variables.scss | 12 +++++++++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/config.json b/src/config.json index aecc1d3947..d9858cb33b 100644 --- a/src/config.json +++ b/src/config.json @@ -389,7 +389,8 @@ "show": true, "taro": true, "author": "Alex.hxy", - "v15": true + "v15": true, + "dd": true }, { "version": "3.0.0", @@ -401,7 +402,8 @@ "show": false, "taro": true, "author": "Alex.hxy", - "v15": true + "v15": true, + "dd": true }, { "version": "2.0.0", diff --git a/src/packages/configprovider/demos/h5/demo2.tsx b/src/packages/configprovider/demos/h5/demo2.tsx index 46121e1252..2b3fe3cddf 100644 --- a/src/packages/configprovider/demos/h5/demo2.tsx +++ b/src/packages/configprovider/demos/h5/demo2.tsx @@ -3,7 +3,7 @@ import { ConfigProvider, Cell, Rate, Button } from '@nutui/nutui-react' const Demo2 = () => { const darkTheme = { - nutuiColorPrimary: 'green', + nutuiColorPrimaryIcon: 'green', nutuiColorPrimaryStop1: 'green', nutuiColorPrimaryStop2: 'green', } diff --git a/src/packages/configprovider/demos/taro/demo2.tsx b/src/packages/configprovider/demos/taro/demo2.tsx index 291c97ff97..3bb61f41f5 100644 --- a/src/packages/configprovider/demos/taro/demo2.tsx +++ b/src/packages/configprovider/demos/taro/demo2.tsx @@ -3,7 +3,7 @@ import { ConfigProvider, Cell, Button, Rate } from '@nutui/nutui-react-taro' const Demo2 = () => { const darkTheme = { - nutuiColorPrimary: 'green', + nutuiColorPrimaryIcon: 'green', nutuiColorPrimaryStop1: 'green', nutuiColorPrimaryStop2: 'green', } diff --git a/src/packages/overlay/demos/h5/demo5.tsx b/src/packages/overlay/demos/h5/demo5.tsx index d4dbf90084..5ca3638e61 100644 --- a/src/packages/overlay/demos/h5/demo5.tsx +++ b/src/packages/overlay/demos/h5/demo5.tsx @@ -17,7 +17,6 @@ const Demo5 = () => { borderRadius: '8px', alignItems: 'center', justifyContent: 'center', - color: 'red', } const handleToggleShow = () => { setVisible(true) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index d9a42a24ae..4ec3112d61 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -12,9 +12,15 @@ $color-primary-gradient-1: linear-gradient( $color-primary-stop-1 0%, $color-primary-stop-2 100% ) !default; -$color-primary-icon: var(--nutui-red-6) !default; -$color-primary-icon-disabled: var(--nutui-gray-8) !default; -$color-primary-specialdisabled: var(--nutui-red-3) !default; +$color-primary-icon: var(--nutui-color-primary-icon, #ff3333) !default; +$color-primary-icon-disabled: var( + --nutui-color-primary-icon-disabled, + #dadce0 +) !default; +$color-primary-specialdisabled: var( + --nutui-color-primary-specialdisabled, + #ffadbe +) !default; // 默认色 $color-default: var(--nutui-color-default) !default; From bdf76d8c8549cb4c8906f4f47c5945f944f66b12 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Mon, 30 Dec 2024 21:25:30 +0800 Subject: [PATCH 2/4] fix: taro configprovider --- src/packages/address/address.taro.tsx | 2 +- src/packages/address/existRender.taro.tsx | 2 +- src/packages/audio/audio.taro.tsx | 2 +- src/packages/avatarcropper/avatarcropper.taro.tsx | 2 +- src/packages/backtop/backtop.scss | 3 +++ src/packages/calendar/calendar.taro.tsx | 2 +- src/packages/calendarcard/calendarcard.taro.tsx | 2 +- src/packages/calendaritem/calendaritem.taro.tsx | 2 +- src/packages/cascader/cascader.taro.tsx | 2 +- src/packages/fixednav/fixednav.taro.tsx | 2 +- src/packages/infiniteloading/infiniteloading.taro.tsx | 2 +- src/packages/inputnumber/demos/taro/demo9.tsx | 8 ++++++-- src/packages/numberkeyboard/numberkeyboard.taro.tsx | 2 +- src/packages/picker/picker.taro.tsx | 2 +- src/packages/searchbar/searchbar.taro.tsx | 2 +- src/packages/table/table.taro.tsx | 5 +---- src/packages/textarea/textarea.taro.tsx | 5 +---- src/packages/timeselect/timeselect.taro.tsx | 2 +- src/packages/tour/tour.taro.tsx | 2 +- src/packages/uploader/uploader.taro.tsx | 2 +- 20 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/packages/address/address.taro.tsx b/src/packages/address/address.taro.tsx index 11268e97bf..aa1c4bb459 100644 --- a/src/packages/address/address.taro.tsx +++ b/src/packages/address/address.taro.tsx @@ -9,7 +9,7 @@ import { ArrowLeft } from '@nutui/icons-react-taro' import Popup from '@/packages/popup/index.taro' import { ExistRender } from './existRender.taro' import { CustomRender } from './customRender.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { AddressList } from './types' import { CascaderOption, diff --git a/src/packages/address/existRender.taro.tsx b/src/packages/address/existRender.taro.tsx index 44f1649e8f..a5d2074078 100644 --- a/src/packages/address/existRender.taro.tsx +++ b/src/packages/address/existRender.taro.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent, ReactNode } from 'react' import { Check, Location } from '@nutui/icons-react-taro' import { ScrollView, View, ITouchEvent } from '@tarojs/components' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { AddressList } from './types' export interface ExistRenderProps { diff --git a/src/packages/audio/audio.taro.tsx b/src/packages/audio/audio.taro.tsx index b09faf61cc..84410060d7 100644 --- a/src/packages/audio/audio.taro.tsx +++ b/src/packages/audio/audio.taro.tsx @@ -10,7 +10,7 @@ import { Service } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Range from '@/packages/range/index.taro' import Button from '@/packages/button/index.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' export interface AudioProps extends BasicComponent { diff --git a/src/packages/avatarcropper/avatarcropper.taro.tsx b/src/packages/avatarcropper/avatarcropper.taro.tsx index 20f0b83f2e..92e2b8f979 100644 --- a/src/packages/avatarcropper/avatarcropper.taro.tsx +++ b/src/packages/avatarcropper/avatarcropper.taro.tsx @@ -9,7 +9,7 @@ import Taro, { useReady, createSelectorQuery } from '@tarojs/taro' import classNames from 'classnames' import { Canvas, CommonEventFunction, View } from '@tarojs/components' import { Button } from '@/packages/button/button.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { useTouch } from '@/utils/use-touch' diff --git a/src/packages/backtop/backtop.scss b/src/packages/backtop/backtop.scss index 91341391b2..e65f50644a 100644 --- a/src/packages/backtop/backtop.scss +++ b/src/packages/backtop/backtop.scss @@ -1,3 +1,6 @@ +@import '../hoverbutton/hoverbutton.scss'; +@import '../hoverbuttonitem/hoverbuttonitem.scss'; + .nut-backtop { display: none; diff --git a/src/packages/calendar/calendar.taro.tsx b/src/packages/calendar/calendar.taro.tsx index 713eabee14..b315b3d8a6 100644 --- a/src/packages/calendar/calendar.taro.tsx +++ b/src/packages/calendar/calendar.taro.tsx @@ -2,7 +2,7 @@ import React, { useRef, ReactNode } from 'react' import Popup from '@/packages/popup/index.taro' import CalendarItem from '@/packages/calendaritem/index.taro' import { Utils } from '@/utils/date' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import type { CalendarDay, CalendarType, CalendarRef } from './types' import { ComponentDefaults } from '@/utils/typings' diff --git a/src/packages/calendarcard/calendarcard.taro.tsx b/src/packages/calendarcard/calendarcard.taro.tsx index f551bfe2f6..439e07ac1a 100644 --- a/src/packages/calendarcard/calendarcard.taro.tsx +++ b/src/packages/calendarcard/calendarcard.taro.tsx @@ -10,7 +10,7 @@ import { getCurrentWeekDays, getPrevMonthDays, } from './utils' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import type { CalendarCardDay, CalendarCardMonth, diff --git a/src/packages/calendaritem/calendaritem.taro.tsx b/src/packages/calendaritem/calendaritem.taro.tsx index 4c917425eb..e757e5df76 100644 --- a/src/packages/calendaritem/calendaritem.taro.tsx +++ b/src/packages/calendaritem/calendaritem.taro.tsx @@ -11,7 +11,7 @@ import { getPreMonthDates, } from '@/utils/date' import requestAniFrame from '@/utils/raf' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { usePropsValue } from '@/utils/use-props-value' import { splitDate, diff --git a/src/packages/cascader/cascader.taro.tsx b/src/packages/cascader/cascader.taro.tsx index e5a1419f18..905349c528 100644 --- a/src/packages/cascader/cascader.taro.tsx +++ b/src/packages/cascader/cascader.taro.tsx @@ -22,7 +22,7 @@ import { } from './types' import { ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' export interface CascaderProps extends Pick< diff --git a/src/packages/fixednav/fixednav.taro.tsx b/src/packages/fixednav/fixednav.taro.tsx index 5090d79a7d..7bbc34fe3e 100644 --- a/src/packages/fixednav/fixednav.taro.tsx +++ b/src/packages/fixednav/fixednav.taro.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames' import { ArrowLeft } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Overlay from '@/packages/overlay/index.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { FixedNavType, diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx index 13a3547c8a..846c891969 100644 --- a/src/packages/infiniteloading/infiniteloading.taro.tsx +++ b/src/packages/infiniteloading/infiniteloading.taro.tsx @@ -8,7 +8,7 @@ import React, { import classNames from 'classnames' import { ScrollView, ScrollViewProps, View } from '@tarojs/components' import { createSelectorQuery } from '@tarojs/taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { InfiniteLoadingType } from './types' diff --git a/src/packages/inputnumber/demos/taro/demo9.tsx b/src/packages/inputnumber/demos/taro/demo9.tsx index 08ec94e19f..c1f768a77e 100644 --- a/src/packages/inputnumber/demos/taro/demo9.tsx +++ b/src/packages/inputnumber/demos/taro/demo9.tsx @@ -1,6 +1,10 @@ import React, { useState } from 'react' -import { Cell, InputNumber, Toast } from '@nutui/nutui-react-taro' -import ConfigProvider from '@/packages/configprovider' +import { + Cell, + InputNumber, + Toast, + ConfigProvider, +} from '@nutui/nutui-react-taro' const Demo9 = () => { const customTheme3 = { diff --git a/src/packages/numberkeyboard/numberkeyboard.taro.tsx b/src/packages/numberkeyboard/numberkeyboard.taro.tsx index af9d0b554c..e459b9abd4 100644 --- a/src/packages/numberkeyboard/numberkeyboard.taro.tsx +++ b/src/packages/numberkeyboard/numberkeyboard.taro.tsx @@ -4,7 +4,7 @@ import { ArrowDown } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Popup from '@/packages/popup/index.taro' import { PopupProps } from '@/packages/popup/popup.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { ComponentDefaults } from '@/utils/typings' import { mergeProps } from '@/utils/merge-props' diff --git a/src/packages/picker/picker.taro.tsx b/src/packages/picker/picker.taro.tsx index 824dbc4102..0eae715b2a 100644 --- a/src/packages/picker/picker.taro.tsx +++ b/src/packages/picker/picker.taro.tsx @@ -12,7 +12,7 @@ import { View, PickerView, PickerViewColumn } from '@tarojs/components' import { Popup, PopupProps } from '@/packages/popup/popup.taro' import PickerPanel from './pickerpanel.taro' import useRefs from '@/utils/use-refs' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { PickerOption } from './types' import { usePropsValue } from '@/utils/use-props-value' import { BasicComponent, ComponentDefaults } from '@/utils/typings' diff --git a/src/packages/searchbar/searchbar.taro.tsx b/src/packages/searchbar/searchbar.taro.tsx index 5d49a61a2f..76d9ec5c93 100644 --- a/src/packages/searchbar/searchbar.taro.tsx +++ b/src/packages/searchbar/searchbar.taro.tsx @@ -2,7 +2,7 @@ import React, { FunctionComponent, useEffect, useRef, useState } from 'react' import type { ChangeEvent, FocusEvent, MouseEvent } from 'react' import { View, ITouchEvent, Input as TaroInput } from '@tarojs/components' import { MaskClose, Search, ArrowLeft } from '@nutui/icons-react-taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' export interface SearchBarProps extends BasicComponent { diff --git a/src/packages/table/table.taro.tsx b/src/packages/table/table.taro.tsx index 7869247cdd..fa56e8b332 100644 --- a/src/packages/table/table.taro.tsx +++ b/src/packages/table/table.taro.tsx @@ -3,10 +3,7 @@ import classNames from 'classnames' import { ArrowDown } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import { BasicTableProps, TableColumnProps } from './types' -import { - useConfig, - useRtl, -} from '@/packages/configprovider/configprovider.taro' +import { useConfig, useRtl } from '@/packages/configprovider/index.taro' import { ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' import { useTableSticky } from './utils' diff --git a/src/packages/textarea/textarea.taro.tsx b/src/packages/textarea/textarea.taro.tsx index e31aab6edb..4f69f69e93 100644 --- a/src/packages/textarea/textarea.taro.tsx +++ b/src/packages/textarea/textarea.taro.tsx @@ -2,10 +2,7 @@ import React, { FunctionComponent, useRef } from 'react' import classNames from 'classnames' import Taro from '@tarojs/taro' import { Textarea, TextareaProps, View, Text } from '@tarojs/components' -import { - useConfig, - useRtl, -} from '@/packages/configprovider/configprovider.taro' +import { useConfig, useRtl } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' diff --git a/src/packages/timeselect/timeselect.taro.tsx b/src/packages/timeselect/timeselect.taro.tsx index 8ae31f7626..9d8532e4cf 100644 --- a/src/packages/timeselect/timeselect.taro.tsx +++ b/src/packages/timeselect/timeselect.taro.tsx @@ -4,7 +4,7 @@ import { View } from '@tarojs/components' import Popup from '@/packages/popup/index.taro' import TimeDetail from '@/packages/timedetail/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' export interface TimeType { value?: string diff --git a/src/packages/tour/tour.taro.tsx b/src/packages/tour/tour.taro.tsx index 98ed5f3288..06fd71f3ad 100644 --- a/src/packages/tour/tour.taro.tsx +++ b/src/packages/tour/tour.taro.tsx @@ -7,7 +7,7 @@ import Popover from '@/packages/popover/index.taro' import { PopoverLocation } from '@/packages/popover/types' import { getTaroRectById } from '@/utils/use-taro-rect' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { useConfig } from '@/packages/configprovider' +import { useConfig } from '@/packages/configprovider/index.taro' export interface TourList { target: Element | string diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx index 51d82712dc..e60cbf3b37 100644 --- a/src/packages/uploader/uploader.taro.tsx +++ b/src/packages/uploader/uploader.taro.tsx @@ -11,7 +11,7 @@ import Taro, { chooseImage, getEnv, chooseMedia } from '@tarojs/taro' import { Failure, Photograph } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Button from '@/packages/button/index.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { funcInterceptor } from '@/utils/interceptor' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { FileItem } from './types' From 270e492a3705eeeaf33dd5a68c27d2fa4a8c600a Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Tue, 31 Dec 2024 20:40:17 +0800 Subject: [PATCH 3/4] fix: variables --- src/styles/variables.scss | 83 +++++++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 4ec3112d61..b35651f853 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -5,8 +5,14 @@ $color-primary-stop-1: var(--nutui-color-primary-stop-1, #ff475d) !default; $color-primary-stop-2: var(--nutui-color-primary-stop-2, #ff0f23) !default; $color-primary-pressed: var(--nutui-color-primary-pressed, #e53029) !default; $color-primary-disabled: var(--nutui-color-primary-disabled, #c2c4cc) !default; -$color-primary-disabled-special: var(--nutui-brand-3) !default; -$color-primary-light-pressed: var(--nutui-brand-1) !default; +$color-primary-disabled-special: var( + --nutui-color-primary-disabled-special, + #ffadbe +) !default; +$color-primary-light-pressed: var( + --nutui-color-primary-light-pressed, + #ffebf1 +) !default; $color-primary-gradient-1: linear-gradient( 135deg, $color-primary-stop-1 0%, @@ -40,53 +46,80 @@ $color-info-background: var( $color-info-text: var(--nutui-color-info, #0073ff) !default; // done // 成功色 -$color-success: var(--nutui-green-2) !default; // done -$color-success-pressed: var(--nutui-green-3) !default; // done +$color-success: var(--nutui-color-success, #00d900) !default; // done +$color-success-pressed: var( + --nutui-color-success-pressed, + #2aa32a +) !default; // done $color-success-disabled: var(--nutui-color-success-disabled, #b2f0ae) !default; -$color-success-light: var(--nutui-green-1) !default; // done -$color-success-background: var(--nutui-green-2) !default; // done -$color-success-text: var(--nutui-green-3) !default; // done +$color-success-light: var( + --nutui-color-success-light, + #ebfbeb +) !default; // done +$color-success-background: var(--nutui-color-success, #00d900) !default; // done +$color-success-text: var( + --nutui-color-success-pressed, + #2aa32a +) !default; // done // 警告色 -$color-warning: var(--nutui-yellow-2) !default; // done -$color-warning-pressed: var(--nutui-yellow-3) !default; // done +$color-warning: var(--nutui-color-warning, #ffbf00) !default; // done +$color-warning-pressed: var( + --nutui-color-warning-pressed, + #c47600 +) !default; // done $color-warning-disabled: var(--nutui-color-warning-disabled, #fdd3b9) !default; -$color-warning-light: var(--nutui-yellow-1) !default; // done -$color-warning-background: var(--nutui-yellow-2) !default; // done -$color-warning-text: var(--nutui-yellow-3) !default; // done +$color-warning-light: var( + --nutui-color-warning-light, + #fff5cc +) !default; // done +$color-warning-background: var(--nutui-color-warning, #ffbf00) !default; // done +$color-warning-text: var( + --nutui-color-warning-pressed, + #c47600 +) !default; // done // 危险色 -$color-danger: var(--nutui-red-2) !default; //done -$color-danger-pressed: var(--nutui-color-danger-pressed) !default; +$color-danger: var(--nutui-color-danger, #ff0f23) !default; //done +$color-danger-pressed: var(--nutui-color-danger-pressed, #ff3333) !default; $color-danger-disabled: var( --nutui-color-danger-disabled, $color-primary-disabled-special ) !default; -$color-danger-light: var(--nutui-red-1) !default; //done -$color-danger-background: var(--nutui-color-danger-background) !default; //done -$color-danger-text: var(--nutui-red-2) !default; //done +$color-danger-light: var(--nutui-color-danger-light, #ffebef) !default; //done +$color-danger-background: var( + --nutui-color-danger-background, + #ff0f23 +) !default; //done +$color-danger-text: var(--nutui-color-danger, #ff0f23) !default; //done // 背景色 -$color-background: var(--nutui-gray-3) !default; //done +$color-background: var(--nutui-color-background, #f2f3f5) !default; //done // 卡片背景色 -$color-background-overlay: var(--nutui-gray-1) !default; +$color-background-overlay: var( + --nutui-color-background-overlay, + #ffffff +) !default; // 卡片内嵌背景色 $color-background-sunken: var( --nutui-color-background-sunken, - var(--nutui-gray-2) + #f7f8fc ) !default; // 蒙层颜色 // 页面全局蒙层 -$color-mask: var(--nutui-black-10) !default; +$color-mask: var(--nutui-color-mask, rgba(0, 0, 0, 0.7)) !default; // 局部蒙层 -$color-mask-part: var(--nutui-black-7) !default; +$color-mask-part: var(--nutui-color-mask-part, rgba(0, 0, 0, 0.4)) !default; // 容错蒙层 -$color-mask-fault-toleran: var(--nutui-black-2) !default; +$color-mask-fault-toleran: var( + --nutui-color-mask-fault-toleran, + rgba(0, 0, 0, 0.02) +) !default; // 边框色 -$color-border: var(--nutui-black-3) !default; -$color-border-disabled: var(--nutui-gray-4) !default; +$color-border: var(--nutui-color-border, rgba(0, 0, 0, 0.06)) !default; +$color-border-disabled: var(--nutui-color-border-disabled, #c2c4cc) !default; // 文本色 $color-title: var(--nutui-gray-7) !default; From 9aad0179fff7332610cb2b8c58a68c59f9fa8389 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Thu, 2 Jan 2025 17:58:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/configprovider/types.ts | 65 ++++++++++++++++------------ src/styles/variables.scss | 35 ++++++++------- 2 files changed, 56 insertions(+), 44 deletions(-) diff --git a/src/packages/configprovider/types.ts b/src/packages/configprovider/types.ts index ea3bae8dad..e5babad739 100644 --- a/src/packages/configprovider/types.ts +++ b/src/packages/configprovider/types.ts @@ -1,14 +1,14 @@ export type NutCSSVariables = - | 'nutuiBrand6' + | 'nutuiColorPrimary' | 'nutuiColorPrimaryStop1' | 'nutuiColorPrimaryStop2' | 'nutuiColorPrimaryPressed' | 'nutuiColorPrimaryDisabled' - | 'nutuiBrand3' - | 'nutuiBrand1' - | 'nutuiRed6' - | 'nutuiGray8' - | 'nutuiRed3' + | 'nutuiColorPrimaryDisabledSpecial' + | 'nutuiColorPrimaryLightPressed' + | 'nutuiColorPrimaryIcon' + | 'nutuiColorPrimaryIconDisabled' + | 'nutuiColorPrimarySpecialdisabled' | 'nutuiColorDefault' | 'nutuiColorDefaultPressed' | 'nutuiColorDefaultLight' @@ -18,33 +18,38 @@ export type NutCSSVariables = | 'nutuiColorInfoDisabled' | 'nutuiColorInfoLight' | 'nutuiColorInfoBackground' - | 'nutuiGreen2' - | 'nutuiGreen3' + | 'nutuiColorSuccess' + | 'nutuiColorSuccessPressed' | 'nutuiColorSuccessDisabled' - | 'nutuiGreen1' - | 'nutuiYellow2' - | 'nutuiYellow3' + | 'nutuiColorSuccessLight' + | 'nutuiColorSuccessBackground' + | 'nutuiColorSuccessText' + | 'nutuiColorWarning' + | 'nutuiColorWarningPressed' | 'nutuiColorWarningDisabled' - | 'nutuiYellow1' - | 'nutuiRed2' + | 'nutuiColorWarningLight' + | 'nutuiColorWarningBackground' + | 'nutuiColorWarningText' + | 'nutuiColorDanger' | 'nutuiColorDangerPressed' | 'nutuiColorDangerDisabled' - | 'nutuiRed1' + | 'nutuiColorDangerLight' | 'nutuiColorDangerBackground' - | 'nutuiGray3' - | 'nutuiGray1' + | 'nutuiColorDangerText' + | 'nutuiColorBackground' + | 'nutuiColorBackgroundOverlay' | 'nutuiColorBackgroundSunken' - | 'nutuiGray2' - | 'nutuiBlack10' - | 'nutuiBlack7' - | 'nutuiBlack2' - | 'nutuiBlack3' - | 'nutuiGray4' - | 'nutuiGray7' - | 'nutuiGray6' - | 'nutuiGray5' - | 'nutuiWhite12' - | 'nutuiBlue2' + | 'nutuiColorMask' + | 'nutuiColorMaskPart' + | 'nutuiColorMaskFaultToleran' + | 'nutuiColorBorder' + | 'nutuiColorBorderDisabled' + | 'nutuiColorTitle' + | 'nutuiColorText' + | 'nutuiColorTextHelp' + | 'nutuiColorTextDisabled' + | 'nutuiColorTextDark' + | 'nutuiColorTextLink' | 'nutuiFontSizeXxs' | 'nutuiFontSizeXs' | 'nutuiFontSizeS' @@ -176,6 +181,7 @@ export type NutCSSVariables = | 'nutuiUploaderPreviewMarginBottom' | 'nutuiUploaderPreviewTipsHeight' | 'nutuiUploaderPreviewTipsBackground' + | 'nutuiBlack7' | 'nutuiUploaderPreviewTipsPadding' | 'nutuiUploaderPreviewCloseRight' | 'nutuiUploaderPreviewCloseTop' @@ -188,6 +194,7 @@ export type NutCSSVariables = | 'nutuiPickerItemTextColor' | 'nutuiPickerItemTextFontSize' | 'nutuiPickerItemActiveLineBorder' + | 'nutuiWhite12' | 'nutuiWhite7' | 'nutuiInputBorderBottom' | 'nutuiInputBorderBottomWidth' @@ -261,8 +268,8 @@ export type NutCSSVariables = | 'nutuiCountdownNumberPrimaryBackgroundColor' | 'nutuiCountdownNumberPrimaryBorderColor' | 'nutuiPriceColor' - | 'nutuiColorTextHelp' | 'nutuiPriceDarkgrayColor' + | 'nutuiGray7' | 'nutuiPriceLineColor' | 'nutuiPriceSymbolPaddingRight' | 'nutuiPriceSymbolXlargeSize' @@ -715,6 +722,7 @@ export type NutCSSVariables = | 'nutuiGridItemBorderRadius' | 'nutuiGridItemContentPadding' | 'nutuiGridItemContentBgColor' + | 'nutuiGray1' | 'nutuiGridItemTextMargin' | 'nutuiGridItemTextColor' | 'nutuiGridItemTextFontSize' @@ -841,4 +849,5 @@ export type NutCSSVariables = | 'nutuiResultpageDescriptionLineHeight' | 'nutuiResultpageActionsMarginTop' | 'nutuiSafeAreaMultiple' + | 'nutuiBlack3' | 'nutuiBlack1' diff --git a/src/styles/variables.scss b/src/styles/variables.scss index b35651f853..99b31976c7 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,6 +1,6 @@ // ---------------------------------------------------- // 主色调 // done -$color-primary: var(--nutui-brand-6) !default; +$color-primary: var(--nutui-color-primary, #ff0f23) !default; $color-primary-stop-1: var(--nutui-color-primary-stop-1, #ff475d) !default; $color-primary-stop-2: var(--nutui-color-primary-stop-2, #ff0f23) !default; $color-primary-pressed: var(--nutui-color-primary-pressed, #e53029) !default; @@ -56,11 +56,11 @@ $color-success-light: var( --nutui-color-success-light, #ebfbeb ) !default; // done -$color-success-background: var(--nutui-color-success, #00d900) !default; // done -$color-success-text: var( - --nutui-color-success-pressed, - #2aa32a +$color-success-background: var( + --nutui-color-success-background, + #00d900 ) !default; // done +$color-success-text: var(--nutui-color-success-text, #2aa32a) !default; // done // 警告色 $color-warning: var(--nutui-color-warning, #ffbf00) !default; // done @@ -73,11 +73,11 @@ $color-warning-light: var( --nutui-color-warning-light, #fff5cc ) !default; // done -$color-warning-background: var(--nutui-color-warning, #ffbf00) !default; // done -$color-warning-text: var( - --nutui-color-warning-pressed, - #c47600 +$color-warning-background: var( + --nutui-color-warning-background, + #ffbf00 ) !default; // done +$color-warning-text: var(--nutui-color-warning-text, #c47600) !default; // done // 危险色 $color-danger: var(--nutui-color-danger, #ff0f23) !default; //done @@ -91,7 +91,7 @@ $color-danger-background: var( --nutui-color-danger-background, #ff0f23 ) !default; //done -$color-danger-text: var(--nutui-color-danger, #ff0f23) !default; //done +$color-danger-text: var(--nutui-color-danger-text, #ff0f23) !default; //done // 背景色 $color-background: var(--nutui-color-background, #f2f3f5) !default; //done @@ -122,12 +122,15 @@ $color-border: var(--nutui-color-border, rgba(0, 0, 0, 0.06)) !default; $color-border-disabled: var(--nutui-color-border-disabled, #c2c4cc) !default; // 文本色 -$color-title: var(--nutui-gray-7) !default; -$color-text: var(--nutui-gray-6) !default; -$color-text-help: var(--nutui-gray-5) !default; -$color-text-disabled: var(--nutui-gray-4) !default; -$color-text-dark: var(--nutui-white-12) !default; -$color-text-link: var(--nutui-blue-2) !default; +$color-title: var(--nutui-color-title, #1a1a1a) !default; +$color-text: var(--nutui-color-text, #505259) !default; +$color-text-help: var(--nutui-color-text-help, #888b94) !default; +$color-text-disabled: var(--nutui-color-text-disabled, #c2c4cc) !default; +$color-text-dark: var( + --nutui-color-text-dark, + rgba(255, 255, 255, 0.9) +) !default; +$color-text-link: var(--nutui-color-text-link, #0073ff) !default; // 与品牌色一起使用，默认为白色，不区分暗黑与明亮模式。 $color-primary-text: #ffffff !default;