@dazhicheng/ui 1.6.73 → 1.6.75

package/dist/api/basicData.d.ts

@@ -2,6 +2,8 @@
 export type BasicAirlineItem = {
     airlineCode?: string;
     airlineNameCn?: string;
+    /** 航司类型：1-境内，2-境外 */
+    airlineType?: number;
     [key: string]: any;
 };
 /** 机场区域完整信息（洲/区域/国家/城市/机场） */

package/dist/hooks/basicDataCodes.d.ts

@@ -39,7 +39,7 @@ export type BasicDataOption = {
 /**
  * PanelSelect 分组方式。
  * - continent / region / country：按洲 / 区域 / 国家树形分组
- * - businessType / primaryReason / supplierManageName：按业务字段树形分组
+ * - businessType / primaryReason / supplierManageName / airlineType：按业务字段树形分组
  * - pinyin：按拼音首字母分组（TtPanelSelect showPinyinMode）
  * - none：不分组，原样平铺（TtPanelSelect showOriginMode）
  */
@@ -53,6 +53,8 @@ export declare const GROUP_BY: {
     readonly PRIMARY_REASON: "primaryReason";
     /** 按供应商名称（配置号） */
     readonly SUPPLIER_MANAGE_NAME: "supplierManageName";
+    /** 按航司类型：1-境内 / 2-境外 */
+    readonly AIRLINE_TYPE: "airlineType";
     readonly PINYIN: "pinyin";
     /** 不分组，原样平铺 */
     readonly NONE: "none";

package/dist/hooks/basicDataCodes.js

@@ -38,6 +38,8 @@ const o = {
   PRIMARY_REASON: "primaryReason",
   /** 按供应商名称（配置号） */
   SUPPLIER_MANAGE_NAME: "supplierManageName",
+  /** 按航司类型：1-境内 / 2-境外 */
+  AIRLINE_TYPE: "airlineType",
   PINYIN: "pinyin",
   /** 不分组，原样平铺 */
   NONE: "none"
@@ -51,13 +53,17 @@ const o = {
     codeKey: "supplierManageName",
     nameKey: "supplierManageName",
     labelMode: "name"
-  }
+  },
+  [d.AIRLINE_TYPE]: { codeKey: "airlineType", nameKey: "airlineTypeName", labelMode: "name" }
 }, g = {
   TICKETING: "出票",
   REFUND: "退票",
   REBOOK: "改签"
+}, v = {
+  1: "境内",
+  2: "境外"
 };
-function Q(a, e) {
+function X(a, e) {
   if (!Array.isArray(a) || !a.length) return a || [];
   if (e === d.PINYIN || e === d.NONE) return a;
   const l = b[e];
@@ -78,7 +84,7 @@ function Q(a, e) {
     n.get(i).children.push(u);
   }), s.map((u) => n.get(u));
 }
-function X(a) {
+function Z(a) {
   const e = /* @__PURE__ */ new Map();
   return (Array.isArray(a) ? a : []).forEach((l) => {
     const n = l.purchaseInfo || l, s = (n == null ? void 0 : n.supplierSubType) ?? "其他";
@@ -90,24 +96,28 @@ function X(a) {
     }, e.set(s, r)), r.children.push(l);
   }), Array.from(e.values());
 }
-function Z(a, e) {
+function ee(a, e) {
   return e || (a === o.CONTINENT ? d.NONE : a === o.AIRPORT || a === o.CITY ? d.COUNTRY : a === o.COUNTRY || a === o.REGION ? d.CONTINENT : 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 v = {
+const K = {
   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 K(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 M(a = []) {
+  return (Array.isArray(a) ? a : []).filter((e) => e == null ? void 0 : e.airlineCode).map((e) => {
+    const l = e.airlineType, n = l != null ? String(l) : "";
+    return {
+      ...e,
+      airlineTypeName: v[n] || n,
+      label: `${e.airlineCode}(${e.airlineNameCn || ""})`,
+      value: e.airlineCode
+    };
+  });
 }
-function M(a) {
+function Y(a) {
   if (!a || typeof a != "object" || Array.isArray(a))
     return a || {};
   const e = a.continentCode || a.regionCode || a.countryCode || a.cityCode || a.airportCode, l = [1, 2, 3, 4, 5].some((u) => a[String(u)] || a[u]);
@@ -124,28 +134,28 @@ function M(a) {
   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 } = v[u];
+    const { codeKey: c, nameKey: i, statusKey: f } = K[u];
     t.code !== void 0 && t.code !== null && t.code !== "" && (r[c] = t.code), t.name !== void 0 && (r[i] = t.name), t.status !== void 0 && (r[f] = t.status);
   }
   return r;
 }
 function w(a) {
-  return (Array.isArray(a) ? a : []).map((l) => M(l || {}));
+  return (Array.isArray(a) ? a : []).map((l) => Y(l || {}));
 }
-function Y(a = [], e, l) {
+function U(a = [], e, l) {
   return (Array.isArray(a) ? a : []).filter((n) => n == null ? void 0 : n[e]).map((n) => ({
     ...n,
     label: `${n[e]}(${n[l] || ""})`,
     value: n[e]
   }));
 }
-const U = [o.CONTINENT, o.REGION, o.COUNTRY, o.CITY, o.AIRPORT], y = {
+const F = [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
-}, F = {
+}, D = {
   [o.CONTINENT]: { codeKey: "continentCode", nameKey: "continentName" },
   [o.REGION]: { codeKey: "regionCode", nameKey: "regionName" },
   [o.COUNTRY]: { codeKey: "countryCode", nameKey: "countryName" },
@@ -154,14 +164,14 @@ const U = [o.CONTINENT, o.REGION, o.COUNTRY, o.CITY, o.AIRPORT], y = {
 };
 o.CONTINENT, o.REGION, o.COUNTRY, o.CITY;
 function N(a) {
-  return U.includes(a);
+  return F.includes(a);
 }
-function ee(a, e) {
+function ae(a, e) {
   return !N(a) || !N(e) ? !1 : y[a] > y[e];
 }
-function ae(a, e) {
+function re(a, e) {
   if (!N(e)) return [];
-  const { codeKey: l, nameKey: n } = F[e], s = /* @__PURE__ */ new Map();
+  const { codeKey: l, nameKey: n } = D[e], s = /* @__PURE__ */ new Map();
   return (Array.isArray(a) ? a : []).forEach((r) => {
     const u = r == null ? void 0 : r[l];
     if (u == null || u === "") return;
@@ -173,7 +183,7 @@ function ae(a, e) {
     });
   }), Array.from(s.values());
 }
-function re(a) {
+function le(a) {
   let e;
   for (const l of a)
     N(l) && (!e || y[l] > y[e]) && (e = l);
@@ -183,20 +193,20 @@ function p(a, e, l) {
   return async () => {
     try {
       const n = await A({ type: a });
-      return Y(w(n), e, l);
+      return U(w(n), e, l);
     } catch {
       return [];
     }
   };
 }
-function D(a = []) {
+function G(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 G(a = []) {
+function m(a = []) {
   const e = Array.isArray(a) ? a : [], l = new Set(
     e.map((r) => r.parentItemCode).filter((r) => r != null && String(r) !== "").map(String)
   ), n = new Set(
@@ -219,7 +229,7 @@ function G(a = []) {
     });
   }), s;
 }
-function S(a, e = D) {
+function S(a, e = G) {
   return async (l) => {
     try {
       const n = await R({
@@ -232,21 +242,21 @@ function S(a, e = D) {
     }
   };
 }
-function m(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) => ({
     ...e,
     label: e.fullName || e.username || String(e.id),
     value: e.id
   }));
 }
-function x(a = []) {
+function B(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 B(a = []) {
+function $(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 l = e.businessType || "";
     return {
@@ -257,7 +267,7 @@ function B(a = []) {
     };
   });
 }
-function $(a = [], e = /* @__PURE__ */ new Map()) {
+function V(a = [], e = /* @__PURE__ */ new Map()) {
   return (Array.isArray(a) ? a : []).filter((l) => (l == null ? void 0 : l.id) !== void 0 && (l == null ? void 0 : l.id) !== null).map((l) => {
     const n = l.primaryReasonId, s = (n != null ? e.get(n) : void 0) || (n != null ? String(n) : "");
     return {
@@ -268,21 +278,21 @@ function $(a = [], e = /* @__PURE__ */ new Map()) {
     };
   });
 }
-function V(a = []) {
+function j(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => e == null ? void 0 : e.supplierConfigPcc).map((e) => ({
     ...e,
     label: e.supplierConfigPcc,
     value: e.supplierConfigPcc
   }));
 }
-function j(a = []) {
+function H(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
   }));
 }
-function H(a = []) {
+function k(a = []) {
   return (Array.isArray(a) ? a : []).filter((e) => e == null ? void 0 : e.purchasePlaceCode).map((e) => ({
     ...e,
     label: e.purchasePlaceName || e.purchasePlaceCode,
@@ -294,7 +304,7 @@ function H(a = []) {
     }
   }));
 }
-const le = {
+const ne = {
   [o.AIRLINE]: {
     defaultFieldName: "airlineCodes",
     defaultLabel: "航司",
@@ -304,7 +314,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await O();
-        return K(a || []);
+        return M(a || []);
       } catch {
         return [];
       }
@@ -363,7 +373,7 @@ const le = {
       valueField: "value",
       parentField: "parentItemCode"
     },
-    fetchOptions: S(o.SALES_ORDER_TYPE, G)
+    fetchOptions: S(o.SALES_ORDER_TYPE, m)
   },
   [o.SALES_ORDER_PRODUCT_TYPE]: {
     defaultFieldName: "productType",
@@ -388,7 +398,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await I();
-        return m(a);
+        return x(a);
       } catch {
         return [];
       }
@@ -403,7 +413,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await L();
-        return x(a || []);
+        return B(a || []);
       } catch {
         return [];
       }
@@ -418,7 +428,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await C();
-        return B(a || []);
+        return $(a || []);
       } catch {
         return [];
       }
@@ -438,7 +448,7 @@ const le = {
         ]), l = /* @__PURE__ */ new Map();
         return (e || []).forEach((n) => {
           (n == null ? void 0 : n.id) !== void 0 && (n == null ? void 0 : n.id) !== null && l.set(n.id, n.reasonName || String(n.id));
-        }), $(a || [], l);
+        }), V(a || [], l);
       } catch {
         return [];
       }
@@ -453,7 +463,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await h({});
-        return V(a || []);
+        return j(a || []);
       } catch {
         return [];
       }
@@ -468,7 +478,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await _();
-        return j(a || []);
+        return H(a || []);
       } catch {
         return [];
       }
@@ -484,7 +494,7 @@ const le = {
     async fetchOptions() {
       try {
         const a = await P();
-        return H(a || []);
+        return k(a || []);
       } catch {
         return [];
       }
@@ -493,14 +503,14 @@ const le = {
 };
 export {
   o as CODES,
-  le as CODE_REGISTRY,
-  U as GEO_LEVEL_CODES,
+  ne as CODE_REGISTRY,
+  F as GEO_LEVEL_CODES,
   d as GROUP_BY,
-  ee as canDeriveGeoLevel,
-  ae as deriveRegionLevelOptionsFromGeoSource,
-  Q as groupBasicDataOptions,
-  X as groupPurchasePlaceOptions,
+  ae as canDeriveGeoLevel,
+  re as deriveRegionLevelOptionsFromGeoSource,
+  X as groupBasicDataOptions,
+  Z as groupPurchasePlaceOptions,
   N as isGeoLevelCode,
-  Z as resolveDefaultGroupBy,
-  re as resolveHighestGeoLevelCode
+  ee as resolveDefaultGroupBy,
+  le as resolveHighestGeoLevelCode
 };

package/dist/hooks/usePanelSelectSchemas.d.ts

@@ -54,8 +54,9 @@ export interface PanelSelectFieldConfig<TValues extends Recordable = Recordable>
      * 分组方式。
      * - 洲默认 `none`；机场/城市默认 `country`；国家/区域默认 `continent`
      * - 亏损原因默认 `businessType`；细类默认 `primaryReason`；配置号默认 `supplierManageName`
-     * - 可传 `continent` / `region` / `country` / `businessType` / `primaryReason` / `supplierManageName` / `pinyin` / `none`
-     * - 也可用 `GROUP_BY.CONTINENT` 等常量
+     * - 航司可传 `airlineType`（1-境内 / 2-境外）；默认仍为 `pinyin`
+     * - 可传 `continent` / `region` / `country` / `businessType` / `primaryReason` / `supplierManageName` / `airlineType` / `pinyin` / `none`
+     * - 也可用 `GROUP_BY.CONTINENT` / `GROUP_BY.AIRLINE_TYPE` 等常量
      */
     groupBy?: PanelSelectGroupBy;
     /** 自定义过滤完整 options（过滤在分组前执行，入参为扁平 options） */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.73",
+  "version": "1.6.75",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -69,8 +69,8 @@
     "vue-router": "^5.0.2",
     "vxe-pc-ui": "^4.14.15",
     "vxe-table": "^4.18.13",
-    "@dazhicheng/hooks": "1.4.68",
-    "@dazhicheng/utils": "1.3.65"
+    "@dazhicheng/hooks": "1.4.69",
+    "@dazhicheng/utils": "1.3.66"
   },
   "files": [
     "dist"