@zat-design/sisyphus-react 3.6.4 → 3.6.5-beta.2

package/es/ProEditTable/components/RenderField/index.js

@@ -318,6 +318,12 @@ var RenderField = function RenderField(_ref) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!(!onFieldChange && !onChange)) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", null);
+        case 2:
           for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
             args[_key2] = _args2[_key2];
           }
@@ -326,47 +332,47 @@ var RenderField = function RenderField(_ref) {
           row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
-            _context.next = 18;
+            _context.next = 20;
             break;
           }
           _args = formatArgs(args);
           _args[1] = row;
           _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
           if (!_context.t0) {
-            _context.next = 12;
+            _context.next = 14;
             break;
           }
-          _context.next = 12;
+          _context.next = 14;
           return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
-        case 12:
+        case 14:
           _context.t1 = onFieldChange;
           if (!_context.t1) {
-            _context.next = 16;
+            _context.next = 18;
             break;
           }
-          _context.next = 16;
+          _context.next = 18;
           return onFieldChange.apply(void 0, _toConsumableArray(_args));
-        case 16:
-          _context.next = 27;
-          break;
         case 18:
+          _context.next = 29;
+          break;
+        case 20:
           _args = _args.concat([row, index, form]);
           _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
           if (!_context.t2) {
-            _context.next = 23;
+            _context.next = 25;
             break;
           }
-          _context.next = 23;
+          _context.next = 25;
           return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
-        case 23:
+        case 25:
           _context.t3 = onChange;
           if (!_context.t3) {
-            _context.next = 27;
+            _context.next = 29;
             break;
           }
-          _context.next = 27;
+          _context.next = 29;
           return onChange.apply(void 0, _toConsumableArray(_args));
-        case 27:
+        case 29:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (!isEqual(orgRow, row)) {
@@ -385,7 +391,7 @@ var RenderField = function RenderField(_ref) {
               d: Date.now()
             }
           });
-        case 30:
+        case 32:
         case "end":
           return _context.stop();
       }
@@ -409,6 +415,12 @@ var RenderField = function RenderField(_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (onBlur) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return", null);
+          case 2:
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
@@ -419,20 +431,20 @@ var RenderField = function RenderField(_ref) {
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
             if (!_context2.t0) {
-              _context2.next = 10;
+              _context2.next = 12;
               break;
             }
-            _context2.next = 10;
+            _context2.next = 12;
             return (_TargetComponent$prop4 = TargetComponent.props).onBlur.apply(_TargetComponent$prop4, _toConsumableArray(_args));
-          case 10:
+          case 12:
             _context2.t1 = onBlur;
             if (!_context2.t1) {
-              _context2.next = 14;
+              _context2.next = 16;
               break;
             }
-            _context2.next = 14;
+            _context2.next = 16;
             return onBlur.apply(void 0, _toConsumableArray(_args));
-          case 14:
+          case 16:
             // 判断属性是否变动
             form.setFieldValue(rowPath, row);
             if (!isEqual(orgRow, row)) {
@@ -445,23 +457,23 @@ var RenderField = function RenderField(_ref) {
               }
             }
             if (!isCell) {
-              _context2.next = 20;
+              _context2.next = 22;
               break;
             }
-            _context2.next = 19;
+            _context2.next = 21;
             return form.validateFields([cellName]);
-          case 19:
+          case 21:
             setState({
               cellNamePath: []
             });
-          case 20:
+          case 22:
             // 单行编辑时需要 强制更新视图
             setState({
               forceUpdate: {
                 d: Date.now()
               }
             });
-          case 21:
+          case 23:
           case "end":
             return _context2.stop();
         }

package/es/ProEditTable/utils/tools.d.ts

@@ -25,7 +25,7 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
  * @param params 当前列的参数
  * @param rowDisabled 行禁用参数
  */
-export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: any) => any;
 /** 表格自动滚动到报错位置
  */
 export declare const handleScrollToError: () => void;

