Skip to content

Commit bea6173

Browse files
myronliu347myronliu347
committed
Merge remote-tracking branch 'upstream/master'
2 parents b05cddf + a93fc2d commit bea6173

File tree

167 files changed

+8127
-2279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+8127
-2279
lines changed

‎.fusion

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"publish-template": "@alifd/next-theme-template@2x",
44
"class-prefix": ".next",
55
"icon": {
6-
"iconfont-project-id": "544230",
7-
"iconfont-path": "//at.alicdn.com/t/font_t6jzs3l3nwtmaemi"
6+
"iconfont-project-id": "515771",
7+
"iconfont-path": "//at.alicdn.com/t/font_515771_7u6frotlpa6"
88
},
99
"import": {
1010
"sources": {
@@ -95,6 +95,7 @@
9595
"range": "lib/range/scss/variable.scss",
9696
"rating": "lib/rating/scss/variable.scss",
9797
"search": "lib/search/scss/variable.scss",
98+
"shell": "lib/shell/scss/variable.scss",
9899
"slider": "lib/slider/scss/variable.scss",
99100
"split-button": "lib/split-button/scss/variable.scss",
100101
"step": "lib/step/scss/variable.scss",
@@ -105,6 +106,7 @@
105106
"transfer": "lib/transfer/scss/variable.scss",
106107
"tree": "lib/tree/scss/variable.scss",
107108
"tree-select": "lib/tree-select/scss/variable.scss",
109+
"typography": "lib/typography/scss/variable.scss",
108110
"upload": "lib/upload/scss/variable.scss"
109111
}
110112
}

‎CHANGELOG.md

+66
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,71 @@
11
# Change Log
22

