Merge branch 'master' into feat-1.3.0
# Conflicts: # components/table/__tests__/__snapshots__/Table.test.js.snappull/398/head
tangjinzhou
commit
1fb3ce30d2
|
|
@ -2,6 +2,12 @@
|
|||
|
||||
---
|
||||
|
||||
## 1.2.5
|
||||
`2019-01-06`
|
||||
|
||||
- 🌟 Add `Typescript` type file[#250](https://github.com/vueComponent/ant-design-vue/issues/250)
|
||||
- 🐞 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)
|
||||
|
||||
## 1.2.4
|
||||
`2018-12-29`
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,12 @@
|
|||
|
||||
---
|
||||
|
||||
## 1.2.5
|
||||
`2019-01-06`
|
||||
|
||||
- 🌟 新增`Typescript`类型文件[#250](https://github.com/vueComponent/ant-design-vue/issues/250)
|
||||
- 🐞 修复`Icon`组件不能同时支持static class和dynamic class问题[#371](https://github.com/vueComponent/ant-design-vue/issues/371)
|
||||
|
||||
## 1.2.4
|
||||
`2018-12-29`
|
||||
|
||||
|
|
|
|||
|
|
@ -182,14 +182,16 @@ export function getClass (ele) {
|
|||
} else if (ele.$vnode && ele.$vnode.data) {
|
||||
data = ele.$vnode.data
|
||||
}
|
||||
const tempCls = data.class || data.staticClass
|
||||
const tempCls = data.class || {}
|
||||
const staticClass = data.staticClass
|
||||
let cls = {}
|
||||
staticClass && staticClass.split(' ').forEach(c => { cls[c.trim()] = true })
|
||||
if (typeof tempCls === 'string') {
|
||||
tempCls.split(' ').forEach(c => { cls[c.trim()] = true })
|
||||
} else if (Array.isArray(tempCls)) {
|
||||
classNames(tempCls).split(' ').forEach(c => { cls[c.trim()] = true })
|
||||
} else {
|
||||
cls = tempCls
|
||||
cls = { ...cls, ...tempCls }
|
||||
}
|
||||
return cls
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2898,31 +2898,31 @@ exports[`renders ./components/table/demo/template.md correctly 1`] = `
|
|||
</thead>
|
||||
<tbody class="ant-table-tbody">
|
||||
<tr class="ant-table-row ant-table-row-level-0" data-row-key="1">
|
||||
<td><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
|
||||
<td class=""><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
|
||||
<!---->John</td>
|
||||
<td>Brown</td>
|
||||
<td>32</td>
|
||||
<td>New York No. 1 Lake Park</td>
|
||||
<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>
|
||||
<td><span><a href="javascript:;">Action 一 John</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
|
||||
<td class="">Brown</td>
|
||||
<td class="">32</td>
|
||||
<td class="">New York No. 1 Lake Park</td>
|
||||
<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>
|
||||
<td class=""><span><a href="javascript:;">Action 一 John</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
|
||||
</tr>
|
||||
<tr class="ant-table-row ant-table-row-level-0" data-row-key="2">
|
||||
<td><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
|
||||
<td class=""><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
|
||||
<!---->Jim</td>
|
||||
<td>Green</td>
|
||||
<td>42</td>
|
||||
<td>London No. 1 Lake Park</td>
|
||||
<td><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">loser</div></span></td>
|
||||
<td><span><a href="javascript:;">Action 一 Jim</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
|
||||
<td class="">Green</td>
|
||||
<td class="">42</td>
|
||||
<td class="">London No. 1 Lake Park</td>
|
||||
<td class=""><span><div data-show="true" class="ant-tag ant-tag-blue ant-tag-zoom-enter">loser</div></span></td>
|
||||
<td class=""><span><a href="javascript:;">Action 一 Jim</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
|
||||
</tr>
|
||||
<tr class="ant-table-row ant-table-row-level-0" data-row-key="3">
|
||||
<td><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
|
||||
<td class=""><span class="ant-table-row-indent indent-level-0" style="padding-left: 0px;"></span>
|
||||
<!---->Joe</td>
|
||||
<td>Black</td>
|
||||
<td>32</td>
|
||||
<td>Sidney No. 1 Lake Park</td>
|
||||
<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>
|
||||
<td><span><a href="javascript:;">Action 一 Joe</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
|
||||
<td class="">Black</td>
|
||||
<td class="">32</td>
|
||||
<td class="">Sidney No. 1 Lake Park</td>
|
||||
<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>
|
||||
<td class=""><span><a href="javascript:;">Action 一 Joe</a> <div class="ant-divider ant-divider-vertical"></div> <a href="javascript:;">Delete</a></span></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ Ant Design Vue is dedicated to providing a **good development experience** for p
|
|||
|
||||
> 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.
|
||||
|
||||
## Use vue-cli@3
|
||||
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.
|
||||
|
||||
## Playground
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@ Ant Design Vue 致力于提供给程序员**愉悦**的开发体验。
|
|||
> 在开始之前，推荐先学习 [Vue](https://cn.vuejs.org/) 和 [ES2015](http://babeljs.io/docs/learn-es2015/)，并正确安装和配置了 [Node.js](https://nodejs.org/) v8.9 或以上。
|
||||
> 官方指南假设你已了解关于 HTML、CSS 和 JavaScript 的中级知识，并且已经完全掌握了 Vue 的正确开发方式。如果你刚开始学习前端或者 Vue，将 UI 框架作为你的第一步可能不是最好的主意。
|
||||
|
||||
## 使用 vue-cli@3
|
||||
我们为新版的 vue-cli 准备了相应的 [Ant Design Vue](https://github.com/vueComponent/vue-cli-plugin-ant-design) 插件，你可以用它们快速地搭建一个基于 Ant Design Vue 的项目。
|
||||
|
||||
## 在线演示
|
||||
|
||||
最简单的使用方式参照以下 CodeSandbox 演示，也推荐 Fork 本例来进行 `Bug Report`。
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ant-design-vue",
|
||||
"version": "1.2.4",
|
||||
"version": "1.2.5",
|
||||
"title": "Ant Design Vue",
|
||||
"description": "An enterprise-class UI design language and Vue-based implementation",
|
||||
"keywords": [
|
||||
|
|
@ -20,7 +20,8 @@
|
|||
"files": [
|
||||
"dist",
|
||||
"lib",
|
||||
"es"
|
||||
"es",
|
||||
"types"
|
||||
],
|
||||
"scripts": {
|
||||
"dev": "cross-env NODE_ENV=development ENTRY_INDEX=dev ./node_modules/.bin/webpack-dev-server --open --hot --port 3001",
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export declare class PaginationConfig extends Pagination {
|
|||
position: "top" | "bottom" | "both";
|
||||
}
|
||||
|
||||
export interface customSelction {
|
||||
export interface customSelection {
|
||||
/**
|
||||
* Key
|
||||
* @description Unique key of this selection
|
||||
|
|
@ -63,7 +63,7 @@ export interface TableRowSelection {
|
|||
* Custom selection config, only displays default selections when set to true
|
||||
* @type boolean | object[]
|
||||
*/
|
||||
selections?: boolean | customSelction[];
|
||||
selections?: boolean | customSelection[];
|
||||
|
||||
/**
|
||||
* Remove the default Select All and Select Invert selections
|
||||
|
|
|
|||
Loading…
Reference in New Issue