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

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -1,37 +1,36 @@
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _omit from "lodash/omit";
-import _isFunction from "lodash/isFunction";
+/* eslint-disable react/no-array-index-key */
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-/* eslint-disable react/no-array-index-key */
-
 import { PlusOutlined } from '@ant-design/icons';
-import { useMemo } from 'react';
-import locale from '../../../../../locale';
+import { isFunction, omit } from 'lodash';
+import React, { useMemo } from 'react';
+import locale from "../../../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var actions = {
   add: {
-    onClick: function onClick(value, _ref) {
+    onClick: (value, _ref) => {
       var operation = _ref.operation;
       operation.add({});
     },
-    label: "".concat(locale.ProForm.formListActions[5]),
-    icon: _jsx(PlusOutlined, {})
+    label: `${locale.ProForm.formListActions[5]}`,
+    // 新增一行
+    icon: /*#__PURE__*/_jsx(PlusOutlined, {})
   }
 };
 var defaultActionProps = [{
   type: 'add'
 }];
 var filterKeys = ['actionType'];
-var ToolbarButton = function ToolbarButton(props) {
+var ToolbarButton = props => {
   var namePath = props.namePath,
     form = props.form,
     operation = props.operation,
@@ -41,25 +40,24 @@ var ToolbarButton = function ToolbarButton(props) {
     max = props.max,
     disabled = props.disabled,
     isView = props.isView;
+
   // 默认显示一个delete
-  var toolbarProps = useMemo(function () {
+  var toolbarProps = useMemo(() => {
     var _props$toolbarProps;
     // 兼容 actionType 和 type
-    var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
+    var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(item => {
       return _objectSpread(_objectSpread({}, item), {}, {
         // @ts-ignore
         type: item.actionType || item.type
       });
     });
-    if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {
-      return item.type === 'add';
-    }))) {
-      return _toolbarProps ? [].concat(_toConsumableArray(_toolbarProps), defaultActionProps) : defaultActionProps;
+    if (!(_toolbarProps !== null && _toolbarProps !== void 0 && _toolbarProps.find(item => item.type === 'add'))) {
+      return _toolbarProps ? [..._toolbarProps, ...defaultActionProps] : defaultActionProps;
     }
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -67,9 +65,9 @@ var ToolbarButton = function ToolbarButton(props) {
             value = form.getFieldValue(namePath);
             _context.next = 3;
             return callback === null || callback === void 0 ? void 0 : callback(value, {
-              operation: operation,
-              form: form,
-              namePath: namePath
+              operation,
+              form,
+              namePath
             });
           case 3:
             data = _context.sent;
@@ -77,10 +75,10 @@ var ToolbarButton = function ToolbarButton(props) {
               _context.next = 7;
               break;
             }
-            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
-              operation: operation,
-              form: form,
-              namePath: namePath
+            defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
+              operation,
+              form,
+              namePath
             });
             return _context.abrupt("return");
           case 7:
@@ -97,24 +95,24 @@ var ToolbarButton = function ToolbarButton(props) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var customClick = function customClick(callback, item) {
+  var customClick = (callback, item) => {
     var value = form.getFieldValue(namePath);
-    callback === null || callback === void 0 ? void 0 : callback(value, {
-      operation: operation,
-      form: form,
-      namePath: namePath
+    callback === null || callback === void 0 || callback(value, {
+      operation,
+      form,
+      namePath
     });
   };
-  return _jsx(_Space, {
+  return /*#__PURE__*/_jsx(_Space, {
     align: "start",
     className: "pro-form-list-toolbar",
-    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item, index) {
-      if (item.show === false) return _jsx(_Fragment, {});
-      if (_isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
-        namePath: namePath,
-        form: form
+    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map((item, index) => {
+      if (item.show === false) return /*#__PURE__*/_jsx(_Fragment, {});
+      if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
+        namePath,
+        form
       })) {
-        return _jsx(_Fragment, {});
+        return /*#__PURE__*/_jsx(_Fragment, {});
       }
       var label = item.label,
         _onClick2 = item.onClick,
@@ -123,7 +121,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (type === 'add') {
-        if (disabled || isView) return _jsx(_Fragment, {});
+        if (disabled || isView) return /*#__PURE__*/_jsx(_Fragment, {});
         var _actions$type = actions[type],
           internalOnClick = _actions$type.onClick,
           defaultLabel = _actions$type.label,
@@ -132,21 +130,17 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), _omit(rest, filterKeys)), {}, {
+        return /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), omit(rest, filterKeys)), {}, {
           type: "link",
-          onClick: function onClick() {
-            return handleClick(internalOnClick, _onClick, item);
-          },
+          onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
-        }), "".concat(type).concat(index));
+        }), `${type}${index}`);
       }
-      return _jsx(_Button, _objectSpread(_objectSpread({}, _omit(rest, filterKeys)), {}, {
+      return /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         type: "link",
-        onClick: function onClick() {
-          return customClick(_onClick2, item);
-        },
+        onClick: () => customClick(_onClick2, item),
         children: label
-      }), "".concat(type).concat(index));
+      }), `${type}${index}`);
     })
   });
 };

