lisang
/
iview-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0'

This commit is contained in:
zhigang.li 2018-12-06 11:30:29 +08:00
parent fc8cf99e59 5e345e02f5
commit ec949dace3
2 changed files with 5147 additions and 7573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12718
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
src/view/update/update-table.vue
View File

@ -30,7 +30,7 @@ export default {
methods: { methods: {
beforeUpload (file) { beforeUpload (file) {
getArrayFromFile(file).then(data => { getArrayFromFile(file).then(data => {
let {columns, tableData} = getTableDataFromArray(data) let { columns, tableData } = getTableDataFromArray(data)
this.columns = columns this.columns = columns
this.tableData = tableData this.tableData = tableData
}).catch(() => { }).catch(() => {