@zat-design/sisyphus-react 3.5.0 → 3.5.1-beta.2

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));
@@ -3736,6 +3737,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-iconEle {
+  margin-right: 8px;
+}
 .pro-tree .ant-tree-node-content-wrapper {
   display: -webkit-box;
   display: -webkit-flex;
@@ -5312,7 +5316,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));
@@ -3736,6 +3737,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-iconEle {
+  margin-right: 8px;
+}
 .pro-tree .ant-tree-node-content-wrapper {
   display: -webkit-box;
   display: -webkit-flex;

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/components/combination/Group/utils.js

@@ -263,6 +263,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       name: columnName
     }, reactiveProps), {}, {
       disabled: reactiveProps.disabled || groupProps.disabled,
+      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
         value: value === null || value === void 0 ? void 0 : value[index]

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -655,7 +655,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           selectedRows: []
         });
       }
-      if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
+      if (!labelInValue && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
         setState({
           _value: value,
           selectedRowKeys: [],

package/es/ProForm/components/render/Render.js

@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _componentProps$disab, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -177,7 +177,7 @@ var Render = function Render(props) {
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
    * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
    */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = (_componentProps$disab = componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _componentProps$disab !== void 0 ? _componentProps$disab : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : _disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */

package/es/ProForm/components/render/RenderFields.js

@@ -45,7 +45,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    var _formItemProps$disabl;
+    var _fieldProps$disabled;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -127,7 +127,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
+    var comDisabled = (_fieldProps$disabled = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) !== null && _fieldProps$disabled !== void 0 ? _fieldProps$disabled : _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled; // 组件属性层disabled fieldProps可能为函数
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
       dataSource: dataSource,

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.d.ts

@@ -1,2 +1,6 @@
 import { FormInstance } from 'antd';
-export declare const useForm: <T>(originForm: FormInstance<T>) => [FormInstance<T>];
+type ModifiedFormInstance<T> = FormInstance<T> & {
+    isModified?: boolean;
+};
+export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
+export {};

package/es/ProForm/utils/useForm.js

@@ -1,16 +1,19 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 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),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
-    setFieldsValue = form.setFieldsValue;
+    isModified = form.isModified;
+  if (isModified) return [form];
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
     // 全部查询
@@ -20,13 +23,6 @@ export var useForm = function useForm(originForm) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
-  //   // 解决names通过set设置无法触发rc-field-form中onStoreChange的问题
-  //   setTimeout(() => {
-  //     const baseData = getFieldsValue(true);
-  //     setFieldsValue({ ...baseData, ...data });
-  //   }, 0);
-  // };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
@@ -38,7 +34,6 @@ export var useForm = function useForm(originForm) {
         _form$getInternalHook,
         getFields,
         fieldsList,
-        _error$errorFields,
         _error$errorFields$,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -52,7 +47,7 @@ export var useForm = function useForm(originForm) {
             isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.next = 10;
+              _context.next = 12;
               break;
             }
             // @ts-ignore
@@ -64,30 +59,40 @@ export var useForm = function useForm(originForm) {
                 validateNames.push(item.name);
               }
             });
+            if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
+              validateNames = _toConsumableArray(nameList);
+            }
             // @ts-ignore
-            delete rest[0].recursive;
-            return _context.abrupt("return", validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
+            // delete rest[0].recursive;
+            _context.next = 11;
+            return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return filterInternalFields(values);
-            }));
-          case 10:
-            return _context.abrupt("return", validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
+            });
+          case 11:
+            return _context.abrupt("return", _context.sent);
+          case 12:
+            _context.next = 14;
+            return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : _getFieldsValue();
-            }));
-          case 13:
-            _context.prev = 13;
+            });
+          case 14:
+            return _context.abrupt("return", _context.sent);
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](0);
-            if (_context.t0 && (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields)) {
-              form === null || form === void 0 ? void 0 : form.scrollToField(_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
+              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
+            handleScrollToError();
             throw _context.t0;
-          case 17:
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 13]]);
+      }, _callee, null, [[0, 17]]);
     }));
     return function _validateFields(_x) {
       return _ref.apply(this, arguments);
@@ -95,6 +100,6 @@ export var useForm = function useForm(originForm) {
   }();
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
-  // form.setFieldsValue = _setFieldsValue;
+  form.isModified = true;
   return [form];
 };

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/ProLayout/index.js

