@zat-design/sisyphus-react 3.7.2 → 3.7.3-beta.10

package/lib/ProForm/components/render/ChangedWrapper.d.ts

@@ -0,0 +1,16 @@
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+import React from 'react';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
+import { DiffConfigProps } from '../../propsType';
+interface Props {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: string;
+    diffConfig?: DiffConfigProps;
+    form: FormInstance;
+    equalWith?: DiffOriginalParams['equalWith'];
+    [name: string]: any;
+}
+declare const ChangedWrapper: React.FC<Props>;
+export default ChangedWrapper;

package/lib/ProForm/components/render/{Changed.js → ChangedWrapper.js}

@@ -10,60 +10,88 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
-var Changed = function Changed(props) {
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _utils = require("../../../utils");
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var ChangedWrapper = function ChangedWrapper(props) {
+  var _diffConfig$toolTip;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
-    originalValues = props.originalValues,
     form = props.form,
     equalWith = props.equalWith,
     children = props.children,
     type = props.type,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
+  var originalValues = diffConfig.originalValues,
+    changeTipColor = diffConfig.changeTipColor,
+    addTipColor = diffConfig.addTipColor;
+  var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
+  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var diffType = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return 'same';
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
-      value: props.value,
+      value: props[valuePropName],
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [notWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props[valuePropName], originalValue]);
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return undefined;
+    if (!isWatch || noChange) return undefined;
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     })) : undefined;
   }, [originalValue, children]);
-  if (notWatch || noChange) {
+  if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
   }
+  var tipOpenCalc = function tipOpenCalc() {
+    if (!toolTip) return false;
+    // 传入undefined 鼠标移入显示移出隐藏
+    return isChanged ? undefined : false;
+  };
+  var style = {
+    '--zaui-contract-bg': changeTipColor,
+    '--zaui-contract-bg-add': addTipColor
+  };
+  var diffClassName = (0, _classnames.default)({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
+    open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
     }),
+    placement: "topLeft",
     children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
+      style: style,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
     })
   });
 };
-var _default = exports.default = Changed;
+var _default = exports.default = ChangedWrapper;

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

