@v2coding/ui 0.1.20 → 0.1.22

package/dist/v2coding-ui.ssr.js

@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var immutable=require('immutable'),merge=require('lodash.merge'),axios=require('axios'),Vuex=require('vuex'),VuexPersistence=require('vuex-persist'),VueRouter=require('vue-router'),to=require('await-to-js'),throttle=require('lodash.throttle'),PinyinMatch=require('pinyin-match'),moment=require('moment'),debounce=require('lodash.debounce'),elementUi=require('element-ui'),vueQuillEditor=require('vue-quill-editor');require('quill/dist/quill.core.css'),require('quill/dist/quill.snow.css'),require('quill/dist/quill.bubble.css');var gcoord=require('gcoord'),AMapLoader=require('@amap/amap-jsapi-loader'),XLSX=require('xlsx'),util=require('element-ui/lib/utils/util'),resizeEvent=require('element-ui/lib/utils/resize-event'),vueMultipane=require('vue-multipane');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var merge__default=/*#__PURE__*/_interopDefaultLegacy(merge);var axios__default=/*#__PURE__*/_interopDefaultLegacy(axios);var Vuex__default=/*#__PURE__*/_interopDefaultLegacy(Vuex);var VuexPersistence__default=/*#__PURE__*/_interopDefaultLegacy(VuexPersistence);var VueRouter__default=/*#__PURE__*/_interopDefaultLegacy(VueRouter);var to__default=/*#__PURE__*/_interopDefaultLegacy(to);var throttle__default=/*#__PURE__*/_interopDefaultLegacy(throttle);var PinyinMatch__default=/*#__PURE__*/_interopDefaultLegacy(PinyinMatch);var moment__default=/*#__PURE__*/_interopDefaultLegacy(moment);var debounce__default=/*#__PURE__*/_interopDefaultLegacy(debounce);var gcoord__default=/*#__PURE__*/_interopDefaultLegacy(gcoord);var AMapLoader__default=/*#__PURE__*/_interopDefaultLegacy(AMapLoader);var XLSX__default=/*#__PURE__*/_interopDefaultLegacy(XLSX);var toString = function toString(obj) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var immutable=require('immutable'),merge=require('lodash.merge'),axios=require('axios'),to=require('await-to-js'),elementUi=require('element-ui'),Vuex=require('vuex'),VuexPersistence=require('vuex-persist'),VueRouter=require('vue-router'),throttle=require('lodash.throttle'),PinyinMatch=require('pinyin-match'),moment=require('moment'),debounce=require('lodash.debounce'),vueQuillEditor=require('vue-quill-editor');require('quill/dist/quill.core.css'),require('quill/dist/quill.snow.css'),require('quill/dist/quill.bubble.css');var gcoord=require('gcoord'),AMapLoader=require('@amap/amap-jsapi-loader'),XLSX=require('xlsx'),util=require('element-ui/lib/utils/util'),resizeEvent=require('element-ui/lib/utils/resize-event'),vueMultipane=require('vue-multipane');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var merge__default=/*#__PURE__*/_interopDefaultLegacy(merge);var axios__default=/*#__PURE__*/_interopDefaultLegacy(axios);var to__default=/*#__PURE__*/_interopDefaultLegacy(to);var Vuex__default=/*#__PURE__*/_interopDefaultLegacy(Vuex);var VuexPersistence__default=/*#__PURE__*/_interopDefaultLegacy(VuexPersistence);var VueRouter__default=/*#__PURE__*/_interopDefaultLegacy(VueRouter);var throttle__default=/*#__PURE__*/_interopDefaultLegacy(throttle);var PinyinMatch__default=/*#__PURE__*/_interopDefaultLegacy(PinyinMatch);var moment__default=/*#__PURE__*/_interopDefaultLegacy(moment);var debounce__default=/*#__PURE__*/_interopDefaultLegacy(debounce);var gcoord__default=/*#__PURE__*/_interopDefaultLegacy(gcoord);var AMapLoader__default=/*#__PURE__*/_interopDefaultLegacy(AMapLoader);var XLSX__default=/*#__PURE__*/_interopDefaultLegacy(XLSX);var toString = function toString(obj) {
   return Object.prototype.toString.call(obj);
 };
 var isObject = function isObject() {
@@ -699,16 +699,86 @@ function _nonIterableRest() {
   }
 };
 
