Skip to content

Commit 74f0f1b

Browse files
committed
chore(Overlay): merge 1.25
2 parents 206f6ba + 1583e14 commit 74f0f1b

File tree

51 files changed

+856
-254
lines changed

Some content is hidden

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

51 files changed

+856
-254
lines changed

CHANGELOG.md

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

3+
## [1.24.15](https://github.com/alibaba-fusion/next/compare/1.24.14...1.24.15) (2021-11-09)
4+
5+
6+
### Bug Fixes
7+
8+
* correct style order of next.var.css, close [#3493](https://github.com/alibaba-fusion/next/issues/3493) ([6b8ff04](https://github.com/alibaba-fusion/next/commit/6b8ff04))
9+
10+
11+
### Features
12+
13+
* **Upload:** new api previewOnFileName to set onPreview on filename. fix [#3455](https://github.com/alibaba-fusion/next/issues/3455) ([fd3d04a](https://github.com/alibaba-fusion/next/commit/fd3d04a))
14+
15+
16+
17+
18+
## [1.24.14](https://github.com/alibaba-fusion/next/compare/1.24.13...1.24.14) (2021-11-04)
19+
20+
21+
### Bug Fixes
22+
23+
* **Affix:** container can update, close [#3473](https://github.com/alibaba-fusion/next/issues/3473) ([66e084f](https://github.com/alibaba-fusion/next/commit/66e084f))
24+
* **Input:** ts add isPreview and renderPreview, close [#3478](https://github.com/alibaba-fusion/next/issues/3478) ([74c664a](https://github.com/alibaba-fusion/next/commit/74c664a))
25+
26+
27+
### Features
28+
29+
* **Input:** add hoverShowClear api to show clear icon only when hover, resolve [#3441](https://github.com/alibaba-fusion/next/issues/3441) ([aee2c67](https://github.com/alibaba-fusion/next/commit/aee2c67))
30+
31+
32+
33+
34+
## [1.24.13](https://github.com/alibaba-fusion/next/compare/1.24.12...1.24.13) (2021-11-03)
35+
36+
37+
### Bug Fixes
38+
39+
* **DatePicker2:** use flex-basis instead width to be compiable with safari, close [#3463](https://github.com/alibaba-fusion/next/issues/3463) ([b13021e](https://github.com/alibaba-fusion/next/commit/b13021e))
40+
* **Select:** select maxcount demo dataSource should string, close [#3462](https://github.com/alibaba-fusion/next/issues/3462) ([64f27ea](https://github.com/alibaba-fusion/next/commit/64f27ea))
41+
* **Select:** set innerAfter element line-height, close [#2830](https://github.com/alibaba-fusion/next/issues/2830) ([#3469](https://github.com/alibaba-fusion/next/issues/3469)) ([f5899a5](https://github.com/alibaba-fusion/next/commit/f5899a5))
42+
43+
44+
45+
46+
## [1.24.12](https://github.com/alibaba-fusion/next/compare/1.24.11...1.24.12) (2021-10-28)
47+
48+
49+
### Bug Fixes
50+
51+
* **NumberPicker:** if max or min were undefined or null should be infinity, close [#3456](https://github.com/alibaba-fusion/next/issues/3456) ([eb8887c](https://github.com/alibaba-fusion/next/commit/eb8887c))
52+
53+
54+
55+
56+
## [1.24.11](https://github.com/alibaba-fusion/next/compare/1.24.10...1.24.11) (2021-10-27)
57+
58+
59+
### Bug Fixes
60+
61+
* **Calendar:** fix showOtherMonth bug close[#3436](https://github.com/alibaba-fusion/next/issues/3436) ([261b900](https://github.com/alibaba-fusion/next/commit/261b900))
62+
* **Form:** add disabled props for d.ts ([eae8449](https://github.com/alibaba-fusion/next/commit/eae8449))
63+
* **NumberPicker:** min max can be async, close [#3450](https://github.com/alibaba-fusion/next/issues/3450) ([bf41b9b](https://github.com/alibaba-fusion/next/commit/bf41b9b))
64+
65+
66+
### Features
67+
68+
* **ConfigProvider:** support popupClassName ([#3422](https://github.com/alibaba-fusion/next/issues/3422)) ([975b163](https://github.com/alibaba-fusion/next/commit/975b163))
69+
70+
71+
72+
73+
## [1.24.10](https://github.com/alibaba-fusion/next/compare/1.24.9...1.24.10) (2021-10-19)
74+
75+
76+
### Bug Fixes
77+
78+
* **Input:** password compatible edge, close [#3289](https://github.com/alibaba-fusion/next/issues/3289) ([29b17e9](https://github.com/alibaba-fusion/next/commit/29b17e9))
79+
* **Table:** Different sorts have different className of table header, close [#3386](https://github.com/alibaba-fusion/next/issues/3386) ([a03f292](https://github.com/alibaba-fusion/next/commit/a03f292))
80+
* **Tree:** reduce rerender caused by onDrageLeave ([21049f4](https://github.com/alibaba-fusion/next/commit/21049f4))
81+
82+
83+
84+
385
## [1.24.9](https://github.com/alibaba-fusion/next/compare/1.24.8...1.24.9) (2021-10-15)
486

587

LATESTLOG.md

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

3-
## [1.24.9](https://github.com/alibaba-fusion/next/compare/1.24.8...1.24.9) (2021-10-15)
3+
## [1.24.15](https://github.com/alibaba-fusion/next/compare/1.24.14...1.24.15) (2021-11-09)
44

55

66
### Bug Fixes
77

8-
* **Card:** arrow down rotate ([0ff263b](https://github.com/alibaba-fusion/next/commit/0ff263b))
9-
* **Rating:** hover color when score<2 and disabled fix [#3400](https://github.com/alibaba-fusion/next/issues/3400) ([d883045](https://github.com/alibaba-fusion/next/commit/d883045))
10-
* **Tab:** repair slipping question, close [#3342](https://github.com/alibaba-fusion/next/issues/3342) ([3f5ec74](https://github.com/alibaba-fusion/next/commit/3f5ec74))
11-
* **Typescript:** add ts type for ConfigProvider Consumer ([#3401](https://github.com/alibaba-fusion/next/issues/3401)) ([17ae8d7](https://github.com/alibaba-fusion/next/commit/17ae8d7))
8+
* correct style order of next.var.css, close [#3493](https://github.com/alibaba-fusion/next/issues/3493) ([6b8ff04](https://github.com/alibaba-fusion/next/commit/6b8ff04))
9+
10+
11+
### Features
12+
13+
* **Upload:** new api previewOnFileName to set onPreview on filename. fix [#3455](https://github.com/alibaba-fusion/next/issues/3455) ([fd3d04a](https://github.com/alibaba-fusion/next/commit/fd3d04a))
1214

1315

docs/breadcrumb/adaptor/index.jsx

+12-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ import React from 'react';
22
import { Breadcrumb } from '@alifd/next';
33
import { Types, parseData } from '@alifd/adaptor-helper';
44

5+
6+
const _propsValue = ({ ellipsis, data, ...others }) => {
7+
const props = ellipsis ? { maxNode: 3 } : {};
8+
return {
9+
...props,
10+
...others,
11+
};
12+
};
13+
514
export default {
615
name: 'Breadcrumb',
716
editor: () => ({
@@ -15,11 +24,12 @@ export default {
1524
default: 'Home\nAll Categories\nWomen\'s Clothing\nBlouses & Shirts 78,999 T-shirts'
1625
}
1726
}),
27+
propsValue: _propsValue,
1828
adaptor: ({ ellipsis, data, ...others }) => {
19-
const props = ellipsis ? { maxNode: 3 } : {};
29+
const props = _propsValue({ ellipsis, ...others });
2030
const list = parseData(data).filter((it) => it.type === 'node');
2131
return (
22-
<Breadcrumb {...others} {...props}>
32+
<Breadcrumb {...props}>
2333
{
2434
list.map((item, index) => <Breadcrumb.Item style={{ overflow: 'visible' }} key={`item_${index}`}>{item.value}</Breadcrumb.Item>)
2535
}

docs/input/demo/clear.md

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ ReactDOM.render(
4646
defaultValue="clear by click"
4747
size="large"
4848
aria-label="input with config of hasClear"
49+
hoverShowClear
4950
onChange={onChange} /><br/><br/>
5051
</div>
5152
, mountNode);

docs/input/demo/inner.md

+8
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ class App extends React.Component {
5454
onChange={this.onChange}
5555
/><br /><br />
5656

57+
<Input
58+
label="total"
59+
innerAfter="¥"
60+
placeholder="search"
61+
value={this.state.v}
62+
onChange={this.onChange}
63+
/><br /><br />
64+
5765
<Input
5866
disabled
5967
defaultValue="hi"

docs/input/index.en-us.md

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Form Input, use it with Form components usually.
4949
| addonTextAfter | text appended before input | ReactNode | - |
5050
| autoComplete | require browser support | String | 'off' |
5151
| autoFocus | require browser support | Boolean | - |
52+
| hoverShowClear | show clear while hover (use while hasClear=true) | Boolean | false | 1.24 |
5253

5354
### Input.TextArea
5455

docs/input/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
| addonTextAfter | 输入框后附加文字 | ReactNode | - | |
5757
| autoComplete | (原生input支持) | String | 'off' | |
5858
| autoFocus | 自动聚焦(原生input支持) | Boolean | - | |
59+
| hoverShowClear | hover展示clear (配合 hasClear=true使用) | Boolean | false | 1.24 |
5960

6061
### Input.TextArea
6162

docs/menu-button/adaptor/index.jsx

+20-8
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,26 @@ const createContents = (array = []) => {
112112
});
113113
};
114114

115+
const _propsValue = ({ shape, level, size, data, ...others}) => {
116+
const list = parseData(data, { parseContent: true });
117+
const buttonItem = list[0] ? list[0] : { value: []};
118+
119+
return {
120+
...others,
121+
size,
122+
disabled: buttonItem.state === 'disabled',
123+
visible: buttonItem.state === 'active',
124+
type: shape === 'ghost' ? 'normal' : level,
125+
popupProps: { needAdjust: false },
126+
ghost: shape === 'ghost' ? level : false,
127+
selectMode: "multiple",
128+
};
129+
};
130+
115131
export default {
116132
name: 'MenuButton',
117133
shape: ['normal', 'text', 'ghost'],
134+
propsValue: _propsValue,
118135
editor: (shape = 'normal') => ({
119136
props: [{
120137
name: 'level',
@@ -148,17 +165,12 @@ export default {
148165
return value;
149166
});
150167

168+
const props = _propsValue({ shape, level, size, data, ...others});
169+
151170
return (
152171
<MenuButton
153-
{...others}
154-
size={size}
155-
disabled={buttonItem.state === 'disabled'}
156-
visible={buttonItem.state === 'active'}
157-
type={shape === 'ghost' ? 'normal' : level}
158-
popupProps={{ needAdjust: false }}
172+
{...props}
159173
popupContainer={node => node}
160-
ghost={shape === 'ghost' ? level : false}
161-
selectMode="multiple"
162174
text={shape === 'text'}
163175
menuProps={{ openKeys: keys.expanded, style: { textAlign: 'left' } }}
164176
selectedKeys={keys.selected}

0 commit comments

Comments
 (0)