@@ -26,7 +26,7 @@ var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _Changed = _interopRequireDefault(require("./Changed"));
+var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -46,12 +46,11 @@ var Render = function Render(props) {
     formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
-    originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
-    globalControl = props.globalControl;
+    globalControl = props.globalControl,
+    diffConfig = props.diffConfig;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -427,17 +426,17 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (originalValues) {
-      child = (0, _jsxRuntime.jsx)(_Changed.default, {
+    if (diffConfig) {
+      child = (0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         form: form,
         equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
         type: type,
         onChange: handleChange,
+        valuePropName: _otherFormItemProps.valuePropName,
         children: child
       });
     }

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

@@ -2,7 +2,7 @@ import { ColProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import React from 'react';
 import { ProColumnProps } from './propsType';
-import { ProFormProps } from '../../propsType';
+import { DiffConfigProps } from '../../propsType';
 interface Props<T = any> {
     isView?: boolean;
     columns: ProColumnProps[];
@@ -13,11 +13,10 @@ interface Props<T = any> {
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
-    originalValues?: ProFormProps<T>['originalValues'];
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);
-    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;

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

@@ -30,11 +30,10 @@ var RenderFields = function RenderFields(props) {
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
     openState = props.openState,
     labelWidth = props.labelWidth,
-    originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
     globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -162,6 +161,7 @@ var RenderFields = function RenderFields(props) {
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
+      componentProps.diffConfig = diffConfig;
     }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
@@ -214,10 +214,9 @@ var RenderFields = function RenderFields(props) {
         otherProps: otherProps,
         fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));

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

@@ -30,7 +30,8 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
-import { DistributiveOmit } from '../../propsType';
+import { DistributiveOmit, DiffConfigProps } from '../../propsType';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -201,7 +202,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
-    equalWith?: (originValue: any, currentValue: any) => boolean;
+    equalWith?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
@@ -267,7 +268,7 @@ export interface RenderProps<Values = any> {
     form: FormInstance<Values>;
     fieldProps?: ReactiveFunction<Values, React.ReactNode>;
     isSelect: boolean;
-    originalValues?: Values;
+    diffConfig: DiffConfigProps;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
     globalControl?: boolean;

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
-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", "scrollToError", "optimize"];
+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", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
@@ -54,7 +54,7 @@ var ProForm = function ProForm(props, ref) {
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
-    originalValues = props.originalValues,
+    diffConfig = props.diffConfig,
     submitOnEnter = props.submitOnEnter,
     _props$clearNotShow = props.clearNotShow,
     clearNotShow = _props$clearNotShow === void 0 ? true : _props$clearNotShow,
@@ -63,8 +63,6 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalDiffTi = props.originalDiffTip,
-    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     _props$scrollToError = props.scrollToError,
@@ -262,11 +260,10 @@ var ProForm = function ProForm(props, ref) {
         colProps: colProps,
         viewEmpty: viewEmpty,
         labelWidth: labelWidth,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), footerRender()]
     })), children]

package/lib/ProForm/propsType.d.ts

@@ -45,6 +45,16 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
 }
+export interface DiffConfigProps<Values = any> {
+    /** 比对原始数据源 */
+    originalValues: Values;
+    /** 是否显示对比值气泡 */
+    toolTip?: boolean;
+    /** 变更提示颜色 */
+    changeTipColor?: string;
+    /** 新增提示颜色 */
+    addTipColor?: string;
+}
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     /** 全局控制优先 */
@@ -67,14 +77,14 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     viewEmpty?: React.ReactNode | string;
     confirmLoading?: boolean;
     labelWidth?: string | number;
-    originalValues?: Values;
     /** 是否回车提交 */
     submitOnEnter?: boolean;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean | boolean[];
-    originalDiffTip?: boolean;
+    /** 表单比对配置 */
+    diffConfig?: DiffConfigProps;
     scrollToError?: boolean;
     /** 性能模式，谨慎使用，默认不开启
      * 1. 开启不过滤names的中间态值

package/lib/ProForm/style/index.less

@@ -99,10 +99,12 @@
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
+        width: 100%;
         flex-grow: inherit;
       }
 
       .@{ant-prefix}-form-item-control-input-content {
+        width: 100%;
         flex: initial;
       }
     }
@@ -314,16 +316,23 @@
       vertical-align: middle;
     }
   }
-  .pro-form-list-mode-block{
-    .pro-collapse-content{
-      .@{ant-prefix}-row{
+
+  .pro-form-list-mode-block {
+    .pro-collapse-content {
+      .@{ant-prefix}-row {
         width: auto;
       }
     }
   }
 
-  // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
+    border-radius: 4px;
+    background: @zaui-contract-bg !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg !important;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -367,10 +376,99 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea  {
+      background: @zaui-contract-bg;
+    }
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg;
       border-radius: 4px;
     }
   }
+
+
+  // 比较原始值场景下  不同时的样式
+  .pro-form-item-add {
+    border-radius: 4px;
+    background: @zaui-contract-bg-add !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg-add !important;
+    }
+
+    span.@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-picker,
+    .@{ant-prefix}-input-number {
+      background: @zaui-contract-bg-add !important;
+
+      input {
+        background: transparent !important;
+      }
+      .@{ant-prefix}-select-selection-placeholder {
+        z-index: 9;
+      }
+    }
+
+    .@{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-add;
+      border-radius: 4px;
+    }
+
+    // 地址组件
+    .@{ant-prefix}-form-item-control-input-content {
+      // 查看模式
+      & > span {
+        border-radius: 4px;
+        padding: 5px 8px;
+        background: @zaui-contract-bg-add;
+      }
+
+      & > .pro-address {
+        .@{ant-prefix}-select-selector,
+        .@{ant-prefix}-input-affix-wrapper,
+        .@{ant-prefix}-input-disabled {
+          background: @zaui-contract-bg-add;
+        }
+      }
+      & > .@{ant-prefix}-input-group {
+        .forever-checkbox {
+          background: @zaui-contract-bg-add;
+        }
+      }
+    }
+
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea {
+      background: @zaui-contract-bg-add;
+    }
+
+
+    .pro-form-view-container {
+      padding: 4px 8px;
+      background: @zaui-contract-bg-add;
+      border-radius: 4px;
+    }
+  }
 }

package/lib/ProForm/utils/diffOriginal.d.ts

@@ -1,9 +1,9 @@
 import { FormInstance } from 'antd';
-interface Params {
+export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
+    equalWith?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
-export declare const diffOriginal: (params: Params) => boolean;
-export {};
+export type DiffType = 'same' | 'add' | 'changed';
+export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/lib/ProForm/utils/diffOriginal.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.diffOriginal = void 0;
 var _lodash = require("lodash");
+var _utils = require("../../utils");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
@@ -12,19 +13,29 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     equalWith = params.equalWith;
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
-    return !equalWith(originalValue, value);
+    var diffRes = equalWith(originalValue, value);
+    if (diffRes === undefined) return 'same';
+    if (typeof diffRes === 'boolean') {
+      return diffRes ? 'same' : 'changed';
+    }
+    return diffRes;
+  }
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if ((0, _utils.isEmpty)(originalValue) && !(0, _utils.isEmpty)(value)) {
+    return 'add';
   }
   if (Array.isArray(originalValue)) {
-    return originalValue.some(function (valueItem, index) {
+    var isSame = originalValue.every(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);
+      if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
+        return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
-      return false;
+      return true;
     });
+    return isSame ? 'same' : 'changed';
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(value, originalValue);
+    return (0, _lodash.isEqual)(value, originalValue) ? 'same' : 'changed';
   }
-  return false;
+  return 'same';
 };

package/lib/ProForm/utils/index.js

@@ -136,7 +136,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -150,20 +150,20 @@ var _filterInternalFields = exports.filterInternalFields = function filterIntern
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return _filterInternalFields(item);
+      return filterInternalFields(item);
     });
   }
   if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = _filterInternalFields(nextValues[key]);
+      result[key] = filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -177,7 +177,7 @@ var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if ((0, _lodash.isObject)(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+      resultKeys.concat(getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
     }
     resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
   });
@@ -320,7 +320,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
+var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -330,7 +330,7 @@ var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -346,7 +346,7 @@ var view = exports.view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -382,7 +382,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
@@ -392,7 +392,7 @@ var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(
       return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }

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

@@ -1,5 +1,5 @@
 export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
-    rules: any;
+    rules?: any[];
     label: any;
     isSelect: any;
     names: any;