x-next 1.11.0 → 1.12.0

package/dist/es/components/table/utils.js

@@ -1,77 +1,86 @@
-import { isUndefined as c, isArray as h, isNull as S } from "../../_utils/is.js";
-import { isNamedComponent as y, resolveProps as _, isSlotsChildren as $, isArrayChildren as b } from "../../_utils/vue-eco.js";
-const R = (t) => {
+import { toRaw as F } from "vue";
+import { isUndefined as h, isArray as c, isNull as _ } from "../../_utils/is.js";
+import { isNamedComponent as $, resolveProps as b, isSlotsChildren as R, isArrayChildren as k } from "../../_utils/vue-eco.js";
+const D = (e) => {
   let i = 0;
-  const e = (r) => {
-    if (h(r) && r.length > 0)
+  const t = (r) => {
+    if (c(r) && r.length > 0)
       for (const d of r)
-        d.children ? e(d.children) : i += 1;
+        d.children ? t(d.children) : i += 1;
   };
-  return e(t), i;
-}, F = (t) => {
+  return t(e), i;
+}, I = (e) => {
   let i = 0;
-  if (h(t) && t.length > 0) {
+  if (c(e) && e.length > 0) {
     i = 1;
-    for (const e of t)
-      if (e.children) {
-        const r = F(e.children);
+    for (const t of e)
+      if (t.children) {
+        const r = I(t.children);
         r > 0 && (i = Math.max(i, r + 1));
       }
   }
   return i;
-}, p = (t, i) => {
-  let { parent: e } = t;
-  for (; e; )
-    e.fixed === i && (i === "left" ? e.isLastLeftFixed = !0 : e.isFirstRightFixed = !0), e = e.parent;
-}, v = (t, i, e) => {
-  const r = F(t);
+}, w = (e, i) => {
+  let { parent: t } = e;
+  for (; t; )
+    t.fixed === i && (i === "left" ? t.isLastLeftFixed = !0 : t.isFirstRightFixed = !0), t = t.parent;
+}, G = (e, i, t) => {
+  const r = I(e);
   i.clear();
-  const d = [], s = [...Array(r)].map(() => []);
-  let f, l;
-  const x = (w, {
+  const d = [], l = [...Array(r)].map(() => []);
+  let s, f;
+  const g = (S, {
     level: a = 0,
-    parent: L,
-    fixed: g
+    parent: y,
+    fixed: x
   } = {}) => {
-    for (const C of w) {
-      const n = { ...C, parent: L };
-      if (h(n.children)) {
-        const o = R(n.children);
-        o > 1 && (n.colSpan = o), s[a].push(n), x(n.children, {
+    for (const p of S) {
+      const n = { ...p, fixed: p.fixed ?? x, parent: y };
+      if (c(n.children)) {
+        const o = D(n.children);
+        o > 1 && (n.colSpan = o), l[a].push(n), g(n.children, {
           level: a + 1,
           parent: n,
           fixed: n.fixed
         });
       } else {
+        n.width !== void 0 && n.minWidth !== void 0 && (n.width = Math.max(n.width, n.minWidth));
         const o = r - a;
-        o > 1 && (n.rowSpan = o), (g || n.fixed) && (n.fixed = n.fixed ?? g, n.fixed === "left" ? f = d.length : c(l) && (l = d.length)), (c(n.dataIndex) || S(n.dataIndex)) && (n.dataIndex = `__arco_data_index_${d.length}`), e[n.dataIndex] && (n._resizeWidth = e[n.dataIndex]), i.set(n.dataIndex, n), d.push(n), s[a].push(n);
+        o > 1 && (n.rowSpan = o), (x || n.fixed) && (n.fixed = n.fixed ?? x, n.fixed === "left" ? s = d.length : h(f) && (f = d.length)), (h(n.dataIndex) || _(n.dataIndex)) && (n.dataIndex = `__arco_data_index_${d.length}`), t[n.dataIndex] && (n._resizeWidth = t[n.dataIndex]), i.set(n.dataIndex, n), d.push(n), l[a].push(n);
       }
     }
   };
-  return x(t), c(f) || (d[f].isLastLeftFixed = !0, p(d[f], "left")), c(l) || (d[l].isFirstRightFixed = !0, p(d[l], "right")), { dataColumns: d, groupColumns: s };
-}, k = (t, i) => {
-  for (let e = 0; e < t.length; e++)
-    if (t[e].name === i)
-      return e;
+  return g(e), h(s) || (d[s].isLastLeftFixed = !0, w(d[s], "left")), h(f) || (d[f].isFirstRightFixed = !0, w(d[f], "right")), { dataColumns: d, groupColumns: l };
+}, N = (e, i) => {
+  for (let t = 0; t < e.length; t++)
+    if (e[t].name === i)
+      return t;
   return -1;
-}, N = (t, i) => {
-  const e = k(i, t.name);
-  if (e <= 0)
+}, W = (e, i) => {
+  const t = N(i, e.name);
+  if (t <= 0)
     return 0;
   let r = 0;
-  const d = i.slice(0, e);
-  for (const s of d)
-    r += s.width ?? 0;
+  const d = i.slice(0, t);
+  for (const l of d)
+    r += l.width ?? 40;
   return r;
-}, m = (t) => t.children && t.children.length > 0 ? m(t.children[0]) : t, I = (t) => t.children && t.children.length > 0 ? I(t.children[t.children.length - 1]) : t, A = (t, {
+}, L = (e) => e.children && e.children.length > 0 ? L(e.children[0]) : e, C = (e) => e.children && e.children.length > 0 ? C(e.children[e.children.length - 1]) : e, m = (e, i) => i.filter((t) => {
+  let r = t.parent;
+  for (; r; ) {
+    if (F(r) === F(e)) return !0;
+    r = r.parent;
+  }
+  return !1;
+}), v = (e, {
   dataColumns: i,
-  operations: e
+  operations: t
 }) => {
   let r = 0;
-  if (t.fixed === "left") {
-    for (const f of e)
+  if (e.fixed === "left") {
+    for (const f of t)
       r += f.width ?? 40;
-    const s = m(t);
+    const s = m(e, i)[0] ?? L(e);
     for (const f of i) {
       if (s.dataIndex === f.dataIndex)
         break;
@@ -79,90 +88,91 @@ const R = (t) => {
     }
     return r;
   }
-  const d = I(t);
+  const d = m(e, i), l = d[d.length - 1] ?? C(e);
   for (let s = i.length - 1; s >= 0; s--) {
     const f = i[s];
-    if (d.dataIndex === f.dataIndex)
+    if (l.dataIndex === f.dataIndex)
       break;
     f.fixed === "right" && (r += f._resizeWidth ?? f.width ?? 0);
   }
   return r;
-}, H = (t, i) => i.fixed ? [
-  `${t}-col-fixed-left`,
+}, K = (e, i) => i.fixed ? [
+  `${e}-col-fixed-left`,
   {
-    [`${t}-col-fixed-left-last`]: i.isLastLeftFixed
+    [`${e}-col-fixed-left-last`]: i.isLastLeftFixed
   }
-] : [], P = (t, i) => i.fixed === "left" ? [
-  `${t}-col-fixed-left`,
+] : [], M = (e, i) => i.fixed === "left" ? [
+  `${e}-col-fixed-left`,
   {
-    [`${t}-col-fixed-left-last`]: i.isLastLeftFixed
+    [`${e}-col-fixed-left-last`]: i.isLastLeftFixed
   }
 ] : i.fixed === "right" ? [
-  `${t}-col-fixed-right`,
+  `${e}-col-fixed-right`,
   {
-    [`${t}-col-fixed-right-first`]: i.isFirstRightFixed
+    [`${e}-col-fixed-right-first`]: i.isFirstRightFixed
   }
-] : [], G = (t, {
+] : [], U = (e, {
   dataColumns: i,
-  operations: e
+  operations: t
 }) => {
-  if (t.fixed) {
-    const r = `${A(t, { dataColumns: i, operations: e })}px`;
-    return t.fixed === "left" ? {
+  if (e.fixed) {
+    const r = `${v(e, { dataColumns: i, operations: t })}px`;
+    return e.fixed === "left" ? {
       left: r
     } : {
       right: r
     };
   }
   return {};
-}, K = (t, i) => t.fixed ? {
-  left: `${N(t, i)}px`
-} : {}, u = (t) => {
+}, j = (e, i) => e.fixed ? {
+  left: `${W(e, i)}px`
+} : {}, u = (e) => {
   const i = [];
-  for (const e of t)
-    if (y(e, "TableColumn")) {
-      const r = _(e);
-      $(e, e.children) && (e.children.default && (r.children = u(e.children.default())), e.children.cell && (r.render = e.children.cell), e.children.title && (r.title = e.children.title)), i.push(r);
-    } else b(e, e.children) ? i.push(...u(e.children)) : h(e) && i.push(...u(e));
+  for (const t of e)
+    if ($(t, "TableColumn")) {
+      const r = b(t);
+      R(t, t.children) && (t.children.default && (r.children = u(t.children.default())), t.children.cell && (r.render = t.children.cell), t.children.title && (r.title = t.children.title)), i.push(r);
+    } else k(t, t.children) ? i.push(...u(t.children)) : c(t) && i.push(...u(t));
   return i;
 };
-function D(t) {
-  return t.map((i) => {
-    const e = { ...i };
-    return e.children && (e.children = D(e.children)), e;
+function A(e) {
+  return e.map((i) => {
+    const t = { ...i };
+    return t.children && (t.children = A(t.children)), t;
   });
 }
-function O(t) {
-  return t.map((i) => {
-    const e = { ...i.raw };
-    return i.children && (e.children = O(i.children)), e;
+function O(e) {
+  return e.map((i) => {
+    const t = { ...i.raw };
+    return i.children && (t.children = O(i.children)), t;
   });
 }
-const z = (t) => {
+const z = (e) => {
+  var t;
   const i = [];
-  if (t.children)
-    for (const e of t.children)
-      e.isLeaf ? i.push(e.key) : i.push(...z(e));
+  if (e.children)
+    for (const r of e.children)
+      r.isLeaf || ((t = r.children) == null ? void 0 : t.length) === 0 ? r.disabled || i.push(r.key) : i.push(...z(r));
   return i;
-}, U = (t, i) => {
-  let e = !1, r = !1;
-  const d = i.filter((s) => t.includes(s));
-  return d.length > 0 && (d.length >= i.length ? e = !0 : r = !0), {
-    checked: e,
+}, q = (e, i) => {
+  let t = !1, r = !1;
+  const d = i.filter((l) => e.includes(l));
+  return d.length > 0 && (d.length >= i.length ? t = !0 : r = !0), {
+    checked: t,
     indeterminate: r
   };
 };
 export {
   u as getColumnsFromSlot,
-  P as getFixedCls,
-  A as getFixedNumber,
-  v as getGroupColumns,
+  M as getFixedCls,
+  v as getFixedNumber,
+  G as getGroupColumns,
   z as getLeafKeys,
-  H as getOperationFixedCls,
-  N as getOperationFixedNumber,
-  K as getOperationStyle,
-  U as getSelectionStatus,
-  G as getStyle,
-  D as mapArrayWithChildren,
+  K as getOperationFixedCls,
+  W as getOperationFixedNumber,
+  j as getOperationStyle,
+  q as getSelectionStatus,
+  U as getStyle,
+  A as mapArrayWithChildren,
   O as mapRawTableData
 };

package/dist/es/components/virtual-list-v2/hooks/use-size.js

@@ -1,60 +1,66 @@
-import { ref as z, computed as n, onMounted as O } from "vue";
-const B = ({
-  dataKeys: h,
-  contentRef: P,
+import { ref as w, reactive as A, watch as O, computed as a, onMounted as P } from "vue";
+const N = ({
+  dataKeys: i,
+  contentRef: b,
   fixedSize: _,
-  estimatedSize: i,
-  buffer: g
+  estimatedSize: g,
+  buffer: S
 }) => {
-  const I = z(0), r = /* @__PURE__ */ new Map(), l = n(() => h.value.length), a = z(0), d = n(() => {
-    const e = a.value + g.value * 3;
+  const I = w(0), u = A(/* @__PURE__ */ new Map());
+  O(i, (e) => {
+    const t = new Set(e);
+    for (const n of u.keys())
+      t.has(n) || u.delete(n);
+  });
+  const l = a(() => i.value.length), r = w(0), d = a(() => {
+    const e = r.value + S.value * 3;
     return e > l.value ? l.value : e;
-  }), v = n(() => {
-    const e = l.value - g.value * 3;
+  }), v = a(() => {
+    const e = l.value - S.value * 3;
     return e < 0 ? 0 : e;
   }), x = (e) => {
-    e < 0 ? a.value = 0 : e > v.value ? a.value = v.value : a.value = e;
-  }, c = z(_.value), s = n(() => i.value !== 30 ? i.value : I.value || i.value), M = (e, t) => {
-    r.set(e, t);
+    e < 0 ? r.value = 0 : e > v.value ? r.value = v.value : r.value = e;
+  }, c = _, s = a(() => g.value !== 30 ? g.value ?? 30 : I.value || g.value || 30), z = (e, t) => {
+    Number.isFinite(t) && t > 0 && u.get(e) !== t && u.set(e, t);
   }, p = (e) => {
     if (c.value)
       return s.value;
-    const t = h.value[e];
-    return r.get(t) ?? s.value;
-  }, w = (e) => r.has(e);
-  O(() => {
-    const e = Array.from(r.values()).reduce((t, u) => t + u, 0);
-    e > 0 && (I.value = e / r.size);
+    const t = i.value[e];
+    return u.get(t) ?? s.value;
+  }, M = (e) => u.has(e);
+  P(() => {
+    const e = Array.from(u.values()).reduce((t, n) => t + n, 0);
+    e > 0 && (I.value = e / u.size);
   });
-  const R = (e) => c.value ? s.value * e : S(0, e), S = (e, t) => {
-    let u = 0;
+  const y = (e) => c.value ? s.value * e : m(0, e), m = (e, t) => {
+    let n = 0;
     for (let o = e; o < t; o++)
-      u += p(o);
-    return u;
-  }, m = n(() => c.value ? s.value * a.value : S(0, a.value)), y = (e) => {
-    const t = e >= m.value;
-    let u = Math.abs(e - m.value);
-    const o = t ? a.value : a.value - 1;
+      n += p(o);
+    return n;
+  }, h = a(() => c.value ? s.value * r.value : m(0, r.value)), F = (e) => {
+    const t = e >= h.value;
+    let n = Math.abs(e - h.value);
+    const o = t ? r.value : r.value - 1;
     let f = 0;
-    for (; u > 0; )
-      u -= p(o + f), t ? f++ : f--;
+    for (; n > 0; )
+      n -= p(o + f), t ? f++ : f--;
     return f;
-  }, A = (e) => {
-    const t = y(e), u = a.value + t - g.value;
-    return u < 0 ? 0 : u > v.value ? v.value : u;
-  }, F = n(() => c.value ? s.value * (l.value - d.value) : S(d.value, l.value));
+  }, R = (e) => {
+    const t = F(e), n = r.value + t - S.value;
+    return n < 0 ? 0 : n > v.value ? v.value : n;
+  }, k = a(() => c.value ? s.value * (l.value - d.value) : m(d.value, l.value));
   return {
-    frontPadding: m,
-    behindPadding: F,
-    start: a,
+    frontPadding: h,
+    behindPadding: k,
+    start: r,
     end: d,
-    getStartByScroll: A,
-    setItemSize: M,
-    hasItemSize: w,
+    getStartByScroll: R,
+    setItemSize: z,
+    hasItemSize: M,
     setStart: x,
-    getScrollOffset: R
+    getScrollOffset: y
   };
 };
 export {
-  B as useSize
+  N as useSize
 };

package/dist/es/components/virtual-list-v2/virtual-list-item.js

@@ -1,6 +1,7 @@
-import { defineComponent as s, getCurrentInstance as a, ref as d, onMounted as p, onBeforeUnmount as g, cloneVNode as h } from "vue";
-import { getFirstComponent as I } from "../../_utils/vue-eco.js";
-const C = /* @__PURE__ */ s({
+import { defineComponent as d, getCurrentInstance as p, ref as g, watch as h, onMounted as a, onBeforeUnmount as I, cloneVNode as z } from "vue";
+import l from "../../Users/xuyu/Code/x-next/node_modules/.pnpm/resize-observer-polyfill@1.5.1/node_modules/resize-observer-polyfill/dist/ResizeObserver.es.js";
+import { getFirstComponent as y } from "../../_utils/vue-eco.js";
+const $ = /* @__PURE__ */ d({
   name: "VirtualListItem",
   props: {
     hasItemSize: {
@@ -12,24 +13,36 @@ const C = /* @__PURE__ */ s({
       required: !0
     }
   },
-  setup(c, {
-    slots: n
+  setup(f, {
+    slots: r
   }) {
-    var o;
-    const f = (o = a()) == null ? void 0 : o.vnode.key, r = d(), i = () => {
-      var u, m;
-      const e = ((u = r.value) == null ? void 0 : u.$el) ?? r.value, t = ((m = e == null ? void 0 : e.getBoundingClientRect) == null ? void 0 : m.call(e).height) ?? (e == null ? void 0 : e.offsetHeight);
-      t && c.setItemSize(f, t);
+    var c;
+    const m = (c = p()) == null ? void 0 : c.vnode.key, u = g();
+    let n;
+    const i = () => {
+      var s;
+      const t = u.value, e = t && "$el" in t ? t.$el : t, o = ((s = e == null ? void 0 : e.getBoundingClientRect) == null ? void 0 : s.call(e).height) ?? (e == null ? void 0 : e.offsetHeight);
+      o && f.setItemSize(m, o);
     };
-    return p(() => i()), g(() => i()), () => {
-      var t;
-      const e = I((t = n.default) == null ? void 0 : t.call(n));
-      return e ? h(e, {
-        ref: r
+    return h(u, (t) => {
+      n == null || n.disconnect();
+      const e = t && "$el" in t ? t.$el : t;
+      if (!(e != null && e.getBoundingClientRect)) return;
+      const o = typeof ResizeObserver > "u" ? l : ResizeObserver;
+      n = new o(i), n.observe(e), i();
+    }, {
+      flush: "post"
+    }), a(() => i()), I(() => {
+      n == null || n.disconnect(), i();
+    }), () => {
+      var e;
+      const t = y((e = r.default) == null ? void 0 : e.call(r));
+      return t ? z(t, {
+        ref: u
       }, !0) : null;
     };
   }
 });
 export {
-  C as default
+  $ as default
 };

package/dist/es/locale/en-US.js

@@ -42,7 +42,13 @@ const e = {
     okText: "OK",
     currentColumnText: "Column",
     filterLabelText: "Filter {column}",
-    summaryText: "Summary"
+    summaryText: "Summary",
+    expandRowText: "Expand row {row}",
+    collapseRowText: "Collapse row {row}",
+    selectRowText: "Select row {row}",
+    selectAllText: "Select all selectable rows",
+    resizeColumnText: "Resize {column} column",
+    moveRowText: "Move row {row}, Alt plus Up or Down to reorder"
   },
   dialog: {
     okText: "OK",

package/dist/es/locale/index.js

@@ -1,4 +1,4 @@
-import { inject as f, computed as g, ref as v } from "vue";
+import { ref as f, inject as g, computed as v } from "vue";
 import c from "./zh-CN.js";
 import L from "./en-US.js";
 const l = {
@@ -15,13 +15,13 @@ const l = {
     t = t[s];
   }
   return typeof t == "string" ? t : void 0;
-}, r = v(m), d = (e) => {
+}, r = f(m), d = (e) => {
   l[e] && (r.value = e);
 }, O = () => r.value, p = Symbol("XLocale"), h = (e, o) => {
   const n = l[r.value] ?? c, t = i(n, e);
   return t === void 0 ? String(e) : u(t, o);
 }, E = () => {
-  const e = f(p, void 0), o = g(() => e != null && e.value ? e.value : l[r.value] ?? c);
+  const e = g(p, void 0), o = v(() => e != null && e.value ? e.value : l[r.value] ?? c);
   return { locale: o, t: (t, s) => {
     const a = i(o.value, t);
     return a === void 0 ? String(t) : u(a, s);

package/dist/es/locale/zh-CN.js

@@ -42,7 +42,13 @@ const e = {
     okText: "确认",
     currentColumnText: "当前列",
     filterLabelText: "筛选{column}",
-    summaryText: "Summary"
+    summaryText: "Summary",
+    expandRowText: "展开行 {row}",
+    collapseRowText: "收起行 {row}",
+    selectRowText: "选择行 {row}",
+    selectAllText: "选择全部可选行",
+    resizeColumnText: "调整{column}列宽",
+    moveRowText: "移动行 {row}，Alt 加上下方向键调整顺序"
   },
   dialog: {
     okText: "确认",