@lemon-fe/kits 1.0.0-15 → 1.0.0-18

package/es/components/DataGrid/typings.d.ts

@@ -8,7 +8,7 @@ export declare type PathType = string | (string | number)[];
 export declare type ValidateRule<T> = Pick<RuleItem, 'required' | 'message' | 'pattern' | 'min' | 'max' | 'len' | 'type'> & {
     validator?: (rule: any, val: any, record: T) => void | Promise<void>;
 };
-export declare type EditableRender<T> = (val: any, record: T, index: number, params: {
+export declare type EditableRender<T, K = any> = (val: K, record: T, index: number, params: {
     context: any;
     ref: RefObject<{
         select?: () => void;
@@ -16,7 +16,7 @@ export declare type EditableRender<T> = (val: any, record: T, index: number, par
         blur?: () => void;
     }>;
     onChange: (val: Partial<T>, action?: 'stop' | 'next') => void;
-} & ICellEditorParams) => ReactNode;
+} & ICellEditorParams<T, K>) => ReactNode;
 export interface ColumnType<TData> extends Omit<ColDef<TData>, 'editable'> {
     title?: ReactNode | ((params: IHeaderParams) => ReactNode);
     dataIndex?: PathType;

package/es/components/SiderTree/index.d.ts

@@ -1,7 +1,5 @@
 import { ReactNode } from 'react';
-import { TreeProps } from 'rc-tree';
-import type { DataNode, EventDataNode } from 'rc-tree/lib/interface';
-import { TabsProps } from 'antd';
+import { type TabsProps, type TreeProps } from 'antd';
 import type { TreeData, OperationType } from './typings';
 interface Props<KeyType> extends Omit<TreeProps, 'onSelect' | 'selectedKeys' | 'defaultSelectedKeys' | 'defaultExpandAll' | 'defaultExpandedKeys' | 'prefixCls'> {
     data?: TreeData<KeyType>[];
@@ -10,13 +8,7 @@ interface Props<KeyType> extends Omit<TreeProps, 'onSelect' | 'selectedKeys' | '
     header?: ReactNode;
     footer?: ReactNode;
     operation?: OperationType<KeyType>;
-    onSelect?: (node: TreeData<KeyType>, info: {
-        event: 'select';
-        selected: boolean;
-        node: EventDataNode<DataNode>;
-        selectedNodes: DataNode[];
-        nativeEvent: MouseEvent;
-    }) => void;
+    onSelect?: (node: TreeData<KeyType>, info: Parameters<Exclude<TreeProps['onSelect'], undefined>>[1]) => void;
     selectedKeys?: KeyType[];
     defaultSelectedKeys?: KeyType[];
     defaultExpandAll?: boolean;

package/es/components/SiderTree/index.js

@@ -29,8 +29,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { useMemo, useState } from 'react';
 import { useDebounce } from '@lemon-fe/hooks';
-import Tree from 'rc-tree';
-import { Input, Tabs } from 'antd';
+import { Input, Tabs, Tree } from 'antd';
 import { PREFIX_CLS } from "../../constants";
 import TreeNodeTitle from "./TreeNodeTitle";
 import Icons from "../Icons";
@@ -149,8 +148,7 @@ export default function SiderTree(props) {
     src: empty
   }), /*#__PURE__*/React.createElement("div", null, "\u6682\u65E0\u6570\u636E")) : /*#__PURE__*/React.createElement(Tree, _extends({
     treeData: tree,
-    prefixCls: prefixCls,
-    itemHeight: 40,
+    itemHeight: 28,
     showLine: true,
     onSelect: function onSelect(selectedKeys, info) {
       if (_onSelect) {

package/es/components/SiderTree/index.less

@@ -8,15 +8,6 @@
     box-sizing: border-box;
     height: 100%;
     padding: @space-v 0;
-
-    .@{prefixCls}-tree-list-scrollbar {
-      display: block !important;
-      right: -16px !important;
-    }
-
-    .@{prefixCls}-tree-list-scrollbar-thumb {
-      background: #ddd !important;
-    }
   }
 
   &-menu-popover {
@@ -66,134 +57,126 @@
 
   &-body {
     min-height: 0;
-    padding: 0 @space-h;
     overflow: auto;
-
     .scrollBar(8px);
-  }
 
-  &-header + &-body {
-    margin-top: 12px;
-  }
+    .@{ant-prefix}-tree {
+      &-list-holder-inner {
+        align-items: stretch;
+      }
 
-  &-header + .@{ant-prefix}-tabs {
-    margin-top: 8px;
-  }
+      &-list {
+        padding: 0 @space-h;
+      }
 
-  &-footer {
-    margin-top: 12px;
-    padding: 0 12px;
-  }
+      &-list-scrollbar-thumb {
+        background: #ddd !important;
+      }
 
-  &-treenode {
-    display: flex;
-    align-items: center;
-    height: @treeNodeHeight;
-  }
+      &-treenode {
+        display: flex;
+        align-items: center;
+        height: @treeNodeHeight;
+        padding-bottom: 0;
+      }
 
-  &-indent {
-    align-self: stretch;
-    white-space: nowrap;
-    user-select: none;
+      &-indent {
+        align-self: stretch;
+        white-space: nowrap;
+        user-select: none;
 
-    &-unit {
-      display: inline-block;
-      width: @indentWidth;
-      vertical-align: top;
-    }
-  }
+        &-unit {
+          display: inline-block;
+          width: @indentWidth;
+          vertical-align: top;
+        }
+      }
 
-  &-show-line &-indent-unit {
-    position: relative;
-    height: 100%;
+      &-node-content-wrapper {
+        display: flex;
+        flex: 1;
+        align-items: center;
+        min-width: 0;
+        padding: 0;
+      }
 
-    &::before {
-      position: absolute;
-      top: 0;
-      right: @indentWidth / 2;
-      bottom: 0;
-      border-right: 1px solid #c4c4c4;
-      content: '';
-    }
-  }
+      &-switcher {
+        position: relative;
+        display: flex;
+        flex: none;
+        justify-content: center;
+        align-items: center;
+        width: @indentWidth;
+        height: @treeNodeHeight;
+        margin: 0;
+        cursor: pointer;
+        user-select: none;
 
-  &-switcher {
-    position: relative;
-    display: block;
-    flex: none;
-    align-self: stretch;
-    width: @indentWidth;
-    margin: 0;
-    line-height: @treeNodeHeight;
-    text-align: center;
-    cursor: pointer;
-    user-select: none;
+        & svg {
+          width: 13px;
+          height: 13px;
+        }
+      }
 
-    & svg {
-      width: 13px;
-      height: 13px;
-    }
+      &-title {
+        display: flex;
+        flex: 1;
+        align-items: center;
+        justify-content: space-between;
+        min-width: 56px;
+        padding: 0 8px;
+        border-radius: 4px;
+        cursor: pointer;
+        transition: background-color 0.2s;
+      }
 
-    &-noop {
-      display: none;
+      &-node-selected {
+        color: @primary-color;
+        background: .primary(0.1) [] !important;
+      }
     }
   }
 
-  &-node-content-wrapper {
-    display: flex;
-    flex: 1;
-    align-items: center;
-    min-width: 0;
+  &-title-content {
+    display: block;
+    height: @treeNodeHeight;
+    overflow: hidden;
+    line-height: @treeNodeHeight;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
-  &-node-selected &-title {
-    color: @primary-color;
-    background: .primary(0.1) [] !important;
-  }
+  &-title-operators {
+    &-item {
+      width: 20px;
+      height: 20px;
+      margin-left: 4px;
+      line-height: 1;
+      text-align: center;
+      border-radius: 4px;
 
-  &-title {
-    display: flex;
-    flex: 1;
-    align-items: center;
-    justify-content: space-between;
-    min-width: 56px;
-    padding: 0 8px;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: background-color 0.2s;
-
-    &:hover {
-      background-color: #ededed;
-    }
+      & svg {
+        vertical-align: middle;
+      }
 
-    &-content {
-      display: block;
-      height: @treeNodeHeight;
-      overflow: hidden;
-      line-height: @treeNodeHeight;
-      white-space: nowrap;
-      text-overflow: ellipsis;
+      &-active,
+      &:hover {
+        background: #d7d7d7;
+      }
     }
+  }
 
-    &-operators {
-      &-item {
-        width: 20px;
-        height: 20px;
-        margin-left: 4px;
-        line-height: 1;
-        text-align: center;
-        border-radius: 4px;
+  &-header + &-body {
+    margin-top: 12px;
+  }
 
-        & svg {
-          vertical-align: middle;
-        }
+  &-header + .@{ant-prefix}-tabs {
+    margin-top: 8px;
+  }
 
-        &-active,
-        &:hover {
-          background: #d7d7d7;
-        }
-      }
-    }
+  &-footer {
+    margin-top: 12px;
+    padding: 0 12px;
   }
 
   &-empty {

package/es/components/SiderTree/typings.d.ts

@@ -1,7 +1,7 @@
-import type { TreeNodeProps } from 'rc-tree';
+import type { DataNode } from 'antd/es/tree';
 import type { ReactNode } from 'react';
 
-export interface TreeData<T> extends Pick<TreeNodeProps, 'icon'> {
+export interface TreeData<T = string | number> extends Pick<DataNode, 'icon'> {
   key: T;
   title: string | number;
   parent?: T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-15",
+  "version": "1.0.0-18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -47,7 +47,6 @@
     "lodash": "^4.17.0",
     "moment": "^2.29.4",
     "rc-resize-observer": "^1.0.0",
-    "rc-tree": "^5.7.0",
     "react-color": "^2.19.3",
     "react-gcolor-picker": "^1.2.4",
     "react-resizable": "^3.0.4",