@dazhicheng/ui 1.5.203 → 1.5.205

package/dist/components/tt-table/src/components/TableButtons.js

@@ -1,19 +1,32 @@
-import { defineComponent as I, inject as S, computed as d, toRaw as k, createVNode as n, resolveComponent as P, unref as f, isVNode as j, mergeProps as c, withDirectives as F, resolveDirective as $ } from "vue";
-import { propTypes as a, useDesign as x } from "@dazhicheng/hooks";
-import { isBoolean as z, isFunction as b, generateTestId as D, toKebabCase as N, isArray as O, isObject as A } from "@dazhicheng/utils";
-import { TtButton as R } from "../../../tt-button/index.js";
-import { TtIcon as m } from "../../../tt-icon/index.js";
-import U from "../../../../directives/disabled-tip/index.js";
-import { ElPopover as V } from "element-plus";
+import { defineComponent as I, inject as S, computed as f, toRaw as k, createVNode as n, resolveComponent as P, unref as d, isVNode as j, mergeProps as c, withDirectives as F, resolveDirective as $ } from "vue";
+import { propTypes as a } from "../../../../packages/hooks/src/propTypes.js";
+import { useDesign as x } from "../../../../packages/hooks/src/useDesign.js";
+import "axios";
+import { ElPopover as z } from "element-plus";
+import { isBoolean as D, isFunction as m, isArray as N, isObject as O } from "../../../../packages/utils/src/is.js";
+import { generateTestId as A, toKebabCase as R } from "../../../../packages/utils/src/testid-helper.js";
+import "xe-utils";
+import "dayjs";
+import "dayjs/plugin/utc";
+import "dayjs/plugin/timezone";
+import "../../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
+import "lodash-es";
+import { TtButton as U } from "../../../tt-button/index.js";
+import { TtIcon as b } from "../../../tt-icon/index.js";
+import V from "../../../../directives/disabled-tip/index.js";
 import { componentMap as _ } from "../componentMap.js";
 /* empty css                         */
