@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/lib/ProDownload/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,15 +11,17 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _ahooks = require("ahooks");
 var _antd = require("antd");
-var _lodash = _interopRequireDefault(require("lodash"));
-var _react = _interopRequireDefault(require("react"));
-var _DownloadHelper = require("./DownloadHelper");
-var _excluded = ["source", "action", "method", "params", "fileName", "headers", "children", "onFinish", "beforeDownload"];
+var _classnames = _interopRequireDefault(require("classnames"));
+var _lodash = _interopRequireWildcard(require("lodash"));
+var _utils = require("./utils");
+var _excluded = ["source", "action", "url", "method", "params", "fileName", "headers", "children", "onFinish", "beforeDownload", "className", "transformResponse"];
 var ProDownload = function ProDownload(props) {
   var source = props.source,
     action = props.action,
+    url = props.url,
     method = props.method,
     params = props.params,
     fileName = props.fileName,
@@ -26,6 +29,8 @@ var ProDownload = function ProDownload(props) {
     children = props.children,
     onFinish = props.onFinish,
     beforeDownload = props.beforeDownload,
+    className = props.className,
+    transformResponse = props.transformResponse,
     defaultProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useSetState = (0, _ahooks.useSetState)({
       loading: false
@@ -35,7 +40,7 @@ var ProDownload = function ProDownload(props) {
     setState = _useSetState2[1];
   var handDownload = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-      var res, fileBlob, data;
+      var _params;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -43,77 +48,89 @@ var ProDownload = function ProDownload(props) {
               _context.next = 3;
               break;
             }
-            fetch(action).then(function (response) {
-              return response.blob();
-            }).then(function (res) {
-              var blob = new Blob([res]);
-              (0, _DownloadHelper.BlobMakeFile)({
-                blob: blob,
-                fileName: fileName
+            try {
+              fetch(url || action).then(function (response) {
+                if (response.status > 400) {
+                  return Promise.reject(new Error("Service exception: ".concat(response.status)));
+                }
+                return response.blob();
+              }).then(function (res) {
+                var blob = new Blob([res]);
+                (0, _utils.BlobMakeFile)({
+                  blob: blob,
+                  fileName: fileName
+                });
               });
-            });
+            } catch (error) {
+              Promise.reject(error);
+            }
             return _context.abrupt("return");
           case 3:
             setState({
               loading: true
             });
-            // 发起请求
-            _context.prev = 4;
-            _context.next = 7;
-            return (0, _DownloadHelper.DownloadRequest)({
-              url: action,
-              method: method,
-              headers: headers,
-              payload: params
-            });
-          case 7:
-            res = _context.sent;
-            data = _lodash.default.get(res, 'data');
-            if (!data) {
-              _context.next = 13;
+            _params = params;
+            if (!(0, _lodash.isFunction)(params)) {
+              _context.next = 14;
               break;
             }
-            fileBlob = (0, _DownloadHelper.convertBase64ToBlob)(data);
-            _context.next = 16;
+            if (!(params.constructor.name === 'AsyncFunction')) {
+              _context.next = 12;
+              break;
+            }
+            _context.next = 9;
+            return params();
+          case 9:
+            _context.t0 = _context.sent;
+            _context.next = 13;
             break;
+          case 12:
+            _context.t0 = params();
           case 13:
-            _context.next = 15;
-            return res.blob();
-          case 15:
-            fileBlob = _context.sent;
-          case 16:
-            _context.next = 18;
-            return (0, _DownloadHelper.BlobMakeFile)({
-              blob: fileBlob,
-              fileName: fileName
+            _params = _context.t0;
+          case 14:
+            _context.prev = 14;
+            _context.next = 17;
+            return (0, _utils.DownloadRequest)({
+              url: url || action,
+              method: method,
+              headers: headers,
+              params: _params,
+              transformResponse: transformResponse,
+              fileName: fileName,
+              onFinish: onFinish
             });
-          case 18:
-            _context.next = 24;
+          case 17:
+            _context.next = 23;
             break;
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context["catch"](4);
+          case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](14);
             setState({
               loading: false
             });
             return _context.abrupt("return", Promise.reject());
-          case 24:
-            _context.prev = 24;
+          case 23:
+            _context.prev = 23;
             setState({
               loading: false
             });
-            return _context.finish(24);
-          case 27:
+            return _context.finish(23);
+          case 26:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 20, 24, 27]]);
+      }, _callee, null, [[14, 19, 23, 26]]);
     }));
     return function handDownload() {
       return _ref.apply(this, arguments);
     };
   }();
