From 69a2f9a992f62e669f442edb885fa45b1f7c95b4 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Mon, 16 Mar 2020 16:03:01 +0800
Subject: [PATCH 01/20] fix: #993

---
 components/menu/SubMenu.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/menu/SubMenu.js b/components/menu/SubMenu.js
index cd0b643e7..cc74c236a 100644
--- a/components/menu/SubMenu.js
+++ b/components/menu/SubMenu.js
@@ -10,12 +10,16 @@ class SubMenu extends Component {
   }
 
   checkActive (activeIndex, index) {
-    return activeIndex.indexOf(index) === 0
+    const indexArr = index.split('-')
+    const activeIndexArr = activeIndex.split('-')
+    return activeIndexArr.slice(0, indexArr.length).join('-') === index
   }
 
   checkExpand (activeIndex, expandIndex, index) {
     return expandIndex.some(item => {
-      return item.indexOf(index) === 0
+      const indexArr = index.split('-')
+      const expandIndexArr = item.split('-')
+      return expandIndexArr.slice(0, indexArr.length).join('-') === index
     })
   }
 

From 2177a499db664013c076864cba56e991a07a4070 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:15:42 +0800
Subject: [PATCH 02/20] fix: dropdown ui bug

---
 components/dropdown/DropdownMenu.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/dropdown/DropdownMenu.jsx b/components/dropdown/DropdownMenu.jsx