@@ -1,7 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createContext } from 'react';
@@ -48,8 +46,9 @@ var ProLayout = function ProLayout(props) {
     set(props.collapsed || false);
   }, [props.collapsed]);
   useDeepCompareEffect(function () {
-    if (Array.isArray(dataSource) && !dataSource.length) {
-      return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
+    if (Array.isArray(dataSource) && !dataSource.length || !dataSource) {
+      console.warn('Warning: Missing menu data source, or menu data source is not an array');
+      return;
     }
     var userData = transformMenus(dataSource);
     setState({

package/es/ProSelect/index.js

@@ -325,7 +325,7 @@ export var ProSelect = function ProSelect(props, ref) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name', 'style'])), {}, {
+    }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return _jsx(Option, {

package/es/ProSelect/propsType.d.ts

@@ -4,7 +4,7 @@ import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
 import { ProFormOtherProps } from '../ProForm/propsType';
 export interface DataOption {
     label?: string;
-    value?: string;
+    value?: string | number;
     [key: string]: any;
 }
 export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {

package/es/ProStep/components/Listener/index.d.ts

@@ -1,5 +1,3 @@
 import React from 'react';
-declare const _default: ({ children, delayTime, }: any) => React.DetailedReactHTMLElement<{
-    onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
-}, HTMLElement>;
+declare const _default: ({ children, delayTime, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
 export default _default;

package/es/ProStep/components/Listener/index.js

@@ -1,14 +1,18 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["children", "delayTime"];
 import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
   var children = _ref.children,
-    delayTime = _ref.delayTime;
+    delayTime = _ref.delayTime,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
     notify = _useStep.notify;
-  return /*#__PURE__*/React.cloneElement(children, {
+  return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
     onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -32,5 +36,5 @@ export default (function (_ref) {
         }
       }, _callee);
     })), 3000)
-  });
+  }));
 });

package/es/ProStep/index.d.ts

@@ -7,8 +7,6 @@ declare const ProStep: {
     ({ children, ...resetProps }: ProStepPropsType): JSX.Element;
     useStep: () => any;
     Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
-    Listener: ({ children, delayTime, }: any) => import("react").DetailedReactHTMLElement<{
-        onClick: import("lodash").DebouncedFunc<() => Promise<void>>;
-    }, HTMLElement>;
+    Listener: ({ children, delayTime, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

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/ProTree/components/Tree.js

@@ -11,7 +11,7 @@ var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /*
  *@Date: 2023-07-25 13:49:35
- *@LastEditTime: 2023-07-25 13:49:35
+ * @LastEditTime: 2024-05-20 11:47:45
  *@Author: liudongliang
  *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
  */
@@ -249,6 +249,12 @@ function List(props) {
       className: nodeClass,
       onClick: function onClick(e) {
         e.stopPropagation();
+        onSelect(item === null || item === void 0 ? void 0 : item[fieldNameValue], {
+          node: e === null || e === void 0 ? void 0 : e.target,
+          event: e,
+          item: item,
+          selected: !isChecked
+        });
       },
       children: [tags && tags.length ? _jsx("div", {
         className: "pro-tree-tree-node-tag",
@@ -263,20 +269,15 @@ function List(props) {
         className: "tree-node-show-text",
         children: [_jsx("div", {
           className: "tree-node-show-text-label",
-          onClick: function onClick(e) {
-            return onSelect(item === null || item === void 0 ? void 0 : item[fieldNameValue], {
-              node: e === null || e === void 0 ? void 0 : e.target,
-              event: e,
-              item: item,
-              selected: !isChecked
-            });
-          },
           children: optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, _objectSpread({
             label: title,
             searchStr: searchStr
           }, other))
         }), _jsx("div", {
           className: "operate-tree-node-btns",
+          onClick: function onClick(e) {
+            e.stopPropagation();
+          },
           children: (operateButton === null || operateButton === void 0 ? void 0 : operateButton.length) > 1 ? _jsx(_Popover, {
             overlayClassName: "pro-tree-operate-container",
             content: _jsx("div", {