@zat-design/sisyphus-react 3.3.0-beta.1 → 3.3.0-beta.11

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);
@@ -3324,6 +3330,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/index.js

@@ -101,7 +101,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var getRowKey = function getRowKey(record) {
     var key = record.rowKey || getRandom();
     if (rowKey) {
-      key = typeof rowKey === 'function' ? rowKey(record) : record[rowKey];
+      var _ref2;
+      key = (_ref2 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref2 !== void 0 ? _ref2 : key;
     }
     return key;
   };
@@ -212,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) {
@@ -231,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 () {

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/base/DatePicker/index.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, TimePickerProps } from 'antd';
-import { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 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<Moment>['showTime'];
+    showTime?: PickerPanelDateProps<Dayjs>['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 moment from 'moment';
+import dayjs from 'dayjs';
 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' && moment.isMoment(value)) {
+    } else if (typeof format === 'string' && dayjs.isDayjs(value)) {
       viewChildren = value.format(format);
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = moment(value).format(format);
+      viewChildren = dayjs(value).format(format);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
@@ -48,11 +48,11 @@ var DatePicker = function DatePicker(props) {
   });
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
-    _rest.value = moment(_rest.value);
+    _rest.value = dayjs(_rest.value);
   }
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
-      value: moment(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
+      value: dayjs(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
       disabled: true
     };
   }

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

@@ -1,11 +1,12 @@
-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, 'separator'>;
+} & Omit<RangePickerProps<Dayjs>, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

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

@@ -4,10 +4,8 @@ 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 moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
@@ -52,9 +50,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 = [moment(_res.value[0]), moment(_res.value[1])];
+    _res.value = [dayjs(_res.value[0]), dayjs(_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 moment from 'moment';
+import dayjs from 'dayjs';
 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 ? moment(value).format(format) : undefined);
+      onChange && onChange(value ? dayjs(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -35,7 +35,7 @@ var TimePicker = function TimePicker(props) {
     });
   }
   return _jsx(_TimePicker, _objectSpread(_objectSpread(_objectSpread({
-    value: value ? moment(value, format) : undefined
+    value: value ? dayjs(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

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

@@ -651,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/ProRangeLimit/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RangePickerProps } from 'antd/es/date-picker';
-import { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 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 = [Moment?, Moment?, boolean?];
+type Value = [Dayjs?, Dayjs?, 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 moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
-var defaultPickerValue = [moment(), moment()];
+var defaultPickerValue = [dayjs(), dayjs()];
 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]) && 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 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 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 moment(foreverDate, format).isSame(endDate);
+    return dayjs(foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
-    return moment(foreverDate, format);
+    return dayjs(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 || moment().startOf('day');
+      start = start || dayjs().startOf('day');
       end = foreverMoment;
     } else {
       start = undefined;

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

@@ -1,8 +1,8 @@
-import moment, { Moment } from 'moment';
+import dayjs, { Dayjs } from 'dayjs';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
     format?: string;
 }
-declare const useControlled: (props: Props) => [moment.Moment, (value: Moment | undefined) => void];
+declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | 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 moment from 'moment';
+import dayjs from 'dayjs';
 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 && moment(value, format).startOf('day'), handleChange];
+    return [value && dayjs(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 { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 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: Moment) => void;
+    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Dayjs) => 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 moment, { isMoment } from 'moment';
+import dayjs, { isDayjs } from 'dayjs';
 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 ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
+      var foreverMoment = foreverTime ? dayjs(foreverTime, format) : dayjs('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 (isMoment(value)) {
+    if (isDayjs(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(moment(foreverString, format));
+      onChange(dayjs(foreverString, format));
     } else {
       onChange(null);
     }

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 moment from 'moment';
+import dayjs from 'dayjs';
 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: [moment('9999-01-01'), moment('9999-01-01')],
+          range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = moment(startTime).format(defaultFormatDate);
-        var tempEndDate = moment(endTime).format(defaultFormatDate);
+        var tempStartDate = dayjs(startTime).format(defaultFormatDate);
+        var tempEndDate = dayjs(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [moment(startTime), moment(endTime)],
+            range: [dayjs(startTime), dayjs(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [moment('9999-01-01'), moment('9999-01-01')],
+            range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = moment(value).format(defaultFormatDate);
+        var tempDate = dayjs(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: moment('9999-01-01'),
+            range: dayjs('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: moment(value),
+          range: dayjs(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         _forever = _value3.forever;
       if (_forever === 'Y') {
         return {
-          range: moment('9999-01-01'),
+          range: dayjs('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = moment(dateTime).format(defaultFormatDate);
+        var _tempDate = dayjs(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: moment(dateTime),
+            range: dayjs(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: moment('9999-01-01'),
+            range: dayjs('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 ? 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,
+      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,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (rangeTime.forever) {
       _value = '长期';
     } else {
-      _value = rangeTime.range ? moment(rangeTime.range).format(defaultFormatDate) : null;
+      _value = rangeTime.range ? dayjs(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 moment from 'moment';
+import dayjs from 'dayjs';
 interface ICertValidityValuePropsType {
-    dateTime?: moment.Moment | string;
+    dateTime?: dayjs.Dayjs | string;
     forever?: string;
 }
 interface ICertValidityRangeValuePropsType {
-    startTime?: moment.Moment | string;
-    endTime?: moment.Moment | string;
+    startTime?: dayjs.Dayjs | string;
+    endTime?: dayjs.Dayjs | string;
     forever?: string;
 }
 interface IProCertValidityExtraPropsType {

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

@@ -363,9 +363,7 @@ 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';
@@ -389,31 +387,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);