index 79f9396f5..c8b14947f 100644
--- a/components/dropdown/DropdownMenu.jsx
+++ b/components/dropdown/DropdownMenu.jsx
@@ -30,7 +30,7 @@ class DropdownMenu extends React.Component {
         placement={placement}
         width={width}
         onMouseEnter={onMouseEnter}
-        leftGap={1}
+        leftGap={0}
         onMouseLeave={onMouseLeave}
       >
         <ul className={menuCls}>

From 3deea401b381994c09d1f15720fad14bd114d829 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:21:43 +0800
Subject: [PATCH 03/20] fix: carousel color to #fff

---
 components/carousel/style/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/carousel/style/index.scss b/components/carousel/style/index.scss
index 34d58f669..ed186b288 100644
--- a/components/carousel/style/index.scss
+++ b/components/carousel/style/index.scss
@@ -1,6 +1,6 @@
 .hi-carousel {
   width: 100%;
-  color: rgba(153, 153, 153, 1);
+  color: #fff;
   overflow: hidden;
   position: relative;
 

From e1498ed928d15f221073725073ad7bcb31f22c3b Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:31:26 +0800
Subject: [PATCH 04/20] fix: alert padding

---
 components/alert/style/index.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/alert/style/index.scss b/components/alert/style/index.scss
index 4022cef0b..2aa75598c 100755
--- a/components/alert/style/index.scss
+++ b/components/alert/style/index.scss
@@ -2,7 +2,7 @@
 
 .hi-alert {
   position: relative;
-  padding: 9px 12px;
+  padding: 9px 11px;
   background: #ebf2fd;
   border: 1px solid #b3cdfb;
   border-radius: 2px;
@@ -89,8 +89,15 @@
   .hi-alert.theme__#{$key} {
     &.info {
       color: $value;
-      background-color: rgba(map-get(get-palette(get-color($palette-primary, $key)), '50'), 0.1);
-      border: 1px solid map-get(get-palette(get-color($palette-primary, $key)), '20');
+      background-color:
+        rgba(
+          map-get(get-palette(get-color($palette-primary, $key)), '50'),
+          0.1
+        );
+      border:
+        1px
+        solid
+        map-get(get-palette(get-color($palette-primary, $key)), '20');
     }
   }
 }

From 9c5ce7eea3274bfa99e4116b4f7e50948006fb1c Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:32:23 +0800
Subject: [PATCH 05/20] docs: adjust alert chinese name

---
 docs/zh-CN/components/alert.mdx | 8 ++++----
 site/locales/zh-CN.js           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/zh-CN/components/alert.mdx b/docs/zh-CN/components/alert.mdx
index 72f84f0a2..cc1bd8e56 100755
--- a/docs/zh-CN/components/alert.mdx
+++ b/docs/zh-CN/components/alert.mdx
@@ -1,4 +1,4 @@
-# Alert 警告
+# Alert 警告提示
 
 作用于页面的内容区域的提示，非触发类信息
 
@@ -38,9 +38,9 @@ import DemoAutoClose from '../../demo/alert/section-autoClose.jsx'
 
 | 参数      | 说明                     | 类型                    | 可选值                                      | 默认值 |
 | --------- | ------------------------ | ----------------------- | ------------------------------------------- | ------ |
-| type      | 警告框类型               | string                  | 'info' \| 'success' \| 'error' \| 'warning' | 'info' |
-| title     | 警告框标题               | string                  | -                                           | -      |
-| content   | 警告框内容               | string                  | -                                           | -      |
+| type      | 警告提示类型             | string                  | 'info' \| 'success' \| 'error' \| 'warning' | 'info' |
+| title     | 警告提示标题             | string                  | -                                           | -      |
+| content   | 警告提示内容             | string                  | -                                           | -      |
 | closeable | 是否可关闭               | boolean                 | true \| false                               | false  |
 | onClose   | 关闭事件触发时的回调     | (e: MouseEvent) => void | -                                           | -      |
 | duration  | 自动关闭时间，单位为毫秒 | number \| null          | -                                           | null   |
diff --git a/site/locales/zh-CN.js b/site/locales/zh-CN.js
index 93aa5eb95..c8a7b8cf2 100755
--- a/site/locales/zh-CN.js
+++ b/site/locales/zh-CN.js
@@ -26,7 +26,7 @@ module.exports = {
     modal: 'Modal 模态对话框',
     confirm: 'confirm 方法组件',
     form: 'Form 表单',
-    alert: 'Alert 警告框',
+    alert: 'Alert 警告提示',
     message: 'Message 消息',
     panel: 'Panel 面板',
     collapse: 'Collapse 折叠面板',

From 8e9766c41fbdfedaadad17a1a8ba3ace403c592f Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:36:38 +0800
Subject: [PATCH 06/20] docs: fix demo color

---
 docs/demo/grid/section-block.jsx  | 10 ++++++----
 docs/demo/grid/section-nest.jsx   |  6 ++++--
 docs/demo/grid/section-offset.jsx |  8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/docs/demo/grid/section-block.jsx b/docs/demo/grid/section-block.jsx
index 8274762de..a8dafb138 100644
--- a/docs/demo/grid/section-block.jsx
+++ b/docs/demo/grid/section-block.jsx
@@ -16,17 +16,19 @@ class Demo extends React.Component {
           <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8', color:'#fff'}}>col-6<br />25%</div>
         </Col>
         <Col span={6}>
-          <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8'}}>col-6<br />25%</div>
+          <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8', color:'#fff'}}>col-6<br />25%</div>
         </Col>
         <Col span={6}>
-          <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8',color:'#fff'}}>col-6<br />25%</div>
+          <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8', color:'#fff'}}>col-6<br />25%</div>
         </Col>
         <Col span={6}>
-          <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8'}}>col-6<br />25%</div>
+          <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', textAlign: 'center', opacity: '.8', color:'#fff'}}>col-6<br />25%</div>
         </Col>
       </Row>
     )
   }
 }`
-const DemoBlock = () => <DocViewer code={code} scope={{ Grid }} prefix={prefix} desc={desc} />
+const DemoBlock = () => (
+  <DocViewer code={code} scope={{ Grid }} prefix={prefix} desc={desc} />
+)
 export default DemoBlock
diff --git a/docs/demo/grid/section-nest.jsx b/docs/demo/grid/section-nest.jsx
index c5a39c8af..299090263 100644
--- a/docs/demo/grid/section-nest.jsx
+++ b/docs/demo/grid/section-nest.jsx
@@ -13,7 +13,7 @@ class Demo extends React.Component {
     return (
       <Row gutter={true}>
         <Col span={16} >
-          <div style={{textAlign:'center', background:'#ff6700',opacity: '0.8', padding:16 }}>
+          <div style={{textAlign:'center', background:'#ff6700',opacity: '0.8', padding:16, color:'#fff' }}>
             col-16
             <Row gutter={true}>
               <Col span={12}>
@@ -32,5 +32,7 @@ class Demo extends React.Component {
     )
   }
 }`
-const DemoNest = () => <DocViewer code={code} scope={{ Grid }} prefix={prefix} desc={desc} />
+const DemoNest = () => (
+  <DocViewer code={code} scope={{ Grid }} prefix={prefix} desc={desc} />
+)
 export default DemoNest
