@zat-design/sisyphus-react 4.0.0-beta.4 → 4.0.0-beta.5

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

@@ -1,12 +1,14 @@
+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 _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";
+/* eslint-disable react/no-array-index-key */
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
-/* eslint-disable react/no-array-index-key */
-import { Space, Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { isFunction, omit } from 'lodash';
 import React, { useMemo } from 'react';
@@ -15,11 +17,11 @@ 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]),
+    label: `${locale.ProForm.formListActions[5]}`,
     // 新增一行
     icon: /*#__PURE__*/_jsx(PlusOutlined, {})
   }
@@ -28,7 +30,7 @@ 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,
@@ -40,19 +42,17 @@ var ToolbarButton = function ToolbarButton(props) {
     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 && _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]);
@@ -65,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;
@@ -76,9 +76,9 @@ var ToolbarButton = function ToolbarButton(props) {
               break;
             }
             defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
-              operation: operation,
-              form: form,
-              namePath: namePath
+              operation,
+              form,
+              namePath
             });
             return _context.abrupt("return");
           case 7:
@@ -95,22 +95,22 @@ 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 || callback(value, {
-      operation: operation,
-      form: form,
-      namePath: namePath
+      operation,
+      form,
+      namePath
     });
   };
-  return /*#__PURE__*/_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) {
+    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: namePath,
-        form: form
+        namePath,
+        form
       })) {
         return /*#__PURE__*/_jsx(_Fragment, {});
       }
@@ -130,21 +130,17 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return /*#__PURE__*/_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 /*#__PURE__*/_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,7 +1,7 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { forwardRef, useCallback, useImperativeHandle } from 'react';
-import { Form } from 'antd';
 import { DndContext } from '@dnd-kit/core';
 import { get } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
