@dazhicheng/ui 1.6.26 → 1.6.27

package/dist/hooks/basicDataCodes.js

@@ -1,5 +1,6 @@
 import { getAllBasicAirline as O, getDictItemsByCodes as R, listChainByTypeAirportRegionLevel as A } from "../api/basicData.js";
-import { queryAllRoles as L, pageUser as I } from "../api/dataTypeContext.js";
+import { queryAllRoles as L } from "../api/dataTypeContext.js";
+import { fetchUserListOnce as I } from "./userListCache.js";
 import { secondaryDropdownListLossReason as T, primaryDropdownListLossReason as C } from "../api/lossReason.js";
 import { listAllSupplierPurchase as P, listAllValidSupplierManage as _, getAllConfigListSupplierConfigManage as h } from "../api/supplier.js";
 const o = {
@@ -56,7 +57,7 @@ const o = {
   REFUND: "退票",
   REBOOK: "改签"
 };
-function J(a, e) {
+function Q(a, e) {
   if (!Array.isArray(a) || !a.length) return a || [];
   if (e === d.PINYIN || e === d.NONE) return a;
   const l = b[e];
@@ -77,7 +78,7 @@ function J(a, e) {
     n.get(i).children.push(u);
   }), s.map((u) => n.get(u));
 }
-function Q(a) {
+function X(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) ?? "其他";
@@ -89,7 +90,7 @@ function Q(a) {
     }, e.set(s, r)), r.children.push(l);
   }), Array.from(e.values());
 }
-function X(a, e) {
+function Z(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 = {
@@ -155,10 +156,10 @@ o.CONTINENT, o.REGION, o.COUNTRY, o.CITY;
 function N(a) {
   return U.includes(a);
 }
-function Z(a, e) {
+function ee(a, e) {
   return !N(a) || !N(e) ? !1 : y[a] > y[e];
 }
-function ee(a, e) {
+function ae(a, e) {
   if (!N(e)) return [];
   const { codeKey: l, nameKey: n } = F[e], s = /* @__PURE__ */ new Map();
   return (Array.isArray(a) ? a : []).forEach((r) => {
@@ -172,7 +173,7 @@ function ee(a, e) {
     });
   }), Array.from(s.values());
 }
-function ae(a) {
+function re(a) {
   let e;
   for (const l of a)
     N(l) && (!e || y[l] > y[e]) && (e = l);
@@ -231,14 +232,14 @@ function S(a, e = D) {
     }
   };
 }
-function x(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.fullName || e.username || String(e.id),
     value: e.id
   }));
 }
-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.roleName || e.roleCode || String(e.id),
@@ -293,7 +294,7 @@ function H(a = []) {
     }
   }));
 }
