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
5c386d5c
Commit
5c386d5c
authored
Nov 24, 2016
by
FuryBean
Committed by
cinwell.li
Nov 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Table: fix dynamic prop in table-column cause script error. (#1314)
parent
2f3f5eab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
197 additions
and
3 deletions
+197
-3
packages/table/src/table-column.js
packages/table/src/table-column.js
+3
-3
packages/table/src/table-layout.js
packages/table/src/table-layout.js
+2
-0
test/unit/specs/table.spec.js
test/unit/specs/table.spec.js
+192
-0
No files found.
packages/table/src/table-column.js
View file @
5c386d5c
...
@@ -306,21 +306,21 @@ export default {
...
@@ -306,21 +306,21 @@ export default {
width
(
newVal
)
{
width
(
newVal
)
{
if
(
this
.
columnConfig
)
{
if
(
this
.
columnConfig
)
{
this
.
columnConfig
.
width
=
newVal
;
this
.
columnConfig
.
width
=
newVal
;
this
.
owner
.
scheduleLayout
();
this
.
owner
.
s
tore
.
s
cheduleLayout
();
}
}
},
},
minWidth
(
newVal
)
{
minWidth
(
newVal
)
{
if
(
this
.
columnConfig
)
{
if
(
this
.
columnConfig
)
{
this
.
columnConfig
.
minWidth
=
newVal
;
this
.
columnConfig
.
minWidth
=
newVal
;
this
.
owner
.
scheduleLayout
();
this
.
owner
.
s
tore
.
s
cheduleLayout
();
}
}
},
},
fixed
(
newVal
)
{
fixed
(
newVal
)
{
if
(
this
.
columnConfig
)
{
if
(
this
.
columnConfig
)
{
this
.
columnConfig
.
fixed
=
newVal
;
this
.
columnConfig
.
fixed
=
newVal
;
this
.
owner
.
scheduleLayout
();
this
.
owner
.
s
tore
.
s
cheduleLayout
();
}
}
}
}
},
},
...
...
packages/table/src/table-layout.js
View file @
5c386d5c
...
@@ -149,6 +149,8 @@ class TableLayout {
...
@@ -149,6 +149,8 @@ class TableLayout {
flattenColumns
.
forEach
((
column
)
=>
{
flattenColumns
.
forEach
((
column
)
=>
{
if
(
!
column
.
width
&&
!
column
.
minWidth
)
{
if
(
!
column
.
width
&&
!
column
.
minWidth
)
{
column
.
realWidth
=
80
;
column
.
realWidth
=
80
;
}
else
{
column
.
realWidth
=
column
.
width
||
column
.
minWidth
;
}
}
bodyMinWidth
+=
column
.
realWidth
;
bodyMinWidth
+=
column
.
realWidth
;
...
...
test/unit/specs/table.spec.js
View file @
5c386d5c
...
@@ -1091,6 +1091,198 @@ describe('Table', () => {
...
@@ -1091,6 +1091,198 @@ describe('Table', () => {
});
});
});
});
describe
(
'
dynamic column attribtes
'
,
()
=>
{
const
DELAY
=
50
;
it
(
'
label
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData">
<el-table-column prop="name" :label="label"/>
<el-table-column prop="release" />
<el-table-column prop="director" />
<el-table-column prop="runtime" />
</el-table>
`
,
data
()
{
return
{
label
:
'
name
'
};
},
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__header th .cell
'
).
textContent
).
to
.
equal
(
'
name
'
);
vm
.
label
=
'
NAME
'
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__header th .cell
'
).
textContent
).
to
.
equal
(
'
NAME
'
);
});
done
();
},
DELAY
);
});
it
(
'
align
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData">
<el-table-column prop="name" :align="align"/>
</el-table>
`
,
data
()
{
return
{
align
:
'
left
'
};
},
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-table__body td.is-right
'
).
length
===
0
).
to
.
be
.
true
;
vm
.
align
=
'
right
'
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.el-table__body td.is-right
'
).
length
>
0
).
to
.
be
.
true
;
});
done
();
},
DELAY
);
});
it
(
'
width
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData" :fit="false">
<el-table-column prop="name" :width="width"/>
</el-table>
`
,
data
()
{
return
{
width
:
100
};
},
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__body col
'
).
getAttribute
(
'
width
'
)).
to
.
equal
(
'
100
'
);
vm
.
width
=
200
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__body col
'
).
getAttribute
(
'
width
'
)).
to
.
equal
(
'
200
'
);
});
done
();
},
DELAY
);
});
it
(
'
min-width
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData" :fit="false">
<el-table-column prop="name" :min-width="width"/>
</el-table>
`
,
data
()
{
return
{
width
:
100
};
},
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__body col
'
).
getAttribute
(
'
width
'
)).
to
.
equal
(
'
100
'
);
vm
.
width
=
200
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.el-table__body col
'
).
getAttribute
(
'
width
'
)).
to
.
equal
(
'
200
'
);
});
done
();
},
DELAY
);
});
it
(
'
fixed
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData">
<el-table-column :fixed="fixed" />
<el-table-column prop="release" />
<el-table-column prop="director" />
<el-table-column prop="runtime" />
</el-table>
`
,
data
()
{
return
{
fixed
:
false
};
},
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(()
=>
{
expect
(
!
vm
.
$el
.
querySelector
(
'
.el-table__fixed
'
)).
to
.
be
.
true
;
vm
.
fixed
=
true
;
vm
.
$nextTick
(()
=>
{
expect
(
!!
vm
.
$el
.
querySelector
(
'
.el-table__fixed
'
)).
to
.
be
.
true
;
});
done
();
},
DELAY
);
});
it
(
'
prop
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-table :data="testData">
<el-table-column :prop="name" />
<el-table-column prop="release" />
<el-table-column prop="director" />
<el-table-column prop="runtime" />
</el-table>
`
,
data
()
{
return
{
prop
:
'
name
'
};
},
created
()
{
this
.
testData
=
getTestData
();
}
},
true
);
setTimeout
(()
=>
{
let
firstColumnContent
=
vm
.
$el
.
querySelector
(
'
.el-table__body td .cell
'
).
textContent
;
let
secondColumnContent
=
vm
.
$el
.
querySelector
(
'
.el-table__body td:nth-child(2) .cell
'
).
textContent
;
expect
(
firstColumnContent
!==
secondColumnContent
).
to
.
be
.
true
;
vm
.
prop
=
'
release
'
;
vm
.
property
=
'
release
'
;
vm
.
$nextTick
(()
=>
{
firstColumnContent
=
vm
.
$el
.
querySelector
(
'
.el-table__body td .cell
'
).
textContent
;
secondColumnContent
=
vm
.
$el
.
querySelector
(
'
.el-table__body td:nth-child(2) .cell
'
).
textContent
;
expect
(
firstColumnContent
===
secondColumnContent
).
to
.
be
.
true
;
});
done
();
},
DELAY
);
});
});
describe
(
'
methods
'
,
()
=>
{
describe
(
'
methods
'
,
()
=>
{
const
createTable
=
function
(
prop
=
''
,
opts
)
{
const
createTable
=
function
(
prop
=
''
,
opts
)
{
return
createVue
({
return
createVue
({
...
...
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