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

package/es/ProAction/index.d.ts

@@ -0,0 +1,7 @@
+import React, { PropsWithChildren } from 'react';
+import { ActionProps } from './propsType';
+import './index.less';
+declare const ProAction: React.FC<PropsWithChildren<{
+    config?: ActionProps[];
+}>>;
+export default ProAction;

package/es/ProAction/index.js

@@ -0,0 +1,220 @@
+import "antd/es/popconfirm/style";
+import _Popconfirm from "antd/es/popconfirm";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { useSetState } from 'ahooks';
+import { isFunction } from 'lodash';
+import { ProDrawerForm } from '../index';
+import './index.less';
+var ProAction = function ProAction(props) {
+  var _config$, _config$2, _config$index;
+  var children = props.children,
+    config = props.config;
+  var _Form$useForm = _Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useSetState = useSetState({
+      index: 0,
+      open: false,
+      servicesArray: [],
+      loading: false
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    state = _useSetState2[0],
+    setState = _useSetState2[1];
+  if (!config || !Array.isArray(config)) {
+    console.error('ProAction 配置 config 必须为数据');
+    return _jsx(_Fragment, {
+      children: children
+    });
+  }
+  var index = state.index,
+    servicesArray = state.servicesArray;
+  var length = config.length;
+  var onActionRun = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
+      var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
+      var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (currentIndex === 0) {
+              setState({
+                loading: true
+              });
+            }
+            actionProps = config[currentIndex];
+            newServicesArray = _toConsumableArray(array);
+            _context.next = 5;
+            return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$useReque = actionProps.useRequest) === null || _actionProps$useReque === void 0 ? void 0 : _actionProps$useReque.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray);
+          case 5:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 8;
+              break;
+            }
+            _context.t0 = {};
+          case 8:
+            _ref2 = _context.t0;
+            service = _ref2.service;
+            options = _ref2.options;
+            transformResponse = _ref2.transformResponse;
+            _context.next = 14;
+            return service === null || service === void 0 ? void 0 : service(options);
+          case 14:
+            _context.t1 = _context.sent;
+            if (_context.t1) {
+              _context.next = 17;
+              break;
+            }
+            _context.t1 = {};
+          case 17:
+            res = _context.t1;
+            if (!(transformResponse && isFunction(transformResponse))) {
+              _context.next = 25;
+              break;
+            }
+            _context.next = 21;
+            return transformResponse(res);
+          case 21:
+            data = _context.sent;
+            newServicesArray[currentIndex] = data;
+            _context.next = 26;
+            break;
+          case 25:
+            if (res.status === 200) {
+              newServicesArray[currentIndex] = res.data;
+            }
+          case 26:
+            options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, newServicesArray[currentIndex], options.defaultParams);
+            if (!service) {
+              newServicesArray[currentIndex] = null;
+            }
+            open = (actionProps === null || actionProps === void 0 ? void 0 : actionProps.mode) === 'check' && ((_newServicesArray$cur = newServicesArray[currentIndex]) === null || _newServicesArray$cur === void 0 ? void 0 : _newServicesArray$cur.errorTitle) && ((_newServicesArray$cur2 = newServicesArray[currentIndex]) === null || _newServicesArray$cur2 === void 0 ? void 0 : (_newServicesArray$cur3 = _newServicesArray$cur2.list) === null || _newServicesArray$cur3 === void 0 ? void 0 : _newServicesArray$cur3.length);
+            setState({
+              servicesArray: newServicesArray,
+              index: currentIndex,
+              open: open
+            });
+            if (!open) {
+              _context.next = 36;
+              break;
+            }
+            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : (_newServicesArray$cur5 = _newServicesArray$cur4.list) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.join('\n')) || [];
+            errorTitle = (_newServicesArray$cur6 = newServicesArray[currentIndex]) === null || _newServicesArray$cur6 === void 0 ? void 0 : _newServicesArray$cur6.errorTitle;
+            form.setFieldsValue({
+              errorTitle: errorTitle,
+              list: list
+            });
+            setState({
+              loading: false
+            });
+            return _context.abrupt("return");
+          case 36:
+            _context.next = 38;
+            return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$onAction = actionProps.onAction) === null || _actionProps$onAction === void 0 ? void 0 : _actionProps$onAction.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray, currentIndex);
+          case 38:
+            _context.next = 40;
+            return actionProps === null || actionProps === void 0 ? void 0 : (_actionProps$continue = actionProps.continue) === null || _actionProps$continue === void 0 ? void 0 : _actionProps$continue.call(actionProps, newServicesArray[currentIndex - 1], newServicesArray);
+          case 40:
+            isContinue = _context.sent;
+            if (!(isContinue === false)) {
+              _context.next = 44;
+              break;
+            }
+            setState({
+              loading: false
+            });
+            return _context.abrupt("return", false);
+          case 44:
+            if (currentIndex + 1 < length) {
+              onActionRun(currentIndex + 1, newServicesArray);
+            } else {
+              setState({
+                loading: false
+              });
+            }
+          case 45:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onActionRun(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var ChildContent = /*#__PURE__*/React.cloneElement(children, {
+    onClick: function onClick() {
+      onActionRun(0, []);
+    },
+    loading: state.loading
+  });
+  var onOk = function onOk() {
+    setState({
+      open: false
+    });
+  };
+  return _jsxs(_Fragment, {
+    children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? _jsx(_Popconfirm, {
+      onConfirm: function onConfirm() {
+        return onActionRun(0, []);
+      },
+      title: ((_config$2 = config[0]) === null || _config$2 === void 0 ? void 0 : _config$2.title) || '确认删除吗?',
+      children: children
+    }) : ChildContent, state.open ? _jsx(ProDrawerForm, {
+      open: state.open,
+      mode: "Modal",
+      title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
+      onCancel: function onCancel() {
+        setState({
+          open: false
+        });
+      },
+      modalProps: {
+        width: 520
+      },
+      size: "small",
+      onOk: onOk,
+      form: form,
+      proFormProps: {
+        span: 24,
+        isView: true,
+        columns: [{
+          type: 'Input',
+          name: 'errorTitle',
+          viewRender: function viewRender(value) {
+            var _servicesArray$index;
+            var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
+            return _jsxs("div", {
+              className: "pro-action-view-tile",
+              children: [value, list.length === 1 ? _jsxs("span", {
+                children: [" ", list[0]]
+              }) : '']
+            });
+          }
+        }, {
+          type: 'TextArea',
+          name: 'list',
+          fieldProps: {
+            autoSize: {
+              minRows: 4,
+              maxRows: 7
+            }
+          },
+          show: function show() {
+            var _servicesArray$index2, _servicesArray$index3;
+            return ((_servicesArray$index2 = servicesArray[index]) === null || _servicesArray$index2 === void 0 ? void 0 : (_servicesArray$index3 = _servicesArray$index2.list) === null || _servicesArray$index3 === void 0 ? void 0 : _servicesArray$index3.length) > 1;
+          }
+        }]
+      }
+    }) : null]
+  });
+};
+export default ProAction;

