Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(price): v15 #2885

Merged
merged 17 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions migrate-from-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -733,9 +733,8 @@ plugins: [

#### Price

- `decimalDigits` 重命名为 `digits`
- 移除 `needSymbol`,通过 `symbol` 判断是否需要加上 symbol 符号
- 新增 `line`,是否展示划线价
- 修改 `size`,增加 'xlarge' 尺寸
- 新增 `type`, 价格类型

#### Progress

Expand Down
1 change: 1 addition & 0 deletions src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,7 @@
"sort": 4,
"show": true,
"taro": true,
"v15": true,
"author": "songsong"
},
{
Expand Down
18 changes: 9 additions & 9 deletions src/packages/card/__test__/__snapshots__/card.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ exports[`description slot test 1`] = `
class="nut-card-right-price"
>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand All @@ -68,7 +68,7 @@ exports[`description slot test 1`] = `
</div>
</div>
<div
class="nut-price nut-card-right-price-origin"
class="nut-price nut-price-primary nut-card-right-price-origin"
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand Down Expand Up @@ -153,7 +153,7 @@ exports[`extra slot test 1`] = `
class="nut-card-right-price"
>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand All @@ -177,7 +177,7 @@ exports[`extra slot test 1`] = `
</div>
</div>
<div
class="nut-price nut-card-right-price-origin"
class="nut-price nut-price-primary nut-card-right-price-origin"
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand Down Expand Up @@ -267,7 +267,7 @@ exports[`priceTag slot test 1`] = `
class="nut-card-right-price"
>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand Down Expand Up @@ -356,7 +356,7 @@ exports[`props test 1`] = `
class="nut-card-right-price"
>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand All @@ -380,7 +380,7 @@ exports[`props test 1`] = `
</div>
</div>
<div
class="nut-price nut-card-right-price-origin"
class="nut-price nut-price-primary nut-card-right-price-origin"
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand Down Expand Up @@ -465,7 +465,7 @@ exports[`tag slot test 1`] = `
class="nut-card-right-price"
>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand All @@ -489,7 +489,7 @@ exports[`tag slot test 1`] = `
</div>
</div>
<div
class="nut-price nut-card-right-price-origin"
class="nut-price nut-price-primary nut-card-right-price-origin"
>
<div
class="nut-price-symbol nut-price-symbol-normal"
Expand Down
18 changes: 6 additions & 12 deletions src/packages/cell/cell.taro.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
import React, { FunctionComponent, ReactNode, useContext } from 'react'
import React, { FunctionComponent, useContext } from 'react'
import classNames from 'classnames'
import { ITouchEvent, View } from '@tarojs/components'
import { BasicComponent, ComponentDefaults } from '@/utils/typings'
import { ComponentDefaults } from '@/utils/typings'
import { CellGroup } from '@/packages/cellgroup/cellgroup.taro'
import CellGroupContext from '@/packages/cellgroup/context'
import { useRtl } from '@/packages/configprovider/index.taro'
import pxTransform from '@/utils/px-transform'
import { CellProps } from './types'

export interface CellProps extends BasicComponent {
title: ReactNode
description: ReactNode
extra: ReactNode
radius: string | number
align: 'flex-start' | 'center' | 'flex-end'
clickable: boolean
isLast: boolean
interface CellTaroProps extends CellProps {
onClick: (
event: React.MouseEvent<HTMLDivElement, MouseEvent> | ITouchEvent
) => void
Expand All @@ -32,12 +26,12 @@ const defaultProps = {
onClick: (
event: React.MouseEvent<HTMLDivElement, MouseEvent> | ITouchEvent
) => {},
} as CellProps
} as CellTaroProps

const classPrefix = 'nut-cell'

export const Cell: FunctionComponent<
Partial<CellProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>
Partial<CellTaroProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>
> & { Group: typeof CellGroup } = (props) => {
const ctx = useContext(CellGroupContext)
const {
Expand Down
16 changes: 3 additions & 13 deletions src/packages/cell/cell.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
import React, { FunctionComponent, ReactNode, useContext } from 'react'
import React, { FunctionComponent, useContext } from 'react'
import classNames from 'classnames'
import { BasicComponent, ComponentDefaults } from '@/utils/typings'
import { ComponentDefaults } from '@/utils/typings'
import CellGroup from '@/packages/cellgroup'
import CellGroupContext from '@/packages/cellgroup/context'
import { useRtl } from '@/packages/configprovider'

export interface CellProps extends BasicComponent {
title: ReactNode
description: ReactNode
extra: ReactNode
radius: string | number
align: 'flex-start' | 'center' | 'flex-end'
clickable: boolean
isLast: boolean
onClick: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void
}
import { CellProps } from './types'

const defaultProps = {
...ComponentDefaults,
Expand Down
2 changes: 1 addition & 1 deletion src/packages/cell/index.taro.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Cell } from './cell.taro'

export type { CellProps } from './cell.taro'
export type { CellProps, CellAlign } from './types'
export default Cell
2 changes: 1 addition & 1 deletion src/packages/cell/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Cell } from './cell'

export type { CellProps } from './cell'
export type { CellProps, CellAlign } from './types'
export default Cell
14 changes: 14 additions & 0 deletions src/packages/cell/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { BasicComponent } from '@/utils/typings'

export type CellAlign = 'flex-start' | 'center' | 'flex-end' | 'baseline'

export interface CellProps extends BasicComponent {
title: React.ReactNode
description: React.ReactNode
extra: React.ReactNode
radius: string | number
align: CellAlign
clickable: boolean
isLast: boolean
onClick: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void
}
110 changes: 91 additions & 19 deletions src/packages/price/__test__/__snapshots__/price.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
exports[`props digits test 1`] = `
<div>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-large"
class="nut-price-symbol nut-price-symbol-normal"
>
¥
</div>
<div
class="nut-price-integer nut-price-integer-large "
class="nut-price-integer nut-price-integer-normal "
>
15213
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
122
</div>
Expand All @@ -32,25 +32,25 @@ exports[`props digits test 1`] = `
exports[`props symbol test 1`] = `
<div>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-large"
class="nut-price-symbol nut-price-symbol-normal"
>
$
</div>
<div
class="nut-price-integer nut-price-integer-large "
class="nut-price-integer nut-price-integer-normal "
>
10010
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
00
</div>
Expand All @@ -61,20 +61,68 @@ exports[`props symbol test 1`] = `
exports[`props test 1`] = `
<div>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-integer nut-price-integer-large "
class="nut-price-integer nut-price-integer-normal "
>
1,010
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
00
</div>
</div>
</div>
`;

exports[`props test 2`] = `
<div>
<div
class="nut-price nut-price-primary "
>
<div
class="nut-price-integer nut-price-integer-normal "
>
1,010
</div>
<div
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-normal "
>
00
</div>
</div>
</div>
`;

exports[`props test 3`] = `
<div>
<div
class="nut-price nut-price-primary "
>
<div
class="nut-price-integer nut-price-integer-normal "
>
1,010
</div>
<div
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-normal "
>
00
</div>
Expand All @@ -85,28 +133,52 @@ exports[`props test 1`] = `
exports[`props thousands test 1`] = `
<div>
<div
class="nut-price "
class="nut-price nut-price-primary "
>
<div
class="nut-price-symbol nut-price-symbol-large"
class="nut-price-symbol nut-price-symbol-normal"
>
$
</div>
<div
class="nut-price-integer nut-price-integer-large "
class="nut-price-integer nut-price-integer-normal "
>
10010
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-large "
class="nut-price-decimal nut-price-decimal-normal "
>
01
</div>
</div>
</div>
`;

exports[`props type 1`] = `
<div>
<div
class="nut-price nut-price-primary "
>
<div
class="nut-price-integer nut-price-integer-normal "
>
1,010
</div>
<div
class="nut-price-decimal nut-price-decimal-normal "
>
.
</div>
<div
class="nut-price-decimal nut-price-decimal-normal "
>
00
</div>
</div>
</div>
`;
Loading
Loading