-  return /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var cls = (0, _classnames.default)(className, {
+    'pro-download': true
+  });
+  return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    className: cls,
     onClick: function () {
       var _onClick = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
         var res;
@@ -158,13 +175,8 @@ var ProDownload = function ProDownload(props) {
               }
               return _context3.abrupt("return");
             case 13:
-              _context3.next = 15;
-              return handDownload();
-            case 15:
-              if (_lodash.default.isFunction(onFinish)) {
-                onFinish();
-              }
-            case 16:
+              handDownload();
+            case 14:
             case "end":
               return _context3.stop();
           }
@@ -176,8 +188,9 @@ var ProDownload = function ProDownload(props) {
       return onClick;
     }()
   }, defaultProps), {}, {
-    loading: loading
-  }), children);
+    loading: loading,
+    children: children
+  }));
 };
-var _default = ProDownload;
-exports.default = _default;
+ProDownload.downLoadRequest = _utils.DownloadRequest;
+var _default = exports.default = ProDownload;

package/lib/ProDownload/propsType.d.ts

@@ -1,31 +1,38 @@
 import { ReactNode } from 'react';
 import type { ButtonProps } from 'antd';
+import type { DownloadRequestProps, PropsWithMakeFilePropsType } from './utils';
 export interface IProDownloadProps extends ButtonProps {
     /**
      * @description       下载资源获取来源：api：通过接口获取，url：通过静态资源链接获取
      * @default           api
      */
     source?: string;
+    /**
+   * @description       下载请求的地址
+   * @default           (必选)
+   */
+    url: string;
     /**
      * @description       下载请求的地址
-     * @default           (必选)
+     * @deprecated        弃用，请使用url进行替换
+     * @default           (非必选)
      */
-    action: string;
+    action?: string;
     /**
      * @description       下载请求的类型
      * @default           post
      */
-    method?: string;
+    method?: 'post' | 'get';
     /**
      * @description       下载所需额外参数或返回上传额外参数的方法
      * @default           -
      */
-    params?: object;
+    params?: any;
     /**
      * @description       下载保存的文件名
      * @default           (必选)
      */
-    fileName: string;
+    fileName?: string;
     /**
      * @description       设置上传的请求头部，IE10 以上有效
      * @default           -
@@ -36,6 +43,8 @@ export interface IProDownloadProps extends ButtonProps {
    * @default           false
    */
     disabled?: boolean;
+    /** 格式化数据 */
+    transformResponse?: (data: any) => any;
     /**
     * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
     * @default           -
@@ -50,5 +59,8 @@ export interface IProDownloadProps extends ButtonProps {
      * @description       下载按钮的填充内容
      * @default           -
      */
-    children: string | ReactNode;
+    downLoadRequest?: DownloadRequestProps;
+    downLoadBlobUrl?: PropsWithMakeFilePropsType;
+    children?: string | ReactNode;
+    [key: string]: any;
 }

package/lib/ProDownload/style/index.less

@@ -0,0 +1,7 @@
+.pro-download {
+
+  &.ant-btn-link,
+  &.ant-btn-text {
+    padding: 0;
+  }
+}

package/lib/ProDownload/utils.d.ts

@@ -0,0 +1,55 @@
+export interface PropsWithMakeFilePropsType {
+    blob?: Blob;
+    fileName: string;
+    url?: string;
+}
+export interface IDownloadRequestPropsType {
+    /**
+   * @description       下载请求的地址
+   * @default           (必选)
+   */
+    url: string;
+    /**
+   * @description       下载请求的类型
+   * @default           post
+   */
+    method?: 'post' | 'get';
+    /**
+   * @description       下载所需额外参数或返回上传额外参数的方法
+   * @default           -
+   */
+    params?: any;
+    headers?: any;
+    /** 格式化数据 */
+    transformResponse?: (data: any) => any;
+    /**
+  * @description       service 执行完成时触发
+  * @default           -
+  */
+    onFinish?: (response: object, params: object) => void;
+    /**
+   * @description       下载保存的文件名
+   * @default           (必选)
+   */
+    fileName?: string;
+}
+/**
+ * 下载Blob
+ *
+ * @param response
+ * @param fileName
+ * @param extendName
+ * @constructor
+ */
+export declare function BlobMakeFile({ blob, fileName, url }: PropsWithMakeFilePropsType): void;
+export type DownloadRequestProps = (props: IDownloadRequestPropsType) => Promise<Response>;
+type convertBase64ToBlobType = (base64: string, fileType?: string, slice?: number) => Blob;
+export declare const convertBase64ToBlob: convertBase64ToBlobType;
+/**
+ * 从Content-Disposition获取filename
+ * @param contentDisposition string
+ * @returns string
+ */
+export declare function getFilenameFromContentDisposition(contentDisposition: any): string;
+export declare const DownloadRequest: DownloadRequestProps;
+export {};