@@ -15,7 +15,7 @@ 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 = function FormList(props, ref) {
+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,
@@ -47,57 +45,51 @@ var FormList = function FormList(props, ref) {
   var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
     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 && 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 /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: handleDragEnd,
     children: /*#__PURE__*/_jsxs(SortableContext, {
-      items: _fields.map(function (item) {
-        return {
-          id: item.key
-        };
-      }),
+      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' ? /*#__PURE__*/_jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
           columns: _columns,
@@ -107,7 +99,7 @@ var FormList = function FormList(props, ref) {
           index: index,
           field: field,
           colProps: {
-            span: span
+            span
           },
           form: form,
           diffConfig: _diffConfig
@@ -134,7 +126,7 @@ var FormList = function FormList(props, ref) {
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), /*#__PURE__*/_jsx(Form.ErrorList, {
+      }), /*#__PURE__*/_jsx(_Form.ErrorList, {
         errors: errors
       }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
         disabled: disabled,

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

@@ -7,24 +7,22 @@ import React from 'react';
  * @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) {
+export var memoWith = (pre, next) => {
+  return isEqualWith(pre, next, (objValue, othValue) => {
     if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }

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

@@ -2,7 +2,7 @@ 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 = function AddonWrapper(props) {
+var AddonWrapper = props => {
   var before = props.before,
     after = props.after,
     children = props.children;

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

@@ -1,6 +1,5 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
 import React from 'react';
 import { omit } from 'lodash';
@@ -19,13 +18,14 @@ var wrapperMap = {
 };
 
 // 增加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];
-      renderComponent = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+      renderComponent = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+        [item]: props[item],
         children: renderComponent
       }));
     }
@@ -34,7 +34,7 @@ var getComRender = function getComRender(component, props, componentProps) {
 };
 
 /** 渲染组件 */
-var ComRender = function ComRender(props) {
+var ComRender = props => {
   var _props$component;
   var type = props.type,
     confirm = props.confirm,
@@ -51,9 +51,9 @@ 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 || (_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';
@@ -66,9 +66,9 @@ var ComRender = function ComRender(props) {
   if (viewRender && isView) {
     return /*#__PURE__*/_jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {
-        valueType: valueType,
-        type: type,
-        isView: isView
+        valueType,
+        type,
+        isView
       }),
       children: viewRender(componentProps)
     });
@@ -77,9 +77,9 @@ var ComRender = function ComRender(props) {
   var renderComponent = getComRender(Component, props, componentProps);
   return /*#__PURE__*/_jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
-      valueType: valueType,
-      type: type,
-      isView: isView
+      valueType,
+      type,
+      isView
     }),
     children: renderComponent
   });

package/es/ProForm/components/combination/Group/hooks/index.d.ts

@@ -12,7 +12,6 @@ interface ColumnsTransformerParams {
     form: FormInstance;
     index?: number;
     formDisabled?: boolean;
-    desensitizationKey?: string;
     groupProps: GroupType;
 }
 /** 转换columns */

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -1,5 +1,4 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /* eslint-disable no-lonely-if */
 import { useRef } from 'react';
 import { cloneDeep, isEqual } from 'lodash';
@@ -7,7 +6,7 @@ import { useDeepCompareMemo } from "../../../../utils/useDeepCompareMemo";
 import { difference } from "../../../../../ProEditTable/utils/tools";
 import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from "../utils";
 /** 转换columns */
-export var useTransformColumns = function useTransformColumns(params) {
+export var useTransformColumns = params => {
   var form = params.form,
     columns = params.columns,
     name = params.name,
@@ -16,11 +15,9 @@ export var useTransformColumns = function useTransformColumns(params) {
     namePath = params.namePath,
     value = params.value,
     internalChange = params.onChange,
-    groupProps = params.groupProps,
-    formDisabled = params.formDisabled,
-    desensitizationKey = params.desensitizationKey;
+    groupProps = params.groupProps;
   var timerRef = useRef([]);
-  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap((column, index) => {
     var type = column.type,
       valueType = column.valueType,
       switchValue = column.switchValue,
@@ -41,18 +38,18 @@ export var useTransformColumns = function useTransformColumns(params) {
     var columnName = names ? names[index] : [].concat(name, index);
 
     // 响应式字段改变后的回调
-    var changedCallback = function changedCallback(lastDependency, current) {
+    var changedCallback = (lastDependency, current) => {
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && names) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
-          timerRef.current[index] = setTimeout(function () {
+          timerRef.current[index] = setTimeout(() => {
             if (names) {
               form.resetFields([columnName]);
             }
             if (!names && value !== null && value !== void 0 && value.length) {
               value[index] = null;
-              form.setFieldValue(columnName, _toConsumableArray(value));
+              form.setFieldValue(columnName, [...value]);
             }
           }, 200);
         } else {
@@ -63,18 +60,18 @@ export var useTransformColumns = function useTransformColumns(params) {
 
     // 响应式字段
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    var reactiveProps = useDeepCompareMemo(function () {
+    var reactiveProps = useDeepCompareMemo(() => {
       return getReactiveProps({
-        form: form,
-        index: index,
-        type: type,
-        namePath: namePath,
+        form,
+        index,
+        type,
+        namePath,
         disabled: _disabled,
-        show: show,
-        component: component,
-        fieldProps: fieldProps,
+        show,
+        component,
+        fieldProps,
         name: columnName,
-        desensitization: desensitization
+        desensitization
       });
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
 
@@ -86,12 +83,12 @@ export var useTransformColumns = function useTransformColumns(params) {
       return [];
     }
     var transform = getValueTypeTrans({
-      type: type,
-      valueType: valueType,
-      switchValue: switchValue,
-      toISOString: toISOString,
-      toCSTString: toCSTString,
-      mode: mode
+      type,
+      valueType,
+      switchValue,
+      toISOString,
+      toCSTString,
+      mode
     });
     var newValue;
     var handleChange = function handleChange() {
@@ -119,11 +116,11 @@ export var useTransformColumns = function useTransformColumns(params) {
       }
       var values = form.getFieldValue(namePath);
       var originRow = namePath !== null && namePath !== void 0 && namePath.length ? cloneDeep(values) : undefined;
-      onChange === null || onChange === void 0 || onChange.apply(void 0, args);
+      onChange === null || onChange === void 0 || onChange(...args);
       onFieldChange === null || onFieldChange === void 0 || onFieldChange(newValue, values, {
         index: outerIndex,
-        namePath: namePath,
-        form: form,
+        namePath,
+        form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
 
@@ -132,12 +129,10 @@ export var useTransformColumns = function useTransformColumns(params) {
         var _Object$keys, _Object$keys$map;
         form.setFieldValue(namePath, values);
         var diff = difference(originRow, values) || {};
-        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-          return [].concat(_toConsumableArray(namePath), [key]);
-        });
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, key => [...namePath, key]);
         if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
-          setTimeout(function () {
-            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+          setTimeout(() => {
+            form.validateFields([name, ...validateFieldKeys]);
           }, 100);
         }
       }
@@ -150,14 +145,14 @@ export var useTransformColumns = function useTransformColumns(params) {
       }
       onBlur === null || onBlur === void 0 || onBlur(args[0], values, {
         index: outerIndex,
-        namePath: namePath,
-        form: form,
+        namePath,
+        form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
 
     // 内外一个为true则为true
-    var getLastDisabled = function getLastDisabled() {
+    var getLastDisabled = () => {
       if (Array.isArray(groupProps.disabled)) {
         return reactiveProps.disabled || groupProps.disabled[index];
       }