package/es/ProForm/components/combination/FormList/index.js

@@ -1,21 +1,21 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _get from "lodash/get";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useCallback, useImperativeHandle } from 'react';
+import React, { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { get } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { toArray } from '../../../utils';
-import { namesPathTransform } from './utils';
-import ToolbarButton from './components/ToolbarButton';
-import BlockFields from './components/BlockFields';
-import LineFields from './components/LineFields';
-import Empty from './components/Empty';
-import ProForm from '../../../../ProForm';
-import { useProConfig } from '../../../../ProConfigProvider';
-var FormList = function FormList(props, ref) {
+import { toArray } from "../../../utils";
+import { namesPathTransform } from "./utils";
+import ToolbarButton from "./components/ToolbarButton";
+import BlockFields from "./components/BlockFields";
+import LineFields from "./components/LineFields";
+import Empty from "./components/Empty";
+import ProForm from "../../../../ProForm";
+import { useProConfig } from "../../../../ProConfigProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var FormList = (props, ref) => {
   var columns = props.columns,
     min = props.min,
     max = props.max,
@@ -29,11 +29,9 @@ var FormList = function FormList(props, ref) {
     span = _props$span === void 0 ? 8 : _props$span,
     disabled = props.disabled,
     emptyBtnText = props.emptyBtnText;
-  var _fields = fields.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      key: String(item.key)
-    });
-  });
+  var _fields = fields.map(item => _objectSpread(_objectSpread({}, item), {}, {
+    key: String(item.key)
+  }));
   var _ref = ProForm.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
@@ -43,63 +41,57 @@ var FormList = function FormList(props, ref) {
     isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = toArray(name);
-  var orgValues = _get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
-    originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
+    originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues
   });
-  var processColumns = useCallback(function (fieldName, namePath) {
-    return columns.map(function (item) {
+  var processColumns = useCallback((fieldName, namePath) => {
+    return columns.map(item => {
       // names的name处理
       var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, namesPathTransform({
         names: item === null || item === void 0 ? void 0 : item.names,
         prefixNamePath: namePath,
         type: item.type
-      })] : [fieldName].concat(_toConsumableArray(toArray(item.name)));
+      })] : [fieldName, ...toArray(item.name)];
       var column = _objectSpread(_objectSpread({}, item), {}, {
         name: _name,
-        names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
+        names: item !== null && item !== void 0 && item.names ? item.names.map(nameItem => {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
-          return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
+          return [...namePath, ...toArray(nameItem)];
         }) : item.names,
         index: fieldName,
-        namePath: namePath,
-        listName: [].concat(_toConsumableArray(namePath), [item.name]),
+        namePath,
+        listName: [...namePath, item.name],
         label: mode === 'less' ? undefined : item.label
       });
       return column;
     });
   }, [columns]);