+var blobToObj = function blobToObj(data) {
+  return new Promise(function (resolve, reject) {
+    var reader = new FileReader();
+    reader.readAsText(data, 'utf-8');
+
+    reader.onload = function () {
+      try {
+        resolve(JSON.parse(reader.result));
+      } catch (error) {
+        reject(error);
+      }
+    };
+  });
+};
+
 var initDownload = function initDownload(server) {
   return function (url, filename, config) {
     var _config = Object.assign({
       url: url,
-      method: 'get'
+      method: 'get',
+      autoMessage: false
     }, config || {});
 
     return server(_config).then(function (res) {
       downloadFile(res, filename);
-    });
+    }).catch( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(error) {
+        var _response$data;
+
+        var _ref2, response, _yield$to, _yield$to2, result;
+
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref2 = error || {}, response = _ref2.response;
+
+                if (!((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.type) === 'application/json')) {
+                  _context.next = 10;
+                  break;
+                }
+
+                _context.next = 4;
+                return to__default["default"](blobToObj(response.data));
+
+              case 4:
+                _yield$to = _context.sent;
+                _yield$to2 = _slicedToArray(_yield$to, 2);
+                result = _yield$to2[1];
+
+                if (!result) {
+                  _context.next = 10;
+                  break;
+                }
+
+                elementUi.Message.error({
+                  dangerouslyUseHTMLString: true,
+                  message: result.message || '网络出现故障,请稍后再试'
+                });
+                return _context.abrupt("return", Promise.reject(result));
+
+              case 10:
+                elementUi.Message.error({
+                  dangerouslyUseHTMLString: true,
+                  message: '网络出现故障,请稍后再试'
+                });
+                return _context.abrupt("return", Promise.reject(error));
+
+              case 12:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
   };
 };var _interceptors2;
 var instance;
@@ -1110,14 +1180,9 @@ var Config = {
 };
 var getSetting = function getSetting() {
   return Objects.merge({}, setting);
-};var isFormErrorResponse = function isFormErrorResponse(result) {
-  return result.code === 'FAILURE_PARAM_ERROR';
-};
-/**
+};/**
  * 自动解析 get/post 请求并提示信息(解析返回信息中的 message/data 字段)
  */
-
-
 var AxiosWithMessage = {
   methods: {
     getWithMessage: function getWithMessage() {
@@ -1131,25 +1196,16 @@ var AxiosWithMessage = {
 
         var _result$success = result.success,
             success = _result$success === void 0 ? false : _result$success,
-            data = result.data,
             message = result.message;
 
         if (success) {
           message && _this.$nextTick(function () {
             return _this.$message({
               message: message,
-              type: success ? 'success' : 'error'
+              type: 'success'
             });
           });
-        } else if (isFormErrorResponse(result)) {
-          var err = Object.values(data);
-          err.length && _this.$nextTick(function () {
-            return _this.$message.error({
-              dangerouslyUseHTMLString: true,
-              message: err.join(';<br/>')
-            });
-          });
-        } else ;
+        }
 
         return result;
       });
@@ -1165,7 +1221,6 @@ var AxiosWithMessage = {
 
         var _result$success2 = result.success,
             success = _result$success2 === void 0 ? false : _result$success2,
-            data = result.data,
             _result$message = result.message,
             message = _result$message === void 0 ? "\u64CD\u4F5C".concat(success ? '成功' : '失败') : _result$message;
 
@@ -1173,18 +1228,10 @@ var AxiosWithMessage = {
           message && _this2.$nextTick(function () {
             return _this2.$message({
               message: message,
-              type: success ? 'success' : 'error'
+              type: 'success'
             });
           });
-        } else if (isFormErrorResponse(result)) {
-          var err = Object.values(data);
-          err.length && _this2.$nextTick(function () {
-            return _this2.$message.error({
-              dangerouslyUseHTMLString: true,
-              message: err.join(';<br/>')
-            });
-          });
-        } else ;
+        }
 
         return result;
       });
@@ -1199,25 +1246,16 @@ var AxiosWithMessage = {
 
         var _result$success3 = result.success,
             success = _result$success3 === void 0 ? false : _result$success3,
-            data = result.data,
             message = result.message;
 
         if (success) {
           message && _this3.$nextTick(function () {
             return _this3.$message({
               message: message,
-              type: success ? 'success' : 'error'
+              type: 'success'
             });
           });
-        } else if (isFormErrorResponse(result)) {
-          var err = Object.values(data);
-          err.length && _this3.$nextTick(function () {
-            return _this3.$message.error({
-              dangerouslyUseHTMLString: true,
-              message: err.join(';<br/>')
-            });
-          });
-        } else ;
+        }
 
         return result;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@v2coding/ui",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "",
 
   "main": "dist/v2coding-ui.ssr.js",