@zat-design/sisyphus-react 3.4.2 → 3.4.3-beta.10

package/es/ProForm/components/render/Render.js

@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -52,8 +52,9 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
-    confirm = props.confirm;
+    originalDiffTip = props.originalDiffTip,
+    confirm = props.confirm,
+    globalControl = props.globalControl;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -149,13 +150,13 @@ var Render = function Render(props) {
    */
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? transformNames(_objectSpread(_objectSpread({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
-  form, otherProps.names, namesStr) : valueTypeTransform();
+  form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
-  }, internalRule, labelRequired || _required ? {
-    required: labelRequired || _required
-  } : null, otherProps.isView && !requiredOnView ? {
+  }, internalRule, {
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required
+  }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
   _objectSpread({}, isUpperCase(type, upperCase)), {
@@ -169,8 +170,12 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先级 formitem上【column.disabled】 > 组件上【fieldProps.disabled】 > 全局【formDisabled】
-  var lastDisabled = (_ref2 = (_ref3 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
+  /**
+   * globalControl 全局控制优先
+   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
+   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
+   */
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -198,8 +203,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref4 = otherProps || {},
-      valueType = _ref4.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -217,12 +222,8 @@ var Render = function Render(props) {
     if (valueType) {
       _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
     }
+    _args[2].option = args[1];
     switch (type) {
-      case 'ProSelect':
-      case 'ProModalSelect':
-      case 'ProEnum':
-        _args[2].option = args[1];
-        break;
       case 'ProAddressBar':
         _args[2].selectedOptions = args[1];
         break;
@@ -239,7 +240,7 @@ var Render = function Render(props) {
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleChange = function handleChange() {
-    var _lastComponentProps$c2;
+    var _otherFormItemProps$n3, _lastComponentProps$c2;
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -257,6 +258,11 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
     }
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
+    // FormList 和 Group场景 对比值改变的话, 回显到表单上
+    if (inList) {
+      form.setFieldsValue(_args[1]);
+    }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
@@ -266,7 +272,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+    if (['ProTree'].includes(type)) {
       var _args2, _args2$;
       _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
     }
@@ -276,7 +282,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -303,7 +309,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -380,7 +386,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -429,7 +435,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = _jsxs(_Space, {
@@ -442,6 +448,9 @@ var Render = function Render(props) {
     return _jsx(_Tooltip, {
       title: title,
       visible: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: formItem
     });
   };

package/es/ProForm/components/render/RenderFields.d.ts

@@ -16,8 +16,9 @@ interface Props<T = any> {
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
     requiredOnView?: boolean;
-    required?: boolean | (() => boolean);
-    originalTip?: boolean;
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
+    originalDiffTip?: boolean;
+    globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/es/ProForm/components/render/RenderFields.js

@@ -25,7 +25,8 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip,
+    globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -175,7 +176,9 @@ var RenderFields = function RenderFields(props) {
       form: form,
       type: _type,
       hiddenNames: column.hiddenNames,
-      colProps: _colProps
+      colProps: _colProps,
+      mode: componentProps.mode,
+      namePath: column.namePath
     };
     if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
       setTimeout(function () {
@@ -204,7 +207,8 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/es/ProForm/components/render/propsType.d.ts

@@ -26,7 +26,6 @@ import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
-import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
@@ -150,9 +149,6 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
-} | {
-    type?: 'ProTreeSelect';
-    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 } | {
     type?: 'ProTreeModal';
     fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
@@ -210,7 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
-    required?: boolean | ReactiveFunction<Values, boolean>;
+    required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
     clearNotShow?: boolean;
@@ -270,6 +266,7 @@ export interface RenderProps<Values = any> {
     originalValues?: Values;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
+    globalControl?: boolean;
     [name: string]: any;
 }
 export {};

package/es/ProForm/index.js

@@ -12,13 +12,13 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
@@ -26,7 +26,7 @@ import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage;
+  var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -49,8 +49,7 @@ var ProForm = function ProForm(props, ref) {
     expandOpenChange = props.expandOpenChange,
     _props$viewEmpty = props.viewEmpty,
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
-    _props$labelAlign = props.labelAlign,
-    labelAlign = _props$labelAlign === void 0 ? 'left' : _props$labelAlign,
+    labelAlign = props.labelAlign,
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
@@ -63,9 +62,10 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalTip = props.originalTip,
-    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    _props$originalDiffTi = props.originalDiffTip,
+    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
+    globalControl = props.globalControl,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig(),
     state = _useProConfig.state,
@@ -230,9 +230,9 @@ var ProForm = function ProForm(props, ref) {
       }
     },
     className: cls,
-    form: form,
-    labelAlign: labelAlign
+    form: form
   }, formProps), config), otherProps), {}, {
+    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
@@ -253,7 +253,8 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       }), children, footerRender()]
     }))
   }));
@@ -318,7 +319,7 @@ ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;
 ProFormForward.ProTimeLimit = ProTimeLimit;
 ProFormForward.ProUpload = ProUpload;
-ProFormForward.ProTreeSelect = ProTreeSelect;
+// ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = ProTreeModal;
 ProFormForward.ProTree = ProTree;
 // 待废弃

package/es/ProForm/propsType.d.ts

@@ -38,10 +38,14 @@ export interface ProFormOtherProps {
     colProps: ColProps;
     disabled: boolean;
     show?: boolean | (() => boolean);
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
+    mode?: string;
+    namePath?: any[] | string | number;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
+    /** 全局控制优先 */
+    globalControl?: boolean;
     mode?: ModeEnum;
     formKey?: string;
     /** 是否查看 */
@@ -66,8 +70,8 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
-    required?: boolean;
-    originalTip?: boolean;
+    required?: boolean | boolean[];
+    originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProForm/style/index.less

@@ -31,16 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
-  .pro-collapse-level2 {
-    .@{ant-prefix}-collapse-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
@@ -135,20 +125,35 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
         }
       }
 
-      .ant-form-item-control:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
         background: @zaui-contract-bg;
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .@{ant-prefix}-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;
@@ -342,4 +347,21 @@
   .delete-icon {
     width: 18px;
   }
+  .pro-form-list-tool-btn {
+    margin-left: 8px;
+    padding: 0;
+    cursor: pointer;
+    .anticon {
+      color: var(--zaui-text-weak, #a0a0a0);
+      font-size: 16px;
+      vertical-align: middle;
+    }
+  }
+  .pro-form-list-mode-block{
+    .pro-collapse-content{
+      .@{ant-prefix}-row{
+        width: auto;
+      }
+    }
+  }
 }

package/es/ProForm/utils/{contrastOriginal.d.ts → diffOriginal.d.ts}

@@ -3,7 +3,8 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
-export declare const contrastOriginal: (params: Params) => boolean;
+export declare const diffOriginal: (params: Params) => boolean;
 export {};

package/es/ProForm/utils/diffOriginal.js

@@ -0,0 +1,46 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { isEqual, isFunction, isString } from 'lodash';
+var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = isString(pathString) ? [] : pathString.slice(0, -1);
+  if (isString(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+    });
+    return result;
+  }
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat(_toConsumableArray(PrefixesName), [item])));
+  });
+  return result;
+};
+export var diffOriginal = function diffOriginal(params) {
+  var _name$join;
+  var originalValue = params.originalValue,
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
+  // 支持传入自定义比较事件
+  if (isFunction(equalWith)) {
+    return !equalWith(originalValue, value);
+  }
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return false;
+    });
+  }
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !isEqual(value, originalValue);
+  }
+  return false;
+};

