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

package/lib/ProEditTable/index.js

@@ -23,9 +23,10 @@ var _components = require("./components");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
+var _RcTable = require("./components/RcTable");
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -35,6 +36,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     mode = _ref.mode,
     stripe = _ref.stripe,
     draggable = _ref.draggable,
+    virtual = _ref.virtual,
     disabled = _ref.disabled,
     insertType = _ref.insertType,
     emptyBtnText = _ref.emptyBtnText,
@@ -327,62 +329,39 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       rowSelection: renderRowSelection()
     });
   } : summary;
+  var TableComponent = draggable ? _RcTable.DraggableTable : virtual ? _RcTable.VirtualTable1 : _RcTable.BaseTable;
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [(0, _jsxRuntime.jsxs)(_antd.ConfigProvider, {
       renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : empty,
-      children: [(0, _jsxRuntime.jsxs)(_components.DndWrapper, {
-        value: value,
-        onChange: onChange,
-        onDrag: onDrag,
-        disabled: disabled,
-        draggable: draggable,
-        children: [headerRender ? (0, _jsxRuntime.jsx)("div", {
-          className: "pro-edit-table-header",
-          children: typeof headerRender === 'function' ? headerRender() : headerRender
-        }) : null, (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          ref: tableRef,
+      children: [(0, _jsxRuntime.jsx)(TableComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), {}, {
+        draggableProps: {
+          onChange: onChange,
+          onDrag: onDrag,
+          draggable: draggable
+        },
+        tableProps: {
+          value: value,
+          headerRender: headerRender,
+          tableRef: tableRef,
           className: _className,
-          dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
           columns: _columns,
-          rowSelection: renderRowSelection(),
+          renderRowSelection: renderRowSelection,
           rowClassName: _rowClassName,
-          components: draggable ? {
-            body: {
-              row: _components.Row
-            }
-          } : undefined,
-          onRow: function onRow() {
-            return {
-              disabled: disabled || virtualKey && !!editingKeys.length,
-              'data-hide': isHideCheckBox,
-              onClick: function onClick() {},
-              rowDraggable: rowDraggable
-            };
-          }
-        }, resetProps), {}, {
-          pagination: pagination ? (0, _objectSpread2.default)({
-            current: page.pageNum,
-            pageSize: page.pageSize,
-            showSizeChanger: false,
-            showQuickJumper: true,
-            total: value === null || value === void 0 ? void 0 : value.length,
-            showTotal: function showTotal(total) {
-              var _locale$ProEditTable;
-              if (!total) return;
-              return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-                total: total
-              });
-            },
-            onChange: handlePageChange
-          }, pagination) : false,
-          rowKey: "rowKey",
-          scroll: {
-            x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
-            y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
-          },
-          summary: _summary
-        }))]
-      }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? (0, _jsxRuntime.jsx)(_antd.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          disabled: disabled,
+          virtualKey: virtualKey,
+          editingKeys: editingKeys,
+          isHideCheckBox: isHideCheckBox,
+          rowDraggable: rowDraggable,
+          pagination: pagination,
+          scroll: scroll,
+          summary: _summary,
+          page: page,
+          formatMessage: _locale.formatMessage,
+          locale: _locale.default,
+          handlePageChange: handlePageChange,
+          empty: empty
+        }
+      })), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? (0, _jsxRuntime.jsx)(_antd.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         ref: affixRef
       }, _toolbarSticky), {}, {
         children: (0, _jsxRuntime.jsx)("div", {
@@ -415,6 +394,7 @@ ForwardProEditTable.defaultProps = {
   toolbarProps: [],
   disabled: false,
   draggable: false,
+  virtual: false,
   stripe: true,
   emptyBtnText: _locale.default.ProEditTable.clickAdd,
   onlyOneLineMsg: _locale.default.ProEditTable.onlyOneLineMsg,

package/lib/ProEditTable/propsType.d.ts

@@ -100,6 +100,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    validateTrigger?: string | string[];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -191,6 +192,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     draggable?: boolean;
+    /**
+   * @description       是否开启虚拟列表（scroll,x,y必须为固定值）
+   * @default           -
+   */
+    virtual?: boolean;
     /**
      * @description       空列表状态时，自定义添加按钮
      * @default          点击添加

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

@@ -9,7 +9,7 @@ export declare const defaultBtnNameMap: {
     custom: any;
 };
 export declare const iconMap: {
-    add: JSX.Element;
+    add: import("react/jsx-runtime").JSX.Element;
 };
 export declare const defaultSingleActionKeys: string[];
 export declare const defaultMultipleActionKeys: string[];

package/lib/ProEditTable/utils/config.js

@@ -173,7 +173,7 @@ var actions = exports.actions = {
   },
   add: function () {
     var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
-      var _tableRef$current$que, _tableRef$current$que2;
+      var _tableRef$current, _tableRef$current$chi, _tableRef$current$chi2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -206,7 +206,7 @@ var actions = exports.actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$chi = _tableRef$current.children) === null || _tableRef$current$chi === void 0 ? void 0 : (_tableRef$current$chi2 = _tableRef$current$chi.scrollTo) === null || _tableRef$current$chi2 === void 0 ? void 0 : _tableRef$current$chi2.call(_tableRef$current$chi, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });

package/lib/ProEditTable/utils/tools.js

@@ -12,14 +12,14 @@ var getRandom = exports.getRandom = function getRandom() {
 };
 // 深层次对比两个对象且取出来差异值
 var difference = exports.difference = function difference(object, base) {
-  var changes = function changes(object, base) {
+  var _changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
       if (!(0, _lodash.isEqual)(value, base[key])) {
-        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
+        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? _changes(value, base[key]) : value;
       }
     });
   };
-  return changes(object, base);
+  return _changes(object, base);
 };
 // 数组字段循环校验，解决validateFields无法批量校验的问题
 var customValidate = exports.customValidate = function customValidate(validateKeys, form, rowName) {

package/lib/ProEnum/components/Group.d.ts

@@ -6,5 +6,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     allowClear?: boolean;
     button?: boolean;
 }
-declare const Group: (props: Props) => JSX.Element;
+declare const Group: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default Group;

package/lib/ProEnum/components/Tag.d.ts

@@ -3,5 +3,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     fieldValue: string;
     fieldLabel: string;
 }
-declare const ProEnumTag: (props: Props) => JSX.Element;
+declare const ProEnumTag: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default ProEnumTag;

package/lib/ProEnum/index.d.ts

@@ -2,8 +2,8 @@ import useEnum from './hooks/useEnum';
 import { ProEnumProps } from './propsType';
 import './style/index.less';
 declare const ProEnum: {
-    (props: ProEnumProps): JSX.Element;
-    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
+    (props: ProEnumProps): import("react/jsx-runtime").JSX.Element;
+    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
     useEnum: typeof useEnum;
 };
 export default ProEnum;

package/lib/ProEnum/utils/eventCenter.js

@@ -10,7 +10,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
     this.events = void 0;
     this.events = new Map();
   }
-  (0, _createClass2.default)(SimpleEventCenter, [{
+  return (0, _createClass2.default)(SimpleEventCenter, [{
     key: "subscribe",
     value: function subscribe(eventName, callback) {
       if (!this.events.has(eventName)) {
@@ -37,6 +37,5 @@ var SimpleEventCenter = /*#__PURE__*/function () {
       }
     }
   }]);
