Skip to content

datepicker-today添加picker写类型选项 #94

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.

Sign up for GitHub

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

Merged
zhipenglin merged 1 commit into from
Mar 24, 2026
Merged

datepicker-today添加picker写类型选项 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,8 @@ const DatePickerExample = () => {
<Flex vertical gap={16}>
<DatePickerToday name="basicToday" label="基础日期范围" />
<DatePickerToday name="requiredToday" label="必选范围" rule="REQ" />
<DatePickerToday name="monthPicker" label="月份选择" picker="month" />
<DatePickerToday name="yearPicker" label="年份选择" picker="year" />
<DatePickerToday
name="customSoFarText"
label="自定义至今文本"
Expand Down Expand Up @@ -1331,14 +1333,15 @@ render(<ButtonsExample />);

#### 属性

| 属性 | 类型 | 默认值 | 描述 |
|------------|------------|-----------|--------------------------------|
| name | `string` | - | 字段名称（必填） |
| label | `string` | - | 字段标签 |
| rule | `string` | - | 校验规则 |
| soFarText | `string` | `'至今'` | "至今"按钮显示的文本 |
| soFarValue | `string` | `'soFar'` | 选择"至今"时的结束日期值，可通过此值判断是否选择了至今 |
| onChange | `function` | - | 值变化回调 `([start, end]) => void` |
| 属性 | 类型 | 默认值 | 描述 |
|------------|------------------------------------------|-----------|--------------------------------|
| name | `string` | - | 字段名称（必填） |
| label | `string` | - | 字段标签 |
| rule | `string` | - | 校验规则 |
| picker | `'date' \| 'week' \| 'month' \| 'year'` | `'date'` | 选择器类型 |
| soFarText | `string` | `'至今'` | "至今"按钮显示的文本 |
| soFarValue | `string` | `'soFar'` | 选择"至今"时的结束日期值，可通过此值判断是否选择了至今 |
| onChange | `function` | - | 值变化回调 `([start, end]) => void` |

#### 返回值说明

Expand Down
17 changes: 9 additions & 8 deletions doc/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,15 @@

#### 属性

| 属性 | 类型 | 默认值 | 描述 |
|------------|------------|-----------|--------------------------------|
| name | `string` | - | 字段名称（必填） |
| label | `string` | - | 字段标签 |
| rule | `string` | - | 校验规则 |
| soFarText | `string` | `'至今'` | "至今"按钮显示的文本 |
| soFarValue | `string` | `'soFar'` | 选择"至今"时的结束日期值，可通过此值判断是否选择了至今 |
| onChange | `function` | - | 值变化回调 `([start, end]) => void` |
| 属性 | 类型 | 默认值 | 描述 |
|------------|------------------------------------------|-----------|--------------------------------|
| name | `string` | - | 字段名称（必填） |
| label | `string` | - | 字段标签 |
| rule | `string` | - | 校验规则 |
| picker | `'date' \| 'week' \| 'month' \| 'year'` | `'date'` | 选择器类型 |
| soFarText | `string` | `'至今'` | "至今"按钮显示的文本 |
| soFarValue | `string` | `'soFar'` | 选择"至今"时的结束日期值，可通过此值判断是否选择了至今 |
| onChange | `function` | - | 值变化回调 `([start, end]) => void` |

#### 返回值说明

Expand Down
2 changes: 2 additions & 0 deletions doc/date-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ const DatePickerExample = () => {
<Flex vertical gap={16}>
<DatePickerToday name="basicToday" label="基础日期范围" />
<DatePickerToday name="requiredToday" label="必选范围" rule="REQ" />
<DatePickerToday name="monthPicker" label="月份选择" picker="month" />
<DatePickerToday name="yearPicker" label="年份选择" picker="year" />
<DatePickerToday
name="customSoFarText"
label="自定义至今文本"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kne/react-form-antd",
"version": "4.1.0",
"version": "4.1.1",
"syntax": {
"esmodules": true
},
Expand Down
4 changes: 3 additions & 1 deletion src/fields/DatePickerToday.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import withLocale, {useIntl} from '../withLocale';

const {useOnChange} = hooks;

const PickerTodayInner = ({soFarText, soFarValue = 'soFar', ...props}) => {
const PickerTodayInner = ({soFarText, soFarValue = 'soFar', picker = 'date', ...props}) => {
const {formatMessage} = useIntl();
const [data, onChange] = useControlValue(props);
const [openStart, setOpenStart] = useState(false);
Expand Down Expand Up @@ -189,6 +189,7 @@ const PickerTodayInner = ({soFarText, soFarValue = 'soFar', ...props}) => {

{/* 开始时间 DatePicker */}
<DatePicker
picker={picker}
open={openStart}
onOpenChange={handleStartOpenChange}
value={tempStart || parsedValue.start}
Expand All @@ -202,6 +203,7 @@ const PickerTodayInner = ({soFarText, soFarValue = 'soFar', ...props}) => {

{/* 结束时间 DatePicker */}
<DatePicker
picker={picker}
open={openEnd}
onOpenChange={handleEndOpenChange}
value={tempEnd || parsedValue.end}
Expand Down
Loading