-  useImperativeHandle(ref, function () {
+  useImperativeHandle(ref, () => {
     return {
-      operation: operation
+      operation
     };
   });
-  var handleDragEnd = function handleDragEnd(drag) {
+  var handleDragEnd = drag => {
     var active = drag.active,
       over = drag.over;
     if (_fields.length > 1 && active.id !== over.id) {
-      var activeIndex = _fields.findIndex(function (item) {
-        return item.key === active.id;
-      });
-      var overIndex = _fields.findIndex(function (item) {
-        return item.key === over.id;
-      });
+      var activeIndex = _fields.findIndex(item => item.key === active.id);
+      var overIndex = _fields.findIndex(item => item.key === over.id);
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return _jsx(DndContext, {
+  return /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: handleDragEnd,
-    children: _jsxs(SortableContext, {
-      items: _fields.map(function (item) {
-        return {
-          id: item.key
-        };
-      }),
+    children: /*#__PURE__*/_jsxs(SortableContext, {
+      items: _fields.map(item => ({
+        id: item.key
+      })),
       strategy: verticalListSortingStrategy,
-      children: [_fields.map(function (field, index) {
-        var namePath = [].concat(_toConsumableArray(_namePath), [field.name]);
+      children: [_fields.map((field, index) => {
+        var namePath = [..._namePath, field.name];
         var _columns = processColumns(index, namePath);
-        return mode === 'block' ? _jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
+        return mode === 'block' ? /*#__PURE__*/_jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
           columns: _columns,
           disabled: disabled,
           isView: isView,
@@ -107,11 +99,11 @@ var FormList = function FormList(props, ref) {
           index: index,
           field: field,
           colProps: {
-            span: span
+            span
           },
           form: form,
           diffConfig: _diffConfig
-        }), field.key) : _jsx(LineFields, _objectSpread(_objectSpread({
+        }), field.key) : /*#__PURE__*/_jsx(LineFields, _objectSpread(_objectSpread({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
           mode: mode,
@@ -127,16 +119,16 @@ var FormList = function FormList(props, ref) {
           form: form,
           diffConfig: _diffConfig
         }), field.key);
-      }), _fields.length === 0 && _jsx(Empty, {
+      }), _fields.length === 0 && /*#__PURE__*/_jsx(Empty, {
         disabled: disabled,
         toolbarProps: toolbarProps,
         operation: operation,
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), _jsx(_Form.ErrorList, {
+      }), /*#__PURE__*/_jsx(_Form.ErrorList, {
         errors: errors
-      }), toolbarProps !== false && _fields.length > 0 && _jsx(ToolbarButton, {
+      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
         disabled: disabled,
         isView: isView,
         min: min,

package/es/ProForm/components/combination/FormList/utils.js

@@ -1,29 +1,29 @@
-import _isEqualWith from "lodash/isEqualWith";
+import { isEqualWith } from 'lodash';
 import React from 'react';
+
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合
  * @param prefixNamePath formList的name前缀
  * @returns list_0_min-list_0_max
  */
-export var namesPathTransform = function namesPathTransform(_ref) {
+export var namesPathTransform = _ref => {
   var names = _ref.names,
     prefixNamePath = _ref.prefixNamePath,
     type = _ref.type;
   if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
     return '';
   }
-  var newNamePath = names.map(function (val) {
-    return prefixNamePath.concat(val);
-  });
-  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
+  var newNamePath = names.map(val => prefixNamePath.concat(val));
+  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(name => {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
 };
+
 // 比较memo
-export var memoWith = function memoWith(pre, next) {
-  return _isEqualWith(pre, next, function (objValue, othValue) {
-    if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+export var memoWith = (pre, next) => {
+  return isEqualWith(pre, next, (objValue, othValue) => {
+    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -1,15 +1,17 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import './index.less';
-var AddonWrapper = function AddonWrapper(props) {
+import React from 'react';
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var AddonWrapper = props => {
   var before = props.before,
     after = props.after,
     children = props.children;
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: "addon-wrapper",
-    children: [before && _jsx("div", {
+    children: [before && /*#__PURE__*/_jsx("div", {
       className: "before",
       children: before
-    }), children, after && _jsx("div", {
+    }), children, after && /*#__PURE__*/_jsx("div", {
       className: "after",
       children: after
     })]

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,38 +1,42 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _omit from "lodash/omit";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
-import { FieldProvider } from '../../../../utils/useFieldProps';
-import * as componentMap from '../../../../../index';
-import AddonWrapper from './AddonWrapper';
+import { omit } from 'lodash';
+import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
+import { FieldProvider } from "../../../../utils/useFieldProps";
+import * as componentMap from "../../../../../index";
+import AddonWrapper from "./AddonWrapper";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: ConfirmWrapper,
   before: AddonWrapper,
   after: AddonWrapper
 };
+
 // 增加middleware根据配置增加多层包裹
-var getComRender = function getComRender(component, props, componentProps) {
+var getComRender = (component, props, componentProps) => {
   var wrappers = Object.keys(wrapperMap);
   var renderComponent = component;
-  wrappers.forEach(function (item) {
+  wrappers.forEach(item => {
     if (item in props) {
       var Wrapper = wrapperMap[item];
       // console.log(props[item]);
-      renderComponent = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+      renderComponent = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+        [item]: props[item],
         children: renderComponent
       }));
     }
   });
   return renderComponent;
 };
+
 /** 渲染组件 */
-var ComRender = function ComRender(props) {
-  var _props$component, _props$component$prop;
+var ComRender = props => {
+  var _props$component;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -48,35 +52,35 @@ var ComRender = function ComRender(props) {
     viewRender = props.viewRender,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
-  var mergedGetValueProps = getValueProps || function (val) {
-    return _defineProperty({}, valuePropName, val);
-  };
+  var mergedGetValueProps = getValueProps || (val => ({
+    [valuePropName]: val
+  }));
   var nextProps = mergedGetValueProps(fieldProps.value);
-  var componentProps = _omit(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
-  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+  var componentProps = omit(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
+  var isSeparator = (props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 || (_props$component = _props$component.props) === null || _props$component === void 0 ? void 0 : _props$component.className) === 'group-separator';
   if (isSeparator && isView) {
-    var _props$component2, _props$component2$pro;
-    return _jsxs(_Fragment, {
-      children: [" ", props === null || props === void 0 ? void 0 : (_props$component2 = props.component) === null || _props$component2 === void 0 ? void 0 : (_props$component2$pro = _props$component2.props) === null || _props$component2$pro === void 0 ? void 0 : _props$component2$pro.children, " "]
+    var _props$component2;
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [" ", props === null || props === void 0 || (_props$component2 = props.component) === null || _props$component2 === void 0 || (_props$component2 = _props$component2.props) === null || _props$component2 === void 0 ? void 0 : _props$component2.children, " "]
     });
   }
   if (viewRender && isView) {
-    return _jsx(FieldProvider, {
+    return /*#__PURE__*/_jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {
-        valueType: valueType,
-        type: type,
-        isView: isView
+        valueType,
+        type,
+        isView
       }),
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : /*#__PURE__*/_jsx(TypeComponent, _objectSpread({}, componentProps));
   var renderComponent = getComRender(Component, props, componentProps);
-  return _jsx(FieldProvider, {
+  return /*#__PURE__*/_jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
-      valueType: valueType,
-      type: type,
-      isView: isView
+      valueType,
+      type,
+      isView
     }),
     children: renderComponent
   });