@ddwl/ddwl-ui 1.4.1 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddwl/ddwl-ui",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "private": false,
   "main": "dist/index.common.js",
   "style": "dist/index.css",

package/src/lib/install/index.js

@@ -21,7 +21,8 @@ export default (Vue) => {
     templateDownloadMethod = null,
     fileType = ['xlsx', 'xls'],
     fileSize = 5,
-    slotRender = null
+    slotRender = null,
+    submit = null
   }) => {
     return new Promise((resolve, reject) => {
       const Import = Vue.extend(importVue)
@@ -38,22 +39,27 @@ export default (Vue) => {
       instance.fileType = fileType
       instance.fileSize = fileSize
       instance.slotRender = slotRender
+      instance.submit = submit
 
       const destroy = () => {
         instance.$destroy()
         el.parentNode && el.parentNode.removeChild(el)
       }
 
-      instance.$on('submit', async (callback, file) => {
-        try {
+      instance.$on('submit', async (file, callback) => {
+        if (instance.submit) {
+          try {
+            await instance.submit(file, callback)
+          } catch (e) {
+            callback(new Error())
+          }
+        } else {
           resolve({ file, callback })
-        } catch (e) {
-          callback(new Error(e))
         }
       })
 
       instance.$on('close', () => {
-        reject()
+        resolve()
         Vue.nextTick(destroy)
       })
     })

package/src/packages/import-file/index.vue

@@ -6,7 +6,7 @@
     :title="title"
     submit-btn-text="导入"
     submit-btn-icon="el-icon-upload2"
-    @submit="submit"
+    @submit="handleSubmit"
   >
     <el-form ref="importForm" :model="form" :inline="true">
       <el-form-item
@@ -143,17 +143,13 @@ export default {
       this.fileList = fileList
       this.form.file = file.raw
     },
-    async submit(callback) {
+    async handleSubmit(callback) {
       if (!this.form.file) {
         this.$message.error('请选择导入文件')
         callback(new Error(false))
         return
       }
-      try {
-        this.$emit('submit', callback, this.form.file)
-      } catch (e) {
-        callback(new Error(false))
-      }
+      this.$emit('submit', this.form.file, callback)
     }
   }
 }