@dazhicheng/ui 1.5.252 → 1.5.254

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

@@ -23,7 +23,7 @@ const de = /* @__PURE__ */ O({
   },
   emits: ["update:modelValue"],
   setup(S, { expose: $ }) {
-    const [n, j] = Q(), c = _(S, "modelValue"), { prefixCls: V } = J("form-submit-btn"), D = E(), h = d(() => ({
+    const [n, j] = Q(), c = _(S, "modelValue"), { prefixCls: V } = J("form-submit-btn"), D = E(), w = d(() => ({
       content: "重置",
       show: !0,
       ...o(n).resetButtonOptions
@@ -32,7 +32,7 @@ const de = /* @__PURE__ */ O({
       show: !0,
       ...o(n).submitButtonOptions
     })), f = L(!1), T = d(() => o(n).showCollapseButton && f.value);
-    async function w(e) {
+    async function h(e) {
       var a;
       e == null || e.preventDefault(), e == null || e.stopPropagation();
       const t = o(n);
@@ -83,7 +83,7 @@ const de = /* @__PURE__ */ O({
           const y = a.getBoundingClientRect();
           y.top !== 0 && s.add(y.top);
         }
-        s.size === 1 ? p() : f.value = !0;
+        s.size <= (o(n).collapsedRows ?? 1) ? p() : f.value = !0;
       }
     }
     M(
@@ -134,7 +134,7 @@ const de = /* @__PURE__ */ O({
       }, 200);
     }), $({
       handleReset: A,
-      handleSubmit: w
+      handleSubmit: h
     }), (e, t) => (l(), C("div", {
       class: I(o(G)(N.value))
     }, [
@@ -143,7 +143,7 @@ const de = /* @__PURE__ */ O({
         i.value.show ? (l(), v(b(o(P)), g({ key: 0 }, i.value, {
           class: o(V),
           type: "primary",
-          onClick: w
+          onClick: h
         }), {
           default: k(() => [
             B(R(i.value.content), 1)
@@ -152,9 +152,9 @@ const de = /* @__PURE__ */ O({
         }, 16, ["class"])) : u("", !0)
       ], 64)) : u("", !0),
       m(e.$slots, "reset-before"),
-      h.value.show ? (l(), v(b(o(P)), g({ key: 1 }, h.value, { onClick: A }), {
+      w.value.show ? (l(), v(b(o(P)), g({ key: 1 }, w.value, { onClick: A }), {
         default: k(() => [
-          B(R(h.value.content), 1)
+          B(R(w.value.content), 1)
         ]),
         _: 1
       }, 16)) : u("", !0),
@@ -164,7 +164,7 @@ const de = /* @__PURE__ */ O({
           key: 0,
           type: "primary",
           class: o(V)
-        }, i.value, { onClick: w }), {
+        }, i.value, { onClick: h }), {
           default: k(() => [
             B(R(i.value.content), 1)
           ]),

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

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

package/dist/hooks/basicDataCodes.d.ts

@@ -91,6 +91,28 @@ export type BasicDataCodeRegistryItem = {
     /** 拉取并归一化为 label/value 选项 */
     fetchOptions: (ctx?: BasicDataFetchContext) => Promise<BasicDataOption[]>;
 };
+/**
+ * 地理层级（数字越大越细）。
+ * 更细层级的扁平字段已含上级 code/name，可去重派生上级，避免同页重复请求。
+ * 机场 → 城市/国家/区域/洲；城市 → 国家/区域/洲；国家 → 区域/洲；区域 → 洲
+ */
+export declare const GEO_LEVEL_CODES: readonly ["continent", "region", "country", "city", "airport"];
+export type GeoLevelCode = (typeof GEO_LEVEL_CODES)[number];
+/** @deprecated 使用 GEO_LEVEL_CODES；保留兼容「从机场可派生」语义 */
+export declare const GEO_CODES_DERIVABLE_FROM_AIRPORT: readonly ["continent", "region", "country", "city"];
+export declare function isGeoLevelCode(code: BasicDataCode): code is GeoLevelCode;
+export declare function isGeoCodeDerivableFromAirport(code: BasicDataCode): boolean;
+/** source 是否可派生 target（source 更细） */
+export declare function canDeriveGeoLevel(source: BasicDataCode, target: BasicDataCode): boolean;
+/**
+ * 从任一地理层级 options 去重生成更粗层级 options。
+ * 扁平字段已含 continentCode / regionCode / countryCode / cityCode 等。
+ */
+export declare function deriveRegionLevelOptionsFromGeoSource(sourceOptions: BasicDataOption[], targetCode: BasicDataCode): BasicDataOption[];
+/** @deprecated 使用 deriveRegionLevelOptionsFromGeoSource */
+export declare function deriveRegionLevelOptionsFromAirports(airports: BasicDataOption[], code: BasicDataCode): BasicDataOption[];
+/** 在候选 code 中取最细的地理层级（机场 > 城市 > 国家 > 区域 > 洲） */
+export declare function resolveHighestGeoLevelCode(codes: Iterable<BasicDataCode>): GeoLevelCode | undefined;
 /**
  * code → 接口与默认展示配置。
  * 后续扩展航线/舱位等，只需在此追加。