package/es/ProForm/utils/index.d.ts

@@ -26,7 +26,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
  */
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
-export declare const contrast: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
+export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
 export declare const splitNameStr: (name: string) => NamePath[];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
@@ -36,7 +36,7 @@ export declare const isNullValue: (value: any) => boolean;
  * @param arr 值
  * @returns boole
  */
-export declare const isNotFullArray: (arr: any, length: any) => boolean;
+export declare const isNotFullArray: (arr: any, length: any, required: any) => boolean;
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值

package/es/ProForm/utils/index.js

@@ -5,6 +5,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState } from 'react';
 import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
+import moment from 'moment';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -42,7 +43,7 @@ export var useControlled = function useControlled(props) {
 export var isSelect = function isSelect(props) {
   var dataSource = props.dataSource,
     type = props.type;
-  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格
@@ -108,7 +109,7 @@ export var weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-export var contrast = function contrast(prevValues, curValues, names) {
+export var diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _.get(prevValues, name) !== _.get(curValues, name);
   });
@@ -122,8 +123,8 @@ export var splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 export var filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
-  // fix: braft-editor对象不可遍历
-  if (values === null || values === void 0 ? void 0 : values._immutable) {
+  // fix: braft-editor对象不可遍历 Moment不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
@@ -134,7 +135,7 @@ export var filterInternalFields = function filterInternalFields(values) {
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) return;
+      // if (key.includes('-')) return;
       result[key] = filterInternalFields(nextValues[key]);
     });
     return result;