package/es/ProEditTable/utils/tools.js

@@ -86,6 +86,7 @@ export var onDelete = function onDelete(_ref) {
  * @param rowDisabled 行禁用参数
  */
 export var getDisabled = function getDisabled(_ref2) {
+  var _ref3, _column$disabled;
   var globalControl = _ref2.globalControl,
     formDisabled = _ref2.formDisabled,
     column = _ref2.column,
@@ -147,7 +148,7 @@ export var getDisabled = function getDisabled(_ref2) {
   if (isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
     return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, _toConsumableArray(params)));
   }
-  return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
+  return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
 };
 /** 表格自动滚动到报错位置
  */
@@ -164,9 +165,9 @@ export var handleScrollToError = function handleScrollToError() {
         while (previousSibling) {
           if (previousSibling.nodeType === 1) {
             var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
-            var _ref3 = previousSibling.getBoundingClientRect() || {},
-              _ref3$width = _ref3.width,
-              width = _ref3$width === void 0 ? 0 : _ref3$width;
+            var _ref4 = previousSibling.getBoundingClientRect() || {},
+              _ref4$width = _ref4.width,
+              width = _ref4$width === void 0 ? 0 : _ref4$width;
             childOffsetLeft += width;
             if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
               childFixedLeft += width;

package/es/ProForm/components/FormFooter/index.js

@@ -34,7 +34,7 @@ var FormFooter = function FormFooter(props) {
       form.setFieldsValue(cache[formId]);
     }
     return cache;
-  }, []);
+  }, [formId]);
   var _onOk = function _onOk() {
     if (formId) {
       var values = form.getFieldsValue();

package/es/ProForm/components/base/InputNumber/index.js

@@ -35,6 +35,7 @@ var limitNumber = function limitNumber(num, _ref) {
   return num;
 };
 var InputNumber = function InputNumber(props) {
+  var _props$precision4;
   var placeholder = props.placeholder,
     className = props.className,
     otherProps = props.otherProps,
@@ -55,28 +56,33 @@ var InputNumber = function InputNumber(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var valueProps = {};
   var formatter = function formatter(value) {
+    var _props$precision;
     if (value === '') return '';
     var num = Number(value);
     if (Number.isNaN(num)) {
       return value;
     }
     var val = num.toLocaleString('en-US', {
-      maximumFractionDigits: (props === null || props === void 0 ? void 0 : props.precision) || 2
+      maximumFractionDigits: (_props$precision = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision !== void 0 ? _props$precision : 2
     });
     if (!activateRef.current) {
+      var _props$precision2;
       var _val$split = val.split('.'),
         _val$split2 = _slicedToArray(_val$split, 2),
         int = _val$split2[0],
         _val$split2$ = _val$split2[1],
         float = _val$split2$ === void 0 ? '' : _val$split2$;
-      return "".concat(int, ".").concat(float.padEnd((props === null || props === void 0 ? void 0 : props.precision) || 2, '0'));
+      if ((props === null || props === void 0 ? void 0 : props.precision) === 0) {
+        return int;
+      }
+      return "".concat(int, ".").concat(float.padEnd((_props$precision2 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision2 !== void 0 ? _props$precision2 : 2, '0'));
     }
     return val;
   };
   var _parser = function parser(value, precision) {
-    var num = Number(value.replace(/[\s,]+/g, ''));
     if (value === '') return value;
-    return Number.isNaN(num) || !precision ? value : num.toFixed(precision);
+    var num = Number(value.replace(/[\s,]+/g, ''));
+    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
   };
   if (valueType) {
     switch (valueType) {
@@ -88,8 +94,10 @@ var InputNumber = function InputNumber(props) {
         valueProps = {
           formatter: formatter,
           parser: function parser(val) {
-            return _parser(val, (props === null || props === void 0 ? void 0 : props.precision) || 2);
-          }
+            var _props$precision3;
+            return _parser(val, (_props$precision3 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision3 !== void 0 ? _props$precision3 : 2);
+          },
+          precision: (_props$precision4 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision4 !== void 0 ? _props$precision4 : 2
         };
         break;
       // 百分比
@@ -177,7 +185,7 @@ var InputNumber = function InputNumber(props) {
           var originValue = calc(Number(value), '/', 100);
           // 获取真实数据的小数位数
           var decimalDigits = getDecimalDigits(originValue);
-          if (decimalDigits > (precision || 4)) {
+          if (decimalDigits > (precision !== null && precision !== void 0 ? precision : 4)) {
             return _jsx(Container, {
               viewEmpty: viewEmpty,
               children: value
@@ -195,7 +203,7 @@ var InputNumber = function InputNumber(props) {
           var _originValue = calc(Number(value), '/', 1000);
           // 获取真实数据的小数位数
           var _decimalDigits = getDecimalDigits(_originValue);
-          if (_decimalDigits > (precision || 5)) {
+          if (_decimalDigits > (precision !== null && precision !== void 0 ? precision : 5)) {
             return _jsx(Container, {
               viewEmpty: viewEmpty,
               children: value
@@ -212,7 +220,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandth':
         return _jsx(Container, {
           viewEmpty: viewEmpty,
-          children: tools.formatAmount(value, precision || 2)
+          children: tools.formatAmount(value, precision !== null && precision !== void 0 ? precision : 2)
         });
       // CNY千分位
       case 'thousandthCNY':
@@ -232,7 +240,7 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _e$target2;
+    var _e$target, _props$precision5, _valueProps3, _e$target2;
     activateRef.current = false;
     var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
     if (_max !== undefined && value > _max) {
@@ -241,7 +249,8 @@ var InputNumber = function InputNumber(props) {
     if (_min !== undefined && value < _min) {
       value = _min;
     }
-    value = _parser(String(value), props.precision);
+    value = _parser(String(value), (_props$precision5 = props.precision) !== null && _props$precision5 !== void 0 ? _props$precision5 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.precision);
+    rest === null || rest === void 0 ? void 0 : rest.onChange(value);
     var limit = {
       min: Number(_min),
       max: Number(_max)

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

@@ -5,7 +5,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
-import { cloneDeep, isFunction } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { toArray } from '../../../utils';
 import { namesPathTransform } from './utils';
@@ -56,10 +55,6 @@ var FormList = function FormList(props, ref) {
         listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
-      // 可编辑表格的columns需要消除引用关系，防止串数据
-      if (column.type === 'ProEditTable' && !isFunction(column.fieldProps)) {
-        column.fieldProps.columns = cloneDeep(column.fieldProps.columns);
-      }
       return column;
     });
   }, [columns]);

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

@@ -160,7 +160,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var defaultOptionRender = function defaultOptionRender(rowData) {
     return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
   };
-  var handleFormat = optionRender || onFormat || defaultOptionRender;
+  var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
     handleFormat = function handleFormat(_ref5) {
       var value = _ref5.value,
@@ -681,6 +681,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       showCodeName: showCodeName,
       labelInValue: labelInValue,
       dataSource: options,
+      optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {

package/es/ProForm/index.js

@@ -229,7 +229,7 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return _jsx(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -247,7 +247,7 @@ var ProForm = function ProForm(props, ref) {
       block: 'center',
       behavior: 'smooth'
     },
-    children: _jsxs(_Row, _objectSpread(_objectSpread({
+    children: [_jsxs(_Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
       children: [_jsx(RenderFields, {
@@ -266,8 +266,8 @@ var ProForm = function ProForm(props, ref) {
         required: required,
         originalDiffTip: originalDiffTip,
         globalControl: globalControl
-      }), children, footerRender()]
-    }))
+      }), footerRender()]
+    })), children]
   }));
 };
 // @ts-ignore

package/es/ProForm/utils/useShouldUpdate.js

@@ -22,6 +22,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     names = formItemProps.names,
     dependencies = formItemProps.dependencies;
   var timerRef = useRef();
+  var needClear = useRef(); // 是否需要执行清值操作
   var showRef = useRef();
   var disabledRef = useRef();
   var requiredRef = useRef();
@@ -158,21 +159,30 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names)) {
+        // 当show为其他变为false的时候记录一次需要清值
+        if (_show !== showRef.current && _show === false) {
+          needClear.current = true;
+        }
         if (_show === false) {
           clearTimeout(timerRef.current);
           timerRef.current = setTimeout(function () {
+            if (needClear.current !== true) return;
             if (Array.isArray(names)) {
               form.resetFields(names);
             } else {
               var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
               form.resetFields([clearName]);
             }
-          }, 200);
+            needClear.current = false;
+          }, 300);
         } else {
+          needClear.current = false;
           clearTimeout(timerRef.current);
         }
       }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) ||
+      var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFun);
+      var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun);
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes ||
       // 值变更，需要同步更新函数式的fieldProps
       // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||

package/es/ProTable/index.js

@@ -14,7 +14,7 @@ var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stri
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
-import { cloneDeep, get, keyBy, assign } from 'lodash';
+import { get, keyBy, assign } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import { ReactSVG } from 'react-svg';
 import classnames from 'classnames';
@@ -135,9 +135,9 @@ function ProTable(props) {
         });
       });
       localColumns = ((_localColumns = localColumns) === null || _localColumns === void 0 ? void 0 : _localColumns.length) === 0 ? undefined : localColumns;
-      setCurColumns(cloneDeep(localColumns || propsColumns));
+      setCurColumns(localColumns || propsColumns);
     } else {
-      setCurColumns(cloneDeep(propsColumns));
+      setCurColumns(propsColumns);
     }
   }, [pathKey, cacheTime, propsColumns]);
   useEffect(function () {

package/lib/ProEditTable/components/RenderField/index.js

@@ -321,6 +321,12 @@ var RenderField = function RenderField(_ref) {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!(!onFieldChange && !onChange)) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", null);
+        case 2:
           for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
             args[_key2] = _args2[_key2];
           }
@@ -329,47 +335,47 @@ var RenderField = function RenderField(_ref) {
           row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
-            _context.next = 18;
+            _context.next = 20;
             break;
           }
           _args = formatArgs(args);
           _args[1] = row;
           _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
           if (!_context.t0) {
-            _context.next = 12;
+            _context.next = 14;
             break;
           }
-          _context.next = 12;
+          _context.next = 14;
           return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, (0, _toConsumableArray2.default)(_args));
-        case 12:
+        case 14:
           _context.t1 = onFieldChange;
           if (!_context.t1) {
-            _context.next = 16;
+            _context.next = 18;
             break;
           }
-          _context.next = 16;
+          _context.next = 18;
           return onFieldChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-        case 16:
-          _context.next = 27;
-          break;
         case 18:
+          _context.next = 29;
+          break;
+        case 20:
           _args = _args.concat([row, index, form]);
           _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
           if (!_context.t2) {
-            _context.next = 23;
+            _context.next = 25;
             break;
           }
-          _context.next = 23;
+          _context.next = 25;
           return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, (0, _toConsumableArray2.default)(_args));
-        case 23:
+        case 25:
           _context.t3 = onChange;
           if (!_context.t3) {
-            _context.next = 27;
+            _context.next = 29;
             break;
           }
-          _context.next = 27;
+          _context.next = 29;
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-        case 27:
+        case 29:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
@@ -388,7 +394,7 @@ var RenderField = function RenderField(_ref) {
               d: Date.now()
             }
           });
