@zat-design/sisyphus-react 3.6.4 → 3.6.5

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/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

@@ -172,7 +172,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
           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/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/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

@@ -179,7 +179,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
           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",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",