diff --git a/CHANGELOG.md b/CHANGELOG.md
index b577119d4..27459bb1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # 更新日志
 
+## 2.14.0
+
+- 优化 `<Menu />` 垂直模式收起后没有配置 icon 的展示效果 [#1167](https://github.com/XiaoMi/hiui/issues/1167)
+- 优化 `<Modal />` 国际化适配 [#1142](https://github.com/XiaoMi/hiui/issues/1142)
+- 修复 `<Progress />` 环形边框颜色问题 [#1165](https://github.com/XiaoMi/hiui/issues/1165)
+- 新增 `<Transfer />` onDragStart/onDragEnd/onDrop 回调函数 [#1162](https://github.com/XiaoMi/hiui/issues/1162)
+- 修复 `<Upload />` 设置 maxCount 后导致上传交互异常问题 [#1158](https://github.com/XiaoMi/hiui/issues/1158)
+- 修复 `<Input />` 设置 clearable 属性控制台警告问题 [#1143](https://github.com/XiaoMi/hiui/issues/1143)
+- 修复 `<Input />` type 为 amount 类型时的问题 [#1150](https://github.com/XiaoMi/hiui/issues/1150)
+- 修复 `<Progress />` placement 为 inside 内容显示折断问题 [#1146](https://github.com/XiaoMi/hiui/issues/1146)
+- 修复 `<Icon />` 部分图标字号问题 [#1145](https://github.com/XiaoMi/hiui/issues/1145)
+- 修复 `<Tabs />` type 非 editable 时，title 属性控制台警告问题 [#1144](https://github.com/XiaoMi/hiui/issues/1144)
+- 修复 `<Rate />` useEmoji 为 true 时，设置 value > 5 报错问题 [#1137](https://github.com/XiaoMi/hiui/issues/1137)
+- 修复 `<Select />` 支持 withCredentials 跨域携带 cookie 属性 [#1128](https://github.com/XiaoMi/hiui/issues/1128)
+- 修复 `<Counter />` 在不设置 min 属性时，只可选中到 -1 问题 [#1108](https://github.com/XiaoMi/hiui/issues/1108)
+- 修复 `<DatePicker />` 手动输入日期相关问题 [#1106](https://github.com/XiaoMi/hiui/issues/1106)
+- 修复 `<DatePicker />` 在禁用状态下，可清空问题 [#1099](https://github.com/XiaoMi/hiui/issues/1099)
+- 修复 `<DatePicker />` DatePicker 在浏览器右侧时，弹出位置显示异常问题 [#1098](https://github.com/XiaoMi/hiui/issues/1098)
+- 优化国际化中简体中文 [#1125](https://github.com/XiaoMi/hiui/issues/1125)
+
 ## 2.13.0
 
 - 修复 `<Checkbox />` 行高不正确问题 [#1061](https://github.com/XiaoMi/hiui/issues/1061)
diff --git a/components/confirm/index.js b/components/confirm/index.js
index 885ff851c..6cb836ed4 100644
--- a/components/confirm/index.js
+++ b/components/confirm/index.js
@@ -1,17 +1,18 @@
 import React, { Component } from 'react'
-import PropTypes from 'prop-types'
 import ReactDOM from 'react-dom'
 
 import Modal from '../modal'
 import './style/index'
+import Provider from '../context'
 
 class Confirm extends Component {
   render () {
-    let {content, onOk, onCancel, title} = this.props
+    let { content, onOk, onCancel, title, localeDatas } = this.props
 
     return (
       <div className='hi-confirm'>
         <Modal
+          localeDatas={localeDatas}
           title={title}
           ref='hi-confirm'
           show
@@ -22,45 +23,32 @@ class Confirm extends Component {
           showFooter
           confirmType='default'
           cancelType='danger'
-          onConfirm={() => (function () {
+          onConfirm={() => {
             if (onOk) {
               onOk()
             }
-
             confirmInstance.destroy()
-          }())}
-          onCancel={() => (function () {
+          }}
+          onCancel={() => {
             if (onCancel) {
               onCancel()
             }
 
             confirmInstance.destroy()
-          }())}
+          }}
         >
           {content}
-
         </Modal>
       </div>
-
     )
   }
-
-  // componentDidMount () {
-  //   Modal.show.call(this, 'hi-confirm')
-  // }
 }
-
-Confirm.propTypes = {
-  tip: PropTypes.string,
-  onOk: PropTypes.function,
-  onCancel: PropTypes.function
-}
-
+Confirm.IS_HIUI_CONFIRM = true
 Confirm.newInstance = function newNotificationInstance (properties) {
   let props = properties || {}
   let div = document.createElement('div')
   document.body.appendChild(div)
-  ReactDOM.render(React.createElement(Confirm, props), div)
+  ReactDOM.render(React.createElement(Provider(Confirm), props), div)
   return {
     destroy () {
       ReactDOM.unmountComponentAtNode(div)
diff --git a/components/context/index.js b/components/context/index.js
index 3f1b2da3e..013e3dcbf 100644
--- a/components/context/index.js
+++ b/components/context/index.js
@@ -2,44 +2,42 @@ import React, { Component, forwardRef } from 'react'
 import locales from '../locales'
 
 export const ThemeContext = React.createContext('hiui-blue')
-export const LocaleContext = React.createContext('zh-CN')
+export const LocaleContext = React.createContext('zh-Hans')
 /**
  * 临时解决 notice组件获取不到theme的问题
  */
 let noticeTheme = ''
-export default WrappedComponent => {
+let confirmLocale = ''
+export default (WrappedComponent) => {
   class WrapperComponent extends Component {
     static displayName = WrappedComponent.name
     render () {
       const { theme, locale, innerRef, ...restProps } = this.props
       let ConsumerComponent = (
         <ThemeContext.Consumer>
-          {contextTheme => {
+          {(contextTheme) => {
             noticeTheme = noticeTheme || contextTheme
             return (
               <LocaleContext.Consumer>
-                {contextLocale => (
-                  <WrappedComponent
-                    theme={
-                      WrappedComponent.IS_HIUI_NOTICE
-                        ? noticeTheme
-                        : contextTheme
-                    }
-                    locale={contextLocale}
-                    localeDatas={locales[contextLocale]}
-                    ref={innerRef}
-                    innerRef={innerRef}
-                    {...restProps}
-                  />
-                )}
+                {(contextLocale) => {
+                  confirmLocale = confirmLocale || contextLocale
+                  return (
+                    <WrappedComponent
+                      theme={WrappedComponent.IS_HIUI_NOTICE ? noticeTheme : contextTheme}
+                      locale={WrappedComponent.IS_HIUI_CONFIRM ? confirmLocale : contextLocale}
+                      localeDatas={WrappedComponent.IS_HIUI_CONFIRM ? locales[confirmLocale] : locales[contextLocale]}
+                      ref={innerRef}
+                      innerRef={innerRef}
+                      {...restProps}
+                    />
+                  )
+                }}
               </LocaleContext.Consumer>
             )
           }}
         </ThemeContext.Consumer>
       )
-      return wrapProvider(theme, ThemeContext)(locale, LocaleContext)(
-        ConsumerComponent
-      )
+      return wrapProvider(theme, ThemeContext)(locale, LocaleContext)(ConsumerComponent)
     }
   }
   return forwardRef((props, ref) => {
@@ -57,12 +55,8 @@ function wrapProvider (value, context) {
   }
   if (!context) {
     let component = value
-    wrapProvider.Providers.reverse().map(obj => {
-      component = (
-        <obj.context.Provider value={obj.value}>
-          {component}
-        </obj.context.Provider>
-      )
+    wrapProvider.Providers.reverse().map((obj) => {
+      component = <obj.context.Provider value={obj.value}>{component}</obj.context.Provider>
     })
     wrapProvider.Providers = []
     return component
diff --git a/components/counter/Counter.js b/components/counter/Counter.js
index 22791b66f..c279aadba 100644
--- a/components/counter/Counter.js
+++ b/components/counter/Counter.js
@@ -211,17 +211,13 @@ class Counter extends React.Component {
   }
 
   getInputNumber () {
-    const { max = Infinity, min = 0 } = this.props
+    const { max, min } = this.props
     let value = this.valueTrue
     if (isNaN(value)) {
-      value = min
-    }
-    if (value - max >= 0) {
-      value = max
-    }
-    if (value - min <= 0) {
-      value = min
+      value = 0
     }
+    value = max && value - max >= 0 ? max : value
+    value = min && value - min <= 0 ? min : value
     return value
   }
 
diff --git a/components/date-picker/BasePicker.js b/components/date-picker/BasePicker.js
index b7ca849f9..702ca459e 100644
--- a/components/date-picker/BasePicker.js
+++ b/components/date-picker/BasePicker.js
@@ -3,7 +3,7 @@ import _ from 'lodash'
 import Modal from './Modal'
 import classNames from 'classnames'
 import {formatterDate, FORMATS} from './constants'
-import {showLargeCalendar} from './util'
+import {showLargeCalendar, getInRangeDate} from './util'
 import PropTypes from 'prop-types'
 import DatePickerType from './Type'
 
@@ -68,6 +68,10 @@ class BasePicker extends Component {
   calcPanelPos (rect) {
     const {showTime, type} = this.props
     let _w = type.indexOf('range') !== -1 ? 578 : 288
+    if (type === 'timerange') {
+      _w = 400
+    }
+
     let _h = 298
     if (type === 'daterange' && showTime) {
       _h = 344
@@ -80,6 +84,7 @@ class BasePicker extends Component {
     const _st = document.documentElement.scrollTop || document.body.scrollTop
     let {left, width, top, height} = rect
     let _top = rect.top + rect.height + _st + 4
+
     if (left + _w > _cw) {
       left = left + width - _w
     }
@@ -172,27 +177,45 @@ class BasePicker extends Component {
       }
     })
   }
+
   callback () {
-    const { type, onChange } = this.props
+    const { type, onChange, disabled, max, min } = this.props
+
     const { date, format } = this.state
-    if (onChange) {
-      let {startDate, endDate} = date
+    if (onChange && !disabled) {
+      let {startDate, endDate} = getInRangeDate(_.cloneDeep(date.startDate), _.cloneDeep(date.endDate), max, min)
       startDate = isValid(startDate) ? startDate : ''
       endDate = isValid(endDate) ? endDate : ''
       if (type === 'week' || type === 'weekrange') {
+        this.setState({
+          texts: [this.callFormatterDate(startDate), this.callFormatterDate(endDate)]
+        })
         onChange(date)
         return
       }
 
       if (type === 'time') {
+        this.setState({
+          texts: [this.callFormatterDate(startDate), '']
+        })
         onChange(startDate, dateFormat(startDate, format))
         return
       }
       if (['timerange', 'timeperiod', 'daterange', 'yearrange', 'monthrange'].includes(type)) {
+        this.setState({
+          texts: [this.callFormatterDate(startDate), this.callFormatterDate(endDate)]
+        })
         onChange({start: startDate, end: endDate}, {start: dateFormat(startDate, format), end: dateFormat(endDate, format)})
+
         return
       }
-      onChange(startDate, startDate ? dateFormat(startDate, format) : '')
+
+      if (isValid(startDate) || startDate === '') {
+        this.setState({
+          texts: [this.callFormatterDate(startDate), '']
+        })
+        onChange(startDate, startDate ? dateFormat(startDate, format) : '')
+      }
     }
   }
   timeCancel () {
@@ -223,6 +246,7 @@ class BasePicker extends Component {
     }
   }
   clickOutSide (e) {
+    const {max, min} = this.props
     const tar = e.target
     this.inputChangeEvent()
 
@@ -234,8 +258,17 @@ class BasePicker extends Component {
       return false
     }
     if (tar !== this.input && tar !== this.rInput) {
-      this.timeCancel()
-      this.callback()
+      let { texts } = this.state
+
+      let {startDate, endDate} = getInRangeDate(texts[0], texts[1], max, min)
+
+      texts = [this.callFormatterDate(startDate), this.callFormatterDate(endDate)]
+      this.setState({
+        texts
+      }, () => {
+        this.timeCancel()
+        this.callback()
+      })
     }
   }
   _input (text, ref, placeholder) {
@@ -268,19 +301,20 @@ class BasePicker extends Component {
     )
   }
   _clear () {
-    this.setState({date: {startDate: null, endDate: null}, texts: ['', ''], isFocus: false}, () => { this.callback() })
+    const { disabled } = this.props
+    !disabled && this.setState({date: {startDate: null, endDate: null}, texts: ['', ''], isFocus: false}, () => { this.callback() })
   }
   _icon () {
     const {isFocus, texts} = this.state
-    const { clearable, type, showTime } = this.props
+    const { clearable, type, showTime, disabled } = this.props
     const iconCls = classNames(
       'hi-datepicker__input-icon',
       'hi-icon',
-      (texts[0].length && isFocus && clearable)
+      (texts[0].length && isFocus && clearable && !disabled)
         ? 'icon-close-circle clear'
         : ((type.includes('time') || showTime) ? 'icon-time' : 'icon-date')
     )
-    return (isFocus && clearable)
+    return (texts[0].length && isFocus && clearable)
       ? <span className={iconCls} onClick={this._clear.bind(this)} />
       : <span className={iconCls} onClick={(e) => {
         if (this.props.disabled) return
diff --git a/components/date-picker/DateRangePanel.js b/components/date-picker/DateRangePanel.js
index 1e98b9edd..84065f1f7 100644
--- a/components/date-picker/DateRangePanel.js
+++ b/components/date-picker/DateRangePanel.js
@@ -1,6 +1,7 @@
 import React, {Component} from 'react'
 import Calender from './Calender'
-import { deconstructDate, nextMonth, showLargeCalendar, colDisabled } from './util'
+import { deconstructDate, nextMonth, showLargeCalendar, colDisabled, getInRangeDate } from './util'
+
 import { DAY_MILLISECONDS } from './constants'
 import Icon from '../icon'
 import classNames from 'classnames'
@@ -170,7 +171,7 @@ class DateRangePanel extends Component {
     })
   }
   shortcutsClickEvent (e) {
-    const { localeDatas } = this.props
+    const { localeDatas, max, min } = this.props
     const {range} = this.state
     const _date = new Date()
     const val = e.target.innerText
@@ -193,8 +194,9 @@ class DateRangePanel extends Component {
         break
     }
     const nDate = new Date((endOfDay(_date).getTime() + 1) - days * DAY_MILLISECONDS)
-    range.startDate = nDate
-    range.endDate = _date
+    const {startDate, endDate} = getInRangeDate(nDate, _date, max, min)
+    range.startDate = startDate
+    range.endDate = endDate
     this.props.onPick(range)
   }
   renderShortcut (shortcuts) {
diff --git a/components/date-picker/util.js b/components/date-picker/util.js
index f098b17da..3088eb3ed 100644
--- a/components/date-picker/util.js
+++ b/components/date-picker/util.js
@@ -1,5 +1,5 @@
 import request from 'axios'
-import { addMonths, getDay, subDays, differenceInDays, startOfWeek, endOfWeek, getYear, getMonth } from './dateUtil'
+import { addMonths, getDay, subDays, differenceInDays, startOfWeek, endOfWeek, getYear, getMonth, toDate, isValid } from './dateUtil'
 const holiday = {
   PRCHoliday: 'https://cdn.cnbj1.fds.api.mi-img.com/hiui/PRCHoliday.json?',
   PRCLunar: 'https://cdn.cnbj1.fds.api.mi-img.com/hiui/PRCLunar.json?',
@@ -80,3 +80,24 @@ export const getPRCDate = (api) => {
   }
   return url ? request.create().request(options) : null
 }
+
+// 处理输入不在该范围内的处理
+export const getInRangeDate = (startDate, endDate, max, min) => {
+  let _startDate = isValid(startDate) ? startDate : ''
+  let _endDate = isValid(endDate) ? endDate : ''
+  if (min && isValid(startDate)) {
+    const minTimestamp = Date.parse(toDate(min))
+    const startDateTimestamp = Date.parse(startDate)
+    const endDateTimestamp = Date.parse(endDate)
+    _startDate = startDateTimestamp < minTimestamp ? new Date(minTimestamp) : new Date(startDate)
+    _endDate = endDateTimestamp < minTimestamp ? new Date(minTimestamp) : new Date(endDate)
+  }
+  if (max && isValid(startDate)) {
+    const maxTimestamp = Date.parse(toDate(max))
+    const startDateTimestamp = Date.parse(_startDate)
+    const endDateTimestamp = Date.parse(_endDate)
+    _startDate = startDateTimestamp > maxTimestamp ? new Date(maxTimestamp) : new Date(_startDate)
+    _endDate = endDateTimestamp > maxTimestamp ? new Date(maxTimestamp) : new Date(_endDate)
+  }
+  return {startDate: _startDate, endDate: _endDate}
+}
diff --git a/components/dropdown/Dropdown.jsx b/components/dropdown/Dropdown.jsx
index 37a65b153..093a87da5 100644
--- a/components/dropdown/Dropdown.jsx
+++ b/components/dropdown/Dropdown.jsx
@@ -139,7 +139,7 @@ class Dropdown extends React.Component {
 }
 
 Dropdown.propTypes = {
-  placement: PropTypes.oneOf(['top-start', 'bottom-start', 'top', 'bottom']),
+  placement: PropTypes.oneOf(['top-start', 'bottom-start', 'top', 'bottom', 'bottom-end', 'top-end']),
   trigger: PropTypes.oneOfType([
     PropTypes.oneOf(['contextmenu', 'click', 'hover']),
     PropTypes.arrayOf(PropTypes.oneOf(['contextmenu', 'click', 'hover']))
diff --git a/components/input/Input.js b/components/input/Input.js
index b2d97ad81..9b6bc163d 100644
--- a/components/input/Input.js
+++ b/components/input/Input.js
@@ -33,8 +33,7 @@ class Input extends Component {
     const prependNode = typeof prepend !== 'string' && prepend
     const appendNode = typeof append !== 'string' && append
     this.state = {
-      value:
-        type === 'string' || type === 'number' ? format(valueSource, this.props.type) : '',
+      value: type === 'string' || type === 'number' ? format(valueSource.toString(), this.props.type) : '',
       valueTrue: prefix + valueSource + suffix,
       hover: false,
       active: false,
@@ -49,7 +48,7 @@ class Input extends Component {
     if (nextProps.value !== undefined) {
       if (nextProps.value !== this.state.value) {
         this.setState({
-          value: format(nextProps.value, this.props.type),
+          value: format(nextProps.value.toString(), this.props.type),
           valueTrue: nextProps.value
         })
       }
@@ -85,7 +84,19 @@ class Input extends Component {
     let prefixId = id ? id + '_prefix' : ''
     let suffixId = id ? id + '_suffix' : ''
     const { defaultValue, ...attrs } = this.attrs
-    const filterAttrs = filterObjProps(attrs, ['locale', 'theme', 'suffixicon', 'suffix', 'prepend', 'prefixicon', 'prefix', 'localeDatas', 'append', 'innerRef'])
+    const filterAttrs = filterObjProps(attrs, [
+      'locale',
+      'theme',
+      'suffixicon',
+      'suffix',
+      'prepend',
+      'prefixicon',
+      'prefix',
+      'localeDatas',
+      'append',
+      'innerRef',
+      'clearable'
+    ])
     return (
       <div
         className={classNames('hi-input__out', {
@@ -93,17 +104,21 @@ class Input extends Component {
           'hi-input--append': append
         })}
       >
-        {// 前置元素
-          prepend && <span className='hi-input__prepend'>{prepend}</span>}
+        {
+          // 前置元素
+          prepend && <span className='hi-input__prepend'>{prepend}</span>
+        }
         <div className={`hi-input__inner${active ? ' active' : ''}${disabled ? ' disabled' : ''}`}>
-          {// 前缀
+          {
+            // 前缀
             prefix && (
               <span id={prefixId} className='hi-input__prefix' data-value={prefix}>
                 {prefix}
               </span>
-            )}
+            )
+          }
           <input
-            ref={arg => {
+            ref={(arg) => {
               this._Input = arg
             }}
             className={`hi-input__text ${disabled ? 'disabled' : ''}`}
@@ -112,7 +127,7 @@ class Input extends Component {
             disabled={disabled}
             {...filterAttrs}
             placeholder={placeholder}
-            onChange={e => {
+            onChange={(e) => {
               e.persist()
               let value = e.target.value
               let valueTrue = formatValue(value, type)
@@ -130,7 +145,7 @@ class Input extends Component {
 
               this.props.value === undefined && this.setState({ value, valueTrue })
             }}
-            onBlur={e => {
+            onBlur={(e) => {
               e.persist()
               let value = e.target.value
               const valueTrue = this.state.valueTrue
@@ -144,7 +159,7 @@ class Input extends Component {
                 this.props.onBlur && this.props.onBlur(e, valueTrue)
               })
             }}
-            onFocus={e => {
+            onFocus={(e) => {
               e.persist()
               const valueTrue = this.state.valueTrue
 
@@ -152,34 +167,34 @@ class Input extends Component {
                 this.props.onFocus && this.props.onFocus(e, valueTrue)
               })
             }}
-            onKeyDown={e => {
+            onKeyDown={(e) => {
               const valueTrue = this.state.valueTrue
 
               this.props.onKeyDown && this.props.onKeyDown(e, valueTrue)
             }}
-            onKeyUp={e => {
+            onKeyUp={(e) => {
               const valueTrue = this.state.valueTrue
 
               this.props.onKeyUp && this.props.onKeyUp(e, valueTrue)
             }}
-            onKeyPress={e => {
+            onKeyPress={(e) => {
               const valueTrue = this.state.valueTrue
 
               this.props.onKeyPress && this.props.onKeyPress(e, valueTrue)
             }}
-            onInput={e => {
+            onInput={(e) => {
               const valueTrue = this.state.valueTrue
 
               this.props.onInput && this.props.onInput(e, valueTrue)
             }}
           />
-          {// 清除
-            noClear.indexOf(type) === -1 &&
-            prefix === '' &&
-            suffix === '' &&
-            (value !== '' && clearable) && (
+          {
+            // 清除
+            noClear.indexOf(type) === -1 && prefix === '' && suffix === '' && value !== '' && clearable && (
               <span
-                className={`hi-input__fix-box ${(hover || clearableTrigger === 'always') && !disabled ? '' : 'invisible'}`}
+                className={`hi-input__fix-box ${
+                  (hover || clearableTrigger === 'always') && !disabled ? '' : 'invisible'
+                }`}
                 onClick={() => {
                   this._Input.focus()
 
@@ -197,16 +212,21 @@ class Input extends Component {
               >
                 <i className={`hi-input__clear hi-input__suffix__icon hi-icon icon-close-circle`} />
               </span>
-            )}
-          {// 后缀
+            )
+          }
+          {
+            // 后缀
             suffix && (
               <span id={suffixId} className='hi-input__suffix' data-value={suffix}>
                 {suffix}
               </span>
-            )}
+            )
+          }
         </div>
-        {// 后置元素
-          append && <span className='hi-input__append'>{append}</span>}
+        {
+          // 后置元素
+          append && <span className='hi-input__append'>{append}</span>
+        }
       </div>
     )
   }
@@ -218,7 +238,19 @@ class Input extends Component {
     let { active } = this.state
     let { disabled, theme } = this.props
     const { defaultValue, ...attrs } = this.attrs
-    const filterAttrs = filterObjProps(attrs, ['locale', 'theme', 'suffixicon', 'suffix', 'prepend', 'prefixicon', 'prefix', 'localeDatas', 'append', 'innerRef'])
+    const filterAttrs = filterObjProps(attrs, [
+      'locale',
+      'theme',
+      'suffixicon',
+      'suffix',
+      'prepend',
+      'prefixicon',
+      'prefix',
+      'localeDatas',
+      'append',
+      'innerRef',
+      'clearable'
+    ])
 
     return (
       <textarea
@@ -228,13 +260,13 @@ class Input extends Component {
         value={this.state.value}
         disabled={disabled}
         {...filterAttrs}
-        onChange={e => {
+        onChange={(e) => {
           e.persist()
           let valueTrue = e.target.value
           this.props.onChange && this.props.onChange(e, valueTrue)
           this.props.value === undefined && this.setState({ value: valueTrue, valueTrue })
         }}
-        onBlur={e => {
+        onBlur={(e) => {
           e.persist()
           let valueTrue = e.target.value
 
@@ -242,7 +274,7 @@ class Input extends Component {
             this.props.onBlur && this.props.onBlur(e, valueTrue)
           })
         }}
-        onFocus={e => {
+        onFocus={(e) => {
           e.persist()
           const valueTrue = e.target.value
 
@@ -250,32 +282,32 @@ class Input extends Component {
             this.props.onFocus && this.props.onFocus(e, valueTrue)
           })
         }}
-        onKeyDown={e => {
+        onKeyDown={(e) => {
           const valueTrue = e.target.value
 
           this.props.onKeyDown && this.props.onKeyDown(e, valueTrue)
         }}
-        onKeyUp={e => {
+        onKeyUp={(e) => {
           const valueTrue = e.target.value
 
           this.props.onKeyUp && this.props.onKeyUp(e, valueTrue)
         }}
-        onKeyPress={e => {
+        onKeyPress={(e) => {
           const valueTrue = e.target.value
 
           this.props.onKeyPress && this.props.onKeyPress(e, valueTrue)
         }}
-        onInput={e => {
+        onInput={(e) => {
           const valueTrue = e.target.value
 
           this.props.onInput && this.props.onInput(e, valueTrue)
         }}
-        onMouseOver={e => {
+        onMouseOver={(e) => {
           this.setState({
             hover: true
           })
         }}
-        onMouseLeave={e => {
+        onMouseLeave={(e) => {
           this.setState({
             hover: false
           })
@@ -288,7 +320,9 @@ class Input extends Component {
     const { type } = this.attrs
 
     const { size, id, className, required, theme } = this.props
-    return type === 'textarea' ? this.renderTextarea() : (
+    return type === 'textarea' ? (
+      this.renderTextarea()
+    ) : (
       <div
         id={id}
         className={`hi-input theme__${theme} ${className || ''} ${type}${size ? ' hi-input_' + size : ''}${
@@ -296,22 +330,23 @@ class Input extends Component {
         }`}
         style={this.props.style}
         data-value={this.state.valueTrue}
-        onClick={e => {
+        onClick={(e) => {
           this._Input.focus()
         }}
-        onMouseOver={e => {
+        onMouseOver={(e) => {
           this.setState({
             hover: true
           })
         }}
-        onMouseLeave={e => {
+        onMouseLeave={(e) => {
           this.setState({
             hover: false
           })
         }}
       >
         {this.renderText()}
-      </div>)
+      </div>
+    )
   }
 }
 
diff --git a/components/locales/index.js b/components/locales/index.js
index bbb51cddb..b0c6cd609 100644
--- a/components/locales/index.js
+++ b/components/locales/index.js
@@ -5,6 +5,7 @@ import zhHantTW from './zh-Hant-TW'
 
 export default {
   'zh-CN': zhCN,
+  'zh-Hans': zhCN,
   'en-US': enUS,
   'zh-Hant-HK': zhHantHK,
   'zh-Hant-TW': zhHantTW
diff --git a/components/menu/Item.js b/components/menu/Item.js
index 2b230917d..9bd3db840 100644
--- a/components/menu/Item.js
+++ b/components/menu/Item.js
@@ -1,39 +1,32 @@
-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import Title from './Title'
 
 class Item extends Component {
   render () {
-    const {
-      children,
-      disabled,
-      onClick,
-      level,
-      activeIndex,
-      id,
-      icon,
-      index,
-      data
-    } = this.props
+    const { children, disabled, onClick, level, placement, activeIndex, id, icon, index, data, mini } = this.props
     const isActive = activeIndex === index
     const cls = classNames('hi-menu-item', 'hi-menu-item__title', 'hi-menu__title', `hi-menu--${level}`, {
       'hi-menu-item--disabled': disabled,
       'hi-menu-item--active': isActive
     })
     return (
-      <li className={cls} key={index} onClick={e => {
-        e.stopPropagation()
-        if (!disabled) {
-          onClick(index, id, data)
-        }
-      }}>
-        <Title icon={icon} content={children} />
+      <li
+        className={cls}
+        key={index}
+        onClick={(e) => {
+          e.stopPropagation()
+          if (!disabled) {
+            onClick(index, id, data)
+          }
+        }}
+      >
+        <Title icon={icon} content={children} placement={placement} level={level} mini={mini} />
       </li>
     )
   }
 }
-
 Item.propTypes = {
   id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
diff --git a/components/menu/Menu.js b/components/menu/Menu.js
index 020890895..24e6ea824 100644
--- a/components/menu/Menu.js
+++ b/components/menu/Menu.js
@@ -9,14 +9,12 @@ import './style/index'
 class Menu extends Component {
   constructor (props) {
     super(props)
-    const {
-      activeId,
-      collapsed
-    } = this.props
+    const { activeId, collapsed } = this.props
     const activeIndex = this.getActiveIndex(activeId)
     let expandIndex = []
     this.clickOutsideHandel = this.clickOutside.bind(this)
-    if (this.isNoMiniVertaicalMenu(collapsed)) { // 垂直非mini菜单默认打开激活项
+    if (this.isNoMiniVertaicalMenu(collapsed)) {
+      // 垂直非mini菜单默认打开激活项
       expandIndex = [activeIndex.split('-').slice(0, -1).join('-')]
     }
     this.state = {
@@ -39,12 +37,7 @@ class Menu extends Component {
       })
       this.isNoMiniVertaicalMenu(collapsed) &&
         this.setState({
-          expandIndex: [
-            activeIndex
-              .split('-')
-              .slice(0, -1)
-              .join('-')
-          ]
+          expandIndex: [activeIndex.split('-').slice(0, -1).join('-')]
         })
     }
 
@@ -81,16 +74,13 @@ class Menu extends Component {
     if (!clickedIndex) {
       return []
     }
-    const {
-      accordion
-    } = this.props
-    const {
-      expandIndex
-    } = this.state
+    const { accordion } = this.props
+    const { expandIndex } = this.state
     let _clickedIndex = clickedIndex
     let subInExpandIndex = false
 
-    let _expandIndex = expandIndex.filter(item => { // 点击父菜单时，需要把已展开的子菜单过滤掉，因为父菜单关闭时所有子菜单也要关闭
+    let _expandIndex = expandIndex.filter((item) => {
+      // 点击父菜单时，需要把已展开的子菜单过滤掉，因为父菜单关闭时所有子菜单也要关闭
       const flag = item.startsWith(_clickedIndex)
       if (flag) {
         subInExpandIndex = true
@@ -101,11 +91,13 @@ class Menu extends Component {
 
     const index = _expandIndex.indexOf(clickedIndex)
 
-    if (index > -1) { // 点击同一个submenu，如果已展开则关闭
+    if (index > -1) {
+      // 点击同一个submenu，如果已展开则关闭
       _clickedIndex = clickedIndex.split('-').slice(0, -1).join('-')
     }
 
-    if (!accordion && this.isNoMiniVertaicalMenu()) { // 非手风琴模式只有在垂直非mini状态下才生效
+    if (!accordion && this.isNoMiniVertaicalMenu()) {
+      // 非手风琴模式只有在垂直非mini状态下才生效
       index > -1 ? _expandIndex.splice(index, 1, _clickedIndex) : _expandIndex.push(_clickedIndex)
 
       return _expandIndex
@@ -114,7 +106,8 @@ class Menu extends Component {
     }
   }
 
-  isNoMiniVertaicalMenu (collapsed = this.state.collapsed) { // 垂直非mini菜单
+  isNoMiniVertaicalMenu (collapsed = this.state.collapsed) {
+    // 垂直非mini菜单
     return this.props.placement === 'vertical' && !collapsed
   }
 
@@ -154,12 +147,15 @@ class Menu extends Component {
     const expandIndex = collapsed ? [] : this.state.expandIndex
 
     setTimeout(() => {
-      this.setState({
-        collapsed,
-        expandIndex
-      }, () => {
-        this.props.onCollapse && this.props.onCollapse(collapsed)
-      })
+      this.setState(
+        {
+          collapsed,
+          expandIndex
+        },
+        () => {
+          this.props.onCollapse && this.props.onCollapse(collapsed)
+        }
+      )
     }, 0)
   }
 
@@ -167,49 +163,54 @@ class Menu extends Component {
     const expandIndex = this.isNoMiniVertaicalMenu() ? this.state.expandIndex : this.getExpandIndex('') // 非mini垂直菜单选中时不需要收起子菜单
     const oldId = this.state.activeId
 
-    this.setState({
-      activeId: id,
-      activeIndex: indexs,
-      expandIndex
-    }, () => {
-      this.props.onClick(id, oldId, data)
-    })
+    this.setState(
+      {
+        activeId: id,
+        activeIndex: indexs,
+        expandIndex
+      },
+      () => {
+        this.props.onClick(id, oldId, data)
+      }
+    )
   }
 
   onClickSubMenu (index) {
     const expandIndex = this.getExpandIndex(index)
 
     this.clickInside()
-    this.setState({
-      expandIndex
-    }, () => {
-      index && this.props.onClickSubMenu && this.props.onClickSubMenu(index.split('-'))
-    })
+    this.setState(
+      {
+        expandIndex
+      },
+      () => {
+        index && this.props.onClickSubMenu && this.props.onClickSubMenu(index.split('-'))
+      }
+    )
   }
 
-  renderItem (data, index, props = {}) { // render menu item
-    const {
-      activeIndex
-    } = this.state
-    const mergeProps = Object.assign({
-      onClick: this.onClick.bind(this),
-      id: data.id,
-      icon: data.icon,
-      activeIndex,
-      index: index,
-      disabled: data.disabled,
-      key: index,
-      data
-    }, props)
-
-    return (
-      <Item {...mergeProps}>
-        {data.content}
-      </Item>
+  renderItem (data, index, props = {}) {
+    // render menu item
+    const { activeIndex } = this.state
+    const mergeProps = Object.assign(
+      {
+        onClick: this.onClick.bind(this),
+        id: data.id,
+        icon: data.icon,
+        activeIndex,
+        index: index,
+        disabled: data.disabled,
+        key: index,
+        data
+      },
+      props
     )
+
+    return <Item {...mergeProps}>{data.content}</Item>
   }
 
-  renderFatSubMenu (data, parentIndex) { // render胖菜单
+  renderFatSubMenu (data, parentIndex) {
+    // render胖菜单
     let groups = []
 
     data.forEach((dataItem, groupIndex) => {
@@ -218,13 +219,13 @@ class Menu extends Component {
           <div className='hi-menu-fat__title hi-menu__title'>
             <Title icon={dataItem.icon} content={dataItem.content} />
           </div>
-          {dataItem.children && <ul className='hi-menu-fat__content'>
-            {
-              dataItem.children.map((child, index) => {
-                return this.renderItem(child, parentIndex + '-' + groupIndex + '-' + index, {level: 2})
-              })
-            }
-          </ul>}
+          {dataItem.children && (
+            <ul className='hi-menu-fat__content'>
+              {dataItem.children.map((child, index) => {
+                return this.renderItem(child, parentIndex + '-' + groupIndex + '-' + index, { level: 2 })
+              })}
+            </ul>
+          )}
         </li>
       )
     })
@@ -232,12 +233,8 @@ class Menu extends Component {
   }
 
   renderMenu (data, parentIndex = '') {
-    const {showAllSubMenus, placement, theme} = this.props
-    const {
-      activeIndex,
-      expandIndex,
-      collapsed
-    } = this.state
+    const { showAllSubMenus, placement, theme } = this.props
+    const { activeIndex, expandIndex, collapsed } = this.state
     let items = []
     const renderMenu = showAllSubMenus ? this.renderFatSubMenu.bind(this) : this.renderMenu.bind(this)
     data.forEach((item, index) => {
@@ -266,7 +263,7 @@ class Menu extends Component {
           />
         )
       } else {
-        items.push(this.renderItem(item, indexStr, {level}))
+        items.push(this.renderItem(item, indexStr, { level, placement, mini: collapsed }))
       }
     })
 
@@ -274,8 +271,8 @@ class Menu extends Component {
   }
 
   render () {
-    const {data, placement, showCollapse, theme} = this.props
-    const {collapsed} = this.state
+    const { data, placement, showCollapse, theme } = this.props
+    const { collapsed } = this.state
     const cls = classNames('hi-menu', `theme__${theme}`, `hi-menu--${placement}`, {
       'hi-menu--mini': collapsed
     })
@@ -283,18 +280,12 @@ class Menu extends Component {
 
     return (
       <div className={cls}>
-        <ul className='hi-menu-items'>
-          { this.renderMenu(data) }
-        </ul>
-        {
-          placement === 'vertical' && showCollapse &&
-          <div
-            className='hi-menu--mini__toggle'
-            onClick={this.toggleMini.bind(this)}
-          >
+        <ul className='hi-menu-items'>{this.renderMenu(data)}</ul>
+        {placement === 'vertical' && showCollapse && (
+          <div className='hi-menu--mini__toggle' onClick={this.toggleMini.bind(this)}>
             {miniIcon}
           </div>
-        }
+        )}
       </div>
     )
   }
@@ -310,16 +301,15 @@ Menu.defaultProps = {
   accordion: true
 }
 Menu.propTypes = {
-  data: PropTypes.arrayOf(PropTypes.shape({
-    content: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-    id: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.number
-    ]),
-    disabled: PropTypes.bool,
-    icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-    children: PropTypes.array
-  })),
+  data: PropTypes.arrayOf(
+    PropTypes.shape({
+      content: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+      id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+      disabled: PropTypes.bool,
+      icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+      children: PropTypes.array
+    })
+  ),
   activeId: PropTypes.string,
   placement: PropTypes.oneOf(['horizontal', 'vertical']),
   collapsed: PropTypes.bool, // 是否是mini模式，需要同时placement=vertical时才生效
diff --git a/components/menu/SubMenu.js b/components/menu/SubMenu.js
index cc74c236a..e1a8d8837 100644
--- a/components/menu/SubMenu.js
+++ b/components/menu/SubMenu.js
@@ -16,7 +16,7 @@ class SubMenu extends Component {
   }
 
   checkExpand (activeIndex, expandIndex, index) {
-    return expandIndex.some(item => {
+    return expandIndex.some((item) => {
       const indexArr = index.split('-')
       const expandIndexArr = item.split('-')
       return expandIndexArr.slice(0, indexArr.length).join('-') === index
@@ -24,15 +24,7 @@ class SubMenu extends Component {
   }
 
   renderPopperMenu (deepSubmenu, isExpand) {
-    const {
-      mini,
-      datas,
-      index,
-      renderMenu,
-      fatMenu,
-      clickInside,
-      theme
-    } = this.props
+    const { mini, datas, index, renderMenu, fatMenu, clickInside, theme } = this.props
     let leftGap
     let topGap
     let placement
@@ -54,9 +46,9 @@ class SubMenu extends Component {
         zIndex={1050}
         topGap={topGap}
         leftGap={leftGap}
-        className={
-          classNames('hi-submenu__popper', `theme__${theme}`, {'hi-submenu__popper--fat': fatMenu})
-        }
+        className={classNames('hi-submenu__popper', `theme__${theme}`, {
+          'hi-submenu__popper--fat': fatMenu
+        })}
         width={false}
         placement={placement}
       >
@@ -64,45 +56,29 @@ class SubMenu extends Component {
           className={classNames('hi-submenu__items')}
           onClick={() => clickInside()} // 利用事件冒泡设置clickInsideFlag
         >
-          { renderMenu(datas, index) }
+          {renderMenu(datas, index)}
         </ul>
       </Popper>
     )
   }
 
   renderVerticalMenu (isActive, isExpand) {
-    const {
-      datas,
-      index,
-      renderMenu,
-      clickInside,
-      theme
-    } = this.props
+    const { datas, index, renderMenu, clickInside, theme } = this.props
     return (
       <ul
-        className={classNames('hi-submenu__items', `theme__${theme}`, {'hi-submenu__items--hide': !isExpand})}
+        className={classNames('hi-submenu__items', `theme__${theme}`, {
+          'hi-submenu__items--hide': !isExpand
+        })}
         onClick={() => clickInside()} // 利用事件冒泡设置clickInsideFlag
         key={index}
       >
-        { renderMenu(datas, index) }
+        {renderMenu(datas, index)}
       </ul>
     )
   }
 
   render () {
-    const {
-      content,
-      icon,
-      mode,
-      mini,
-      level,
-      index,
-      activeIndex,
-      expandIndex,
-      disabled,
-      fatMenu,
-      theme
-    } = this.props
+    const { content, icon, mode, mini, level, index, activeIndex, expandIndex, disabled, fatMenu, theme } = this.props
     const isExpand = this.checkExpand(activeIndex, expandIndex, index)
     const isActive = this.checkActive(activeIndex, index)
     const deepSubmenu = index.split('-').length > 1
@@ -123,7 +99,9 @@ class SubMenu extends Component {
     return (
       <li
         className={cls}
-        ref={node => { this.submenuTrigger = node }}
+        ref={(node) => {
+          this.submenuTrigger = node
+        }}
         key={index}
       >
         <div
@@ -132,16 +110,14 @@ class SubMenu extends Component {
             !disabled && this.onClick(index)
           }}
         >
-          <Title icon={icon} content={content} />
+          <Title icon={icon} content={content} mini={mini} level={level} placement={mode} />
           <div className='hi-menu__title-toggle-icon'>
             <Icon name={toggleIcon} />
           </div>
         </div>
-        {
-          !mini && mode === 'vertical'
-            ? this.renderVerticalMenu(isActive, isExpand)
-            : this.renderPopperMenu(deepSubmenu, isExpand)
-        }
+        {!mini && mode === 'vertical'
+          ? this.renderVerticalMenu(isActive, isExpand)
+          : this.renderPopperMenu(deepSubmenu, isExpand)}
       </li>
     )
   }
diff --git a/components/menu/Title.js b/components/menu/Title.js
index ad40b9d30..6f58cfab8 100644
--- a/components/menu/Title.js
+++ b/components/menu/Title.js
@@ -1,38 +1,28 @@
-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Icon from '../icon'
 
 class Title extends Component {
   renderIcon (icon) {
+    const { level, placement, mini, content } = this.props
     if (!icon) {
       icon = null
     }
     if (typeof icon === 'string') {
       icon = <Icon name={icon} />
     }
-
-    return (
-      icon
-        ? (<div className='hi-menu__title-icon'>
-          {icon}
-        </div>) : null
-    )
+    return icon || (level === 1 && placement === 'vertical' && mini) ? (
+      <div className='hi-menu__title-icon'>{icon || content.substring(0, 1)}</div>
+    ) : null
   }
 
   render () {
-    const {
-      content,
-      icon
-    } = this.props
+    const { content, icon } = this.props
 
     return (
       <React.Fragment>
-        {
-          this.renderIcon(icon)
-        }
-        <div className='hi-menu__title-content'>
-          {content}
-        </div>
+        {this.renderIcon(icon)}
+        <div className='hi-menu__title-content'>{content}</div>
       </React.Fragment>
     )
   }
diff --git a/components/popper/index.js b/components/popper/index.js
index c26f5c1c1..572f49800 100644
--- a/components/popper/index.js
+++ b/components/popper/index.js
@@ -17,7 +17,7 @@ export default class Popper extends Component {
     topGap: PropTypes.number,
     leftGap: PropTypes.number,
     zIndex: PropTypes.number,
-    placement: PropTypes.oneOf(['bottom', 'bottom-start', 'top', 'top-start', 'left', 'right', 'right-start', 'top-bottom-start', 'top-bottom']),
+    placement: PropTypes.oneOf(['bottom', 'bottom-start', 'top', 'top-start', 'top-end', 'left', 'right', 'right-start', 'top-bottom-start', 'top-bottom', 'bottom-end']),
     onMouseOver: PropTypes.func,
     onMouseOut: PropTypes.func,
     onMouseEnter: PropTypes.func,
diff --git a/components/progress/BarProgress.js b/components/progress/BarProgress.js
index eae270cc5..20b9f8100 100644
--- a/components/progress/BarProgress.js
+++ b/components/progress/BarProgress.js
@@ -1,54 +1,62 @@
 import React from 'react'
 import Classnames from 'classnames'
 
-export const BarProgress = props => {
-  function getWidth () {
-    if (!props.width || props.width <= 0) {
-      return props.size === 'large' ? 480 : 160
+export default class BarProgress extends React.Component {
+  textRef = React.createRef()
+  state = { insidePlacement: 'right' }
+
+  componentDidMount () {
+    if (this.props.placement === 'inside') {
+      if (
+        this.textRef.current &&
+        this.textRef.current.clientWidth >= this.getWidth() - ((this.getWidth() * this.props.percent) / 100 + 5)
+      ) {
+        this.setState({ insidePlacement: 'left' })
+      } else {
+        this.setState({ insidePlacement: 'right' })
+      }
     }
-    return props.width
   }
-
-  function getHeight () {
-    const { size, height } = props
+  getWidth = () => {
+    const { width, size } = this.props
+    if (!width || width <= 0) {
+      return size === 'large' ? 480 : 160
+    }
+    return width
+  }
+  getHeight = () => {
+    const { size, height } = this.props
     if (!height || height <= 0) {
       return size === 'large' ? 8 : size === 'default' ? 6 : 2
     }
     return height
   }
 
-  let prefix = 'hi-progress'
-  const {
-    percent: percentNum,
-    content,
-    type,
-    showInfo,
-    placement,
-    tooltip = null,
-    active
-  } = props
-  const percent = percentNum > 0 ? percentNum : 0
-  return (
-    <div>
-      <div
-        className={`${prefix}__inner`}
-        style={{ width: getWidth() + 'px', height: getHeight() + 'px' }}
-      >
-        <div
-          className={Classnames(`${prefix}__bar ${prefix}__bar--${type}`, {
-            [`${prefix}__bar--active`]: active
-          })}
-          style={{ width: `${percent}%` }}
-        >
-          {showInfo && placement === 'inside' && getHeight() >= 14 && (
-            <div className={`${prefix}__text--inside`}>{content || `${percent}%`}</div>
-          )}
-          {tooltip}
+  render () {
+    let prefix = 'hi-progress'
+    const { percent: percentNum, content, type, showInfo, placement, tooltip = null, active } = this.props
+    const percent = percentNum > 0 ? percentNum : 0
+    return (
+      <div>
+        <div className={`${prefix}__inner`} style={{ width: this.getWidth() + 'px', height: this.getHeight() + 'px' }}>
+          <div
+            className={Classnames(`${prefix}__bar ${prefix}__bar--${type}`, {
+              [`${prefix}__bar--active`]: active
+            })}
+            style={{ width: `${percent}%` }}
+          >
+            {showInfo && placement === 'inside' && this.getHeight() >= 14 && (
+              <div ref={this.textRef} className={`${prefix}__text--inside inside--${this.state.insidePlacement}`}>
+                {content || `${percent}%`}
+              </div>
+            )}
+            {tooltip}
+          </div>
         </div>
+        {showInfo && placement === 'outside' && (
+          <div className={`${prefix}__text ${prefix}__text--${type}`}>{content || `${percent}%`}</div>
+        )}
       </div>
-      {showInfo && placement === 'outside' && (
-        <div className={`${prefix}__text ${prefix}__text--${type}`}>{content || `${percent}%`}</div>
-      )}
-    </div>
-  )
+    )
+  }
 }
diff --git a/components/progress/Progress.js b/components/progress/Progress.js
index 4ef549779..9615456a8 100644
--- a/components/progress/Progress.js
+++ b/components/progress/Progress.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import './style'
-import { BarProgress } from './BarProgress.js'
+import BarProgress from './BarProgress.js'
 import { CircleProgress } from './CircleProgress.js'
 import { DashboardProgress } from './DashboardProgress'
 import Provider from '../context'
@@ -40,11 +40,9 @@ class Progress extends Component {
 
   render () {
     let prefix = 'hi-progress'
-    const {className = '', apperance, theme} = this.props
+    const { className = '', apperance, theme } = this.props
 
-    return (
-      <div className={`${prefix}__container ${className} theme__${theme}`}>{this.getRenderType(apperance)}</div>
-    )
+    return <div className={`${prefix}__container ${className} theme__${theme}`}>{this.getRenderType(apperance)}</div>
   }
 }
 export default Provider(Progress)
diff --git a/components/progress/style/index.scss b/components/progress/style/index.scss
index 55db9070d..ab7d4f898 100644
--- a/components/progress/style/index.scss
+++ b/components/progress/style/index.scss
@@ -3,8 +3,8 @@
 $progress-bg: #f2f2f2 !default;
 $progress-primary: #3b76dc !default;
 $progress-success: #1da653 !default;
-$progress-warn: #eb5252 !default;
-$progress-error: #e19d0c !default;
+$progress-warn: #e19d0c !default;
+$progress-error: #eb5252 !default;
 $progress-text: #666 !default;
 
 .hi-progress {
@@ -27,9 +27,7 @@ $progress-text: #666 !default;
       background: #fff;
       opacity: 0;
       content: '';
-      animation:
-        hi-progress-active 2.4s cubic-bezier(0.23, 1, 0.32, 1)
-        infinite;
+      animation: hi-progress-active 2.4s cubic-bezier(0.23, 1, 0.32, 1) infinite;
     }
   }
 
@@ -63,12 +61,17 @@ $progress-text: #666 !default;
 
   &__text--inside {
     font-size: 14px;
-    color: #fff;
     position: absolute;
-    right: 5px;
+    right: -5px;
     top: 50%;
-    transform: translateY(-50%);
+    transform: translate(100%, -50%);
     line-height: 14px;
+
+    &.inside--left {
+      color: #fff;
+      right: 5px;
+      transform: translate(0, -50%);
+    }
   }
 
   &__text--success {
@@ -117,18 +120,16 @@ $progress-text: #666 !default;
     transition: stroke-dashoffset 0.4s cubic-bezier(0.3, 0, 0.7, 1);
   }
 
-  .theme__hiui-blue {
-    &__circle--success {
-      stroke: $progress-success;
-    }
+  &__circle--success {
+    stroke: $progress-success;
+  }
 
-    &__circle--warn {
-      stroke: $progress-warn;
-    }
+  &__circle--warn {
+    stroke: $progress-warn;
+  }
 
-    &__circle--error {
-      stroke: $progress-error;
-    }
+  &__circle--error {
+    stroke: $progress-error;
   }
 
   &__dashboard {
diff --git a/components/rate/Rate.js b/components/rate/Rate.js
index 82074bef3..b96e86239 100644
--- a/components/rate/Rate.js
+++ b/components/rate/Rate.js
@@ -136,7 +136,7 @@ Rate.defaultProps = {
   count: 5,
   prefixCls: 'hi-rate',
   tooltips: [],
-  onChange: () => {}
+  onChange: () => { }
 }
 
 function ToolTipWrapper ({ children, title }) {
@@ -145,6 +145,7 @@ function ToolTipWrapper ({ children, title }) {
 
 function Icon ({ value, currentValue, disabled, useEmoji, allowHalf }) {
   if (useEmoji) {
+    const emojiValue = currentValue > 5 ? 5 : currentValue
     const Emojis = [
       Icons.EmojiOne,
       Icons.EmojiTwo,
@@ -152,8 +153,8 @@ function Icon ({ value, currentValue, disabled, useEmoji, allowHalf }) {
       Icons.EmojiFour,
       Icons.EmojiFive
     ]
-    if (value <= currentValue) {
-      return React.createElement(Emojis[currentValue - 1])
+    if (value <= emojiValue) {
+      return React.createElement(Emojis[emojiValue - 1])
     } else {
       return <Icons.EmojiDefault />
     }
diff --git a/components/select/Select.js b/components/select/Select.js
index d5417fadc..0561484af 100644
--- a/components/select/Select.js
+++ b/components/select/Select.js
@@ -37,6 +37,7 @@ class Select extends Component {
     ]),
     showCheckAll: PropTypes.bool,
     autoload: PropTypes.bool,
+    withCredentials: PropTypes.bool,
     searchable: PropTypes.bool,
     filterOption: PropTypes.func,
     clearable: PropTypes.bool,
@@ -60,6 +61,7 @@ class Select extends Component {
     autoload: false,
     showCheckAll: false,
     open: true,
+    withCredentials: false,
     onClick: () => {},
     onBlur: () => {},
     onFocus: () => {}
@@ -337,7 +339,7 @@ class Select extends Component {
   }
 
   remoteSearch (keyword) {
-    const { onSearch, dataSource, autoload } = this.props
+    const { onSearch, dataSource, autoload, withCredentials: propsWithCredentials } = this.props
     if (onSearch && typeof onSearch === 'function') {
       this.setState({
         fetching: true
@@ -357,6 +359,7 @@ class Select extends Component {
         data = {},
         type = 'GET',
         key,
+        withCredentials = propsWithCredentials,
         jsonpCallback = 'callback',
         ...options
       } = _dataSource
@@ -396,6 +399,7 @@ class Select extends Component {
         /* eslint-disable */
         fetch(url, {
           method: type,
+          credentials: withCredentials ? 'include' : 'same-origin',
           ...options
         })
           .then(response => response.json())
diff --git a/components/select/SelectInput.js b/components/select/SelectInput.js
index d797cb862..94621f954 100644
--- a/components/select/SelectInput.js
+++ b/components/select/SelectInput.js
@@ -146,10 +146,12 @@ class SelectInput extends Component {
               <div key={index} className='hi-select__input--item' style={{ maxWidth: this.itemsRef ? (this.itemsRef.getBoundingClientRect().width - 50) * 0.8 : '80%' }}>
                 <div className='hi-select__input--item__name'>{item.title}</div>
                 <span
-                  className='hi-select__input--item__remove'
+                  className={classNames('hi-select__input--item__remove', {
+                    disabled
+                  })}
                   onClick={(e) => {
                     e.stopPropagation()
-                    this.props.onDelete(item)
+                    !disabled && this.props.onDelete(item)
                   }}
                 >
                   <i className='hi-icon icon-close' />
@@ -159,7 +161,9 @@ class SelectInput extends Component {
             return _item
           })}
           {showCount < selectedItems.length && (
-            <div className='hi-select__input-items--left'>
+            <div className={classNames('hi-select__input-items--left', {
+              disabled
+            })}>
               +
               <span className='hi-select__input-items--left-count'>
                 {selectedItems.length - showCount}
diff --git a/components/select/style/select-input.scss b/components/select/style/select-input.scss
index ce4d4f34d..9f94796a2 100644
--- a/components/select/style/select-input.scss
+++ b/components/select/style/select-input.scss
@@ -205,6 +205,10 @@
         background-color: #f2f2f2;
         border-radius: 2px;
         box-sizing: border-box;
+
+        &.disabled {
+          color: #ccc;
+        }
       }
     }
 
@@ -239,6 +243,10 @@
         top: 0;
         right: 4px;
         padding: 0 0 0 8px;
+
+        &.disabled {
+          cursor: not-allowed;
+        }
       }
     }
 
diff --git a/components/style/icon/diyIcon.scss b/components/style/icon/diyIcon.scss
index 048a83889..afdfb795e 100644
--- a/components/style/icon/diyIcon.scss
+++ b/components/style/icon/diyIcon.scss
@@ -1,7 +1,9 @@
 /* stylelint-disable */
 @font-face {
   font-family: 'diy-icon';
-  src: url('data:application/font-woff;base64,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') format('woff');
+  src:
+    url('data:application/font-woff;base64,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')
+    format('woff');
   font-weight: normal;
   font-style: normal;
 }
@@ -81,7 +83,6 @@
 .Ficon-other::before {
   content: '\e61d';
   color: #ccc;
-  font-size: 18px;
 }
 
 .Ficon-warning::before {
@@ -134,8 +135,6 @@
   color: #000;
 }
 
-
-
 .Ficon-success::before {
   content: '\e674';
   color: #000;
diff --git a/components/tabs/Tabs.js b/components/tabs/Tabs.js
index 6083a3ad4..a98e4f395 100644
--- a/components/tabs/Tabs.js
+++ b/components/tabs/Tabs.js
@@ -157,15 +157,9 @@ class Tabs extends Component {
     const { activeId, showTabItems, hiddenTabItems, defaultActiveId } = this.state
     const { prefixCls, type, placement, children, className, theme } = this.props
     const editable = this.checkEditable()
-    const tabsClasses = classNames(
-      prefixCls,
-      className,
-      `${prefixCls}--${type}`,
-      `theme__${theme}`,
-      {
-        [`${prefixCls}--${placement}`]: type === 'card'
-      }
-    )
+    const tabsClasses = classNames(prefixCls, className, `${prefixCls}--${type}`, `theme__${theme}`, {
+      [`${prefixCls}--${placement}`]: type === 'card'
+    })
     let activeTabInHiddenItems = true
 
     return (
@@ -186,7 +180,7 @@ class Tabs extends Component {
                   className={itemClasses}
                   key={`${prefixCls}__item-${index}`}
                   onClick={(e) => this.handleClick(item, e)}
-                  title={tabTitle}
+                  title={type === 'editable' && tabId !== activeId ? tabTitle : null}
                 >
                   <span className={`${prefixCls}__item-name`}>{tabTitle}</span>
                   {type === 'desc' && <span className={`${prefixCls}__item-desc`}>{tabDesc}</span>}
diff --git a/components/transfer/Item.js b/components/transfer/Item.js
index ef8114b29..0633b8a4d 100644
--- a/components/transfer/Item.js
+++ b/components/transfer/Item.js
@@ -54,9 +54,12 @@ const TYPE = 'CARD'
 const source = {
   beginDrag (props) {
     props.setSourceNode(props.item.id)
-    return {
-      sourceItem: props.item
+    if (props.onDragStart(props.item)) {
+      return {
+        sourceItem: props.item
+      }
     }
+    return false
   },
 
   isDragging (props, monitor) {
@@ -71,9 +74,11 @@ const target = {
 
   drop (props, monitor, component) {
     const { sourceItem } = monitor.getItem()
-    const { item: targetItem, removeTargetNode, move } = props
-    move(sourceItem, targetItem)
-    removeTargetNode()
+    const { item: targetItem, removeTargetNode, move, onDrop } = props
+    if (onDrop(sourceItem, targetItem)) {
+      move(sourceItem, targetItem)
+      removeTargetNode()
+    }
   },
   hover (props, monitor, component) {
     if (monitor.isOver({ shallow: true })) {
diff --git a/components/transfer/Transfer.js b/components/transfer/Transfer.js
index edfdbb2a4..fdb9310e4 100755
--- a/components/transfer/Transfer.js
+++ b/components/transfer/Transfer.js
@@ -236,6 +236,7 @@ class Transfer extends Component {
     } else {
       _targetList.splice(sIdx + 1, 1)
     }
+    this.props.onDragEnd(_targetList)
     this.setState({ targetList: _targetList })
   }
   setTargetNode (id, dividerPosition) {
@@ -262,7 +263,9 @@ class Transfer extends Component {
       title,
       disabled,
       theme,
-      localeDatas
+      localeDatas,
+      onDragStart,
+      onDrop
     } = this.props
     const {
       sourceSelectedKeys,
@@ -340,6 +343,8 @@ class Transfer extends Component {
                     setPosition={this.setPosition}
                     positionX={positionX}
                     positionY={positionY}
+                    onDragStart={onDragStart}
+                    onDrop={onDrop}
                   />
                 )
               })}
@@ -421,7 +426,11 @@ Transfer.defaultProps = {
   draggable: false,
   emptyContent: ['暂无数据', '暂无数据'],
   title: ['', ''],
-  disabled: false
+  disabled: false,
+  onDragStart: () => true,
+  onDragEnd: () => {},
+  onDrop: () => true,
+  onChange: () => {}
 }
 Transfer.propTypes = {
   mode: PropTypes.oneOf(['basic', 'multiple']), // TODO: 废弃，使用 type
@@ -431,5 +440,9 @@ Transfer.propTypes = {
   searchable: PropTypes.bool,
   draggable: PropTypes.bool,
   disabled: PropTypes.bool,
-  targetLimit: PropTypes.number
+  targetLimit: PropTypes.number,
+  onDragStart: PropTypes.func,
+  onDragEnd: PropTypes.func,
+  onDrop: PropTypes.func,
+  onChange: PropTypes.func
 }
diff --git a/components/upload/Upload.js b/components/upload/Upload.js
index db0c44f1b..3cc20350b 100644
--- a/components/upload/Upload.js
+++ b/components/upload/Upload.js
@@ -191,7 +191,10 @@ class Upload extends Component {
         if (fileList[index].fileId === file.fileId) {
           const _fileList = [...fileList]
           _fileList.splice(index, 1)
-          this.setState({ fileList: _fileList })
+          this.setState({
+            fileList: _fileList,
+            fileCountLimted: _fileList.length >= this.props.maxCount
+          })
           break
         }
       }
diff --git a/docs/demo/progress/section-circle.jsx b/docs/demo/progress/section-circle.jsx
index 34ea2f3d8..2b69acf14 100644
--- a/docs/demo/progress/section-circle.jsx
+++ b/docs/demo/progress/section-circle.jsx
@@ -71,14 +71,15 @@ class Demo extends React.Component {
             <Progress percent={this.state.percent} apperance='circle' radius={radius}/>
           </div>
           <div style={{display:'inline-block',marginLeft: '50px'}}>
-            <Progress percent={this.state.percent} apperance='circle' type='warn' radius={radius} content={<i className='hi-icon icon-close' style={{fontSize: '18px'}}/>}/>
+            <Progress percent={this.state.percent} apperance='circle' type='success' radius={radius} content={<i className='hi-icon icon-check' style={{fontSize: '18px'}}/>} />
           </div>
           <div style={{display:'inline-block',marginLeft: '50px'}}>
-            <Progress percent={this.state.percent} apperance='circle' type='error' radius={radius} content={<i className='hi-icon icon-alarm' style={{fontSize: '18px'}}/>}/>
-          </div>
+          <Progress percent={this.state.percent} apperance='circle' type='warn' radius={radius} content={<i className='hi-icon icon-alarm' style={{fontSize: '18px'}}/>}/>
+        </div>
           <div style={{display:'inline-block',marginLeft: '50px'}}>
-            <Progress percent={this.state.percent} apperance='circle' type='success' radius={radius} content={<i className='hi-icon icon-check' style={{fontSize: '18px'}}/>} />
+            <Progress percent={this.state.percent} apperance='circle' type='error' radius={radius} content={<i className='hi-icon icon-close' style={{fontSize: '18px'}}/>}/>
           </div>
+          
         </Col>
       </Row>
 
diff --git a/docs/demo/progress/section-type.jsx b/docs/demo/progress/section-type.jsx
index 3f5d4783d..36a230c55 100644
--- a/docs/demo/progress/section-type.jsx
+++ b/docs/demo/progress/section-type.jsx
@@ -58,9 +58,9 @@ class Demo extends React.Component {
             <br/>
             <Progress type='success' content='成功' percent={40} size={size}/>
             <br/>
-            <Progress type='warn' content='错误' percent={50} size={size}/>
+            <Progress type='warn' content='警示' percent={50} size={size}/>
             <br/>
-            <Progress type='error' content='警示' percent={100} size={size}/>
+            <Progress type='error' content='错误' percent={100} size={size}/>
           </Col>
         </Row>
       </div>
@@ -68,5 +68,12 @@ class Demo extends React.Component {
   }
 }`
 
-const DemoType = () => <DocViewer code={code} scope={{ Progress, Form, Radio, Grid, Input, Button }} prefix={prefix} desc={desc} />
+const DemoType = () => (
+  <DocViewer
+    code={code}
+    scope={{ Progress, Form, Radio, Grid, Input, Button }}
+    prefix={prefix}
+    desc={desc}
+  />
+)
 export default DemoType
diff --git a/docs/demo/progress/section-word.jsx b/docs/demo/progress/section-word.jsx
index 80e262909..9ac009741 100644
--- a/docs/demo/progress/section-word.jsx
+++ b/docs/demo/progress/section-word.jsx
@@ -11,14 +11,16 @@ class Demo extends React.Component {
       <div>
         <Progress percent={50} placement='inside' height={20} size='large'/>
         <br/>
-        <Progress percent={50} placement='inside' type='warn' height={20} size='large' content='错误'/>
+        <Progress percent={50} placement='inside' type='warn' height={20} size='large' content='警告'/>
         <br/>
-        <Progress percent={50} placement='inside' type='error' height={20} size='large' content='警告'/>
+        <Progress percent={50} placement='inside' type='error' height={20} size='large' content='错误'/>
         <br/>
         <Progress percent={100} placement='inside' type='success' content='成功' height={20} size='large'/>
       </div>
     )
   }
 }`
-const DemoWord = () => <DocViewer code={code} scope={{ Progress }} prefix={prefix} desc={desc} />
+const DemoWord = () => (
+  <DocViewer code={code} scope={{ Progress }} prefix={prefix} desc={desc} />
+)
 export default DemoWord
diff --git a/docs/demo/transfer/section-area.jsx b/docs/demo/transfer/section-area.jsx
index 827cdd46a..9361c6117 100644
--- a/docs/demo/transfer/section-area.jsx
+++ b/docs/demo/transfer/section-area.jsx
@@ -3,45 +3,100 @@ import DocViewer from '../../../libs/doc-viewer'
 import Transfer from '../../../components/transfer'
 const prefix = 'transfer-area'
 const desc = '可通过拖拽的形式对目标区域内进行排序'
-const code = `import React from 'react'
-import Transfer from '@hi-ui/hiui/es/transfer'\n
-class Demo extends React.Component {
-  constructor () {
-    super()
-    this.state = {
-      datas: this.randomDatas(),
-      targetKeys: [2, 3, 4, 6, 9]
-    }
-  }
-  randomDatas () {
-    const arr = []
-    for (let i=1;i<16; i++) {
-      arr.push({
-        id: i,
-        content: '选项'+i
+const rightOptions = ['基础用法', '高级用法']
+const code = [{
+  code: `import React from 'react'
+  import Transfer from '@hi-ui/hiui/es/transfer'\n
+  class Demo extends React.Component {
+    constructor () {
+      super()
+      this.state = {
+        datas: this.randomDatas(),
+        targetIds: [2, 3, 4, 6, 9]
+      }
+    }
+    randomDatas () {
+      const arr = []
+      for (let i=1;i<16; i++) {
+        arr.push({
+          id: i,
+          content: '选项'+i
+        })
+      }
+      return arr
+    }
+    onChange (movedKeys) {
+      console.log(movedKeys)
+      this.setState({
+        targetIds: movedKeys
+      })
+    }
+    render () {
+      return (
+        <Transfer
+          type='multiple'
+          showCheckAll
+          draggable
+          targetIds={this.state.targetIds}
+          data={this.state.datas}
+          onChange={this.onChange.bind(this)}
+        />
+      )
+    }
+  }`,
+  opt: ['基础用法']
+}, {
+  code: `import React from 'react'
+  import Transfer from '@hi-ui/hiui/es/transfer'\n
+  class Demo extends React.Component {
+    constructor () {
+      super()
+      this.state = {
+        datas: this.randomDatas(),
+        targetIds: [2, 3, 4, 6, 9]
+      }
+    }
+    randomDatas () {
+      const arr = []
+      for (let i=1;i<16; i++) {
+        arr.push({
+          id: i,
+          content: '选项'+i
+        })
+      }
+      return arr
+    }
+    onChange (movedKeys) {
+      console.log(movedKeys)
+      this.setState({
+        targetIds: movedKeys
       })
     }
-    return arr
-  }
-  onChange (movedKeys) {
-    this.setState({
-      targetKeys: movedKeys
-    })
-  }
-  render () {
-    return (
-      <Transfer
-        type='multiple'
-        showCheckAll
-        draggable
-        targetKeys={this.state.targetKeys}
-        data={this.state.datas}
-        onChange={this.onChange.bind(this)}
-      />
-    )
-  }
-}`
+    render () {
+      return (
+        <Transfer
+          type='multiple'
+          showCheckAll
+          draggable
+          onDragEnd={newData => {
+            console.log(newData)
+          }}
+          onDragStart={item => {
+            return item.id !== 3
+          }}
+          onDrop={(targetItem, sourceItem) => {
+            return targetItem.id > sourceItem.id
+          }}
+          targetIds={this.state.targetIds}
+          data={this.state.datas}
+          onChange={this.onChange.bind(this)}
+        />
+      )
+    }
+  }`,
+  opt: ['高级用法']
+}]
 const DemoArea = () => (
-  <DocViewer code={code} scope={{ Transfer }} prefix={prefix} desc={desc} />
+  <DocViewer code={code} scope={{ Transfer }} prefix={prefix} rightOptions={rightOptions} desc={desc} />
 )
 export default DemoArea
diff --git a/docs/zh-CN/components/changelog.mdx b/docs/zh-CN/components/changelog.mdx
index b577119d4..27459bb1b 100644
--- a/docs/zh-CN/components/changelog.mdx
+++ b/docs/zh-CN/components/changelog.mdx
@@ -1,5 +1,25 @@
 # 更新日志
 
+## 2.14.0
+
+- 优化 `<Menu />` 垂直模式收起后没有配置 icon 的展示效果 [#1167](https://github.com/XiaoMi/hiui/issues/1167)
+- 优化 `<Modal />` 国际化适配 [#1142](https://github.com/XiaoMi/hiui/issues/1142)
+- 修复 `<Progress />` 环形边框颜色问题 [#1165](https://github.com/XiaoMi/hiui/issues/1165)
+- 新增 `<Transfer />` onDragStart/onDragEnd/onDrop 回调函数 [#1162](https://github.com/XiaoMi/hiui/issues/1162)
+- 修复 `<Upload />` 设置 maxCount 后导致上传交互异常问题 [#1158](https://github.com/XiaoMi/hiui/issues/1158)
+- 修复 `<Input />` 设置 clearable 属性控制台警告问题 [#1143](https://github.com/XiaoMi/hiui/issues/1143)
+- 修复 `<Input />` type 为 amount 类型时的问题 [#1150](https://github.com/XiaoMi/hiui/issues/1150)
+- 修复 `<Progress />` placement 为 inside 内容显示折断问题 [#1146](https://github.com/XiaoMi/hiui/issues/1146)
+- 修复 `<Icon />` 部分图标字号问题 [#1145](https://github.com/XiaoMi/hiui/issues/1145)
+- 修复 `<Tabs />` type 非 editable 时，title 属性控制台警告问题 [#1144](https://github.com/XiaoMi/hiui/issues/1144)
+- 修复 `<Rate />` useEmoji 为 true 时，设置 value > 5 报错问题 [#1137](https://github.com/XiaoMi/hiui/issues/1137)
+- 修复 `<Select />` 支持 withCredentials 跨域携带 cookie 属性 [#1128](https://github.com/XiaoMi/hiui/issues/1128)
+- 修复 `<Counter />` 在不设置 min 属性时，只可选中到 -1 问题 [#1108](https://github.com/XiaoMi/hiui/issues/1108)
+- 修复 `<DatePicker />` 手动输入日期相关问题 [#1106](https://github.com/XiaoMi/hiui/issues/1106)
+- 修复 `<DatePicker />` 在禁用状态下，可清空问题 [#1099](https://github.com/XiaoMi/hiui/issues/1099)
+- 修复 `<DatePicker />` DatePicker 在浏览器右侧时，弹出位置显示异常问题 [#1098](https://github.com/XiaoMi/hiui/issues/1098)
+- 优化国际化中简体中文 [#1125](https://github.com/XiaoMi/hiui/issues/1125)
+
 ## 2.13.0
 
 - 修复 `<Checkbox />` 行高不正确问题 [#1061](https://github.com/XiaoMi/hiui/issues/1061)
diff --git a/docs/zh-CN/components/i18n.mdx b/docs/zh-CN/components/i18n.mdx
index 9ac20f065..06fa87e43 100755
--- a/docs/zh-CN/components/i18n.mdx
+++ b/docs/zh-CN/components/i18n.mdx
@@ -1,6 +1,6 @@
 # 国际化
 
-HIUI 目前支持简体中文、英文两种语言，默认为 **zh-CN**
+HIUI 目前支持简体中文、香港繁体、台湾繁体、英文四种语言，默认为 **zh-Hans**
 
 ## 使用方法
 
@@ -35,7 +35,7 @@ import DemoExample from '../../demo/i18n/section-example.jsx'
   <tbody>
     <tr>
       <td>简体中文</td>
-      <td>zh-CN</td>
+      <td> zh-Hans | zh-CN</td>
     </tr>
     <tr>
       <td>英语</td>
diff --git a/docs/zh-CN/components/select.mdx b/docs/zh-CN/components/select.mdx
index 8ab633de9..9a9241458 100755
--- a/docs/zh-CN/components/select.mdx
+++ b/docs/zh-CN/components/select.mdx
@@ -79,4 +79,5 @@ import DemoAsync from '../../demo/select/section-async'
 | params            | url 查询参数                       | object                           | -                                                  | -             |
 | headers           | 请求头                             | object                           | -                                                  | -             |
 | mode              | 请求模式                           | string                           | 'same-origin' \| 'cors' \| 'no-cors' \| 'navigate' | 'same-origin' |
+| withCredentials   | 上传请求时是否携带 cookie            | boolean                          | true \| false                                     | false          |
 | transformResponse | 成功时的回调，用于对数据进行预处理 | (response: object) => DataItem[] | -                                                  | -             |
diff --git a/docs/zh-CN/components/transfer.mdx b/docs/zh-CN/components/transfer.mdx
index 42675d809..2f06bee2b 100755
--- a/docs/zh-CN/components/transfer.mdx
+++ b/docs/zh-CN/components/transfer.mdx
@@ -48,6 +48,10 @@ import DemoArea from '../../demo/transfer/section-area.jsx'
 | targetLimit    | 最大可穿梭上限                                                             | number                                                                                         | -                       | -         |
 | targetIds      | 目标框内的元素 id 集合                                                     | number[] \| string[]                                                                           | -                       | -         |
 | targetSortType | 目标框内的排序方式                                                         | string                                                                                         | 'default' \| 'queue'    | 'default' |
+| draggable      | 是否可拖拽排序(目标框内)                                                   | boolean                                                                                        |                         | false     |
+| onDragStart    | 拖拽开始时的回调函数                                                       | (dragItem: DataItem) => boolean                                                                | -                       | -         |
+| onDragEnd      | 拖拽结束时的回调函数(完成拖拽)                                             | (newData: DataItem[]) => void                                                                  | -                       | -         |
+| onDrop         | 放开拖拽元素时的回调函数，可用于条件判断，阻止拖拽到对应位置               | (targetItem: DataItem, sourceItem: DataItem) => boolean                                        | -                       | -         |
 | onChange       | 选中元素被移动到目标框内后的回调，回调值为目标框的值                       | (targetKey: number[] \| string[], direction: 'left' \| 'right', moveDatas: DataItem[]) => void | -                       | -         |
 
 ## Type
diff --git a/package.json b/package.json
index 8f3bd6df5..f98f74224 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",