diff --git a/docs/demo/grid/section-offset.jsx b/docs/demo/grid/section-offset.jsx
index 827c0e083..8df179c39 100644
--- a/docs/demo/grid/section-offset.jsx
+++ b/docs/demo/grid/section-offset.jsx
@@ -17,7 +17,7 @@ class Demo extends React.Component {
             <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', color: '#fff', opacity:'0.8', textAlign: 'center'}}>col-8</div>
           </Col>
           <Col span={6} offset={6}>
-            <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', opacity:'0.8', textAlign: 'center'}}>col-6-offset-6</div>
+            <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', color: '#fff', opacity:'0.8', textAlign: 'center'}}>col-6-offset-6</div>
           </Col>
           <Col span={4}>
             <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', color: '#fff', opacity:'0.8', textAlign: 'center'}}>col-4</div>
@@ -28,7 +28,7 @@ class Demo extends React.Component {
             <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', color: '#fff', opacity:'0.8', textAlign: 'center'}}>col-4</div>
           </Col>
           <Col span={6} offset={4}>
-            <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', opacity:'0.8', textAlign: 'center'}}>col-6-offset-4</div>
+            <div style={{backgroundColor: '#ff6700', width: '100%', padding: '16px 0', color: '#fff', opacity:'0.8', textAlign: 'center'}}>col-6-offset-4</div>
           </Col>
           <Col span={4}>
             <div style={{backgroundColor: '#4284F5', width: '100%', padding: '16px 0', color: '#fff', opacity:'0.8', textAlign: 'center'}}>col-4</div>
@@ -41,5 +41,7 @@ class Demo extends React.Component {
     )
   }
 }`
-const DemoOffset = () => <DocViewer code={code} scope={{ Grid }} prefix={prefix} desc={desc} />
+const DemoOffset = () => (
+  <DocViewer code={code} scope={{ Grid }} prefix={prefix} desc={desc} />
+)
 export default DemoOffset

From 28d2fdbc3b74c13d29babffc71878e04873d58a8 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:46:48 +0800
Subject: [PATCH 07/20] fix: select dropdown not justify

---
 components/select/Select.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/select/Select.js b/components/select/Select.js
index 726707850..78528ae90 100644
--- a/components/select/Select.js
+++ b/components/select/Select.js
@@ -612,6 +612,7 @@ class Select extends Component {
           attachEle={this.selectInputContainer}
           zIndex={1050}
           topGap={5}
+          leftGap={0}
           className="hi-select__popper"
           placement="top-bottom-start"
         >

From 64e50cb8b902ad2920fdafb13c3f0791895a5c21 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 15:56:00 +0800
Subject: [PATCH 08/20] fix: adjust #d9d9d9 to #d8d8d8

---
 components/cascader/style/cascader.scss   | 2 +-
 components/collapse/style/index.scss      | 2 +-
 components/select/style/select-input.scss | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/cascader/style/cascader.scss b/components/cascader/style/cascader.scss
index 26695e6e2..8dcb72950 100644
--- a/components/cascader/style/cascader.scss
+++ b/components/cascader/style/cascader.scss
@@ -36,7 +36,7 @@ $cascader: 'hi-cascader' !default;
     display: flex;
     align-items: center;
     padding: 5px 12px;
-    border: 1px solid #d9d9d9;
+    border: 1px solid #d8d8d8;
   }
 
   &__input-keyword {
diff --git a/components/collapse/style/index.scss b/components/collapse/style/index.scss
index 7dbc163c1..0b052f9f3 100755
--- a/components/collapse/style/index.scss
+++ b/components/collapse/style/index.scss
@@ -6,7 +6,7 @@
   font-size: 14px;
 
   .collapse-item {
-    border-bottom: 1px solid #d9d9d9;
+    border-bottom: 1px solid #d8d8d8;
 
     &__head {
       display: flex;
diff --git a/components/select/style/select-input.scss b/components/select/style/select-input.scss
index a9004f4d3..ce4d4f34d 100644
--- a/components/select/style/select-input.scss
+++ b/components/select/style/select-input.scss
@@ -14,7 +14,7 @@
   color: #333;
   line-height: 1;
   border-radius: 2px;
-  border: 1px solid #d9d9d9;
+  border: 1px solid #d8d8d8;
   cursor: pointer;
   outline: none;
   user-select: none;

From 547f8abca298b205b32768f38c836e4ddaac1aba Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 16:02:48 +0800
Subject: [PATCH 09/20] fix: pagination border color

---
 components/pagination/style/index.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/pagination/style/index.scss b/components/pagination/style/index.scss
index 512ac43d9..705dfa8bb 100644
--- a/components/pagination/style/index.scss
+++ b/components/pagination/style/index.scss
@@ -57,6 +57,10 @@
   &__span {
     display: inline-block;
     margin: 0 $spacer-1;
+
+    .hi-select__input {
+      border: 1px solid $gray-light;
+    }
   }
 
   &__jumper-input {
@@ -67,6 +71,10 @@
     .hi-input {
       width: 64px;
 
+      &__inner {
+        border: 1px solid $gray-light;
+      }
+
       &__text {
         text-align: center;
       }

From 683269b2877e173a94c6775b8608d6784398f2ff Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 16:35:56 +0800
Subject: [PATCH 10/20] fix: modal default footer

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

diff --git a/components/modal/index.js b/components/modal/index.js
index 309d55922..e3f65195f 100755
--- a/components/modal/index.js
+++ b/components/modal/index.js
@@ -87,7 +87,7 @@ class Modal extends Component {
       return footers || footer
     } else {
       return [
-        <Button type='default' key={0} onClick={this.handleClose.bind(this)}>
+        <Button type='line' key={0} onClick={this.handleClose.bind(this)}>
           {cancelText}
         </Button>,
         <Button type='primary' key={1} onClick={this.handleConfirm.bind(this)}>

From f62328297a3111b30e5556ac11cb15f3e54479cd Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 16:36:26 +0800
Subject: [PATCH 11/20] docs: update demo

---
 docs/demo/modal/section-size.jsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/demo/modal/section-size.jsx b/docs/demo/modal/section-size.jsx
index 4bf25609c..10fa7820c 100644
--- a/docs/demo/modal/section-size.jsx
+++ b/docs/demo/modal/section-size.jsx
@@ -58,9 +58,6 @@ class Demo extends React.Component {
           size={this.state.size}
           show={this.state.show}
           onCancel={this.cancelEvent.bind(this)}
-          footers={[
-            <Button type="default" key={3} onClick={this.cancelEvent.bind(this)}>关闭</Button>
-          ]}
         >
           <span>一些消息</span>
           <span>一些消息</span>

From a5ae21de809ee66e0589831664f965920b321247 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 16:36:46 +0800
Subject: [PATCH 12/20] fix: counter border color

---
 components/counter/style/index.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/counter/style/index.scss b/components/counter/style/index.scss
index 9885177f0..6cf331eaf 100644
--- a/components/counter/style/index.scss
+++ b/components/counter/style/index.scss
@@ -32,7 +32,7 @@ $counter: 'hi-counter' !default;
     width: $m-width-ceil;
     height: $m-width-ceil;
     line-height: $m-width-ceil;
-    border: 1px solid $border-color-normal;
+    border: 1px solid $gray-light;
     border-radius: 2px;
     font-weight: bold;
     color: $active-color;
@@ -64,7 +64,7 @@ $counter: 'hi-counter' !default;
     flex: 1 1 auto;
     width: 2 * $m-width-ceil;
     padding: 0 6px;
-    border: 1px solid $border-color-normal;
+    border: 1px solid $gray-light;
     color: $normal-color;
     outline: none;
     box-sizing: border-box;

From 053c999a7302472a2d6ecc664ee4c51c909dfa7d Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 17:09:08 +0800
Subject: [PATCH 13/20] fix: update button tab style

---
 components/tabs/style/index.scss | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/components/tabs/style/index.scss b/components/tabs/style/index.scss
index af5072a64..f85f2fc84 100644
--- a/components/tabs/style/index.scss
+++ b/components/tabs/style/index.scss
@@ -54,8 +54,8 @@ $prefix: 'hi-tabs' !default;
     }
 
     .#{$prefix}__item {
-      height: 40px;
-      line-height: 40px;
+      height: 48px;
+      line-height: 46px;
       padding: 0 16px;
       box-sizing: border-box;
 
@@ -217,18 +217,22 @@ $prefix: 'hi-tabs' !default;
     .#{$prefix}__item {
       flex: none;
       height: 36px;
-      line-height: 36px;
-      padding: 0 24px;
+      line-height: 34px;
+      padding: 0 23px;
       box-sizing: border-box;
+      margin-right: 24px;
+      border: 1px solid #d8d8d8;
+      border-radius: 18px;
 
-      &:hover {
+      &:hover:not(.hi-tabs__item--active) {
         color: #4284f5;
+        border: 1px solid #4284f5;
       }
 
       &--active {
-        color: #4284f5;
+        color: #fff;
+        background-color: #4284f5;
         border: 1px solid #4284f5;
-        border-radius: 18px;
       }
     }
   }
@@ -315,12 +319,13 @@ $prefix: 'hi-tabs' !default;
 
     &--button {
       .#{$prefix}__item {
-        &:hover {
+        &:hover:not(.hi-tabs__item--active) {
           color: $value;
+          border: 1px solid $value;
         }
 
         &--active {
-          color: $value;
+          background-color: $value;
           border: 1px solid $value;
         }
       }

From 06297f4ec7afd8dce7ac2fde62f1dc3304e42dee Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 17:47:08 +0800
Subject: [PATCH 14/20] fix: carousel arrow add hover style

---
 components/carousel/style/index.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/carousel/style/index.scss b/components/carousel/style/index.scss
index ed186b288..b8653ad91 100644
--- a/components/carousel/style/index.scss
+++ b/components/carousel/style/index.scss
@@ -69,6 +69,10 @@
     margin-left: 24px;
     cursor: pointer;
 
+    &:hover {
+      background: rgba(0, 0, 0, 0.45);
+    }
+
     &:last-child {
       margin-right: 24px;
     }

From e002602da0232cdd1a608b59c613ddbe3ded7cfe Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 17:59:07 +0800
Subject: [PATCH 15/20] fix: update badage style

---
 components/badge/style/index.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/badge/style/index.scss b/components/badge/style/index.scss
index 977e08ef9..a19facc4f 100755
--- a/components/badge/style/index.scss
+++ b/components/badge/style/index.scss
@@ -11,6 +11,7 @@
     transform: translateX(50%);
     height: 16px;
     padding: 0 4px;
+    min-width: 8px;
     border: 2px solid #fff;
     border-radius: 10px;
     line-height: 16px;
@@ -29,7 +30,7 @@
     position: absolute;
     width: 8px;
     height: 8px;
-    top: -7px;
+    top: -5px;
     right: -5px;
     background: #f44141;
     border: 1px solid #fff;

From 2be32bf9ae808d9d7162e151d4c05b51fbe05e7f Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 18:09:27 +0800
Subject: [PATCH 16/20] fix: tree checkbox margin

---
 components/tree/style/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/tree/style/index.scss b/components/tree/style/index.scss
index 8252c7d95..92e99ef6e 100644
--- a/components/tree/style/index.scss
+++ b/components/tree/style/index.scss
@@ -21,7 +21,7 @@ $tree: 'hi-tree' !default;
 
   /* =========== */
   .hi-checkbox-legacy {
-    margin-left: 8px;
+    margin-left: 6px;
   }
 
   .hi-checkbox-legacy--part .hi-checkbox-legacy__input {

From 46d0bb6f3e9deee483817689420a9f04614a7160 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 21:00:00 +0800
Subject: [PATCH 17/20] 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 4adf39ef5..6c54e3894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 更新日志
 
+## 2.11.0
+
+- 新增 `<DatePicker />` 支持农历、节假日（中国和印度）显示 [#902](https://github.com/XiaoMi/hiui/issues/902)[#992](https://github.com/XiaoMi/hiui/issues/992)
+- 修复 `<Menu />` 高亮、展开对应菜单项不正确的问题 [#993](https://github.com/XiaoMi/hiui/issues/993)
+- 优化若干视觉还原问题：[#990](https://github.com/XiaoMi/hiui/issues/990) [#991](https://github.com/XiaoMi/hiui/issues/991) [#998](https://github.com/XiaoMi/hiui/issues/998) [#1000](https://github.com/XiaoMi/hiui/issues/1000) [#954](https://github.com/XiaoMi/hiui/issues/954) [#1001](https://github.com/XiaoMi/hiui/issues/1001) [#1002](https://github.com/XiaoMi/hiui/issues/1002) [#1003](https://github.com/XiaoMi/hiui/issues/1003) [#1004](https://github.com/XiaoMi/hiui/issues/1004) [#1005](https://github.com/XiaoMi/hiui/issues/1005)
+
 ## 2.10.0
 
 - 新增 `<Upload />` onDownload 点击上传成功文件的回调 [#613](https://github.com/XiaoMi/hiui/issues/613)
diff --git a/docs/zh-CN/components/changelog.mdx b/docs/zh-CN/components/changelog.mdx
index 4adf39ef5..6c54e3894 100644
--- a/docs/zh-CN/components/changelog.mdx
+++ b/docs/zh-CN/components/changelog.mdx
@@ -1,5 +1,11 @@
 # 更新日志
 
+## 2.11.0
+
+- 新增 `<DatePicker />` 支持农历、节假日（中国和印度）显示 [#902](https://github.com/XiaoMi/hiui/issues/902)[#992](https://github.com/XiaoMi/hiui/issues/992)
+- 修复 `<Menu />` 高亮、展开对应菜单项不正确的问题 [#993](https://github.com/XiaoMi/hiui/issues/993)
+- 优化若干视觉还原问题：[#990](https://github.com/XiaoMi/hiui/issues/990) [#991](https://github.com/XiaoMi/hiui/issues/991) [#998](https://github.com/XiaoMi/hiui/issues/998) [#1000](https://github.com/XiaoMi/hiui/issues/1000) [#954](https://github.com/XiaoMi/hiui/issues/954) [#1001](https://github.com/XiaoMi/hiui/issues/1001) [#1002](https://github.com/XiaoMi/hiui/issues/1002) [#1003](https://github.com/XiaoMi/hiui/issues/1003) [#1004](https://github.com/XiaoMi/hiui/issues/1004) [#1005](https://github.com/XiaoMi/hiui/issues/1005)
+
 ## 2.10.0
 
 - 新增 `<Upload />` onDownload 点击上传成功文件的回调 [#613](https://github.com/XiaoMi/hiui/issues/613)
diff --git a/package.json b/package.json
index c2413920e..1d756984c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",

From cdb5c794d61dad27c2cd77c6f6459cfcd5063f8c Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 21:24:59 +0800
Subject: [PATCH 18/20] fix: spell mistake

---
 components/date-picker/Calender.js   | 8 ++++----
 components/date-picker/DatePicker.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/date-picker/Calender.js b/components/date-picker/Calender.js
index 6623239e8..77c06d61c 100644
--- a/components/date-picker/Calender.js
+++ b/components/date-picker/Calender.js
@@ -249,19 +249,19 @@ class Calender extends Component {
     const LunarInfo = Lunar.toLunar(_year, _month, _value)
     let lunarcellinfo = {
       text: altCalendarPreset === 'zh-CN' ? LunarInfo[6] : null, // 默认预置信息
-      hightlight: false
+      highlight: false
     }
     if (altCalendar || dateMarkRender) {
       lunarcellinfo = {
         text: this.altCalendarText(datainfo, lunarcellinfo),
-        hightlight: altCalendarPresetData && altCalendarPresetData[datainfo] && altCalendarPresetData[datainfo].hightlight,
+        highlight: altCalendarPresetData && altCalendarPresetData[datainfo] && altCalendarPresetData[datainfo].highlight,
         nodeMark: this.markRender(datainfo)
       }
     }
     if ((dateMarkPresetData && dateMarkPresetData[datainfo]) || (altCalendarPresetData && altCalendarPresetData[datainfo])) {
       lunarcellinfo = {
         text: this.altCalendarText(datainfo, lunarcellinfo),
-        hightlight: altCalendarPresetData && altCalendarPresetData[datainfo] && altCalendarPresetData[datainfo].hightlight,
+        highlight: altCalendarPresetData && altCalendarPresetData[datainfo] && altCalendarPresetData[datainfo].highlight,
         nodeMark: this.markRender(datainfo)
       }
     }
@@ -338,7 +338,7 @@ class Calender extends Component {
                 }}
               >
                 {
-                  fullTimeInfo.hightlight
+                  fullTimeInfo.highlight
                     ? <span value={td.value} className='hi-datepicker__text--showLunar hi-datepicker__text--showLunar--festival'>
                       {fullTimeInfo.text}
                     </span>
diff --git a/components/date-picker/DatePicker.js b/components/date-picker/DatePicker.js
index bbbcac441..cc18e8248 100644
--- a/components/date-picker/DatePicker.js
+++ b/components/date-picker/DatePicker.js
@@ -46,7 +46,7 @@ class DatePicker extends BasePicker {
           Object.assign(oneYear, {
             [item.date.replace(/-/g, '/')]: {
               ...item,
-              hightlight: true
+              highlight: true
             }
           })
         })

From 4fa228fbfb6fa3f4546037acdfc44afa01118051 Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 21:25:34 +0800
Subject: [PATCH 19/20] docs: update datepicker

---
 docs/demo/date-picker/section-calendar.jsx |  2 +-
 docs/zh-CN/components/date-picker.mdx      | 48 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/demo/date-picker/section-calendar.jsx b/docs/demo/date-picker/section-calendar.jsx
index 8ab27bac5..7bc0f1cd0 100644
--- a/docs/demo/date-picker/section-calendar.jsx
+++ b/docs/demo/date-picker/section-calendar.jsx
@@ -55,7 +55,7 @@ class Demo extends React.Component {
               {
                 date:'2020/4/8',
                 text:'十周年',
-                hightlight: true
+                highlight: true
               },
           ]}
           dateMarkRender = {
diff --git a/docs/zh-CN/components/date-picker.mdx b/docs/zh-CN/components/date-picker.mdx
index 8c443bd6e..6089c13a9 100755
--- a/docs/zh-CN/components/date-picker.mdx
+++ b/docs/zh-CN/components/date-picker.mdx
@@ -46,34 +46,34 @@ import DemoCalendar from '../../demo/date-picker/section-calendar.jsx'
 
 ## Props
 
-| 参数        | 说明                              | 类型                                               | 可选值                                                                                                                                       | 默认值 |
-| ----------- | --------------------------------- | -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------ |
-| type        | 选择器类型                        | string                                             | date 普通日期 <br/> daterange 日期范围<br/> year 年份<br/> month 月份<br/> week 周<br/> weekrange 周范围 <br/> timeperiod 时间段（1.5 新增） | date   |
-| value       | 默认显示的日期                    | Date \| string \| number\| DateRange \| undefined \| null | -                                                                                                                                           | null   |
-| minDate     | 最小日期                          | Date                                               | null                                                                                                                                         | null   |
-| maxDate     | 最大日期                          | Date                                               | null                                                                                                                                         | null   |
-| disabled    | 是否禁用输入框                    | boolean                                            | true \| false                                                                                                                                | false  |
-| disabledDate    | 不可选择的日期                  | (currentDate: Date) => boolean                 | true \| false                                                                                                                    | false  |
-| clearable   | 是否可以清空                      | boolean                                            | true \| false                                                                                                                                | true   |
-| showTime    | 是否在日期选择器中显示时间选择器     | boolean                                            | true \| false                                                                                                                                     | false  |
-| shortcuts   | 快捷面板                          | string[]                                              | 近一周, 近一月, 近三月, 近一年                                                                                                               | null   |
-| weekOffset  | 周起始<br/>默认周日做为第一列     | number                                             | 0 \| 1                                                                                                                                          | 0      |
-| placeholder | 自定义占位符<br/>数组用于范围日期 | string \| string[]                                    | -                                                                                                                                            | -      |
-| onChange    | 值变化时的回调函数                | (date: Date \| DateRange, dateStr: string \| DateRange ) => void                                    | -                                                                                                | -      |
-| altCalendar | 日期中历法信息                      | CalendarItem                                    | -                                                                                                                                             | 农历 & 假日  |
-| altCalendarPreset | 暂预置历法信息<br/> <阴历\|印度>                  | string                                           | 'zh-CN' \| 'id-ID'                                                                                                               | 'zh-CN' |
-| dateMarkRender | 日期的右上角标记     | (currentDate: Date, today: Date) => React.ReactNode | -                                                                                                                      | 休 \| 班 |
-| dateMarkPreset | 暂预置中国大陆节假日                     | string                                         | 'zh-CN'                                                                                                                                     | 'zh-CN' |
-
+| 参数              | 说明                                     | 类型                                                             | 可选值                                                                                                                                       | 默认值      |
+| ----------------- | ---------------------------------------- | ---------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
+| type              | 选择器类型                               | string                                                           | date 普通日期 <br/> daterange 日期范围<br/> year 年份<br/> month 月份<br/> week 周<br/> weekrange 周范围 <br/> timeperiod 时间段（1.5 新增） | date        |
+| value             | 默认显示的日期                           | Date \| string \| number\| DateRange \| undefined \| null        | -                                                                                                                                            | null        |
+| minDate           | 最小日期                                 | Date                                                             | null                                                                                                                                         | null        |
+| maxDate           | 最大日期                                 | Date                                                             | null                                                                                                                                         | null        |
+| disabled          | 是否禁用输入框                           | boolean                                                          | true \| false                                                                                                                                | false       |
+| disabledDate      | 不可选择的日期                           | (currentDate: Date) => boolean                                   | true \| false                                                                                                                                | false       |
+| clearable         | 是否可以清空                             | boolean                                                          | true \| false                                                                                                                                | true        |
+| showTime          | 是否在日期选择器中显示时间选择器         | boolean                                                          | true \| false                                                                                                                                | false       |
+| shortcuts         | 快捷面板                                 | string[]                                                         | 近一周, 近一月, 近三月, 近一年                                                                                                               | null        |
+| weekOffset        | 周起始，默认周日做为第一列               | number                                                           | 0 \| 1                                                                                                                                       | 0           |
+| placeholder       | 自定义占位符（数组用于范围日期）         | string \| string[]                                               | -                                                                                                                                            | -           |
+| onChange          | 值变化时的回调函数                       | (date: Date \| DateRange, dateStr: string \| DateRange ) => void | -                                                                                                                                            | -           |
+| altCalendar       | 自定义日期中历法展示信息                 | CalendarItem                                                     | -                                                                                                                                            | 农历 & 假日 |
+| altCalendarPreset | 预置历法信息（支持中国农历和印度节假日） | string                                                           | 'zh-CN' \| 'id-ID'                                                                                                                           | 'zh-CN'     |
+| dateMarkRender    | 自定义日期的右上角标记                   | (currentDate: Date, today: Date) => React.ReactNode              | -                                                                                                                                            | -           |
+| dateMarkPreset    | 预置日期的右上角标记（休 \| 班）         | string                                                           | 'zh-CN'                                                                                                                                      | 'zh-CN'     |
 
 ## Type
+
 ### CalendarItem
-| 参数     | 说明      | 类型    | 可选值 | 默认值 |
-| -------- | ------- | ------- | ------ | ------ |
-| date    | 日期     | Date \| string  | -      | -      |
-| text    |  描述信息  | string  |  -  | - |
-| hightlight    |  高亮显示  | boolean  |  true \| false | false |
 
+| 参数      | 说明     | 类型           | 可选值        | 默认值 |
+| --------- | -------- | -------------- | ------------- | ------ |
+| date      | 日期     | Date \| string | -             | -      |
+| text      | 描述信息 | string         | -             | -      |
+| highlight | 高亮显示 | boolean        | true \| false | false  |
 
 ### DateRange
 

From 80517697dcf7d436fb0d9c04b75a41bc2e0e6cbb Mon Sep 17 00:00:00 2001
From: solarjoker <chenissolar@gmail.com>
Date: Wed, 18 Mar 2020 21:26:47 +0800
Subject: [PATCH 20/20] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c54e3894..f393719da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.11.0
 
-- 新增 `<DatePicker />` 支持农历、节假日（中国和印度）显示 [#902](https://github.com/XiaoMi/hiui/issues/902)[#992](https://github.com/XiaoMi/hiui/issues/992)
+- 新增 `<DatePicker />` altCalendarPreset 预设历法信息（支持中国农历和印度节假日），altCalendar 自定义日期显示，dateMarkRender 自定义日期右上角显示标志，dateMarkPreset 预设右上角显示标志「班」和「休」 [#902](https://github.com/XiaoMi/hiui/issues/902)[#992](https://github.com/XiaoMi/hiui/issues/992)
 - 修复 `<Menu />` 高亮、展开对应菜单项不正确的问题 [#993](https://github.com/XiaoMi/hiui/issues/993)
 - 优化若干视觉还原问题：[#990](https://github.com/XiaoMi/hiui/issues/990) [#991](https://github.com/XiaoMi/hiui/issues/991) [#998](https://github.com/XiaoMi/hiui/issues/998) [#1000](https://github.com/XiaoMi/hiui/issues/1000) [#954](https://github.com/XiaoMi/hiui/issues/954) [#1001](https://github.com/XiaoMi/hiui/issues/1001) [#1002](https://github.com/XiaoMi/hiui/issues/1002) [#1003](https://github.com/XiaoMi/hiui/issues/1003) [#1004](https://github.com/XiaoMi/hiui/issues/1004) [#1005](https://github.com/XiaoMi/hiui/issues/1005)
 
diff --git a/docs/zh-CN/components/changelog.mdx b/docs/zh-CN/components/changelog.mdx
index 6c54e3894..f393719da 100644
--- a/docs/zh-CN/components/changelog.mdx
+++ b/docs/zh-CN/components/changelog.mdx
@@ -2,7 +2,7 @@
 
 ## 2.11.0
 
-- 新增 `<DatePicker />` 支持农历、节假日（中国和印度）显示 [#902](https://github.com/XiaoMi/hiui/issues/902)[#992](https://github.com/XiaoMi/hiui/issues/992)
+- 新增 `<DatePicker />` altCalendarPreset 预设历法信息（支持中国农历和印度节假日），altCalendar 自定义日期显示，dateMarkRender 自定义日期右上角显示标志，dateMarkPreset 预设右上角显示标志「班」和「休」 [#902](https://github.com/XiaoMi/hiui/issues/902)[#992](https://github.com/XiaoMi/hiui/issues/992)
 - 修复 `<Menu />` 高亮、展开对应菜单项不正确的问题 [#993](https://github.com/XiaoMi/hiui/issues/993)
 - 优化若干视觉还原问题：[#990](https://github.com/XiaoMi/hiui/issues/990) [#991](https://github.com/XiaoMi/hiui/issues/991) [#998](https://github.com/XiaoMi/hiui/issues/998) [#1000](https://github.com/XiaoMi/hiui/issues/1000) [#954](https://github.com/XiaoMi/hiui/issues/954) [#1001](https://github.com/XiaoMi/hiui/issues/1001) [#1002](https://github.com/XiaoMi/hiui/issues/1002) [#1003](https://github.com/XiaoMi/hiui/issues/1003) [#1004](https://github.com/XiaoMi/hiui/issues/1004) [#1005](https://github.com/XiaoMi/hiui/issues/1005)