-  return SimpleEventCenter;
 }(); // 将 eventCenter 实例添加到 window 对象上
 window.eventCenter = new SimpleEventCenter();

package/lib/ProEnum/utils/getEnumLabel.d.ts

@@ -1,2 +1,2 @@
-declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
+declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
 export default getEnumLabel;

package/lib/ProForm/components/base/Input/index.d.ts

@@ -1,3 +1,3 @@
 import { IProps } from './propsType';
-declare const Input: (props: IProps) => JSX.Element;
+declare const Input: (props: IProps) => import("react/jsx-runtime").JSX.Element;
 export default Input;

package/lib/ProForm/components/combination/ProCascader/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -28,9 +28,9 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -94,7 +94,7 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
     return (0, _index.transformDataName)(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -129,7 +129,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -194,7 +194,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var findSelectedOptions = function findSelectedOptions(options, value) {
+  var _findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -213,7 +213,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -221,7 +221,7 @@ var ProCascader = function ProCascader(props) {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var _selectedOptions = _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {

package/lib/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
 export default InputRange;

package/lib/ProForm/components/old/InputWithSuffix/index.d.ts

@@ -1,3 +1,3 @@
 import { comPropsType } from './propsTypes';
-declare const InputWithSuffix: (props: comPropsType) => JSX.Element;
+declare const InputWithSuffix: (props: comPropsType) => import("react/jsx-runtime").JSX.Element;
 export default InputWithSuffix;

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -24,5 +23,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
 export default ProAddress;

package/lib/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;

package/lib/ProForm/index.d.ts

@@ -1,11 +1,12 @@
-import { Form, FormInstance } from 'antd';
+import { FormInstance } from 'antd';
 import React, { ForwardRefRenderFunction } from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
 import { useForm } from './utils/useForm';
+import useWatch from './utils/useWatch';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
     useForm: typeof useForm;
-    useWatch: typeof Form.useWatch;
+    useWatch: typeof useWatch;
     [key: string]: any;
 }
 declare const ProFormForward: IProForm;

package/lib/ProForm/index.js

@@ -24,6 +24,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
+var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl", "scrollToError", "optimize"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage, _ref;
@@ -274,22 +275,7 @@ var ProForm = function ProForm(props, ref) {
 // @ts-ignore
 var ProFormForward = /*#__PURE__*/(0, _react.forwardRef)(ProForm);
 ProFormForward.useForm = _useForm3.useForm;
-ProFormForward.useWatch = function (watchValue, form) {
-  if ((0, _lodash.isString)(watchValue)) {
-    var watchValues = [watchValue];
-    watchValues.forEach(function (item) {
-      _antd.Form.useWatch(item, form);
-    });
-    return form.getFieldsValue(watchValues);
-  }
-  if (watchValue.length) {
-    watchValue.forEach(function (item) {
-      _antd.Form.useWatch(item, form);
-    });
-    return form.getFieldsValue(watchValue);
-  }
-  return _antd.Form.useWatch([], form);
-};
+ProFormForward.useWatch = _useWatch.default;
 var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props) {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,

package/lib/ProForm/utils/index.js

@@ -139,7 +139,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -153,20 +153,20 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return filterInternalFields(item);
+      return _filterInternalFields(item);
     });
   }
   if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = filterInternalFields(nextValues[key]);
+      result[key] = _filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -180,7 +180,7 @@ var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if ((0, _lodash.isObject)(value)) {
-      resultKeys.concat(getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
     }
     resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
   });
