@zat-design/sisyphus-react 3.3.0 → 3.3.1-beta.2

package/dist/index.esm.css

@@ -1629,6 +1629,12 @@
 .pro-table .ant-table-tbody .ant-table-cell-fix-right {
   background: unset !important;
 }
+.pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell {
+  background: #d2fff4 !important;
+}
+.pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell td {
+  background: #d2fff4 !important;
+}
 .pro-table .ant-table-body .ant-table-cell .varied-cell {
   margin-left: -8px;
   background: var(--zaui-contract-bg, #fffaa1);
@@ -1996,11 +2002,11 @@ div.pro-textarea-view::after {
 .pro-form-list-action .ant-btn-text:hover {
   background: transparent;
 }
-.ant-form-item-has-error .ant-picker-status-error ~ .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input {
+.ant-form-item-has-error .ant-picker-status-error ~ .forever-checkbox:not(.ant-input-disabled):not( .ant-input-borderless).ant-input {
   background: var(--zaui-base-bg, #ffffff);
   border-color: var(--ant-error-color);
 }
-.ant-form-item-has-error .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
+.ant-form-item-has-error .forever-checkbox:not(.ant-input-disabled):not( .ant-input-borderless).ant-input:focus {
   border-color: var(--ant-error-color-hover);
   border-right-width: 1px;
   outline: 0;
@@ -2021,6 +2027,10 @@ span.ant-input-group-compact.pro-range-limit .ant-picker {
       -ms-flex: 1;
           flex: 1;
 }
+span.ant-input-group-compact.pro-time-limit .ant-picker-focused,
+span.ant-input-group-compact.pro-range-limit .ant-picker-focused {
+  z-index: 1;
+}
 span.ant-input-group-compact.pro-time-limit .forever-checkbox,
 span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-flex: 0;
@@ -3324,6 +3334,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-tree-modal-checkbox-close {
   padding-left: var(--zaui-space-size-sm, 8px);
+  color: #c5c7cd;
   font-size: var(--zaui-font-size-sm, 12px);
 }
 .pro-tree-modal-tree-node {

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

@@ -506,7 +506,7 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
-  var originalTitle = _jsxs(_Space, {
+  var originalTitle = originalTip ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -516,14 +516,16 @@ var RenderField = function RenderField(_ref) {
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     }))]
-  });
-  var FormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({
+  }) : null;
+  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
     children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
-  }));
+  })) : _jsx(Container, {
+    viewEmpty: viewEmpty
+  });
   return _jsx(FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
     children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {

package/es/ProEditTable/index.js

@@ -10,7 +10,7 @@ import _ConfigProvider from "antd/es/config-provider";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
 import { isArray } from 'lodash';
@@ -50,6 +50,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
     originalTip = _ref.originalTip,
+    rowKey = _ref.rowKey,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -97,21 +98,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     'pro-table-no-stripe': !stripe,
     className: className
   });
-  // 编辑行设置下样式
-  var _rowClassName = function _rowClassName(record) {
-    return !virtualKey || editingKeys.includes(record.rowKey) ? 'is-editing' : '';
-  };
-  // 复选框
-  var _rowSelection = _objectSpread({
-    fixed: true,
-    selectedRowKeys: selectedRowKeys,
-    onChange: function onChange(selectedRowKeys, selectedRows) {
-      setState({
-        selectedRowKeys: selectedRowKeys,
-        selectedRows: selectedRows
-      });
+  var getRowKey = function getRowKey(record) {
+    var key = record.rowKey || getRandom();
+    if (rowKey) {
+      var _ref2;
+      key = (_ref2 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref2 !== void 0 ? _ref2 : key;
     }
-  }, rowSelection);
+    return key;
+  };
   var config = {
     form: form,
     mode: mode,
@@ -144,6 +138,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalTip: originalTip,
     prefixCls: prefixCls
   };
+  // 编辑行设置下样式
+  var _rowClassName = function _rowClassName(record) {
+    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var className = isEdit ? 'is-editing' : '';
+    return className;
+  };
+  // 复选框
+  var _rowSelection = _objectSpread({
+    fixed: true,
+    selectedRowKeys: selectedRowKeys,
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      setState({
+        selectedRowKeys: selectedRowKeys,
+        selectedRows: selectedRows
+      });
+    }
+  }, rowSelection);
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = useCallback(function (type) {
     // 当工具栏不渲染时，都不渲染
@@ -202,7 +213,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var nextColumns;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -221,7 +232,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }, _callee);
     }));
     return function setColumns() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useDebounceEffect(function () {
@@ -237,7 +248,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
-          rowKey: getRandom()
+          rowKey: getRowKey(item)
         });
       });
       onChange(nextValues);