package/es/ProAction/index.less

@@ -0,0 +1,7 @@
+.pro-action-view-tile {
+  margin-bottom: 12px;
+  color: #666;
+  span {
+    color: #000;
+  }
+}

package/es/ProAction/propsType.d.ts

@@ -0,0 +1,38 @@
+import { ReactNode } from 'react';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+export interface ActionProps {
+    /**
+     * check 执行校验并解析错误信息展示
+     * confirm 确认提示
+     */
+    mode?: 'check' | 'confirm';
+    /**
+     * 标题
+     */
+    title?: string | ReactNode;
+    /**
+     *
+     * @param previouData 接上一个 useRequest 返回的值
+     * @param args 接所有链式 useRequest 返回的值
+     * @returns
+     */
+    onAction?: (previouData?: any, args?: any[], index?: number) => void | Promise<void>;
+    /**
+     * 自定义请求
+     * @param previouData 接上一个 useRequest 返回的值
+     * @param args 接所有链式 useRequest 返回的值
+     * @returns
+     */
+    useRequest?: (previouData: any, args: any) => {
+        service?: Service<any, any>;
+        options?: Options<any, any>;
+        transformResponse?: (data: any) => any;
+    };
+    /**
+     * 是否中断链式操作
+     * @param previouData 上一个操作的返回数据
+     * @param args 所有链式的数据合集
+     * @returns
+     */
+    continue?: (previouData: any, args: any[]) => boolean;
+}

package/es/ProConfigProvider/index.d.ts

