@zat-design/sisyphus-react 3.5.0-beta.1 → 3.5.0-beta.10

package/dist/index.esm.css

@@ -2937,6 +2937,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item-label > label {
   white-space: pre-wrap;
+  word-break: break-all;
 }
 .pro-form .suffix-value {
   margin-left: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
@@ -5312,7 +5313,7 @@ input[type='button'] {
 .ant-form .ant-form-item .ant-form-item-label > label,
 .ant-drawer .ant-form-item .ant-form-item-label > label,
 .ant-modal .ant-form-item .ant-form-item-label > label {
-  word-break: break-word;
+  word-break: break-all;
 }
 .ant-form .ant-form-item .ant-form-item-label > label::after,
 .ant-drawer .ant-form-item .ant-form-item-label > label::after,

package/dist/less.esm.css

@@ -2937,6 +2937,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item-label > label {
   white-space: pre-wrap;
+  word-break: break-all;
 }
 .pro-form .suffix-value {
   margin-left: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));

package/es/ProEditTable/style/index.less

@@ -222,6 +222,7 @@
 
   .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
+    // vertical-align: top;
     vertical-align: middle;
   }
 

package/es/ProEditTable/utils/index.js

@@ -18,7 +18,7 @@ import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
 import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from './config';
-import { customValidate, getNamePath, splitNames } from './tools';
+import { customValidate, getNamePath, splitNames, handleScrollToError } from './tools';
 import ProTooltip from '../../ProTooltip';
 import { RenderField, ActionButton } from '../components';
 import tipSvg from '../../assets/tip.svg';
@@ -98,35 +98,7 @@ var getActionColumn = function getActionColumn(config) {
             case 8:
               _context.prev = 8;
               _context.t0 = _context["catch"](3);
-              setTimeout(function () {
-                var errorDom = document.querySelector('.ant-form-item-has-error');
-                if (errorDom) {
-                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-                  var tableCell = errorDom.closest('.ant-table-cell');
-                  if (tableBody && tableCell) {
-                    var previousSibling = tableCell.previousElementSibling;
-                    var childOffsetLeft = 0;
-                    var childFixedLeft = 0;
-                    while (previousSibling) {
-                      if (previousSibling.nodeType === 1) {
-                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
-                        var _ref2 = previousSibling.getBoundingClientRect() || {},
-                          _ref2$width = _ref2.width,
-                          width = _ref2$width === void 0 ? 0 : _ref2$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;
-                        }
-                      }
-                      previousSibling = previousSibling.previousElementSibling;
-                    }
-                    tableBody.scrollTo({
-                      left: childOffsetLeft - childFixedLeft,
-                      behavior: 'smooth'
-                    });
-                  }
-                }
-              }, 0);
+              handleScrollToError();
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
@@ -254,10 +226,10 @@ export var transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref3 = tooltip || {},
-          tooltipTitle = _ref3.title,
-          icon = _ref3.icon,
-          resetProps = _objectWithoutProperties(_ref3, _excluded2);
+        var _ref2 = tooltip || {},
+          tooltipTitle = _ref2.title,
+          icon = _ref2.icon,
+          resetProps = _objectWithoutProperties(_ref2, _excluded2);
         item.title = _jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
@@ -409,13 +381,13 @@ export var transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+        var _item, key, value, _ref4, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = _slicedToArray(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
+              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -435,7 +407,7 @@ export var transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

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

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

package/es/ProEditTable/utils/tools.js

@@ -151,4 +151,37 @@ export var getDisabled = function getDisabled(_ref2) {
     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);
+};
+/** 表格自动滚动到报错位置
+ */
+export var handleScrollToError = function handleScrollToError() {
+  setTimeout(function () {
+    var errorDom = document.querySelector('.ant-form-item-has-error');
+    if (errorDom) {
+      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+      var tableCell = errorDom.closest('.ant-table-cell');
+      if (tableBody && tableCell) {
+        var previousSibling = tableCell.previousElementSibling;
+        var childOffsetLeft = 0;
+        var childFixedLeft = 0;
+        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;
+            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;
+            }
+          }
+          previousSibling = previousSibling.previousElementSibling;
+        }
+        tableBody.scrollTo({
+          left: childOffsetLeft - childFixedLeft,
+          behavior: 'smooth'
+        });
+      }
+    }
+  }, 0);
 };

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

@@ -122,7 +122,7 @@ var ActionButton = function ActionButton(props) {
     var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_actionProps === null || _actionProps === void 0 ? void 0 : _actionProps.find(function (item) {

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

@@ -46,7 +46,7 @@ var ToolbarButton = function ToolbarButton(props) {
     var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {

package/es/ProForm/index.js

@@ -20,7 +20,7 @@ import { isObject, isString, merge } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
-import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
+import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
@@ -163,7 +163,7 @@ var ProForm = function ProForm(props, ref) {
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
-      onValuesChange(changedValue, form.getFieldsValue());
+      onValuesChange(filterInternalFields(changedValue), form.getFieldsValue());
     } else {
       var values = keys.map(function (key) {
         if (key.includes('-')) {
@@ -175,7 +175,7 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), form.getFieldsValue());
+      onValuesChange(filterInternalFields(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values)))), form.getFieldsValue());
     }
   };
   // 包装一层兼容 names 改变

package/es/ProForm/style/index.less

@@ -215,6 +215,7 @@
   .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
+      word-break: break-all;
     }
   }
 

