@dazhicheng/ui 1.5.237 → 1.5.239

package/dist/components/tt-form/src/form-render/expandable.js

@@ -1,46 +1,48 @@
-import { useTemplateRef as b, ref as f, computed as k, watch as x, nextTick as m, onMounted as C } from "vue";
-import { useElementVisibility as B, useBreakpoints as I, breakpointsTailwind as S } from "@vueuse/core";
-function M(o) {
-  const n = b("wrapperRef"), w = B(n), i = f({}), r = f(!1), d = I(S), v = k(() => {
-    const e = o.collapsedRows ?? 1, t = i.value;
-    let s = 0;
-    for (let a = 1; a <= e; a++)
-      s += (t == null ? void 0 : t[a]) ?? 0;
-    return s - 1 || 1;
+import { useTemplateRef as y, ref as m, computed as b, watch as x, nextTick as f, onMounted as k } from "vue";
+import { useElementVisibility as C, useBreakpoints as B, breakpointsTailwind as I } from "@vueuse/core";
+function H(t) {
+  const a = y("wrapperRef"), w = C(a), i = m({}), s = m(!1), d = B(I), g = b(() => {
+    const e = t.collapsedRows ?? 1, l = i.value;
+    let o = 0;
+    for (let n = 1; n <= e; n++)
+      o += (l == null ? void 0 : l[n]) ?? 0;
+    return Math.max(o - 1, 1);
   });
   x(
     [
-      () => o.showCollapseButton,
+      () => t.showCollapseButton,
       () => d.active().value,
       () => {
         var e;
-        return (e = o.schema) == null ? void 0 : e.length;
+        return (e = t.schema) == null ? void 0 : e.length;
       },
       () => w.value
     ],
     async ([e]) => {
-      e && (await m(), i.value = {}, r.value = !1, await c());
+      e && (await f(), i.value = {}, s.value = !1, await c());
     }
   );
   async function c() {
-    if (!o.showCollapseButton || (await m(), !n.value))
+    if (!t.showCollapseButton || (await f(), !a.value))
       return;
-    const e = Array.from(n.value.children), t = n.value, a = window.getComputedStyle(t).getPropertyValue("grid-template-rows").split(" "), g = t == null ? void 0 : t.getBoundingClientRect();
-    e.forEach((p) => {
-      const R = p.getBoundingClientRect().top - g.top;
-      let l = 0, u = 0;
-      for (const [h, y] of a.entries())
-        if (u += Number.parseFloat(y), R < u) {
-          l = h + 1;
+    const e = a.value, o = window.getComputedStyle(e).getPropertyValue("grid-template-rows").split(" "), n = e == null ? void 0 : e.getBoundingClientRect();
+    if (o[0] === "none" || n.height === 0)
+      return;
+    Array.from(e.children).forEach((h) => {
+      const p = h.getBoundingClientRect().top - n.top;
+      let r = 0, u = 0;
+      for (const [v, R] of o.entries())
+        if (u += Number.parseFloat(R), p < u) {
+          r = v + 1;
           break;
         }
-      l > ((o == null ? void 0 : o.collapsedRows) ?? 1) || (i.value[l] = (i.value[l] ?? 0) + 1, r.value = !0);
+      r > ((t == null ? void 0 : t.collapsedRows) ?? 1) || (i.value[r] = (i.value[r] ?? 0) + 1, s.value = !0);
     });
   }
-  return C(() => {
+  return k(() => {
     c();
-  }), { isCalculated: r, keepFormItemIndex: v, wrapperRef: n };
+  }), { isCalculated: s, keepFormItemIndex: g, wrapperRef: a };
 }
 export {
-  M as useExpandable
+  H as useExpandable
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.237",
+  "version": "1.5.239",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -67,8 +67,8 @@
     "vue-router": "^5.0.2",
     "vxe-pc-ui": "^4.12.36",
     "vxe-table": "^4.17.48",
-    "@dazhicheng/utils": "1.3.41",
-    "@dazhicheng/hooks": "1.4.44"
+    "@dazhicheng/hooks": "1.4.45",
+    "@dazhicheng/utils": "1.3.42"
   },
   "files": [
     "dist"