-const re = {
+const le = {
   [o.AIRLINE]: {
     defaultFieldName: "airlineCodes",
     defaultLabel: "航司",
@@ -386,8 +387,8 @@ const re = {
     defaultShowAll: !1,
     async fetchOptions() {
       try {
-        const a = await I({ pageNo: 1, pageSize: 9999 });
-        return x((a == null ? void 0 : a.records) || []);
+        const a = await I();
+        return m(a);
       } catch {
         return [];
       }
@@ -402,7 +403,7 @@ const re = {
     async fetchOptions() {
       try {
         const a = await L();
-        return m(a || []);
+        return x(a || []);
       } catch {
         return [];
       }
@@ -492,14 +493,14 @@ const re = {
 };
 export {
   o as CODES,
-  re as CODE_REGISTRY,
+  le as CODE_REGISTRY,
   U as GEO_LEVEL_CODES,
   d as GROUP_BY,
-  Z as canDeriveGeoLevel,
-  ee as deriveRegionLevelOptionsFromGeoSource,
-  J as groupBasicDataOptions,
-  Q as groupPurchasePlaceOptions,
+  ee as canDeriveGeoLevel,
+  ae as deriveRegionLevelOptionsFromGeoSource,
+  Q as groupBasicDataOptions,
+  X as groupPurchasePlaceOptions,
   N as isGeoLevelCode,
-  X as resolveDefaultGroupBy,
-  ae as resolveHighestGeoLevelCode
+  Z as resolveDefaultGroupBy,
+  re as resolveHighestGeoLevelCode
 };

package/dist/hooks/useDataPermissionOptions.d.ts

@@ -1,26 +1,39 @@
 import { MaybeRef, Ref } from 'vue';
-export type BudinessDataType = "platformId" | "shopId" | "purchasePlaceId" | "businessType" | "lockUserId" | "userId";
+/** 数据权限维度的 code 标识，对应平台、店铺、采购地、业务类型、锁单人、用户 */
+export type BusinessDataType = "platformId" | "shopId" | "purchasePlaceId" | "businessType" | "lockUserId" | "userId";
+/** 下拉选项条目，label 和 value 由 toNormalizedOptions 从原始字段映射而来 */
 export type DataPermissionOptionItem = Record<string, any> & {
     label?: string;
     value?: string | number;
 };
-export type DataPermissionOptionsMap = Partial<Record<BudinessDataType, DataPermissionOptionItem[]>>;
-export interface UseBudinessDataOptions {
-    codes: BudinessDataType[];
+/** 各 code 到选项列表的映射，Partial 因为不一定每个 code 都有数据 */
+export type DataPermissionOptionsMap = Partial<Record<BusinessDataType, DataPermissionOptionItem[]>>;
+/** useDataPermissionOptions 的入参 */
+export interface UseBusinessDataOptions {
+    /** 需要获取的数据权限维度 */
+    codes: BusinessDataType[];
+    /** 外部数据源，传入后优先使用，不走接口请求，不回写共享缓存 */
     dataSource?: MaybeRef<DataPermissionOptionsMap | undefined>;
-    showAll?: boolean | Partial<Record<BudinessDataType, boolean>>;
+    /** 是否在选项列表头部插入「全部」选项。传 boolean 对所有 code 生效，传对象可按 code 单独控制 */
+    showAll?: boolean | Partial<Record<BusinessDataType, boolean>>;
 }
 /**
+ * 获取当前用户的数据权限下拉选项（平台 / 店铺 / 采购地 / 业务类型 / 锁单人 / 用户）。
  *
+ * 同路由多个实例共享缓存，microtask 合并同 tick 请求，pending 去重跨 tick 请求。
+ * 返回的 dataSource 是只读 Proxy，访问未声明的 code 返回空数组，赋值会报错。
+ *
+ * @param options 配置项
+ * @returns dataSource — 响应式选项数据源；reload — 清空当前路由缓存并重新请求
  * @example
  * ```ts
  * const { dataSource } = useDataPermissionOptions({
- *  codes:['userId','shopId]
- * })
- *
- * dataSource.value.userId
+ *   codes: ["userId", "shopId"],
+ * });
+ * dataSource.value.userId // [{ label: "张三", value: 1 }, ...]
+ * ```
  */
-export declare function useDataPermissionOptions(options: UseBudinessDataOptions): {
-    dataSource: Ref<Record<BudinessDataType, DataPermissionOptionItem[]>>;
+export declare function useDataPermissionOptions(options: UseBusinessDataOptions): {
+    dataSource: Ref<Record<BusinessDataType, DataPermissionOptionItem[]>>;
     reload: () => Promise<void>;
 };

package/dist/hooks/useDataPermissionOptions.js

@@ -1,146 +1,103 @@
-import { queryDataPermissionDetailDataTypeContext as j } from "../api/dataTypeContext.js";
-import { fetchUserListOnce as k, clearUserListCache as B } from "./userListCache.js";
-import { ref as F, watchEffect as W, unref as U, computed as G } from "vue";
-import { useOwnerRoutePath as H } from "./useOwnerRoutePath.js";
-const u = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Map(), I = /* @__PURE__ */ new Map(), J = "all", Q = { label: "全部", value: J }, b = /* @__PURE__ */ new WeakMap(), X = {
+import { queryDataPermissionDetailDataTypeContext as M } from "../api/dataTypeContext.js";
+import { fetchUserListOnce as N, clearUserListCache as R } from "./userListCache.js";
+import { computed as O, unref as S, ref as A } from "vue";
+import { useOwnerRoutePath as D } from "./useOwnerRoutePath.js";
+const F = { label: "全部", value: "all" }, T = {
   platformId: ["platformName", "platformId"],
   shopId: ["shopName", "shopId"],
   purchasePlaceId: ["purchasePlaceName", "purchasePlaceCode"],
   businessType: ["itemName", "itemCode"],
   lockUserId: ["userName", "userId"],
   userId: ["fullName", "id"]
-};
-function Y(n, a = []) {
-  const i = b.get(a) || /* @__PURE__ */ new Map(), o = i.get(n);
-  if (o) return o.slice();
-  const [y, S] = X[n], m = a.map((h) => {
-    const c = n === "purchasePlaceId" ? h.purchaseInfo || {} : h;
-    return {
-      ...h,
-      label: c == null ? void 0 : c[y],
-      value: c == null ? void 0 : c[S]
-    };
+}, f = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Set(), y = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map(), I = /* @__PURE__ */ new WeakMap();
+function v(e) {
+  let s = y.get(e);
+  return s || (s = A(0), y.set(e, s)), s;
+}
+function q(e) {
+  v(e).value++;
+}
+function x(e, s = []) {
+  let o = I.get(s);
+  o || (o = /* @__PURE__ */ new Map(), I.set(s, o));
+  const a = o.get(e);
+  if (a) return a.slice();
+  const [l, r] = T[e], c = s.map((t) => {
+    const n = e === "purchasePlaceId" ? t.purchaseInfo || {} : t;
+    return { ...t, label: n[l], value: n[r] };
   });
-  return i.set(n, m), b.set(a, i), m.slice();
+  return o.set(e, c), c.slice();
 }
-function re(n) {
-  const a = H(), i = F({});
-  function o(t = {}) {
-    i.value = n.codes.reduce(
-      (e, r) => (e[r] = Y(r, t[r]), e),
-      {}
-    );
-  }
-  function y(t) {
-    var e;
-    return typeof n.showAll == "boolean" ? n.showAll : ((e = n.showAll) == null ? void 0 : e[t]) ?? !1;
-  }
-  function S() {
-    p.clear(), f.clear(), u.clear(), d.clear(), I.clear(), B();
+async function L(e) {
+  const s = e.filter((t) => t !== "userId"), o = e.includes("userId"), [a, l] = await Promise.allSettled([
+    s.length ? M({ dataTypeName: s }).then(
+      (t) => t
+    ) : Promise.resolve([]),
+    o ? N() : Promise.resolve(void 0)
+  ]), r = {};
+  if (a.status === "fulfilled") {
+    for (const t of s)
+      r[t] = [];
+    for (const t of a.value) {
+      const n = t == null ? void 0 : t.dataTypeCode;
+      n && (r[n] = t.originalItems || []);
+    }
   }
-  function m(t) {
-    u.delete(t), d.delete(t), f.delete(t);
+  const c = l.status === "fulfilled" ? l.value : void 0;
+  return c != null && c.length && (r.userId = c), r;
+}
+async function C(e, s = !1) {
+  const o = d.get(e);
+  o && await o;
+  const a = f.get(e) ?? {}, l = [...h.get(e) ?? []], r = s ? l : l.filter((n) => !Object.hasOwn(a, n));
+  if (!r.length) return;
+  const c = p.get(e) ?? 0, t = (async () => {
+    const n = await L(r);
+    if ((p.get(e) ?? 0) !== c) return;
+    const m = { ...f.get(e) ?? {}, ...n };
+    f.set(e, m), q(e);
+  })();
+  d.set(e, t);
+  try {
+    await t;
+  } finally {
+    d.get(e) === t && d.delete(e);
   }
-  function h(t) {
-    const e = d.get(t) || /* @__PURE__ */ new Set(), r = e.size;
-    n.codes.forEach((l) => e.add(l)), d.set(t, e), e.size !== r && A(t);
+}
+function U(e) {
+  g.has(e) || (g.add(e), Promise.resolve().then(() => {
+    g.delete(e), C(e);
+  }));
+}
+function E(e) {
+  const s = D(), o = v(s), a = h.get(s) ?? /* @__PURE__ */ new Set();
+  e.codes.forEach((t) => a.add(t)), h.set(s, a), U(s);
+  function l(t) {
+    var n;
+    return typeof e.showAll == "boolean" ? e.showAll : ((n = e.showAll) == null ? void 0 : n[t]) ?? !1;
   }
-  async function c(t = !1) {
-    const e = a, r = U(n.dataSource);
-    if (r) {
-      o({ ...u.get(e) || {}, ...r });
-      return;
+  const r = O(() => {
+    o.value;
+    const t = S(e.dataSource), n = f.get(s) ?? {}, w = t ? { ...n, ...t } : n, m = {};
+    for (const i of e.codes) {
+      const u = x(i, w[i]);
+      m[i] = l(i) ? [F, ...u] : u;
     }
-    const l = /* @__PURE__ */ new Set(), V = 32;
-    for (let L = 0; L < V; L++) {
-      const v = u.get(e) || {}, M = [...d.get(e) || n.codes], g = t ? M : M.filter((s) => !Object.prototype.hasOwnProperty.call(v, s));
-      if (t = !1, !g.length) {
-        o(v);
-        return;
-      }
-      const N = p.get(e);
-      if (N) {
-        await N;
-        continue;
-      }
-      if (g.every((s) => l.has(s))) {
-        o(v);
-        return;
-      }
-      g.forEach((s) => l.add(s));
-      const x = g.filter((s) => s !== "userId"), _ = g.includes("userId"), D = Promise.allSettled([
-        x.length ? j({ dataTypeName: x }).then(
-          (s) => s
-        ) : Promise.resolve([]),
-        _ ? k() : Promise.resolve(void 0)
-      ]).then(([s, q]) => {
-        const w = s.status === "fulfilled" ? s.value : [], C = q.status === "fulfilled" ? q.value : void 0;
-        return {
-          ...C != null && C.length ? { userId: C } : {},
-          ...w.reduce((O, P) => {
-            const T = P == null ? void 0 : P.dataTypeCode;
-            return T && (O[T] = P.originalItems || []), O;
-          }, {})
-        };
-      }), R = (I.get(e) || 0) + 1;
-      I.set(e, R), p.set(e, D);
-      try {
-        const s = await D;
-        if (I.get(e) !== R) continue;
-        const w = { ...u.get(e) || {}, ...s };
-        u.set(e, w), o(w);
-      } finally {
-        p.get(e) === D && p.delete(e);
+    return new Proxy(m, {
+      get(i, u, b) {
+        return typeof u == "symbol" ? Reflect.get(i, u, b) : i[u] ?? [];
+      },
+      set(i, u) {
+        return !0;
       }
-    }
-    o(u.get(e) || {});
-  }
-  async function E() {
-    const t = a, e = new Set(d.get(t) || n.codes);
-    S(), m(t), d.set(t, e), await c(!0);
-  }
-  function A(t) {
-    const e = f.get(t);
-    if (e) return e;
-    const r = Promise.resolve().then(() => c());
-    return f.set(t, r), r.finally(() => {
-      f.get(t) === r && f.delete(t);
-    }), r;
-  }
-  W(() => {
-    const t = U(n.dataSource);
-    t && o({ ...u.get(a) || {}, ...t });
+    });
   });
-  function z(t) {
-    o(u.get(t));
+  async function c() {
+    const t = (p.get(s) ?? 0) + 1;
+    p.set(s, t), f.delete(s), d.delete(s), R(), await C(s, !0);
   }
-  return h(a), A(a).then(() => z(a)), {
-    /**
-     * 数据源
-     */
-    dataSource: G(() => {
-      const t = n.codes.reduce(
-        (e, r) => {
-          const l = i.value[r] || [];
-          return e[r] = y(r) ? [Q, ...l] : l, e;
-        },
-        {}
-      );
-      return new Proxy(t, {
-        get(e, r) {
-          return typeof r != "string" ? [] : t[r] || [];
-        },
-        set() {
-          return !1;
-        }
-      });
-    }),
-    /**
-     * @description 清空所有缓存，重新请求
-     */
-    reload: E
-  };
+  return { dataSource: r, reload: c };
 }
 export {
-  re as useDataPermissionOptions
+  E as useDataPermissionOptions
 };

package/dist/hooks/useFormSchemasLink.d.ts

@@ -1,8 +1,8 @@
 import { TtFormSchema } from '../components/tt-form';
 import { Recordable } from '../../../utils/src';
 import { MaybeRef, Ref } from 'vue';
-import { BudinessDataType, DataPermissionOptionsMap } from './useDataPermissionOptions';
-type DataType = Exclude<BudinessDataType, "userId">;
+import { BusinessDataType, DataPermissionOptionsMap } from './useDataPermissionOptions';
+type DataType = Exclude<BusinessDataType, "userId">;
 /**
  * 表单使用场景。
  *
@@ -89,7 +89,7 @@ export type SelectOption = Recordable & {
  * 返回值会包含每个 DataType 对应的 TtFormSchema，以及当前已归一化的下拉数据源。
  */
 type UseFormSchemasLinkResult = Record<DataType, TtFormSchema> & {
-    dataSource: Ref<Record<BudinessDataType, SelectOption[]>>;
+    dataSource: Ref<Record<BusinessDataType, SelectOption[]>>;
 };
 type FormSchemasLinkBuilder = {
     /** 设置为查询筛选场景 */
@@ -99,7 +99,7 @@ type FormSchemasLinkBuilder = {
     /** 设置表单场景 */
     scene(scene: FormScene): FormSchemasLinkBuilder;
     /** 指定需要请求和构建的字段类型，默认包含全部 DataType */
-    codes(codes: BudinessDataType[]): FormSchemasLinkBuilder;
+    codes(codes: BusinessDataType[]): FormSchemasLinkBuilder;
     /** 使用外部数据源，跳过内部接口请求 */
     dataSource(dataSource: MaybeRef<DataPermissionOptionsMap | undefined>): FormSchemasLinkBuilder;
     /** 覆盖单个字段配置 */

package/dist/hooks/userListCache.js

@@ -1,8 +1,8 @@
-import { pageUser as t } from "../api/dataTypeContext.js";
+import { pageUser as o } from "../api/dataTypeContext.js";
 let r, e;
-function c() {
-  return r != null && r.length ? Promise.resolve(r) : e || (e = t({ pageNo: 1, pageSize: 9999 }).then((i) => {
-    const n = (i == null ? void 0 : i.records) || [];
+function a() {
+  return r != null && r.length ? Promise.resolve(r) : e || (e = o({ pageNo: 1, pageSize: 9999 }).then((i) => {
+    const n = ((i == null ? void 0 : i.records) ?? (Array.isArray(i) ? i : [])) || [];
     return n.length ? r = n : e = void 0, n;
   }), e.catch(() => {
     e = void 0;
@@ -13,5 +13,5 @@ function s() {
 }
 export {
   s as clearUserListCache,
-  c as fetchUserListOnce
+  a as fetchUserListOnce
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.26",
+  "version": "1.6.27",
   "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/utils": "1.3.53",
-    "@dazhicheng/hooks": "1.4.56"
+    "@dazhicheng/hooks": "1.4.56",
+    "@dazhicheng/utils": "1.3.53"
   },
   "files": [
     "dist"