3+
## [1.18.3](https://github.com/alibaba-fusion/next/compare/1.18.2...1.18.3) (2019-09-30)
4+
5+
6+
### Bug Fixes
7+
8+
* **Icon:** correct eye/eye-close's width ([19b7d04](https://github.com/alibaba-fusion/next/commit/19b7d04))
9+
* **NumberPicker:** corner config ([db5929f](https://github.com/alibaba-fusion/next/commit/db5929f))
10+
* **NumberPicker:** fix display valueunder controlled. fix [#1163](https://github.com/alibaba-fusion/next/issues/1163) ([7207532](https://github.com/alibaba-fusion/next/commit/7207532))
11+
* **NumberPicker:** up down key ([6edc9a6](https://github.com/alibaba-fusion/next/commit/6edc9a6))
12+
* **Progress:** backgroundColor is invalid ([#1180](https://github.com/alibaba-fusion/next/issues/1180)) ([b4ee796](https://github.com/alibaba-fusion/next/commit/b4ee796))
13+
* **Typescript:** add field ([01fdcd2](https://github.com/alibaba-fusion/next/commit/01fdcd2))
14+
15+
16+
17+
18+
## [1.18.2](https://github.com/alibaba-fusion/next/compare/1.18.1...1.18.2) (2019-09-26)
19+
20+
21+
22+
23+
## [1.18.2](https://github.com/alibaba-fusion/next/compare/1.18.1...1.18.2) (2019-09-26)
24+
25+
26+
27+
28+
## [1.18.2](https://github.com/alibaba-fusion/next/compare/1.18.1...1.18.2) (2019-09-26)
29+
30+
31+
32+
33+
## [1.18.1](https://github.com/alibaba-fusion/next/compare/1.17.12...1.18.1) (2019-09-26)
34+
35+
36+
### Bug Fixes
37+
38+
* **ConfigProvider:** support component created by React.forwardRef() ([cc6d002](https://github.com/alibaba-fusion/next/commit/cc6d002))
39+
* **Dialog:** fullscreen mask click. fix [#927](https://github.com/alibaba-fusion/next/issues/927) ([#932](https://github.com/alibaba-fusion/next/issues/932)) ([e9b5d28](https://github.com/alibaba-fusion/next/commit/e9b5d28))
40+
* **Dialog:** option.type can only be set as alert or confirm ([be7d644](https://github.com/alibaba-fusion/next/commit/be7d644))
41+
* **Field:** spliceArray can remove a obj in array. close [#1091](https://github.com/alibaba-fusion/next/issues/1091) ([8cc5546](https://github.com/alibaba-fusion/next/commit/8cc5546))
42+
* **NumberPicker:** add variable for button corner. close [#1151](https://github.com/alibaba-fusion/next/issues/1151) ([882fa89](https://github.com/alibaba-fusion/next/commit/882fa89))
43+
* **Overlay:** fullscreen mask click issue with pr [#932](https://github.com/alibaba-fusion/next/issues/932) ([e117487](https://github.com/alibaba-fusion/next/commit/e117487))
44+
* **Tab:** all key should use string ([#1070](https://github.com/alibaba-fusion/next/issues/1070)) ([0d8396f](https://github.com/alibaba-fusion/next/commit/0d8396f))
45+
* **TimePicker:** support format HH ([e5924c2](https://github.com/alibaba-fusion/next/commit/e5924c2))
46+
47+
### Deprecated
48+
49+
* **ConfigProvider(pure):** deprecated API pure ([434e6e0](https://github.com/alibaba-fusion/next/commit/434e6e0))
50+
51+
52+
### Features
53+
54+
* **Field** use field and validate npm packages ([6e70255](https://github.com/alibaba-fusion/next/commit/6e70255))
55+
* **Card:** add free card ([5ee79c7](https://github.com/alibaba-fusion/next/commit/5ee79c7))
56+
* **ConfigProvider:** add popupContainer ([6631a55](https://github.com/alibaba-fusion/next/commit/6631a55))
57+
* **Field:** add api addArrayValue/deleteArrayValue for spliceArray ([ccc95e9](https://github.com/alibaba-fusion/next/commit/ccc95e9))
58+
* **Form:** add fullWidth prop ([c9e6ded](https://github.com/alibaba-fusion/next/commit/c9e6ded))
59+
* **Form:** api field={false} to disable inner field. fix [#1162](https://github.com/alibaba-fusion/next/issues/1162) ([4ed9cde](https://github.com/alibaba-fusion/next/commit/4ed9cde))
60+
* **Icon:** add new icon, close [#1114](https://github.com/alibaba-fusion/next/issues/1114) ([9651f2f](https://github.com/alibaba-fusion/next/commit/9651f2f))
61+
* **Transfer:** support customer panel ([7bef81e](https://github.com/alibaba-fusion/next/commit/7bef81e)) ([6a57e62](https://github.com/alibaba-fusion/next/commit/6a57e62))
62+
* **Notification:** add Notification Component ([f135a67](https://github.com/alibaba-fusion/next/commit/f135a67))
63+
* **Shell:** add Shell ([#1175](https://github.com/alibaba-fusion/next/issues/1175)) ([dd03a64](https://github.com/alibaba-fusion/next/commit/dd03a64))
64+
* **Typography:** add Typography, deprecated Paragraph ([ed3afce](https://github.com/alibaba-fusion/next/commit/ed3afce))
65+
66+
67+
68+
369
## [1.17.12](https://github.com/alibaba-fusion/next/compare/1.17.11...1.17.12) (2019-09-19)
470

571

‎LATESTLOG.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Latest Log
22

3-
## [1.17.12](https://github.com/alibaba-fusion/next/compare/1.17.11...1.17.12) (2019-09-19)
3+
## [1.18.3](https://github.com/alibaba-fusion/next/compare/1.18.2...1.18.3) (2019-09-30)
44

55

66
### Bug Fixes
77

8-
* **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))
9-
* **Overlay:** wrong object of reference in safari ([cba0d1e](https://github.com/alibaba-fusion/next/commit/cba0d1e))
10-
* **Rating:** click offset in allowHalf, close [#1123](https://github.com/alibaba-fusion/next/issues/1123) ([b4278c4](https://github.com/alibaba-fusion/next/commit/b4278c4))
11-
* **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))
12-
* **Tab:** fix tab nav border in fusion cool ([43d2013](https://github.com/alibaba-fusion/next/commit/43d2013))
13-
* **Util:** copy react node directly, close [#1132](https://github.com/alibaba-fusion/next/issues/1132) ([04618b0](https://github.com/alibaba-fusion/next/commit/04618b0))
8+
* **Icon:** correct eye/eye-close's width ([19b7d04](https://github.com/alibaba-fusion/next/commit/19b7d04))
9+
* **NumberPicker:** corner config ([db5929f](https://github.com/alibaba-fusion/next/commit/db5929f))
10+
* **NumberPicker:** fix display valueunder controlled. fix [#1163](https://github.com/alibaba-fusion/next/issues/1163) ([7207532](https://github.com/alibaba-fusion/next/commit/7207532))
11+
* **NumberPicker:** up down key ([6edc9a6](https://github.com/alibaba-fusion/next/commit/6edc9a6))
12+
* **Progress:** backgroundColor is invalid ([#1180](https://github.com/alibaba-fusion/next/issues/1180)) ([b4ee796](https://github.com/alibaba-fusion/next/commit/b4ee796))
13+
* **Typescript:** add field ([01fdcd2](https://github.com/alibaba-fusion/next/commit/01fdcd2))
1414

1515

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ English | [简体中文](./README.zh-cn.md)
66
</a>
77
</p>
88

9-
<p align="center">An enterprise-class UI solution for backend system, amied of settling the problems like cooperation between designers and front-developers, consistency of product experience and development efficiency.</p>
9+
<p align="center">An enterprise-class UI solution for backend system, aimed at settling the problems like cooperation between designers and front-developers, consistency of product experience and development efficiency.</p>
1010

1111
---
1212

‎docs/card/demo/free.md

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# 自定义卡片
2+
3+
- order: 5
4+
5+
与子组件的组合来自定义卡片样式
6+
7+
:::lang=en-us
8+
# Free Mode
9+
10+
- order: 5
11+
12+
Combination with subcomponents to customize card styles
13+
14+
:::
15+
16+
---
17+
18+
````jsx
19+
import { Card, Button } from '@alifd/next';
20+
21+
ReactDOM.render(
22+
<div>
23+
<Card
24+
className="free-card custom"
25+
free
26+
>
27+
<Card.Media image="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" />
28+
<div className="free-card-main">
29+
<Card.Header title="Title" subTitle="Sub Title" extra={<Button type="primary" text>Link</Button>} />
30+
<Card.Divider />
31+
<Card.Content>
32+
Lorem ipsum dolor sit amet, est viderer iuvaret perfecto et.
33+
</Card.Content>
34+
<Card.Actions>
35+
<Button type="primary" key="action1" text>Action 1</Button>
36+
<Button type="primary" key="action2" text>Action 2</Button>
37+
</Card.Actions>
38+
</div>
39+
</Card>
40+
<br/>
41+
<Card
42+
className="free-card"
43+
free
44+
>
45+
<Card.Media style={{ height: 140 }} image="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" />
46+
<Card.BulletHeader title="Title" subTitle="Sub Title" extra={<Button type="primary" text>Link</Button>} />
47+
<Card.CollaspeContent contentHeight="auto">
48+
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.
49+
</Card.CollaspeContent>
50+
<Card.Actions>
51+
<Button type="primary" key="action1" text>Action 1</Button>
52+
<Button type="primary" key="action2" text>Action 2</Button>
53+
</Card.Actions>
54+
</Card>
55+
56+
<Card
57+
className="free-card"
58+
free
59+
>
60+
<Card.Media style={{ height: 140 }} image="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" />
61+
<Card.Header title="Title" subTitle="Sub Title" extra={<Button type="primary" text>Link</Button>} />
62+
<Card.Divider />
63+
<Card.Content>
64+
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.
65+
</Card.Content>
66+
<Card.Actions>
67+
<Button type="primary" key="action1" text>Action 1</Button>
68+
<Button type="primary" key="action2" text>Action 2</Button>
69+
</Card.Actions>
70+
</Card>
71+
</div>
72+
, mountNode);
73+
````
74+
75+
````css
76+
.free-card {
77+
display: inline-block;
78+
width: 300px;
79+
vertical-align: top;
80+
}
81+
.free-card + .free-card {
82+
margin-left: 20px;
83+
}
84+
85+
.free-card.custom {
86+
display: flex;
87+
justify-content: space-between;
88+
width: 500px;
89+
height: 200px;
90+
}
91+
92+
.free-card.custom .next-card-media {
93+
height: 100%;
94+
width: 200px;
95+
flex-shrink: 0;
96+
}
97+
98+
.free-card-main {
99+
display: flex;
100+
flex-direction: column;
101+
align-items: stretch;
102+
}
103+
104+
.free-card-main .next-card-content-container {
105+
flex: 1;
106+
}
107+
108+
.free-card-main .next-card-actions {
109+
text-align: right;
110+
}
111+
````

‎docs/card/demo/media.md

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# 多媒体内容
2+
3+
- order: 4
4+
5+
下面是一个使用图像来增强内容的卡片示例。
6+
7+
:::lang=en-us
8+
# Media Content
9+
10+
- order: 4
11+
12+
Here is an example of a card that uses images to enhance content.
13+
14+
:::
15+
16+
---
17+
18+
````jsx
19+
import { Card, Button } from '@alifd/next';
20+
21+
ReactDOM.render(
22+
<Card
23+
className="media-card"
24+
media={<img src="https://img.alicdn.com/tfs/TB1FNIOSFXXXXaWXXXXXXXXXXXX-260-188.png" />}
25+
contentHeight="auto"
26+
title="Title"
27+
subTitle="Sub Title"
28+
extra={[
29+
<Button type="primary" key="action1" text>More</Button>
30+
]}
31+
actions={[
32+
<Button type="primary" key="action1" text>Action 1</Button>,
33+
<Button type="primary" key="action2" text>Action 2</Button>
34+
]}
35+
>
36+
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.
37+
38+
</Card>
39+
, mountNode);
40+
````
41+
42+
````css
43+
.media-card {
44+
width: 300px;
45+
}
46+
47+
.custom-card p {
48+
color: #999;
49+
}
50+
````

‎docs/card/index.en-us.md

+38
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,41 @@ A card could contain a photo, text, and a link about a single subject.
2727
| showHeadDivider | If show head divider | Boolean | true |
2828
| contentHeight | Height of content | String/Number | 120 |
2929
| extra | Extra of card header | ReactNode | - |
30+
| media | Media content | ReactNode | - |
31+
| actions | Actions of card | ReactNode | - |
32+
| free | Whether to open free mode, if opened, can`t set title subTitle ..., must use Card.Header Card.Content ... to set Card | Boolean | - |
33+
34+
### Card.Actions
35+
36+
| 参数 | 说明 | 类型 | 默认值 |
37+
| --------- | ------ | ------ | ----- |
38+
| component | The html tag to be rendered | custom | 'div' |
39+
40+
### Card.Content
41+
42+
| 参数 | 说明 | 类型 | 默认值 |
43+
| --------- | ------ | ------ | ----- |
44+
| component | The html tag to be rendered | custom | 'div' |
45+
46+
### Card.Divider
47+
48+
| 参数 | 说明 | 类型 | 默认值 |
49+
| --------- | ------ | ------ | ---- |
50+
| component | The html tag to be rendered | custom | 'hr' |
51+
52+
### Card.Header
53+
54+
| 参数 | 说明 | 类型 | 默认值 |
55+
| --------- | ------------ | --------- | ----- |
56+
| title | Title of card | ReactNode | - |
57+
| subTitle | Sub Title of Card | ReactNode | - |
58+
| extra | Extra of card header | ReactNode | - |
59+
| component | The html tag to be rendered | custom | 'div' |
60+
61+
### Card.Media
62+
63+
| 参数 | 说明 | 类型 | 默认值 |
64+
| --------- | ------- | ------ | ----- |
65+
| component | The html tag to be rendered | custom | 'div' |
66+
| image | Media background image | String | - |
67+
| src | Media source URL | String | - |

‎docs/card/index.md

+46-8
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,49 @@
1919

2020
### Card
2121

22-
| 参数 | 说明 | 类型 | 默认值 |
23-
| --------------- | ------------ | ------------- | ---- |
24-
| title | 卡片的标题 | ReactNode | - |
25-
| subTitle | 卡片的副标题 | ReactNode | - |
26-
| showTitleBullet | 是否显示标题的项目符号 | Boolean | true |
27-
| showHeadDivider | 是否展示头部的分隔线 | Boolean | true |
28-
| contentHeight | 内容区域的固定高度 | String/Number | 120 |
29-
| extra | 标题区域的用户自定义内容 | ReactNode | - |
22+
| 参数 | 说明 | 类型 | 默认值 |
23+
| --------------- | ------------------------------------------------------------ | ------------- | ----- |
24+
| media | 卡片的上的图片 / 视频 | ReactNode | - |
25+
| title | 卡片的标题 | ReactNode | - |
26+
| subTitle | 卡片的副标题 | ReactNode | - |
27+
| actions | 卡片操作组，位置在卡片底部 | ReactNode | - |
28+
| showTitleBullet | 是否显示标题的项目符号 | Boolean | true |
29+
| showHeadDivider | 是否展示头部的分隔线 | Boolean | true |
30+
| contentHeight | 内容区域的固定高度 | String/Number | 120 |
31+
| extra | 标题区域的用户自定义内容 | ReactNode | - |
32+
| free | 是否开启自由模式，开启后card 将使用子组件配合使用, 设置此项后 title, subtitle, 等等属性都将失效 | Boolean | false |
33+
34+
### Card.Media
35+
36+
| 参数 | 说明 | 类型 | 默认值 |
37+
| --------- | ------- | ------ | ----- |
38+
| component | 设置标签类型 | custom | 'div' |
39+
| image | 背景图片地址 | String | - |
40+
| src | 媒体源文件地址 | String | - |
41+
42+
### Card.Header
43+
44+
| 参数 | 说明 | 类型 | 默认值 |
45+
| --------- | ------------ | --------- | ----- |
46+
| title | 卡片的标题 | ReactNode | - |
47+
| subTitle | 卡片的副标题 | ReactNode | - |
48+
| extra | 标题区域的用户自定义内容 | ReactNode | - |
49+
| component | 设置标签类型 | custom | 'div' |
50+
51+
### Card.Content
52+
53+
| 参数 | 说明 | 类型 | 默认值 |
54+
| --------- | ------ | ------ | ----- |
55+
| component | 设置标签类型 | custom | 'div' |
56+
57+
### Card.Divider
58+
59+
| 参数 | 说明 | 类型 | 默认值 |
60+
| --------- | ------ | ------ | ---- |
61+
| component | 设置标签类型 | custom | 'hr' |
62+
63+
### Card.Actions
64+
65+
| 参数 | 说明 | 类型 | 默认值 |
66+
| --------- | ------ | ------ | ----- |
67+
| component | 设置标签类型 | custom | 'div' |

0 commit comments

Comments
 (0)