@v2coding/ui 0.1.20 → 0.1.22

package/dist/v2coding-ui.esm.js

@@ -1,15 +1,15 @@
 import { fromJS, is } from 'immutable';
 import merge from 'lodash.merge';
 import axios from 'axios';
+import to from 'await-to-js';
+import { Message, TableColumn as TableColumn$1 } from 'element-ui';
 import Vuex, { mapState } from 'vuex';
 import VuexPersistence from 'vuex-persist';
 import VueRouter from 'vue-router';
-import to from 'await-to-js';
 import throttle from 'lodash.throttle';
 import PinyinMatch from 'pinyin-match';
 import moment from 'moment';
 import debounce from 'lodash.debounce';
-import { Message, TableColumn as TableColumn$1 } from 'element-ui';
 import { Quill, quillEditor } from 'vue-quill-editor';
 import 'quill/dist/quill.core.css';
 import 'quill/dist/quill.snow.css';
@@ -162,15 +162,55 @@ const downloadFile = (data, filename, mime) => {
   }
 };
 
+const blobToObj = data => {
+  return new Promise((resolve, reject) => {
+    let reader = new FileReader();
+    reader.readAsText(data, 'utf-8');
+
+    reader.onload = function () {
+      try {
+        resolve(JSON.parse(reader.result));
+      } catch (error) {
+        reject(error);
+      }
+    };
+  });
+};
+
 const initDownload = server => {
   return (url, filename, config) => {
     const _config = Object.assign({
       url,
-      method: 'get'
+      method: 'get',
+      autoMessage: false
     }, config || {});
 
     return server(_config).then(res => {
       downloadFile(res, filename);
+    }).catch(async error => {
+      var _response$data;
+
+      const {
+        response
+      } = error || {};
+
+      if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.type) === 'application/json') {
+        const [, result] = await to(blobToObj(response.data));
+
+        if (result) {
+          Message.error({
+            dangerouslyUseHTMLString: true,
+            message: result.message || '网络出现故障,请稍后再试'
+          });
+          return Promise.reject(result);
+        }
+      }
+
+      Message.error({
+        dangerouslyUseHTMLString: true,
+        message: '网络出现故障,请稍后再试'
+      });
+      return Promise.reject(error);
     });
   };
 };
@@ -535,14 +575,9 @@ const getSetting = () => {
   return Objects.merge({}, setting);
 };
 
-const isFormErrorResponse = result => {
-  return result.code === 'FAILURE_PARAM_ERROR';
-};
 /**
  * 自动解析 get/post 请求并提示信息(解析返回信息中的 message/data 字段)
  */
-
-
 var AxiosWithMessage = {
   methods: {
     getWithMessage() {
@@ -553,22 +588,15 @@ var AxiosWithMessage = {
 
         const {
           success = false,
-          data,
           message
         } = result;
 
         if (success) {
           message && this.$nextTick(() => this.$message({
             message,
-            type: success ? 'success' : 'error'
-          }));
-        } else if (isFormErrorResponse(result)) {
-          const err = Object.values(data);
-          err.length && this.$nextTick(() => this.$message.error({
-            dangerouslyUseHTMLString: true,
-            message: err.join(';<br/>')
+            type: 'success'
           }));
-        } else ;
+        }
 
         return result;
       });
@@ -582,22 +610,15 @@ var AxiosWithMessage = {
 
         const {
           success = false,
-          data,
           message = `操作${success ? '成功' : '失败'}`
         } = result;
 
         if (success) {
           message && this.$nextTick(() => this.$message({
             message,
-            type: success ? 'success' : 'error'
-          }));
-        } else if (isFormErrorResponse(result)) {
-          const err = Object.values(data);
-          err.length && this.$nextTick(() => this.$message.error({
-            dangerouslyUseHTMLString: true,
-            message: err.join(';<br/>')
+            type: 'success'
           }));
-        } else ;
+        }
 
         return result;
       });
@@ -611,22 +632,15 @@ var AxiosWithMessage = {
 
         const {
           success = false,
-          data,
           message
         } = result;
 
         if (success) {
           message && this.$nextTick(() => this.$message({
             message,
-            type: success ? 'success' : 'error'
-          }));
-        } else if (isFormErrorResponse(result)) {
-          const err = Object.values(data);
-          err.length && this.$nextTick(() => this.$message.error({
-            dangerouslyUseHTMLString: true,
-            message: err.join(';<br/>')
+            type: 'success'
           }));
-        } else ;
+        }
 
         return result;
       });