@dazhicheng/ui 1.5.244 → 1.5.246

package/dist/api/basicData.d.ts

@@ -4,8 +4,16 @@ export type BasicAirlineItem = {
     airlineNameCn?: string;
     [key: string]: any;
 };
-/** 机场区域完整信息 */
+/** 机场区域完整信息（洲/区域/国家/城市/机场） */
 export type AirportRegionItem = {
+    continentCode?: string;
+    continentName?: string;
+    regionCode?: string;
+    regionName?: string;
+    countryCode?: string;
+    countryName?: string;
+    cityCode?: string;
+    cityName?: string;
     airportCode?: string;
     airportName?: string;
     [key: string]: any;
@@ -14,10 +22,37 @@ export type AirportRegionItem = {
 export declare function getAllBasicAirline(options?: {
     [key: string]: any;
 }): Promise<BasicAirlineItem[]>;
-/** 根据代码查询区域机场完整层级信息 POST /airportRegionLevel/getByCode */
-export declare function getByCodeAirportRegionLevel(body: {
-    type?: number;
-    codes?: string[];
+/**
+ * 按类型查询区域机场链路列表 GET /airportRegionLevel/listChainByType
+ * type：1-洲，2-区域，3-国家，4-城市，5-机场
+ */
+export declare function listChainByTypeAirportRegionLevel(params: {
+    type: number;
 }, options?: {
     [key: string]: any;
 }): Promise<AirportRegionItem[]>;
+/** 系统字典项 */
+export type SysDictItem = {
+    id?: number;
+    dictCode?: string;
+    itemCode?: string;
+    itemName?: string;
+    itemOrder?: number;
+    parentItemCode?: string;
+    status?: number;
+    remark?: string;
+    [key: string]: any;
+};
+/** 按字典编码批量查询字典项入参 */
+export type SysDictItemByCodesQry = {
+    permissionOnlyCode?: string;
+    dictCodeList?: string[];
+    status?: number;
+};
+/**
+ * 根据权限编码和多个字典编码获取系统字典枚举项
+ * POST /sysDictItem/getDictItemsByCodes
+ */
+export declare function getDictItemsByCodes(body: SysDictItemByCodesQry, options?: {
+    [key: string]: any;
+}): Promise<Record<string, SysDictItem[]>>;

package/dist/api/basicData.js

@@ -1,16 +1,23 @@
-import { request as t } from "../utils/xhr.js";
-async function r(e) {
-  return t.get({
+import { request as e } from "../utils/xhr.js";
+async function n(t) {
+  return e.get({
     url: "/basic/basicAirline/getAll"
   });
 }
-async function n(e, i) {
-  return t.post({
-    url: "/basic/airportRegionLevel/getByCode",
-    data: e
+async function r(t, i) {
+  return e.get({
+    url: "/basic/airportRegionLevel/listChainByType",
+    params: t
+  });
+}
+async function o(t, i) {
+  return e.post({
+    url: "/basic/sysDictItem/getDictItemsByCodes",
+    params: t
   });
 }
 export {
-  r as getAllBasicAirline,
-  n as getByCodeAirportRegionLevel
+  n as getAllBasicAirline,
+  o as getDictItemsByCodes,
+  r as listChainByTypeAirportRegionLevel
 };

package/dist/hooks/basicDataCodes.d.ts

@@ -1,16 +1,59 @@
 /**
  * 基础数据 code 常量，页面传入 hooks 时使用。
+ * 区域层级 type：1-洲，2-区域，3-国家，4-城市，5-机场
+ * 字典类：SALES_ORDER_TYPE / SALES_ORDER_PRODUCT_TYPE 对应 sysDictItem 字典编码
  */
 export declare const CODES: {
     readonly AIRLINE: "airline";
+    readonly CONTINENT: "continent";
+    readonly REGION: "region";
+    readonly COUNTRY: "country";
+    readonly CITY: "city";
     readonly AIRPORT: "airport";
+    /** 订单类型（字典 SALES_ORDER_TYPE） */
+    readonly SALES_ORDER_TYPE: "SALES_ORDER_TYPE";
+    /** 产品类型（字典 SALES_ORDER_PRODUCT_TYPE） */
+    readonly SALES_ORDER_PRODUCT_TYPE: "SALES_ORDER_PRODUCT_TYPE";
 };
 export type BasicDataCode = (typeof CODES)[keyof typeof CODES];
 export type BasicDataOption = {
     label: string;
     value: string | number;
+    children?: BasicDataOption[];
     [key: string]: any;
 };
+/**
+ * PanelSelect 分组方式。
+ * - continent / region / country：按洲 / 区域 / 国家树形分组
+ * - pinyin：按拼音首字母分组（TtPanelSelect showPinyinMode）
+ */
+export declare const GROUP_BY: {
+    readonly CONTINENT: "continent";
+    readonly REGION: "region";
+    readonly COUNTRY: "country";
+    readonly PINYIN: "pinyin";
+};
+export type PanelSelectGroupBy = (typeof GROUP_BY)[keyof typeof GROUP_BY];
+/**
+ * 将扁平 options 按洲/区域/国家转为树形（父节点 + children）。
+ * `pinyin` 或不支持的分组原样返回，交由组件拼音模式处理。
+ */
+export declare function groupBasicDataOptions(options: BasicDataOption[], groupBy: PanelSelectGroupBy): BasicDataOption[];
+/** 机场默认按国家分组；其余默认拼音 */
+export declare function resolveDefaultGroupBy(code: BasicDataCode, groupBy?: PanelSelectGroupBy): PanelSelectGroupBy;
+export type BasicDataFetchContext = {
+    /** 当前路由 permissionOnlyCode，字典接口按权限过滤时使用 */
+    permissionOnlyCode?: string;
+};
+export type BasicDataTreeConfig = {
+    transform?: boolean;
+    labelField?: string;
+    valueField?: string;
+    parentField?: string;
+    childrenField?: string;
+    disabledField?: string;
+    rootParentValue?: string | number | null;
+};
 export type BasicDataCodeRegistryItem = {
     /** 默认表单字段名 */
     defaultFieldName: string;
@@ -22,8 +65,12 @@ export type BasicDataCodeRegistryItem = {
     defaultMultiple: boolean;
     /** 默认是否展示「全部」 */
     defaultShowAll: boolean;
+    /** 默认是否展示左侧导航 */
+    defaultShowNav?: boolean;
+    /** 默认树配置（如产品类型父子字典）；有值时关闭拼音分组 */
+    defaultTreeConfig?: BasicDataTreeConfig;
     /** 拉取并归一化为 label/value 选项 */
-    fetchOptions: () => Promise<BasicDataOption[]>;
+    fetchOptions: (ctx?: BasicDataFetchContext) => Promise<BasicDataOption[]>;
 };
 /**
  * code → 接口与默认展示配置。

package/dist/hooks/basicDataCodes.js

@@ -1,47 +1,237 @@
-import { getByCodeAirportRegionLevel as r, getAllBasicAirline as t } from "../api/basicData.js";
-const a = {
+import { getAllBasicAirline as p, getDictItemsByCodes as N, listChainByTypeAirportRegionLevel as E } from "../api/basicData.js";
+const u = {
   AIRLINE: "airline",
-  AIRPORT: "airport"
+  CONTINENT: "continent",
+  REGION: "region",
+  COUNTRY: "country",
+  CITY: "city",
+  AIRPORT: "airport",
+  /** 订单类型（字典 SALES_ORDER_TYPE） */
+  SALES_ORDER_TYPE: "SALES_ORDER_TYPE",
+  /** 产品类型（字典 SALES_ORDER_PRODUCT_TYPE） */
+  SALES_ORDER_PRODUCT_TYPE: "SALES_ORDER_PRODUCT_TYPE"
+}, i = {
+  CONTINENT: "continent",
+  REGION: "region",
+  COUNTRY: "country",
+  PINYIN: "pinyin"
+}, O = {
+  [i.CONTINENT]: { codeKey: "continentCode", nameKey: "continentName" },
+  [i.REGION]: { codeKey: "regionCode", nameKey: "regionName" },
+  [i.COUNTRY]: { codeKey: "countryCode", nameKey: "countryName" }
+};
+function g(t, a) {
+  if (!Array.isArray(t) || !t.length) return t || [];
+  if (a === i.PINYIN) return t;
+  const r = O[a];
+  if (!r) return t;
+  const n = /* @__PURE__ */ new Map(), d = [];
+  return t.forEach((e) => {
+    const l = e[r.codeKey], o = l != null && l !== "", s = o ? String(l) : "__unknown__";
+    if (!n.has(s)) {
+      d.push(s);
+      const c = e[r.nameKey];
+      n.set(s, {
+        label: o ? `${l}(${c || ""})` : "未知",
+        value: o ? l : "__unknown__",
+        children: []
+      });
+    }
+    n.get(s).children.push(e);
+  }), d.map((e) => n.get(e));
+}
+function h(t, a) {
+  return a || (t === u.AIRPORT ? i.COUNTRY : i.PINYIN);
+}
+const R = {
+  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 o(l = []) {
-  return (l || []).filter((e) => e == null ? void 0 : e.airlineCode).map((e) => ({
-    ...e,
-    label: `${e.airlineCode}(${e.airlineNameCn || ""})`,
-    value: e.airlineCode
+function S(t = []) {
+  return (Array.isArray(t) ? t : []).filter((a) => a == null ? void 0 : a.airlineCode).map((a) => ({
+    ...a,
+    label: `${a.airlineCode}(${a.airlineNameCn || ""})`,
+    value: a.airlineCode
+  }));
+}
+function A(t) {
+  if (!t || typeof t != "object" || Array.isArray(t))
+    return t || {};
+  const a = t.continentCode || t.regionCode || t.countryCode || t.cityCode || t.airportCode, r = [1, 2, 3, 4, 5].some((l) => t[String(l)] || t[l]);
+  if (a && !r)
+    return t;
+  let n = {}, d = 0;
+  for (const l of [1, 2, 3, 4, 5]) {
+    const o = t[String(l)] || t[l];
+    if (!o || typeof o != "object") continue;
+    const s = Number(o.type ?? l);
+    s >= d && (d = s, n = o);
+  }
+  const e = { ...n };
+  for (const l of [1, 2, 3, 4, 5]) {
+    const o = t[String(l)] || t[l];
+    if (!o || typeof o != "object") continue;
+    const { codeKey: s, nameKey: c, statusKey: C } = R[l];
+    o.code !== void 0 && o.code !== null && o.code !== "" && (e[s] = o.code), o.name !== void 0 && (e[c] = o.name), o.status !== void 0 && (e[C] = o.status);
+  }
+  return e;
+}
+function T(t) {
+  return (Array.isArray(t) ? t : []).map((r) => A(r || {}));
+}
+function L(t = [], a, r) {
+  return (Array.isArray(t) ? t : []).filter((n) => n == null ? void 0 : n[a]).map((n) => ({
+    ...n,
+    label: `${n[a]}(${n[r] || ""})`,
+    value: n[a]
   }));
 }
-function n(l = []) {
-  return (l || []).filter((e) => e == null ? void 0 : e.airportCode).map((e) => ({
-    ...e,
-    label: `${e.airportCode}(${e.airportName || ""})`,
-    value: e.airportCode
+function f(t, a, r) {
+  return async () => {
+    try {
+      const n = await E({ type: t });
+      return L(T(n), a, r);
+    } catch {
+      return [];
+    }
+  };
+}
+function _(t = []) {
+  return (Array.isArray(t) ? t : []).filter((a) => (a == null ? void 0 : a.itemCode) !== void 0 && (a == null ? void 0 : a.itemCode) !== null && (a == null ? void 0 : a.itemCode) !== "").map((a) => ({
+    ...a,
+    label: a.itemName || "",
+    value: a.itemCode
   }));
 }
-const u = {
-  [a.AIRLINE]: {
+function I(t = []) {
+  const a = Array.isArray(t) ? t : [], r = new Set(
+    a.map((e) => e.parentItemCode).filter((e) => e != null && String(e) !== "").map(String)
+  ), n = new Set(
+    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) => String(e.itemCode))
+  ), d = 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) => {
+    const l = String(e.itemCode), o = e.itemName || "";
+    return {
+      ...e,
+      label: r.has(l) ? `${l}(${o})` : o,
+      value: l
+    };
+  });
+  return r.forEach((e) => {
+    n.has(e) || d.push({
+      itemCode: e,
+      itemName: e,
+      label: e,
+      value: e,
+      parentItemCode: null
+    });
+  }), d;
+}
+function y(t, a = _) {
+  return async (r) => {
+    try {
+      const n = await N({
+        dictCodeList: [t],
+        permissionOnlyCode: r == null ? void 0 : r.permissionOnlyCode
+      }), d = (n == null ? void 0 : n[t]) || [];
+      return a(d);
+    } catch {
+      return [];
+    }
+  };
+}
+const m = {
+  [u.AIRLINE]: {
     defaultFieldName: "airlineCodes",
     defaultLabel: "航司",
     defaultExcludeLabel: "排除航司",
     defaultMultiple: !0,
     defaultShowAll: !0,
     async fetchOptions() {
-      const l = await t();
-      return o(l || []);
+      try {
+        const t = await p();
+        return S(t || []);
+      } catch {
+        return [];
+      }
     }
   },
-  [a.AIRPORT]: {
+  [u.CONTINENT]: {
+    defaultFieldName: "continentCodes",
+    defaultLabel: "洲",
+    defaultExcludeLabel: "排除洲",
+    defaultMultiple: !0,
+    defaultShowAll: !1,
+    fetchOptions: f(1, "continentCode", "continentName")
+  },
+  [u.REGION]: {
+    defaultFieldName: "regionCodes",
+    defaultLabel: "区域",
+    defaultExcludeLabel: "排除区域",
+    defaultMultiple: !0,
+    defaultShowAll: !1,
+    fetchOptions: f(2, "regionCode", "regionName")
+  },
+  [u.COUNTRY]: {
+    defaultFieldName: "countryCodes",
+    defaultLabel: "国家",
+    defaultExcludeLabel: "排除国家",
+    defaultMultiple: !0,
+    defaultShowAll: !1,
+    fetchOptions: f(3, "countryCode", "countryName")
+  },
+  [u.CITY]: {
+    defaultFieldName: "cityCodes",
+    defaultLabel: "城市",
+    defaultExcludeLabel: "排除城市",
+    defaultMultiple: !0,
+    defaultShowAll: !1,
+    fetchOptions: f(4, "cityCode", "cityName")
+  },
+  [u.AIRPORT]: {
     defaultFieldName: "airportCodes",
     defaultLabel: "机场",
     defaultExcludeLabel: "排除机场",
     defaultMultiple: !0,
     defaultShowAll: !1,
-    async fetchOptions() {
-      const l = await r({ type: 5 });
-      return n(l || []);
-    }
+    fetchOptions: f(5, "airportCode", "airportName")
+  },
+  [u.SALES_ORDER_TYPE]: {
+    defaultFieldName: "orderType",
+    defaultLabel: "订单类型",
+    defaultExcludeLabel: "排除订单类型",
+    defaultMultiple: !1,
+    defaultShowAll: !1,
+    defaultShowNav: !0,
+    defaultTreeConfig: {
+      transform: !0,
+      labelField: "label",
+      valueField: "value",
+      parentField: "parentItemCode"
+    },
+    fetchOptions: y(u.SALES_ORDER_TYPE, I)
+  },
+  [u.SALES_ORDER_PRODUCT_TYPE]: {
+    defaultFieldName: "productType",
+    defaultLabel: "产品类型",
+    defaultExcludeLabel: "排除产品类型",
+    defaultMultiple: !1,
+    defaultShowAll: !1,
+    defaultTreeConfig: {
+      transform: !0,
+      labelField: "itemName",
+      valueField: "itemCode",
+      parentField: "parentItemCode"
+    },
+    fetchOptions: y(u.SALES_ORDER_PRODUCT_TYPE)
   }
 };
 export {
-  a as CODES,
-  u as CODE_REGISTRY
+  u as CODES,
+  m as CODE_REGISTRY,
+  i as GROUP_BY,
+  g as groupBasicDataOptions,
+  h as resolveDefaultGroupBy
 };

package/dist/hooks/useBasicDataOptions.d.ts

@@ -8,6 +8,7 @@ export interface UseBasicDataOptionsParams {
 }
 /**
  * 按基础数据 code 拉取并缓存 options。
+ * 接口失败或返回非数组时兜底为空数组，不影响表单 schema 生成与渲染。
  *
  * @example
  * ```ts

package/dist/hooks/useBasicDataOptions.js

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

package/dist/hooks/usePanelSelectSchemas.d.ts

@@ -1,7 +1,7 @@
 import { TtFormSchema } from '../components/tt-form';
 import { Recordable } from '../../../utils/src';
 import { MaybeRef, Ref } from 'vue';
-import { BasicDataCode, BasicDataOption } from './basicDataCodes';
+import { BasicDataCode, BasicDataOption, PanelSelectGroupBy } from './basicDataCodes';
 import { BasicDataOptionsMap } from './useBasicDataOptions';
 type FieldComponentProps = Recordable | ((values: Recordable, actions: any, options: BasicDataOption[]) => Recordable);
 export interface PanelSelectFieldOnChangeContext {
@@ -30,7 +30,10 @@ export interface PanelSelectExcludeConfig {
 }
 export interface PanelSelectFieldConfig {
     code: BasicDataCode;
-    /** 返回解构名，默认用 code；同 code 多字段时必传不同 key */
+    /**
+     * 返回解构名。
+     * 默认：唯一 code 用 code；同 code 多字段时用 fieldName（缺省则用 registry 默认 fieldName）。
+     */
     key?: string;
     fieldName?: string;
     label?: string;
@@ -45,7 +48,14 @@ export interface PanelSelectFieldConfig {
     mutexWith?: string;
     /** 同 code 数据源的排除字段联动 */
     exclude?: PanelSelectExcludeConfig;
-    /** 自定义过滤完整 options */
+    /**
+     * 分组方式。
+     * - 机场默认 `country`（按国家）
+     * - 可传 `continent` / `region` / `country` / `pinyin`
+     * - 也可用 `GROUP_BY.CONTINENT` 等常量
+     */
+    groupBy?: PanelSelectGroupBy;
+    /** 自定义过滤完整 options（过滤在分组前执行，入参为扁平 options） */
     customOptions?: (values: Recordable, options: BasicDataOption[]) => BasicDataOption[];
 }
 export interface UsePanelSelectSchemasOptions {
@@ -54,9 +64,10 @@ export interface UsePanelSelectSchemasOptions {
 /**
  * 基础数据 PanelSelect schema hooks。
  *
- * - 按 CODES 拉取 options
+ * - 按 CODES 拉取 options；接口失败时兜底空数组，不影响 schema 生成
  * - 默认组件 TtPanelSelect
  * - 支持 exclude 排除联动、mutexWith 互斥过滤
+ * - 同 code 多字段时自动用 fieldName 作为返回解构名，避免互相覆盖
  *
  * @example
  * ```ts
@@ -68,14 +79,12 @@ export interface UsePanelSelectSchemasOptions {
  *   },
  *   {
  *     code: CODES.AIRPORT,
- *     key: 'depAirport',
  *     fieldName: 'depAirport',
  *     label: '出发',
  *     mutexWith: 'arrAirport',
  *   },
  *   {
  *     code: CODES.AIRPORT,
- *     key: 'arrAirport',
  *     fieldName: 'arrAirport',
  *     label: '到达',
  *     mutexWith: 'depAirport',

package/dist/hooks/usePanelSelectSchemas.js

@@ -1,6 +1,6 @@
 import "axios";
 import "element-plus";
-import { isFunction as R } from "../packages/utils/src/is.js";
+import { isFunction as H } from "../packages/utils/src/is.js";
 import "vue";
 import "xe-utils";
 import "dayjs";
@@ -11,111 +11,120 @@ import "../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
 import "../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
 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 { omit as N } from "lodash-es";
-import { CODE_REGISTRY as H } from "./basicDataCodes.js";
-import { useBasicDataOptions as J } from "./useBasicDataOptions.js";
-const g = "all";
-function h(t) {
+import { omit as L } from "lodash-es";
+import { CODE_REGISTRY as ne, resolveDefaultGroupBy as oe, GROUP_BY as re, groupBasicDataOptions as $ } from "./basicDataCodes.js";
+import { useBasicDataOptions as se } from "./useBasicDataOptions.js";
+const b = "all";
+function d(t) {
   return Array.isArray(t) ? t : t == null || t === "" ? [] : [t];
 }
-function Q(t, n = g) {
+function ce(t, n = b) {
   return t === n ? !0 : typeof t == "string" && typeof n == "string" && t.toLowerCase() === String(n).toLowerCase();
 }
-function X(t, n = g) {
-  return h(t).some((r) => Q(r, n));
+function le(t, n = b) {
+  return d(t).some((r) => ce(r, n));
 }
-function v(t) {
+function pe(t) {
   return t.replace(/[-_]+/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").split(/\s+/).filter(Boolean).map((n) => n.charAt(0).toUpperCase() + n.slice(1)).join("");
 }
-function W(t, n, r, s) {
-  return t ? R(t) ? t(n, r, s) : t : {};
+function z(t, n, r, c) {
+  return t ? H(t) ? t(n, r, c) : t : {};
 }
-function $(t, n, r, s) {
-  const l = new Set(r.map((c) => c.value)), e = t[n];
-  if (s) {
-    const c = h(e).filter((p) => l.has(p)), u = h(e);
-    (c.length !== u.length || c.some((p, S) => p !== u[S])) && (t[n] = c);
+function K(t, n, r, c) {
+  const p = new Set(r.map((e) => e.value)), l = t[n];
+  if (c) {
+    const e = d(l).filter((u) => p.has(u)), s = d(l);
+    (e.length !== s.length || e.some((u, g) => u !== s[g])) && (t[n] = e);
     return;
   }
-  e == null || e === "" || l.has(e) || (t[n] = void 0);
+  l == null || l === "" || p.has(l) || (t[n] = void 0);
 }
-function z(t, n, r, s, l, e) {
-  const c = e ? l.filter((u) => h(r[n]).includes(u.value)) : l.find((u) => u.value === r[n]);
+function V(t, n, r, c, p, l) {
+  const e = l ? p.filter((s) => d(r[n]).includes(s.value)) : p.find((s) => s.value === r[n]);
   return {
     values: r,
-    actions: s,
+    actions: c,
     fieldName: n,
     code: t,
-    options: l,
-    currentOption: c
+    options: p,
+    currentOption: e
   };
 }
-function B(t, n, r) {
-  const s = h(t);
-  if (!s.length) return [];
-  if (X(t, r)) return n;
-  const l = new Set(s);
-  return n.filter((e) => l.has(e.value));
+function j(t, n, r) {
+  const c = d(t);
+  if (!c.length) return [];
+  if (le(t, r)) return n;
+  const p = new Set(c);
+  return n.filter((l) => p.has(l.value));
 }
-function K(t, n) {
-  const r = new Set(h(t));
-  return r.size ? n.filter((s) => !r.has(s.value)) : n;
+function q(t, n) {
+  const r = new Set(d(t));
+  return r.size ? n.filter((c) => !r.has(c.value)) : n;
 }
-function xe(t, n = {}) {
-  const r = [...new Set(t.map((e) => e.code))], { dataSource: s } = J({
+function Z(t, n) {
+  var c;
+  const r = (c = t.value) == null ? void 0 : c[n];
+  return Array.isArray(r) ? r : [];
+}
+function Ee(t, n = {}) {
+  const r = [...new Set(t.map((e) => e.code))], c = t.reduce(
+    (e, s) => (e[s.code] = (e[s.code] || 0) + 1, e),
+    {}
+  ), { dataSource: p } = se({
     codes: r,
     dataSource: n.dataSource
   }), l = {};
   return t.forEach((e) => {
-    var D;
-    const c = H[e.code], u = e.key || e.code, p = e.fieldName || c.defaultFieldName, S = e.label || c.defaultLabel, L = e.multiple ?? c.defaultMultiple, U = e.showAll ?? c.defaultShowAll, O = e.showAllField ?? g, x = e.mutexWith, V = [
-      ...x ? [x] : [],
-      ...((D = e.dependencies) == null ? void 0 : D.triggerFields) || []
-    ], T = [...new Set(V)], j = N(e.dependencies || {}, ["triggerFields"]), q = T.length ? {
-      ...j,
-      triggerFields: T
-    } : e.dependencies, b = {
+    var U;
+    const s = ne[e.code], u = e.fieldName || s.defaultFieldName, g = e.key || ((c[e.code] || 0) > 1 ? u : e.code), _ = e.label || s.defaultLabel, k = e.multiple ?? s.defaultMultiple, J = e.showAll ?? s.defaultShowAll, E = e.showAllField ?? b, m = e.mutexWith, T = oe(e.code, e.groupBy), F = T !== re.PINYIN, P = s.defaultTreeConfig, G = !!P, I = s.defaultShowNav ?? !1, Q = [
+      ...m ? [m] : [],
+      ...((U = e.dependencies) == null ? void 0 : U.triggerFields) || []
+    ], R = [...new Set(Q)], X = L(e.dependencies || {}, ["triggerFields"]), v = R.length ? {
+      ...X,
+      triggerFields: R
+    } : e.dependencies, M = {
       component: "TtPanelSelect",
-      fieldName: p,
-      label: S,
+      fieldName: u,
+      label: _,
       rules: e.rules,
-      dependencies: q,
-      componentProps: (o, w) => {
-        const A = s.value[e.code] || [];
-        let a = x ? K(o[x], A) : A;
-        R(e.customOptions) && (a = e.customOptions(o, a));
-        const P = W(e.componentProps, o, w, a), { onChange: k, ...E } = P;
+      dependencies: v,
+      componentProps: (o, x) => {
+        const A = Z(p, e.code);
+        let a = m ? q(o[m], A) : A;
+        H(e.customOptions) && (a = e.customOptions(o, a) || []);
+        const O = F ? $(a, T) : a, B = z(e.componentProps, o, x, a), { onChange: W, ...S } = B;
         return {
-          multiple: L,
-          showAll: U,
-          showAllField: O,
-          showNav: !1,
+          multiple: k,
+          showAll: J,
+          showAllField: E,
+          showNav: I,
           showOriginMode: !1,
-          showPinyinMode: !0,
-          ...E,
-          options: a,
-          onChange(d) {
-            var F;
-            if (x) {
-              const m = Array.isArray(o[x]), i = K(d, A);
-              $(o, x, i, m);
+          showPinyinMode: G ? !1 : !F,
+          ...P ? { treeConfig: P } : {},
+          ...S,
+          options: O,
+          onChange(w) {
+            var y;
+            if (m) {
+              const i = Array.isArray(o[m]), h = q(w, A);
+              K(o, m, h, i);
             }
             if (e.exclude) {
-              const m = e.exclude.fieldName, i = e.exclude.multiple ?? !0, y = B(d, A, O);
-              h(d).length ? $(o, m, y, i) : o[m] = i ? [] : void 0;
+              const i = e.exclude.fieldName, h = e.exclude.multiple ?? !0, D = j(w, A, E);
+              d(w).length ? K(o, i, D, h) : o[i] = h ? [] : void 0;
             }
-            (F = e.onChange) == null || F.call(
+            (y = e.onChange) == null || y.call(
               e,
-              d,
-              z(e.code, p, o, w, a, L)
+              w,
+              V(e.code, u, o, x, a, k)
             );
           }
         };
       }
     };
-    if (l[u] = {
-      ...b,
-      ...N(e, [
+    if (l[g] = {
+      ...M,
+      ...L(e, [
         "code",
         "key",
         "fieldName",
@@ -129,50 +138,52 @@ function xe(t, n = {}) {
         "rules",
         "mutexWith",
         "exclude",
+        "groupBy",
         "customOptions"
       ]),
-      fieldName: p,
-      label: S,
+      fieldName: u,
+      label: _,
       rules: e.rules,
-      dependencies: b.dependencies,
-      componentProps: b.componentProps,
+      dependencies: M.dependencies,
+      componentProps: M.componentProps,
       component: "TtPanelSelect"
     }, e.exclude) {
-      const o = e.exclude, w = o.fieldName, A = o.key || `exclude${v(u)}`, a = o.label || c.defaultExcludeLabel, P = o.multiple ?? !0, k = o.showAll ?? !1, E = o.showAllField ?? g, d = o.dependencies || {}, F = {
-        ...d,
-        triggerFields: d.triggerFields ?? [p],
-        if: d.if ?? ((i) => h(i[p]).length > 0)
-      }, m = {
+      const o = e.exclude, x = o.fieldName, A = o.key || `exclude${pe(g)}`, a = o.label || s.defaultExcludeLabel, O = o.multiple ?? !0, B = o.showAll ?? !1, W = o.showAllField ?? b, S = o.dependencies || {}, w = {
+        ...S,
+        triggerFields: S.triggerFields ?? [u],
+        if: S.if ?? ((i) => d(i[u]).length > 0)
+      }, y = {
         component: "TtPanelSelect",
-        fieldName: w,
+        fieldName: x,
         label: a,
         rules: o.rules,
-        dependencies: F,
-        componentProps: (i, y) => {
-          const G = s.value[e.code] || [], M = B(i[p], G, O), I = W(o.componentProps, i, y, M), { onChange: f, ...Y } = I;
+        dependencies: w,
+        componentProps: (i, h) => {
+          const D = Z(p, e.code), N = j(i[u], D, E), f = F ? $(N, T) : N, C = z(o.componentProps, i, h, N), { onChange: ue, ...ee } = C;
           return {
-            multiple: P,
-            showAll: k,
-            showAllField: E,
-            showNav: !1,
+            multiple: O,
+            showAll: B,
+            showAllField: W,
+            showNav: I,
             showOriginMode: !1,
-            showPinyinMode: !0,
-            ...Y,
-            options: M,
-            onChange(Z) {
-              var _;
-              (_ = o.onChange) == null || _.call(
+            showPinyinMode: G ? !1 : !F,
+            ...P ? { treeConfig: P } : {},
+            ...ee,
+            options: f,
+            onChange(te) {
+              var Y;
+              (Y = o.onChange) == null || Y.call(
                 o,
-                Z,
-                z(e.code, w, i, y, M, P)
+                te,
+                V(e.code, x, i, h, N, O)
               );
             }
           };
         }
       };
       l[A] = {
-        ...m,
-        ...N(o, [
+        ...y,
+        ...L(o, [
           "fieldName",
           "label",
           "key",
@@ -184,19 +195,19 @@ function xe(t, n = {}) {
           "onChange",
           "rules"
         ]),
-        fieldName: w,
+        fieldName: x,
         label: a,
         rules: o.rules,
-        dependencies: m.dependencies,
-        componentProps: m.componentProps,
+        dependencies: y.dependencies,
+        componentProps: y.componentProps,
         component: "TtPanelSelect"
       };
     }
   }), {
     ...l,
-    dataSource: s
+    dataSource: p
   };
 }
 export {
-  xe as usePanelSelectSchemas
+  Ee as usePanelSelectSchemas
 };

package/dist/index.d.ts

@@ -26,7 +26,7 @@ export { useFormSchemasLink } from './hooks/useFormSchemasLink';
 export { useDataPermissionOptions } from './hooks/useDataPermissionOptions';
 export { useBasicDataOptions } from './hooks/useBasicDataOptions';
 export { usePanelSelectSchemas, type PanelSelectFieldConfig, type PanelSelectExcludeConfig, } from './hooks/usePanelSelectSchemas';
-export { CODES, type BasicDataCode } from './hooks/basicDataCodes';
+export { CODES, GROUP_BY, type BasicDataCode, type PanelSelectGroupBy } from './hooks/basicDataCodes';
 export { useFormat } from './hooks/useFormat';
 export { useLoading } from './hooks/useLoading';
 export { useScreenshotOss, type ScreenshotOssComponentOptions, type ScreenshotOssDataUrlResult, type ScreenshotOssOptions, type ScreenshotOssResult, } from './hooks/useScreenshotOss';

package/dist/index.js

@@ -11,8 +11,8 @@ import { RenderModal as c } from "./components/tt-modal/index.js";
 import { TtModal as pr } from "./components/tt-modal/index.js";
 import { TtSelect as b } from "./components/tt-select/index.js";
 import { TtText as w } from "./components/tt-text/index.js";
-import { TtUpload as h } from "./components/tt-upload/index.js";
-import { TtNavAnchor as R } from "./components/tt-nav-anchor/index.js";
+import { TtUpload as R } from "./components/tt-upload/index.js";
+import { TtNavAnchor as h } from "./components/tt-nav-anchor/index.js";
 import { TtApiComponent as g } from "./components/tt-api-component/index.js";
 import * as e from "./directives/index.js";
 import { setup as M } from "./hooks/useSetup.js";
@@ -27,36 +27,36 @@ import { setXHR as ir } from "./utils/xhr.js";
 import { default as xr } from "./components/tt-area/TtArea.vue.js";
 import { useModalForm as ur } from "./components/tt-modal-form/useModalForm.js";
 import { TtLoading as nr } from "./components/tt-loading/index.js";
-import { TtTable as br, TtTableAction as wr, TtTableButton as hr } from "./components/tt-table/index.js";
+import { TtTable as br, TtTableAction as wr, TtTableButton as Rr } from "./components/tt-table/index.js";
 import { useFormSchemasLink as gr } from "./hooks/useFormSchemasLink.js";
 import { useDataPermissionOptions as Sr } from "./hooks/useDataPermissionOptions.js";
 import { useBasicDataOptions as Cr } from "./hooks/useBasicDataOptions.js";
 import { usePanelSelectSchemas as Fr } from "./hooks/usePanelSelectSchemas.js";
-import { CODES as Or } from "./hooks/basicDataCodes.js";
-import { useFormat as Er } from "./hooks/useFormat.js";
+import { CODES as Pr, GROUP_BY as Lr } from "./hooks/basicDataCodes.js";
+import { useFormat as Ir } from "./hooks/useFormat.js";
 import { useLoading as vr } from "./hooks/useLoading.js";
-import { useScreenshotOss as Br } from "./hooks/useScreenshotOss.js";
+import { useScreenshotOss as Nr } from "./hooks/useScreenshotOss.js";
 import { setupDrawer as D } from "./components/tt-drawer/src/index.js";
-import { useShowDrawer as kr } from "./components/tt-drawer/src/index.js";
+import { useShowDrawer as Ur } from "./components/tt-drawer/src/index.js";
 import { setupModal as F } from "./components/tt-modal/src/index.js";
-import { useShowModal as Ur } from "./components/tt-modal/src/index.js";
+import { useShowModal as _r } from "./components/tt-modal/src/index.js";
 import { default as jr } from "./directives/disabled-tip/index.js";
 import { default as Hr } from "./directives/auto-tip/index.js";
-import { showTtDrawer as Xr, useDrawerRender as Zr } from "./components/tt-drawer/src/hooks/useDrawerRender.js";
+import { showTtDrawer as Xr, useDrawerRender as Yr } from "./components/tt-drawer/src/hooks/useDrawerRender.js";
 import { useDrawerResizable as qr } from "./components/tt-drawer/src/hooks/useResizable.js";
 import { showTtModal as Kr, useModalRender as Qr } from "./components/tt-modal/src/hooks/useModalRender.js";
-import { default as Yr } from "./directives/dialog-resize/index.js";
+import { default as ro } from "./directives/dialog-resize/index.js";
 import * as rr from "zod";
-import { useGroupForm as oo } from "./components/tt-form/src/group-form/useGroupForm.js";
-import { COMPONENT_MAP as to } from "./components/tt-form/src/config.js";
-import { useForm as ao } from "./components/tt-form/src/useForm.js";
-import { TtImageViewer as po } from "./components/tt-image/src/components/ImageViewer.js";
-import { vTtLoading as io } from "./components/tt-loading/src/directive.js";
-import { Loading as To } from "./components/tt-loading/src/service.js";
-import { useTableContext as lo, useTableFormContext as no } from "./components/tt-table/src/hooks/useTableContext.js";
-import { useTableFormRender as bo, useTableRender as wo } from "./components/tt-table/src/hooks/useTableRender.js";
-import { ttUploadProps as Ro } from "./components/tt-upload/src/typing.js";
-const L = [
+import { useGroupForm as eo } from "./components/tt-form/src/group-form/useGroupForm.js";
+import { COMPONENT_MAP as mo } from "./components/tt-form/src/config.js";
+import { useForm as fo } from "./components/tt-form/src/useForm.js";
+import { TtImageViewer as so } from "./components/tt-image/src/components/ImageViewer.js";
+import { vTtLoading as xo } from "./components/tt-loading/src/directive.js";
+import { Loading as uo } from "./components/tt-loading/src/service.js";
+import { useTableContext as no, useTableFormContext as co } from "./components/tt-table/src/hooks/useTableContext.js";
+import { useTableFormRender as wo, useTableRender as Ro } from "./components/tt-table/src/hooks/useTableRender.js";
+import { ttUploadProps as go } from "./components/tt-upload/src/typing.js";
+const O = [
   a,
   n,
   c,
@@ -67,16 +67,16 @@ const L = [
   f,
   d,
   l,
-  h,
   R,
+  h,
   T,
   u,
   g,
   S,
   A,
   C
-], O = (r) => {
-  L.forEach((o) => r.use(o)), Object.keys(e).forEach((o) => {
+], P = (r) => {
+  O.forEach((o) => r.use(o)), Object.keys(e).forEach((o) => {
     const t = e[o], m = o.replace(/([A-Z])/g, "-$1").toLowerCase();
     r.directive(m, t);
   }), D(r), F(r);
@@ -89,7 +89,7 @@ const er = {
    * 安装组件
    * @param app Vue 应用实例
    */
-  install: O,
+  install: P,
   /**
    * 全局参数设置
    * @param options 全局参数
@@ -98,9 +98,10 @@ const er = {
   setup: M
 };
 export {
-  Or as CODES,
-  to as COMPONENT_MAP,
-  To as Loading,
+  Pr as CODES,
+  mo as COMPONENT_MAP,
+  Lr as GROUP_BY,
+  uo as Loading,
   n as RenderDrawer,
   c as RenderModal,
   ar as TtAddButton,
@@ -112,24 +113,24 @@ export {
   p as TtEmpty,
   x as TtIcon,
   l as TtImage,
-  po as TtImageViewer,
+  so as TtImageViewer,
   nr as TtLoading,
   S as TtLog,
   pr as TtModal,
-  R as TtNavAnchor,
+  h as TtNavAnchor,
   A as TtPanelSelect,
   C as TtRadioGroup,
   b as TtSelect,
   u as TtSubIcon,
   br as TtTable,
   wr as TtTableAction,
-  hr as TtTableButton,
+  Rr as TtTableButton,
   w as TtText,
-  h as TtUpload,
+  R as TtUpload,
   s as addComponent,
   Hr as autoTip,
   er as default,
-  Yr as dialogResize,
+  ro as dialogResize,
   jr as disabledTip,
   or as formAdapter,
   i as setConfig,
@@ -138,26 +139,26 @@ export {
   F as setupModal,
   Xr as showTtDrawer,
   Kr as showTtModal,
-  Ro as ttUploadProps,
+  go as ttUploadProps,
   Cr as useBasicDataOptions,
   Sr as useDataPermissionOptions,
-  Zr as useDrawerRender,
+  Yr as useDrawerRender,
   qr as useDrawerResizable,
-  ao as useForm,
+  fo as useForm,
   gr as useFormSchemasLink,
-  Er as useFormat,
-  oo as useGroupForm,
+  Ir as useFormat,
+  eo as useGroupForm,
   vr as useLoading,
   ur as useModalForm,
   Qr as useModalRender,
   Fr as usePanelSelectSchemas,
-  Br as useScreenshotOss,
-  kr as useShowDrawer,
-  Ur as useShowModal,
-  lo as useTableContext,
-  no as useTableFormContext,
-  bo as useTableFormRender,
-  wo as useTableRender,
-  io as vTtLoading,
+  Nr as useScreenshotOss,
+  Ur as useShowDrawer,
+  _r as useShowModal,
+  no as useTableContext,
+  co as useTableFormContext,
+  wo as useTableFormRender,
+  Ro as useTableRender,
+  xo as vTtLoading,
   rr as z
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.244",
+  "version": "1.5.246",
   "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.46",
-    "@dazhicheng/utils": "1.3.43"
+    "@dazhicheng/utils": "1.3.43",
+    "@dazhicheng/hooks": "1.4.46"
   },
   "files": [
     "dist"