@zat-design/sisyphus-react 3.5.5-beta.11 → 3.5.5-beta.13

package/es/ProEditTable/index.js

@@ -15,7 +15,7 @@ var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type",
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray, isBoolean } from 'lodash';
-import { useLocalStorageState, useSetState } from 'ahooks';
+import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
@@ -76,6 +76,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = useRef(null);
+  var valueChangeRef = useRef(null);
+  valueChangeRef.current = 0;
   var _React$useContext = React.useContext(_ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -266,24 +268,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return null;
   };
+  useDeepCompareEffect(function () {
+    valueChangeRef.current += 1;
+    // 在这里根据需要计算新的数组
+  }, [value, config.name]);
   var _columns = useMemo(function () {
     return transformColumns(columns, config);
-  }, [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page, config.name]);
-  // const setColumns = async () => {
-  //   const nextColumns = transformColumns(columns, config);
-  //   setState({
-  //     _columns: nextColumns,
-  //   });
-  // };
-  // useDebounceEffect(
-  //   () => {
-  //     setColumns();
-  //   },
-  //   [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page], // columns更新修复外部表单无法控制内部表单的问题
-  //   {
-  //     wait: 60,
-  //   },
-  // );
+  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   useEffect(function () {
     var isAllHasKey = value.every(function (item) {
       return item.rowKey;

package/es/ProEditTable/utils/index.js

@@ -203,6 +203,7 @@ export var transformColumns = function transformColumns() {
     cacheMap = config.cacheMap,
     setState = config.setState,
     page = config.page;
+  console.log(123);
   var isCell = mode === 'cell';
   var _columns = _toConsumableArray(columns);
   var _cacheMap = _objectSpread({}, cacheMap.current);
@@ -256,6 +257,7 @@ export var transformColumns = function transformColumns() {
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
+    // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
     var required = isBoolean(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = getNamePath(name, virtualKey);

package/lib/ProEditTable/index.js

@@ -77,6 +77,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = (0, _react.useRef)(null);
+  var valueChangeRef = (0, _react.useRef)(null);
+  valueChangeRef.current = 0;
   var _React$useContext = _react.default.useContext(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -267,24 +269,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return null;
   };
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    valueChangeRef.current += 1;
+    // 在这里根据需要计算新的数组
+  }, [value, config.name]);
   var _columns = (0, _react.useMemo)(function () {
     return (0, _utils.transformColumns)(columns, config);
-  }, [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page, config.name]);
-  // const setColumns = async () => {
-  //   const nextColumns = transformColumns(columns, config);
-  //   setState({
-  //     _columns: nextColumns,
-  //   });
-  // };
-  // useDebounceEffect(
-  //   () => {
-  //     setColumns();
-  //   },
-  //   [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page], // columns更新修复外部表单无法控制内部表单的问题
-  //   {
-  //     wait: 60,
-  //   },
-  // );
+  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   (0, _react.useEffect)(function () {
     var isAllHasKey = value.every(function (item) {
       return item.rowKey;

package/lib/ProEditTable/utils/index.js

@@ -207,6 +207,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     cacheMap = config.cacheMap,
     setState = config.setState,
     page = config.page;
+  console.log(123);
   var isCell = mode === 'cell';
   var _columns = (0, _toConsumableArray2.default)(columns);
   var _cacheMap = (0, _objectSpread2.default)({}, cacheMap.current);
@@ -260,6 +261,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
+    // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
     var required = (0, _lodash.isBoolean)(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = (0, _tools.getNamePath)(name, virtualKey);

package/package.json

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