Skip to content

Commit 1fb3ce3

Browse files
tangjinzhoutangjinzhou
committed
Merge branch 'master' into feat-1.3.0
# Conflicts: # components/table/__tests__/__snapshots__/Table.test.js.snap
2 parents b5ca022 + 5c3b77f commit 1fb3ce3

File tree

8 files changed

+44
-24
lines changed

8 files changed

+44
-24
lines changed

‎CHANGELOG.en-US.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
---
44

5+
## 1.2.5
6+
`2019-01-06`
7+
8+
- 🌟 Add `Typescript` type file[#250](https://github.com/vueComponent/ant-design-vue/issues/250)
9+
- 🐞 Fix `Icon` component can't support static class and dynamic class problems at the same time[#371](https://github.com/vueComponent/ant-design-vue/issues/371)
10+
511
## 1.2.4
612
`2018-12-29`
713

‎CHANGELOG.zh-CN.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
---
44

5+
## 1.2.5
6+
`2019-01-06`
7+
8+
- 🌟 新增`Typescript`类型文件[#250](https://github.com/vueComponent/ant-design-vue/issues/250)
9+
- 🐞 修复`Icon`组件不能同时支持static class和dynamic class问题[#371](https://github.com/vueComponent/ant-design-vue/issues/371)
10+
511
## 1.2.4
612
`2018-12-29`
713

‎components/_util/props-util.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,16 @@ export function getClass (ele) {
182182
} else if (ele.$vnode && ele.$vnode.data) {
183183
data = ele.$vnode.data
184184
}
185-
const tempCls = data.class || data.staticClass
185+
const tempCls = data.class || {}
186+
const staticClass = data.staticClass
186187
let cls = {}
188+
staticClass && staticClass.split(' ').forEach(c => { cls[c.trim()] = true })
187189
if (typeof tempCls === 'string') {
188190
tempCls.split(' ').forEach(c => { cls[c.trim()] = true })
189191
} else if (Array.isArray(tempCls)) {
190192
classNames(tempCls).split(' ').forEach(c => { cls[c.trim()] = true })
191193
} else {
192-
cls = tempCls
194+
cls = { ...cls, ...tempCls }
193195
}
194196
return cls
195197
}

‎components/table/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2898,31 +2898,31 @@ exports[`renders ./components/table/demo/template.md correctly 1`] = `
28982898
</thead>
28992899
<tbody class="ant-table-tbody">
29002900
<tr class="ant-table-row ant-table-row-level-0" data-row-key="1">
2901-
<td><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
2901+
<td class=""><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
29022902
<!---->John</td>
2903-
<td>Brown</td>
2904-
<td>32</td>
2905-
<td>New York No. 1 Lake Park</td>
2906-
<td><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">nice</div><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">developer</div></span></td>
2907-
<td><span><a href="javascript:;">Action 一 John</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
2903+
<td class="">Brown</td>
2904+
<td class="">32</td>
2905+
<td class="">New York No. 1 Lake Park</td>
2906+
<td class=""><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">nice</div><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">developer</div></span></td>
2907+
<td class=""><span><a href="javascript:;">Action 一 John</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
29082908
</tr>
29092909
<tr class="ant-table-row ant-table-row-level-0" data-row-key="2">
2910-
<td><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
2910+
<td class=""><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
29112911
<!---->Jim</td>
2912-
<td>Green</td>
2913-
<td>42</td>
2914-
<td>London No. 1 Lake Park</td>
2915-
<td><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">loser</div></span></td>
2916-
<td><span><a href="javascript:;">Action 一 Jim</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
2912+
<td class="">Green</td>
2913+
<td class="">42</td>
2914+
<td class="">London No. 1 Lake Park</td>
2915+
<td class=""><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">loser</div></span></td>
2916+
<td class=""><span><a href="javascript:;">Action 一 Jim</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
29172917
</tr>
29182918
<tr class="ant-table-row ant-table-row-level-0" data-row-key="3">
2919-
<td><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
2919+
<td class=""><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
29202920
<!---->Joe</td>
2921-
<td>Black</td>
2922-
<td>32</td>
2923-
<td>Sidney No. 1 Lake Park</td>
2924-
<td><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">cool</div><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">teacher</div></span></td>
2925-
<td><span><a href="javascript:;">Action 一 Joe</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
2921+
<td class="">Black</td>
2922+
<td class="">32</td>
2923+
<td class="">Sidney No. 1 Lake Park</td>
2924+
<td class=""><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">cool</div><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">teacher</div></span></td>
2925+
<td class=""><span><a href="javascript:;">Action 一 Joe</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
29262926
</tr>
29272927
</tbody>
29282928
</table>

‎docs/vue/getting-started.en-US.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Ant Design Vue is dedicated to providing a **good development experience** for p
55

66
> Before delving into Ant Design Vue, a good knowledge base of [Vue](https://cn.vuejs.org/) and [JavaScript ES2015](http://babeljs.io/docs/learn-es2015/) is needed.
77
8+
## Use vue-cli@3
9+
We provide an [Ant Design Vue](https://github.com/vueComponent/vue-cli-plugin-ant-design) plugin for vue-cli@3, which you can use to quickly build an Ant Design Vue-based project.
810

911
## Playground
1012

‎docs/vue/getting-started.zh-CN.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Ant Design Vue 致力于提供给程序员**愉悦**的开发体验。
66
> 在开始之前，推荐先学习 [Vue](https://cn.vuejs.org/) 和 [ES2015](http://babeljs.io/docs/learn-es2015/)，并正确安装和配置了 [Node.js](https://nodejs.org/) v8.9 或以上。
77
> 官方指南假设你已了解关于 HTML、CSS 和 JavaScript 的中级知识，并且已经完全掌握了 Vue 的正确开发方式。如果你刚开始学习前端或者 Vue，将 UI 框架作为你的第一步可能不是最好的主意。
88
9+
## 使用 vue-cli@3
10+
我们为新版的 vue-cli 准备了相应的 [Ant Design Vue](https://github.com/vueComponent/vue-cli-plugin-ant-design) 插件，你可以用它们快速地搭建一个基于 Ant Design Vue 的项目。
11+
912
## 在线演示
1013

1114
最简单的使用方式参照以下 CodeSandbox 演示，也推荐 Fork 本例来进行 `Bug Report`。

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ant-design-vue",
3-
"version": "1.2.4",
3+
"version": "1.2.5",
44
"title": "Ant Design Vue",
55
"description": "An enterprise-class UI design language and Vue-based implementation",
66
"keywords": [
@@ -20,7 +20,8 @@
2020
"files": [
2121
"dist",
2222
"lib",
23-
"es"
23+
"es",
24+
"types"
2425
],
2526
"scripts": {
2627
"dev": "cross-env NODE_ENV=development ENTRY_INDEX=dev ./node_modules/.bin/webpack-dev-server --open --hot --port 3001",

‎types/table/table.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export declare class PaginationConfig extends Pagination {
1313
position: "top" | "bottom" | "both";
1414
}
1515

16-
export interface customSelction {
16+
export interface customSelection {
1717
/**
1818
* Key
1919
* @description Unique key of this selection
@@ -63,7 +63,7 @@ export interface TableRowSelection {
6363
* Custom selection config, only displays default selections when set to true
6464
* @type boolean | object[]
6565
*/
66-
selections?: boolean | customSelction[];
66+
selections?: boolean | customSelection[];
6767

6868
/**
6969
* Remove the default Select All and Select Invert selections

0 commit comments

Comments
 (0)