From 93a21a184154fa6bc97b171b1467d1d187146466 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:08:58 +0800
Subject: [PATCH 1/8] fix: #828

---
 components/form/Form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/form/Form.js b/components/form/Form.js
index 18853fde3..7fb26c024 100644
--- a/components/form/Form.js
+++ b/components/form/Form.js
@@ -119,7 +119,6 @@ Form.propTypes = {
 
 Form.defaultProps = {
   size: 'small',
-  labelPlacement: 'left',
   showColon: true
 }
 

From 293fc45e8104b465215de0b89d92e4ca2eadca85 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:13:42 +0800
Subject: [PATCH 2/8] fix: #820

---
 components/counter/Counter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/counter/Counter.js b/components/counter/Counter.js
index 6a11a7632..a9eb93ac1 100644
--- a/components/counter/Counter.js
+++ b/components/counter/Counter.js
@@ -239,7 +239,7 @@ class Counter extends React.Component {
       step
     } = this.props
 
-    let num = new Decimal(this.valueTrue).plus(step).valueOf() * 1
+    let num = new Decimal(this.valueTrue).plus(step > 0 ? step : -step).valueOf() * 1
     return max <= num
   }
 
@@ -248,7 +248,7 @@ class Counter extends React.Component {
       min = -1 * Infinity,
       step
     } = this.props
-    let num = new Decimal(this.valueTrue).minus(step).valueOf() * 1
+    let num = new Decimal(this.valueTrue).minus(step > 0 ? step : -step).valueOf() * 1
     return min >= num
   }
 

From 6bb641bb9ae8e38e5d9bdbc67ecb7eac5716de98 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:18:40 +0800
Subject: [PATCH 3/8] fix: #821

---
 components/transfer/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/transfer/index.js b/components/transfer/index.js
