Merge branch 'master' into feat-3.10.3

CHANGELOG.en-US.md

@@ -2,6 +2,16 @@
 
 ---
 
+## 1.1.8
+
+`2018-11-11`
+- `Progress`
+  - 🐞 Fix `circle` type does not support `strokeColor` problem [#238](https://github.com/vueComponent/ant-design-vue/issues/238)
+  - 🐞 Add `normal` type [#257](https://github.com/vueComponent/ant-design-vue/issues/257)
+- 🐞 Fix `Cascader` component does not support `getPopupContainer` problem  [#257](https://github.com/vueComponent/ant-design-vue/issues/257)
+- 🌟 `Tooltip` support align [#252](https://github.com/vueComponent/ant-design-vue/issues/252)
+
+
 ## 1.1.7
 
 `2018-10-27`

CHANGELOG.zh-CN.md

@@ -2,6 +2,16 @@
 
 ---
 
+## 1.1.8
+
+`2018-11-11`
+- `Progress`
+  - 🐞 修复circle类型不支持strokeColor问题 [#238](https://github.com/vueComponent/ant-design-vue/issues/238)
+  - 🐞 添加`normal`类型 [#257](https://github.com/vueComponent/ant-design-vue/issues/257)
+- 🐞 修复`Cascader`组件getPopupContainer不生效问题 [#257](https://github.com/vueComponent/ant-design-vue/issues/257)
+- 🌟 `Tooltip`支持align [#252](https://github.com/vueComponent/ant-design-vue/issues/252)
+
+
 ## 1.1.7
 
 `2018-10-27`

components/progress/__tests__/__snapshots__/index.test.js.snap

@@ -1,5 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Progress render format 1`] = `
+<div class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default">
+  <div class="ant-progress-inner" style="width: 120px; height: 120px; font-size: 24px;"><svg viewBox="0 0 100 100" class="ant-progress-circle">
+      <path d="M 50,50 m 0,-47
+       a 47,47 0 1 1 0,94
+       a 47,47 0 1 1 0,-94" stroke="#f3f3f3" stroke-width="6" fill-opacity="0" class="ant-progress-circle-trail" style="stroke-dasharray: 295.3097094374406px 295.3097094374406px; stroke-dashoffset: -0px;"></path>
+      <path d="M 50,50 m 0,-47
+       a 47,47 0 1 1 0,94
+       a 47,47 0 1 1 0,-94" stroke-linecap="round" stroke-width="6" fill-opacity="0" class="ant-progress-circle-path" style="stroke: red; stroke-dasharray: 147.6548547187203px 295.3097094374406px; stroke-dashoffset: -0px;"></path>
+    </svg><span class="ant-progress-text">50%</span></div>
+</div>
+`;
+
 exports[`Progress render negetive progress 1`] = `
 <div class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default">
   <div>

components/progress/__tests__/index.test.js

@@ -84,4 +84,18 @@ describe('Progress', () => {
       expect(wrapper.html()).toMatchSnapshot()
     })
   })
+
+  it('render format', async () => {
+    const wrapper = mount(Progress, {
+      propsData: {
+        percent: 50,
+        type: 'circle',
+        strokeColor: 'red',
+      },
+      sync: false,
+    })
+    await asyncExpect(() => {
+      expect(wrapper.html()).toMatchSnapshot()
+    })
+  })
 })

components/progress/index.en-US.md

@@ -7,7 +7,7 @@
 | gapPosition `(type=circle)` | the gap position, options: `top` `bottom` `left` `right` | string | `top` |
 | percent | to set the completion percentage | number | 0 |
 | showInfo | whether to display the progress value and the status icon | boolean | true |
-| status | to set the status of the Progress, options: `success` `exception` `active` | string | - |
+| status | to set the status of the Progress, options: `normal` `success` `exception` `active` | string | `normal` |
 | strokeWidth `(type=line)` | to set the width of the progress bar, unit: `px` | number | 10 |
 | strokeWidth `(type=circle)` | to set the width of the circular progress bar, unit: percentage of the canvas width | number | 6 |
 | strokeLinecap | to set the style of the progress linecap | Enum{ 'round', 'square' } | `round` |

components/progress/index.zh-CN.md

@@ -7,7 +7,7 @@
 | gapPosition `(type=circle)` | 圆形进度条缺口位置 | Enum{ 'top', 'bottom', 'left', 'right' } | `top` |
 | percent | 百分比 | number | 0 |
 | showInfo | 是否显示进度数值或状态图标 | boolean | true |
-| status | 状态，可选：`success` `exception` `active` | string | - |
+| status | 状态，可选：`normal` `success` `exception` `active` | string | `normal` |
 | strokeWidth `(type=line)` | 进度条线的宽度，单位 px | number | 10 |
 | strokeWidth `(type=circle)` | 圆形进度条线的宽度，单位是进度条画布宽度的百分比 | number | 6 |
 | strokeLinecap | | Enum{ 'round', 'square' } | `round` |

components/progress/progress.jsx

@@ -23,7 +23,7 @@ export const ProgressProps = {
   percent: PropTypes.number,
   successPercent: PropTypes.number,
   format: PropTypes.func,
-  status: PropTypes.oneOf(['success', 'active', 'exception']),
+  status: PropTypes.oneOf(['normal', 'success', 'active', 'exception']),
   showInfo: PropTypes.bool,
   strokeWidth: PropTypes.number,
   strokeLinecap: PropTypes.oneOf(['round', 'square']),
@@ -123,7 +123,7 @@ export default {
             percent={validProgress(percent)}
             strokeWidth={circleWidth}
             trailWidth={circleWidth}
-            strokeColor={statusColorMap[progressStatus]}
+            strokeColor={strokeColor || statusColorMap[progressStatus]}
             strokeLinecap={strokeLinecap}
             trailColor={trailColor}
             prefixCls={prefixCls}

components/tooltip/abstractTooltipProps.js

@@ -17,4 +17,5 @@ export default () => ({
   getPopupContainer: PropTypes.func,
   arrowPointAtCenter: PropTypes.bool.def(false),
   autoAdjustOverflow: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]).def(true),
+  align: PropTypes.object.def({}),
 })

components/tooltip/index.en-US.md

@@ -21,6 +21,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | placement | The position of the tooltip relative to the target, which can be one of `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | `top` |
 | trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` \| `contextmenu` | `hover` |
 | visible(v-model) | Whether the floating tooltip card is visible or not | boolean | `false` |
+| align | this value will be merged into placement's config, please refer to the settings [dom-align](https://github.com/yiminghe/dom-align) | Object | - |
 
 ### events
 | Events Name | Description | Arguments |

components/tooltip/index.zh-CN.md

@@ -21,6 +21,7 @@
 | placement | 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | top |
 | trigger | 触发行为，可选 `hover/focus/click/contextmenu` | string | hover |
 | visible(v-model) | 用于手动控制浮层显隐 | boolean | false |
+| align | 该值将合并到 placement 的配置中，设置参考 [dom-align](https://github.com/yiminghe/dom-align) | Object | 无 |
 
 ### 事件
 | 事件名称 | 说明 | 回调参数 |

components/vc-cascader/Cascader.jsx

@@ -67,6 +67,7 @@ export default {
     fieldNames: PropTypes.object.def({ label: 'label', value: 'value', children: 'children' }),
     expandIcon: PropTypes.any,
     loadingIcon: PropTypes.any,
+    getPopupContainer: PropTypes.func,
   },
   mixins: [BaseMixin],
   model: {

components/vc-progress/src/Circle.js

@@ -54,6 +54,7 @@ const Circle = {
         transition: 'stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s',
       }
       const strokePathStyle = {
+        stroke: strokeColor,
         strokeDasharray: `${(percent / 100) * (len - gapDegree)}px ${len}px`,
         strokeDashoffset: `-${gapDegree / 2}px`,
         transition: 'stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s', // eslint-disable-line

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ant-design-vue",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "title": "Ant Design Vue",
     "description": "An enterprise-class UI design language and Vue-based implementation",
     "keywords": [