chore(*): fix merge master conflict

Author: lakerswgq

CHANGELOG.md

@@ -1,5 +1,87 @@
 # Change Log 
 
+## [1.24.15](https://github.com/alibaba-fusion/next/compare/1.24.14...1.24.15) (2021-11-09)
+
+
+### Bug Fixes
+
+* 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))
+
+
+### Features
+
+* **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))
+
+
+
+
+## [1.24.14](https://github.com/alibaba-fusion/next/compare/1.24.13...1.24.14) (2021-11-04)
+
+
+### Bug Fixes
+
+* **Affix:** container can update, close [#3473](https://github.com/alibaba-fusion/next/issues/3473) ([66e084f](https://github.com/alibaba-fusion/next/commit/66e084f))
+* **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))
+
+
+### Features
+
+* **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))
+
+
+
+
+## [1.24.13](https://github.com/alibaba-fusion/next/compare/1.24.12...1.24.13) (2021-11-03)
+
+
+### Bug Fixes
+
+* **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))
+* **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))
+* **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))
+
+
+
+
+## [1.24.12](https://github.com/alibaba-fusion/next/compare/1.24.11...1.24.12) (2021-10-28)
+
+
+### Bug Fixes
+
+* **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))
+
+
+
+
+## [1.24.11](https://github.com/alibaba-fusion/next/compare/1.24.10...1.24.11) (2021-10-27)
+
+
+### Bug Fixes
+
+* **Calendar:** fix showOtherMonth bug close[#3436](https://github.com/alibaba-fusion/next/issues/3436) ([261b900](https://github.com/alibaba-fusion/next/commit/261b900))
+* **Form:** add disabled props for d.ts ([eae8449](https://github.com/alibaba-fusion/next/commit/eae8449))
+* **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))
+
+
+### Features
+
+* **ConfigProvider:** support popupClassName ([#3422](https://github.com/alibaba-fusion/next/issues/3422)) ([975b163](https://github.com/alibaba-fusion/next/commit/975b163))
+
+
+
+
+## [1.24.10](https://github.com/alibaba-fusion/next/compare/1.24.9...1.24.10) (2021-10-19)
+
+
+### Bug Fixes
+
+* **Input:** password compatible edge, close [#3289](https://github.com/alibaba-fusion/next/issues/3289) ([29b17e9](https://github.com/alibaba-fusion/next/commit/29b17e9))
+* **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))
+* **Tree:** reduce rerender caused by onDrageLeave ([21049f4](https://github.com/alibaba-fusion/next/commit/21049f4))
+
+
+
+
 ## [1.24.9](https://github.com/alibaba-fusion/next/compare/1.24.8...1.24.9) (2021-10-15)
 
 

LATESTLOG.md

@@ -1,13 +1,15 @@
 # Latest Log 
 
-## [1.24.9](https://github.com/alibaba-fusion/next/compare/1.24.8...1.24.9) (2021-10-15)
+## [1.24.15](https://github.com/alibaba-fusion/next/compare/1.24.14...1.24.15) (2021-11-09)
 
 
 ### 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))
+* 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))
+
+
+### Features
+
+* **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))
 
 

docs/breadcrumb/adaptor/index.jsx

@@ -2,6 +2,15 @@ import React from 'react';
 import { Breadcrumb } from '@alifd/next';
 import { Types, parseData } from '@alifd/adaptor-helper';
 