package/lib/ProDownload/{DownloadHelper.js → utils.js}

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BlobMakeFile = BlobMakeFile;
 exports.convertBase64ToBlob = exports.DownloadRequest = void 0;
-exports.postDownloadFile = postDownloadFile;
+exports.getFilenameFromContentDisposition = getFilenameFromContentDisposition;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _antd = require("antd");
+var _lodash = require("lodash");
 /* eslint-disable no-empty */
 /* eslint-disable prefer-promise-reject-errors */
 
@@ -50,14 +51,39 @@ function BlobMakeFile(_ref) {
   ele.click();
   doc.body.removeChild(ele);
 }
+var convertBase64ToBlob = exports.convertBase64ToBlob = function convertBase64ToBlob(base64, fileType) {
+  var _atob$match;
+  var slice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1024;
+  return new Blob((_atob$match = atob(base64).match(new RegExp("([\\s\\S]{".concat(slice, "})|([\\s\\S]{1,").concat(slice, "})"), 'g'))) === null || _atob$match === void 0 ? void 0 : _atob$match.map(function (item) {
+    return new Uint8Array(item.split('').map(function (s, i) {
+      return item.charCodeAt(i);
+    }));
+  }), {
+    type: fileType
+  });
+};
+/**
+ * 从Content-Disposition获取filename
+ * @param contentDisposition string
+ * @returns string
+ */
+function getFilenameFromContentDisposition(contentDisposition) {
+  var pattern = /filename=([^;]+)/i;
+  var matches = pattern.exec(contentDisposition);
+  if (matches && matches[1]) {
+    // remove double quotes if filename is quoted
+    return matches[1].replace(/^"?(.+?)"?$/, '$1');
+  }
+  return null;
+}
 // 发起请求获取下载文件
-var DownloadRequest = /*#__PURE__*/function () {
+var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
-    var url, _ref2$method, method, payload, headers, config;
+    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, config, res, fileBlob, data, contentFileName;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = _ref2.url, _ref2$method = _ref2.method, method = _ref2$method === void 0 ? 'post' : _ref2$method, payload = _ref2.payload, headers = _ref2.headers;
+          url = _ref2.url, _ref2$method = _ref2.method, method = _ref2$method === void 0 ? 'post' : _ref2$method, params = _ref2.params, headers = _ref2.headers, transformResponse = _ref2.transformResponse, fileName = _ref2.fileName, onFinish = _ref2.onFinish;
           config = {
             method: method,
             credentials: 'include',
@@ -66,21 +92,22 @@ var DownloadRequest = /*#__PURE__*/function () {
               accept: 'application/json;charset=UTF-8'
             },
             body: null
-          }; // method = post and payload, add it to the fetch request
-          if (method === 'post' && payload) {
-            config.body = JSON.stringify(payload);
+          }; // method = post and params, add it to the fetch request
+          if (method === 'post' && params) {
+            config.body = JSON.stringify(params);
           }
           // 处理get请求入参
-          if (method === 'get' && payload) {
-            url = "".concat(url).concat(url.indexOf('?') !== -1 ? '&' : '?').concat(stringify(payload));
+          if (method === 'get' && params) {
+            url = "".concat(url).concat(url.indexOf('?') !== -1 ? '&' : '?').concat(stringify(params));
           }
           // if custom headers need to be set for the specific request
           if (headers && (0, _typeof2.default)(headers) === 'object' && Object.keys(headers).length > 0) {
             config.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config.headers), headers);
           }
