npm - @zat-design/sisyphus-react - Versions diffs - 3.6.4-beta.11 → 3.6.4-beta.12 - Mend

@zat-design/sisyphus-react 3.6.4-beta.11 → 3.6.4-beta.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

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

@@ -17,7 +17,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 /* eslint-disable prefer-const */
 import React, { useCallback, useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, omit, isFunction } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference, getDisabled } from '../../utils/tools';
@@ -296,107 +296,101 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _len2,
-        args,
-        _key2,
-        _args,
-        rowPath,
-        row,
-        orgRow,
-        _TargetComponent,
-        _TargetComponent$prop,
-        _TargetComponent$prop2,
-        _TargetComponent2,
-        _TargetComponent2$pro,
-        _TargetComponent$prop3,
-        _Object$keys,
-        _Object$keys$map,
-        diff,
-        validateFieldKeys,
-        _args2 = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              args[_key2] = _args2[_key2];
-            }
-            _args = [].concat(args);
-            rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = form.getFieldValue(rowPath, true);
-            orgRow = cloneDeep(row);
-            if (!onFieldChange) {
-              _context.next = 18;
-              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;
-              break;
-            }
+  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _len2,
+      args,
+      _key2,
+      _args,
+      rowPath,
+      row,
+      orgRow,
+      _TargetComponent,
+      _TargetComponent$prop,
+      _TargetComponent$prop2,
+      _TargetComponent2,
+      _TargetComponent2$pro,
+      _TargetComponent$prop3,
+      _Object$keys,
+      _Object$keys$map,
+      diff,
+      validateFieldKeys,
+      _args2 = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            args[_key2] = _args2[_key2];
+          }
+          _args = [].concat(args);
+          rowPath = [].concat(_toConsumableArray(namePath), [index]);
+          row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
+          orgRow = cloneDeep(row);
+          if (!onFieldChange) {
+            _context.next = 18;
+            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;
-            return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
-          case 12:
-            _context.t1 = onFieldChange;
-            if (!_context.t1) {
-              _context.next = 16;
-              break;
-            }
+            break;
+          }
+          _context.next = 12;
+          return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
+        case 12:
+          _context.t1 = onFieldChange;
+          if (!_context.t1) {
             _context.next = 16;
-            return onFieldChange.apply(void 0, _toConsumableArray(_args));
-          case 16:
-            _context.next = 27;
             break;
-          case 18:
-            _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;
-              break;
-            }
+          }
+          _context.next = 16;
+          return onFieldChange.apply(void 0, _toConsumableArray(_args));
+        case 16:
+          _context.next = 27;
+          break;
+        case 18:
+          _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;
-            return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
-          case 23:
-            _context.t3 = onChange;
-            if (!_context.t3) {
-              _context.next = 27;
-              break;
-            }
+            break;
+          }
+          _context.next = 23;
+          return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
+        case 23:
+          _context.t3 = onChange;
+          if (!_context.t3) {
             _context.next = 27;
-            return onChange.apply(void 0, _toConsumableArray(_args));
-          case 27:
-            // 判断属性是否变动
-            form.setFieldValue(rowPath, _objectSpread({}, row));
-            if (!isEqual(orgRow, row)) {
-              diff = difference(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-                return [].concat(_toConsumableArray(rowPath), [key]);
-              });
-              if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-                setTimeout(function () {
-                  form.validateFields(validateFieldKeys);
-                }, 100);
-              }
-            }
-            // 单行编辑时需要 强制更新视图
-            setState({
-              forceUpdate: {
-                d: Date.now()
-              }
+            break;
+          }
+          _context.next = 27;
+          return onChange.apply(void 0, _toConsumableArray(_args));
+        case 27:
+          // 判断属性是否变动
+          form.setFieldValue(rowPath, row);
+          if (!isEqual(orgRow, row)) {
+            diff = difference(row, orgRow) || {};
+            validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+              return [].concat(_toConsumableArray(rowPath), [key]);
             });