package/es/ProForm/utils/useForm.js

@@ -4,6 +4,7 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { filterInternalFields } from './index';
+import { handleScrollToError } from '../../ProEditTable/utils/tools';
 export var useForm = function useForm(originForm) {
   var _Form$useForm = _Form.useForm(originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -89,8 +90,9 @@ export var useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
+            handleScrollToError();
             throw _context.t0;
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -18,8 +18,7 @@ var OpenMenu = function OpenMenu(props) {
     dataSource = props.dataSource,
     style = props.style,
     _props$theme = props.theme,
-    theme = _props$theme === void 0 ? 'dark' : _props$theme,
-    otherProps = props.otherProps;
+    theme = _props$theme === void 0 ? 'dark' : _props$theme;
   var _ref = dataSource || {},
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;

package/es/ProTree/components/ProTreeSelect/index.js

@@ -30,9 +30,11 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
   var label = 'label';
   var code = 'value';
+  var uuidKey = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
     code = proSelectFieldNames.value;
     label = proSelectFieldNames.label;
+    uuidKey = proSelectFieldNames.key || proSelectFieldNames.value;
   }
   // 配置属性
   var disabled = props.disabled,
@@ -76,6 +78,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   if (fieldNames && Object.keys(fieldNames).length) {
     code = fieldNames.value || 'value';
     label = fieldNames.label || 'label';
+    uuidKey = fieldNames.key || code;
   }
   // 经过处理后的枚举数据，可能来自用户配置的处理函数后返回的结果
   var _useSetState = useSetState({}),
@@ -285,6 +288,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       icon = node.icon;
     var labelText = node[label];
     var value = node[code];
+    var key = node[uuidKey];
     var titleHtml = _jsx("span", {
       dangerouslySetInnerHTML: {
         __html: labelText
@@ -315,7 +319,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
         checkable: node.checkable,
         icon: icon,
         className: "node-val-".concat(value)
-      }, value);
+      }, key);
     }
     var sonGrade = grade + 1;
     return _jsx(_TreeSelect.TreeNode, {
@@ -328,7 +332,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       children: children.map(function (child) {
         return renderTreeNode(child, sonGrade);
       })
-    }, value);
+    }, key);
   };
   /**
    * 从树形数据中找出用户搜索得数据，并且将搜索字符串高亮标识

package/es/style/theme/antd.less

@@ -55,7 +55,7 @@
       }
 
       & > label {
-        word-break: break-word;
+        word-break: break-all;
 
         // 隐藏冒号
         &::after {

package/lib/ProEditTable/style/index.less

@@ -222,6 +222,7 @@
 
   .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
+    // vertical-align: top;
     vertical-align: middle;
   }
 

package/lib/ProEditTable/utils/index.js

@@ -102,35 +102,7 @@ var getActionColumn = function getActionColumn(config) {
             case 8:
               _context.prev = 8;
               _context.t0 = _context["catch"](3);
-              setTimeout(function () {
-                var errorDom = document.querySelector('.ant-form-item-has-error');
-                if (errorDom) {
-                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-                  var tableCell = errorDom.closest('.ant-table-cell');
-                  if (tableBody && tableCell) {
-                    var previousSibling = tableCell.previousElementSibling;
-                    var childOffsetLeft = 0;
-                    var childFixedLeft = 0;
-                    while (previousSibling) {
-                      if (previousSibling.nodeType === 1) {
-                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
-                        var _ref2 = previousSibling.getBoundingClientRect() || {},
-                          _ref2$width = _ref2.width,
-                          width = _ref2$width === void 0 ? 0 : _ref2$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;
-                        }
-                      }
-                      previousSibling = previousSibling.previousElementSibling;
-                    }
-                    tableBody.scrollTo({
-                      left: childOffsetLeft - childFixedLeft,
-                      behavior: 'smooth'
-                    });
-                  }
-                }
-              }, 0);
+              (0, _tools.handleScrollToError)();
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
@@ -258,10 +230,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref3 = tooltip || {},
-          tooltipTitle = _ref3.title,
-          icon = _ref3.icon,
-          resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
+        var _ref2 = tooltip || {},
+          tooltipTitle = _ref2.title,
+          icon = _ref2.icon,
+          resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -413,13 +385,13 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
+      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+        var _item, key, value, _ref4, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
+              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -439,7 +411,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

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

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

package/lib/ProEditTable/utils/tools.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.splitNames = exports.onDelete = exports.getRandom = exports.getNamePath = exports.getDisabled = exports.difference = exports.customValidate = void 0;
+exports.splitNames = exports.onDelete = exports.handleScrollToError = exports.getRandom = exports.getNamePath = exports.getDisabled = exports.difference = exports.customValidate = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var getRandom = exports.getRandom = function getRandom() {
@@ -158,4 +158,37 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
     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);
+};
+/** 表格自动滚动到报错位置
+ */
+var handleScrollToError = exports.handleScrollToError = function handleScrollToError() {
+  setTimeout(function () {
+    var errorDom = document.querySelector('.ant-form-item-has-error');
+    if (errorDom) {
+      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+      var tableCell = errorDom.closest('.ant-table-cell');
+      if (tableBody && tableCell) {
+        var previousSibling = tableCell.previousElementSibling;
+        var childOffsetLeft = 0;
+        var childFixedLeft = 0;
+        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;
+            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;
+            }
+          }
+          previousSibling = previousSibling.previousElementSibling;
+        }
+        tableBody.scrollTo({
+          left: childOffsetLeft - childFixedLeft,
+          behavior: 'smooth'
+        });
+      }
+    }
+  }, 0);
 };

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