-          return _context2.abrupt("return", fetch(url, config).then( /*#__PURE__*/function () {
+          _context2.next = 7;
+          return fetch(url, config).then( /*#__PURE__*/function () {
             var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
-              var data, errorMsg;
+              var _data, errorMsg;
               return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
@@ -88,39 +115,83 @@ var DownloadRequest = /*#__PURE__*/function () {
                     _context.next = 3;
                     return response.clone().json();
                   case 3:
-                    data = _context.sent;
-                    if (!((data === null || data === void 0 ? void 0 : data.status) > 200 || (data === null || data === void 0 ? void 0 : data.code) === 401)) {
-                      _context.next = 8;
+                    _data = _context.sent;
+                    if (_data) {
+                      _context.next = 7;
+                      break;
+                    }
+                    _antd.message.error('请求失败！');
+                    return _context.abrupt("return", Promise.reject('请求失败！'));
+                  case 7:
+                    if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
+                      _context.next = 11;
                       break;
                     }
-                    errorMsg = (data === null || data === void 0 ? void 0 : data.message) || (data === null || data === void 0 ? void 0 : data.msg);
+                    errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
                     errorMsg && _antd.message.error(errorMsg);
                     return _context.abrupt("return", Promise.reject(errorMsg));
-                  case 8:
-                    Promise.resolve(data);
-                    _context.next = 15;
-                    break;
                   case 11:
-                    _context.prev = 11;
+                    if (!(0, _lodash.isFunction)(transformResponse)) {
+                      _context.next = 13;
+                      break;
+                    }
+                    return _context.abrupt("return", Promise.resolve(transformResponse(_data)));
+                  case 13:
+                    Promise.resolve(_data);
+                    _context.next = 20;
+                    break;
+                  case 16:
+                    _context.prev = 16;
                     _context.t0 = _context["catch"](0);
                     if (!response.ok) {
-                      _context.next = 15;
+                      _context.next = 20;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(response));
-                  case 15:
+                  case 20:
                     return _context.abrupt("return", Promise.reject('请求失败！'));
-                  case 16:
+                  case 21:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 11]]);
+              }, _callee, null, [[0, 16]]);
             }));
             return function (_x2) {
               return _ref4.apply(this, arguments);
             };
-          }()));
-        case 6:
+          }());
+        case 7:
+          res = _context2.sent;
+          data = null;
+          contentFileName = '';
+          if ((0, _lodash.isFunction)(transformResponse)) {
+            data = res;
+          } else {
+            // 优先获取Content-Disposition中filename
+            contentFileName = getFilenameFromContentDisposition(res.headers.get('Content-Disposition'));
+            data = (0, _lodash.get)(res, 'data');
+          }
+          if (!data) {
+            _context2.next = 15;
+            break;
+          }
+          fileBlob = convertBase64ToBlob(data);
+          _context2.next = 18;
+          break;
+        case 15:
+          _context2.next = 17;
+          return res.blob();
+        case 17:
+          fileBlob = _context2.sent;
+        case 18:
+          // 完成回调
+          onFinish === null || onFinish === void 0 ? void 0 : onFinish(res, params);
+          BlobMakeFile({
+            blob: fileBlob,
+            fileName: fileName || contentFileName
+          });
+          return _context2.abrupt("return", Promise.resolve(res));
+        case 21:
         case "end":
           return _context2.stop();
       }
@@ -129,55 +200,4 @@ var DownloadRequest = /*#__PURE__*/function () {
   return function DownloadRequest(_x) {
     return _ref3.apply(this, arguments);
   };
-}();
-exports.DownloadRequest = DownloadRequest;
-function postDownloadFile(_ref5) {
-  var url = _ref5.url,
-    params = _ref5.params,
-    cb = _ref5.cb;
-  if (!url) {
-    return false;
-  }
-  // 删除重复创建的Form
-  var downloadForm = document.querySelector('#downloadForm');
-  if (downloadForm) {
-    document.body.removeChild(downloadForm);
-  }
-  try {
-    var form = document.createElement('form');
-    form.action = url;
-    form.id = 'downloadForm';
-    form.style = 'display:none';
-    form.method = 'post';
-    form.target = '_blank';
-    // eslint-disable-next-line no-restricted-syntax
-    for (var key in params) {
-      if (Object.prototype.hasOwnProperty.call(params, key)) {
-        var newInput = document.createElement('input');
-        newInput.type = 'hidden';
-        newInput.name = key;
-        newInput.value = params[key];
-        form.appendChild(newInput);
-      }
-    }
-    document.body.appendChild(form);
-    form.submit();
-    setTimeout(function () {
-      cb && cb();
-    }, 3000);
-  } catch (e) {
-    console.warn(e);
-  }
-}
-var convertBase64ToBlob = function convertBase64ToBlob(base64, fileType) {
-  var _atob$match;
-  var slice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1024;
-  return new Blob((_atob$match = atob(base64).match(new RegExp("([\\s\\S]{".concat(slice, "})|([\\s\\S]{1,").concat(slice, "})"), 'g'))) === null || _atob$match === void 0 ? void 0 : _atob$match.map(function (item) {
-    return new Uint8Array(item.split('').map(function (s, i) {
-      return item.charCodeAt(i);
-    }));
-  }), {
-    type: fileType
-  });
-};
-exports.convertBase64ToBlob = convertBase64ToBlob;
+}();