-          case 30:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function _onChange() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+            if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
+            }
+          }
+          setState({
+            forceUpdate: {
+              d: Date.now()
+            }
+          });
+        case 30:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), 300);
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
@@ -440,7 +434,7 @@ var RenderField = function RenderField(_ref) {
             return onBlur.apply(void 0, _toConsumableArray(_args));
           case 14:
             // 判断属性是否变动
-            form.setFieldValue(rowPath, _objectSpread({}, row));
+            form.setFieldValue(rowPath, row);
             if (!isEqual(orgRow, row)) {
               diff = difference(row, orgRow) || {};
               validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {

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

@@ -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 CHANGED Viewed

@@ -35,7 +35,6 @@ 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,
@@ -56,33 +55,28 @@ 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$precision = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision !== void 0 ? _props$precision : 2
+      maximumFractionDigits: (props === null || props === void 0 ? 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$;
-      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 "".concat(int, ".").concat(float.padEnd((props === null || props === void 0 ? void 0 : props.precision) || 2, '0'));
     }
     return val;
   };
   var _parser = function parser(value, precision) {
-    if (value === '') return value;
     var num = Number(value.replace(/[\s,]+/g, ''));
-    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
+    if (value === '') return value;
+    return Number.isNaN(num) || !precision ? value : num.toFixed(precision);
   };
   if (valueType) {
     switch (valueType) {
@@ -94,10 +88,8 @@ var InputNumber = function InputNumber(props) {
         valueProps = {
           formatter: formatter,
           parser: function parser(val) {
-            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
+            return _parser(val, (props === null || props === void 0 ? void 0 : props.precision) || 2);
+          }
         };
         break;
       // 百分比
@@ -185,7 +177,7 @@ var InputNumber = function InputNumber(props) {
           var originValue = calc(Number(value), '/', 100);
           // 获取真实数据的小数位数
           var decimalDigits = getDecimalDigits(originValue);
-          if (decimalDigits > (precision !== null && precision !== void 0 ? precision : 4)) {
+          if (decimalDigits > (precision || 4)) {
             return _jsx(Container, {
               viewEmpty: viewEmpty,
               children: value
@@ -203,7 +195,7 @@ var InputNumber = function InputNumber(props) {
           var _originValue = calc(Number(value), '/', 1000);
           // 获取真实数据的小数位数
           var _decimalDigits = getDecimalDigits(_originValue);
-          if (_decimalDigits > (precision !== null && precision !== void 0 ? precision : 5)) {
+          if (_decimalDigits > (precision || 5)) {
             return _jsx(Container, {
               viewEmpty: viewEmpty,
               children: value
@@ -220,7 +212,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandth':
         return _jsx(Container, {
           viewEmpty: viewEmpty,
-          children: tools.formatAmount(value, precision !== null && precision !== void 0 ? precision : 2)
+          children: tools.formatAmount(value, precision || 2)
         });
       // CNY千分位
       case 'thousandthCNY':
@@ -240,7 +232,7 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _props$precision5, _valueProps3, _e$target2;
+    var _e$target, _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) {
@@ -249,8 +241,7 @@ var InputNumber = function InputNumber(props) {
     if (_min !== undefined && value < _min) {
       value = _min;
     }
-    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);
+    value = _parser(String(value), props.precision);
     var limit = {
       min: Number(_min),
       max: Number(_max)

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

@@ -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 CHANGED Viewed

@@ -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/lib/ProEditTable/components/RenderField/index.js CHANGED Viewed

@@ -299,107 +299,101 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-      var _len2,
-        args,
-        _key2,
-        _args,
-        rowPath,
-        row,
-        orgRow,
-        _TargetComponent,
-        _TargetComponent$prop,
-        _TargetComponent$prop2,
-        _TargetComponent2,
-        _TargetComponent2$pro,
-        _TargetComponent$prop3,
-        _Object$keys,
-        _Object$keys$map,
-        diff,
-        validateFieldKeys,
-        _args2 = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              args[_key2] = _args2[_key2];
-            }
-            _args = [].concat(args);
-            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-            row = form.getFieldValue(rowPath, true);
-            orgRow = (0, _lodash.cloneDeep)(row);
-            if (!onFieldChange) {
-              _context.next = 18;
-              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;
-              break;
-            }
+  var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _len2,
+      args,
+      _key2,
+      _args,
+      rowPath,
+      row,
+      orgRow,
+      _TargetComponent,
+      _TargetComponent$prop,
+      _TargetComponent$prop2,
+      _TargetComponent2,
+      _TargetComponent2$pro,
+      _TargetComponent$prop3,
+      _Object$keys,
+      _Object$keys$map,
+      diff,
+      validateFieldKeys,
+      _args2 = arguments;
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            args[_key2] = _args2[_key2];
+          }
+          _args = [].concat(args);
+          rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
+          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;
+            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;
-            return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, (0, _toConsumableArray2.default)(_args));
-          case 12:
-            _context.t1 = onFieldChange;
-            if (!_context.t1) {
-              _context.next = 16;
-              break;
-            }
+            break;
+          }
+          _context.next = 12;
+          return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, (0, _toConsumableArray2.default)(_args));
+        case 12:
+          _context.t1 = onFieldChange;
+          if (!_context.t1) {
             _context.next = 16;
-            return onFieldChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-          case 16:
-            _context.next = 27;
             break;
-          case 18:
-            _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;
-              break;
-            }
+          }
+          _context.next = 16;
+          return onFieldChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
+        case 16:
+          _context.next = 27;
+          break;
+        case 18:
+          _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;
-            return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, (0, _toConsumableArray2.default)(_args));
-          case 23:
-            _context.t3 = onChange;
-            if (!_context.t3) {
-              _context.next = 27;
-              break;
-            }
+            break;
+          }
+          _context.next = 23;
+          return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, (0, _toConsumableArray2.default)(_args));
+        case 23:
+          _context.t3 = onChange;
+          if (!_context.t3) {
             _context.next = 27;
-            return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-          case 27:
-            // 判断属性是否变动
-            form.setFieldValue(rowPath, (0, _objectSpread2.default)({}, row));
-            if (!(0, _lodash.isEqual)(orgRow, row)) {
-              diff = (0, _tools.difference)(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-                return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
-              });
-              if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-                setTimeout(function () {
-                  form.validateFields(validateFieldKeys);
-                }, 100);
-              }
-            }
-            // 单行编辑时需要 强制更新视图
-            setState({
-              forceUpdate: {
-                d: Date.now()
-              }
+            break;
+          }
+          _context.next = 27;
+          return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
+        case 27:
+          // 判断属性是否变动
+          form.setFieldValue(rowPath, row);
+          if (!(0, _lodash.isEqual)(orgRow, row)) {
+            diff = (0, _tools.difference)(row, orgRow) || {};
+            validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+              return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
             });
-          case 30:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function _onChange() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+            if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
+            }
+          }
+          setState({
+            forceUpdate: {
+              d: Date.now()
+            }
+          });
+        case 30:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), 300);
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
@@ -443,7 +437,7 @@ var RenderField = function RenderField(_ref) {
             return onBlur.apply(void 0, (0, _toConsumableArray2.default)(_args));
           case 14:
             // 判断属性是否变动
-            form.setFieldValue(rowPath, (0, _objectSpread2.default)({}, row));
+            form.setFieldValue(rowPath, row);
             if (!(0, _lodash.isEqual)(orgRow, row)) {
               diff = (0, _tools.difference)(row, orgRow) || {};
               validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {

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

@@ -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 CHANGED Viewed

@@ -39,7 +39,6 @@ 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,
@@ -60,33 +59,28 @@ 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$precision = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision !== void 0 ? _props$precision : 2
+      maximumFractionDigits: (props === null || props === void 0 ? 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$;
-      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 "".concat(int, ".").concat(float.padEnd((props === null || props === void 0 ? void 0 : props.precision) || 2, '0'));
     }
     return val;
   };
   var _parser = function parser(value, precision) {
-    if (value === '') return value;
     var num = Number(value.replace(/[\s,]+/g, ''));
-    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
+    if (value === '') return value;
+    return Number.isNaN(num) || !precision ? value : num.toFixed(precision);
   };
   if (valueType) {
     switch (valueType) {
@@ -98,10 +92,8 @@ var InputNumber = function InputNumber(props) {
         valueProps = {
           formatter: formatter,
           parser: function parser(val) {
-            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
+            return _parser(val, (props === null || props === void 0 ? void 0 : props.precision) || 2);
+          }
         };
         break;
       // 百分比
@@ -189,7 +181,7 @@ var InputNumber = function InputNumber(props) {
           var originValue = calc(Number(value), '/', 100);
           // 获取真实数据的小数位数
           var decimalDigits = (0, _index.getDecimalDigits)(originValue);
-          if (decimalDigits > (precision !== null && precision !== void 0 ? precision : 4)) {
+          if (decimalDigits > (precision || 4)) {
             return (0, _jsxRuntime.jsx)(_Container.default, {
               viewEmpty: viewEmpty,
               children: value
@@ -207,7 +199,7 @@ var InputNumber = function InputNumber(props) {
           var _originValue = calc(Number(value), '/', 1000);
           // 获取真实数据的小数位数
           var _decimalDigits = (0, _index.getDecimalDigits)(_originValue);
-          if (_decimalDigits > (precision !== null && precision !== void 0 ? precision : 5)) {
+          if (_decimalDigits > (precision || 5)) {
             return (0, _jsxRuntime.jsx)(_Container.default, {
               viewEmpty: viewEmpty,
               children: value
@@ -224,7 +216,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandth':
         return (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: _utils.tools.formatAmount(value, precision !== null && precision !== void 0 ? precision : 2)
+          children: _utils.tools.formatAmount(value, precision || 2)
         });
       // CNY千分位
       case 'thousandthCNY':
@@ -244,7 +236,7 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _props$precision5, _valueProps3, _e$target2;
+    var _e$target, _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) {
@@ -253,8 +245,7 @@ var InputNumber = function InputNumber(props) {
     if (_min !== undefined && value < _min) {
       value = _min;
     }
-    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);
+    value = _parser(String(value), props.precision);
     var limit = {
       min: Number(_min),
       max: Number(_max)

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

@@ -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 CHANGED Viewed

@@ -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/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.4-beta.11",
+  "version": "3.6.4-beta.12",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",