@@ -171,10 +172,15 @@ export var isNullValue = function isNullValue(value) {
  * @param arr 值
  * @returns boole
  */
-export var isNotFullArray = function isNotFullArray(arr, length) {
+export var isNotFullArray = function isNotFullArray(arr, length, required) {
   if (!Array.isArray(arr)) {
     return false;
   }
+  if (Array.isArray(required) && required.some(function (item) {
+    return item === false;
+  })) {
+    return false;
+  }
   if (arr.length < length) return true;
   return arr.some(function (item) {
     if (item === undefined || item === null) {
@@ -295,6 +301,10 @@ export function initialValuesToNames() {
         values[key] = formInitialValue;
       }
     }
+    // 给FormList默认增加一行
+    if (item.type === 'FormList' && !item.initialValue && !get(values, item.name)) {
+      item.initialValue = [{}];
+    }
   });
   return values;
 }

package/es/ProForm/utils/rulesCreator.d.ts

@@ -1 +1,7 @@
-export declare const rulesCreator: (rules: any, label: any, isSelect: any) => any[];
+export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
+    rules: any;
+    label: any;
+    isSelect: any;
+    names: any;
+    required: any;
+}) => any[];

package/es/ProForm/utils/rulesCreator.js

@@ -1,10 +1,24 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { validate, regExp } from '@zat-design/utils';
-import { isString } from 'lodash';
+import { isString, isNumber } from 'lodash';
 import { isNullValue } from './index';
-import locale from '../../locale';
-export var rulesCreator = function rulesCreator(rules, label, isSelect) {
+import locale, { formatMessage } from '../../locale';
+var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+  var result = [];
+  required.forEach(function (item, index) {
+    if (item && !valueArray[index] && !isNumber(valueArray[index])) {
+      result.push(index + 1);
+    }
+  });
+  return result;
+};
+export var rulesCreator = function rulesCreator(_ref) {
   var _result;
+  var rules = _ref.rules,
+    label = _ref.label,
+    isSelect = _ref.isSelect,
+    names = _ref.names,
+    required = _ref.required;
   var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
@@ -29,6 +43,34 @@ export var rulesCreator = function rulesCreator(rules, label, isSelect) {
     }
     return rule;
   });
+  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
+    var customRequired = {
+      validator: function validator(rules, value) {
+        var _errorValues3;
+        var errorValues = getNonEmptyValuesByIndex(required, value);
+        if ((value === null || value === void 0 ? void 0 : value.length) === 2) {
+          var _errorValues;
+          errorValues = errorValues.map(function (item) {
+            var _locale$ProForm;
+            return locale === null || locale === void 0 ? void 0 : (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
+          });
+          if ((_errorValues = errorValues) === null || _errorValues === void 0 ? void 0 : _errorValues.length) {
+            var _locale$ProForm2, _errorValues2;
+            return Promise.reject(new Error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProForm2 = locale.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder).concat((_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(','))));
+          }
+        }
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && ((_errorValues3 = errorValues) === null || _errorValues3 === void 0 ? void 0 : _errorValues3.length)) {
+          var _locale$ProForm3, _errorValues4;
+          return Promise.reject(new Error("".concat(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProForm3 = locale.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
+            total: (_errorValues4 = errorValues) === null || _errorValues4 === void 0 ? void 0 : _errorValues4.join(',')
+          }))));
+        }
+        return Promise.resolve();
+      }
+    };
+    result.push(customRequired);
+  }
   if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
     result = [{
       required: false

package/es/ProForm/utils/transformNames.d.ts

@@ -6,5 +6,5 @@ interface TransformProps extends FormItemProps {
     namePath: any[];
 }
 type TransformFun = 'normalize' | 'getValueProps' | 'shouldUpdate' | 'name';
-declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string) => Pick<TransformProps, TransformFun>;
+declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string, type?: string) => Pick<TransformProps, TransformFun>;
 export default transformNames;