@zat-design/sisyphus-react 3.14.3 → 3.14.4-beta.1

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

@@ -9,7 +9,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
 /* eslint-disable prefer-const */
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
-import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
+import { cloneDeep, isEqual, debounce, omit, isFunction, get } from 'lodash';
 import valueTypeMap from "../../../ProForm/utils/valueType";
 import transformMap from "../../utils/transform";
 import { getNamePath, difference, getDisabled } from "../../utils/tools";
@@ -26,7 +26,7 @@ import ListChangedWrapper from "./ListChangedWrapper";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 var RenderField = _ref => {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -85,6 +85,7 @@ var RenderField = _ref => {
   var _disabled = false;
   var _desensitization = desensitization || [];
   var isCell = mode === 'cell';
+  var isSingleMode = mode === 'single';
   if (isCell) {
     record['is-view'] = !isEqual(cellNamePath, cellName);
   }
@@ -188,6 +189,32 @@ var RenderField = _ref => {
   var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
     validateTrigger
   });
+
+  // 只在 single 模式下，当这些函数类型存在时，自动添加 shouldUpdate
+  // 因为这些函数依赖行数据，当行数据变化时需要重新计算
+  var hasFunctionDependency = isFunction(column === null || column === void 0 ? void 0 : column.disabled) ||
+  // disabled 是函数
+  isFunction(fieldProps) ||
+  // fieldProps 是函数
+  isFunction(required) ||
+  // required 是函数
+  isFunction(rules) ||
+  // rules 是函数
+  isFunction(isEditable) ||
+  // isEditable 是函数
+  isFunction(_editRender) ||
+  // component/editRender 是函数
+  isFunction(viewRender); // viewRender 是函数
+
+  if (isSingleMode && hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
+    // 使用 shouldUpdate 监听同一行的数据变化
+    _formItemProps.shouldUpdate = (prevValues, currentValues) => {
+      var prevRow = get(prevValues, [...namePath, index]);
+      var currentRow = get(currentValues, [...namePath, index]);
+      // 如果行数据发生变化，则重新渲染
+      return !isEqual(prevRow, currentRow);
+    };
+  }
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -567,10 +594,46 @@ var RenderField = _ref => {
   var _className = classNames({
     [className]: className
   });
-  var getFieldItem = () => {
-    var _componentProps;
+  var getFieldItem = function getFieldItem() {
+    var _finalComponentProps;
+    var shouldUpdateMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
+    var finalComponentProps = componentProps;
+    if (shouldUpdateMode) {
+      // 重新获取最新的行数据
+      var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
+      var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
+      var latestOptions = {
+        index,
+        form,
+        name: column === null || column === void 0 ? void 0 : column.name,
+        namePath: [...namePath, index]
+      };
+      var latestRowParams = [latestCurrentValue, latestRowData, latestOptions];
+
+      // 重新计算 fieldProps
+      var latestFieldProps = fieldProps || formItemProps || {};
+      if (isFunction(fieldProps)) {
+        latestFieldProps = fieldProps(...latestRowParams);
+      }
+
+      // 重新计算 disabled
+      var latestDisabled = getDisabled({
+        globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+        formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+        column,
+        tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+        columnFieldProps: latestFieldProps,
+        params: latestRowParams
+      });
+
+      // 更新 componentProps 中的 disabled 和 fieldProps
+      finalComponentProps = _objectSpread(_objectSpread({}, componentProps), {}, {
+        disabled: latestDisabled
+      }, latestFieldProps);
+    }
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, componentProps));
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, finalComponentProps)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, finalComponentProps));
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/_jsx(ListChangedWrapper, {
         name: cellName,
@@ -594,15 +657,15 @@ var RenderField = _ref => {
         children: FieldComponent
       });
     }
-    if ((_componentProps = componentProps) !== null && _componentProps !== void 0 && _componentProps.confirm) {
-      FieldComponent = /*#__PURE__*/_jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+    if ((_finalComponentProps = finalComponentProps) !== null && _finalComponentProps !== void 0 && _finalComponentProps.confirm) {
+      FieldComponent = /*#__PURE__*/_jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
         children: FieldComponent
       }));
     }
     FormItem = TargetComponent ? /*#__PURE__*/_jsx(_Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
-      // 移除非必要字段
+    }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+      // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -613,7 +676,7 @@ var RenderField = _ref => {
       FormItem = /*#__PURE__*/_jsx(_Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
       }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-        children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+        children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
           otherProps: otherProps,
           fields: fields,
           operation: operation,
@@ -624,11 +687,13 @@ var RenderField = _ref => {
     return FormItem;
   };
   return /*#__PURE__*/_jsx(FieldProvider, {
-    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: _formItemProps.shouldUpdate ? /*#__PURE__*/_jsx(_Form.Item, {
       noStyle: true,
       shouldUpdate: _formItemProps.shouldUpdate,
-      children: () => getFieldItem()
+      children: () => {
+        return getFieldItem(true);
+      }
     }) : getFieldItem()
   });
 };

package/es/ProEditTable/utils/index.js

@@ -15,6 +15,7 @@ import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
 import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from "./config";
 import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeepFilterNode } from "./tools";
+import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
 import tipSvg from "../../assets/tip.svg";