@@ -123,7 +123,7 @@ var ActionButton = function ActionButton(props) {
     var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_actionProps === null || _actionProps === void 0 ? void 0 : _actionProps.find(function (item) {

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

@@ -50,7 +50,7 @@ var ToolbarButton = function ToolbarButton(props) {
     var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {

package/lib/ProForm/index.js

@@ -164,7 +164,7 @@ var ProForm = function ProForm(props, ref) {
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
-      onValuesChange(changedValue, form.getFieldsValue());
+      onValuesChange((0, _index.filterInternalFields)(changedValue), form.getFieldsValue());
     } else {
       var values = keys.map(function (key) {
         if (key.includes('-')) {
@@ -176,7 +176,7 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange(_lodash.merge.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), form.getFieldsValue());
+      onValuesChange((0, _index.filterInternalFields)(_lodash.merge.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values)))), form.getFieldsValue());
     }
   };
   // 包装一层兼容 names 改变

package/lib/ProForm/style/index.less

@@ -215,6 +215,7 @@
   .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
+      word-break: break-all;
     }
   }
 

package/lib/ProForm/utils/useForm.js

@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
 var _index = require("./index");
+var _tools = require("../../ProEditTable/utils/tools");
 var useForm = exports.useForm = function useForm(originForm) {
   var _Form$useForm = _antd.Form.useForm(originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
@@ -95,8 +96,9 @@ var useForm = exports.useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
+            (0, _tools.handleScrollToError)();
             throw _context.t0;
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -24,8 +24,7 @@ var OpenMenu = function OpenMenu(props) {
     dataSource = props.dataSource,
     style = props.style,
     _props$theme = props.theme,
-    theme = _props$theme === void 0 ? 'dark' : _props$theme,
-    otherProps = props.otherProps;
+    theme = _props$theme === void 0 ? 'dark' : _props$theme;
   var _ref = dataSource || {},
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -32,9 +32,11 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
   var label = 'label';
   var code = 'value';
+  var uuidKey = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
     code = proSelectFieldNames.value;
     label = proSelectFieldNames.label;
+    uuidKey = proSelectFieldNames.key || proSelectFieldNames.value;
   }
   // 配置属性
   var disabled = props.disabled,
@@ -78,6 +80,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   if (fieldNames && Object.keys(fieldNames).length) {
     code = fieldNames.value || 'value';
     label = fieldNames.label || 'label';
+    uuidKey = fieldNames.key || code;
   }
   // 经过处理后的枚举数据，可能来自用户配置的处理函数后返回的结果
   var _useSetState = (0, _ahooks.useSetState)({}),
@@ -287,6 +290,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       icon = node.icon;
     var labelText = node[label];
     var value = node[code];
+    var key = node[uuidKey];
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
       dangerouslySetInnerHTML: {
         __html: labelText
@@ -317,7 +321,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         checkable: node.checkable,
         icon: icon,
         className: "node-val-".concat(value)
-      }, value);
+      }, key);
     }
     var sonGrade = grade + 1;
     return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
@@ -330,7 +334,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       children: children.map(function (child) {
         return renderTreeNode(child, sonGrade);
       })
-    }, value);
+    }, key);
   };
   /**
    * 从树形数据中找出用户搜索得数据，并且将搜索字符串高亮标识

package/lib/style/theme/antd.less

@@ -55,7 +55,7 @@
       }
 
       & > label {
-        word-break: break-word;
+        word-break: break-all;
 
         // 隐藏冒号
         &::after {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.0-beta.1",
+  "version": "3.5.0-beta.10",
   "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.22",
+    "@zat-design/utils": "^1.1.23",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",