@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/lib/ProForm/utils/index.js

@@ -5,20 +5,20 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.filterInternalFields = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
-exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = void 0;
+exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = void 0;
 exports.processHyphenKeys = processHyphenKeys;
 exports.splitNameStr = void 0;
 exports.toArray = toArray;
 exports.weedOutProps = exports.view = exports.useControlled = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
 var _lodash = _interopRequireWildcard(require("lodash"));
 var colProps = {
@@ -30,25 +30,22 @@ var colProps = {
   }
 };
 var footer = {
-  search: true,
+  search: false,
   drawer: false
 };
-var getLayout = function getLayout(params) {
-  var mode = params.mode,
-    span = params.span,
+var getLayout = exports.getLayout = function getLayout(params) {
+  var _params$span = params.span,
+    span = _params$span === void 0 ? 8 : _params$span,
     form = params.form;
-  var _colProps = (0, _objectSpread2.default)({}, colProps[mode]);
-  if (span) {
-    _colProps.span = span;
-  }
   return {
-    modeFooter: footer[mode],
     formProps: {
       colon: false,
       labelAlign: 'left',
       labelWrap: true
     },
-    colProps: _colProps,
+    colProps: {
+      span: span || 8
+    },
     onCancel: function onCancel() {
       form.resetFields();
     },
@@ -58,8 +55,7 @@ var getLayout = function getLayout(params) {
   };
 };
 // 受控状态
-exports.getLayout = getLayout;
-var useControlled = function useControlled(props) {
+var useControlled = exports.useControlled = function useControlled(props) {
   var value = props.value,
     onChange = props.onChange;
   var _useState = (0, _react.useState)(value || false),
@@ -71,11 +67,10 @@ var useControlled = function useControlled(props) {
   }
   return [state, setState];
 };
-exports.useControlled = useControlled;
-var isSelect = function isSelect(props) {
+var isSelect = exports.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'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格
@@ -83,19 +78,46 @@ var isSelect = function isSelect(props) {
  * @param trim 是否移除前后空格
  * @returns {}
  */
-exports.isSelect = isSelect;
-var isTrim = function isTrim(type, trim) {
+var isTrim = exports.isTrim = function isTrim(type, trim) {
   var result = {};
-  if (['Input', 'TextArea'].includes(type) && trim) {
+  if (['Input', 'TextArea', 'ProCombination'].includes(type) && trim) {
     result.getValueFromEvent = function (event) {
-      return event.target.value.trim();
+      var _event$target$value;
+      if (Array.isArray(event)) {
+        return event.map(function (value) {
+          return (value === null || value === void 0 ? void 0 : value.trim()) || '';
+        });
+      }
+      return ((_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.trim()) || '';
+    };
+  }
+  return result;
+};
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+var isUpperCase = exports.isUpperCase = function isUpperCase(type, upperCase) {
+  var result = {};
+  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+    result.getValueFromEvent = function (event) {
+      var _event$target, _event$target$value2;
+      if (Array.isArray(event)) {
+        return event.map(function (value) {
+          var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+          return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
+        });
+      }
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value2 = _event$target.value) === null || _event$target$value2 === void 0 ? void 0 : _event$target$value2.replace(/[^a-zA-Z]/g, '');
+      return newValue.toUpperCase() || '';
     };
   }
   return result;
 };
 // 剔除otherProps 组成对象返回
-exports.isTrim = isTrim;
-var weedOutProps = function weedOutProps(data, keys) {
+var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
   var obj = {};
   var weedOut = {};
   Object.keys(data).forEach(function (key) {
@@ -109,22 +131,19 @@ var weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-exports.weedOutProps = weedOutProps;
-var contrast = function contrast(prevValues, curValues, names) {
+var contrast = exports.contrast = function contrast(prevValues, curValues, names) {
   return names.some(function (name) {
     return _lodash.default.get(prevValues, name) !== _lodash.default.get(curValues, name);
   });
 };
 // 表单name展开
-exports.contrast = contrast;
-var splitNameStr = function splitNameStr(name) {
+var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   return name.split('-').map(function (keyStr) {
     return keyStr.split('_');
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-exports.splitNameStr = splitNameStr;
-var filterInternalFields = function filterInternalFields(values) {
+var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
   if (Array.isArray(nextValues)) {
     nextValues.forEach(function (item) {
@@ -141,8 +160,7 @@ var filterInternalFields = function filterInternalFields(values) {
   }
   return nextValues;
 };
-exports.filterInternalFields = filterInternalFields;
-var 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 = [];
@@ -163,29 +181,53 @@ var getAllNamePath = function getAllNamePath(object) {
   return resultKeys;
 };
 // 判断一个字段值是否算空
-exports.getAllNamePath = getAllNamePath;
 var nullList = [undefined, 'null', '""', '[]'];
-var isNullValue = function isNullValue(value) {
+var isNullValue = exports.isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
 };
-// 判断数组是否算空
-exports.isNullValue = isNullValue;
-var isNullArray = function isNullArray(value, length) {
-  var hasValue = false;
-  var hasNullValue = false;
-  if (Array.isArray(value)) {
-    for (var i = 0; i < length; i++) {
-      if (!isNullValue(value[i])) {
-        hasValue = true;
-      } else {
-        hasNullValue = true;
-      }
-    }
-    return hasValue && hasNullValue;
+/**
+ * 判断数组中是否包含空值 一个为空则为true
+ * @param arr 值
+ * @returns boole
+ */
+var isNotFullArray = exports.isNotFullArray = function isNotFullArray(arr, length) {
+  if (!Array.isArray(arr)) {
+    return false;
   }
-  return !value;
+  if (arr.length < length) return true;
+  return arr.some(function (item) {
+    if (item === undefined || item === null) {
+      return true;
+    }
+    if (typeof item === 'string' && item.trim().length === 0) {
+      return true;
+    }
+    if (Array.isArray(item) && item.length === 0) {
+      return true;
+    }
+    return false;
+  });
+};
+/**
+ * 判断数组中值是否都为空 全部为空则为true
+ * @param arr 值
+ * @returns boole
+ */
+var isNullArray = exports.isNullArray = function isNullArray(arr) {
+  if (!Array.isArray(arr)) return !arr;
+  return arr.every(function (item) {
+    if (item === undefined || item === null) {
+      return true;
+    }
+    if (typeof item === 'string' && item.trim().length === 0) {
+      return true;
+    }
+    if (Array.isArray(item) && item.length === 0) {
+      return true;
+    }
+    return false;
+  });
 };
-exports.isNullArray = isNullArray;
 function toArray(value) {
   if (value === undefined || value === null) {
     return [];
@@ -245,7 +287,9 @@ function processHyphenKeys(obj) {
  * @param obj AnyObject
  * @returns AnyObject
  */
-function initialValuesToNames(values, columns) {
+function initialValuesToNames() {
+  var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var columns = arguments.length > 1 ? arguments[1] : undefined;
   var result = {};
   if (!Array.isArray(columns)) {
     return result;
@@ -256,10 +300,22 @@ function initialValuesToNames(values, columns) {
       var key = (_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.map(function (name) {
         return Array.isArray(name) ? name.join('_') : name;
       }).join('-');
-      values[key] = undefined;
+      var formInitialValue = item.names.map(function (name, index) {
+        if (item.initialValue) {
+          (0, _lodash.set)(values, name, item.initialValue[index]);
+        }
+        return (0, _lodash.get)(values, name);
+      });
+      // 过滤掉不存在的初始值  防止names字段值为空数组
+      var namesInitialValue = formInitialValue.filter(function (item) {
+        return item !== undefined;
+      });
+      if (namesInitialValue.length) {
+        values[key] = formInitialValue;
+      }
     }
   });
-  return processHyphenKeys(values);
+  return values;
 }
 /**
  * 获取数组含数字的新数组
@@ -272,7 +328,7 @@ function getArrayBeforeNumber(arr) {
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
 // 自定义深比对 如果两边都是函数类型则认为相等
-var customEqualForFun = function customEqualForFun(value, other) {
+var customEqualForFun = exports.customEqualForFun = function customEqualForFun(value, other) {
   if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other)) {
     return true;
   }
@@ -280,8 +336,7 @@ var customEqualForFun = function customEqualForFun(value, other) {
 /**
  * 查询数据中是否包含rowKey
  */
-exports.customEqualForFun = customEqualForFun;
-var hasRowKey = function hasRowKey(obj) {
+var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -297,8 +352,7 @@ var hasRowKey = function hasRowKey(obj) {
 /**
  * 查询数据中是否包含rowKey
  */
-exports.hasRowKey = hasRowKey;
-var view = function view(obj) {
+var view = exports.view = function view(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -316,9 +370,48 @@ var view = function view(obj) {
  * @param num 数字
  * @returns 位数
  */
-exports.view = view;
-var getDecimalDigits = function getDecimalDigits(num) {
+var getDecimalDigits = exports.getDecimalDigits = function getDecimalDigits(num) {
   var match = num.toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
 };
-exports.getDecimalDigits = getDecimalDigits;
+var deleteForPath = exports.deleteForPath = function deleteForPath(values, namePath) {
+  if (Array.isArray(namePath)) {
+    var current = values;
+    namePath.every(function (nameItem, index) {
+      if (index === namePath.length - 1) {
+        delete current[nameItem];
+        return false;
+      }
+      if ((0, _typeof2.default)(current[nameItem]) !== 'object') {
+        return false;
+      }
+      current = current[nameItem];
+      return true;
+    });
+    return;
+  }
+  delete values[namePath];
+};
+/**
+ * 获取树状结构option
+ * @param treeData 树数据源
+ * @param value 选中值
+ * @returns {}
+ */
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value) {
+  if ((0, _lodash.isObject)(value)) {
+    return value;
+  }
+  for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
+    var node = treeData[i];
+    if (node.value === value) {
+      return (0, _lodash.omit)(node, ['children']);
+    }
+    if (node.children) {
+      var foundNode = findOptionByValue(node.children, value);
+      if (foundNode) {
+        return (0, _lodash.omit)(foundNode, ['children']);
+      }
+    }
+  }
+};

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

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

package/lib/ProForm/utils/rulesCreator.js

@@ -1,14 +1,19 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.rulesCreator = void 0;
-var _utils = require("@zat-design-pro-component/utils");
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _utils = require("@zat-design/utils");
 var _index = require("./index");
-var rulesCreator = function rulesCreator(rules, label, isSelect) {
+var rulesCreator = exports.rulesCreator = function rulesCreator(rules, label, isSelect) {
+  var _result;
   var message = "".concat(isSelect ? '请选择' : '请输入', "\u6B63\u786E\u7684").concat(label || '');
-  return rules.map(function (rule) {
+  var result = [];
+  result = rules.map(function (ruleItem) {
+    var rule = (0, _objectSpread2.default)({}, ruleItem);
     if (rule instanceof Object && 'type' in rule) {
       if (Object.keys(_utils.regExp).includes(rule.type)) {
         rule.validator = function (rule, value) {
@@ -29,5 +34,10 @@ var rulesCreator = function rulesCreator(rules, label, isSelect) {
     }
     return rule;
   });
-};
-exports.rulesCreator = rulesCreator;
+  if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
+    result = [{
+      required: false
+    }];
+  }
+  return result;
+};

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

@@ -1,5 +1,5 @@
 import { FormInstance, FormItemProps } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
+import { NamePath } from 'antd/es/form/interface';
 interface TransformProps extends FormItemProps {
     names: NamePath[];
     form: FormInstance;

package/lib/ProForm/utils/transformNames.js

@@ -35,5 +35,4 @@ var transformNames = function transformNames(formItem, form, names, fieldName) {
     }
   };
 };
-var _default = transformNames;
-exports.default = _default;
+var _default = exports.default = transformNames;

package/lib/ProForm/utils/transformValue.js

@@ -10,7 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _lodash = require("lodash");
 var _utils = require("../utils");
 var _excluded = ["value"];
-var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
+var transformValue = exports.transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
       var _value = value;
@@ -23,7 +23,8 @@ var transformValue = function transformValue(names, form, fieldName, _normalize,
       }
       names.forEach(function (name, index) {
         var _value2;
-        form.setFieldValue(name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
+        // @ts-ignore
+        (0, _lodash.set)(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
       });
       return _value;
     },
@@ -31,7 +32,7 @@ var transformValue = function transformValue(names, form, fieldName, _normalize,
       var _value = [];
       names.forEach(function (name, index) {
         var value = form.getFieldValue(name);
-        ![null, undefined].includes(value) && (_value[index] = value);
+        _value[index] = value;
       });
       // 支持外部传入转换函数
       var _ref = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
@@ -39,12 +40,8 @@ var transformValue = function transformValue(names, form, fieldName, _normalize,
         },
         cusValue = _ref.value,
         cusRest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-      if (!(0, _lodash.isEqual)(value, cusValue)) {
-        // 延时解决表单render期间，重复渲染阻塞的问题
-        setTimeout(function () {
-          form.setFieldValue(fieldName, cusValue);
-        }, 200);
-      }
+      // @ts-ignore
+      (0, _lodash.set)(form.getFieldsValue(true), fieldName, cusValue);
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return (0, _objectSpread2.default)({
         value: cusValue
@@ -55,6 +52,4 @@ var transformValue = function transformValue(names, form, fieldName, _normalize,
     }
   };
 };
-exports.transformValue = transformValue;
-var _default = transformValue;
-exports.default = _default;
+var _default = exports.default = transformValue;

package/lib/ProForm/utils/useChanged.js

@@ -7,10 +7,13 @@ exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _contrastOriginal = require("./contrastOriginal");
-var useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
-  var value = _antd.Form.useWatch(nameStr || name, form);
-  if (!originalValues || (0, _lodash.get)(originalValues, nameStr || name) === undefined) return false;
+var useChanged = exports.useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
+  var _form = form;
+  if (!originalValues || (0, _lodash.get)(originalValues, nameStr || name) === undefined) {
+    _form = [];
+    return false;
+  }
+  var value = _antd.Form.useWatch(nameStr || name, _form);
   var changed = (0, _contrastOriginal.contrastOriginal)(name, names, originalValues, value, fun);
   return changed;
-};
-exports.useChanged = useChanged;
+};

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ProFormOtherProps } from '../propsType';
+export declare const FieldProvider: React.Provider<ProFormOtherProps>;
+export declare const useFieldProps: () => ProFormOtherProps;

package/lib/ProForm/utils/useFieldProps.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFieldProps = exports.FieldProvider = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var FieldContext = /*#__PURE__*/_react.default.createContext({});
+var FieldProvider = exports.FieldProvider = FieldContext.Provider;
+var useFieldProps = exports.useFieldProps = function useFieldProps() {
+  return (0, _react.useContext)(FieldContext);
+};

package/lib/ProForm/utils/useForm.js

@@ -7,59 +7,50 @@ Object.defineProperty(exports, "__esModule", {
 exports.useForm = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
 var _react = require("react");
 var _lodash = require("lodash");
-var _index = require("./index");
-// eslint-disable-next-line space-before-function-paren
-var useForm = function useForm(originForm) {
+var _FieldContext = require("rc-field-form/es/FieldContext");
+var _ = require(".");
+var useForm = exports.useForm = function useForm(originForm) {
   var _Form$useForm = _antd.Form.useForm(originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
     getFieldValue = form.getFieldValue;
-  (0, _react.useEffect)(function () {
+  (0, _react.useMemo)(function () {
     var _getFieldsValue = function _getFieldsValue() {
-      for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-        rest[_key] = arguments[_key];
-      }
-      var props = (rest === null || rest === void 0 ? void 0 : rest.length) ? rest : [true];
-      // @ts-ignore
-      var values = getFieldsValue.apply(void 0, (0, _toConsumableArray2.default)(props));
-      if (rest === null || rest === void 0 ? void 0 : rest.length) {
-        return values;
-      }
-      if ((rest === null || rest === void 0 ? void 0 : rest[0]) === true) {
-        return values;
-      }
-      return (0, _index.filterInternalFields)((0, _lodash.cloneDeep)(values));
-    };
-    var originSetFieldsValue = form.setFieldsValue; // 备份原始的 setFieldsValue 方法
-    // const originSetFieldValue = form.setFieldValue; // 备份原始的 setFieldValue 方法
-    var _setFieldsValue = function _setFieldsValue(values) {
-      if ((0, _index.hasRowKey)(values)) {
-        originSetFieldsValue(values); // 调用原始方法
-      } else {
-        var mergedValues = (0, _index.processHyphenKeys)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, getFieldsValue()), values));
-        originSetFieldsValue(mergedValues); // 调用原始方法
+      var firstProps = !(arguments.length <= 0 ? undefined : arguments[0]) ? true : arguments.length <= 0 ? undefined : arguments[0];
+      var values = getFieldsValue(firstProps, arguments.length <= 1 ? undefined : arguments[1]);
+      if ((arguments.length <= 0 ? undefined : arguments[0]) === undefined) {
+        var result = (0, _lodash.merge)({}, values);
+        // @ts-ignore
+        var internalHooks = form.getInternalHooks(_FieldContext.HOOK_MARK);
+        var fields = internalHooks.getFields();
+        var deletePath = [];
+        // 找到带'-'的name
+        fields.forEach(function (field) {
+          var name = field.name;
+          if (Array.isArray(name)) {
+            var index = name.findIndex(function (item) {
+              return typeof item === 'string' && item.includes('-');
+            });
+            if (index !== -1) deletePath.push(name);
+          }
+          if (typeof name === 'string' && name.includes('-')) {
+            deletePath.push(name);
+          }
+        });
+        // 执行删除操作
+        deletePath.forEach(function (item) {
+          (0, _.deleteForPath)(result, item);
+        });
+        return result;
       }
+      return values;
     };
-    // const _setFieldValue: FormInstance<T>['setFieldValue'] = (namePath, value) => {
-    //   // 当namePath是数组且最后一个为数字时，就是行编辑
-    //   if (Array.isArray(namePath) && isNumber(namePath[namePath.length - 1])) {
-    //     const newNamePath: any = getArrayBeforeNumber(namePath); // formList&ProEditTable的行namePath
-    //     const getRightValue = getFieldsValue()[newNamePath[0]] ? getFieldsValue()[newNamePath[0]] : getFieldsValue()[newNamePath[0].split('-')[0]];
-    //     const getNamePathValue = getRightValue?.[newNamePath[newNamePath.length - 1]]; // 取当前行数据
-    //     const mergedValues: any = processHyphenKeys({ ...getNamePathValue, ...value });
-    //     originSetFieldValue(newNamePath, mergedValues); // 调用原始方法
-    //   } else {
-    //     originSetFieldValue(namePath, value);
-    //   }
-    // };
     var _validateFields = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
         var values, _values;
@@ -90,14 +81,6 @@ var useForm = function useForm(originForm) {
     }();
     form.getFieldsValue = _getFieldsValue;
     form.validateFields = _validateFields;
-    form.setFieldsValue = _setFieldsValue;
-    // form.setFieldValue = _setFieldValue;
-    // return () => {
-    //   // 组件卸载前恢复原始的 setFieldsValue 方法
-    //   form.setFieldsValue = originSetFieldsValue;
-    //   form.setFieldValue = originSetFieldValue;
-    // };
   }, [form]);
   return [form];
-};
-exports.useForm = useForm;
+};

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

@@ -0,0 +1,16 @@
+import type { InternalNamePath } from 'antd/lib/form/interface';
+import type { ProRule } from '../propsType';
+interface Props {
+    rules?: ProRule[];
+    required?: boolean;
+    isSelect: boolean;
+    label?: string;
+    names?: InternalNamePath[];
+    labelRequired?: boolean;
+    type?: string;
+}
+declare const useRules: (props: Props) => {
+    rules: ProRule[];
+    required?: boolean;
+};
+export default useRules;