-        case 30:
+        case 32:
         case "end":
           return _context.stop();
       }
@@ -412,6 +418,12 @@ var RenderField = function RenderField(_ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (onBlur) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return", null);
+          case 2:
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
@@ -422,20 +434,20 @@ var RenderField = function RenderField(_ref) {
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
             if (!_context2.t0) {
-              _context2.next = 10;
+              _context2.next = 12;
               break;
             }
-            _context2.next = 10;
+            _context2.next = 12;
             return (_TargetComponent$prop4 = TargetComponent.props).onBlur.apply(_TargetComponent$prop4, (0, _toConsumableArray2.default)(_args));
-          case 10:
+          case 12:
             _context2.t1 = onBlur;
             if (!_context2.t1) {
-              _context2.next = 14;
+              _context2.next = 16;
               break;
             }
-            _context2.next = 14;
+            _context2.next = 16;
             return onBlur.apply(void 0, (0, _toConsumableArray2.default)(_args));
-          case 14:
+          case 16:
             // 判断属性是否变动
             form.setFieldValue(rowPath, row);
             if (!(0, _lodash.isEqual)(orgRow, row)) {
@@ -448,23 +460,23 @@ var RenderField = function RenderField(_ref) {
               }
             }
             if (!isCell) {
-              _context2.next = 20;
+              _context2.next = 22;
               break;
             }
-            _context2.next = 19;
+            _context2.next = 21;
             return form.validateFields([cellName]);
-          case 19:
+          case 21:
             setState({
               cellNamePath: []
             });
-          case 20:
+          case 22:
             // 单行编辑时需要 强制更新视图
             setState({
               forceUpdate: {
                 d: Date.now()
               }
             });
-          case 21:
+          case 23:
           case "end":
             return _context2.stop();
         }

package/lib/ProEditTable/utils/tools.d.ts

@@ -25,7 +25,7 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
  * @param params 当前列的参数
  * @param rowDisabled 行禁用参数
  */
-export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: any) => any;
 /** 表格自动滚动到报错位置
  */
 export declare const handleScrollToError: () => void;