@@ -371,7 +371,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
 /**
  * 查询数据中是否包含rowKey
  */
-var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
+var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -381,7 +381,7 @@ var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -397,7 +397,7 @@ var view = exports.view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -433,7 +433,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
@@ -443,7 +443,7 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
       return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }

package/lib/ProForm/utils/useShouldUpdate.js

@@ -29,6 +29,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     names = formItemProps.names,
     dependencies = formItemProps.dependencies;
   var timerRef = (0, _react.useRef)();
+  var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
   var showRef = (0, _react.useRef)();
   var disabledRef = (0, _react.useRef)();
   var requiredRef = (0, _react.useRef)();
@@ -165,17 +166,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names)) {
+        // 当show为其他变为false的时候记录一次需要清值
+        if (_show !== showRef.current && _show === false) {
+          needClear.current = true;
+        }
         if (_show === false) {
           clearTimeout(timerRef.current);
           timerRef.current = setTimeout(function () {
+            if (needClear.current !== true) return;
             if (Array.isArray(names)) {
               form.resetFields(names);
             } else {
               var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
               form.resetFields([clearName]);
             }
-          }, 200);
+            needClear.current = false;
+          }, 300);
         } else {
+          needClear.current = false;
           clearTimeout(timerRef.current);
         }
       }