index 783fb8572..5a43bceaf 100755
--- a/components/transfer/index.js
+++ b/components/transfer/index.js
@@ -306,7 +306,7 @@ class Transfer extends Component {
                     draggable={draggable}
                     key={index}
                     onClick={this.clickItemEvent.bind(this, item, index, dir)}
-                    mode={mode}
+                    mode={mode === 'basic' && type === 'default' ? 'basic' : 'multiple'}
                     item={item}
                     checked={selectedKeys.includes(item.id)}
                     checkboxOnChange={this.checkboxEvent.bind(this, dir)}

From b9a4b2e260cade69ed5ca7521db938565ad5ba73 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:23:18 +0800
Subject: [PATCH 4/8] fix: #822

---
 docs/demo/transfer/section-area.jsx   | 4 ++--
 docs/demo/transfer/section-base.jsx   | 3 +--
 docs/demo/transfer/section-batch.jsx  | 4 ++--
 docs/demo/transfer/section-check.jsx  | 6 +++---
 docs/demo/transfer/section-count.jsx  | 6 +++---
 docs/demo/transfer/section-search.jsx | 6 +++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/demo/transfer/section-area.jsx b/docs/demo/transfer/section-area.jsx
index 4f4131e49..5844c28c9 100644
--- a/docs/demo/transfer/section-area.jsx
+++ b/docs/demo/transfer/section-area.jsx
@@ -30,8 +30,8 @@ class Demo extends React.Component {
   render () {
     return (
       <Transfer
-        mode='multiple'
-        showAllSelect
+        type='multiple'
+        showCheckAll
         draggable
         targetKeys={this.state.targetKeys}
         data={this.state.datas}
diff --git a/docs/demo/transfer/section-base.jsx b/docs/demo/transfer/section-base.jsx
index 153883dee..b59cd7616 100644
--- a/docs/demo/transfer/section-base.jsx
+++ b/docs/demo/transfer/section-base.jsx
@@ -31,10 +31,9 @@ class Demo extends React.Component {
   render () {
     return (
       <Transfer
-        mode='basic'
         emptyContent={['空', '无数据']}
         title={['左标题', '右标题']}
-        targetKeys={this.state.targetKeys}
+        targetIds={this.state.targetKeys}
         data={this.state.datas}
         onChange={this.onChange.bind(this)}
       />
diff --git a/docs/demo/transfer/section-batch.jsx b/docs/demo/transfer/section-batch.jsx
index 9ce3ff0cb..ffd14b549 100644
--- a/docs/demo/transfer/section-batch.jsx
+++ b/docs/demo/transfer/section-batch.jsx
@@ -34,10 +34,10 @@ class Demo extends React.Component {
     return (
       <div>
         <Transfer
-          mode='multiple'
+          type='multiple'
           title={['批量']}
           disabled={this.state.disabled}
-          targetKeys={this.state.targetKeys}
+          targetIds={this.state.targetKeys}
           data={this.state.datas}
           onChange={this.onChange.bind(this)}
         />
diff --git a/docs/demo/transfer/section-check.jsx b/docs/demo/transfer/section-check.jsx
index c7dc16b4f..ce7a3708d 100644
--- a/docs/demo/transfer/section-check.jsx
+++ b/docs/demo/transfer/section-check.jsx
@@ -31,9 +31,9 @@ class Demo extends React.Component {
   render () {
     return (
       <Transfer
-        mode='multiple'
-        showAllSelect
-        targetKeys={this.state.targetKeys}
+        type='multiple'
+        showCheckAll
+        targetIds={this.state.targetKeys}
         data={this.state.datas}
         onChange={this.onChange.bind(this)}
       />
diff --git a/docs/demo/transfer/section-count.jsx b/docs/demo/transfer/section-count.jsx
index ba7def8da..e15e8b1d7 100644
--- a/docs/demo/transfer/section-count.jsx
+++ b/docs/demo/transfer/section-count.jsx
@@ -30,10 +30,10 @@ class Demo extends React.Component {
   render () {
     return (
       <Transfer
-        mode='multiple'
-        showAllSelect
+        type='multiple'
+        showCheckAll
         targetLimit={4}
-        targetKeys={this.state.targetKeys}
+        targetIds={this.state.targetKeys}
         data={this.state.datas}
         onChange={this.onChange.bind(this)}
       />
diff --git a/docs/demo/transfer/section-search.jsx b/docs/demo/transfer/section-search.jsx
index e72dfc438..9a877e568 100644
--- a/docs/demo/transfer/section-search.jsx
+++ b/docs/demo/transfer/section-search.jsx
@@ -30,10 +30,10 @@ class Demo extends React.Component {
   render () {
     return (
       <Transfer
-        mode='multiple'
-        showAllSelect
+        Type='multiple'
+        showCheckAll
         searchable
-        targetKeys={this.state.targetKeys}
+        targetIds={this.state.targetKeys}
         data={this.state.datas}
         onChange={this.onChange.bind(this)}
       />

From d9e391d7d2fa30da319bfb8b1f32b69060a65265 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:26:43 +0800
Subject: [PATCH 5/8] fix: #827

---
 docs/demo/collapse/section-accordion.jsx | 8 ++++----
 docs/demo/collapse/section-basic.jsx     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/demo/collapse/section-accordion.jsx b/docs/demo/collapse/section-accordion.jsx
index cb96acce6..ade5aadcf 100644
--- a/docs/demo/collapse/section-accordion.jsx
+++ b/docs/demo/collapse/section-accordion.jsx
@@ -13,25 +13,25 @@ class Demo extends React.Component {
       <Collapse
         onChange={()=>{console.log('切换了！');}}
         accordion={true}
-        arrow="right"
+        arrowPlacement="right"
       >
         <Collapse.Panel
           disabled={true}
-          header="panel title 1"
+          title="panel title 1"
         >
           <p>Collapse Panel Content 1</p>
           <p>Collapse Panel Content 1</p>
           <p>Collapse Panel Content 1</p>
         </Collapse.Panel>
         <Collapse.Panel
-          header="panel title 2"
+          title="panel title 2"
         >
           <p>Collapse Panel Content 2</p>
           <p>Collapse Panel Content 2</p>
           <p>Collapse Panel Content 2</p>
         </Collapse.Panel>
         <Collapse.Panel
-          header="panel title 3"
+          title="panel title 3"
         >
           <p>Collapse Panel Content 3</p>
           <p>Collapse Panel Content 3</p>
diff --git a/docs/demo/collapse/section-basic.jsx b/docs/demo/collapse/section-basic.jsx
index dc59c6756..6399f7a30 100644
--- a/docs/demo/collapse/section-basic.jsx
+++ b/docs/demo/collapse/section-basic.jsx
@@ -12,25 +12,25 @@ class Demo extends React.Component {
     return(
       <Collapse
         onChange={()=>{console.log('切换了！');}}
-        arrow="right"
+        arrowPlacement="right"
       >
         <Collapse.Panel
           disabled={true}
-          header="panel title 1"
+          title="panel title 1"
         >
           <p>Collapse Panel Content 1</p>
           <p>Collapse Panel Content 1</p>
           <p>Collapse Panel Content 1</p>
         </Collapse.Panel>
         <Collapse.Panel
-          header="panel title 2"
+          title="panel title 2"
         >
           <p>Collapse Panel Content 2</p>
           <p>Collapse Panel Content 2</p>
           <p>Collapse Panel Content 2</p>
         </Collapse.Panel>
         <Collapse.Panel
-          header="panel title 3"
+          title="panel title 3"
         >
           <p>Collapse Panel Content 3</p>
           <p>Collapse Panel Content 3</p>

From 3e722be76fcb9c9c5dde67b7cbc3119e666c92b7 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:31:05 +0800
Subject: [PATCH 6/8] chore: update version and changelog

---
 CHANGELOG.md                        | 6 ++++++
 docs/zh-CN/components/changelog.mdx | 6 ++++++
 package.json                        | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7b0dd188..23c121ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 更新日志
 
+## 2.6.2
+
+- 修复 `<Form />` labelPosition 兼容属性不生效的问题 [#828](https://github.com/XiaoMi/hiui/issues/828)
+- 修复 `<Transfer />` type 的问题 [#821](https://github.com/XiaoMi/hiui/issues/821)
+- 修复 `<Counter />` step 为负值，max 和 min 不起作用的问题 [#799](https://github.com/XiaoMi/hiui/issues/799)
+
 ## 2.6.1
 
 - 修复 `<Cascader />` 不能正确通过搜索过滤选项的问题 [#812](https://github.com/XiaoMi/hiui/issues/812)
diff --git a/docs/zh-CN/components/changelog.mdx b/docs/zh-CN/components/changelog.mdx
index b9d888dbb..4763ef82e 100644
--- a/docs/zh-CN/components/changelog.mdx
+++ b/docs/zh-CN/components/changelog.mdx
@@ -1,5 +1,11 @@
 # 更新日志
 
+## 2.6.2
+
+- 修复 `<Form />` labelPosition 兼容属性不生效的问题 [#828](https://github.com/XiaoMi/hiui/issues/828)
+- 修复 `<Transfer />` type 的问题 [#821](https://github.com/XiaoMi/hiui/issues/821)
+- 修复 `<Counter />` step 为负值，max 和 min 不起作用的问题 [#799](https://github.com/XiaoMi/hiui/issues/799)
+
 ## 2.6.1
 
 - 修复 `<Cascader />` 不能正确通过搜索过滤选项的问题 [#812](https://github.com/XiaoMi/hiui/issues/812)
diff --git a/package.json b/package.json
index ee52fba47..31f0a40aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",

From 68cdcb5f896b1c3f4038bd812b17459b9046885a Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Dec 2019 18:32:56 +0800
Subject: [PATCH 7/8] docs: update transfer doc

---
 docs/demo/transfer/section-search.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/demo/transfer/section-search.jsx b/docs/demo/transfer/section-search.jsx
index 9a877e568..1fdf8d9ad 100644
--- a/docs/demo/transfer/section-search.jsx
+++ b/docs/demo/transfer/section-search.jsx
@@ -30,7 +30,7 @@ class Demo extends React.Component {
   render () {
     return (
       <Transfer
-        Type='multiple'
+        type='multiple'
         showCheckAll
         searchable
         targetIds={this.state.targetKeys}

From 5802323a34793283c7543e567ed29d485bde7362 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Thu, 19 Dec 2019 20:08:55 +0800
Subject: [PATCH 8/8] chore: update version and changelog

---
 CHANGELOG.md                        | 2 ++
 docs/zh-CN/components/changelog.mdx | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23c121ebb..3dad56910 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - 修复 `<Form />` labelPosition 兼容属性不生效的问题 [#828](https://github.com/XiaoMi/hiui/issues/828)
 - 修复 `<Transfer />` type 的问题 [#821](https://github.com/XiaoMi/hiui/issues/821)
 - 修复 `<Counter />` step 为负值，max 和 min 不起作用的问题 [#799](https://github.com/XiaoMi/hiui/issues/799)
+- 优化 `<Cascader />` filterOption [#832](https://github.com/XiaoMi/hiui/issues/832)
+- 修复 `<Cascader />` 受控问题 [#830](https://github.com/XiaoMi/hiui/issues/830)
 
 ## 2.6.1
 
diff --git a/docs/zh-CN/components/changelog.mdx b/docs/zh-CN/components/changelog.mdx
index 4763ef82e..511c27d0d 100644
--- a/docs/zh-CN/components/changelog.mdx
+++ b/docs/zh-CN/components/changelog.mdx
@@ -5,6 +5,8 @@
 - 修复 `<Form />` labelPosition 兼容属性不生效的问题 [#828](https://github.com/XiaoMi/hiui/issues/828)
 - 修复 `<Transfer />` type 的问题 [#821](https://github.com/XiaoMi/hiui/issues/821)
 - 修复 `<Counter />` step 为负值，max 和 min 不起作用的问题 [#799](https://github.com/XiaoMi/hiui/issues/799)
+- 优化 `<Cascader />` filterOption [#832](https://github.com/XiaoMi/hiui/issues/832)
+- 修复 `<Cascader />` 受控问题 [#830](https://github.com/XiaoMi/hiui/issues/830)
 
 ## 2.6.1