@dazhicheng/ui 1.5.236 → 1.5.237

package/dist/components/tt-form/src/components/FormActions.vue2.js

@@ -9,7 +9,7 @@ import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/en
 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 V } from "../../../tt-button/index.js";
+import { TtButton as P } from "../../../tt-button/index.js";
 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 J } from "../../../../packages/hooks/src/useDesign.js";
 import K from "./ExpandableArrow.vue2.js";
@@ -23,7 +23,7 @@ const de = /* @__PURE__ */ O({
   },
   emits: ["update:modelValue"],
   setup(S, { expose: $ }) {
-    const [n, j] = Q(), c = _(S, "modelValue"), { prefixCls: A } = J("form-submit-btn"), D = E(), h = d(() => ({
+    const [n, j] = Q(), c = _(S, "modelValue"), { prefixCls: V } = J("form-submit-btn"), D = E(), h = d(() => ({
       content: "重置",
       show: !0,
       ...o(n).resetButtonOptions
@@ -44,7 +44,7 @@ const de = /* @__PURE__ */ O({
       const s = F(await t.formApi.getValues()) ?? {};
       await ((a = t.handleSubmit) == null ? void 0 : a.call(t, s));
     }
-    async function P(e) {
+    async function A(e) {
       var s, a;
       e == null || e.preventDefault(), e == null || e.stopPropagation();
       const t = o(n), r = F(await ((s = t.formApi) == null ? void 0 : s.getValues())) ?? {};
@@ -60,7 +60,7 @@ const de = /* @__PURE__ */ O({
       }
       await H();
       const e = D["wrapper-ref"];
-      if (!e) {
+      if (!e || !e.offsetParent) {
         p();
         return;
       }
@@ -133,15 +133,15 @@ const de = /* @__PURE__ */ O({
         o(n).showCollapseButton && z();
       }, 200);
     }), $({
-      handleReset: P,
+      handleReset: A,
       handleSubmit: w
     }), (e, t) => (l(), C("div", {
       class: I(o(G)(N.value))
     }, [
       o(n).actionButtonsReverse ? (l(), C(x, { key: 0 }, [
         m(e.$slots, "submit-before"),
-        i.value.show ? (l(), v(b(o(V)), g({ key: 0 }, i.value, {
-          class: o(A),
+        i.value.show ? (l(), v(b(o(P)), g({ key: 0 }, i.value, {
+          class: o(V),
           type: "primary",
           onClick: w
         }), {
@@ -152,7 +152,7 @@ const de = /* @__PURE__ */ O({
         }, 16, ["class"])) : u("", !0)
       ], 64)) : u("", !0),
       m(e.$slots, "reset-before"),
-      h.value.show ? (l(), v(b(o(V)), g({ key: 1 }, h.value, { onClick: P }), {
+      h.value.show ? (l(), v(b(o(P)), g({ key: 1 }, h.value, { onClick: A }), {
         default: k(() => [
           B(R(h.value.content), 1)
         ]),
@@ -160,10 +160,10 @@ const de = /* @__PURE__ */ O({
       }, 16)) : u("", !0),
       o(n).actionButtonsReverse ? u("", !0) : (l(), C(x, { key: 2 }, [
         m(e.$slots, "submit-before"),
-        i.value.show ? (l(), v(b(o(V)), g({
+        i.value.show ? (l(), v(b(o(P)), g({
           key: 0,
           type: "primary",
-          class: o(A)
+          class: o(V)
         }, i.value, { onClick: w }), {
           default: k(() => [
             B(R(i.value.content), 1)

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.236",
+  "version": "1.5.237",
   "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/hooks": "1.4.44",
-    "@dazhicheng/utils": "1.3.41"
+    "@dazhicheng/utils": "1.3.41",
+    "@dazhicheng/hooks": "1.4.44"
   },
   "files": [
     "dist"