chore: merge feature into master #27488

ycjcl868 · 2020-11-02T02:02:45Z

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language	Changelog
🇺🇸 English
🇨🇳 Chinese

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

Doc is updated/provided or not needed
Demo is updated/provided or not needed
TypeScript definition is updated/provided or not needed
Changelog is provided or not needed

* feat: Input.Textarea add size props * update snapshot * update snapshot * add case * fix code

chore: merge 4.7.0 release to feature

chore: merge master into feature

* feat: add loading prop for Statistic * feat: update statistic demo * feat: add style dependency * feat: replace loading component * feat: update doc of statistic * fix loading type * feat: add loading prop for Statistic * feat: update statistic demo * update api version Co-authored-by: lvpansen <pansen.lv@atzuche.com>

* feat: ConfigProvider add form requiredMark * Update Form.tsx

* feat: modal.update() supports functional updating (#27162) * docs: add version tip for modal.update() api

chore: merge master into feature

* feat: Avatar.Group add size props * change type

* fix: border style of Input.Search when allowClear (#27325) * fix: border style of Input.Search when allowClear * fix css * update * change name * docs: 4.7.3 changelog (#27350) * docs: 4.7.3 changelog * docs: Patch 27325 * chore: improve useCombinedRefs (#27352) * docs: 📝 update introduce * chore: fix API table border * chore: Adjust collapse arrow position align with first line Co-authored-by: xrk <xrkffgg@gmail.com> Co-authored-by: Tom Xu <ycxzhkx@gmail.com> Co-authored-by: afc163 <afc163@gmail.com>

chore: merge master into featrue

…27376)

chore: merge master to feature

chore: Feature merge master

* feat: Support noWrap * test: update snapshot * fix: Miss check * test: fix snapshot * refactor: rename to wrap * update snapshot

* feat: support Image element prop for Avatar component * feat: reuse src prop instead of new image prop * fix: update snapshot * fix: re-update snapshots with latest dependencies

ant-design-bot · 2020-11-02T02:07:42Z

codesandbox-ci · 2020-11-02T02:18:16Z

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 39c192a:

Sandbox	Source
antd reproduction template	Configuration

github-actions · 2020-11-02T02:22:05Z

Size Change: +314 B (0%)

Total Size: 792 kB

Filename	Size	Change
`./dist/antd-with-locales.min.js`	314 kB	+132 B (0%)
`./dist/antd.compact.min.css`	66.5 kB	+8 B (0%)
`./dist/antd.dark.min.css`	67.8 kB	+9 B (0%)
`./dist/antd.min.css`	66.5 kB	+9 B (0%)
`./dist/antd.min.js`	277 kB	+156 B (0%)

_{compressed-size-action}

fireairforce and others added 28 commits October 12, 2020 20:39

feat: Input.Textarea support size props (#27110)

e6cc000

* feat: Input.Textarea add size props * update snapshot * update snapshot * add case * fix code

merge feature

288f0ca

Merge pull request #27122 from ant-design/master-to-merge-feature

1123666

chore: merge 4.7.0 release to feature

Merge pull request #27137 from ant-design/master

2788140

chore: merge master into feature

feat: 🖼 Image support preview.getContainer (#26713)

7d59890

Merge branch 'feature' into merge-into-feature

1f1956c

fix conflict

605bb2f

update snap

4cd2cfa

Merge pull request #27275 from ant-design/merge-into-feature

bcc05fc

chore: merge master into feature

feat: Modal method add bodyStyle (#27292)

b969bb4

docs: image fear add version (#27291)

5e1665d

docs(Modal): add version (#27300)

888e28f

feat: ConfigProvider add form requiredMark (#27322)

7e782da

* feat: ConfigProvider add form requiredMark * Update Form.tsx

feat: modal.update() supports functional updating (#27162) (#27163)

ab4aeca

* feat: modal.update() supports functional updating (#27162) * docs: add version tip for modal.update() api

Merge branch 'feature' into merge

7be4339

fix: snap

af6d8f7

Merge pull request #27349 from ant-design/merge

bae5509

chore: merge master into feature

feat: Avatar.Group add size props (#27348)

6b1d73b

* feat: Avatar.Group add size props * change type

feat: Table summary support align (#27365)

23f8cce

Merge pull request #27388 from ant-design/master

6880bf7

chore: merge master into featrue

feat: components used in confirm title and content support prefixCls (#…

7c0e888

…27376)

Merge pull request #27421 from shaodahong/merge-to-feature

4ec9e23

chore: merge master to feature

chore: feature merge master

0bf5a43

Merge pull request #27477 from ant-design/feature-merge-master

f6f3166

chore: Feature merge master

feat: Row support wrap (#27469)

d052543

* feat: Support noWrap * test: update snapshot * fix: Miss check * test: fix snapshot * refactor: rename to wrap * update snapshot

feat: support Image element prop for Avatar component (#27448)

0afb8de

* feat: support Image element prop for Avatar component * feat: reuse src prop instead of new image prop * fix: update snapshot * fix: re-update snapshots with latest dependencies

pr-triage bot added the PR: unreviewed label Nov 2, 2020

ycjcl868 mentioned this pull request Nov 2, 2020

[WIP]chore: merge feature into master #27290

Closed

19 tasks

Merge branch 'master' into chore-conflict-feature

39c192a

ycjcl868 requested a review from zombieJ November 2, 2020 02:04

zombieJ approved these changes Nov 2, 2020

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Nov 2, 2020

ycjcl868 merged commit 2a4027b into master Nov 2, 2020

ycjcl868 deleted the chore-conflict-feature branch November 2, 2020 02:19

pr-triage bot added PR: merged and removed PR: reviewed-approved labels Nov 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: merge feature into master #27488

chore: merge feature into master #27488

ycjcl868 commented Nov 2, 2020 •

edited by markdownify bot

ant-design-bot commented Nov 2, 2020 •

edited

codesandbox-ci bot commented Nov 2, 2020

github-actions bot commented Nov 2, 2020

chore: merge feature into master #27488

chore: merge feature into master #27488

Conversation

ycjcl868 commented Nov 2, 2020 • edited by markdownify bot

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self Check before Merge

ant-design-bot commented Nov 2, 2020 • edited

codesandbox-ci bot commented Nov 2, 2020

github-actions bot commented Nov 2, 2020

ycjcl868 commented Nov 2, 2020 •

edited by markdownify bot

ant-design-bot commented Nov 2, 2020 •

edited