chore: auto merge branches (#36431)

chore: Next merge master
This commit is contained in:
github-actions[bot] 2022-07-08 04:07:51 +00:00 committed by GitHub
commit 112cbdea38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 18 deletions

View File

@ -3481,8 +3481,8 @@ exports[`renders ./components/calendar/demo/customize-header.md extend context c
/> />
</div> </div>
<div <div
aria-selected="false" aria-selected="true"
class="ant-select-item ant-select-item-option year-item" class="ant-select-item ant-select-item-option year-item ant-select-item-option-selected"
title="2016" title="2016"
> >
<div <div

View File

@ -46,16 +46,16 @@ const App: React.FC = () => {
months.push(localeData.monthsShort(current)); months.push(localeData.monthsShort(current));
} }
for (let index = start; index < end; index++) { for (let i = start; i < end; i++) {
monthOptions.push( monthOptions.push(
<Select.Option className="month-item" key={`${index}`}> <Select.Option key={i} value={i} className="month-item">
{months[index]} {months[i]}
</Select.Option>, </Select.Option>,
); );
} }
const month = value.month();
const year = value.year(); const year = value.year();
const month = value.month();
const options = []; const options = [];
for (let i = year - 10; i < year + 10; i += 1) { for (let i = year - 10; i < year + 10; i += 1) {
options.push( options.push(
@ -83,11 +83,11 @@ const App: React.FC = () => {
size="small" size="small"
dropdownMatchSelectWidth={false} dropdownMatchSelectWidth={false}
className="my-year-select" className="my-year-select"
value={year}
onChange={newYear => { onChange={newYear => {
const now = value.clone().year(Number(newYear)); const now = value.clone().year(newYear);
onChange(now); onChange(now);
}} }}
value={String(year)}
> >
{options} {options}
</Select> </Select>
@ -96,11 +96,10 @@ const App: React.FC = () => {
<Select <Select
size="small" size="small"
dropdownMatchSelectWidth={false} dropdownMatchSelectWidth={false}
value={String(month)} value={month}
onChange={selectedMonth => { onChange={newMonth => {
const newValue = value.clone(); const now = value.clone().month(newMonth);
newValue.month(parseInt(selectedMonth, 10)); onChange(now);
onChange(newValue);
}} }}
> >
{monthOptions} {monthOptions}

View File

@ -495,7 +495,7 @@ React can not get correct interaction of controlled component with async value u
See similar issues: [#28370](https://github.com/ant-design/ant-design/issues/28370) [#27994](https://github.com/ant-design/ant-design/issues/27994) See similar issues: [#28370](https://github.com/ant-design/ant-design/issues/28370) [#27994](https://github.com/ant-design/ant-design/issues/27994)
`scrollToFirstError` and `scrollToField` deps on `id` attribute passed to form control, please mark sure that it hasn't been ignored in your custom form control. Check [codesandbox](https://codesandbox.io/s/antd-reproduction-template-forked-25nul?file=/index.js) for solution. `scrollToFirstError` and `scrollToField` deps on `id` attribute passed to form control, please make sure that it hasn't been ignored in your custom form control. Check [codesandbox](https://codesandbox.io/s/antd-reproduction-template-forked-25nul?file=/index.js) for solution.
### `setFieldsValue` do not trigger `onFieldsChange` or `onValuesChange`? ### `setFieldsValue` do not trigger `onFieldsChange` or `onValuesChange`?

View File

@ -61,7 +61,7 @@ const genFixedStyle: GenerateStyle<TableToken, CSSObject> = token => {
position: 'absolute', position: 'absolute',
top: 0, top: 0,
bottom: 0, bottom: 0,
zIndex: 1, zIndex: zIndexTableFixed,
width: 30, width: 30,
transition: `box-shadow ${motionDurationSlow}`, transition: `box-shadow ${motionDurationSlow}`,
content: '""', content: '""',

View File

@ -113,7 +113,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/GOM1KQ24O/Typography.svg
| onChange | 文本域编辑时触发 | function(event) | - | | | onChange | 文本域编辑时触发 | function(event) | - | |
| onEnd | 按 ENTER 结束编辑状态时触发 | function | - | 4.14.0 | | onEnd | 按 ENTER 结束编辑状态时触发 | function | - | 4.14.0 |
| onStart | 进入编辑中状态时触发 | function | - | | | onStart | 进入编辑中状态时触发 | function | - | |
| triggerType | Edit mode trigger - icon, text or both (not specifying icon as trigger hides it) | Array&lt;`icon`\|`text`> | \[`icon`] | | | triggerType | 编辑模式触发器类型,图标、文本或者两者都设置(不设置图标作为触发器时它会隐藏) | Array&lt;`icon`\|`text`> | \[`icon`] | |
| enterIcon | 在编辑段中自定义“enter”图标传递“null”将删除图标 | ReactNode | `<EnterOutlined />` | 4.17.0 | | enterIcon | 在编辑段中自定义“enter”图标传递“null”将删除图标 | ReactNode | `<EnterOutlined />` | 4.17.0 |
### ellipsis ### ellipsis

View File

@ -561,7 +561,7 @@
@modal-header-title-line-height: 22px; @modal-header-title-line-height: 22px;
@modal-header-title-font-size: @font-size-lg; @modal-header-title-font-size: @font-size-lg;
@modal-header-border-color-split: @border-color-split; @modal-header-border-color-split: @border-color-split;
@modal-header-close-size: 56px; @modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical;
@modal-content-bg: @component-background; @modal-content-bg: @component-background;
@modal-heading-color: @heading-color; @modal-heading-color: @heading-color;
@modal-close-color: @text-color-secondary; @modal-close-color: @text-color-secondary;

View File

@ -616,7 +616,7 @@
@modal-header-title-line-height: 22px; @modal-header-title-line-height: 22px;
@modal-header-title-font-size: @font-size-lg; @modal-header-title-font-size: @font-size-lg;
@modal-header-border-color-split: @border-color-split; @modal-header-border-color-split: @border-color-split;
@modal-header-close-size: 56px; @modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical;
@modal-content-bg: @component-background; @modal-content-bg: @component-background;
@modal-heading-color: @heading-color; @modal-heading-color: @heading-color;
@modal-close-color: @text-color-secondary; @modal-close-color: @text-color-secondary;