-function E(l) {
-  return typeof l == "function" || Object.prototype.toString.call(l) === "[object Object]" && !j(l);
+function E(i) {
+  return typeof i == "function" || Object.prototype.toString.call(i) === "[object Object]" && !j(i);
 }
-const X = /* @__PURE__ */ I({
+const ft = /* @__PURE__ */ I({
   name: "TtTableButton",
   directives: {
-    disabledTip: U
+    disabledTip: V
   },
   props: {
     /** 按钮acitons */
@@ -26,92 +39,92 @@ const X = /* @__PURE__ */ I({
     /** 是否阻止默认行为 */
     stopButtonPropagation: a.bool.def(!0)
   },
-  setup(l, {
+  setup(i, {
     slots: g
   }) {
     const {
-      prefixCls: s
-    } = x("table-buttons"), h = S("tableIdContext", d(() => "")), T = (e) => D(f(h), "toolbar-btn", N(e)), C = (e) => {
-      const t = e.ifShow;
+      prefixCls: l
+    } = x("table-buttons"), h = S("tableIdContext", f(() => "")), T = (t) => A(d(h), "toolbar-btn", R(t)), C = (t) => {
+      const e = t.ifShow;
       let o = !0;
-      return z(t) && (o = t), b(t) && (o = t(e)), o;
-    }, v = d(() => (k(l.actions) || []).filter((e) => C(e))), y = (e) => {
-      if (!l.stopButtonPropagation) return;
-      e.composedPath().find((r) => {
-        var i;
-        return ((i = r.tagName) == null ? void 0 : i.toUpperCase()) === "BUTTON";
-      }) && e.stopPropagation();
+      return D(e) && (o = e), m(e) && (o = e(t)), o;
+    }, v = f(() => (k(i.actions) || []).filter((t) => C(t))), y = (t) => {
+      if (!i.stopButtonPropagation) return;
+      t.composedPath().find((r) => {
+        var s;
+        return ((s = r.tagName) == null ? void 0 : s.toUpperCase()) === "BUTTON";
+      }) && t.stopPropagation();
     };
-    function B(e, t) {
-      const o = e;
-      return O(o) && o.length > 0 ? o.some((r) => !!(r != null && r.condition)) : A(o) ? !!o.condition : !!t;
+    function B(t, e) {
+      const o = t;
+      return N(o) && o.length > 0 ? o.some((r) => !!(r != null && r.condition)) : O(o) ? !!o.condition : !!e;
     }
-    function w(e, t = "default", o) {
-      if (!e || !Reflect.has(e, t) || !b(e[t]))
+    function w(t, e = "default", o) {
+      if (!t || !Reflect.has(t, e) || !m(t[e]))
         return null;
-      const r = e[t];
+      const r = t[e];
       return r ? r(o) : null;
     }
-    const u = (e, t) => F(n(R, c({
-      disabled: B(e.disabledTip, e.disabled),
-      key: t,
+    const p = (t, e) => F(n(U, c({
+      disabled: B(t.disabledTip, t.disabled),
+      key: e,
       style: {
-        color: e.color
+        color: t.color
       },
-      class: `${s}-reference-btn`,
-      onClick: e.onClick,
-      loading: e.loading,
-      type: e.type || "",
-      size: e.size || "default",
-      "data-testid": T(e.label || "")
-    }, e.props ?? {}), {
-      default: () => [n("span", null, [e.label || ""]), e.children && !e.disabled && n(m, {
+      class: `${l}-reference-btn`,
+      onClick: t.onClick,
+      loading: t.loading,
+      type: t.type || "",
+      size: t.size || "default",
+      "data-testid": T(t.label || "")
+    }, t.props ?? {}), {
+      default: () => [n("span", null, [t.label || ""]), t.children && !t.disabled && n(b, {
         "icon-font": "icon-xiala",
         class: "el-icon--right"
       }, null)],
-      ...e.iconFont && {
-        icon: () => n(m, {
-          "icon-font": e.iconFont,
+      ...t.iconFont && {
+        icon: () => n(b, {
+          "icon-font": t.iconFont,
           size: 14
         }, null)
       }
-    }), [[$("disabled-tip"), e.disabledTip]]), p = (e) => e.map((t, o) => {
-      const r = _.get(t.component);
-      if (t.children && t.children.length > 0) {
-        const i = {
-          reference: () => u(t, o)
+    }), [[$("disabled-tip"), t.disabledTip]]), u = (t) => t.map((e, o) => {
+      const r = _.get(e.component);
+      if (e.children && e.children.length > 0) {
+        const s = {
+          reference: () => p(e, o)
         };
-        return t.disabled ? u(t, o) : n(V, {
+        return e.disabled ? p(e, o) : n(z, {
           placement: "bottom",
           width: "auto",
           trigger: "hover",
           offset: 8,
           "show-arrow": !1,
-          "popper-class": `${s}-popover`
+          "popper-class": `${l}-popover`
         }, {
           default: () => [n("div", {
-            class: `${s}-popover-btnbox`
-          }, [p(t.children)])],
-          ...i
+            class: `${l}-popover-btnbox`
+          }, [u(e.children)])],
+          ...s
         });
       }
-      return t.slot ? w(g, t.slot, t) : t.component ? n(r, c({
+      return e.slot ? w(g, e.slot, e) : e.component ? n(r, c({
         key: o
-      }, t), null) : u(t, o);
+      }, e), null) : p(e, o);
     });
     return () => {
-      let e;
+      let t;
       return n("div", {
-        class: `${s} flex`,
+        class: `${l} flex`,
         onClick: y
       }, [n(P("el-space"), {
         size: 8
-      }, E(e = p(f(v))) ? e : {
-        default: () => [e]
+      }, E(t = u(d(v))) ? t : {
+        default: () => [t]
       })]);
     };
   }
 });
 export {
-  X as default
+  ft as default
 };

package/dist/components/tt-table/src/components/TableColumnModal.vue2.js

@@ -5,12 +5,23 @@ import { TtIcon as B } from "../../../tt-icon/index.js";
 import { TtText as oe } from "../../../tt-text/index.js";
 import "../../../tt-modal/index.js";
 import { TtButton as ne } from "../../../tt-button/index.js";
-import { useDesign as se } from "@dazhicheng/hooks";
+import "../../../../node_modules/.pnpm/vue-types@5.1.3_vue@3.5.21_typescript@5.9.3_/node_modules/vue-types/shim/index.modern.js";
+import { useDesign as se } from "../../../../packages/hooks/src/useDesign.js";
+import "axios";
 import { ElScrollbar as $, ElCheckbox as I, ElCheckboxGroup as ie, ElTooltip as de } from "element-plus";
+import "dayjs";
+import "xe-utils";
+import "dayjs/plugin/utc";
+import "dayjs/plugin/timezone";
+import "../../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
 import { cloneDeep as ce } from "lodash-es";
 import ae from "sortablejs";
 import { useModalRender as re } from "../../../tt-modal/src/hooks/useModalRender.js";
-const ue = { class: "flex-1" }, me = { class: "cb flex items-center" }, fe = { class: "text-[var(--el-text-color-primary)] font-bold" }, pe = { class: "flex flex-col w-[200px] shrink-0" }, he = { class: "flex items-center justify-between px-15px pt-12px pb-6px text-xs text-[var(--el-text-color-regular)]" }, xe = { class: "flex items-center text-xs" }, Ce = ["onClick"], be = { class: "text-left" }, Be = /* @__PURE__ */ X({
+const ue = { class: "flex-1" }, me = { class: "cb flex items-center" }, fe = { class: "text-[var(--el-text-color-primary)] font-bold" }, pe = { class: "flex flex-col w-[200px] shrink-0" }, he = { class: "flex items-center justify-between px-15px pt-12px pb-6px text-xs text-[var(--el-text-color-regular)]" }, xe = { class: "flex items-center text-xs" }, Ce = ["onClick"], be = { class: "text-left" }, qe = /* @__PURE__ */ X({
   __name: "TableColumnModal",
   props: {
     openColumn: { type: Function },
@@ -230,5 +241,5 @@ const ue = { class: "flex-1" }, me = { class: "cb flex items-center" }, fe = { c
   }
 });
 export {
-  Be as default
+  qe as default
 };

package/dist/components/tt-table/src/components/TableToobalTools.vue.js

@@ -1,55 +1,66 @@
-import { defineComponent as w, inject as E, computed as i, unref as n, ref as x, createElementBlock as a, openBlock as t, createBlock as d, createCommentVNode as f, withCtx as p, renderSlot as u, Fragment as h, renderList as I, createElementVNode as $, createVNode as y } from "vue";
+import { defineComponent as w, inject as E, computed as s, unref as n, ref as x, createElementBlock as a, openBlock as t, createBlock as p, createCommentVNode as d, withCtx as f, renderSlot as u, Fragment as h, renderList as I, createElementVNode as $, createVNode as y } from "vue";
 import { TtIcon as A } from "../../../tt-icon/index.js";
-import { generateTestId as B } from "@dazhicheng/utils";
-import { ElSpace as N, ElTooltip as V } from "element-plus";
+import "axios";
+import { ElSpace as B, ElTooltip as N } from "element-plus";
+import "dayjs";
+import { generateTestId as V } from "../../../../packages/utils/src/testid-helper.js";
+import "xe-utils";
+import "dayjs/plugin/utc";
+import "dayjs/plugin/timezone";
+import "../../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
+import "lodash-es";
 import { toolProps as z } from "../toolProps.js";
 import R from "../../../../assets/svg/RiRefreshLine.svg.js";
 import j from "../../../../assets/svg/exportSvg.svg.js";
 import F from "../../../../assets/svg/columnSet.svg.js";
-const L = ["data-testid"], P = ["onClick", "onAnimationend"], Q = /* @__PURE__ */ w({
+const L = ["data-testid"], P = ["onClick", "onAnimationend"], ie = /* @__PURE__ */ w({
   __name: "TableToobalTools",
   props: z,
   emits: ["on-refresh", "on-columns-setting", "on-export"],
   setup(b, { emit: k }) {
-    const r = b, l = k, v = E(
+    const r = b, i = k, v = E(
       "tableIdContext",
-      i(() => "")
-    ), _ = i(() => B(n(v), "table-toolbar-tools")), c = x(/* @__PURE__ */ new Set());
-    function g(e, m) {
-      c.value.add(e), m();
+      s(() => "")
+    ), _ = s(() => V(n(v), "table-toolbar-tools")), m = x(/* @__PURE__ */ new Set());
+    function g(e, c) {
+      m.value.add(e), c();
     }
     function C(e) {
-      c.value.delete(e);
+      m.value.delete(e);
     }
-    const S = i(() => [
+    const S = s(() => [
       {
         label: "自定义导出",
         icon: j,
-        handler: () => l("on-export"),
+        handler: () => i("on-export"),
         if: r.showExport
       },
       {
         label: "刷新",
         icon: R,
-        handler: () => l("on-refresh"),
+        handler: () => i("on-refresh"),
         if: r.showRefresh
       },
       {
         label: "列设置",
         icon: F,
-        handler: () => l("on-columns-setting"),
+        handler: () => i("on-columns-setting"),
         if: r.showSetColumn
       }
     ]);
-    return (e, m) => (t(), a("div", { "data-testid": _.value }, [
-      e.showSetting ? (t(), d(n(N), {
+    return (e, c) => (t(), a("div", { "data-testid": _.value }, [
+      e.showSetting ? (t(), p(n(B), {
         key: 0,
         size: 12
       }, {
-        default: p(() => [
+        default: f(() => [
           u(e.$slots, "toolbar-left"),
-          (t(!0), a(h, null, I(S.value, (o, s) => (t(), a(h, { key: s }, [
-            o.if ? (t(), d(n(V), {
+          (t(!0), a(h, null, I(S.value, (o, l) => (t(), a(h, { key: l }, [
+            o.if ? (t(), p(n(N), {
               key: 0,
               ref_for: !0,
               ref: "tooltipRef",
@@ -59,11 +70,11 @@ const L = ["data-testid"], P = ["onClick", "onAnimationend"], Q = /* @__PURE__ *
               placement: "top",
               "show-after": 200
             }, {
-              default: p(() => [
+              default: f(() => [
                 $("div", {
                   class: "icon-table-btn",
-                  onClick: (T) => g(s, o.handler),
-                  onAnimationend: (T) => C(s)
+                  onClick: (T) => g(l, o.handler),
+                  onAnimationend: (T) => C(l)
                 }, [
                   y(n(A), {
                     icon: o.icon,
@@ -73,15 +84,15 @@ const L = ["data-testid"], P = ["onClick", "onAnimationend"], Q = /* @__PURE__ *
                 ], 40, P)
               ]),
               _: 2
-            }, 1032, ["content"])) : f("", !0)
+            }, 1032, ["content"])) : d("", !0)
           ], 64))), 128)),
           u(e.$slots, "toolbar-right")
         ]),
         _: 3
-      })) : f("", !0)
+      })) : d("", !0)
     ], 8, L));
   }
 });
 export {
-  Q as default
+  ie as default
 };

package/dist/components/tt-table/src/hooks/useColumns.js

@@ -1,8 +1,15 @@
-import { calcWordsWidth as G } from "@dazhicheng/utils";
-import { ElMessage as Y } from "element-plus";
-import { GlobalConfig as R } from "../../../../hooks/useSetup.js";
-import { isEqual as U, debounce as B, cloneDeep as L, flattenDeep as ee, isArray as ne, isFunction as te } from "lodash-es";
-import { ref as x, shallowRef as le, computed as T, unref as n, watch as E, toValue as oe, watchEffect as ie, onUnmounted as se, nextTick as ue } from "vue";
+import "axios";
+import { ElMessage as G } from "element-plus";
+import "dayjs";
+import { ref as x, shallowRef as Y, computed as T, unref as n, watch as E, toValue as R, watchEffect as ee, onUnmounted as ne, nextTick as te } from "vue";
+import { calcWordsWidth as oe } from "../../../../packages/utils/src/tool.js";
+import "../../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
+import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
+import { isEqual as U, debounce as B, cloneDeep as L, flattenDeep as le, isArray as ie, isFunction as se } from "lodash-es";
+import { GlobalConfig as ue } from "../../../../hooks/useSetup.js";
 function S(e) {
   var u;
   const s = L(e || []);
@@ -56,7 +63,7 @@ function ce(e) {
     ...W
   }), a;
 }
-function de(e) {
+function re(e) {
   const { showAction: s, actionProps: u, actionWidth: t, actionTitle: i } = n(e);
   return s ? [
     {
@@ -71,7 +78,7 @@ function de(e) {
     }
   ] : [];
 }
-function re(e, s) {
+function de(e, s) {
   const u = (t, i) => {
     if (t.sortable && i) {
       const h = `${t.field}_header`;
@@ -100,7 +107,7 @@ function ae(e, s, u) {
 }
 function he(e) {
   const u = document.getElementsByTagName("body")[0], t = window.getComputedStyle(u).fontFamily;
-  return e.minWidth = e.minWidth === "auto" ? (G(e.title, "12px", t) + 60).toFixed(0) : e.minWidth, e;
+  return e.minWidth = e.minWidth === "auto" ? (oe(e.title, "12px", t) + 60).toFixed(0) : e.minWidth, e;
 }
 function fe({
   propsRef: e,
@@ -113,29 +120,29 @@ function fe({
 }) {
   var g;
   const { columnsFieldSort: h, columnsFieldNoSort: b, isCellSort: W, isCellResize: C, customizeColumn: a } = n(e);
-  let v = W;
-  h.length > 0 && (v = h.includes(s.field)), b.length > 0 && (v = !b.includes(s.field));
-  let r = {
+  let p = W;
+  h.length > 0 && (p = h.includes(s.field)), b.length > 0 && (p = !b.includes(s.field));
+  let d = {
     minWidth: 140,
-    sortable: v,
+    sortable: p,
     resizable: C,
     ...s
   };
-  const m = a || ((g = R.table) == null ? void 0 : g.customizeColumn);
-  return m && te(m) && (r = m(r)), r = re(r, t), r = ae(r, u, i), r = he(r), r;
+  const m = a || ((g = ue.table) == null ? void 0 : g.customizeColumn);
+  return m && se(m) && (d = m(d)), d = de(d, t), d = ae(d, u, i), d = he(d), d;
 }
-function xe(e, {
+function Pe(e, {
   xGrid: s,
   tableWidth: u
 }, t) {
-  const i = x([]), h = x([]), b = x([]), W = x([]), C = x([]), a = x([]), v = le(!0), r = x(!1);
+  const i = x([]), h = x([]), b = x([]), W = x([]), C = x([]), a = x([]), p = Y(!0), d = x(!1);
   let m = null, g = [];
-  function j(o) {
+  function j(l) {
     var c;
-    const l = { ...o };
-    return (c = l.children) != null && c.length && (l.children = l.children.map((z) => j(z))), fe({
+    const o = { ...l };
+    return (c = o.children) != null && c.length && (o.children = o.children.map((v) => j(v))), fe({
       propsRef: e,
-      item: l,
+      item: o,
       titleSolts: h,
       validSolts: b,
       validRulesKeys: W
@@ -144,70 +151,70 @@ function xe(e, {
     });
   }
   const q = T(() => {
-    const o = S(n(i));
-    return o ? o.map((c) => j(c)) : [];
+    const l = S(n(i));
+    return l ? l.map((c) => j(c)) : [];
   }), H = () => ({
     leftColumn: n(C),
     actionColumn: n(a)
   });
-  function D(o) {
-    const l = S(o);
-    if (ne(l)) {
-      if (l.length <= 0) {
+  function D(l) {
+    const o = S(l);
+    if (ie(o)) {
+      if (o.length <= 0) {
         i.value = [];
         return;
       }
-      i.value = g = l;
+      i.value = g = o;
     }
   }
   function $() {
     return g;
   }
-  function N(o) {
-    ue(() => {
-      const l = n(s);
-      l && l.reloadColumn(ee(o));
+  function N(l) {
+    te(() => {
+      const o = n(s);
+      o && o.reloadColumn(le(l));
     });
   }
-  function V(o) {
+  function V(l) {
     m || (m = n(s).$el.querySelector(".vxe-table--scroll-y-virtual"));
-    const l = [...n(C), ...n(a)], { column: c } = o, { tableColumn: z } = n(s).getTableColumn(), w = L(
-      z.filter((d) => !l.map((f) => (f == null ? void 0 : f.type) || f.field).includes((d == null ? void 0 : d.type) || d.field))
-    ), F = l.reduce((d, f) => d + (f.width || 0), 0), I = (n(u) || 0) - F, A = w.filter((d) => d.field !== c.field).reduce((d, f) => d + Number(f.renderWidth), 0), p = I - A;
-    if (c.resizeWidth < p) {
-      const d = (m == null ? void 0 : m.offsetWidth) || 0;
-      c.resizeWidth = p - d, c.renderWidth = c.resizeWidth, n(s).setColumnWidth(w, c.resizeWidth), Y.warning("不能小于拖动的最小宽度，会导致表格右侧空白");
+    const o = [...n(C), ...n(a)], { column: c } = l, { tableColumn: v } = n(s).getTableColumn(), w = L(
+      v.filter((r) => !o.map((f) => (f == null ? void 0 : f.type) || f.field).includes((r == null ? void 0 : r.type) || r.field))
+    ), F = o.reduce((r, f) => r + (f.width || 0), 0), I = (n(u) || 0) - F, A = w.filter((r) => r.field !== c.field).reduce((r, f) => r + Number(f.renderWidth), 0), y = I - A;
+    if (c.resizeWidth < y) {
+      const r = (m == null ? void 0 : m.offsetWidth) || 0;
+      c.resizeWidth = y - r, c.renderWidth = c.resizeWidth, n(s).setColumnWidth(w, c.resizeWidth), G.warning("不能小于拖动的最小宽度，会导致表格右侧空白");
     }
-    const k = w == null ? void 0 : w.find((d) => d.field === c.field);
+    const k = w == null ? void 0 : w.find((r) => r.field === c.field);
     k && (k.width = c.resizeWidth);
   }
-  function J(o) {
-    V(o), t("resizable-change", o);
+  function J(l) {
+    V(l), t("resizable-change", l);
   }
-  function K(o) {
-    V(o), t("column-resizable-change", o);
+  function K(l) {
+    V(l), t("column-resizable-change", l);
   }
-  function Q(o) {
+  function Q(l) {
     var _;
-    r.value = !0;
-    const l = [], { showAction: c, showCheckbox: z, showIndex: w, showRadio: F, showExpand: I } = n(e);
-    c && l.push("action"), z && l.push("checkbox"), w && l.push("seq"), F && l.push("radio"), I && l.push("expand");
-    const { collectColumn: A } = ((_ = o.$grid) == null ? void 0 : _.getTableColumn()) || { collectColumn: [] }, p = A.filter((P) => !l.includes(P.field) && !l.includes(P.type)), k = $();
-    function d(P, X) {
+    d.value = !0;
+    const o = [], { showAction: c, showCheckbox: v, showIndex: w, showRadio: F, showExpand: I } = n(e);
+    c && o.push("action"), v && o.push("checkbox"), w && o.push("seq"), F && o.push("radio"), I && o.push("expand");
+    const { collectColumn: A } = ((_ = l.$grid) == null ? void 0 : _.getTableColumn()) || { collectColumn: [] }, y = A.filter((P) => !o.includes(P.field) && !o.includes(P.type)), k = $();
+    function r(P, X) {
       const M = [];
       return P.forEach((O) => {
-        const y = X.find((Z) => Z.field === O.field);
-        y && (O.children && y.children && (y.children = d(O.children, y.children)), M.push(y));
+        const z = X.find((Z) => Z.field === O.field);
+        z && (O.children && z.children && (z.children = r(O.children, z.children)), M.push(z));
       }), M;
     }
-    const f = d(p, k);
-    D(f), t("column-dragend", o);
+    const f = r(y, k);
+    D(f), t("column-dragend", l);
   }
   return E(
-    T(() => oe(n(e).columns)),
-    (o, l) => {
-      if (!U(o, l)) {
-        const c = S(o || []);
+    T(() => R(n(e).columns)),
+    (l, o) => {
+      if (!U(l, o)) {
+        const c = S(l || []);
         i.value = g = c || [];
       }
     },
@@ -217,13 +224,13 @@ function xe(e, {
     }
   ), E(
     () => [C.value, q.value, a.value],
-    (o, l) => {
-      if (n(r))
-        return r.value = !1, !1;
-      v.value && (N(o), v.value = !1), U(o, l) || N(o);
+    (l, o) => {
+      if (n(d))
+        return d.value = !1, !1;
+      p.value && (N(l), p.value = !1), U(l, o) || N(l);
     },
     { deep: !0 }
-  ), ie(() => {
+  ), ee(() => {
     n(e).editRules && (W.value = Object.keys(n(e).editRules));
   }), E(
     T(() => [
@@ -251,12 +258,12 @@ function xe(e, {
       n(e).isI18n
     ]),
     () => {
-      a.value = de(e);
+      a.value = re(e);
     },
     {
       immediate: !0
     }
-  ), se(() => {
+  ), ne(() => {
     g = [];
   }), {
     getColumnsRef: q,
@@ -271,5 +278,5 @@ function xe(e, {
   };
 }
 export {
-  xe as useColumns
+  Pe as useColumns
 };