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

package/lib/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -6,7 +6,7 @@
     ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
-    background: @zaui-base-bg;
+    // background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(

package/lib/ProForm/components/index.d.ts

@@ -24,7 +24,6 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/lib/ProForm/components/index.js

@@ -167,12 +167,6 @@ Object.defineProperty(exports, "ProTreeModal", {
     return _ProTreeModal.default;
   }
 });
-Object.defineProperty(exports, "ProTreeSelect", {
-  enumerable: true,
-  get: function get() {
-    return _ProTreeSelect.default;
-  }
-});
 Object.defineProperty(exports, "ProUpload", {
   enumerable: true,
   get: function get() {
@@ -252,7 +246,6 @@ var _Container = _interopRequireDefault(require("./combination/Container"));
 var _ProEnum = _interopRequireDefault(require("../../ProEnum"));
 var _ProSelect = _interopRequireDefault(require("../../ProSelect"));
 var _ProUpload = _interopRequireDefault(require("../../ProUpload"));
-var _ProTreeSelect = _interopRequireDefault(require("../../ProTreeSelect"));
 var _ProTreeModal = _interopRequireDefault(require("../../ProTreeModal"));
 var _ProTree = _interopRequireDefault(require("../../ProTree"));
 var _FormFooter = _interopRequireDefault(require("./FormFooter"));

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -39,7 +39,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       return;
     }
     if ((0, _lodash.isObject)(confirmProps)) {
-      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), confirmProps), {}, {
+      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
         onOk: function onOk() {
           var _confirmProps$onOk;
           for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {

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

@@ -32,7 +32,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 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,
@@ -50,8 +50,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,
@@ -147,7 +148,7 @@ var Render = function Render(props) {
    */
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
-  form, otherProps.names, namesStr) : valueTypeTransform();
+  form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -167,8 +168,12 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.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
    */
@@ -196,8 +201,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = (0, _toConsumableArray2.default)(args);
-    var _ref4 = otherProps || {},
-      valueType = _ref4.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -264,7 +269,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+    if (['ProTree'].includes(type)) {
       var _args2, _args2$;
       _args[2].option = (0, _index.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]);
     }
@@ -274,7 +279,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -301,7 +306,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -378,7 +383,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';
@@ -427,7 +432,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -440,6 +445,9 @@ var Render = function Render(props) {
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: title,
       visible: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: formItem
     });
   };

package/lib/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/lib/ProForm/components/render/RenderFields.js

@@ -33,7 +33,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);
@@ -183,7 +184,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 () {
@@ -212,7 +215,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/lib/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/lib/ProForm/index.js

@@ -25,9 +25,9 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-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"];
 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,
@@ -50,8 +50,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,
@@ -64,9 +63,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 = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
     state = _useProConfig.state,
@@ -231,9 +231,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,
@@ -254,7 +254,8 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       }), children, footerRender()]
     }))
   }));
@@ -319,7 +320,7 @@ ProFormForward.ProNumberRange = _components.ProNumberRange;
 ProFormForward.ProModalSelect = _components.ProModalSelect;
 ProFormForward.ProTimeLimit = _components.ProTimeLimit;
 ProFormForward.ProUpload = _components.ProUpload;
-ProFormForward.ProTreeSelect = _components.ProTreeSelect;
+// ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = _components.ProTreeModal;
 ProFormForward.ProTree = _components.ProTree;
 // 待废弃

package/lib/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/lib/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,7 +125,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
@@ -147,8 +137,22 @@
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .ant-select-selector,
+          .ant-input-affix-wrapper,
+          .ant-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .ant-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;

package/lib/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/lib/ProForm/utils/diffOriginal.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.diffOriginal = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _lodash = require("lodash");
+var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+var extractValue = function extractValue(obj, path) {
+  var value = obj || {};
+  if (!Object.keys(obj)) {
+    return [];
+  }
+  var _iterator = (0, _createForOfIteratorHelper2.default)(path),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      if (value && value.hasOwnProperty(key)) {
+        value = value[key];
+      } else {
+        return undefined;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Object.values(value);
+};
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(data, pathString) {
+  if (pathString.includes('_')) {
+    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
+    return extractValue(data, namePrefixes);
+  }
+  return pathString.split('-').map(function (item) {
+    return data[item];
+  });
+};
+var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  // 支持传入自定义比较事件
+  if ((0, _lodash.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 !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return false;
+    });
+  }
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !(0, _lodash.isEqual)(value, originalValue);
+  }
+  return false;
+};

package/lib/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/lib/ProForm/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.diffField = exports.deleteForPath = exports.customEqualForFun = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
@@ -124,7 +124,7 @@ var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-var contrast = exports.contrast = function contrast(prevValues, curValues, names) {
+var diffField = exports.diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _lodash.default.get(prevValues, name) !== _lodash.default.get(curValues, name);
   });
@@ -187,10 +187,15 @@ var isNullValue = exports.isNullValue = function isNullValue(value) {
  * @param arr 值
  * @returns boole
  */
-var isNotFullArray = exports.isNotFullArray = function isNotFullArray(arr, length) {
+var isNotFullArray = exports.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) {

package/lib/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/lib/ProForm/utils/rulesCreator.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,9 +10,23 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _utils = require("@zat-design/utils");
 var _lodash = require("lodash");
 var _index = require("./index");
-var _locale = _interopRequireDefault(require("../../locale"));
-var rulesCreator = exports.rulesCreator = function rulesCreator(rules, label, isSelect) {
+var _locale = _interopRequireWildcard(require("../../locale"));
+var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+  var result = [];
+  required.forEach(function (item, index) {
+    if (item && !valueArray[index] && !(0, _lodash.isNumber)(valueArray[index])) {
+      result.push(index + 1);
+    }
+  });
+  return result;
+};
+var rulesCreator = exports.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.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _lodash.isString)(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
@@ -36,6 +51,22 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(rules, label, is
     }
     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 errorIndexes = getNonEmptyValuesByIndex(required, value);
+        // 校验为true的值是否存在
+        if (Array.isArray(value) && (errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.length)) {
+          var _locale$ProForm;
+          return Promise.reject(new Error("".concat((0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm = _locale.default.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.halfRuleText, {
+            total: errorIndexes === null || errorIndexes === void 0 ? void 0 : errorIndexes.join(',')
+          }))));
+        }
+        return Promise.resolve();
+      }
+    };
+    result.push(customRequired);
+  }
   if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
     result = [{
       required: false

package/lib/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;

package/lib/ProForm/utils/transformNames.js

@@ -6,17 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _lodash = require("lodash");
 var _transformValue2 = require("./transformValue");
-var transformNames = function transformNames(formItem, form, names, fieldName) {
+var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  var _names = names;
+  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  var _transformValue = (0, _transformValue2.transformValue)(names, form, _fieldName, normalize, getValueProps),
+  if (type === 'Group' && (0, _lodash.isNumber)((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
+    _names = _names.map(function (item) {
+      return (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
+    });
+  }
+  var _transformValue = (0, _transformValue2.transformValue)(_names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

package/lib/ProForm/utils/transformValue.js

@@ -48,7 +48,7 @@ var transformValue = exports.transformValue = function transformValue(names, for
       }, cusRest);
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
-      return (0, _utils.contrast)(prevValues, curValues, names);
+      return (0, _utils.diffField)(prevValues, curValues, names);
     }
   };
 };