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

package/dist/index.esm.css

@@ -2002,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;
@@ -2027,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;

package/es/ProDownload/utils.js

@@ -4,8 +4,6 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-/* eslint-disable no-empty */
-/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 import locale from '../locale';
 var stringify = function stringify(data) {

package/es/ProForm/components/base/DatePicker/index.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, TimePickerProps } from 'antd';
-import { Dayjs } from 'dayjs';
+import { Moment } from 'moment';
 import React from 'react';
 import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 export type Props = DatePickerProps & TimePickerProps & {
     isView?: boolean;
     viewEmpty?: React.ReactNode;
     format?: string;
-    showTime?: PickerPanelDateProps<Dayjs>['showTime'];
+    showTime?: PickerPanelDateProps<Moment>['showTime'];
     showNow?: boolean;
 };
 declare const DatePicker: React.FC<Props>;

package/es/ProForm/components/base/DatePicker/index.js

@@ -7,7 +7,7 @@ var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { isFunction, isString } from 'lodash';
 import classNames from 'classnames';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
@@ -30,12 +30,12 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && dayjs.isDayjs(value)) {
+    } else if (typeof format === 'string' && moment.isMoment(value)) {
       viewChildren = value.format(format);
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = dayjs(value).format(format);
+      viewChildren = moment(value).format(format);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
@@ -48,11 +48,11 @@ var DatePicker = function DatePicker(props) {
   });
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
-    _rest.value = dayjs(_rest.value);
+    _rest.value = moment(_rest.value);
   }
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
-      value: dayjs(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
+      value: moment(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
       disabled: true
     };
   }

package/es/ProForm/components/base/RangePicker/index.d.ts

@@ -1,12 +1,11 @@
+import type { RangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
-import { Dayjs } from 'dayjs';
-import { RangePickerProps } from 'antd/lib/date-picker/generatePicker';
 import { ProFormOtherProps } from '../../../propsType';
 export type Props = {
     otherProps?: ProFormOtherProps;
     separator?: any;
     showTime?: any;
     isView?: boolean;
-} & Omit<RangePickerProps<Dayjs>, 'separator'>;
+} & Omit<RangePickerProps, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

package/es/ProForm/components/base/RangePicker/index.js

@@ -4,8 +4,10 @@ import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 var _excluded = ["format", "otherProps", "separator"];
 import { jsx as _jsx } from "react/jsx-runtime";
+// @ts-check
+
 import { isFunction, isString, omit } from 'lodash';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
@@ -50,9 +52,9 @@ var RangePicker = function RangePicker(props) {
   var _res = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  // // 字符串时间格式兼容
+  // 字符串时间格式兼容
   if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
-    _res.value = [dayjs(_res.value[0]), dayjs(_res.value[1])];
+    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
   }
   return _jsx(AntRangePicker, _objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])));
 };

package/es/ProForm/components/base/TimePicker/index.js

