Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
- Loading branch information
Showing
167 changed files
with
8,127 additions
and
2,279 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| # Latest Log | ||
|
|
||
| ## [1.17.12](https://github.com/alibaba-fusion/next/compare/1.17.11...1.17.12) (2019-09-19) | ||
| ## [1.18.3](https://github.com/alibaba-fusion/next/compare/1.18.2...1.18.3) (2019-09-30) | ||
|
|
||
|
|
||
| ### Bug Fixes | ||
|
|
||
| * **Input:** border should collapse in input group, close [#1127](https://github.com/alibaba-fusion/next/issues/1127) ([ac4e604](https://github.com/alibaba-fusion/next/commit/ac4e604)) | ||
| * **Overlay:** wrong object of reference in safari ([cba0d1e](https://github.com/alibaba-fusion/next/commit/cba0d1e)) | ||
| * **Rating:** click offset in allowHalf, close [#1123](https://github.com/alibaba-fusion/next/issues/1123) ([b4278c4](https://github.com/alibaba-fusion/next/commit/b4278c4)) | ||
| * **Select:** popupStyle width should override autoWidth, close [#1075](https://github.com/alibaba-fusion/next/issues/1075) ([0e75a2f](https://github.com/alibaba-fusion/next/commit/0e75a2f)) | ||
| * **Tab:** fix tab nav border in fusion cool ([43d2013](https://github.com/alibaba-fusion/next/commit/43d2013)) | ||
| * **Util:** copy react node directly, close [#1132](https://github.com/alibaba-fusion/next/issues/1132) ([04618b0](https://github.com/alibaba-fusion/next/commit/04618b0)) | ||
| * **Icon:** correct eye/eye-close's width ([19b7d04](https://github.com/alibaba-fusion/next/commit/19b7d04)) | ||
| * **NumberPicker:** corner config ([db5929f](https://github.com/alibaba-fusion/next/commit/db5929f)) | ||
| * **NumberPicker:** fix display valueunder controlled. fix [#1163](https://github.com/alibaba-fusion/next/issues/1163) ([7207532](https://github.com/alibaba-fusion/next/commit/7207532)) | ||
| * **NumberPicker:** up down key ([6edc9a6](https://github.com/alibaba-fusion/next/commit/6edc9a6)) | ||
| * **Progress:** backgroundColor is invalid ([#1180](https://github.com/alibaba-fusion/next/issues/1180)) ([b4ee796](https://github.com/alibaba-fusion/next/commit/b4ee796)) | ||
| * **Typescript:** add field ([01fdcd2](https://github.com/alibaba-fusion/next/commit/01fdcd2)) | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| # 自定义卡片 | ||
|
|
||
| - order: 5 | ||
|
|
||
| 与子组件的组合来自定义卡片样式 | ||
|
|
||
| :::lang=en-us | ||
| # Free Mode | ||
|
|
||
| - order: 5 | ||
|
|
||
| Combination with subcomponents to customize card styles | ||
|
|
||
| ::: | ||
|
|
||
| --- | ||
|
|
||
| ````jsx | ||
| import { Card, Button } from '@alifd/next'; | ||
|
|
||
| ReactDOM.render( | ||
| <div> | ||
| <Card | ||
| className="free-card custom" | ||
| free | ||
| > | ||
| <Card.Media image="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" /> | ||
| <div className="free-card-main"> | ||
| <Card.Header title="Title" subTitle="Sub Title" extra={<Button type="primary" text>Link</Button>} /> | ||
| <Card.Divider /> | ||
| <Card.Content> | ||
| Lorem ipsum dolor sit amet, est viderer iuvaret perfecto et. | ||
| </Card.Content> | ||
| <Card.Actions> | ||
| <Button type="primary" key="action1" text>Action 1</Button> | ||
| <Button type="primary" key="action2" text>Action 2</Button> | ||
| </Card.Actions> | ||
| </div> | ||
| </Card> | ||
| <br/> | ||
| <Card | ||
| className="free-card" | ||
| free | ||
| > | ||
| <Card.Media style={{ height: 140 }} image="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" /> | ||
| <Card.BulletHeader title="Title" subTitle="Sub Title" extra={<Button type="primary" text>Link</Button>} /> | ||
| <Card.CollaspeContent contentHeight="auto"> | ||
| Lorem ipsum dolor sit amet, est viderer iuvaret perfecto et. Ne petentium quaerendum nec, eos ex recteque mediocritatem, ex usu assum legendos temporibus. Ius feugiat pertinacia an, cu verterem praesent quo. | ||
| </Card.CollaspeContent> | ||
| <Card.Actions> | ||
| <Button type="primary" key="action1" text>Action 1</Button> | ||
| <Button type="primary" key="action2" text>Action 2</Button> | ||
| </Card.Actions> | ||
| </Card> | ||
|
|
||
| <Card | ||
| className="free-card" | ||
| free | ||
| > | ||
| <Card.Media style={{ height: 140 }} image="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" /> | ||
| <Card.Header title="Title" subTitle="Sub Title" extra={<Button type="primary" text>Link</Button>} /> | ||
| <Card.Divider /> | ||
| <Card.Content> | ||
| Lorem ipsum dolor sit amet, est viderer iuvaret perfecto et. Ne petentium quaerendum nec, eos ex recteque mediocritatem, ex usu assum legendos temporibus. Ius feugiat pertinacia an, cu verterem praesent quo. | ||
| </Card.Content> | ||
| <Card.Actions> | ||
| <Button type="primary" key="action1" text>Action 1</Button> | ||
| <Button type="primary" key="action2" text>Action 2</Button> | ||
| </Card.Actions> | ||
| </Card> | ||
| </div> | ||
| , mountNode); | ||
| ```` | ||
|
|
||
| ````css | ||
| .free-card { | ||
| display: inline-block; | ||
| width: 300px; | ||
| vertical-align: top; | ||
| } | ||
| .free-card + .free-card { | ||
| margin-left: 20px; | ||
| } | ||
|
|
||
| .free-card.custom { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| width: 500px; | ||
| height: 200px; | ||
| } | ||
|
|
||
| .free-card.custom .next-card-media { | ||
| height: 100%; | ||
| width: 200px; | ||
| flex-shrink: 0; | ||
| } | ||
|
|
||
| .free-card-main { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: stretch; | ||
| } | ||
|
|
||
| .free-card-main .next-card-content-container { | ||
| flex: 1; | ||
| } | ||
|
|
||
| .free-card-main .next-card-actions { | ||
| text-align: right; | ||
| } | ||
| ```` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| # 多媒体内容 | ||
|
|
||
| - order: 4 | ||
|
|
||
| 下面是一个使用图像来增强内容的卡片示例。 | ||
|
|
||
| :::lang=en-us | ||
| # Media Content | ||
|
|
||
| - order: 4 | ||
|
|
||
| Here is an example of a card that uses images to enhance content. | ||
|
|
||
| ::: | ||
|
|
||
| --- | ||
|
|
||
| ````jsx | ||
| import { Card, Button } from '@alifd/next'; | ||
|
|
||
| ReactDOM.render( | ||
| <Card | ||
| className="media-card" | ||
| media={<img src="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" />} | ||
| contentHeight="auto" | ||
| title="Title" | ||
| subTitle="Sub Title" | ||
| extra={[ | ||
| <Button type="primary" key="action1" text>More</Button> | ||
| ]} | ||
| actions={[ | ||
| <Button type="primary" key="action1" text>Action 1</Button>, | ||
| <Button type="primary" key="action2" text>Action 2</Button> | ||
| ]} | ||
| > | ||
| Lorem ipsum dolor sit amet, est viderer iuvaret perfecto et. Ne petentium quaerendum nec, eos ex recteque mediocritatem, ex usu assum legendos temporibus. Ius feugiat pertinacia an, cu verterem praesent quo. | ||
|
|
||
| </Card> | ||
| , mountNode); | ||
| ```` | ||
|
|
||
| ````css | ||
| .media-card { | ||
| width: 300px; | ||
| } | ||
|
|
||
| .custom-card p { | ||
| color: #999; | ||
| } | ||
| ```` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.