Skip to content

Commit e52f9de

Browse files
committed
fix: 修改类型定义和变量文件同步
1 parent 3049038 commit e52f9de

5 files changed

Lines changed: 18 additions & 3 deletions

File tree

src/packages/notify/Notification.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export default class Notification extends React.PureComponent<
7676

7777
render() {
7878
const {
79+
id,
7980
style,
8081
message,
8182
leftIcon,
@@ -105,6 +106,7 @@ export default class Notification extends React.PureComponent<
105106
unmountOnExit
106107
appear
107108
position={position}
109+
id={id}
108110
>
109111
<div
110112
className={classes}

src/packages/notify/notify.taro.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ export const Notify: FunctionComponent<Partial<TaroNotifyProps>> & {
101101
}, [distance, position])
102102

103103
const classes = classNames({
104-
[`${classPrefix}-popup-top`]: position === 'top',
105-
[`${classPrefix}-popup-bottom`]: position === 'bottom',
106104
[`${classPrefix}`]: true,
107105
[`${className}`]: true,
108106
})

src/styles/variables-jmapp.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,13 @@ $notify-warning-background-color: var(
11161116
--nutui-notify-warning-background-color,
11171117
$color-warning
11181118
) !default;
1119+
$notify-border-radius: var(--nutui-notify-border-radius, 8px) !default;
1120+
$notify-box-shadow: var(
1121+
--nutui-notify-box-shadow,
1122+
0px 4px 12px 0px rgba(0, 0, 0, 0.06)
1123+
) !default;
1124+
$notify-z-index: var(--nutui-notify-z-index, 1000) !default;
1125+
$notify-background-color: var(--nutui-notify-background-color, $white) !default;
11191126

11201127
// rate(✅)
11211128
$rate-item-margin: var(--nutui-rate-item-margin, 14px) !default;

src/styles/variables-jrkf.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,13 @@ $notify-warning-background-color: var(
11351135
--nutui-notify-warning-background-color,
11361136
$color-warning
11371137
) !default;
1138+
$notify-border-radius: var(--nutui-notify-border-radius, 8px) !default;
1139+
$notify-box-shadow: var(
1140+
--nutui-notify-box-shadow,
1141+
0px 4px 12px 0px rgba(0, 0, 0, 0.06)
1142+
) !default;
1143+
$notify-z-index: var(--nutui-notify-z-index, 1000) !default;
1144+
$notify-background-color: var(--nutui-notify-background-color, $white) !default;
11381145

11391146
// rate(✅)
11401147
$rate-item-margin: var(--nutui-rate-item-margin, 14px) !default;

src/types/spec/notify/base.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { PositionY } from '@/types/base/atoms'
12
import { BaseProps } from '../../base/props'
23

34
export interface BaseNotify extends BaseProps {
@@ -6,7 +7,7 @@ export interface BaseNotify extends BaseProps {
67
closeable: boolean
78
leftIcon: React.ReactNode
89
rightIcon: React.ReactNode
9-
position: string
10+
position: PositionY
1011
duration: number
1112
onClick: () => void
1213
onClose: () => void

0 commit comments

Comments
 (0)