@unicom-cloud/ui 0.8.99 → 0.8.101

package/suspense-fallback-test/index.js

@@ -1,13 +1,4 @@
-import "./style/index.less.js";
-import e, { useImperativeHandle as t, useEffect as o } from "react";
-function a(n, r) {
-  return t(r, () => ({})), o(() => () => {
-  }, []), e.createElement(
-    e.lazy(() => new Promise((s, m) => {
-    }))
-  );
-}
-const l = e.memo(e.forwardRef(a));
+import a from "../components/common/suspense-fallback-test/index.js";
 export {
-  l as default
+  a as default
 };

package/suspense-fallback-test/interface.js

@@ -0,0 +1 @@
+

package/table/Table.js

@@ -49,7 +49,7 @@ function ko(ce, st) {
     renderEmpty: at,
     componentConfig: ae,
     rtl: F
-  } = fo(Lo), b = Ze(
+  } = fo(Lo), m = Ze(
     ce,
     Ho,
     ae?.Table
@@ -61,10 +61,10 @@ function ko(ce, st) {
     style: ft,
     className: dt,
     component: ut,
-    border: h,
+    border: b,
     borderCell: fe,
     columns: ve = Ro,
-    data: m = zo,
+    data: g = zo,
     scroll: i,
     noDataElement: pt,
     showHeader: mt,
@@ -84,10 +84,10 @@ function ko(ce, st) {
     renderPagination: Le,
     summary: de,
     rowKey: Y
-  } = b, ze = ne(
-    () => vo(m, H),
-    [m, H]
-  ), n = it?.("table"), ue = b.size || (["default", "middle", "small"].indexOf(Ne) > -1 ? Ne : "default"), D = w(null), u = w(null), pe = w(null), g = w(null), E = w(null), me = w(null), K = w(null), j = w(0), ge = w(!1), [Re, f] = bo(b), { currentFilters: Ct, defaultSorters: xt } = zt(), [O, ye] = V(1), [St, wt] = V(
+  } = m, ze = ne(
+    () => vo(g, H),
+    [g, H]
+  ), n = it?.("table"), ue = m.size || (["default", "middle", "small", "mini"].indexOf(Ne) > -1 ? Ne : "default"), D = w(null), u = w(null), pe = w(null), y = w(null), E = w(null), me = w(null), K = w(null), j = w(0), ge = w(!1), [Re, f] = bo(m), { currentFilters: Ct, defaultSorters: xt } = zt(), [O, ye] = V(1), [St, wt] = V(
     N.pageSize || N.defaultPageSize || 10
   ), [He, ke] = V(Ct), [Pt, Tt] = V(0), [$t, Ft] = V([]), he = To(f), [Nt, Ee] = Po(
     Re,
@@ -112,8 +112,8 @@ function ko(ce, st) {
           priority: s
         };
         c ? Je(s) ? t.every(
-          (y) => Je(y.priority) || !y.direction
-        ) && t.push(l) : t.every((y) => !y.direction) ? t.push(l) : t = [l] : t.push(l);
+          (h) => Je(h.priority) || !h.direction
+        ) && t.push(l) : t.every((h) => !h.direction) ? t.push(l) : t = [l] : t.push(l);
       }
     }), { currentFilters: e, defaultSorters: t };
   }
