@zat-design/sisyphus-react 3.13.18 → 3.13.19-beta.10

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
   });

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

@@ -1,14 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isEqual from "lodash/isEqual";
-import _cloneDeep from "lodash/cloneDeep";
 /* eslint-disable no-lonely-if */
 import { useRef } from 'react';
-import { useDeepCompareMemo } from '../../../../utils/useDeepCompareMemo';
-import { difference } from '../../../../../ProEditTable/utils/tools';
-import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from '../utils';
+import { cloneDeep, isEqual } from 'lodash';
+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,
@@ -21,7 +19,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     formDisabled = params.formDisabled,
     desensitizationKey = params.desensitizationKey;
   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,
@@ -40,19 +38,20 @@ export var useTransformColumns = function useTransformColumns(params) {
       comDisabled = _ref.disabled;
     var _disabled = disabled || comDisabled;
     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 ? void 0 : value.length)) {
+            if (!names && value !== null && value !== void 0 && value.length) {
               value[index] = null;
-              form.setFieldValue(columnName, _toConsumableArray(value));
+              form.setFieldValue(columnName, [...value]);
             }
           }, 200);
         } else {
@@ -60,22 +59,24 @@ 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]);
+
     // 从处理后的fieldProps中获取事件处理器
     var _ref2 = reactiveProps.fieldProps || {},
       onFieldChange = _ref2.onFieldChange,
@@ -84,12 +85,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() {
@@ -97,43 +98,43 @@ export var useTransformColumns = function useTransformColumns(params) {
         args[_key] = arguments[_key];
       }
       newValue = valueFromEventWrapper(column, args);
-      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
+      if (transform !== null && transform !== void 0 && transform.normalize) {
         var _transform$normalize;
-        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+        newValue = transform === null || transform === void 0 || (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
       } else if (normalize) {
         // @ts-ignore
         newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
+
       // 根据模式选择值管理方式
       if (names) {
         // 独立字段模式：设置单个字段值 + 触发整体校验
         form.setFieldValue(columnName, newValue);
         // 确保触发Group整体的校验
-        internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
       } else {
         // 数组值模式
-        internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
       }
       var values = form.getFieldValue(namePath);
-      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? _cloneDeep(values) : undefined;
-      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
+      var originRow = namePath !== null && namePath !== void 0 && namePath.length ? cloneDeep(values) : undefined;
+      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]
       });
+
       // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
-      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !_isEqual(originRow, values)) {
+      if (namePath !== null && namePath !== void 0 && namePath.length && !isEqual(originRow, values)) {
         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 ? 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]);
-        });
-        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-          setTimeout(function () {
-            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+        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(() => {
+            form.validateFields([name, ...validateFieldKeys]);
           }, 100);
         }
       }
@@ -144,15 +145,16 @@ export var useTransformColumns = function useTransformColumns(params) {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+      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];
       }

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

@@ -1,23 +1,22 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _omit from "lodash/omit";
-import { jsx as _jsx } from "react/jsx-runtime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React from 'react';
+import { omit } from 'lodash';
 import classnames from 'classnames';
-import { insertSeparator } from './utils';
-import { useTransformColumns } from './hooks';
-import ProForm from '../../../../ProForm';
-import ComRender from './component/ComRender';
+import { insertSeparator } from "./utils";
+import { useTransformColumns } from "./hooks";
+import ProForm from "../../../../ProForm";
+import ComRender from "./component/ComRender";
+
 /**
  * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
  * 2.
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
-var Group = function Group(props) {
+import { jsx as _jsx } from "react/jsx-runtime";
+var Group = props => {
   var children = props.children,
     className = props.className,
     _props$space = props.space,
@@ -40,63 +39,65 @@ var Group = function Group(props) {
     index = contextProps.index,
     isView = contextProps.isView;
   var nextOption = React.useRef([]);
+
   // 组合onChange
-  var handleChange = function handleChange(value, option, index) {
-    var nextValue = props.value ? _toConsumableArray(props.value) : [];
+  var handleChange = (value, option, index) => {
+    var nextValue = props.value ? [...props.value] : [];
     nextValue[index] = value;
     nextOption.current[index] = option;
     onChange(nextValue, nextOption.current);
   };
   var columnsProps = useTransformColumns({
     columns: children,
-    name: name,
-    names: names,
+    name,
+    names,
     onChange: handleChange,
-    namePath: namePath,
-    form: form,
-    index: index,
-    value: value,
+    namePath,
+    form,
+    index,
+    value,
     groupProps: props,
-    formDisabled: formDisabled,
-    desensitizationKey: desensitizationKey
+    formDisabled,
+    desensitizationKey
   });
   var columns = insertSeparator(columnsProps, space);
-  var nextClassName = classnames(_defineProperty({
+  var nextClassName = classnames({
     'pro-group': true,
-    'pro-group-diy-width': columns.some(function (item) {
-      var _item$fieldProps, _item$fieldProps$styl;
-      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    'pro-group-diy-width': columns.some(item => {
+      var _item$fieldProps;
+      return item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 || (_item$fieldProps = _item$fieldProps.style) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.width;
     }),
-    'pro-group-width-auto': columns.some(function (item) {
+    'pro-group-width-auto': columns.some(item => {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
-    })
-  }, "".concat(className), className));
-  return _jsx("div", {
+    }),
+    [`${className}`]: className
+  });
+  return /*#__PURE__*/_jsx("div", {
     className: nextClassName,
     id: id,
-    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: columns.map(function (column, index) {
+    children: space.compact || space !== null && space !== void 0 && space.separator ? /*#__PURE__*/_jsx(_Space.Compact, {
+      children: columns.map((column, index) => {
         column.otherProps = otherProps;
         // 自定义间隔移除对应参数
-        if (column === null || column === void 0 ? void 0 : column.separator) {
+        if (column !== null && column !== void 0 && column.separator) {
           delete column.separator;
           delete column.otherProps;
         }
-        return _jsx(ComRender, _objectSpread({
+        return /*#__PURE__*/_jsx(ComRender, _objectSpread({
           contextProps: contextProps,
           isView: isParentView || isView
         }, column), column.name || index);
       })
-    }) : _jsx(_Space, _objectSpread(_objectSpread({
+    }) : /*#__PURE__*/_jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
-    }, _omit(space, ['separator', 'compact'])), {}, {
-      children: columns.map(function (column, index) {
+    }, omit(space, ['separator', 'compact'])), {}, {
+      children: columns.map((column, index) => {
         column.otherProps = otherProps;
-        if (column === null || column === void 0 ? void 0 : column.separator) {
+        if (column !== null && column !== void 0 && column.separator) {
           delete column.separator;
           delete column.otherProps;
         }
-        return _jsx(ComRender, _objectSpread({
+        return /*#__PURE__*/_jsx(ComRender, _objectSpread({
           contextProps: contextProps,
           isView: isParentView || isView
         }, column), column.name || index);