package/lib/ProEditTable/utils/tools.js

@@ -93,6 +93,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
  * @param rowDisabled 行禁用参数
  */
 var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
+  var _ref3, _column$disabled;
   var globalControl = _ref2.globalControl,
     formDisabled = _ref2.formDisabled,
     column = _ref2.column,
@@ -154,7 +155,7 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
   if ((0, _lodash.isFunction)(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
     return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, (0, _toConsumableArray2.default)(params)));
   }
-  return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
+  return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
 };
 /** 表格自动滚动到报错位置
  */
@@ -171,9 +172,9 @@ var handleScrollToError = exports.handleScrollToError = function handleScrollToE
         while (previousSibling) {
           if (previousSibling.nodeType === 1) {
             var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
-            var _ref3 = previousSibling.getBoundingClientRect() || {},
-              _ref3$width = _ref3.width,
-              width = _ref3$width === void 0 ? 0 : _ref3$width;
+            var _ref4 = previousSibling.getBoundingClientRect() || {},
+              _ref4$width = _ref4.width,
+              width = _ref4$width === void 0 ? 0 : _ref4$width;
             childOffsetLeft += width;
             if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
               childFixedLeft += width;

package/lib/ProForm/components/FormFooter/index.js

@@ -38,7 +38,7 @@ var FormFooter = function FormFooter(props) {
       form.setFieldsValue(cache[formId]);
     }
     return cache;
-  }, []);
+  }, [formId]);
   var _onOk = function _onOk() {
     if (formId) {
       var values = form.getFieldsValue();

package/lib/ProForm/components/base/InputNumber/index.js

@@ -39,6 +39,7 @@ var limitNumber = function limitNumber(num, _ref) {
   return num;
 };
 var InputNumber = function InputNumber(props) {
+  var _props$precision4;
   var placeholder = props.placeholder,
     className = props.className,
     otherProps = props.otherProps,
@@ -59,28 +60,33 @@ var InputNumber = function InputNumber(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var valueProps = {};
   var formatter = function formatter(value) {
+    var _props$precision;
     if (value === '') return '';
     var num = Number(value);
     if (Number.isNaN(num)) {
       return value;
     }
     var val = num.toLocaleString('en-US', {
-      maximumFractionDigits: (props === null || props === void 0 ? void 0 : props.precision) || 2
+      maximumFractionDigits: (_props$precision = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision !== void 0 ? _props$precision : 2
     });
     if (!activateRef.current) {
+      var _props$precision2;
       var _val$split = val.split('.'),
         _val$split2 = (0, _slicedToArray2.default)(_val$split, 2),
         int = _val$split2[0],
         _val$split2$ = _val$split2[1],
         float = _val$split2$ === void 0 ? '' : _val$split2$;
-      return "".concat(int, ".").concat(float.padEnd((props === null || props === void 0 ? void 0 : props.precision) || 2, '0'));
+      if ((props === null || props === void 0 ? void 0 : props.precision) === 0) {
+        return int;
+      }
+      return "".concat(int, ".").concat(float.padEnd((_props$precision2 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision2 !== void 0 ? _props$precision2 : 2, '0'));
     }
     return val;
   };
   var _parser = function parser(value, precision) {
-    var num = Number(value.replace(/[\s,]+/g, ''));
     if (value === '') return value;
-    return Number.isNaN(num) || !precision ? value : num.toFixed(precision);
+    var num = Number(value.replace(/[\s,]+/g, ''));
+    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
   };
   if (valueType) {
     switch (valueType) {
@@ -92,8 +98,10 @@ var InputNumber = function InputNumber(props) {
         valueProps = {
           formatter: formatter,
           parser: function parser(val) {
-            return _parser(val, (props === null || props === void 0 ? void 0 : props.precision) || 2);
-          }
+            var _props$precision3;
+            return _parser(val, (_props$precision3 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision3 !== void 0 ? _props$precision3 : 2);
+          },
+          precision: (_props$precision4 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision4 !== void 0 ? _props$precision4 : 2
         };
         break;
       // 百分比
@@ -181,7 +189,7 @@ var InputNumber = function InputNumber(props) {
           var originValue = calc(Number(value), '/', 100);
           // 获取真实数据的小数位数
           var decimalDigits = (0, _index.getDecimalDigits)(originValue);
-          if (decimalDigits > (precision || 4)) {
+          if (decimalDigits > (precision !== null && precision !== void 0 ? precision : 4)) {
             return (0, _jsxRuntime.jsx)(_Container.default, {
               viewEmpty: viewEmpty,
               children: value
@@ -199,7 +207,7 @@ var InputNumber = function InputNumber(props) {
           var _originValue = calc(Number(value), '/', 1000);
           // 获取真实数据的小数位数
           var _decimalDigits = (0, _index.getDecimalDigits)(_originValue);
-          if (_decimalDigits > (precision || 5)) {
+          if (_decimalDigits > (precision !== null && precision !== void 0 ? precision : 5)) {
             return (0, _jsxRuntime.jsx)(_Container.default, {
               viewEmpty: viewEmpty,
               children: value
@@ -216,7 +224,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandth':
         return (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: _utils.tools.formatAmount(value, precision || 2)
+          children: _utils.tools.formatAmount(value, precision !== null && precision !== void 0 ? precision : 2)
         });
       // CNY千分位
       case 'thousandthCNY':
@@ -236,7 +244,7 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _e$target2;
+    var _e$target, _props$precision5, _valueProps3, _e$target2;
     activateRef.current = false;
     var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
     if (_max !== undefined && value > _max) {
@@ -245,7 +253,8 @@ var InputNumber = function InputNumber(props) {
     if (_min !== undefined && value < _min) {
       value = _min;
     }
-    value = _parser(String(value), props.precision);
+    value = _parser(String(value), (_props$precision5 = props.precision) !== null && _props$precision5 !== void 0 ? _props$precision5 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.precision);
+    rest === null || rest === void 0 ? void 0 : rest.onChange(value);
     var limit = {
       min: Number(_min),
       max: Number(_max)

package/lib/ProForm/components/combination/FormList/index.js

@@ -11,7 +11,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
-var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -62,10 +61,6 @@ var FormList = function FormList(props, ref) {
         listName: [].concat((0, _toConsumableArray2.default)(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
-      // 可编辑表格的columns需要消除引用关系，防止串数据
-      if (column.type === 'ProEditTable' && !(0, _lodash.isFunction)(column.fieldProps)) {
-        column.fieldProps.columns = (0, _lodash.cloneDeep)(column.fieldProps.columns);
-      }
       return column;
     });
   }, [columns]);

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -157,7 +157,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var defaultOptionRender = function defaultOptionRender(rowData) {
     return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
   };
-  var handleFormat = optionRender || onFormat || defaultOptionRender;
+  var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
     handleFormat = function handleFormat(_ref5) {
       var value = _ref5.value,
@@ -678,6 +678,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       showCodeName: showCodeName,
       labelInValue: labelInValue,
       dataSource: options,
+      optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {

package/lib/ProForm/index.js

@@ -230,7 +230,7 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return (0, _jsxRuntime.jsx)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsxs)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -248,7 +248,7 @@ var ProForm = function ProForm(props, ref) {
       block: 'center',
       behavior: 'smooth'
     },
-    children: (0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [(0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       gutter: 24
     }, rowProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
@@ -267,8 +267,8 @@ var ProForm = function ProForm(props, ref) {
         required: required,
         originalDiffTip: originalDiffTip,
         globalControl: globalControl
-      }), children, footerRender()]
-    }))
+      }), footerRender()]
+    })), children]
   }));
 };
 // @ts-ignore

package/lib/ProForm/utils/useShouldUpdate.js

@@ -29,6 +29,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     names = formItemProps.names,
     dependencies = formItemProps.dependencies;
   var timerRef = (0, _react.useRef)();
+  var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
   var showRef = (0, _react.useRef)();
   var disabledRef = (0, _react.useRef)();
   var requiredRef = (0, _react.useRef)();
@@ -165,21 +166,30 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names)) {
+        // 当show为其他变为false的时候记录一次需要清值
+        if (_show !== showRef.current && _show === false) {
+          needClear.current = true;
+        }
         if (_show === false) {
           clearTimeout(timerRef.current);
           timerRef.current = setTimeout(function () {
+            if (needClear.current !== true) return;
             if (Array.isArray(names)) {
               form.resetFields(names);
             } else {
               var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
               form.resetFields([clearName]);
             }
-          }, 200);
+            needClear.current = false;
+          }, 300);
         } else {
+          needClear.current = false;
           clearTimeout(timerRef.current);
         }
       }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) ||
+      var equalRes = (0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun);
+      var proEqualRes = (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes ||
       // 值变更，需要同步更新函数式的fieldProps
       // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||

package/lib/ProTable/index.js

@@ -139,9 +139,9 @@ function ProTable(props) {
         });
       });
       localColumns = ((_localColumns = localColumns) === null || _localColumns === void 0 ? void 0 : _localColumns.length) === 0 ? undefined : localColumns;
-      setCurColumns((0, _lodash.cloneDeep)(localColumns || propsColumns));
+      setCurColumns(localColumns || propsColumns);
     } else {
-      setCurColumns((0, _lodash.cloneDeep)(propsColumns));
+      setCurColumns(propsColumns);
     }
   }, [pathKey, cacheTime, propsColumns]);
   (0, _react.useEffect)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.4",
+  "version": "3.6.5-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.28",
+    "@zat-design/utils": "^1.1.29",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",