@@ -2,11 +2,12 @@ import React, { FC } from 'react';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
+import { ProEnumConfig } from '../ProEnum/propsType';
 export interface ProConfigState {
-    ProEnum?: PropSelectProps & Record<string, any>;
-    ProSelect?: PropSelectProps & Record<string, any>;
-    ProModalSelect?: ProModalSelectPropsType & Record<string, any>;
-    ProAddressBar?: AddressProps & Record<string, any>;
+    ProEnum?: Partial<ProEnumConfig>;
+    ProSelect?: Partial<PropSelectProps> & Record<string, any>;
+    ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
+    ProAddressBar?: Partial<AddressProps> & Record<string, any>;
     [key: string]: any;
 }
 interface ConfigContext {

package/es/ProConfigProvider/index.js

@@ -1,8 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import React, { useContext, useReducer } from 'react';
 import merge from 'lodash/merge';
-import useEnum from '../ProEnum/useEnumRequest';
+import useEnumRequest from '../ProEnum/hooks/useEnumRequest';
 export var ProConfigContext = /*#__PURE__*/React.createContext({
   state: {
     ProEnum: {
@@ -41,12 +42,15 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-  useEnum(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
-  return /*#__PURE__*/React.createElement(ProConfigContext.Provider, {
+  useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  return _jsx(ProConfigContext.Provider, {
     value: {
       state: merge(state, props.value),
       dispatch: dispatch
-    }
-  }, /*#__PURE__*/React.createElement("div", null, " ", props.children));
+    },
+    children: _jsxs("div", {
+      children: [" ", props.children]
+    })
+  });
 };
 export default ProConfigProvider;

package/es/ProDownload/index.d.ts

@@ -1,4 +1,6 @@
-import React from 'react';
 import { IProDownloadProps } from './propsType';
-declare const ProDownload: React.FC<IProDownloadProps>;
+declare const ProDownload: {
+    (props: IProDownloadProps): JSX.Element;
+    downLoadRequest: import("./utils").DownloadRequestProps;
+};
 export default ProDownload;

package/es/ProDownload/index.js

@@ -5,14 +5,16 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["source", "action", "method", "params", "fileName", "headers", "children", "onFinish", "beforeDownload"];
+var _excluded = ["source", "action", "url", "method", "params", "fileName", "headers", "children", "onFinish", "beforeDownload", "className", "transformResponse"];
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
-import _ from 'lodash';
-import React from 'react';
-import { BlobMakeFile, convertBase64ToBlob, DownloadRequest } from './DownloadHelper';
+import classNames from 'classnames';
+import _, { isFunction } from 'lodash';
+import { BlobMakeFile, DownloadRequest } from './utils';
 var ProDownload = function ProDownload(props) {
   var source = props.source,
     action = props.action,
+    url = props.url,
     method = props.method,
     params = props.params,
     fileName = props.fileName,
@@ -20,6 +22,8 @@ var ProDownload = function ProDownload(props) {
     children = props.children,
     onFinish = props.onFinish,
     beforeDownload = props.beforeDownload,
+    className = props.className,
+    transformResponse = props.transformResponse,
     defaultProps = _objectWithoutProperties(props, _excluded);
   var _useSetState = useSetState({
       loading: false
@@ -29,7 +33,7 @@ var ProDownload = function ProDownload(props) {
     setState = _useSetState2[1];
   var handDownload = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, fileBlob, data;
+      var _params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -37,77 +41,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]);
-              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]);
+                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 DownloadRequest({
-              url: action,
-              method: method,
-              headers: headers,
-              payload: params
-            });
-          case 7:
-            res = _context.sent;
-            data = _.get(res, 'data');
-            if (!data) {
-              _context.next = 13;
+            _params = params;
+            if (!isFunction(params)) {
+              _context.next = 14;
               break;
             }
-            fileBlob = 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 BlobMakeFile({
-              blob: fileBlob,
-              fileName: fileName
+            _params = _context.t0;
+          case 14:
+            _context.prev = 14;
+            _context.next = 17;
+            return 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.createElement(_Button, _objectSpread(_objectSpread({
+  var cls = classNames(className, {
+    'pro-download': true
+  });
+  return _jsx(_Button, _objectSpread(_objectSpread({
+    className: cls,
     onClick: function () {
       var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var res;
@@ -152,13 +168,8 @@ var ProDownload = function ProDownload(props) {
               }
               return _context3.abrupt("return");
             case 13:
-              _context3.next = 15;
-              return handDownload();
-            case 15:
-              if (_.isFunction(onFinish)) {
-                onFinish();
-              }
-            case 16:
+              handDownload();
+            case 14:
             case "end":
               return _context3.stop();
           }
@@ -170,7 +181,9 @@ var ProDownload = function ProDownload(props) {
       return onClick;
     }()
   }, defaultProps), {}, {
-    loading: loading
-  }), children);
+    loading: loading,
+    children: children
+  }));
 };
+ProDownload.downLoadRequest = DownloadRequest;
 export default ProDownload;

package/es/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/es/ProDownload/style/index.less

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

package/es/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 {};