@zat-design/sisyphus-react 3.6.6 → 3.6.7-beta.1

package/es/ProEditTable/index.js

@@ -1,7 +1,5 @@
 import "antd/es/affix/style";
 import _Affix from "antd/es/affix";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -11,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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 _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"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray, isBoolean } from 'lodash';
@@ -19,12 +17,13 @@ import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks'
 import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
-import { DndWrapper, Row, Validator, Summary, RenderToolbar } from './components';
+import { Validator, Summary, RenderToolbar } from './components';
 import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
+import { BaseTable, DraggableTable, VirtualTable } from './components/RcTable';
 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,
@@ -34,6 +33,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,
@@ -244,7 +244,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         children: disabled || isForbiddenBtn('add') ? locale.ProEditTable.noData : _jsxs(_Fragment, {
           children: [locale.ProEditTable.noData, "\uFF0C", _jsx(RenderToolbar, _objectSpread({}, _objectSpread(_objectSpread({}, config), {}, {
             toolbarProps: toolbarProps === null || toolbarProps === void 0 ? void 0 : (_toolbarProps$filter = toolbarProps.filter) === null || _toolbarProps$filter === void 0 ? void 0 : _toolbarProps$filter.call(toolbarProps, function (item) {
-              return item.type === 'add';
+              return item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence);
             }),
             dataSource: []
           })))]
@@ -326,62 +326,38 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       rowSelection: renderRowSelection()
     });
   } : summary;
+  var TableComponent = draggable ? DraggableTable : virtual ? VirtualTable : BaseTable;
   return _jsxs(_Fragment, {
     children: [_jsxs(_ConfigProvider, {
       renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : empty,
-      children: [_jsxs(DndWrapper, {
-        value: value,
-        onChange: onChange,
-        onDrag: onDrag,
-        disabled: disabled,
-        draggable: draggable,
-        children: [headerRender ? _jsx("div", {
-          className: "pro-edit-table-header",
-          children: typeof headerRender === 'function' ? headerRender() : headerRender
-        }) : null, _jsx(_Table, _objectSpread(_objectSpread({
-          ref: tableRef,
+      children: [_jsx(TableComponent, _objectSpread(_objectSpread({}, 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: Row
-            }
-          } : undefined,
-          onRow: function onRow() {
-            return {
-              disabled: disabled || virtualKey && !!editingKeys.length,
-              'data-hide': isHideCheckBox,
-              onClick: function onClick() {},
-              rowDraggable: rowDraggable
-            };
-          }
-        }, resetProps), {}, {
-          pagination: pagination ? _objectSpread({
-            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 formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.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 ? _jsx(_Affix, _objectSpread(_objectSpread({
+          disabled: disabled,
+          virtualKey: virtualKey,
+          editingKeys: editingKeys,
+          isHideCheckBox: isHideCheckBox,
+          rowDraggable: rowDraggable,
+          pagination: pagination,
+          scroll: scroll,
+          summary: _summary,
+          page: page,
+          formatMessage: formatMessage,
+          locale: locale,
+          handlePageChange: handlePageChange
+        }
+      })), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? _jsx(_Affix, _objectSpread(_objectSpread({
         ref: affixRef
       }, _toolbarSticky), {}, {
         children: _jsx("div", {
@@ -414,6 +390,7 @@ ForwardProEditTable.defaultProps = {
   toolbarProps: [],
   disabled: false,
   draggable: false,
+  virtual: false,
   stripe: true,
   emptyBtnText: locale.ProEditTable.clickAdd,
   onlyOneLineMsg: locale.ProEditTable.onlyOneLineMsg,

package/es/ProEditTable/propsType.d.ts

@@ -45,6 +45,11 @@ export interface BaseActionProps<T = any> {
      * @default           true
      */
     show?: boolean | ShowFunction<T>;
+    /**
+   * @description       是否持久化（一直显示）操作按钮
+   * @default           true
+   */
+    persistence?: boolean;
     /**
      * @description       是否禁止操作
      * @default           true
@@ -100,6 +105,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 +197,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     draggable?: boolean;
+    /**
+   * @description       是否开启虚拟列表（scroll,x,y必须为固定值）
+   * @default           -
+   */
+    virtual?: boolean;
     /**
      * @description       空列表状态时，自定义添加按钮
      * @default          点击添加

package/es/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/es/ProEditTable/utils/index.js

@@ -121,7 +121,7 @@ var getActionColumn = function getActionColumn(config) {
             case 20:
               result = _context.sent;
             case 21:
-              if (result && type !== 'custom') {
+              if (result !== false && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
                   virtualRowName: rowName,

package/es/ProEditTable/utils/tools.js

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

package/es/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/es/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/es/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/es/ProEnum/utils/eventCenter.js

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

package/es/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/es/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/es/ProForm/components/base/InputNumber/index.js

@@ -240,9 +240,15 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _props$precision5, _valueProps3, _e$target2;
+    var _e$target, _props$precision5, _valueProps3, _e$target3;
     activateRef.current = false;
     var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
+    //  为空直接返回
+    if (value === '') {
+      var _e$target2;
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value);
+      return false;
+    }
     if (_max !== undefined && value > _max) {
       value = _max;
     }
@@ -269,7 +275,7 @@ var InputNumber = function InputNumber(props) {
         value = limitNumber(value, limit);
         break;
     }
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value));
   };
   // 获得焦点
   var handleFocus = function handleFocus(e) {

package/es/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/es/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 _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (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 _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (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 = 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 transformDataName(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, 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(_toConsumableArray(path), [foundOption]));
+        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat(_toConsumableArray(path), [foundOption]);
@@ -221,7 +221,9 @@ var ProCascader = function ProCascader(props) {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var _selectedOptions = useMemo(function () {
+    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  }, [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/es/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/es/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/es/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/es/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/es/ProForm/utils/index.js

@@ -121,7 +121,7 @@ export var splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-export var filterInternalFields = function filterInternalFields(values, optimize) {
+var _filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -135,20 +135,21 @@ export var filterInternalFields = function filterInternalFields(values, optimize
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return filterInternalFields(item);
+      return _filterInternalFields(item);
     });
   }
   if (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;
 };
-export var getAllNamePath = function getAllNamePath(object) {
+export { _filterInternalFields as filterInternalFields };
+var _getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -162,13 +163,14 @@ export var getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if (isObject(value)) {
-      resultKeys.concat(getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
+      resultKeys.concat(_getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
     }
     resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
   });
   return resultKeys;
 };
 // 判断一个字段值是否算空
+export { _getAllNamePath as getAllNamePath };
 var nullList = [undefined, 'null', '""', '[]'];
 export var isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
@@ -353,7 +355,7 @@ export var customEqualForFun = function customEqualForFun(value, other) {
 /**
  * 查询数据中是否包含rowKey
  */
-export var hasRowKey = function hasRowKey(obj) {
+var _hasRowKey = function hasRowKey(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -363,12 +365,13 @@ export var hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
  * 查询数据中是否包含rowKey
  */
+export { _hasRowKey as hasRowKey };
 export var view = function view(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
@@ -379,7 +382,7 @@ export var view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -415,7 +418,7 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
@@ -425,7 +428,7 @@ export var findOptionByValue = function findOptionByValue(treeData, value, field
       return 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 omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
@@ -435,6 +438,7 @@ export var findOptionByValue = function findOptionByValue(treeData, value, field
 /**
  * 对比依赖列表中的 值是否变更
  */
+export { _findOptionByValue as findOptionByValue };
 export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
   if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
     return dependencies.some(function (namePath) {

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

@@ -2,6 +2,5 @@ import { InternalNamePath, FormInstance, NamePath } from 'rc-field-form/es/inter
 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[];
+declare function useWatch(dependencies: string | NamePath[], form?: FormInstance, wait?: number): any;
 export default useWatch;

package/es/ProIcon/utils/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { themeMap, themeFillMap } from '../config';
-export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var _recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -19,10 +19,11 @@ export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      recurseGetNodes(type, node.childNodes[i], queue);
+      _recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
+export { _recurseGetNodes as recurseGetNodes };
 export var onBeforeInjection = function onBeforeInjection(_ref) {
   var svg = _ref.svg,
     actionMap = _ref.actionMap,
@@ -49,7 +50,7 @@ export var onBeforeInjection = function onBeforeInjection(_ref) {
     // 目前只支持处理渐变及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) {

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts

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

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -50,7 +50,7 @@ var OpenMenu = function OpenMenu(props) {
     if (!Array.isArray(result) || !result.length) {
       return [];
     }
-    var menuDeep = function menuDeep(data) {
+    var _menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
         var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
@@ -91,7 +91,7 @@ var OpenMenu = function OpenMenu(props) {
           if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
             delete item.children;
           } else {
-            menuDeep(item.children);
+            _menuDeep(item.children);
           }
         } else {
           delete item.children;
@@ -99,7 +99,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    menuDeep(result);
+    _menuDeep(result);
     return result;
   }, [dataSource]);
   useDeepCompareEffect(function () {

package/es/ProLayout/components/ProCollapse/index.d.ts

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

package/es/ProLayout/components/ProFooter/index.d.ts

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

package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts

@@ -1,4 +1,4 @@
 declare const Copy: ({ text }: {
     text: any;
-}) => JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default Copy;

package/es/ProLayout/components/ProHeader/index.d.ts

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

package/es/ProLayout/index.d.ts

@@ -5,7 +5,7 @@ export declare const LayoutContext: import("react").Context<{
     onSelected: (params: any) => void;
 }>;
 declare const ProLayout: {
-    (props: ProLayoutProps): JSX.Element;
+    (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;
     defaultProps: {
         menus: any[];
         iconfontUrl: string;
@@ -17,8 +17,8 @@ declare const ProLayout: {
         headerHeight: number;
         contentStyle: {};
     };
-    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => JSX.Element;
-    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => JSX.Element>;
-    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => JSX.Element>;
+    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
+    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
+    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
 };
 export default ProLayout;