@@ -4,7 +4,7 @@ import _TimePicker from "antd/es/time-picker";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["format", "onChange", "value", "otherProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import ProForm from '../../../../ProForm';
@@ -25,7 +25,7 @@ var TimePicker = function TimePicker(props) {
   var initialConfig = useProConfig('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? dayjs(value).format(format) : undefined);
+      onChange && onChange(value ? moment(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -35,7 +35,7 @@ var TimePicker = function TimePicker(props) {
     });
   }
   return _jsx(_TimePicker, _objectSpread(_objectSpread(_objectSpread({
-    value: value ? dayjs(value, format) : undefined
+    value: value ? moment(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

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

@@ -642,7 +642,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     return defaultAddonAfter;
   };
-  console.log(locale.ProModalSelect.select);
   // 加个中间状态Input
   var initRender = _jsxs(_Fragment, {
     children: [_jsx(_Input, _objectSpread({

package/es/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RangePickerProps } from 'antd/es/date-picker';
-import { Dayjs } from 'dayjs';
+import { Moment } from 'moment';
 export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
     disabled?: boolean;
     foreverText?: string;
@@ -12,7 +12,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     separator?: any;
     isView?: boolean;
 };
-type Value = [Dayjs?, Dayjs?, boolean?];
+type Value = [Moment?, Moment?, boolean?];
 type ValueStr = [string?, string?, string?];
 type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
 declare const ProRangeLimit: React.FC<Props>;

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

@@ -12,12 +12,12 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useMemo, useState } from 'react';
 import { omit } from 'lodash';
 import classNames from 'classnames';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
-var defaultPickerValue = [dayjs(), dayjs()];
+var defaultPickerValue = [moment(), moment()];
 var useControlled = function useControlled(props) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -25,7 +25,7 @@ var useControlled = function useControlled(props) {
     setValue = _useState2[1];
   if ('value' in props) {
     var _props$value, _props$value2;
-    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && dayjs(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && dayjs(props.value[1], props.format)];
+    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && moment(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && moment(props.value[1], props.format)];
     var handleChange = function handleChange(value, other) {
       var _value = _slicedToArray(value, 2),
         start = _value[0],
@@ -74,10 +74,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'forever-checkbox': true
   });
   var _isForever = useMemo(function () {
-    return dayjs(foreverDate, format).isSame(endDate);
+    return moment(foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
-    return dayjs(foreverDate, format);
+    return moment(foreverDate, format);
   }, [foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
@@ -115,7 +115,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      start = start || dayjs().startOf('day');
+      start = start || moment().startOf('day');
       end = foreverMoment;
     } else {
       start = undefined;

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.d.ts

@@ -1,8 +1,8 @@
-import dayjs, { Dayjs } from 'dayjs';
+import moment, { Moment } from 'moment';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
     format?: string;
 }
-declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | undefined) => void];
+declare const useControlled: (props: Props) => [moment.Moment, (value: Moment | undefined) => void];
 export default useControlled;

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { useState } from 'react';
 var useControlled = function useControlled(props) {
   var value = props.value,
@@ -18,7 +18,7 @@ var useControlled = function useControlled(props) {
     onChange(_value, value);
   };
   if ('value' in props) {
-    return [value && dayjs(value, format).startOf('day'), handleChange];
+    return [value && moment(value, format).startOf('day'), handleChange];
   }
   return [valueState, handleChange];
 };

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps } from 'antd';
-import { Dayjs } from 'dayjs';
+import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 import { Props as ProRangeLimitProps } from '../ProRangeLimit';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;
-    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Dayjs) => void;
+    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
     foreverTime?: string;
     foreverText?: string;

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

@@ -12,7 +12,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { omit } from 'lodash';
-import dayjs, { isDayjs } from 'dayjs';
+import moment, { isMoment } from 'moment';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
@@ -37,7 +37,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useMemo = useMemo(function () {
-      var foreverMoment = foreverTime ? dayjs(foreverTime, format) : dayjs('9999-01-01', 'YYYY-MM-DD');
+      var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
       var foreverString = foreverTime || foreverMoment.format(format);
       return [foreverString, foreverMoment];
     }, [format, foreverTime]),
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
-    if (isDayjs(value)) {
+    if (isMoment(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -61,7 +61,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var foreverChange = function foreverChange(e) {
     var checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange(dayjs(foreverString, format));
+      onChange(moment(foreverString, format));
     } else {
       onChange(null);
     }

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

@@ -10,7 +10,7 @@ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
 
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { forwardRef, useMemo, useRef } from 'react';
 var RangePicker = _DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
@@ -50,37 +50,37 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         forever = _value2.forever;
       if (forever === 'Y') {
         return {
-          range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
+          range: [moment('9999-01-01'), moment('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = dayjs(startTime).format(defaultFormatDate);
-        var tempEndDate = dayjs(endTime).format(defaultFormatDate);
+        var tempStartDate = moment(startTime).format(defaultFormatDate);
+        var tempEndDate = moment(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [dayjs(startTime), dayjs(endTime)],
+            range: [moment(startTime), moment(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
+            range: [moment('9999-01-01'), moment('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = dayjs(value).format(defaultFormatDate);
+        var tempDate = moment(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: dayjs('9999-01-01'),
+            range: moment('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: dayjs(value),
+          range: moment(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         _forever = _value3.forever;
       if (_forever === 'Y') {
         return {
-          range: dayjs('9999-01-01'),
+          range: moment('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = dayjs(dateTime).format(defaultFormatDate);
+        var _tempDate = moment(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: dayjs(dateTime),
+            range: moment(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: dayjs('9999-01-01'),
+            range: moment('9999-01-01'),
             forever: true
           };
         }
@@ -113,8 +113,8 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [value, (_value4 = value) === null || _value4 === void 0 ? void 0 : _value4.dateTime]);
   var changeRangeTime = function changeRangeTime(values) {
     onChange({
-      startTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
-      endTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
+      startTime: values ? moment(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
+      endTime: values ? moment(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (rangeTime.forever) {
       _value = '长期';
     } else {
-      _value = rangeTime.range ? dayjs(rangeTime.range).format(defaultFormatDate) : null;
+      _value = rangeTime.range ? moment(rangeTime.range).format(defaultFormatDate) : null;
     }
     return _jsx(_Input, {
       value: _value,

package/es/ProForm/components/old/ProCertValidity/propsType.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
-import dayjs from 'dayjs';
+import moment from 'moment';
 interface ICertValidityValuePropsType {
-    dateTime?: dayjs.Dayjs | string;
+    dateTime?: moment.Moment | string;
     forever?: string;
 }
 interface ICertValidityRangeValuePropsType {
-    startTime?: dayjs.Dayjs | string;
-    endTime?: dayjs.Dayjs | string;
+    startTime?: moment.Moment | string;
+    endTime?: moment.Moment | string;
     forever?: string;
 }
 interface IProCertValidityExtraPropsType {

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

@@ -367,7 +367,9 @@ var Render = function Render(props) {
     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,

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/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();
         }