Skip to content

Commit

Permalink
Table: add test
Browse files Browse the repository at this point in the history
  • Loading branch information
QingWei-Li committed Oct 25, 2016
1 parent f97d885 commit a793750
Show file tree
Hide file tree
Showing 7 changed files with 616 additions and 19 deletions.
7 changes: 4 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ npm run dev
# open http://localhost:8085
```

如果国内用户觉得安装慢可以使用 [npminstall](https://github.com/cnpm/npminstall)
如果国内用户觉得安装慢可以使用 [yarn](https://github.com/yarnpkg/yarn) 搭配 taobao registry
```shell
npm i npminstall -g
npminstall
npm i yarn -g
yarn config set registry https://registry.npm.taobao.org
yarn
npm run dev

# open http://localhost:8085
Expand Down
21 changes: 13 additions & 8 deletions examples/docs/zh-cn/table.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
},

methods: {
handleClick() {
console.log('fuck');
},

handleSelectionChange(val) {
this.singleSelection = val;
},
Expand Down Expand Up @@ -676,6 +680,7 @@
<el-table
:data="tableData3"
style="width: 100%"
@cell-click="handleClick"
@selection-change="handleMultipleSelectionChange">
<el-table-column
type="selection"
Expand Down Expand Up @@ -814,17 +819,17 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
|---------- |-------------- |---------- |-------------------------------- |-------- |
| data | 显示的数据 | array |||
| height | table 的高度,默认高度为空,即自动高度 | string |||
| height | table 的高度,默认高度为空,即自动高度,单位 px | string, number |||
| stripe | 是否为斑马纹 table | boolean || false |
| border | 是否带有纵向边框 | boolean || false |
| fit | 列的宽度是否自撑开 | boolean || true |
| row-class-name | 行的 className 的回调,会传入 row, index| Function | - | - |
| row-key | 行数据的 Key,用来优化 Table 的渲染;在使用 reserve-selection 功能的情况下,该属性是必填的 | Function, String | - | |
| row-class-name | 行的 className 的回调。 | Function(row, index) | - | - |
| row-key | 行数据的 Key,用来优化 Table 的渲染;在使用 reserve-selection 功能的情况下,该属性是必填的 | Function(row), String | - | - |

### Table Events
| 事件名 | 说明 | 参数 |
| ---- | ---- | ---- |
| select | 当用户手动勾选数据行的 Checkbox 时触发的事件 | selection |
| select | 当用户手动勾选数据行的 Checkbox 时触发的事件 | selection, row |
| select-all | 当用户手动勾选全选 Checkbox 时触发的事件 | selection |
| selection-change | 当选择项发生变化时会触发该事件 | selection |
| cell-mouse-enter | 当单元格 hover 进入时会触发该事件 | row, column, cell, event |
Expand All @@ -843,13 +848,13 @@
| label | 显示的标题 | string |||
| prop | 对应列内容的字段名,也可以使用 property 属性 | string |||
| width | 对应列的宽度 | string |||
| fixed | 列是否固定在左侧或者右侧 | string, boolean | true, left, right | - |
| fixed | 列是否固定在左侧或者右侧,true 表示固定在左侧 | string, boolean | true, left, right | - |
| sortable | 对应列是否可以排序 | boolean || false |
| resizable | 对应列是否可以通过拖动改变宽度(如果需要,需在 el-table 上设置 border 属性为真) | boolean || false |
| resizable | 对应列是否可以通过拖动改变宽度(如果需要在 el-table 上设置 border 属性为真) | boolean || true |
| type | 对应列的类型。如果设置了 `selection` 则显示多选框,如果设置了 `index` 则显示该行的索引(从 1 开始计算) | string | selection/index ||
| formatter | 用来格式化内容,在 formatter 执行的时候,会传入 rowcolumn | function |||
| formatter | 用来格式化内容 | Function(row, column) |||
| show-tooltip-when-overflow | 当过长被隐藏时显示 tooltip | Boolean || false |
| inline-template | 指定该属性后可以自定义 column 模板,参考多选的时间列,通过 row 获取行信息,JSX 里通过 _self 获取当前上下文。此时不需要配置 prop 属性 |||
| align | 对齐方式 | String | left, center, right | left |
| selectable | 仅对 type=selection 的列有效,类型为 Function,Function 的返回值用来决定这一行的 CheckBox 是否可以勾选 | Function | - | - |
| selectable | 仅对 type=selection 的列有效,类型为 Function,Function 的返回值用来决定这一行的 CheckBox 是否可以勾选 | Function(row, index) | - | - |
| reserve-selection | 仅对 type=selection 的列有效,类型为 Boolean,为 true 则代表会保留之前数据的选项,需要配合 Table 的 clearSelection 方法使用。 | Boolean | - | false |
2 changes: 1 addition & 1 deletion packages/table/src/table-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const getColumnById = function(table, columnId) {
};

const getColumnByCell = function(table, cell) {
const matches = (cell.className || '').match(/table_[^\s]+/gm);
const matches = (cell.className || '').match(/el-table_[^\s]+/gm);
if (matches) {
return getColumnById(table, matches[0]);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/table/src/table-column.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export default {
let column = getDefaultColumn(type, {
id: columnId,
label: this.label,
property: this.property,
property,
type,
template,
minWidth,
Expand Down
3 changes: 0 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Sync from './utils/sync';
import Pagination from '../packages/pagination/index.js';
import Dialog from '../packages/dialog/index.js';
import Autocomplete from '../packages/autocomplete/index.js';
Expand Down Expand Up @@ -59,7 +58,6 @@ const install = function(Vue) {
/* istanbul ignore if */
if (install.installed) return;

Vue.directive('sync', Sync);
Vue.component(Pagination.name, Pagination);
Vue.component(Dialog.name, Dialog);
Vue.component(Autocomplete.name, Autocomplete);
Expand Down Expand Up @@ -130,7 +128,6 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = {
version: '1.0.0-rc.7',
install,
Sync,
Pagination,
Dialog,
Autocomplete,
Expand Down
Loading

0 comments on commit a793750

Please sign in to comment.