@zat-design/sisyphus-react 3.5.1-beta.6 → 3.5.1-beta.8

package/es/ProDownload/index.js

@@ -5,7 +5,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse"];
+var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
 import classNames from 'classnames';
@@ -24,6 +24,7 @@ var ProDownload = function ProDownload(props) {
     beforeDownload = props.beforeDownload,
     className = props.className,
     transformResponse = props.transformResponse,
+    onError = props.onError,
     defaultProps = _objectWithoutProperties(props, _excluded);
   var _useSetState = useSetState({
       loading: false
@@ -32,7 +33,8 @@ var ProDownload = function ProDownload(props) {
     loading = _useSetState2[0].loading,
     setState = _useSetState2[1];
   var _ref = useProConfig('ProDownload') || {},
-    headers = _ref.headers;
+    headers = _ref.headers,
+    onErrorConfig = _ref.onError;
   defaultProps.headers = _objectSpread(_objectSpread({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -94,7 +96,8 @@ var ProDownload = function ProDownload(props) {
               params: _params,
               transformResponse: transformResponse,
               fileName: fileName,
-              onFinish: onFinish
+              onFinish: onFinish,
+              onError: onError || onErrorConfig
             });
           case 17:
             _context.next = 23;

package/es/ProDownload/propsType.d.ts

@@ -8,9 +8,9 @@ export interface IProDownloadProps extends ButtonProps {
      */
     source?: string;
     /**
-   * @description       下载请求的地址
-   * @default           (必选)
-   */
+     * @description       下载请求的地址
+     * @default           (必选)
+     */
     url: string;
     /**
      * @description       下载请求的地址
@@ -39,21 +39,26 @@ export interface IProDownloadProps extends ButtonProps {
      */
     headers?: object;
     /**
-   * @description      禁用状态
-   * @default           false
-   */
+     * @description      禁用状态
+     * @default           false
+     */
     disabled?: boolean;
     /** 格式化数据 */
     transformResponse?: (data: any) => any;
     /**
-    * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
-    * @default           -
-    */
-    beforeDownload?: (() => boolean | Promise<any>);
+     * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
+     * @default           -
+     */
+    beforeDownload?: () => boolean | Promise<any>;
     /**
-   * @description       service 执行完成时触发
-   * @default           -
-   */
+     * @description       service 执行完成时触发
+     * @default           -
+     */
+    /**
+     * @description       下载出错的回调
+     * @default           -
+     */
+    onError?: (response: object) => void;
     onFinish?: () => void;
     /**
      * @description       下载按钮的填充内容

package/es/ProDownload/utils.d.ts

@@ -32,6 +32,11 @@ export interface IDownloadRequestPropsType {
    * @default           (必选)
    */
     fileName?: string;
+    /**
+     * @description       下载出错的回调
+     * @default           -
+     */
+    onError?: (response: object) => void;
 }
 /**
  * 下载Blob

package/es/ProDownload/utils.js

@@ -71,11 +71,11 @@ export function getFilenameFromContentDisposition(contentDisposition) {
 // 发起请求获取下载文件
 export var DownloadRequest = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, config, res, fileBlob, data, contentFileName;
+    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
     return _regeneratorRuntime().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, params = _ref2.params, headers = _ref2.headers, transformResponse = _ref2.transformResponse, fileName = _ref2.fileName, onFinish = _ref2.onFinish;
+          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, onError = _ref2.onError;
           config = {
             method: method,
             credentials: 'include',
@@ -116,37 +116,38 @@ export var DownloadRequest = /*#__PURE__*/function () {
                     return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
                   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;
+                      _context.next = 12;
                       break;
                     }
                     errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
                     errorMsg && _message.error(errorMsg);
+                    onError && onError(_data);
                     return _context.abrupt("return", Promise.reject(errorMsg));
-                  case 11:
+                  case 12:
                     if (!isFunction(transformResponse)) {
-                      _context.next = 13;
+                      _context.next = 14;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(transformResponse(_data)));
-                  case 13:
+                  case 14:
                     Promise.resolve(_data);
-                    _context.next = 20;
+                    _context.next = 21;
                     break;
-                  case 16:
-                    _context.prev = 16;
+                  case 17:
+                    _context.prev = 17;
                     _context.t0 = _context["catch"](0);
                     if (!response.ok) {
-                      _context.next = 20;
+                      _context.next = 21;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(response));
-                  case 20:
-                    return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
                   case 21:
+                    return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
+                  case 22:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 16]]);
+              }, _callee, null, [[0, 17]]);
             }));
             return function (_x2) {
               return _ref4.apply(this, arguments);

package/es/ProEditTable/components/DndWrapper/index.js

@@ -36,7 +36,7 @@ export var Row = function Row(props) {
     style: style
   }, attributes), {}, {
     children: React.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,

package/lib/ProDownload/index.js

@@ -18,7 +18,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = _interopRequireWildcard(require("lodash"));
 var _utils = require("./utils");
 var _ProConfigProvider = require("../ProConfigProvider");
-var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse"];
+var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
 var ProDownload = function ProDownload(props) {
   var source = props.source,
     action = props.action,
@@ -31,6 +31,7 @@ var ProDownload = function ProDownload(props) {
     beforeDownload = props.beforeDownload,
     className = props.className,
     transformResponse = props.transformResponse,
+    onError = props.onError,
     defaultProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useSetState = (0, _ahooks.useSetState)({
       loading: false
@@ -39,7 +40,8 @@ var ProDownload = function ProDownload(props) {
     loading = _useSetState2[0].loading,
     setState = _useSetState2[1];
   var _ref = (0, _ProConfigProvider.useProConfig)('ProDownload') || {},
-    headers = _ref.headers;
+    headers = _ref.headers,
+    onErrorConfig = _ref.onError;
   defaultProps.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
@@ -101,7 +103,8 @@ var ProDownload = function ProDownload(props) {
               params: _params,
               transformResponse: transformResponse,
               fileName: fileName,
-              onFinish: onFinish
+              onFinish: onFinish,
+              onError: onError || onErrorConfig
             });
           case 17:
             _context.next = 23;

package/lib/ProDownload/propsType.d.ts

@@ -8,9 +8,9 @@ export interface IProDownloadProps extends ButtonProps {
      */
     source?: string;
     /**
-   * @description       下载请求的地址
-   * @default           (必选)
-   */
+     * @description       下载请求的地址
+     * @default           (必选)
+     */
     url: string;
     /**
      * @description       下载请求的地址
@@ -39,21 +39,26 @@ export interface IProDownloadProps extends ButtonProps {
      */
     headers?: object;
     /**
-   * @description      禁用状态
-   * @default           false
-   */
+     * @description      禁用状态
+     * @default           false
+     */
     disabled?: boolean;
     /** 格式化数据 */
     transformResponse?: (data: any) => any;
     /**
-    * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
-    * @default           -
-    */
-    beforeDownload?: (() => boolean | Promise<any>);
+     * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
+     * @default           -
+     */
+    beforeDownload?: () => boolean | Promise<any>;
     /**
-   * @description       service 执行完成时触发
-   * @default           -
-   */
+     * @description       service 执行完成时触发
+     * @default           -
+     */
+    /**
+     * @description       下载出错的回调
+     * @default           -
+     */
+    onError?: (response: object) => void;
     onFinish?: () => void;
     /**
      * @description       下载按钮的填充内容

package/lib/ProDownload/utils.d.ts

@@ -32,6 +32,11 @@ export interface IDownloadRequestPropsType {
    * @default           (必选)
    */
     fileName?: string;
+    /**
+     * @description       下载出错的回调
+     * @default           -
+     */
+    onError?: (response: object) => void;
 }
 /**
  * 下载Blob

package/lib/ProDownload/utils.js

@@ -80,11 +80,11 @@ function getFilenameFromContentDisposition(contentDisposition) {
 // 发起请求获取下载文件
 var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
-    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, config, res, fileBlob, data, contentFileName;
+    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, 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, params = _ref2.params, headers = _ref2.headers, transformResponse = _ref2.transformResponse, fileName = _ref2.fileName, onFinish = _ref2.onFinish;
+          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, onError = _ref2.onError;
           config = {
             method: method,
             credentials: 'include',
@@ -125,37 +125,38 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
                     return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
                   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;
+                      _context.next = 12;
                       break;
                     }
                     errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
                     errorMsg && _antd.message.error(errorMsg);
+                    onError && onError(_data);
                     return _context.abrupt("return", Promise.reject(errorMsg));
-                  case 11:
+                  case 12:
                     if (!(0, _lodash.isFunction)(transformResponse)) {
-                      _context.next = 13;
+                      _context.next = 14;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(transformResponse(_data)));
-                  case 13:
+                  case 14:
                     Promise.resolve(_data);
-                    _context.next = 20;
+                    _context.next = 21;
                     break;
-                  case 16:
-                    _context.prev = 16;
+                  case 17:
+                    _context.prev = 17;
                     _context.t0 = _context["catch"](0);
                     if (!response.ok) {
-                      _context.next = 20;
+                      _context.next = 21;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(response));
-                  case 20:
-                    return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
                   case 21:
+                    return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
+                  case 22:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 16]]);
+              }, _callee, null, [[0, 17]]);
             }));
             return function (_x2) {
               return _ref4.apply(this, arguments);

package/lib/ProEditTable/components/DndWrapper/index.js

@@ -43,7 +43,7 @@ var Row = exports.Row = function Row(props) {
     style: style
   }, attributes), {}, {
     children: _react.default.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.1-beta.6",
+  "version": "3.5.1-beta.8",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",