@dazhicheng/ui 1.5.251 → 1.5.253

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

@@ -33,7 +33,7 @@ function ce(e) {
   return u && a.unshift({
     type: "seq",
     title: "序号",
-    width: 60,
+    width: 48,
     resizable: !1,
     align: "center",
     fixed: "left",
@@ -123,7 +123,7 @@ function fe({
   let p = W;
   h.length > 0 && (p = h.includes(s.field)), b.length > 0 && (p = !b.includes(s.field));
   let d = {
-    minWidth: 140,
+    minWidth: 80,
     sortable: p,
     resizable: C,
     ...s

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 → 接口与默认展示配置。
  * 后续扩展航线/舱位等，只需在此追加。

package/dist/hooks/basicDataCodes.js

@@ -1,8 +1,8 @@
-import { getAllBasicAirline as E, getDictItemsByCodes as R, listChainByTypeAirportRegionLevel as C } from "../api/basicData.js";
-import { queryAllRoles as A, pageUser as O } from "../api/dataTypeContext.js";
-import { secondaryDropdownListLossReason as L, primaryDropdownListLossReason as S } from "../api/lossReason.js";
-import { listAllValidSupplierManage as _, getAllConfigListSupplierConfigManage as I } from "../api/supplier.js";
-const u = {
+import { getAllBasicAirline as R, getDictItemsByCodes as O, listChainByTypeAirportRegionLevel as A } from "../api/basicData.js";
+import { queryAllRoles as L, pageUser as I } from "../api/dataTypeContext.js";
+import { secondaryDropdownListLossReason as _, primaryDropdownListLossReason as S } from "../api/lossReason.js";
+import { listAllValidSupplierManage as T, getAllConfigListSupplierConfigManage as b } from "../api/supplier.js";
+const o = {
   AIRLINE: "airline",
   CONTINENT: "continent",
   REGION: "region",
@@ -36,7 +36,7 @@ const u = {
   /** 按供应商名称（配置号） */
   SUPPLIER_MANAGE_NAME: "supplierManageName",
   PINYIN: "pinyin"
-}, b = {
+}, g = {
   [d.CONTINENT]: { codeKey: "continentCode", nameKey: "continentName" },
   [d.REGION]: { codeKey: "regionCode", nameKey: "regionName" },
   [d.COUNTRY]: { codeKey: "countryCode", nameKey: "countryName" },
@@ -47,186 +47,226 @@ const u = {
     nameKey: "supplierManageName",
     labelMode: "name"
   }
-}, g = {
+}, P = {
   TICKETING: "出票",
   REFUND: "退票",
   REBOOK: "改签"
 };
-function k(a, e) {
+function H(a, e) {
   if (!Array.isArray(a) || !a.length) return a || [];
   if (e === d.PINYIN) return a;
-  const n = b[e];
-  if (!n) return a;
-  const r = /* @__PURE__ */ new Map(), s = [], l = n.labelMode || "codeName";
-  return a.forEach((t) => {
-    const o = t[n.codeKey], f = o != null && o !== "", i = f ? String(o) : "__unknown__";
-    if (!r.has(i)) {
+  const r = g[e];
+  if (!r) return a;
+  const l = /* @__PURE__ */ new Map(), s = [], n = r.labelMode || "codeName";
+  return a.forEach((u) => {
+    const t = u[r.codeKey], c = t != null && t !== "", i = c ? String(t) : "__unknown__";
+    if (!l.has(i)) {
       s.push(i);
-      const c = t[n.nameKey];
-      let y = "未知";
-      f && (l === "name" ? y = c != null && String(c) !== "" ? String(c) : String(o) : y = `${o}(${c || ""})`), r.set(i, {
-        label: y,
-        value: f ? o : "__unknown__",
+      const f = u[r.nameKey];
+      let E = "未知";
+      c && (n === "name" ? E = f != null && String(f) !== "" ? String(f) : String(t) : E = `${t}(${f || ""})`), l.set(i, {
+        label: E,
+        value: c ? t : "__unknown__",
         children: []
       });
     }
-    r.get(i).children.push(t);
-  }), s.map((t) => r.get(t));
+    l.get(i).children.push(u);
+  }), s.map((u) => l.get(u));
 }
-function V(a, e) {
-  return e || (a === u.AIRPORT ? d.COUNTRY : a === u.LOSS_REASON ? d.BUSINESS_TYPE : a === u.LOSS_REASON_SECONDARY ? d.PRIMARY_REASON : a === u.SUPPLIER_CONFIG ? d.SUPPLIER_MANAGE_NAME : d.PINYIN);
+function W(a, e) {
+  return e || (a === o.AIRPORT ? d.COUNTRY : a === o.LOSS_REASON ? d.BUSINESS_TYPE : a === o.LOSS_REASON_SECONDARY ? d.PRIMARY_REASON : a === o.SUPPLIER_CONFIG ? d.SUPPLIER_MANAGE_NAME : d.PINYIN);
 }
-const P = {
+const h = {
   1: { codeKey: "continentCode", nameKey: "continentName", statusKey: "continentStatus" },
   2: { codeKey: "regionCode", nameKey: "regionName", statusKey: "regionStatus" },
   3: { codeKey: "countryCode", nameKey: "countryName", statusKey: "countryStatus" },
   4: { codeKey: "cityCode", nameKey: "cityName", statusKey: "cityStatus" },
   5: { codeKey: "airportCode", nameKey: "airportName", statusKey: "airportStatus" }
 };
-function T(a = []) {
+function v(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => e == null ? void 0 : e.airlineCode).map((e) => ({
     ...e,
     label: `${e.airlineCode}(${e.airlineNameCn || ""})`,
     value: e.airlineCode
   }));
 }
-function h(a) {
+function K(a) {
   if (!a || typeof a != "object" || Array.isArray(a))
     return a || {};
-  const e = a.continentCode || a.regionCode || a.countryCode || a.cityCode || a.airportCode, n = [1, 2, 3, 4, 5].some((t) => a[String(t)] || a[t]);
-  if (e && !n)
+  const e = a.continentCode || a.regionCode || a.countryCode || a.cityCode || a.airportCode, r = [1, 2, 3, 4, 5].some((u) => a[String(u)] || a[u]);
+  if (e && !r)
     return a;
-  let r = {}, s = 0;
-  for (const t of [1, 2, 3, 4, 5]) {
-    const o = a[String(t)] || a[t];
-    if (!o || typeof o != "object") continue;
-    const f = Number(o.type ?? t);
-    f >= s && (s = f, r = o);
+  let l = {}, s = 0;
+  for (const u of [1, 2, 3, 4, 5]) {
+    const t = a[String(u)] || a[u];
+    if (!t || typeof t != "object") continue;
+    const c = Number(t.type ?? u);
+    c >= s && (s = c, l = t);
   }
-  const l = { ...r };
-  for (const t of [1, 2, 3, 4, 5]) {
-    const o = a[String(t)] || a[t];
-    if (!o || typeof o != "object") continue;
-    const { codeKey: f, nameKey: i, statusKey: c } = P[t];
-    o.code !== void 0 && o.code !== null && o.code !== "" && (l[f] = o.code), o.name !== void 0 && (l[i] = o.name), o.status !== void 0 && (l[c] = o.status);
+  const n = { ...l };
+  for (const u of [1, 2, 3, 4, 5]) {
+    const t = a[String(u)] || a[u];
+    if (!t || typeof t != "object") continue;
+    const { codeKey: c, nameKey: i, statusKey: f } = h[u];
+    t.code !== void 0 && t.code !== null && t.code !== "" && (n[c] = t.code), t.name !== void 0 && (n[i] = t.name), t.status !== void 0 && (n[f] = t.status);
   }
-  return l;
+  return n;
 }
 function M(a) {
-  return (Array.isArray(a) ? a : []).map((n) => h(n || {}));
+  return (Array.isArray(a) ? a : []).map((r) => K(r || {}));
 }
-function v(a = [], e, n) {
-  return (Array.isArray(a) ? a : []).filter((r) => r == null ? void 0 : r[e]).map((r) => ({
-    ...r,
-    label: `${r[e]}(${r[n] || ""})`,
-    value: r[e]
+function w(a = [], e, r) {
+  return (Array.isArray(a) ? a : []).filter((l) => l == null ? void 0 : l[e]).map((l) => ({
+    ...l,
+    label: `${l[e]}(${l[r] || ""})`,
+    value: l[e]
   }));
 }
-function p(a, e, n) {
+const Y = [o.CONTINENT, o.REGION, o.COUNTRY, o.CITY, o.AIRPORT], y = {
+  [o.CONTINENT]: 1,
+  [o.REGION]: 2,
+  [o.COUNTRY]: 3,
+  [o.CITY]: 4,
+  [o.AIRPORT]: 5
+}, U = {
+  [o.CONTINENT]: { codeKey: "continentCode", nameKey: "continentName" },
+  [o.REGION]: { codeKey: "regionCode", nameKey: "regionName" },
+  [o.COUNTRY]: { codeKey: "countryCode", nameKey: "countryName" },
+  [o.CITY]: { codeKey: "cityCode", nameKey: "cityName" },
+  [o.AIRPORT]: { codeKey: "airportCode", nameKey: "airportName" }
+};
+o.CONTINENT, o.REGION, o.COUNTRY, o.CITY;
+function N(a) {
+  return Y.includes(a);
+}
+function J(a, e) {
+  return !N(a) || !N(e) ? !1 : y[a] > y[e];
+}
+function Q(a, e) {
+  if (!N(e)) return [];
+  const { codeKey: r, nameKey: l } = U[e], s = /* @__PURE__ */ new Map();
+  return (Array.isArray(a) ? a : []).forEach((n) => {
+    const u = n == null ? void 0 : n[r];
+    if (u == null || u === "") return;
+    const t = String(u);
+    s.has(t) || s.set(t, {
+      ...n,
+      label: `${u}(${n[l] || ""})`,
+      value: u
+    });
+  }), Array.from(s.values());
+}
+function X(a) {
+  let e;
+  for (const r of a)
+    N(r) && (!e || y[r] > y[e]) && (e = r);
+  return e;
+}
+function p(a, e, r) {
   return async () => {
     try {
-      const r = await C({ type: a });
-      return v(M(r), e, n);
+      const l = await A({ type: a });
+      return w(M(l), e, r);
     } catch {
       return [];
     }
   };
 }
-function w(a = []) {
+function D(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => (e == null ? void 0 : e.itemCode) !== void 0 && (e == null ? void 0 : e.itemCode) !== null && (e == null ? void 0 : e.itemCode) !== "").map((e) => ({
     ...e,
     label: e.itemName || "",
     value: e.itemCode
   }));
 }
-function K(a = []) {
-  const e = Array.isArray(a) ? a : [], n = new Set(
-    e.map((l) => l.parentItemCode).filter((l) => l != null && String(l) !== "").map(String)
-  ), r = new Set(
-    e.filter((l) => (l == null ? void 0 : l.itemCode) !== void 0 && (l == null ? void 0 : l.itemCode) !== null && (l == null ? void 0 : l.itemCode) !== "").map((l) => String(l.itemCode))
-  ), s = e.filter((l) => (l == null ? void 0 : l.itemCode) !== void 0 && (l == null ? void 0 : l.itemCode) !== null && (l == null ? void 0 : l.itemCode) !== "").map((l) => {
-    const t = String(l.itemCode), o = l.itemName || "";
+function F(a = []) {
+  const e = Array.isArray(a) ? a : [], r = new Set(
+    e.map((n) => n.parentItemCode).filter((n) => n != null && String(n) !== "").map(String)
+  ), l = new Set(
+    e.filter((n) => (n == null ? void 0 : n.itemCode) !== void 0 && (n == null ? void 0 : n.itemCode) !== null && (n == null ? void 0 : n.itemCode) !== "").map((n) => String(n.itemCode))
+  ), s = e.filter((n) => (n == null ? void 0 : n.itemCode) !== void 0 && (n == null ? void 0 : n.itemCode) !== null && (n == null ? void 0 : n.itemCode) !== "").map((n) => {
+    const u = String(n.itemCode), t = n.itemName || "";
     return {
-      ...l,
-      label: n.has(t) ? `${t}(${o})` : o,
-      value: t
+      ...n,
+      label: r.has(u) ? `${u}(${t})` : t,
+      value: u
     };
   });
-  return n.forEach((l) => {
-    r.has(l) || s.push({
-      itemCode: l,
-      itemName: l,
-      label: l,
-      value: l,
+  return r.forEach((n) => {
+    l.has(n) || s.push({
+      itemCode: n,
+      itemName: n,
+      label: n,
+      value: n,
       parentItemCode: null
     });
   }), s;
 }
-function N(a, e = w) {
-  return async (n) => {
+function C(a, e = D) {
+  return async (r) => {
     try {
-      const r = await R({
+      const l = await O({
         dictCodeList: [a],
-        permissionOnlyCode: n == null ? void 0 : n.permissionOnlyCode
-      }), s = (r == null ? void 0 : r[a]) || [];
+        permissionOnlyCode: r == null ? void 0 : r.permissionOnlyCode
+      }), s = (l == null ? void 0 : l[a]) || [];
       return e(s);
     } catch {
       return [];
     }
   };
 }
-function Y(a = []) {
+function G(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => (e == null ? void 0 : e.id) !== void 0 && (e == null ? void 0 : e.id) !== null).map((e) => ({
     ...e,
     label: e.fullName || e.username || String(e.id),
     value: e.id
   }));
 }
-function F(a = []) {
+function m(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => (e == null ? void 0 : e.id) !== void 0 && (e == null ? void 0 : e.id) !== null).map((e) => ({
     ...e,
     label: e.roleName || e.roleCode || String(e.id),
     value: e.id
   }));
 }
-function D(a = []) {
+function x(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => (e == null ? void 0 : e.id) !== void 0 && (e == null ? void 0 : e.id) !== null).map((e) => {
-    const n = e.businessType || "";
+    const r = e.businessType || "";
     return {
       ...e,
-      businessTypeName: g[n] || n,
+      businessTypeName: P[r] || r,
       label: e.reasonName || "",
       value: e.id
     };
   });
 }
-function U(a = [], e = /* @__PURE__ */ new Map()) {
-  return (Array.isArray(a) ? a : []).filter((n) => (n == null ? void 0 : n.id) !== void 0 && (n == null ? void 0 : n.id) !== null).map((n) => {
-    const r = n.primaryReasonId, s = (r != null ? e.get(r) : void 0) || (r != null ? String(r) : "");
+function B(a = [], e = /* @__PURE__ */ new Map()) {
+  return (Array.isArray(a) ? a : []).filter((r) => (r == null ? void 0 : r.id) !== void 0 && (r == null ? void 0 : r.id) !== null).map((r) => {
+    const l = r.primaryReasonId, s = (l != null ? e.get(l) : void 0) || (l != null ? String(l) : "");
     return {
-      ...n,
+      ...r,
       primaryReasonName: s,
-      label: n.reasonName || "",
-      value: n.id
+      label: r.reasonName || "",
+      value: r.id
     };
   });
 }
-function G(a = []) {
+function $(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => e == null ? void 0 : e.supplierConfigPcc).map((e) => ({
     ...e,
     label: e.supplierConfigPcc,
     value: e.supplierConfigPcc
   }));
 }
-function x(a = []) {
+function V(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => e == null ? void 0 : e.supplierCode).map((e) => ({
     ...e,
     label: e.supplierName || e.supplierCode,
     value: e.supplierCode
   }));
 }
-const q = {
-  [u.AIRLINE]: {
+const Z = {
+  [o.AIRLINE]: {
     defaultFieldName: "airlineCodes",
     defaultLabel: "航司",
     defaultExcludeLabel: "排除航司",
@@ -234,14 +274,14 @@ const q = {
     defaultShowAll: !0,
     async fetchOptions() {
       try {
-        const a = await E();
-        return T(a || []);
+        const a = await R();
+        return v(a || []);
       } catch {
         return [];
       }
     }
   },
-  [u.CONTINENT]: {
+  [o.CONTINENT]: {
     defaultFieldName: "continentCodes",
     defaultLabel: "洲",
     defaultExcludeLabel: "排除洲",
@@ -249,7 +289,7 @@ const q = {
     defaultShowAll: !1,
     fetchOptions: p(1, "continentCode", "continentName")
   },
-  [u.REGION]: {
+  [o.REGION]: {
     defaultFieldName: "regionCodes",
     defaultLabel: "区域",
     defaultExcludeLabel: "排除区域",
@@ -257,7 +297,7 @@ const q = {
     defaultShowAll: !1,
     fetchOptions: p(2, "regionCode", "regionName")
   },
-  [u.COUNTRY]: {
+  [o.COUNTRY]: {
     defaultFieldName: "countryCodes",
     defaultLabel: "国家",
     defaultExcludeLabel: "排除国家",
@@ -265,7 +305,7 @@ const q = {
     defaultShowAll: !1,
     fetchOptions: p(3, "countryCode", "countryName")
   },
-  [u.CITY]: {
+  [o.CITY]: {
     defaultFieldName: "cityCodes",
     defaultLabel: "城市",
     defaultExcludeLabel: "排除城市",
@@ -273,7 +313,7 @@ const q = {
     defaultShowAll: !1,
     fetchOptions: p(4, "cityCode", "cityName")
   },
-  [u.AIRPORT]: {
+  [o.AIRPORT]: {
     defaultFieldName: "airportCodes",
     defaultLabel: "机场",
     defaultExcludeLabel: "排除机场",
@@ -281,7 +321,7 @@ const q = {
     defaultShowAll: !1,
     fetchOptions: p(5, "airportCode", "airportName")
   },
-  [u.SALES_ORDER_TYPE]: {
+  [o.SALES_ORDER_TYPE]: {
     defaultFieldName: "orderType",
     defaultLabel: "订单类型",
     defaultExcludeLabel: "排除订单类型",
@@ -294,9 +334,9 @@ const q = {
       valueField: "value",
       parentField: "parentItemCode"
     },
-    fetchOptions: N(u.SALES_ORDER_TYPE, K)
+    fetchOptions: C(o.SALES_ORDER_TYPE, F)
   },
-  [u.SALES_ORDER_PRODUCT_TYPE]: {
+  [o.SALES_ORDER_PRODUCT_TYPE]: {
     defaultFieldName: "productType",
     defaultLabel: "产品类型",
     defaultExcludeLabel: "排除产品类型",
@@ -308,9 +348,9 @@ const q = {
       valueField: "itemCode",
       parentField: "parentItemCode"
     },
-    fetchOptions: N(u.SALES_ORDER_PRODUCT_TYPE)
+    fetchOptions: C(o.SALES_ORDER_PRODUCT_TYPE)
   },
-  [u.USER]: {
+  [o.USER]: {
     defaultFieldName: "userIds",
     defaultLabel: "用户",
     defaultExcludeLabel: "排除用户",
@@ -318,14 +358,14 @@ const q = {
     defaultShowAll: !1,
     async fetchOptions() {
       try {
-        const a = await O({ pageNo: 1, pageSize: 9999 });
-        return Y((a == null ? void 0 : a.records) || []);
+        const a = await I({ pageNo: 1, pageSize: 9999 });
+        return G((a == null ? void 0 : a.records) || []);
       } catch {
         return [];
       }
     }
   },
-  [u.ROLE]: {
+  [o.ROLE]: {
     defaultFieldName: "roleIds",
     defaultLabel: "角色",
     defaultExcludeLabel: "排除角色",
@@ -333,14 +373,14 @@ const q = {
     defaultShowAll: !1,
     async fetchOptions() {
       try {
-        const a = await A();
-        return F(a || []);
+        const a = await L();
+        return m(a || []);
       } catch {
         return [];
       }
     }
   },
-  [u.LOSS_REASON]: {
+  [o.LOSS_REASON]: {
     defaultFieldName: "lossReasonIds",
     defaultLabel: "亏损原因",
     defaultExcludeLabel: "排除亏损原因",
@@ -349,13 +389,13 @@ const q = {
     async fetchOptions() {
       try {
         const a = await S();
-        return D(a || []);
+        return x(a || []);
       } catch {
         return [];
       }
     }
   },
-  [u.LOSS_REASON_SECONDARY]: {
+  [o.LOSS_REASON_SECONDARY]: {
     defaultFieldName: "lossReasonSecondaryIds",
     defaultLabel: "亏损原因细类",
     defaultExcludeLabel: "排除亏损原因细类",
@@ -364,18 +404,18 @@ const q = {
     async fetchOptions() {
       try {
         const [a, e] = await Promise.all([
-          L(),
+          _(),
           S()
-        ]), n = /* @__PURE__ */ new Map();
-        return (e || []).forEach((r) => {
-          (r == null ? void 0 : r.id) !== void 0 && (r == null ? void 0 : r.id) !== null && n.set(r.id, r.reasonName || String(r.id));
-        }), U(a || [], n);
+        ]), r = /* @__PURE__ */ new Map();
+        return (e || []).forEach((l) => {
+          (l == null ? void 0 : l.id) !== void 0 && (l == null ? void 0 : l.id) !== null && r.set(l.id, l.reasonName || String(l.id));
+        }), B(a || [], r);
       } catch {
         return [];
       }
     }
   },
-  [u.SUPPLIER_CONFIG]: {
+  [o.SUPPLIER_CONFIG]: {
     defaultFieldName: "supplierConfigPccs",
     defaultLabel: "配置号",
     defaultExcludeLabel: "排除配置号",
@@ -383,14 +423,14 @@ const q = {
     defaultShowAll: !1,
     async fetchOptions() {
       try {
-        const a = await I({});
-        return G(a || []);
+        const a = await b({});
+        return $(a || []);
       } catch {
         return [];
       }
     }
   },
-  [u.SUPPLIER]: {
+  [o.SUPPLIER]: {
     defaultFieldName: "supplierCodes",
     defaultLabel: "供应商",
     defaultExcludeLabel: "排除供应商",
@@ -398,8 +438,8 @@ const q = {
     defaultShowAll: !1,
     async fetchOptions() {
       try {
-        const a = await _();
-        return x(a || []);
+        const a = await T();
+        return V(a || []);
       } catch {
         return [];
       }
@@ -407,9 +447,14 @@ const q = {
   }
 };
 export {
-  u as CODES,
-  q as CODE_REGISTRY,
+  o as CODES,
+  Z as CODE_REGISTRY,
+  Y as GEO_LEVEL_CODES,
   d as GROUP_BY,
-  k as groupBasicDataOptions,
-  V as resolveDefaultGroupBy
+  J as canDeriveGeoLevel,
+  Q as deriveRegionLevelOptionsFromGeoSource,
+  H as groupBasicDataOptions,
+  N as isGeoLevelCode,
+  W as resolveDefaultGroupBy,
+  X as resolveHighestGeoLevelCode
 };

package/dist/hooks/useBasicDataOptions.d.ts

@@ -9,6 +9,7 @@ export interface UseBasicDataOptionsParams {
 /**
  * 按基础数据 code 拉取并缓存 options。
  * 接口失败或返回非数组时兜底为空数组，不影响表单 schema 生成与渲染。
+ * 同页已有更细地理层级时，上级（洲/区域/国家/城市）由其扁平字段派生，避免重复 listChainByType。
  *
  * @example
  * ```ts

package/dist/hooks/useBasicDataOptions.js

@@ -1,112 +1,147 @@
-import { ref as P, watchEffect as R, unref as D, watch as q, computed as x } from "vue";
-import { useRoute as M } from "vue-router";
-import { CODE_REGISTRY as b } from "./basicDataCodes.js";
-const n = /* @__PURE__ */ new Map(), C = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map();
-function p(c) {
-  return Array.isArray(c) ? c : [];
+import { ref as A, watchEffect as M, unref as C, watch as _, computed as F } from "vue";
+import { useRoute as K } from "vue-router";
+import { GEO_LEVEL_CODES as E, canDeriveGeoLevel as R, deriveRegionLevelOptionsFromGeoSource as T, resolveHighestGeoLevelCode as L, isGeoLevelCode as G, CODE_REGISTRY as V } from "./basicDataCodes.js";
+const o = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
+function v(t) {
+  return Array.isArray(t) ? t : [];
 }
-function E(c) {
-  return c.reduce((u, y) => (u[y] = [], u), {});
+function b(t) {
+  return t.reduce((n, l) => (n[l] = [], n), {});
 }
-function _(c) {
-  const u = M(), y = P({});
-  function i(r = {}) {
-    y.value = c.codes.reduce(
-      (e, t) => (e[t] = p(r[t]), e),
+function O(t, n) {
+  return Object.prototype.hasOwnProperty.call(t, n);
+}
+function q(t) {
+  return L(E.filter((n) => O(t, n)));
+}
+function y(t) {
+  const n = q(t);
+  if (!n) return t;
+  const l = t[n];
+  if (!Array.isArray(l)) return t;
+  const u = { ...t };
+  let d = !1;
+  return E.forEach((i) => {
+    R(n, i) && (O(u, i) || (u[i] = T(l, i), d = !0));
+  }), d ? u : t;
+}
+function j(t, n) {
+  const l = q(n), u = t.filter(G), d = l || L(u) || void 0;
+  return d ? t.filter((i) => G(i) ? !(R(d, i) || i === d && O(n, d)) : !0) : t;
+}
+function k(t) {
+  const n = K(), l = A({});
+  function u(s = {}) {
+    l.value = t.codes.reduce(
+      (e, r) => (e[r] = v(s[r]), e),
       {}
     );
   }
-  i();
-  async function O(r) {
-    var s;
-    const e = (s = u.meta) == null ? void 0 : s.permissionOnlyCode;
+  u();
+  async function d(s) {
+    var h;
+    const e = (h = n.meta) == null ? void 0 : h.permissionOnlyCode;
     return (await Promise.allSettled(
-      r.map(async (a) => {
+      s.map(async (c) => {
         try {
-          const f = await b[a].fetchOptions({ permissionOnlyCode: e });
-          return [a, p(f)];
+          const p = await V[c].fetchOptions({ permissionOnlyCode: e });
+          return [c, v(p)];
         } catch {
-          return [a, []];
+          return [c, []];
         }
       })
-    )).reduce((a, o, f) => {
-      const l = r[f];
-      return o.status === "fulfilled" ? a[o.value[0]] = p(o.value[1]) : a[l] = [], a;
+    )).reduce((c, f, p) => {
+      const S = s[p];
+      return f.status === "fulfilled" ? c[f.value[0]] = v(f.value[1]) : c[S] = [], c;
     }, {});
   }
-  async function w(r = !1) {
-    const e = u.path;
-    let t = [];
+  async function i(s = !1) {
+    const e = n.path;
+    let r = [];
     try {
-      const s = D(c.dataSource);
-      if (s) {
-        const m = { ...n.get(e) || {}, ...s };
-        n.set(e, m), i(m);
+      const h = C(t.dataSource);
+      if (h) {
+        let a = { ...o.get(e) || {}, ...h };
+        a = y(a), o.set(e, a), u(a);
         return;
       }
-      const a = n.get(e) || {};
-      if (t = r ? [...c.codes] : c.codes.filter((d) => !Object.prototype.hasOwnProperty.call(a, d)), !t.length) {
-        i(a);
+      let c = y(o.get(e) || {});
+      if (c !== (o.get(e) || {}) && o.set(e, c), r = s ? [...t.codes] : t.codes.filter((a) => !O(c, a)), !r.length) {
+        u(c);
         return;
       }
-      const o = r ? void 0 : C.get(e);
-      if (o)
+      const f = s ? void 0 : D.get(e);
+      if (f)
         try {
-          const d = await o, h = { ...n.get(e) || {}, ...d };
-          if (n.set(e, h), t = c.codes.filter((v) => !Object.prototype.hasOwnProperty.call(h, v)), !t.length) {
-            i(h);
+          const a = await f, g = y({
+            ...o.get(e) || {},
+            ...a
+          });
+          if (o.set(e, g), r = t.codes.filter((P) => !O(g, P)), !r.length) {
+            u(g);
             return;
           }
+          c = g;
         } catch {
         }
-      const f = O(t), l = (g.get(e) || 0) + 1;
-      g.set(e, l), C.set(e, f);
+      const p = j(r, c);
+      if (!p.length) {
+        const a = y(c);
+        o.set(e, a), u(a);
+        return;
+      }
+      const S = d(p), w = (m.get(e) || 0) + 1;
+      m.set(e, w), D.set(e, S);
       try {
-        const d = await f;
-        if (g.get(e) !== l) return;
-        const h = { ...n.get(e) || {}, ...d };
-        n.set(e, h), i(h);
+        const a = await S;
+        if (m.get(e) !== w) return;
+        let g = {
+          ...o.get(e) || {},
+          ...a
+        };
+        g = y(g), o.set(e, g), u(g);
       } finally {
-        g.get(e) === l && C.delete(e);
+        m.get(e) === w && D.delete(e);
       }
     } catch {
-      const s = E(t.length ? t : c.codes), o = { ...n.get(e) || {}, ...s };
-      n.set(e, o), i(o);
+      const h = b(r.length ? r : t.codes), f = { ...o.get(e) || {}, ...h };
+      o.set(e, f), u(f);
     }
   }
-  async function S() {
-    const r = u.path;
-    C.clear(), n.clear(), g.clear(), n.delete(r), await w(!0);
+  async function x() {
+    const s = n.path;
+    D.clear(), o.clear(), m.clear(), o.delete(s), await i(!0);
   }
-  return R(() => {
-    const r = D(c.dataSource);
-    if (!r) return;
-    const e = u.path, s = { ...n.get(e) || {}, ...r };
-    n.set(e, s), i(s);
-  }), q(
-    () => u.path,
+  return M(() => {
+    const s = C(t.dataSource);
+    if (!s) return;
+    const e = n.path;
+    let r = { ...o.get(e) || {}, ...s };
+    r = y(r), o.set(e, r), u(r);
+  }), _(
+    () => n.path,
     () => {
-      w();
+      i();
     },
     { immediate: !0 }
   ), {
-    dataSource: x(() => {
-      const r = c.codes.reduce(
-        (e, t) => (e[t] = p(y.value[t]), e),
+    dataSource: F(() => {
+      const s = t.codes.reduce(
+        (e, r) => (e[r] = v(l.value[r]), e),
         {}
       );
-      return new Proxy(r, {
-        get(e, t) {
-          return typeof t != "string" ? [] : p(r[t]);
+      return new Proxy(s, {
+        get(e, r) {
+          return typeof r != "string" ? [] : v(s[r]);
         },
         set() {
           return !1;
         }
       });
     }),
-    reload: S
+    reload: x
   };
 }
 export {
-  _ as useBasicDataOptions
+  k as useBasicDataOptions
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.251",
+  "version": "1.5.253",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",