Merge branch 'feat/1.25' into feat-overlay-v2

alibaba-fusion · Nov 4, 2021 · e4e140b · e4e140b
2 parents 1897092 + 14e0157
commit e4e140b
Show file tree

Hide file tree

Showing 43 changed files with 462 additions and 308 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,79 @@
 # Change Log 
 
+## [1.24.9](https://github.com/alibaba-fusion/next/compare/1.24.8...1.24.9) (2021-10-15)
+
+
+### Bug Fixes
+
+* **Card:** arrow down rotate ([0ff263b](https://github.com/alibaba-fusion/next/commit/0ff263b))
+* **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))
+* **Tab:** repair slipping question, close [#3342](https://github.com/alibaba-fusion/next/issues/3342) ([3f5ec74](https://github.com/alibaba-fusion/next/commit/3f5ec74))
+* **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))
+
+
+
+
+## [1.24.8](https://github.com/alibaba-fusion/next/compare/1.24.7...1.24.8) (2021-10-12)
+
+
+
+
+## [1.24.7](https://github.com/alibaba-fusion/next/compare/1.24.6...1.24.7) (2021-10-12)
+
+
+### Bug Fixes
+
+* **DatePicker2:** should support fullWidth ([#3395](https://github.com/alibaba-fusion/next/issues/3395)) ([6b9a04b](https://github.com/alibaba-fusion/next/commit/6b9a04b))
+* **Tree:** remove guide line when beyond boundary ([695efdc](https://github.com/alibaba-fusion/next/commit/695efdc))
+
+
+
+
+## [1.24.6](https://github.com/alibaba-fusion/next/compare/1.24.5...1.24.6) (2021-09-26)
+
+
+### Bug Fixes
+
+* input should be ahead of select ([#3373](https://github.com/alibaba-fusion/next/issues/3373)) ([6c19f94](https://github.com/alibaba-fusion/next/commit/6c19f94))
+
+
+
+
+## [1.24.5](https://github.com/alibaba-fusion/next/compare/1.24.4...1.24.5) (2021-09-24)
+
+
+### Bug Fixes
+
+* **Balloon:** close [#3357](https://github.com/alibaba-fusion/next/issues/3357) ([85f6b9b](https://github.com/alibaba-fusion/next/commit/85f6b9b))
+* **Card:** hr should be visible, close [#3281](https://github.com/alibaba-fusion/next/issues/3281) ([a7936a5](https://github.com/alibaba-fusion/next/commit/a7936a5))
+* **ConfigProvider:** popupContainer should work when container set undefined, close [#3368](https://github.com/alibaba-fusion/next/issues/3368) ([716ddc7](https://github.com/alibaba-fusion/next/commit/716ddc7))
+* **DatePicker2:** popupTriggerType hover should work, close [#3366](https://github.com/alibaba-fusion/next/issues/3366) ([ac4baac](https://github.com/alibaba-fusion/next/commit/ac4baac))
+* **Nav:** add disabled style ([4e06f71](https://github.com/alibaba-fusion/next/commit/4e06f71))
+* **Select:** useVirtual when children > 10 ([cedf011](https://github.com/alibaba-fusion/next/commit/cedf011))
+
+
+
+
+## [1.24.4](https://github.com/alibaba-fusion/next/compare/1.24.3...1.24.4) (2021-09-18)
+
+
+### Bug Fixes
+
+* **Breadcrumb:** empty node, close [#2699](https://github.com/alibaba-fusion/next/issues/2699) ([ed57bdc](https://github.com/alibaba-fusion/next/commit/ed57bdc))
+* **Calendar:** showOtherMonth=false style, close [#3321](https://github.com/alibaba-fusion/next/issues/3321) ([2997a17](https://github.com/alibaba-fusion/next/commit/2997a17))
+* **Collapse:** enhace empty node ([bc6564d](https://github.com/alibaba-fusion/next/commit/bc6564d))
+* **DatePicker:** style issue, close [#3353](https://github.com/alibaba-fusion/next/issues/3353) ([#3354](https://github.com/alibaba-fusion/next/issues/3354)) ([860ec8f](https://github.com/alibaba-fusion/next/commit/860ec8f))
+* **Input:** disabled mutual hasClear, drawer repair afterOpen warning, close [#2933](https://github.com/alibaba-fusion/next/issues/2933) [#3145](https://github.com/alibaba-fusion/next/issues/3145) ([39daa7c](https://github.com/alibaba-fusion/next/commit/39daa7c))
+* move some props to behind others ([58cf157](https://github.com/alibaba-fusion/next/commit/58cf157))
+
+
+### Features
+
+* add main.scss for only main style ([97814ec](https://github.com/alibaba-fusion/next/commit/97814ec))
+
+
+
+
 ## [1.24.3](https://github.com/alibaba-fusion/next/compare/1.24.2...1.24.3) (2021-09-14)
 
 

diff --git a/LATESTLOG.md b/LATESTLOG.md
@@ -1,17 +1,13 @@
 # Latest Log 
 
-## [1.24.3](https://github.com/alibaba-fusion/next/compare/1.24.2...1.24.3) (2021-09-14)
+## [1.24.9](https://github.com/alibaba-fusion/next/compare/1.24.8...1.24.9) (2021-10-15)
 
 
 ### Bug Fixes
 
-* **Dialog:** node-sass upgrade fix [#3338](https://github.com/alibaba-fusion/next/issues/3338) ([119976c](https://github.com/alibaba-fusion/next/commit/119976c))
-* **Table:** noBorder with round corner should work, close [#3329](https://github.com/alibaba-fusion/next/issues/3329) ([cd5d61f](https://github.com/alibaba-fusion/next/commit/cd5d61f))
-* **Table:** scroll alwaysshow + fixedHeader, close [#3328](https://github.com/alibaba-fusion/next/issues/3328) ([90d4f74](https://github.com/alibaba-fusion/next/commit/90d4f74))
-
-
-### Features
-
-* **Card:** add hasBorder ([14de219](https://github.com/alibaba-fusion/next/commit/14de219))
+* **Card:** arrow down rotate ([0ff263b](https://github.com/alibaba-fusion/next/commit/0ff263b))
+* **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))
+* **Tab:** repair slipping question, close [#3342](https://github.com/alibaba-fusion/next/issues/3342) ([3f5ec74](https://github.com/alibaba-fusion/next/commit/3f5ec74))
+* **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))
 
 
diff --git a/components.scss b/components.scss
@@ -1,62 +1,62 @@
-@import "lib/affix/index.scss";
-@import "lib/animate/index.scss";
-@import "lib/badge/index.scss";
-@import "lib/balloon/index.scss";
-@import "lib/breadcrumb/index.scss";
-@import "lib/button/index.scss";
-@import "lib/calendar/index.scss";
-@import "lib/card/index.scss";
-@import "lib/cascader/index.scss";
-@import "lib/cascader-select/index.scss";
-@import "lib/checkbox/index.scss";
-@import "lib/collapse/index.scss";
-@import "lib/config-provider/index.scss";
-@import "lib/date-picker/index.scss";
-@import "lib/dialog/index.scss";
-@import "lib/drawer/index.scss";
-@import "lib/dropdown/index.scss";
-@import "lib/field/index.scss";
-@import "lib/form/index.scss";
-@import "lib/grid/index.scss";
-@import "lib/icon/index.scss";
-@import "lib/input/index.scss";
-@import "lib/list/index.scss";
-@import "lib/loading/index.scss";
-@import "lib/menu/index.scss";
-@import "lib/menu-button/index.scss";
-@import "lib/message/index.scss";
-@import "lib/nav/index.scss";
-@import "lib/number-picker/index.scss";
-@import "lib/overlay/index.scss";
-@import "lib/pagination/index.scss";
-@import "lib/paragraph/index.scss";
-@import "lib/progress/index.scss";
-@import "lib/radio/index.scss";
-@import "lib/range/index.scss";
-@import "lib/rating/index.scss";
-@import "lib/search/index.scss";
-@import "lib/select/index.scss";
-@import "lib/slider/index.scss";
-@import "lib/split-button/index.scss";
-@import "lib/step/index.scss";
-@import "lib/switch/index.scss";
-@import "lib/tab/index.scss";
-@import "lib/table/index.scss";
-@import "lib/tag/index.scss";
-@import "lib/time-picker/index.scss";
-@import "lib/timeline/index.scss";
-@import "lib/transfer/index.scss";
-@import "lib/tree/index.scss";
-@import "lib/tree-select/index.scss";
-@import "lib/upload/index.scss";
-@import "lib/virtual-list/index.scss";
-@import "lib/shell/index.scss";
-@import "lib/notification/index.scss";
-@import "lib/typography/index.scss";
-@import "lib/divider/index.scss";
-@import "lib/avatar/index.scss";
-@import "lib/box/index.scss";
-@import "lib/responsive-grid/index.scss";
-@import "lib/date-picker2/index.scss";
-@import "lib/calendar2/index.scss";
-@import "lib/time-picker2/index.scss";
+@import "lib/affix/main.scss";
+@import "lib/animate/main.scss";
+@import "lib/icon/main.scss";
+@import "lib/overlay/main.scss";
+@import "lib/loading/main.scss";
+@import "lib/radio/main.scss";
+@import "lib/badge/main.scss";
+@import "lib/balloon/main.scss";
+@import "lib/menu/main.scss";
+@import "lib/dropdown/main.scss";
+@import "lib/breadcrumb/main.scss";
+@import "lib/button/main.scss";
+@import "lib/input/main.scss";
+@import "lib/calendar/main.scss";
+@import "lib/card/main.scss";
+@import "lib/cascader/main.scss";
+@import "lib/cascader-select/main.scss";
+@import "lib/checkbox/main.scss";
+@import "lib/collapse/main.scss";
+@import "lib/config-provider/main.scss";
+@import "lib/time-picker/main.scss";
+@import "lib/date-picker/main.scss";
+@import "lib/message/main.scss";
+@import "lib/dialog/main.scss";
+@import "lib/drawer/main.scss";
+@import "lib/field/main.scss";
+@import "lib/grid/main.scss";
+@import "lib/responsive-grid/main.scss";
+@import "lib/form/main.scss";
+@import "lib/avatar/main.scss";
+@import "lib/select/main.scss";
+@import "lib/list/main.scss";
+@import "lib/menu-button/main.scss";
+@import "lib/nav/main.scss";
+@import "lib/number-picker/main.scss";
+@import "lib/pagination/main.scss";
+@import "lib/paragraph/main.scss";
+@import "lib/progress/main.scss";
+@import "lib/range/main.scss";
+@import "lib/rating/main.scss";
+@import "lib/search/main.scss";
+@import "lib/slider/main.scss";
+@import "lib/split-button/main.scss";
+@import "lib/step/main.scss";
+@import "lib/switch/main.scss";
+@import "lib/tab/main.scss";
+@import "lib/tag/main.scss";
+@import "lib/timeline/main.scss";
+@import "lib/transfer/main.scss";
+@import "lib/tree/main.scss";
+@import "lib/tree-select/main.scss";
+@import "lib/upload/main.scss";
+@import "lib/virtual-list/main.scss";
+@import "lib/shell/main.scss";
+@import "lib/notification/main.scss";
+@import "lib/typography/main.scss";
+@import "lib/divider/main.scss";
+@import "lib/box/main.scss";
+@import "lib/table/main.scss";
+@import "lib/calendar2/main.scss";
+@import "lib/time-picker2/main.scss";
+@import "lib/date-picker2/main.scss";
diff --git a/docs/date-picker/index.md b/docs/date-picker/index.md
@@ -116,7 +116,7 @@ DatePicker 默认情况下接收和返回的数据类型都是 Moment 对象。
 | disabledDate        | 禁用日期函数<br/><br/>**签名**:<br/>Function(日期值: MomentObject, view: String) => Boolean<br/>**参数**:<br/>_日期值_: {MomentObject} null<br/>_view_: {String} 当前视图类型，year: 年， month: 月, date: 日<br/>**返回值**:<br/>{Boolean} 是否禁用<br/>                                                    | Function       | () => false  |
 | footerRender        | 自定义面板页脚<br/><br/>**签名**:<br/>Function() => Node<br/>**返回值**:<br/>{Node} 自定义的面板页脚组件<br/>                                                                                                                                                                                    | Function       | () => null   |
 | onChange            | 日期值改变时的回调<br/><br/>**签名**:<br/>Function(value: MomentObject/String) => void<br/>**参数**:<br/>_value_: {MomentObject/String} 日期值                                                                                                                                             | Function       | func.noop    |
-| onOk                | 点击确认按钮时的回调<br/><br/>**签名**:<br/>Function() => MomentObject/String<br/>**返回值**:<br/>{MomentObject/String} 日期值<br/>                                                                                                                                                          | Function       | func.noop    |
+| onOk                | 点击确认按钮时的回调<br/><br/>**签名**:<br/>Function(value: MomentObject/String) => void<br/>**参数**:<br/>_value_: {MomentObject/String} 日期值                                                                                                                                            | Function       | func.noop    |
 | disabled            | 是否禁用                                                                                                                                                                                                                                                                       | Boolean        | -            |
 | hasClear            | 是否显示清空按钮                                                                                                                                                                                                                                                                   | Boolean        | true         |
 | visible             | 弹层显示状态                                                                                                                                                                                                                                                                     | Boolean        | -            |

diff --git a/docs/drawer/index.md b/docs/drawer/index.md
@@ -27,6 +27,7 @@
 | cache       | 隐藏时是否保留子节点，不销毁                                                                                                                                                                                                                         | Boolean             | -                                          |      |
 | closeMode   | [推荐]控制对话框关闭的方式，值可以为字符串或者数组，其中字符串、数组均为以下值的枚举：<br/>**close** 表示点击关闭按钮可以关闭对话框<br/>**mask** 表示点击遮罩区域可以关闭对话框<br/>**esc** 表示按下 esc 键可以关闭对话框<br/>如 'close' 或 ['close','esc','mask'], \[]                                                      | Array&lt;Enum>/Enum | -                                          | 1.21 |
 | onClose     | 对话框关闭时触发的回调函数<br/><br/>**签名**:<br/>Function(trigger: String, event: Object) => void<br/>**参数**:<br/>_trigger_: {String} 关闭触发行为的描述字符串<br/>_event_: {Object} 关闭时事件对象                                                                     | Function            | () => {}                                   |      |
+| afterOpen   | 对话框打开后的回调函数<br/><br/>**签名**:<br/>Function() => void                                                                                                                                                                                    | Function            | -                                          |      |
 | placement   | 位于页面的位置<br/><br/>**可选值**:<br/>'top', 'right', 'bottom', 'left'                                                                                                                                                                         | Enum                | 'right'                                    |      |
 | title       | 标题                                                                                                                                                                                                                                     | ReactNode           | -                                          |      |
 | headerStyle | header上的样式                                                                                                                                                                                                                             | Object              | -                                          |      |

diff --git a/docs/nav/demo/vertical.md b/docs/nav/demo/vertical.md
@@ -47,10 +47,10 @@ class App extends React.Component {
                 <Nav style={{ width: '200px' }} type={type} defaultOpenAll>
                     <Item icon="account">Navigation One</Item>
                     <Item icon="account">Navigation Two</Item>
-                    <Item icon="account">Navigation Three</Item>
+                    <Item disabled icon="account">Navigation Three</Item>
                     <Item icon="account">Navigation Four</Item>
                     <Item icon="account">Navigation Five</Item>
-                    <SubNav icon="account" label="Sub Nav">
+                    <SubNav disabled icon="account" label="Sub Nav">
                         <Item icon="account">Item 1</Item>
                         <Item icon="account">Item 2</Item>
                         <Item icon="account">Item 3</Item>

diff --git a/docs/notification/index.md b/docs/notification/index.md
@@ -60,7 +60,7 @@ Notification.config({
 
 | 参数 | 说明 | 类型 | 默认值 | 版本 |
 | --- | --- | --- | --- | --- |
-| duration | 默认自动关闭延时，单位秒 | Number | 4.5 |  |
+| duration | 默认自动关闭延时，单位秒 | Number | 4500 |  |
 | maxCount | 最多同时出现的个数, 默认不限制 | Number | - |  |
 | getContainer | 配置渲染节点的输出位置 | () => HTMLNode | () => document.body |  |
 | offset | 对齐之后的偏移 [x, y] | Array | [30, 30] |  |

diff --git a/docs/rating/demo/disabled.md b/docs/rating/demo/disabled.md
@@ -18,5 +18,9 @@ Rating component can only display score when you set `disabled` attribute.
 ````jsx
 import { Rating } from '@alifd/next';
 
-ReactDOM.render(<Rating defaultValue={3.5} disabled />, mountNode);
+ReactDOM.render(<div>
+<Rating defaultValue={2.5} disabled />
+<br/>
+<Rating defaultValue={1.5} disabled />
+</div>, mountNode);
 ````
diff --git a/index-noreset.css b/index-noreset.css
@@ -1,49 +1,50 @@
 @import "lib/affix/index.css";
 @import "lib/animate/index.css";
 @import "lib/badge/index.css";
+@import "lib/overlay/index.css";
+@import "lib/icon/index.css";
 @import "lib/balloon/index.css";
+@import "lib/menu/index.css";
+@import "lib/dropdown/index.css";
 @import "lib/breadcrumb/index.css";
 @import "lib/button/index.css";
+@import "lib/radio/index.css";
+@import "lib/select/index.css";
 @import "lib/calendar/index.css";
 @import "lib/card/index.css";
 @import "lib/cascader/index.css";
 @import "lib/cascader-select/index.css";
 @import "lib/checkbox/index.css";
 @import "lib/collapse/index.css";
 @import "lib/config-provider/index.css";
+@import "lib/input/index.css";
+@import "lib/time-picker/index.css";
 @import "lib/date-picker/index.css";
+@import "lib/message/index.css";
 @import "lib/dialog/index.css";
 @import "lib/drawer/index.css";
-@import "lib/dropdown/index.css";
 @import "lib/field/index.css";
-@import "lib/form/index.css";
 @import "lib/grid/index.css";
-@import "lib/icon/index.css";
-@import "lib/input/index.css";
-@import "lib/list/index.css";
+@import "lib/responsive-grid/index.css";
+@import "lib/form/index.css";
+@import "lib/avatar/index.css";
 @import "lib/loading/index.css";
-@import "lib/menu/index.css";
+@import "lib/list/index.css";
 @import "lib/menu-button/index.css";
-@import "lib/message/index.css";
 @import "lib/nav/index.css";
 @import "lib/number-picker/index.css";
-@import "lib/overlay/index.css";
 @import "lib/pagination/index.css";
 @import "lib/paragraph/index.css";
 @import "lib/progress/index.css";
-@import "lib/radio/index.css";
 @import "lib/range/index.css";
 @import "lib/rating/index.css";
 @import "lib/search/index.css";
-@import "lib/select/index.css";
 @import "lib/slider/index.css";
 @import "lib/split-button/index.css";
 @import "lib/step/index.css";
 @import "lib/switch/index.css";
 @import "lib/tab/index.css";
-@import "lib/table/index.css";
 @import "lib/tag/index.css";
-@import "lib/time-picker/index.css";
 @import "lib/timeline/index.css";
 @import "lib/transfer/index.css";
 @import "lib/tree/index.css";
@@ -54,9 +55,8 @@
 @import "lib/notification/index.css";
 @import "lib/typography/index.css";
 @import "lib/divider/index.css";
-@import "lib/avatar/index.css";
 @import "lib/box/index.css";
-@import "lib/responsive-grid/index.css";
-@import "lib/date-picker2/index.css";
+@import "lib/table/index.css";
 @import "lib/calendar2/index.css";
 @import "lib/time-picker2/index.css";
+@import "lib/date-picker2/index.css";
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 var next = require('./lib/index.js');
 
-next.version = '1.24.3';
+next.version = '1.24.9';
 
 module.exports = next;