@@ -85,7 +86,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, lastRecord, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -109,7 +110,7 @@ var getActionColumn = config => {
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 13:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
-              _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
+              lastRecord = filterInternalFields((_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record); // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
                 _context.next = 19;
@@ -120,7 +121,7 @@ var getActionColumn = config => {
               break;
             case 19:
               _context.next = 21;
-              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(lastRecord, {
                 form,
                 index,
                 tableLength,
@@ -135,7 +136,7 @@ var getActionColumn = config => {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [...name, index],
                   virtualRowName: rowName,
-                  record,
+                  record: lastRecord,
                   result,
                   validateKeys
                 }));

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

@@ -33,7 +33,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = _ref => {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -92,6 +92,7 @@ var RenderField = _ref => {
   var _disabled = false;
   var _desensitization = desensitization || [];
   var isCell = mode === 'cell';
+  var isSingleMode = mode === 'single';
   if (isCell) {
     record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
   }
@@ -195,6 +196,32 @@ var RenderField = _ref => {
   var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
     validateTrigger
   });
+
+  // 只在 single 模式下，当这些函数类型存在时，自动添加 shouldUpdate
+  // 因为这些函数依赖行数据，当行数据变化时需要重新计算
+  var hasFunctionDependency = (0, _lodash.isFunction)(column === null || column === void 0 ? void 0 : column.disabled) ||
+  // disabled 是函数
+  (0, _lodash.isFunction)(fieldProps) ||
+  // fieldProps 是函数
+  (0, _lodash.isFunction)(required) ||
+  // required 是函数
+  (0, _lodash.isFunction)(rules) ||
+  // rules 是函数
+  (0, _lodash.isFunction)(isEditable) ||
+  // isEditable 是函数
+  (0, _lodash.isFunction)(_editRender) ||
+  // component/editRender 是函数
+  (0, _lodash.isFunction)(viewRender); // viewRender 是函数
+
+  if (isSingleMode && hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
+    // 使用 shouldUpdate 监听同一行的数据变化
+    _formItemProps.shouldUpdate = (prevValues, currentValues) => {
+      var prevRow = (0, _lodash.get)(prevValues, [...namePath, index]);
+      var currentRow = (0, _lodash.get)(currentValues, [...namePath, index]);
+      // 如果行数据发生变化，则重新渲染
+      return !(0, _lodash.isEqual)(prevRow, currentRow);
+    };
+  }
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -574,10 +601,46 @@ var RenderField = _ref => {
   var _className = (0, _classnames.default)({
     [className]: className
   });
-  var getFieldItem = () => {
-    var _componentProps;
+  var getFieldItem = function getFieldItem() {
+    var _finalComponentProps;
+    var shouldUpdateMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
+    var finalComponentProps = componentProps;
+    if (shouldUpdateMode) {
+      // 重新获取最新的行数据
+      var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
+      var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
+      var latestOptions = {
+        index,
+        form,
+        name: column === null || column === void 0 ? void 0 : column.name,
+        namePath: [...namePath, index]
+      };
+      var latestRowParams = [latestCurrentValue, latestRowData, latestOptions];
+
+      // 重新计算 fieldProps
+      var latestFieldProps = fieldProps || formItemProps || {};
+      if ((0, _lodash.isFunction)(fieldProps)) {
+        latestFieldProps = fieldProps(...latestRowParams);
+      }
+
+      // 重新计算 disabled
+      var latestDisabled = (0, _tools.getDisabled)({
+        globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+        formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+        column,
+        tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+        columnFieldProps: latestFieldProps,
+        params: latestRowParams
+      });
+
+      // 更新 componentProps 中的 disabled 和 fieldProps
+      finalComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+        disabled: latestDisabled
+      }, latestFieldProps);
+    }
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, finalComponentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, finalComponentProps));
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
@@ -601,15 +664,15 @@ var RenderField = _ref => {
         children: FieldComponent
       });
     }
-    if ((_componentProps = componentProps) !== null && _componentProps !== void 0 && _componentProps.confirm) {
-      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+    if ((_finalComponentProps = finalComponentProps) !== null && _finalComponentProps !== void 0 && _finalComponentProps.confirm) {
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, finalComponentProps), {}, {
         children: FieldComponent
       }));
     }
     FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       validateFirst: true
-    }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
-      // 移除非必要字段
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+      // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -620,7 +683,7 @@ var RenderField = _ref => {
       FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
       }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-        children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+        children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, finalComponentProps), {}, {
           otherProps: otherProps,
           fields: fields,
           operation: operation,
@@ -631,11 +694,13 @@ var RenderField = _ref => {
     return FormItem;
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: _formItemProps.shouldUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
       noStyle: true,
       shouldUpdate: _formItemProps.shouldUpdate,
-      children: () => getFieldItem()
+      children: () => {
+        return getFieldItem(true);
+      }
     }) : getFieldItem()
   });
 };

package/lib/ProEditTable/utils/index.js

@@ -20,6 +20,7 @@ var _reactSvg = require("react-svg");
 var _utils = require("@zat-design/utils");
 var _config = require("./config");
 var _tools = require("./tools");
+var _utils2 = require("../../ProForm/utils");
 var _ProTooltip = _interopRequireDefault(require("../../ProTooltip"));
 var _components = require("../components");
 var _tip = _interopRequireDefault(require("../../assets/tip.svg"));
@@ -89,7 +90,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, lastRecord, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -113,7 +114,7 @@ var getActionColumn = config => {
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 13:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
-              _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
+              lastRecord = (0, _utils2.filterInternalFields)((_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record); // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
                 _context.next = 19;
@@ -124,7 +125,7 @@ var getActionColumn = config => {
               break;
             case 19:
               _context.next = 21;
-              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(lastRecord, {
                 form,
                 index,
                 tableLength,
@@ -139,7 +140,7 @@ var getActionColumn = config => {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [...name, index],
                   virtualRowName: rowName,
-                  record,
+                  record: lastRecord,
                   result,
                   validateKeys
                 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.14.3",
+  "version": "3.14.4-beta.1",
   "license": "MIT",
   "engines": {
     "node": ">=18.19.0"