Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
8502c891
Commit
8502c891
authored
Oct 27, 2016
by
qingwei.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Table: add filter test
a a
parent
14495f61
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
220 additions
and
50 deletions
+220
-50
README.md
README.md
+1
-0
examples/docs/zh-cn/table.md
examples/docs/zh-cn/table.md
+1
-1
packages/table/src/filter-panel.vue
packages/table/src/filter-panel.vue
+1
-1
packages/table/src/table-column.js
packages/table/src/table-column.js
+9
-9
packages/table/src/table-header.js
packages/table/src/table-header.js
+1
-0
test/unit/specs/table.spec.js
test/unit/specs/table.spec.js
+204
-36
test/unit/specs/time-picker.spec.js
test/unit/specs/time-picker.spec.js
+3
-3
No files found.
README.md
View file @
8502c891
# Element
[

](https://travis-ci.org/ElemeFE/element)
[

](https://coveralls.io/github/ElemeFE/element?branch=master)
[

](https://www.npmjs.org/package/element-ui)
[

](https://npmjs.org/package/element-ui)

...
...
examples/docs/zh-cn/table.md
View file @
8502c891
...
...
@@ -822,7 +822,7 @@
对表格进行筛选,可快速查找到自己想看的数据。
:::demo 在列中设置
`filters``filter-method`
属性即可开启该列的筛选,filters 是一个数组,
`filter-method`
是一个方法,它用于决定某些数据是否显示,会传入两个参数:
`value`
和
`row`
。
:::demo 在列中设置
`filters`
`filter-method`
属性即可开启该列的筛选,filters 是一个数组,
`filter-method`
是一个方法,它用于决定某些数据是否显示,会传入两个参数:
`value`
和
`row`
。
```
html
<template>
<el-table
...
...
packages/table/src/filter-panel.vue
View file @
8502c891
...
...
@@ -30,7 +30,7 @@
</transition>
</
template
>
<
script
type=
"text/
jsx
"
>
<
script
type=
"text/
babel
"
>
import
Popper
from
'
element-ui/src/utils/vue-popper
'
;
import
Locale
from
'
element-ui/src/mixins/locale
'
;
import
Clickoutside
from
'
element-ui/src/utils/clickoutside
'
;
...
...
packages/table/src/table-column.js
View file @
8502c891
...
...
@@ -48,16 +48,16 @@ const forced = {
return
<
div
>
{
$index
+
1
}
<
/div>
;
},
sortable
:
false
},
filter
:
{
headerTemplate
:
function
(
h
)
{
return
'
#
'
;
},
template
:
function
(
h
,
{
row
,
column
})
{
return
<
el
-
tag
type
=
"
primary
"
style
=
"
height: 16px; line-height: 16px; min-width: 40px; text-align: center
"
>
{
row
[
column
.
property
]
}
<
/el-tag>
;
},
resizable
:
false
}
// filter: {
// headerTemplate: function(h) {
// return '#';
// },
// template: function(h, { row, column }) {
// return <el-tag type="primary" style="height: 16px; line-height: 16px; min-width: 40px; text-align: center">{ row[column.property] }</el-tag>;
// },
// resizable: false
// }
};
const
getDefaultColumn
=
function
(
type
,
options
)
{
...
...
packages/table/src/table-header.js
View file @
8502c891
...
...
@@ -163,6 +163,7 @@ export default {
},
handleMouseDown
(
event
,
column
)
{
/* istanbul ignore if */
if
(
this
.
draggingColumn
&&
this
.
border
)
{
this
.
dragging
=
true
;
...
...
test/unit/specs/table.spec.js
View file @
8502c891
...
...
@@ -138,8 +138,103 @@ describe('Table', () => {
done
();
},
DELAY
);
});
});
describe
(
'
filter
'
,
()
=>
{
let
vm
;
beforeEach
(
done
=>
{
vm
=
createVue
({
template
:
`
<el-table ref="table" :data="testData">
<el-table-column prop="name" label="片名" />
<el-table-column prop="release" label="发行日期" />
<el-table-column
prop="director"
:filters="[
{ text: 'John Lasseter', value: 'John Lasseter' },
{ text: 'Peter Docter', value: 'Peter Docter' },
{ text: 'Andrew Stanton', value: 'Andrew Stanton' }
]"
:filter-method="filterMethod"
label="导演" />
<el-table-column prop="runtime" label="时长(分)" />
</el-table>
`
,
created
()
{
this
.
testData
=
getTestData
();
},
// TODO: row-key
methods
:
{
filterMethod
(
value
,
row
)
{
return
value
===
row
.
director
;
}
}
},
true
);
setTimeout
(
done
,
DELAY
);
});
afterEach
(()
=>
destroyVM
(
vm
));
it
(
'
render
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__column-filter-trigger
'
)).
to
.
exist
;
});
it
(
'
click dropdown
'
,
done
=>
{
const
btn
=
vm
.
$el
.
querySelector
(
'
.el-table__column-filter-trigger
'
);
triggerEvent
(
btn
,
'
click
'
,
true
,
false
);
setTimeout
(
_
=>
{
const
filter
=
document
.
body
.
querySelector
(
'
.el-table-filter
'
);
expect
(
filter
).
to
.
exist
;
document
.
body
.
removeChild
(
filter
);
done
();
},
100
);
});
it
(
'
click filter
'
,
done
=>
{
const
btn
=
vm
.
$el
.
querySelector
(
'
.el-table__column-filter-trigger
'
);
triggerEvent
(
btn
,
'
click
'
,
true
,
false
);
setTimeout
(
_
=>
{
const
filter
=
document
.
body
.
querySelector
(
'
.el-table-filter
'
);
// John Lasseter
triggerEvent
(
filter
.
querySelector
(
'
.el-checkbox
'
),
'
click
'
,
true
,
false
);
// confrim button
setTimeout
(
_
=>
{
triggerEvent
(
filter
.
querySelector
(
'
.el-table-filter__bottom button
'
),
'
click
'
,
true
,
false
);
setTimeout
(
_
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-table__body-wrapper tbody tr
'
)).
to
.
length
(
3
);
document
.
body
.
removeChild
(
filter
);
done
();
},
DELAY
);
},
100
);
},
100
);
});
it
(
'
click reset
'
,
done
=>
{
const
btn
=
vm
.
$el
.
querySelector
(
'
.el-table__column-filter-trigger
'
);
triggerEvent
(
btn
,
'
click
'
,
true
,
false
);
setTimeout
(
_
=>
{
const
filter
=
document
.
body
.
querySelector
(
'
.el-table-filter
'
);
// John Lasseter
triggerEvent
(
filter
.
querySelector
(
'
.el-checkbox
'
),
'
click
'
,
true
,
false
);
setTimeout
(
_
=>
{
// reset button
triggerEvent
(
filter
.
querySelectorAll
(
'
.el-table-filter__bottom button
'
)[
1
],
'
click
'
,
true
,
false
);
setTimeout
(
_
=>
{
expect
(
filter
.
querySelector
(
'
.el-table-filter__bottom button
'
).
classList
.
contains
(
'
is-disabled
'
)).
to
.
true
;
document
.
body
.
removeChild
(
filter
);
destroyVM
(
vm
);
done
();
},
DELAY
);
},
100
);
},
100
);
});
});
describe
(
'
events
'
,
()
=>
{
...
...
@@ -265,8 +360,6 @@ describe('Table', () => {
});
});
describe
(
'
methods
'
,
()
=>
{});
describe
(
'
column attributes
'
,
()
=>
{
const
createTable
=
function
(
props1
,
props2
,
props3
,
props4
,
opts
,
tableProps
)
{
return
createVue
(
Object
.
assign
({
...
...
@@ -452,39 +545,83 @@ describe('Table', () => {
},
DELAY
);
});
// TODO
// it('reserve-selection', done => {
// const vm = createVue({
// template: `
// <el-table :data="testData" @selection-change="change">
// <el-table-column type="selection" reserve-selection />
// <el-table-column prop="name" label="片名" />
// <el-table-column prop="release" label="release" />
// <el-table-column prop="director" label="director" />
// <el-table-column prop="runtime" label="runtime" />
// </el-table>
// `,
// created() {
// this.testData = getTestData();
// },
// data() {
// return { selected: [] };
// },
// methods: {
// change(rows) {
// this.selected = rows;
// }
// }
// }, true);
// setTimeout(_ => {
// done();
// }, DELAY);
// });
it
(
'
reserve-selection
'
,
done
=>
{
const
getData
=
function
(
page
=
0
)
{
let
id
=
0
;
const
rows
=
[];
const
row
=
()
=>
{
return
{
id
:
++
id
+
page
*
10
,
date
:
new
Date
().
getTime
()
};
};
let
count
=
10
;
while
(
--
count
)
{
rows
.
push
(
row
());
}
return
rows
;
};
const
vm
=
createVue
({
template
:
`
<el-table ref="table" :row-key="rowKey" :data="testData" @selection-change="change">
<el-table-column type="selection" reserve-selection />
<el-table-column prop="id" label="id" />
<el-table-column prop="date" label="date" />
</el-table>
`
,
created
()
{
this
.
testData
=
getData
();
},
data
()
{
return
{
selected
:
[],
testData
:
[]
};
},
methods
:
{
rowKey
(
row
)
{
return
row
.
id
;
},
change
(
rows
)
{
this
.
selected
=
rows
;
}
}
},
true
);
setTimeout
(
_
=>
{
// click first
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox
'
)[
1
].
click
();
setTimeout
(
_
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox__inner.is-checked
'
)).
to
.
length
(
1
);
// go to second page
vm
.
testData
=
getData
(
1
);
setTimeout
(
_
=>
{
// expect no checked
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox__inner.is-checked
'
)).
to
.
length
(
0
);
// click first checkbox
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox
'
)[
1
].
click
();
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox
'
)[
2
].
click
();
setTimeout
(
_
=>
{
// back first page
vm
.
testData
=
getData
();
setTimeout
(
_
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox__inner.is-checked
'
)).
to
.
length
(
1
);
// clear
vm
.
$refs
.
table
.
clearSelection
();
setTimeout
(
_
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-checkbox__inner.is-checked
'
)).
to
.
length
(
0
);
destroyVM
(
vm
);
done
();
},
DELAY
);
},
DELAY
);
},
DELAY
);
},
DELAY
);
},
DELAY
);
},
DELAY
);
});
describe
(
'
type
'
,
()
=>
{
const
createTable
=
function
(
type
)
{
...
...
@@ -580,6 +717,7 @@ describe('Table', () => {
it
(
'
render
'
,
done
=>
{
setTimeout
(
_
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.caret-wrapper
'
)).
to
.
length
(
1
);
destroyVM
(
vm
);
done
();
},
DELAY
);
});
...
...
@@ -614,4 +752,34 @@ describe('Table', () => {
});
});
});
it
(
'
hover
'
,
done
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData">
<el-table-column prop="name" label="片名" />
<el-table-column prop="release" label="发行日期" />
<el-table-column prop="director" label="导演" />
<el-table-column prop="runtime" label="时长(分)" />
</el-table>
`
,
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(
_
=>
{
const
tr
=
vm
.
$el
.
querySelector
(
'
.el-table__body-wrapper tbody tr
'
);
triggerEvent
(
tr
,
'
mouseenter
'
,
true
,
false
);
setTimeout
(
_
=>
{
expect
(
tr
.
classList
.
contains
(
'
hover-row
'
)).
to
.
true
;
triggerEvent
(
tr
,
'
mouseleave
'
,
true
,
false
);
setTimeout
(
_
=>
{
expect
(
tr
.
classList
.
contains
(
'
hover-row
'
)).
to
.
false
;
destroyVM
(
vm
);
done
();
},
DELAY
);
},
DELAY
);
},
DELAY
);
});
});
test/unit/specs/time-picker.spec.js
View file @
8502c891
...
...
@@ -202,7 +202,7 @@ describe('TimePicker(range)', () => {
it
(
'
minTime < maxTime
'
,
done
=>
{
const
vm2
=
createTest
(
TimePicker
,
{
isRange
:
true
,
value
:
[
new
Date
(
2016
,
9
,
10
,
2
1
,
40
),
new
Date
(
2016
,
9
,
10
,
2
0
,
40
)]
value
:
[
new
Date
(
2016
,
9
,
10
,
2
3
,
40
),
new
Date
(
2016
,
9
,
10
,
1
0
,
40
)]
},
true
);
const
input
=
vm2
.
$el
.
querySelector
(
'
input
'
);
...
...
@@ -210,10 +210,10 @@ describe('TimePicker(range)', () => {
input
.
focus
();
input
.
blur
();
setTimeout
(()
=>
{
expect
(
vm2
.
picker
.
maxTime
>
vm2
.
picker
.
minTime
).
to
.
true
;
expect
(
vm2
.
picker
.
maxTime
>
=
vm2
.
picker
.
minTime
).
to
.
true
;
destroyVM
(
vm2
);
done
();
},
2
0
);
},
10
0
);
});
it
(
'
click cancel button
'
,
done
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment