@teamix/pro 1.4.14 → 1.4.17

package/es/sidebar/components/tree-node/index.js

@@ -29,6 +29,7 @@ import { ProActionGroup } from '../../../actions';
 import { usePrefixCls } from '@teamix/utils';
 import React, { isValidElement, useState } from 'react';
 import ProField, { renderTags } from '@teamix/pro-field';
+import { getTreeNodeProps } from '../..';
 import ProIconAction from './components/IconAction';
 import ProIconSwitch from './components/IconSwitch';
 import ProHoverTooltip from './components/HoverTooltip';
@@ -201,10 +202,14 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
 
 export function renderTreeNode(data) {
   return data.map(function (item) {
-    return /*#__PURE__*/React.createElement(Tree.Node, {
+    var _getTreeNodeProps = getTreeNodeProps(item),
+        nodeProps = _getTreeNodeProps.nodeProps,
+        labelProps = _getTreeNodeProps.labelProps;
+
+    return /*#__PURE__*/React.createElement(Tree.Node, _objectSpread({
       key: item.value,
-      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, item))
-    }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, labelProps))
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNode(item.children));
   });
 } // 渲染树节点 依赖 value
 
@@ -216,10 +221,14 @@ export function renderTreeNodeDependenceValue(data, onBeforeRenderNodeEvent, che
       newProps = onBeforeRenderNodeEvent(item, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data);
     }
 
-    return /*#__PURE__*/React.createElement(Tree.Node, {
+    var _getTreeNodeProps2 = getTreeNodeProps(item),
+        nodeProps = _getTreeNodeProps2.nodeProps,
+        labelProps = _getTreeNodeProps2.labelProps;
+
+    return /*#__PURE__*/React.createElement(Tree.Node, _objectSpread({
       key: item.value,
-      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, newProps))
-    }, item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data));
+      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, labelProps))
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data));
   });
 }
 export default ProSideBarTreeNode;

package/es/sidebar/components/tree-node/index.scss

@@ -50,9 +50,13 @@
       font-weight: unset;
     }
   }
-  .next-tree.next-node-block .next-tree-node-inner{
-    padding: 6px 0px 6px 4px !important;
-    margin: 0 0 4px 0px;
-    border-radius: 2px;
+}
+.teamix-pro-sidebar-deep-1 {
+  .teamix-pro-sidebar-tree {
+    .next-tree.next-node-block .next-tree-node-inner{
+      padding: 6px 0px 6px 4px !important;
+      margin: 0 0 4px 0px;
+      border-radius: 2px;
+    }
   }
-}
+}

package/es/sidebar/index.js

@@ -169,10 +169,10 @@ var ProSidebar = function ProSidebar(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls({
+    className: "".concat(cls(_defineProperty({
       '': true,
       'scroll-tree': scrollArea === 'tree'
-    }), " ").concat(className),
+    }, "deep-".concat(expandLevel), true)), " ").concat(className),
     style: style
   }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread(_objectSpread({
     searchOnChange: debounce(function (value) {

package/es/sidebar/index.scss

@@ -11,7 +11,8 @@
     .teamix-pro-sidebar-container,
     .teamix-pro-card,
     .next-card-content-container,
-    .teamix-pro-card-content {
+    .teamix-pro-card-content,
+    .teamix-pro-card-box{
       height: 100%;
     }
     .teamix-pro-sidebar-container-context {
@@ -24,3 +25,14 @@
     color: unset;
   }
 }
+.teamix-pro-page-container-sidebar {
+  .teamix-pro-sidebar {
+    .teamix-pro-sidebar-container {
+      .next-card-header.next-card-header {
+        padding-top: 0;
+      }
+    }
+  }
+}
+
+

package/es/sidebar/typing.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { MessageProps } from '@alifd/next/types/message';
-import { TreeProps } from '@alifd/next/types/tree';
+import { NodeProps, TreeProps } from '@alifd/next/types/tree';
 import { CommonRequestConfig } from '@teamix/utils';
 import { ProTagItem } from '../field';
 import { ProActionConfig, ProCardProps, ProFieldProps, ProFieldRenderProps, ProFieldType } from '..';
@@ -48,7 +48,9 @@ export declare type ProSidebarDataSourceItem = {
     render?: ProFieldRenderProps;
     /** ProField 的其他配置项 */
     fieldProps?: ProFieldProps;
-};
+    /** TreeNode 的其他配置项 */
+    treeNodeProps?: ProFieldProps;
+} & NodeProps;
 /** 单项 extra 配置项 */
 export declare type ProSidebarExtraProps = React.ReactNode | (ProSidebarExtraPropsItem | React.ReactNode)[];
 export declare type ProSidebarExtraPropsItem = {

package/es/sidebar/utils/index.d.ts

@@ -5,6 +5,7 @@
  * @param aliasMap 标识
  * @param level 深度
  */
+import { ProSidebarDataSourceItem } from '../typing';
 export declare function loop<T>(data: T[], func: any, aliasMap?: {
     children: string;
 }, level?: number): void;
@@ -81,3 +82,280 @@ export declare function filterTreeData<T>(nodes: any[], predicate: (node: T) =>
 }): {
     filterTreeValue: T[];
 };
+/**
+ * 获取TreeNodeProps
+ * @param item
+ */
+export declare function getTreeNodeProps(item: ProSidebarDataSourceItem): {
+    nodeProps: {
+        [k: string]: boolean | undefined;
+    };
+    labelProps: {
+        label?: (string & (boolean | import("react").ReactChild | import("react").ReactFragment | import("react").ReactPortal | null)) | undefined;
+        value?: any;
+        tag?: import("@teamix/pro-field").ProTagItem | undefined;
+        extra?: import("../typing").ProSidebarExtraProps;
+        children?: (ProSidebarDataSourceItem[] & (boolean | import("react").ReactChild | import("react").ReactFragment | import("react").ReactPortal | null)) | undefined;
+        valueType?: import("@teamix/pro-field").ProFieldType | undefined;
+        render?: import("@teamix/pro-field").ProFieldRenderProps | undefined;
+        fieldProps?: import("@teamix/pro-field").ProFieldProps | undefined;
+        defaultChecked?: boolean | undefined;
+        defaultValue?: string | number | readonly string[] | undefined;
+        suppressContentEditableWarning?: boolean | undefined;
+        suppressHydrationWarning?: boolean | undefined;
+        accessKey?: string | undefined;
+        className?: string | undefined;
+        contentEditable?: "inherit" | (boolean | "false" | "true") | undefined;
+        contextMenu?: string | undefined;
+        dir?: string | undefined;
+        hidden?: boolean | undefined;
+        id?: string | undefined;
+        lang?: string | undefined;
+        placeholder?: string | undefined;
+        slot?: string | undefined;
+        spellCheck?: (boolean | "false" | "true") | undefined;
+        style?: import("react").CSSProperties | undefined;
+        tabIndex?: number | undefined;
+        title?: string | undefined;
+        translate?: "yes" | "no" | undefined;
+        radioGroup?: string | undefined;
+        role?: import("react").AriaRole | undefined;
+        about?: string | undefined;
+        datatype?: string | undefined;
+        inlist?: any;
+        prefix?: string | undefined;
+        property?: string | undefined;
+        resource?: string | undefined;
+        typeof?: string | undefined;
+        vocab?: string | undefined;
+        autoCapitalize?: string | undefined;
+        autoCorrect?: string | undefined;
+        autoSave?: string | undefined;
+        color?: string | undefined;
+        itemProp?: string | undefined;
+        itemScope?: boolean | undefined;
+        itemType?: string | undefined;
+        itemID?: string | undefined;
+        itemRef?: string | undefined;
+        results?: number | undefined;
+        security?: string | undefined;
+        unselectable?: "on" | "off" | undefined;
+        inputMode?: "url" | "none" | "text" | "search" | "tel" | "email" | "numeric" | "decimal" | undefined;
+        is?: string | undefined;
+        'aria-activedescendant'?: string | undefined;
+        'aria-atomic'?: (boolean | "false" | "true") | undefined;
+        'aria-autocomplete'?: "none" | "inline" | "both" | "list" | undefined;
+        'aria-busy'?: (boolean | "false" | "true") | undefined;
+        'aria-checked'?: boolean | "mixed" | "false" | "true" | undefined;
+        'aria-colcount'?: number | undefined;
+        'aria-colindex'?: number | undefined;
+        'aria-colspan'?: number | undefined;
+        'aria-controls'?: string | undefined;
+        'aria-current'?: boolean | "date" | "time" | "page" | "false" | "true" | "step" | "location" | undefined;
+        'aria-describedby'?: string | undefined;
+        'aria-details'?: string | undefined;
+        'aria-disabled'?: (boolean | "false" | "true") | undefined;
+        'aria-dropeffect'?: "link" | "none" | "copy" | "move" | "execute" | "popup" | undefined;
+        'aria-errormessage'?: string | undefined;
+        'aria-expanded'?: (boolean | "false" | "true") | undefined;
+        'aria-flowto'?: string | undefined;
+        'aria-grabbed'?: (boolean | "false" | "true") | undefined;
+        'aria-haspopup'?: boolean | "listbox" | "grid" | "menu" | "false" | "true" | "dialog" | "tree" | undefined;
+        'aria-hidden'?: (boolean | "false" | "true") | undefined;
+        'aria-invalid'?: boolean | "false" | "true" | "grammar" | "spelling" | undefined;
+        'aria-keyshortcuts'?: string | undefined;
+        'aria-label'?: string | undefined;
+        'aria-labelledby'?: string | undefined;
+        'aria-level'?: number | undefined;
+        'aria-live'?: "off" | "assertive" | "polite" | undefined;
+        'aria-modal'?: (boolean | "false" | "true") | undefined;
+        'aria-multiline'?: (boolean | "false" | "true") | undefined;
+        'aria-multiselectable'?: (boolean | "false" | "true") | undefined;
+        'aria-orientation'?: "vertical" | "horizontal" | undefined;
+        'aria-owns'?: string | undefined;
+        'aria-placeholder'?: string | undefined;
+        'aria-posinset'?: number | undefined;
+        'aria-pressed'?: boolean | "mixed" | "false" | "true" | undefined;
+        'aria-readonly'?: (boolean | "false" | "true") | undefined;
+        'aria-relevant'?: "text" | "all" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
+        'aria-required'?: (boolean | "false" | "true") | undefined;
+        'aria-roledescription'?: string | undefined;
+        'aria-rowcount'?: number | undefined;
+        'aria-rowindex'?: number | undefined;
+        'aria-rowspan'?: number | undefined;
+        'aria-selected'?: (boolean | "false" | "true") | undefined;
+        'aria-setsize'?: number | undefined;
+        'aria-sort'?: "none" | "ascending" | "descending" | "other" | undefined;
+        'aria-valuemax'?: number | undefined;
+        'aria-valuemin'?: number | undefined;
+        'aria-valuenow'?: number | undefined;
+        'aria-valuetext'?: string | undefined;
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        } | undefined;
+        onCopy?: import("react").ClipboardEventHandler<HTMLElement> | undefined;
+        onCopyCapture?: import("react").ClipboardEventHandler<HTMLElement> | undefined;
+        onCut?: import("react").ClipboardEventHandler<HTMLElement> | undefined;
+        onCutCapture?: import("react").ClipboardEventHandler<HTMLElement> | undefined;
+        onPaste?: import("react").ClipboardEventHandler<HTMLElement> | undefined;
+        onPasteCapture?: import("react").ClipboardEventHandler<HTMLElement> | undefined;
+        onCompositionEnd?: import("react").CompositionEventHandler<HTMLElement> | undefined;
+        onCompositionEndCapture?: import("react").CompositionEventHandler<HTMLElement> | undefined;
+        onCompositionStart?: import("react").CompositionEventHandler<HTMLElement> | undefined;
+        onCompositionStartCapture?: import("react").CompositionEventHandler<HTMLElement> | undefined;
+        onCompositionUpdate?: import("react").CompositionEventHandler<HTMLElement> | undefined;
+        onCompositionUpdateCapture?: import("react").CompositionEventHandler<HTMLElement> | undefined;
+        onFocus?: import("react").FocusEventHandler<HTMLElement> | undefined;
+        onFocusCapture?: import("react").FocusEventHandler<HTMLElement> | undefined;
+        onBlur?: import("react").FocusEventHandler<HTMLElement> | undefined;
+        onBlurCapture?: import("react").FocusEventHandler<HTMLElement> | undefined;
+        onChange?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onChangeCapture?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onBeforeInput?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onBeforeInputCapture?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onInput?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onInputCapture?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onReset?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onResetCapture?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onSubmit?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onSubmitCapture?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onInvalid?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onInvalidCapture?: import("react").FormEventHandler<HTMLElement> | undefined;
+        onLoad?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onError?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onErrorCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onKeyDown?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyDownCapture?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyPress?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyPressCapture?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyUp?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyUpCapture?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onAbort?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onAbortCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onCanPlay?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onCanPlayCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onCanPlayThrough?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onCanPlayThroughCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onDurationChange?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onDurationChangeCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onEmptied?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onEmptiedCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onEncrypted?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onEncryptedCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onEnded?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onEndedCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadedData?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadedDataCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadedMetadata?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadedMetadataCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadStart?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onLoadStartCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onPause?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onPauseCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onPlay?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onPlayCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onPlaying?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onPlayingCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onProgress?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onProgressCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onRateChange?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onRateChangeCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSeeked?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSeekedCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSeeking?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSeekingCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onStalled?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onStalledCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSuspend?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSuspendCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onTimeUpdate?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onTimeUpdateCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onVolumeChange?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onVolumeChangeCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onWaiting?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onWaitingCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onAuxClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onAuxClickCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onClickCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onContextMenu?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onContextMenuCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onDoubleClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onDoubleClickCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onDrag?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragEnd?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragEndCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragEnter?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragEnterCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragExit?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragExitCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragLeave?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragLeaveCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragOver?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragOverCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragStart?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDragStartCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDrop?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onDropCapture?: import("react").DragEventHandler<HTMLElement> | undefined;
+        onMouseDown?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseDownCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseEnter?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseLeave?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseMove?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseMoveCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseOut?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseOutCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseOver?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseOverCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseUp?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onMouseUpCapture?: import("react").MouseEventHandler<HTMLElement> | undefined;
+        onSelect?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onSelectCapture?: import("react").ReactEventHandler<HTMLElement> | undefined;
+        onTouchCancel?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchCancelCapture?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchEnd?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchEndCapture?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchMove?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchMoveCapture?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchStart?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onTouchStartCapture?: import("react").TouchEventHandler<HTMLElement> | undefined;
+        onPointerDown?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerDownCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerMove?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerMoveCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerUp?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerUpCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerCancel?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerCancelCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerEnter?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerEnterCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerLeave?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerLeaveCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerOver?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerOverCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerOut?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onPointerOutCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onGotPointerCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onGotPointerCaptureCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onLostPointerCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onLostPointerCaptureCapture?: import("react").PointerEventHandler<HTMLElement> | undefined;
+        onScroll?: import("react").UIEventHandler<HTMLElement> | undefined;
+        onScrollCapture?: import("react").UIEventHandler<HTMLElement> | undefined;
+        onWheel?: import("react").WheelEventHandler<HTMLElement> | undefined;
+        onWheelCapture?: import("react").WheelEventHandler<HTMLElement> | undefined;
+        onAnimationStart?: import("react").AnimationEventHandler<HTMLElement> | undefined;
+        onAnimationStartCapture?: import("react").AnimationEventHandler<HTMLElement> | undefined;
+        onAnimationEnd?: import("react").AnimationEventHandler<HTMLElement> | undefined;
+        onAnimationEndCapture?: import("react").AnimationEventHandler<HTMLElement> | undefined;
+        onAnimationIteration?: import("react").AnimationEventHandler<HTMLElement> | undefined;
+        onAnimationIterationCapture?: import("react").AnimationEventHandler<HTMLElement> | undefined;
+        onTransitionEnd?: import("react").TransitionEventHandler<HTMLElement> | undefined;
+        onTransitionEndCapture?: import("react").TransitionEventHandler<HTMLElement> | undefined;
+        locale?: any;
+        pure?: boolean | undefined;
+        warning?: boolean | undefined;
+        rtl?: boolean | undefined;
+    };
+};

package/es/sidebar/utils/index.js

@@ -1,3 +1,17 @@
+var _excluded = ["selectable", "checkable", "editable", "draggable", "disabled", "checkboxDisabled", "isLeaf", "treeNodeProps"];
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -14,19 +28,12 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-/**
- * 深度遍历节点
- * @param data 数据
- * @param func 处理方法
- * @param aliasMap 标识
- * @param level 深度
- */
 export function loop(data, func, aliasMap) {
   var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
 
@@ -188,19 +195,15 @@ export function getTreeLevel(data, aliasMap) {
       _ref6$children = _ref6.children,
       children = _ref6$children === void 0 ? 'children' : _ref6$children;
 
-  var result = 1;
+  var result = 0;
   loop(data, function (item, level) {
     if (result < level) {
       result = level;
     }
-
-    if ('children' in item) {
-      result += 1;
-    }
   }, {
     children: children
   });
-  return result;
+  return result + 1;
 }
 /**
  * 获取树层级对应的所有 key
@@ -283,4 +286,42 @@ export function filterTreeData(nodes, predicate, aliasMap) {
   return {
     filterTreeValue: filterTreeValue
   };
+}
+/**
+ * 获取TreeNodeProps
+ * @param item
+ */
+
+export function getTreeNodeProps(item) {
+  var selectable = item.selectable,
+      checkable = item.checkable,
+      editable = item.editable,
+      draggable = item.draggable,
+      disabled = item.disabled,
+      checkboxDisabled = item.checkboxDisabled,
+      isLeaf = item.isLeaf,
+      _item$treeNodeProps = item.treeNodeProps,
+      treeNodeProps = _item$treeNodeProps === void 0 ? {} : _item$treeNodeProps,
+      others = _objectWithoutProperties(item, _excluded);
+
+  var nodeProps = _objectSpread({
+    selectable: selectable,
+    checkable: checkable,
+    editable: editable,
+    draggable: draggable,
+    disabled: disabled,
+    checkboxDisabled: checkboxDisabled,
+    isLeaf: isLeaf
+  }, treeNodeProps);
+
+  return {
+    nodeProps: Object.fromEntries(Object.entries(nodeProps).filter(function (_ref9) {
+      var _ref10 = _slicedToArray(_ref9, 2),
+          _ = _ref10[0],
+          v = _ref10[1];
+
+      return v !== undefined;
+    })),
+    labelProps: others
+  };
 }

package/es/table/components/Layout/index.js

@@ -122,14 +122,20 @@ var Layout = function Layout(props) {
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
-      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QueryFilterLayout, {
         addonBefore: renderMainAction(),
-        addonAfter: renderAddonAfter()
-      });
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/React.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     } else {
-      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
-        addonAfter: renderAddonAfter()
-      });
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QueryFilterLayout, {
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/React.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     }
   }; // 区域组合渲染
 

package/es/table/components/QuickAction/index.js

@@ -15,7 +15,7 @@ var QuickAction = function QuickAction(props) {
       actionRef = props.actionRef,
       rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ProActionButton
 
-  if (_typeof(quickAction) === 'object') {
+  if (_typeof(quickAction) === 'object' && (quickAction === null || quickAction === void 0 ? void 0 : quickAction.config)) {
     // 默认 context
     var defaultContext = {
       action: actionRef.current,