@qsxy/element-plus-react 1.0.0-next.5 → 1.0.0-next.8

package/dist/Cascader/CascaderMenu.js

@@ -33,82 +33,20 @@ __export(CascaderMenu_exports, {
 });
 module.exports = __toCommonJS(CascaderMenu_exports);
 var import_classnames = __toESM(require("classnames"));
-var import_flattenDeep = __toESM(require("lodash/flattenDeep"));
 var import_react = __toESM(require("react"));
 var import_scroll_into_view_if_needed = __toESM(require("scroll-into-view-if-needed"));
 var import_Checkbox = require("../Checkbox");
 var import_Icon = require("../Icon");
 var import_Scrollbar = require("../Scrollbar");
-var import_Util = require("../Util");
 var import_hooks = require("../hooks");
 var import_CascaderContext = require("./CascaderContext");
 var CascaderMenu = (0, import_react.memo)(
   (0, import_react.forwardRef)((props, ref) => {
     const { data = [], level, value } = props;
-    const { menuProps, treeMenuProps, onSelect, onCheckedChange, getDataType, loading, getExpandedKeys, searchText } = (0, import_react.useContext)(import_CascaderContext.CascaderContext);
-    const { valueKey = "value", labelKey = "label", disabledKey = "disabled", multiple } = menuProps;
-    const { valueKey: treeValueKey = "key", labelKey: treeLabelKey = "title", childrenKey: treeChildrenKey } = treeMenuProps;
+    const { props: menuProps, onSelect, onCheckedChange, loading } = (0, import_react.useContext)(import_CascaderContext.CascaderContext);
+    const { valueKey = "value", labelKey = "label", disabledKey = "disabled", multiple, expandTrigger } = menuProps;
     const { b, be, is } = (0, import_hooks.useClassNames)("cascader");
-    const treeRef = (0, import_react.useRef)();
-    const dataList = (0, import_react.useRef)([]);
     const ulRef = (0, import_react.useRef)(null);
-    const isTree = (0, import_react.useMemo)(() => {
-      return getDataType(level);
-    }, [getDataType, level]);
-    const fieldNames = (0, import_react.useMemo)(() => {
-      return { title: treeLabelKey, key: treeValueKey, children: treeChildrenKey };
-    }, [treeChildrenKey, treeLabelKey, treeValueKey]);
-    const loop = (0, import_react.useCallback)(
-      (_data, searchValue, parent) => _data.map((item) => {
-        var _a;
-        const index = item[fieldNames.title].indexOf(searchValue);
-        const beforeStr = item[fieldNames.title].substring(0, index);
-        const afterStr = item[fieldNames.title].slice(index + searchValue.length);
-        const title = index > -1 ? /* @__PURE__ */ import_react.default.createElement("span", null, beforeStr, /* @__PURE__ */ import_react.default.createElement("span", { className: b("tree-search-value", false) }, searchValue), afterStr) : /* @__PURE__ */ import_react.default.createElement("span", null, item[fieldNames.title]);
-        const newItem = { ...item, parentId: parent ? [parent.parentId, parent[fieldNames.key]].filter((item1) => !!item1).join(",") : "" };
-        dataList.current.push(newItem);
-        if (((_a = item == null ? void 0 : item[fieldNames.children]) == null ? void 0 : _a.length) > 0) {
-          return {
-            ...item,
-            [fieldNames.title]: title,
-            _title: item[fieldNames.title],
-            [fieldNames.key]: item[fieldNames.key],
-            [fieldNames.children]: loop(item.children, searchValue, newItem).filter((item1) => !!item1),
-            disabled: item.disabled
-          };
-        }
-        return index > -1 ? {
-          ...item,
-          [fieldNames.title]: title,
-          _title: item[fieldNames.title],
-          [fieldNames.key]: item[fieldNames.key],
-          disabled: item.disabled
-        } : null;
-      }),
-      [b, fieldNames.children, fieldNames.key, fieldNames.title]
-    );
-    const expandByKeys = (0, import_react.useCallback)((expandedKeys) => {
-      var _a, _b;
-      const flattenNodes = (_a = treeRef.current) == null ? void 0 : _a.flattenTreeData(expandedKeys);
-      (_b = treeRef.current) == null ? void 0 : _b.setState({
-        expandedKeys,
-        flattenNodes
-      });
-    }, []);
-    const getExpandKeys = (0, import_react.useCallback)(() => {
-      if (isTree) {
-        const _expandedKeys = (0, import_flattenDeep.default)(
-          dataList.current.map((item) => {
-            var _a;
-            if (item[fieldNames.title].indexOf(searchText) > -1) {
-              return ((_a = item.parentId) == null ? void 0 : _a.split(",")) ?? [];
-            }
-            return null;
-          })
-        ).filter((item, i, self) => item && self.indexOf(item) === i);
-        expandByKeys(_expandedKeys);
-      }
-    }, [expandByKeys, fieldNames.title, isTree, searchText]);
     const scrollToSelected = (0, import_react.useCallback)(() => {
       var _a, _b;
       if ((_b = (_a = ulRef.current) == null ? void 0 : _a.resizeRef) == null ? void 0 : _b.current) {
@@ -123,17 +61,6 @@ var CascaderMenu = (0, import_react.memo)(
         }
       }
     }, []);
-    (0, import_react.useEffect)(() => {
-      if (isTree && (0, import_Util.isNotEmpty)(searchText)) {
-        getExpandKeys();
-      }
-    }, [searchText]);
-    (0, import_react.useEffect)(() => {
-      if (isTree) {
-        const expandedKeys = getExpandedKeys(level);
-        expandByKeys(expandedKeys);
-      }
-    }, []);
     (0, import_react.useImperativeHandle)(ref, () => ({
       scrollToSelected: () => {
         scrollToSelected();
@@ -160,13 +87,13 @@ var CascaderMenu = (0, import_react.memo)(
             ),
             onClick: () => {
               if (!item[disabledKey]) {
-                if (menuProps.expandTrigger === "click" || item.__leaf) {
+                if (expandTrigger === "click" || item.__leaf) {
                   onSelect == null ? void 0 : onSelect(level, item);
                 }
               }
             },
             onMouseEnter: () => {
-              if (menuProps.expandTrigger === "hover" && !item[disabledKey] && !item.__leaf) {
+              if (expandTrigger === "hover" && !item[disabledKey] && !item.__leaf) {
                 onSelect == null ? void 0 : onSelect(level, item);
               }
             }

package/dist/Cascader/Utils.d.ts

@@ -1,3 +1 @@
-import { CascaderMenuProps, OptionNode, TreeMenuProps } from './typings';
 export declare const toArray: (val: string | string[] | string[][], separator?: string) => string[] | string[][];
-export declare const reOrgTree: (treeData: object[], level: number, { valueKey, labelKey, leafKey, childrenKey }: CascaderMenuProps, { valueKey: treeValueKey, labelKey: treeLabelKey, childrenKey: treeChildrenKey }: TreeMenuProps, plainData?: OptionNode[], parent?: any) => OptionNode[];

package/dist/Cascader/Utils.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,25 +14,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/Cascader/Utils.ts
 var Utils_exports = {};
 __export(Utils_exports, {
-  reOrgTree: () => reOrgTree,
   toArray: () => toArray
 });
 module.exports = __toCommonJS(Utils_exports);
-var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
-var import_omit = __toESM(require("lodash/omit"));
 var import_Util = require("../Util");
 var toArray = (val, separator = "/") => {
   if ((0, import_Util.isNotEmpty)(val)) {
@@ -46,38 +33,7 @@ var toArray = (val, separator = "/") => {
   }
   return [];
 };
-var reOrgTree = (treeData, level, { valueKey = "value", labelKey = "label", leafKey = "leaf", childrenKey = "children" }, { valueKey: treeValueKey = "key", labelKey: treeLabelKey = "title", childrenKey: treeChildrenKey = "children" }, plainData = [], parent = null) => {
-  return treeData.map((node) => {
-    if (node[childrenKey]) {
-      node[childrenKey] = reOrgTree(
-        node[childrenKey],
-        level,
-        { valueKey, labelKey, leafKey, childrenKey },
-        { valueKey: treeValueKey, labelKey: treeLabelKey, childrenKey: treeChildrenKey },
-        plainData,
-        (0, import_omit.default)((0, import_cloneDeep.default)(node), childrenKey)
-      );
-    }
-    const id = (0, import_Util.randomCode)(11);
-    plainData.push({
-      __id: id,
-      __level: level,
-      __pId: (parent == null ? void 0 : parent.__id) ?? "0",
-      [valueKey]: node[treeValueKey],
-      [labelKey]: node[treeLabelKey],
-      [leafKey]: false,
-      treeChildren: Object.prototype.hasOwnProperty.call(node, treeChildrenKey),
-      ...parent != null ? { parent } : {}
-    });
-    return {
-      ...node,
-      __id: id,
-      __pId: (parent == null ? void 0 : parent.__id) ?? "0"
-    };
-  });
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  reOrgTree,
   toArray
 });

package/dist/Cascader/index.d.ts

@@ -1,2 +1,2 @@
 export { default as Cascader } from './Cascader';
-export type { CascaderMenuProps, CascaderProps, TreeMenuProps } from './typings';
+export type { CascaderMenuProps, CascaderProps } from './typings';

package/dist/Cascader/typings.d.ts

@@ -1,10 +1,9 @@
 import React from 'react';
 import { InputRef } from '../Input';
 import { PopperOptions } from '../Popper';
-import { DataNode, DirectoryTreeProps, Key } from '../Tree';
 import { AnimationEventProps, BaseProps, FormControlBaseProps, NativeProps } from '../types/common';
 export type ValueType = string[] | string[][];
-export interface CascaderProps<V = ValueType, S = DataNode> extends Omit<FormControlBaseProps<V>, 'onChange' | 'value' | 'defaultValue'>, BaseProps, NativeProps, AnimationEventProps, PopperOptions, Omit<DirectoryTreeProps<S>, 'children' | 'style' | 'expandedKeys' | 'className' | 'readOnly' | 'disabled'> {
+export interface CascaderProps<V = ValueType, S = any> extends Omit<FormControlBaseProps<V>, 'onChange' | 'value' | 'defaultValue'>, BaseProps, NativeProps, AnimationEventProps, PopperOptions {
     /** 初始值 */
     defaultValue?: ValueType;
     /** 值（可控） */
@@ -13,8 +12,6 @@ export interface CascaderProps<V = ValueType, S = DataNode> extends Omit<FormCon
     options?: any[];
     /** 配置选项 */
     props?: CascaderMenuProps;
-    /** 树形租金配置选项 */
-    treeMenuProps?: TreeMenuProps;
     /** 是否禁用 */
     disabled?: boolean;
     /** 是否可以清空选项 */
@@ -61,7 +58,6 @@ export interface CascaderProps<V = ValueType, S = DataNode> extends Omit<FormCon
     prepend?: React.ReactElement<any> | string | number;
     /** 输入框后置内容，只对 type="text" 有效 */
     append?: React.ReactElement | string | number;
-    expandedKeys?: Key[][];
     lable?: string;
     /** 是否追加到body下 */
     appendToBody?: boolean;
@@ -83,19 +79,7 @@ export interface CascaderMenuProps {
     /** 是否动态加载子节点，需与 lazyLoad 方法结合使用 */
     lazy?: boolean;
     /** 加载动态数据的方法，仅在 lazy 为 true 时有效 */
-    lazyLoad?: (node: object, resolve?: (value: object[], isTree?: boolean) => void, reject?: () => void) => void;
-    /** 指定选项的值为选项对象的某个属性值 */
-    valueKey?: string;
-    /** 指定选项标签为选项对象的某个属性值 */
-    labelKey?: string;
-    /** 指定选项的子选项为选项对象的某个属性值 */
-    childrenKey?: string;
-    /** 指定选项的禁用为选项对象的某个属性值 */
-    disabledKey?: string;
-    /** 指定选项的叶子节点的标志位为选项对象的某个属性值 */
-    leafKey?: string;
-}
-export interface TreeMenuProps {
+    lazyLoad?: (node: object, resolve?: (value: object[]) => void, reject?: () => void) => void;
     /** 指定选项的值为选项对象的某个属性值 */
     valueKey?: string;
     /** 指定选项标签为选项对象的某个属性值 */

package/dist/Cascader/useCascader.d.ts

@@ -1,12 +1,5 @@
 import { Key } from '../Tree';
 import { CascaderProps, OptionNode } from './typings';
-/**
- * @author	Parker
- * @CreateTime	2022/4/17 16:02:49
- * @LastEditor	Parker
- * @ModifyTime	2022/11/20 13:05:51
- * @Description
- */
 export declare const useCascader: (initialData: object[], props: CascaderProps, value: string[] | string[][]) => {
     /** 最高层级 */
     allLevel: number;
@@ -17,8 +10,7 @@ export declare const useCascader: (initialData: object[], props: CascaderProps,
      * @param nodes
      * @param level 层级
      */
-    storeOptionData: (nodes: object[], level: number, parent: OptionNode, { isTree, isCover }: {
-        isTree?: boolean;
+    storeOptionData: (nodes: object[], level: number, parent: OptionNode, { isCover }: {
         isCover?: boolean;
     }) => OptionNode[];
     /**
@@ -78,12 +70,6 @@ export declare const useCascader: (initialData: object[], props: CascaderProps,
      * @returns
      */
     getDataType: (level: number) => any;
-    /**
-     * 获取树数据
-     * @param level 层级
-     * @returns
-     */
-    getTreeData: (level: number) => any[];
     /**
      * 获取扩展key
      * @param level 层级

package/dist/Cascader/useCascader.js

@@ -38,12 +38,10 @@ var import_isEqual = __toESM(require("lodash/isEqual"));
 var import_last = __toESM(require("lodash/last"));
 var import_react = require("react");
 var import_Util = require("../Util");
-var import_Utils = require("./Utils");
 var useCascader = (initialData, props, value) => {
-  const { props: menuProps, treeMenuProps, showAllLevels, separator, expandedKeys = [] } = props;
+  const { props: menuProps, showAllLevels, separator } = props;
   const { childrenKey = "children", valueKey = "value", labelKey = "label", leafKey = "leaf", lazy } = menuProps;
   const [allLevel, setAllLevel] = (0, import_react.useState)(0);
-  const [treeData, setTreeData] = (0, import_react.useState)({});
   const [dataTypes, setDataTypes] = (0, import_react.useState)([]);
   const _dataTypes = (0, import_react.useRef)([]);
   const [optionData, setOptionData] = (0, import_react.useState)({});
@@ -301,26 +299,18 @@ var useCascader = (initialData, props, value) => {
     }
   }, []);
   const storeOptionData = (0, import_react.useCallback)(
-    (nodes, level, parent, { isTree, isCover }) => {
+    (nodes, level, parent, { isCover }) => {
       let data = (0, import_cloneDeep.default)(_optionData.current);
       let newNodes = [];
-      if (isTree) {
-        const treeNodes = (0, import_Utils.reOrgTree)(nodes, level, menuProps, treeMenuProps, newNodes);
-        setTreeData({
-          ...treeData,
-          [`level${level}`]: treeNodes
-        });
-      } else {
-        newNodes = nodes.map((node) => ({
-          ...node,
-          __level: level,
-          __id: (0, import_Util.randomCode)(11),
-          __pId: (parent == null ? void 0 : parent.__id) ?? "0",
-          __leaf: node[leafKey] ?? false,
-          __checked: false,
-          __indeterminate: false
-        }));
-      }
+      newNodes = nodes.map((node) => ({
+        ...node,
+        __level: level,
+        __id: (0, import_Util.randomCode)(11),
+        __pId: (parent == null ? void 0 : parent.__id) ?? "0",
+        __leaf: node[leafKey] ?? false,
+        __checked: false,
+        __indeterminate: false
+      }));
       if ((0, import_Util.isEmpty)(data[`level${level}`])) {
         data = {
           ...data,
@@ -350,19 +340,19 @@ var useCascader = (initialData, props, value) => {
           selectedValue.current.push(null);
           selectedLabel.current.push(null);
           selectedNode.current.push(null);
-          setDataTypes(_dataTypes.current = [..._dataTypes.current, isTree ? true : false]);
+          setDataTypes(_dataTypes.current);
         }
       } else {
         selectedValue.current[level] = null;
         selectedLabel.current[level] = null;
         selectedNode.current[level] = null;
         const _types = (0, import_cloneDeep.default)(_dataTypes.current);
-        _types[level] = isTree ? true : false;
+        _types[level] = false;
         setDataTypes(_dataTypes.current = _types);
       }
       return data[`level${level}`];
     },
-    [allLevel, childrenKey, leafKey, menuProps, treeData, treeMenuProps]
+    [allLevel, childrenKey, leafKey]
   );
   const setNodeLeaf = (0, import_react.useCallback)(
     (node, isLeaf) => {
@@ -380,12 +370,6 @@ var useCascader = (initialData, props, value) => {
     },
     [dataTypes, lazy]
   );
-  const getTreeData = (0, import_react.useCallback)(
-    (level) => {
-      return lazy && treeData[`level${level}`];
-    },
-    [lazy, treeData]
-  );
   const getExpandedKeys = (0, import_react.useCallback)((level) => {
     return expandKeys.current[`level${level}`] ?? [];
   }, []);
@@ -511,11 +495,6 @@ var useCascader = (initialData, props, value) => {
       }
     }
   }, [value, allLevel, props.options]);
-  (0, import_react.useEffect)(() => {
-    expandedKeys.forEach((keys, level) => {
-      setExpandedKeys(level, keys);
-    });
-  }, [expandedKeys, setExpandedKeys]);
   return {
     // eslint-disable-next-line lines-around-comment
     /** 最高层级 */
@@ -585,12 +564,6 @@ var useCascader = (initialData, props, value) => {
      * @returns
      */
     getDataType,
-    /**
-     * 获取树数据
-     * @param level 层级
-     * @returns
-     */
-    getTreeData,
     /**
      * 获取扩展key
      * @param level 层级

package/dist/DatePicker/DatePicker.js

@@ -83,7 +83,7 @@ var DatePicker = (0, import_react.memo)(
       if ((0, import_Util.isNotEmpty)(props.format)) {
         return props.format;
       } else {
-        switch (props.type) {
+        switch (type) {
           case "year":
             return "YYYY";
           case "month":
@@ -94,12 +94,12 @@ var DatePicker = (0, import_react.memo)(
             return "YYYY-MM-DD";
         }
       }
-    }, [props.format, props.type]);
+    }, [props.format, type]);
     const placeholder = (0, import_react.useMemo)(() => {
       if ((0, import_Util.isNotEmpty)(props.placeholder)) {
         return props.placeholder;
       } else {
-        switch (props.type) {
+        switch (type) {
           case "year":
             return "请选择年份";
           case "month":
@@ -110,7 +110,7 @@ var DatePicker = (0, import_react.memo)(
             return "请选择日期";
         }
       }
-    }, [props.placeholder, props.type]);
+    }, [props.placeholder, type]);
     const dateProp = (0, import_react.useMemo)(() => {
       if (type === "week") {
         return currentDate.current || (currentDate.current = typeof value === "string" ? (0, import_Calendar.toDayjs)(value, props.valueFormat ?? format) : (0, import_Calendar.initDate)());
@@ -216,7 +216,7 @@ var DatePicker = (0, import_react.memo)(
           value: {
             value: dateProp,
             valueRange,
-            dateType: props.type,
+            dateType: type,
             isoWeek: props.isoWeek,
             showToday: props.showToday,
             popperInstRef,

package/dist/Empty/ImgEmpty.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_Util = require("../Util");
 var ImgEmpty = () => {
   const ids = (0, import_react.useMemo)(() => [`linearGradient-${(0, import_Util.randomCode)(5)}`, `linearGradient-${(0, import_Util.randomCode)(5)}`], []);
-  return /* @__PURE__ */ import_react.default.createElement("svg", { viewBox: "0 0 79 86", version: "1.1", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" }, /* @__PURE__ */ import_react.default.createElement("defs", null, /* @__PURE__ */ import_react.default.createElement("linearGradient", { id: ids[0], x1: "38.8503086%", y1: "0%", x2: "61.1496914%", y2: "100%" }, /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-1)", offset: "0%" }), /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-4)", offset: "100%" })), /* @__PURE__ */ import_react.default.createElement("linearGradient", { id: ids[1], x1: "0%", y1: "9.5%", x2: "100%", y2: "90.5%" }, /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-1)", offset: "0%" }), /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-6)", offset: "100%" })), /* @__PURE__ */ import_react.default.createElement("rect", { id: "path-3-1", x: "0", y: "0", width: "17", height: "36" })), /* @__PURE__ */ import_react.default.createElement("g", { id: "Illustrations", stroke: "none", "stroke-width": "1", fill: "none", "fill-rule": "evenodd" }, /* @__PURE__ */ import_react.default.createElement("g", { id: "B-type", transform: "translate(-1268.000000, -535.000000)" }, /* @__PURE__ */ import_react.default.createElement("g", { id: "Group-2", transform: "translate(1268.000000, 535.000000)" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("svg", { viewBox: "0 0 79 86", version: "1.1", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" }, /* @__PURE__ */ import_react.default.createElement("defs", null, /* @__PURE__ */ import_react.default.createElement("linearGradient", { id: ids[0], x1: "38.8503086%", y1: "0%", x2: "61.1496914%", y2: "100%" }, /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-1)", offset: "0%" }), /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-4)", offset: "100%" })), /* @__PURE__ */ import_react.default.createElement("linearGradient", { id: ids[1], x1: "0%", y1: "9.5%", x2: "100%", y2: "90.5%" }, /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-1)", offset: "0%" }), /* @__PURE__ */ import_react.default.createElement("stop", { "stop-color": "var(--el-empty-fill-color-6)", offset: "100%" })), /* @__PURE__ */ import_react.default.createElement("rect", { id: "path-3-1", x: "0", y: "0", width: "17", height: "36" })), /* @__PURE__ */ import_react.default.createElement("g", { id: "Illustrations", stroke: "none", "stroke-width": "1", fill: "none", fillRule: "evenodd" }, /* @__PURE__ */ import_react.default.createElement("g", { id: "B-type", transform: "translate(-1268.000000, -535.000000)" }, /* @__PURE__ */ import_react.default.createElement("g", { id: "Group-2", transform: "translate(1268.000000, 535.000000)" }, /* @__PURE__ */ import_react.default.createElement(
     "path",
     {
       id: "Oval-Copy-2",

package/dist/Loading/Loading.js

@@ -33,6 +33,7 @@ __export(Loading_exports, {
 });
 module.exports = __toCommonJS(Loading_exports);
 var import_classnames = __toESM(require("classnames"));
+var import_dom_lib = require("dom-lib");
 var import_react = __toESM(require("react"));
 var import_react_dom = require("react-dom");
 var import_client = require("react-dom/client");
@@ -42,17 +43,26 @@ var import_Util = require("../Util");
 var import_hooks = require("../hooks");
 var Main = (props) => {
   const { visible, text, fullscreen = true, spinner, background } = props;
-  const { b, is } = (0, import_hooks.useClassNames)("loading");
+  const { b, is, bm } = (0, import_hooks.useClassNames)("loading");
   const nodeRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    var _a;
+    if ((_a = nodeRef.current) == null ? void 0 : _a.parentNode) {
+      (0, import_dom_lib.addClass)(nodeRef.current.parentNode, bm("parent", "relative"));
+    }
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(import_Transition.Transition, { nodeRef, name: "loading-fade", visible }, /* @__PURE__ */ import_react.default.createElement("div", { ref: nodeRef, className: (0, import_classnames.default)(b`mask`, is({ fullscreen }), props.className), style: { ...props.style, background, zIndex: import_Util.PopupManager.nextZIndex() } }, /* @__PURE__ */ import_react.default.createElement("div", { className: b`spinner` }, spinner ? /* @__PURE__ */ import_react.default.createElement(import_Icon.Icon, { name: spinner, spin: true }) : /* @__PURE__ */ import_react.default.createElement("svg", { className: "circular", viewBox: "25 25 50 50" }, /* @__PURE__ */ import_react.default.createElement("circle", { className: "path", cx: "50", cy: "50", r: "20", fill: "none" })), text && /* @__PURE__ */ import_react.default.createElement("p", { className: b`text` }, text))));
 };
 var service = (props = {}) => {
   const { target = { current: document.body } } = props;
-  const root = (0, import_client.createRoot)(document.body);
+  const renderDom = document.createDocumentFragment();
+  const root = (0, import_client.createRoot)(renderDom);
   root.render((0, import_react_dom.createPortal)(/* @__PURE__ */ import_react.default.createElement(Main, { ...props, visible: true }), target.current));
   return {
     close: () => {
-      root.unmount();
+      setTimeout(() => {
+        root.unmount();
+      }, 200);
     }
   };
 };
@@ -64,5 +74,5 @@ var Loading = (props) => {
   return /* @__PURE__ */ import_react.default.createElement(Main, { ...props, visible });
 };
 Loading.service = service;
-Loading.displayName = "Loading";
+Loading.displayName = "ElLoading";
 var Loading_default = Loading;

package/dist/Tree/DirectoryTree.d.ts

@@ -1,22 +1,15 @@
-import React, { Ref } from 'react';
+import * as React from 'react';
 import RcTree from './RCTree';
-import { Key } from './typings';
 import { TreeProps } from './Tree';
+import { BasicDataNode, DataNode, Key } from './typings';
 export type ExpandAction = false | 'click' | 'doubleClick';
-export interface DirectoryTreeProps<T> extends TreeProps<T> {
+export interface DirectoryTreeProps<T extends BasicDataNode = DataNode> extends TreeProps<T> {
     expandAction?: ExpandAction;
 }
+type DirectoryTreeCompoundedComponent = (<T extends BasicDataNode | DataNode = DataNode>(props: React.PropsWithChildren<DirectoryTreeProps<T>> & React.RefAttributes<RcTree>) => React.ReactElement) & Pick<React.FC, 'displayName'>;
 export interface DirectoryTreeState {
     expandedKeys?: Key[];
     selectedKeys?: Key[];
 }
-declare const ForwardDirectoryTree: <RecordType extends object = any>(props: DirectoryTreeProps<RecordType> & {
-    ref?: Ref<RcTree>;
-}) => React.ReactElement;
-type InternalDirectoryTreeType = typeof ForwardDirectoryTree;
-interface DirectoryTreeInterface extends InternalDirectoryTreeType {
-    displayName?: string;
-    defaultProps?: Partial<DirectoryTreeProps<any>>;
-}
-declare const DirectoryTree: DirectoryTreeInterface;
-export default DirectoryTree;
+declare const ForwardDirectoryTree: DirectoryTreeCompoundedComponent;
+export default ForwardDirectoryTree;