package/es/ProEnum/index.js

@@ -16,7 +16,7 @@ var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useState, useEffect, useMemo } from 'react';
-import { cloneDeep, isFunction, isString, isArray } from 'lodash';
+import { cloneDeep, isFunction, isString, isArray, omit } from 'lodash';
 import ProSelect from '../ProSelect';
 import { useProConfig } from '../ProConfigProvider';
 import ProEnumTag from './components/Tag';
@@ -79,7 +79,6 @@ var ProEnum = function ProEnum(props) {
   var _useProConfig = useProConfig('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  // const enumList = dics?.[code] || [];
   var _useRequestFunc = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
       manual: true,
       cacheTime: -1
@@ -173,26 +172,16 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+          options: list,
           value: value,
-          onChange: onChange,
-          children: list.map(function (item) {
-            return _jsx(_Radio, {
-              value: item[fieldValue],
-              children: item[label]
-            }, item[fieldValue]);
-          })
+          onChange: onChange
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+          options: list,
           value: value,
-          onChange: onChange,
-          children: list.map(function (item) {
-            return _jsx(_Checkbox, {
-              value: item[fieldValue],
-              children: item[label]
-            }, item[fieldValue]);
-          })
+          onChange: onChange
         }));
       case 'Tag':
         return _jsx(ProEnumTag, {

package/es/ProEnum/propsType.d.ts

@@ -6,6 +6,7 @@ import { PropSelectProps } from '../ProSelect/propsType';
 export interface DataOption {
     label?: string;
     value?: string;
+    disabled?: boolean;
     [key: string]: any;
 }
 export interface ProEnumConfig {

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

@@ -145,13 +145,13 @@ var ActionButton = function ActionButton(props) {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
-      if (item.show === false) return _jsx(_Fragment, {});
+      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return _jsx(_Fragment, {});
+        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,

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

@@ -62,7 +62,7 @@ var FormList = function FormList(props, ref) {
   var handleDragEnd = function handleDragEnd(drag) {
     var active = drag.active,
       over = drag.over;
-    if (active.id !== over.id) {
+    if (_fields.length > 1 && active.id !== over.id) {
       var activeIndex = _fields.findIndex(function (item) {
         return item.key === active.id;
       });

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

@@ -9,7 +9,7 @@ import { useMemo } from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
-import { insertSeparator, parseName } from './utils';
+import { insertSeparator } from './utils';
 import ProForm from '../../../../ProForm';
 var Group = function Group(props) {
   var columns = props.children,
@@ -27,7 +27,6 @@ var Group = function Group(props) {
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
-  var _parentNames = parseName(id);
   var data = useMemo(function () {
     var fieldList = [];
     var result = columns.map(function (item) {
@@ -35,7 +34,7 @@ var Group = function Group(props) {
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: _parentNames
+        parentNames: id
       });
     });
     var node = _jsx(_Button, {
@@ -46,7 +45,7 @@ var Group = function Group(props) {
       columns: insertSeparator(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space, props]);
+  }, [name, columns, space, props, names]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {
@@ -54,6 +53,7 @@ var Group = function Group(props) {
       return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
     })
   }, "".concat(className), className));
+  console.log('name', name, data);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -6,5 +6,3 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
-/** 解析name */
-export declare const parseName: (name: string) => any[];

package/es/ProForm/components/combination/Group/utils.js

@@ -33,17 +33,4 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     }
     return result;
   }, []);
-};
-/** 解析name */
-export var parseName = function parseName(name) {
-  var result = [];
-  var parts = name.split('_');
-  parts.forEach(function (part) {
-    if (!Number.isNaN(Number(part))) {
-      result.push(Number(part));
-    } else {
-      result.push(part);
-    }
-  });
-  return result;
 };

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

@@ -419,19 +419,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
             }
             if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
-              _context4.next = 13;
+              _context4.next = 10;
               break;
             }
-            if (readOnly) {
-              _context4.next = 5;
-              break;
-            }
-            setState({
-              _value: value,
-              isInit: false
-            });
-            return _context4.abrupt("return");
-          case 5:
             queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
             page = _objectSpread({
               pageNum: 1,
@@ -441,9 +431,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context4.next = 11;
+            _context4.next = 8;
             return runAsync(params);
-          case 11:
+          case 8:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = [];
@@ -453,19 +443,27 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              nextSelectRowKeys = isMultiple ? value : [value];
-              if (labelInValue) {
-                onChange(_data2);
+              if (_data2) {
+                nextSelectRowKeys = isMultiple ? value : [value];
+                if (labelInValue) {
+                  onChange(_data2);
+                }
+                // 更新内部展示值
+                setState({
+                  _value: _data2,
+                  isInit: false,
+                  selectedRows: list,
+                  selectedRowKeys: nextSelectRowKeys
+                });
+              } else if (!readOnly) {
+                // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
+                setState({
+                  _value: value,
+                  isInit: false
+                });
               }
-              // 更新内部展示值
-              setState({
-                _value: _data2,
-                isInit: false,
-                selectedRows: list,
-                selectedRowKeys: nextSelectRowKeys
-              });
             }
-          case 13:
+          case 10:
           case "end":
             return _context4.stop();
         }
@@ -653,7 +651,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onChange: handleChangeValue,
       disabled: disabled,
       addonAfter: forceAddonAfterRender(),
-      placeholder: locale.ProModalSelect.select,
       autoComplete: "off"
     }, restInputProps)), _jsx(_Input, {
       type: "hidden",

package/es/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -3,11 +3,15 @@
 
 .@{ant-prefix}-form-item-has-error {
   .@{ant-prefix}-picker-status-error
-    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input {
+    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
+      .@{ant-prefix}-input-borderless
+    ).@{ant-prefix}-input {
     background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
-  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input:focus {
+  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
+      .@{ant-prefix}-input-borderless
+    ).@{ant-prefix}-input:focus {
     border-color: var(--ant-error-color-hover);
     border-right-width: 1px;
     outline: 0;
@@ -24,6 +28,9 @@ span.@{ant-prefix}-input-group-compact {
       flex: 1;
     }
 
+    .@{ant-prefix}-picker-focused {
+      z-index: 1;
+    }
     .forever-checkbox {
       flex: 0;
       min-width: unset;

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

@@ -363,13 +363,13 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange',
-    // 'shouldUpdate',
-    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = _jsx(_Form.List, _objectSpread(_objectSpread({}, _otherFormItemProps), {}, {
+      child = _jsx(_Form.List, _objectSpread(_objectSpread({
+        name: _otherFormItemProps.name
+      }, omit(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
           return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
             otherProps: otherProps,
@@ -389,31 +389,24 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    // if (_otherFormItemProps.shouldUpdate) {
-    //   return (
-    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
-    //       {() => {
-    //         return (
-    //           <Form.Item
-    //             {...omit(_otherFormItemProps, filterFormItemKey)}
-    //             // @ts-ignore
-    //             _internalItemRender={internalItemRender}
-    //             className={_className}
-    //           >
-    //             {child}
-    //           </Form.Item>
-    //         );
-    //       }}
-    //     </Form.Item>
-    //   );
-    // }
-    var formItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+
+    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    var formItem = orgFormItem;
+    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
+    if (_otherFormItemProps.shouldUpdate) {
+      formItem = _jsx(_Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return orgFormItem;
+        }
+      });
+    }
     // 不渲染tooltip
     if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;

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

@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
-import { isBoolean, isFunction, union } from 'lodash';
+import { isBoolean, isFunction, union, isString } from 'lodash';
 import Render from './Render';
 import * as componentMap from '../index';
 import { isSelect } from '../../utils';
@@ -129,7 +129,11 @@ var RenderFields = function RenderFields(props) {
       dataSource: dataSource,
       type: _type
     });
-    var _placeholder = placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(label || formLabel || '');
+    var placeholderHandle = function placeholderHandle() {
+      var _label = isString(label) ? label : '';
+      var _formLabel = isString(formLabel) ? formLabel : '';
+      return placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
+    };
     // 表单组件Props 兼容2.0版本
     var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
     if (isBoolean(formDisabled)) {
@@ -137,7 +141,7 @@ var RenderFields = function RenderFields(props) {
     }
     var componentProps = _objectSpread(_objectSpread({
       disabledStrictly: true,
-      placeholder: _placeholder
+      placeholder: placeholderHandle()
     }, _fieldProps), {}, {
       disabled: _disabled
     });

package/es/ProForm/utils/rulesCreator.js

@@ -1,10 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { validate, regExp } from '@zat-design/utils';
+import { isString } from 'lodash';
 import { isNullValue } from './index';
 import locale from '../../locale';
 export var rulesCreator = function rulesCreator(rules, label, isSelect) {
   var _result;
-  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(label || '');
+  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
     var rule = _objectSpread({}, ruleItem);

package/es/ProForm/utils/useForm.js

@@ -47,23 +47,31 @@ export var useForm = function useForm(originForm) {
     };
     var _validateFields = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
-        var values, _values;
+        var _len,
+          rest,
+          _key,
+          values,
+          _values,
+          _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return validateFields(nameList);
-            case 2:
+              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                rest[_key - 1] = _args[_key];
+              }
+              _context.next = 3;
+              return validateFields.apply(void 0, [nameList].concat(rest));
+            case 3:
               values = _context.sent;
               if (!nameList) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", values);
-            case 5:
+            case 6:
               _values = _getFieldsValue();
               return _context.abrupt("return", _values);
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }

package/es/ProForm/utils/useRules.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { useEffect, useMemo } from 'react';
-import { isBoolean } from 'lodash';
+import { isBoolean, isString } from 'lodash';
 import { rulesCreator } from './rulesCreator';
 import { isNotFullArray, isNullArray } from './index';
 import locale from '../../locale';
@@ -12,6 +12,7 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
+  var _label = isString(label) ? label : '';
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = useMemo(function () {
     var result = {
@@ -22,7 +23,7 @@ var useRules = function useRules(props) {
         return 'required' in rule;
       }));
       if (!requiredRule) {
-        var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(label || '') : "".concat(locale.ProForm.inputPlaceholder).concat(label || '');
+        var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
         var rule = {
           required: required,
           message: message
@@ -31,7 +32,7 @@ var useRules = function useRules(props) {
         if (names === null || names === void 0 ? void 0 : names.length) {
           rule.validator = function (_, value) {
             if (!value || isNullArray(value)) {
-              return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(label)));
+              return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
             }
             return Promise.resolve();
           };
@@ -42,7 +43,7 @@ var useRules = function useRules(props) {
     return result;
   }, [rules, required]);
   // type转换为内置rules
-  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, label, isSelect);
+  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, _label, isSelect);
   useEffect(function () {
     // 添加完整性校验
     if (names && !isBoolean(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
@@ -50,7 +51,7 @@ var useRules = function useRules(props) {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length)) {
-            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(label || '')));
+            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }

package/es/ProStep/index.js

@@ -7,7 +7,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createContext, useContext, useEffect, useMemo, useState } from 'react';
-import { useEventEmitter, useSetState, useLocalStorageState } from 'ahooks';
+import { useEventEmitter, useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
 import Item from './components/Item';
@@ -163,7 +163,7 @@ var ProStep = function ProStep(_ref) {
 
     observer.observe(targetElement, config);
   };
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     var errorModuleKeys = Object.keys(errorCollection).reverse();
     if (errorModuleKeys === null || errorModuleKeys === void 0 ? void 0 : errorModuleKeys.length) {
       var _dataSource$find;