package/lib/ProForm/utils/useWatch.d.ts

@@ -0,0 +1,7 @@
+import { InternalNamePath, FormInstance, NamePath } from 'rc-field-form/es/interface';
+export declare function toArray<T>(value?: T | T[] | null): T[];
+export declare function getNamePath(path: NamePath | null): InternalNamePath;
+export declare function stringify(value: any): string | number;
+declare function useWatch(dependencies: string, form?: FormInstance, wait?: number): any;
+declare function useWatch(dependencies: NamePath[], form?: FormInstance, wait?: number): any[];
+export default useWatch;

package/lib/ProForm/utils/useWatch.js

@@ -0,0 +1,87 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.getNamePath = getNamePath;
+exports.stringify = stringify;
+exports.toArray = toArray;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _lodash = require("lodash");
+var _FieldContext = require("rc-field-form/es/FieldContext");
+var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
+var _react = require("react");
+function toArray(value) {
+  if (value === undefined || value === null) {
+    return [];
+  }
+  return Array.isArray(value) ? value : [value];
+}
+function getNamePath(path) {
+  return toArray(path);
+}
+function stringify(value) {
+  try {
+    return JSON.stringify(value);
+  } catch (err) {
+    return Math.random();
+  }
+}
+// 创建之后namepath就不可变
+var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (namePath) {
+  var fullyStr = JSON.stringify(namePath);
+  var nameStrRef = (0, _react.useRef)(fullyStr);
+  (0, _warning.default)(nameStrRef.current === fullyStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
+} : function () {};
+function useWatch(dependencies, form, wait) {
+  var isSingle = typeof dependencies === 'string';
+  var _useState = (0, _react.useState)({}),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  var valueStr = (0, _react.useMemo)(function () {
+    return stringify(value);
+  }, [value]);
+  var valueStrRef = (0, _react.useRef)(valueStr);
+  valueStrRef.current = valueStr;
+  var formInstance = form;
+  var isValidForm = formInstance && formInstance._init;
+  var _dependencies = isSingle ? [dependencies] : dependencies;
+  var namePaths = _dependencies === null || _dependencies === void 0 ? void 0 : _dependencies.map(function (item) {
+    return getNamePath(item);
+  });
+  var namePathsRef = (0, _react.useRef)(namePaths);
+  namePathsRef.current = namePaths;
+  useWatchWarning(namePaths);
+  (0, _react.useEffect)(function () {
+    if (!isValidForm) return;
+    var getFieldsValue = formInstance.getFieldsValue,
+      getInternalHooks = formInstance.getInternalHooks;
+    var _getInternalHooks = getInternalHooks(_FieldContext.HOOK_MARK),
+      registerWatch = _getInternalHooks.registerWatch;
+    var callback = function callback() {
+      var newValue = getFieldsValue(_dependencies);
+      var nextValueStr = stringify(newValue);
+      // Compare stringify in case it's nest object
+      if (valueStrRef.current !== nextValueStr) {
+        valueStrRef.current = nextValueStr;
+        setValue(getFieldsValue(_dependencies));
+      }
+    };
+    // 增加防抖
+    if (wait) {
+      callback = (0, _lodash.debounce)(callback, wait);
+    }
+    var cancelRegister = registerWatch(callback);
+    var initialValue = getFieldsValue(_dependencies);
+    setValue(initialValue);
+    return cancelRegister;
+  },
+  // We do not need re-register since namePath content is the same
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [isValidForm]);
+  return value;
+}
+var _default = exports.default = useWatch;

package/lib/ProIcon/utils/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.recurseGetNodes = exports.onBeforeInjection = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _config = require("../config");
-var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -26,7 +26,7 @@ var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, n
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      recurseGetNodes(type, node.childNodes[i], queue);
+      _recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
@@ -56,7 +56,7 @@ var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_
     // 目前只支持处理渐变及fill填充
     var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
     types.forEach(function (typeKey) {
-      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+      _recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
     });
     if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
       nodeMap.gradation.forEach(function (item, index) {