Merge branch '2.0'

2018-12-06 11:30:29 +08:00 · 2018-12-06 11:30:29 +08:00 · ec949dace3
parent fc8cf99e59 5e345e02f5
commit ec949dace3
2 changed files with 5147 additions and 7573 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/view/update/update-table.vue
+++ b/src/view/update/update-table.vue
@ -30,7 +30,7 @@ export default {
  methods: {
    beforeUpload (file) {
      getArrayFromFile(file).then(data => {
-        let {columns, tableData} = getTableDataFromArray(data)
+        let { columns, tableData } = getTableDataFromArray(data)
        this.columns = columns
        this.tableData = tableData
      }).catch(() => {