@@ -151,16 +151,16 @@ function ko(ce, st) {
   function Ht(e) {
     const t = function(r, s) {
       return (c, l) => {
-        const y = r(c, l);
-        return s === "descend" ? -y : y;
+        const h = r(c, l);
+        return s === "descend" ? -h : h;
       };
     }, o = [...e];
     return o.sort((r, s) => s.priority - r.priority), (r, s) => {
       for (let c = 0, l = o.length; c < l; c++) {
-        const { sorterFn: y, direction: $e } = o[c];
-        if (typeof y != "function")
+        const { sorterFn: h, direction: $e } = o[c];
+        if (typeof h != "function")
           continue;
-        const re = t(y, $e)(r, s);
+        const re = t(h, $e)(r, s);
         if (re !== 0)
           return re;
       }
@@ -221,8 +221,8 @@ function ko(ce, st) {
     Object.keys(o).forEach((c) => {
       if (o[c] && o[c].length) {
         const l = Ve(c);
-        l && typeof l.onFilter == "function" && (r = r.filter((y) => o[c].reduce(
-          ($e, re) => $e || l.onFilter(re, y),
+        l && typeof l.onFilter == "function" && (r = r.filter((h) => o[c].reduce(
+          ($e, re) => $e || l.onFilter(re, h),
           !1
         )));
       }
@@ -269,12 +269,12 @@ function ko(ce, st) {
   const Z = L(), z = I();
   function I(e = B, t = Z) {
     const { current: o = 0, pageSize: r = 10 } = t;
-    return P === !1 || p(P) && m.length <= r ? e : e.slice((o - 1) * r, o * r);
+    return P === !1 || p(P) && g.length <= r ? e : e.slice((o - 1) * r, o * r);
   }
   const We = io(Ie, 100), S = !!(i && i.y), _ = de?.(C(B)), Ce = de && co.isValidElement(_) && _.props.fixed, Et = S && Ce;
   mo(() => {
     Ie(), se(window, "resize", We);
-    const e = D.current, t = u.current, o = g.current;
+    const e = D.current, t = u.current, o = y.current;
     t && se(t, "scroll", R);
     const r = e && e.parentNode;
     return e && r && se(r, "scroll", R), o && se(o, "scroll", R), () => {
@@ -286,13 +286,13 @@ function ko(ce, st) {
     i?.x,
     i?.y,
     f.length,
-    m
+    g
   ]), et(() => {
-    const { total: e, pageSize: t } = L(m);
+    const { total: e, pageSize: t } = L(g);
     Math.ceil(e / t) < O && ye(1);
-  }, [m?.length]), et(() => {
+  }, [g?.length]), et(() => {
     ee();
-  }, [m, G, X, F]), uo(st, () => ({
+  }, [g, G, X, F]), uo(st, () => ({
     getRootDomElement: xe,
     scrollIntoView: (e) => {
       me.current && me.current.scrollTo({ key: e });
@@ -363,7 +363,7 @@ function ko(ce, st) {
     setSelectedRowKeys: Vt,
     allSelectedRowKeys: Mt,
     flattenData: Yt
-  } = So(b, z, ze, be);
+  } = So(m, z, ze, be);
   function Ve(e) {
     return f.find((t, o) => typeof t.key < "u" ? typeof t.key == "number" && typeof e == "string" ? t.key.toString() === e : t.key === e : typeof t.dataIndex < "u" ? t.dataIndex === e : typeof e == "number" ? o === e : !1);
   }
@@ -398,7 +398,7 @@ function ko(ce, st) {
     }).start();
   }
   function R(e) {
-    const { target: t } = e, o = u.current, r = D.current && D.current.parentNode, s = g.current;
+    const { target: t } = e, o = u.current, r = D.current && D.current.parentNode, s = y.current;
     t.scrollLeft !== j.current && (r && (r.scrollLeft = t.scrollLeft), o && (o.scrollLeft = t.scrollLeft), s && (s.scrollLeft = t.scrollLeft), ee()), j.current = e.target.scrollLeft;
   }
   function qt(e) {
@@ -406,7 +406,7 @@ function ko(ce, st) {
     t.scrollLeft !== j.current && (o.scrollLeft = t.scrollLeft, ee()), j.current = e.target.scrollLeft;
   }
   const [Me, Ut] = xo(
-    b,
+    m,
     Yt,
     be
   );
@@ -419,16 +419,16 @@ function ko(ce, st) {
   function Gt() {
     requestAnimationFrame((e) => {
       const t = D.current && D.current.parentNode, o = Do(t);
-      o && o > 0 && (t.style.marginBottom = `-${o}px`, t.style.paddingBottom = "0px", g.current && (g.current.style.marginBottom = `-${o}px`, g.current.style.paddingBottom = "0px")), setTimeout(() => {
+      o && o > 0 && (t.style.marginBottom = `-${o}px`, t.style.paddingBottom = "0px", y.current && (y.current.style.marginBottom = `-${o}px`, y.current.style.paddingBottom = "0px")), setTimeout(() => {
         const r = u.current;
-        Bo(r) ? (ge.current = !0, t && (t.style.overflowY = "scroll", t.style.scrollSnapType = "y mandatory"), g.current && (g.current.style.overflowY = "scroll", g.current.style.overflowY = "y mandatory")) : t && ge.current && (ge.current = !1, t.style.overflowY = "auto", t.style.overflowY = "y mandatory", g.current && (g.current.style.overflowY = "auto", g.current.style.overflowY = "y mandatory"));
+        Bo(r) ? (ge.current = !0, t && (t.style.overflowY = "scroll", t.style.scrollSnapType = "y mandatory"), y.current && (y.current.style.overflowY = "scroll", y.current.style.overflowY = "y mandatory")) : t && ge.current && (ge.current = !1, t.style.overflowY = "auto", t.style.overflowY = "y mandatory", y.current && (y.current.style.overflowY = "auto", y.current.style.overflowY = "y mandatory"));
       }, 0);
     });
   }
   const Ke = /* @__PURE__ */ a(
     No,
     {
-      ...b,
+      ...m,
       activeSorters: d,
       currentSorter: W,
       selectedRowKeys: Se,
@@ -480,7 +480,7 @@ function ko(ce, st) {
   ), qe = /* @__PURE__ */ a(
     $o,
     {
-      ...b,
+      ...m,
       saveRef: (e) => pe.current = e,
       selectedRowKeys: Se,
       indeterminateKeys: Wt,
@@ -503,7 +503,7 @@ function ko(ce, st) {
       saveVirtualListRef: (e) => {
         v && (me.current = e, u.current = e?.dom);
       },
-      ___dangerouslySetInnerHTML___: b.___dangerouslySetInnerHTML___
+      ___dangerouslySetInnerHTML___: m.___dangerouslySetInnerHTML___
     }
   ), Ue = !v && !Et ? /* @__PURE__ */ T(Fe, { children: [
     qe,
@@ -514,10 +514,10 @@ function ko(ce, st) {
     return () => {
       t();
     };
-  }, [u.current, pe.current]), Qe(() => (console.table(m), () => {
-  }), [m]), !ve.length) return null;
+  }, [u.current, pe.current]), Qe(() => (m.consoleTable && console.table(g), () => {
+  }), [g, m.consoleTable]), !ve.length) return null;
   function Jt() {
-    const e = p(i) && i.x === "max-content" && !!i.y && A(m) && m.length > 0;
+    const e = p(i) && i.x === "max-content" && !!i.y && A(g) && g.length > 0;
     return S && !v ? /* @__PURE__ */ a(
       Bt,
       {
@@ -533,7 +533,7 @@ function ko(ce, st) {
               producer: e,
               onSetColumnWidths: Ft,
               expandedRowKeys: Me,
-              data: m
+              data: g
             }
           ),
           Ue
@@ -546,7 +546,7 @@ function ko(ce, st) {
     i && p(i) && i.x && (e = {
       width: i.x
     });
-    const t = /* @__PURE__ */ a("div", { className: `${n}-tfoot`, ref: g, children: /* @__PURE__ */ T(q, { style: e, children: [
+    const t = /* @__PURE__ */ a("div", { className: `${n}-tfoot`, ref: y, children: /* @__PURE__ */ T(q, { style: e, children: [
       /* @__PURE__ */ a(le, { columns: f, prefixCls: n }),
       je
     ] }) }), o = _ && S && Ce === "top", r = _ && S && Ce === "bottom", s = /* @__PURE__ */ T(Fe, { children: [
@@ -571,7 +571,7 @@ function ko(ce, st) {
       typeof Be == "function" && /* @__PURE__ */ a("div", { className: `${n}-footer`, children: Be(z) })
     ] });
   }
-  const Zt = p(h) ? h.wrapper : h, Pe = p(h) ? h.cell : fe, eo = p(h) ? h.cell || h.headerCell : fe, to = p(h) ? h.cell || h.bodyCell : fe, oo = ot(
+  const Zt = p(b) ? b.wrapper : b, Pe = p(b) ? b.cell : fe, eo = p(b) ? b.cell || b.headerCell : fe, to = p(b) ? b.cell || b.bodyCell : fe, oo = ot(
     n,
     `${n}-size-${ue}`,
     {
@@ -593,7 +593,7 @@ function ko(ce, st) {
     [`${n}-pagination-center`]: x === "topCenter" || x === "bottomCenter",
     [`${n}-pagination-top`]: Te
   });
-  let oe = b.loading;
+  let oe = m.loading;
   typeof oe == "boolean" && (oe = { loading: oe });
   const Ge = typeof Le == "function" ? Le(/* @__PURE__ */ a(tt, { ...Z })) : /* @__PURE__ */ a("div", { className: ro, children: /* @__PURE__ */ a(tt, { ...Z }) }), Xe = P !== !1 && (B.length !== 0 || Z.total > 0);
   return /* @__PURE__ */ a(
@@ -602,7 +602,7 @@ function ko(ce, st) {
       ref: E,
       style: ft,
       className: oo,
-      ...yo(b),
+      ...yo(m),
       children: /* @__PURE__ */ T(
         go,
         {

package/table/hook/useThResizable.js

@@ -1,39 +1,85 @@
-import { useState as h, useEffect as p } from "react";
+import { useState as b, useEffect as a } from "react";
+import "@unicom-cloud/utils/case-name";
+import "@unicom-cloud/utils/class-name";
+import "../../dist/tinycolor/chunk/BOzCVdr0.js";
+import "@unicom-cloud/utils/constant/ui";
+import "../../utils/contextHolder.js";
+import "@unicom-cloud/utils/dayjs";
+import "@unicom-cloud/utils/clipboard-copy";
+import "../../components/common/utils/dayjs.js";
+import "../../components/common/utils/dom.js";
+import "@unicom-cloud/utils/file/fileToURL";
+import "react/jsx-runtime";
+import "lodash/escapeRegExp";
+import "lodash/isArray";
+import "lodash/isNumber";
+import "lodash/isString";
+import "lodash/isFunction";
+import "lodash/throttle";
 import "../../components/common/utils/is.js";
-import x from "../th-resizable/index.js";
-import { isArray as b } from "@unicom-cloud/utils/is";
-function g(a = {}) {
-  function c(e, n) {
+import "lodash/camelCase";
+import "lodash/capitalize";
+import "lodash/cloneDeep";
+import "lodash/debounce";
+import "lodash/get";
+import "lodash/has";
+import "lodash/kebabCase";
+import "lodash/merge";
+import "lodash/mergeWith";
+import "lodash/set";
+import "lodash/setWith";
+import "lodash/snakeCase";
+import "lodash/startCase";
+import "lodash/uniq";
+import "lodash/upperFirst";
+import "@unicom-cloud/utils/math";
+import "lodash/isPlainObject";
+import "../../dist/react-transition-group/src/CSSTransition.js";
+import "../../dist/react-transition-group/src/ReplaceTransition.js";
+import "../../dist/react-transition-group/src/SwitchTransition.js";
+import "../../dist/react-transition-group/chunk/CPfP7aNL.js";
+import "../../dist/react-transition-group/src/TransitionGroup.js";
+import "../../components/common/utils/reactDOM.js";
+import "@unicom-cloud/utils/file/saveAs";
+import "@unicom-cloud/utils/screenfull";
+import "@unicom-cloud/utils/constant/ui.js";
+import "react-is";
+import "@unicom-cloud/utils/tree";
+import { isArray as C } from "@unicom-cloud/utils/is";
+import "uuid";
+import "../../dist/validate/src/index.js";
+import "@unicom-cloud/utils/constant/keyboardCode";
+import z from "../th-resizable/index.js";
+function Rt(f = {}, c = []) {
+  const { columns: u } = f ?? {}, [d, m] = b(o(u));
+  function h(t, i) {
     return {
-      column: e,
-      onResize(o) {
-        const { column: t = {}, width: d } = o ?? {};
-        s((i) => {
-          const f = i.find((u, C, z) => u === t || u.dataIndex === t.dataIndex && u.title == t.title);
-          return f ? (f.width = d ?? t.width, r(i)) : i;
+      column: t,
+      onResize(p) {
+        const { column: r = {}, width: x } = p ?? {};
+        m((e) => {
+          const l = e.find((n, w, R) => n === r || n.dataIndex === r.dataIndex && n.title == r.title);
+          return l ? (l.width = x ?? r.width, o(e)) : e;
         });
       }
     };
   }
-  function r(e) {
-    return b(e) ? e.map((n, l, o) => {
-      const t = n;
-      return l < o.length - 1 && n.resizable !== !1 && !n.fixed && (t.onHeaderCell = c), t;
-    }) : e;
+  function o(t) {
+    return C(t) ? t.map((i, s, p) => {
+      const r = i;
+      return s < p.length - 1 && i.resizable !== !1 && !i.fixed && (r.onHeaderCell = h), r;
+    }) : t;
   }
-  const [m, s] = h(() => {
-    const e = a.columns;
-    return e ? r(e) : [];
-  });
-  return p(() => () => {
+  return a(() => (m(o(u)), () => {
+  }), [...c]), a(() => () => {
   }, []), {
-    columns: m,
-    setColumns(e) {
-      return s(r(e));
+    columns: d,
+    setColumns(t) {
+      return m(o(t));
     },
-    ThResizable: x
+    ThResizable: z
   };
 }
 export {
-  g as default
+  Rt as default
 };

package/table/tbody/Td.js

@@ -1,62 +1,62 @@
-import { jsx as s, jsxs as le } from "react/jsx-runtime";
-import U from "lodash/get";
+import { jsx as s, jsxs as re } from "react/jsx-runtime";
+import W from "lodash/get";
 import u from "lodash/isFunction";
-import $ from "lodash/isPlainObject";
-import S from "lodash/isString";
-import z, { useContext as re, useRef as C, useMemo as ie, useEffect as se } from "react";
+import E from "lodash/isPlainObject";
+import C from "lodash/isString";
+import V, { useContext as ie, useRef as h, useMemo as se, useEffect as ce } from "react";
 import "../../config-provider/ConfigProvider.js";
-import ce from "../../components/common/hooks/useForceUpdate.js";
-import de from "../hook/useComponent.js";
-import { getOriginData as W } from "../util.js";
-import ae from "../../tooltip/index.js";
-import I from "@unicom-cloud/utils/class-name";
-import { mergedToString as fe } from "../../components/common/utils/mergedToString.js";
-import { pick as me } from "../../components/common/utils/pick.js";
-import pe from "../../config-provider/context.js";
-function ue(i) {
-  return i && !z.isValidElement(i) && $(i);
-}
+import de from "../../components/common/hooks/useForceUpdate.js";
+import ae from "../hook/useComponent.js";
+import { getOriginData as z } from "../util.js";
+import fe from "../../tooltip/index.js";
+import $ from "@unicom-cloud/utils/class-name";
+import { mergedToString as me } from "../../components/common/utils/mergedToString.js";
+import { pick as pe } from "../../components/common/utils/pick.js";
+import ue from "../../config-provider/context.js";
 function Ce(i) {
-  const E = ce(), {
-    component: V,
-    InnerComponentTd: A,
+  return i && !V.isValidElement(i) && E(i);
+}
+function he(i) {
+  const N = de(), {
+    component: A,
+    InnerComponentTd: K,
     column: e,
-    columnIndex: N,
+    columnIndex: v,
     prefixCls: l,
-    stickyClassName: K,
-    stickyOffset: v,
-    currentSorter: h,
-    virtualized: q,
+    stickyClassName: q,
+    stickyOffset: M,
+    currentSorter: g,
+    virtualized: G,
     record: o,
     trIndex: r,
-    level: M,
-    placeholder: G = "-",
-    indentSize: J,
-    renderExpandIcon: Q,
+    level: T,
+    placeholder: J = "-",
+    indentSize: Q,
+    renderExpandIcon: X,
     rowKey: y,
-    recordHaveChildren: T,
-    haveTreeData: X
-  } = i, { rtl: R } = re(pe), { ComponentBodyCell: b } = de(V), c = C(null), d = C(null), g = C(null), x = C(null), _ = e?.showTooltip !== !1 && e?.ellipsis, Y = I(
+    recordHaveChildren: b,
+    haveTreeData: Y
+  } = i, { rtl: R } = ie(ue), { ComponentBodyCell: _ } = ae(A), c = h(null), d = h(null), x = h(null), w = h(null), S = e?.tooltip?.show !== !1 && e?.ellipsis, Z = $(
     `${l}-td`,
-    K,
+    q,
     {
-      [`${l}-col-sorted`]: h && h.direction && h.field === e?.dataIndex
+      [`${l}-col-sorted`]: g && g.direction && g.field === e?.dataIndex
     },
     e?.className,
     u(e?.bodyClassName) ? e.bodyClassName(o, r) : e?.bodyClassName
   );
   let a = {}, k, B, n = {};
-  e?.fixed === "left" && (n[R ? "right" : "left"] = v), e?.fixed === "right" && (n[R ? "left" : "right"] = v), $(e?.cellStyle) && (n = {
+  e?.fixed === "left" && (n[R ? "right" : "left"] = M), e?.fixed === "right" && (n[R ? "left" : "right"] = M), E(e?.cellStyle) && (n = {
     ...n,
     ...e?.cellStyle
-  }), $(e?.bodyCellStyle) && (n = {
+  }), E(e?.bodyCellStyle) && (n = {
     ...n,
     ...e?.bodyCellStyle
   }), u(e?.bodyCellStyle) && (n = {
     ...n,
     ...e?.bodyCellStyle?.(o, r) ?? {}
-  }), e?.align && (n.textAlign = e?.align), q && e.width && (n.width = e.width, n.minWidth = e.width, n.maxWidth = e.width);
-  const { onHandleSave: Z, ...D } = e?.onCell ? e?.onCell(
+  }), e?.align && (n.textAlign = e?.align), G && e.width && (n.width = e.width, n.minWidth = e.width, n.maxWidth = e.width);
+  const { onHandleSave: ee, ...D } = e?.onCell ? e?.onCell(
     o,
     r,
     e,
@@ -64,51 +64,51 @@ function Ce(i) {
     // 潘启宝添加
   ) ?? {} : { onHandleSave: () => {
   } }, H = e?.render;
-  let t = ie(() => H?.(
-    U(o, e?.dataIndex ?? ""),
-    W(o),
+  let t = se(() => H?.(
+    W(o, e?.dataIndex ?? ""),
+    z(o),
     r,
     e,
     // 潘启宝添加
     { rowKey: y }
     // 潘启宝添加
   ), [o, e, r]);
-  if (u(H) || (t = U(o, e?.dataIndex ?? "")), ue(t) && (a = t?.props, k = a?.rowSpan, B = a?.colSpan, t = t?.children), k === 0 || B === 0)
+  if (u(H) || (t = W(o, e?.dataIndex ?? "")), Ce(t) && (a = t?.props, k = a?.rowSpan, B = a?.colSpan, t = t?.children), k === 0 || B === 0)
     return null;
-  S(t) && (t = t.trim()), !t && t !== 0 && (t = e?.placeholder ?? G ?? "-");
-  const ee = e?.ellipsis && S(t) ? {
-    //  title: cellChildren // 暂时不需要title属性了，因为单独加了tooltip组件，潘启宝2023年4月1日于广东省惠州市
-  } : {}, w = X && e?.$$isFirstColumn, L = w && T;
-  let f = w && M > 0 ? J * M : 0;
-  w && !T && (f += 20);
-  function te(p) {
-    E();
+  C(t) && (t = t.trim()), !t && t !== 0 && (t = e?.placeholder ?? J ?? "-");
+  const te = e?.ellipsis && C(t) && !S ? {
+    title: t
+  } : {}, I = Y && e?.$$isFirstColumn, L = I && b;
+  let f = I && T > 0 ? Q * T : 0;
+  I && !b && (f += 20);
+  function ne(p) {
+    N();
   }
-  const O = `${N}-${r}-${f}-${L}`, ne = /* @__PURE__ */ s(
+  const O = `${v}-${r}-${f}-${L}`, oe = /* @__PURE__ */ s(
     "div",
     {
       ref: c,
-      className: I(`${l}-cell`, {
+      className: $(`${l}-cell`, {
         [`${l}-cell-text-ellipsis`]: e?.ellipsis
       }),
-      ...ee,
-      onMouseEnter: _ ? te : void 0,
-      children: /* @__PURE__ */ le(
-        b,
+      ...te,
+      onMouseEnter: S ? ne : void 0,
+      children: /* @__PURE__ */ re(
+        _,
         {
           ref: d,
           className: `${l}-cell-wrap-value`,
-          ...S(b) ? {} : {
-            rowData: W(o),
+          ...C(_) ? {} : {
+            rowData: z(o),
             column: e,
-            onHandleSave: Z,
+            onHandleSave: ee,
             ...D
           },
           children: [
             !!f && /* @__PURE__ */ s(
               "span",
               {
-                ref: g,
+                ref: x,
                 className: `${l}-cell-indent`,
                 style: { paddingLeft: f }
               }
@@ -116,12 +116,12 @@ function Ce(i) {
             !!L && /* @__PURE__ */ s(
               "span",
               {
-                ref: x,
+                ref: w,
                 className: `${l}-cell-expand-icon`,
-                children: Q(o, y)
+                children: X(o, y)
               }
             ),
-            i.___dangerouslySetInnerHTML___ ? /* @__PURE__ */ s(
+            i.___dangerouslySetInnerHTML___ && C(t) ? /* @__PURE__ */ s(
               "span",
               {
                 dangerouslySetInnerHTML: {
@@ -137,11 +137,11 @@ function Ce(i) {
     O
   );
   let m = /* @__PURE__ */ s(
-    A,
+    K,
     {
-      className: Y,
+      className: Z,
       style: n,
-      ...me(D, [
+      ...pe(D, [
         "onClick",
         "onDoubleClick",
         "onContextMenu",
@@ -153,29 +153,32 @@ function Ce(i) {
         "onMouseUp"
       ]),
       ...a,
-      children: ne
+      children: oe
     },
-    e?.key || e?.dataIndex || N
+    e?.key || e?.dataIndex || v
   );
-  if (_) {
+  if (S) {
     let p = 0, P = 0, j = 0, F = 0;
-    if (c.current instanceof Element && (p = c.current.getBoundingClientRect().width), d.current instanceof Element && (P = d.current.getBoundingClientRect().width), g.current instanceof Element && (j = g.current.getBoundingClientRect().width), x.current instanceof Element && (F = x.current.getBoundingClientRect().width), p < P + j + F) {
-      const oe = u(e?.tooltipContentRender) ? e.tooltipContentRender(o, r, e) : fe(m);
+    if (c.current instanceof Element && (p = c.current.getBoundingClientRect().width), d.current instanceof Element && (P = d.current.getBoundingClientRect().width), x.current instanceof Element && (j = x.current.getBoundingClientRect().width), w.current instanceof Element && (F = w.current.getBoundingClientRect().width), p < P + j + F) {
+      const U = e?.tooltip?.render, le = u(U) ? U(o, r, e) : e?.tooltip?.content ?? me(m);
       m = /* @__PURE__ */ s(
-        ae,
+        fe,
         {
-          className: I(`${l}-cell-tooltip`, e.tooltipClassName),
-          style: e.tooltipStyle,
-          content: oe,
+          ...e?.tooltip,
+          className: $(
+            `${l}-cell-tooltip`,
+            e?.tooltip?.className
+          ),
+          content: le,
           children: m
         }
       );
     }
   }
-  return se(() => (E(), () => {
+  return ce(() => (N(), () => {
   }), [c.current, d.current]), m;
 }
-const _e = z.memo(Ce);
+const ke = V.memo(he);
 export {
-  _e as default
+  ke as default
 };