+
+const _propsValue = ({ ellipsis, data, ...others }) => {
+    const props = ellipsis ? { maxNode: 3 } : {};
+    return {
+        ...props,
+        ...others,
+    };
+};
+
 export default {
     name: 'Breadcrumb',
     editor: () => ({
@@ -15,11 +24,12 @@ export default {
             default: 'Home\nAll Categories\nWomen\'s Clothing\nBlouses & Shirts 78,999 T-shirts'
         }
     }),
+    propsValue: _propsValue,
     adaptor: ({ ellipsis, data, ...others }) => {
-        const props = ellipsis ? { maxNode: 3 } : {};
+        const props = _propsValue({ ellipsis, ...others });
         const list = parseData(data).filter((it) => it.type === 'node');
         return (
-            <Breadcrumb {...others} {...props}>
+            <Breadcrumb {...props}>
                 {
                     list.map((item, index) => <Breadcrumb.Item style={{ overflow: 'visible' }} key={`item_${index}`}>{item.value}</Breadcrumb.Item>)
                 }

docs/input/demo/clear.md

@@ -46,6 +46,7 @@ ReactDOM.render(
             defaultValue="clear by click"
             size="large"
             aria-label="input with config of hasClear"
+            hoverShowClear
             onChange={onChange} /><br/><br/>
     </div>
     , mountNode);

docs/input/demo/inner.md

@@ -54,6 +54,14 @@ class App extends React.Component {
                 onChange={this.onChange}
             /><br /><br />
 
+            <Input
+                label="total"
+                innerAfter="¥"
+                placeholder="search"
+                value={this.state.v}
+                onChange={this.onChange}
+            /><br /><br />
+
             <Input
                 disabled
                 defaultValue="hi"

docs/input/index.en-us.md

@@ -49,6 +49,7 @@ Form Input, use it with Form components usually.
 | addonTextAfter  | text appended  before input                              | ReactNode     | -         |
 | autoComplete    | require browser support                                            | String        | 'off'     |
 | autoFocus       | require browser support                         | Boolean       | -         |
+| hoverShowClear  | show clear while hover (use while hasClear=true)                                                                                                                                                                                                  | Boolean          | false     | 1.24 |
 
 ### Input.TextArea
 

docs/input/index.md

@@ -56,6 +56,7 @@
 | addonTextAfter  | 输入框后附加文字                                                                                                                                                                                                                           | ReactNode        | -         |      |
 | autoComplete    | (原生input支持)                                                                                                                                                                                                                        | String           | 'off'     |      |
 | autoFocus       | 自动聚焦(原生input支持)                                                                                                                                                                                                                    | Boolean          | -         |      |
+| hoverShowClear  | hover展示clear (配合 hasClear=true使用)                                                                                                                                                                                                  | Boolean          | false     | 1.24 |
 
 ### Input.TextArea
 

docs/menu-button/adaptor/index.jsx

@@ -112,9 +112,26 @@ const createContents = (array = []) => {
     });
 };
 
+const _propsValue = ({ shape, level, size, data, ...others}) => {
+    const list = parseData(data, { parseContent: true });
+    const buttonItem = list[0] ? list[0] : { value: []};
+    
+    return {
+        ...others,
+        size,
+        disabled: buttonItem.state === 'disabled',
+        visible: buttonItem.state === 'active',
+        type: shape === 'ghost' ? 'normal' : level,
+        popupProps: { needAdjust: false },
+        ghost: shape === 'ghost' ? level : false,
+        selectMode: "multiple",
+    };
+};
+
 export default {
     name: 'MenuButton',
     shape: ['normal', 'text', 'ghost'],
+    propsValue: _propsValue,
     editor: (shape = 'normal') => ({
         props: [{
             name: 'level',
@@ -148,17 +165,12 @@ export default {
             return value;
         });
 
+        const props = _propsValue({ shape, level, size, data, ...others});
+
         return (
             <MenuButton
-                {...others}
-                size={size}
-                disabled={buttonItem.state === 'disabled'}
-                visible={buttonItem.state === 'active'}
-                type={shape === 'ghost' ? 'normal' : level}
-                popupProps={{ needAdjust: false }}
+                {...props}
                 popupContainer={node => node}
-                ghost={shape === 'ghost' ? level : false}
-                selectMode="multiple"
                 text={shape === 'text'}
                 menuProps={{ openKeys: keys.expanded, style: { textAlign: 'left' } }}
                 selectedKeys={keys.selected}