@dazhicheng/ui 1.6.79 → 1.6.81

package/dist/hooks/useBasicDataOptions.js

@@ -1,158 +1,165 @@
-import { ref as b, watchEffect as j, unref as q, computed as B } from "vue";
+import { ref as b, watchEffect as B, unref as q, computed as j } from "vue";
 import { useRoute as H } from "vue-router";
 import { useOwnerRoutePath as I } from "./useOwnerRoutePath.js";
 import { clearUserListCache as U } from "./userListCache.js";
-import { GEO_LEVEL_CODES as M, canDeriveGeoLevel as x, deriveRegionLevelOptionsFromGeoSource as Y, resolveHighestGeoLevelCode as A, isGeoLevelCode as L, CODE_REGISTRY as k } from "./basicDataCodes.js";
-const u = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), O = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map();
-function C(r) {
+import { GEO_LEVEL_CODES as L, canDeriveGeoLevel as x, deriveRegionLevelOptionsFromGeoSource as Y, resolveHighestGeoLevelCode as A, isGeoLevelCode as M, CODE_REGISTRY as k } from "./basicDataCodes.js";
+import { missingOptionsEchoVersion as J, getMergedOptions as N } from "./missingOptionsCache.js";
+const a = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), w = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), C = /* @__PURE__ */ new Map();
+function y(r) {
   return Array.isArray(r) ? r : [];
 }
-function J(r) {
-  return r.reduce((c, a) => (c[a] = [], c), {});
+function ne(r, o) {
+  var c;
+  return y((c = a.get(r)) == null ? void 0 : c[o]);
 }
-function D(r, c) {
-  return Object.prototype.hasOwnProperty.call(r, c);
+function Q(r) {
+  return r.reduce((o, c) => (o[c] = [], o), {});
+}
+function D(r, o) {
+  return Object.prototype.hasOwnProperty.call(r, o);
 }
 function F(r) {
-  return A(M.filter((c) => D(r, c)));
+  return A(L.filter((o) => D(r, o)));
 }
-function S(r) {
-  const c = F(r);
-  if (!c) return r;
-  const a = r[c];
-  if (!Array.isArray(a)) return r;
+function O(r) {
+  const o = F(r);
+  if (!o) return r;
+  const c = r[o];
+  if (!Array.isArray(c)) return r;
   const d = { ...r };
-  let o = !1;
-  return M.forEach((f) => {
-    x(c, f) && (D(d, f) || (d[f] = Y(a, f), o = !0));
-  }), o ? d : r;
+  let u = !1;
+  return L.forEach((f) => {
+    x(o, f) && (D(d, f) || (d[f] = Y(c, f), u = !0));
+  }), u ? d : r;
 }
-function N(r, c) {
-  const a = F(c), d = r.filter(L), o = a || A(d) || void 0;
-  return o ? r.filter((f) => L(f) ? !(x(o, f) || f === o && D(c, o)) : !0) : r;
+function W(r, o) {
+  const c = F(o), d = r.filter(M), u = c || A(d) || void 0;
+  return u ? r.filter((f) => M(f) ? !(x(u, f) || f === u && D(o, u)) : !0) : r;
 }
-function ee(r) {
-  const c = H(), a = I(), d = b({});
-  function o(t = {}) {
+function se(r) {
+  const o = H(), c = I(), d = b({});
+  function u(t = {}) {
     d.value = r.codes.reduce(
-      (e, n) => (e[n] = C(t[n]), e),
+      (e, n) => (e[n] = y(t[n]), e),
       {}
     );
   }
-  o();
+  u();
   function f(t) {
-    u.delete(t), m.delete(t);
+    a.delete(t), m.delete(t);
   }
-  function _(t) {
+  function V(t) {
     const e = g.get(t) || /* @__PURE__ */ new Set(), n = e.size;
-    r.codes.forEach((s) => e.add(s)), g.set(t, e), e.size !== n && P(t);
+    r.codes.forEach((s) => e.add(s)), g.set(t, e), e.size !== n && E(t);
   }
-  function z(t) {
-    o(u.get(t));
+  function _(t) {
+    u(a.get(t));
   }
-  function P(t) {
+  function E(t) {
     const e = m.get(t);
     if (e) return e;
-    const n = Promise.resolve().then(() => E());
+    const n = Promise.resolve().then(() => P());
     return m.set(t, n), n.finally(() => {
       m.get(t) === n && m.delete(t);
     }), n;
   }
-  async function T(t) {
+  async function z(t) {
     var s;
-    const e = (s = c.meta) == null ? void 0 : s.permissionOnlyCode;
+    const e = (s = o.meta) == null ? void 0 : s.permissionOnlyCode;
     return (await Promise.allSettled(
       t.map(async (i) => {
         try {
-          const h = await k[i].fetchOptions({ permissionOnlyCode: e });
-          return [i, C(h)];
+          const p = await k[i].fetchOptions({ permissionOnlyCode: e });
+          return [i, y(p)];
         } catch {
           return [i, []];
         }
       })
-    )).reduce((i, l, h) => {
-      const w = t[h];
-      return l.status === "fulfilled" ? i[l.value[0]] = C(l.value[1]) : i[w] = [], i;
+    )).reduce((i, l, p) => {
+      const S = t[p];
+      return l.status === "fulfilled" ? i[l.value[0]] = y(l.value[1]) : i[S] = [], i;
     }, {});
   }
-  async function E(t = !1) {
-    const e = a;
+  async function P(t = !1) {
+    const e = c;
     try {
       const n = q(r.dataSource);
       if (n) {
-        let s = { ...u.get(e) || {}, ...n };
-        s = S(s), u.set(e, s), o(s);
+        let s = { ...a.get(e) || {}, ...n };
+        s = O(s), a.set(e, s), u(s);
         return;
       }
       for (; ; ) {
-        const s = S(u.get(e) || {});
-        s !== (u.get(e) || {}) && u.set(e, s);
-        const i = [...g.get(e) || r.codes], l = t ? i : i.filter((p) => !D(s, p));
+        const s = O(a.get(e) || {});
+        s !== (a.get(e) || {}) && a.set(e, s);
+        const i = [...g.get(e) || r.codes], l = t ? i : i.filter((h) => !D(s, h));
         if (t = !1, !l.length) {
-          o(s);
+          u(s);
           return;
         }
-        const h = O.get(e);
-        if (h)
+        const p = w.get(e);
+        if (p)
           try {
-            await h;
+            await p;
             continue;
           } catch {
           }
-        const w = N(l, s);
-        if (!w.length) {
-          const p = S(s);
-          u.set(e, p), o(p);
+        const S = W(l, s);
+        if (!S.length) {
+          const h = O(s);
+          a.set(e, h), u(h);
           return;
         }
-        const G = T(w), R = (y.get(e) || 0) + 1;
-        y.set(e, R), O.set(e, G);
+        const G = z(S), R = (C.get(e) || 0) + 1;
+        C.set(e, R), w.set(e, G);
         try {
-          const p = await G;
-          if (y.get(e) !== R)
+          const h = await G;
+          if (C.get(e) !== R)
             continue;
           let v = {
-            ...u.get(e) || {},
-            ...p
+            ...a.get(e) || {},
+            ...h
           };
-          v = S(v), u.set(e, v), o(v);
+          v = O(v), a.set(e, v), u(v);
         } finally {
-          y.get(e) === R && O.delete(e);
+          C.get(e) === R && w.delete(e);
         }
       }
     } catch {
-      const n = [...g.get(e) || r.codes], s = J(n), l = { ...u.get(e) || {}, ...s };
-      u.set(e, l), o(l);
+      const n = [...g.get(e) || r.codes], s = Q(n), l = { ...a.get(e) || {}, ...s };
+      a.set(e, l), u(l);
     }
   }
-  async function V() {
-    const t = a, e = new Set(g.get(t) || r.codes);
-    O.clear(), m.clear(), u.clear(), g.clear(), y.clear(), U(), g.set(t, e), f(t), await E(!0);
+  async function T() {
+    const t = c, e = new Set(g.get(t) || r.codes);
+    w.clear(), m.clear(), a.clear(), g.clear(), C.clear(), U(), g.set(t, e), f(t), await P(!0);
   }
-  return j(() => {
+  return B(() => {
     const t = q(r.dataSource);
     if (!t) return;
-    const e = a;
-    let n = { ...u.get(e) || {}, ...t };
-    n = S(n), u.set(e, n), o(n);
-  }), _(a), P(a).then(() => z(a)), {
-    dataSource: B(() => {
+    const e = c;
+    let n = { ...a.get(e) || {}, ...t };
+    n = O(n), a.set(e, n), u(n);
+  }), V(c), E(c).then(() => _(c)), {
+    dataSource: j(() => {
+      J.value;
       const t = r.codes.reduce(
-        (e, n) => (e[n] = C(d.value[n]), e),
+        (e, n) => (e[n] = N(c, n, y(d.value[n])), e),
         {}
       );
       return new Proxy(t, {
         get(e, n) {
-          return typeof n != "string" ? [] : C(t[n]);
+          return typeof n != "string" ? [] : y(t[n]);
         },
         set() {
           return !1;
         }
       });
     }),
-    reload: V
+    reload: T
   };
 }
 export {
-  ee as useBasicDataOptions
+  ne as getBasicDataMainOptions,
+  se as useBasicDataOptions
 };

package/dist/hooks/useDataPermissionOptions.d.ts

@@ -17,6 +17,16 @@ export interface UseBusinessDataOptions {
     /** 是否在选项列表头部插入「全部」选项。传 boolean 对所有 code 生效，传对象可按 code 单独控制 */
     showAll?: boolean | Partial<Record<BusinessDataType, boolean>>;
 }
+/**
+ * 读取路由级数据权限主列表（已归一化 label/value，不含缺码 echo），
+ * 供 ensureMissing 算差集（如 purchasePlaceId ↔ CODES.PURCHASE_PLACE）。
+ */
+export declare function getDataPermissionMainOptions(routePath: string, code: BusinessDataType): DataPermissionOptionItem[];
+/**
+ * 等待路由级数据权限主列表就绪（含 microtask 已排程的首拉）。
+ * 表格 ensureMissing 若早于权限缓存落地，会把整页 code 误判为缺码。
+ */
+export declare function awaitDataPermissionReady(routePath: string, codes?: BusinessDataType[]): Promise<void>;
 /**
  * 获取当前用户的数据权限下拉选项（平台 / 店铺 / 采购地 / 业务类型 / 锁单人 / 用户）。
  *

package/dist/hooks/useDataPermissionOptions.js

@@ -1,103 +1,120 @@
 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 = {
+import { fetchUserListOnce as R, clearUserListCache as N } from "./userListCache.js";
+import { ref as S, computed as D, unref as A } from "vue";
+import { useOwnerRoutePath as F } from "./useOwnerRoutePath.js";
+const T = { label: "全部", value: "all" }, q = {
   platformId: ["platformName", "platformId"],
   shopId: ["shopName", "shopId"],
   purchasePlaceId: ["purchasePlaceName", "purchasePlaceCode"],
   businessType: ["itemName", "itemCode"],
   lockUserId: ["userName", "userId"],
   userId: ["fullName", "id"]
-}, 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;
+}, d = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), w = /* @__PURE__ */ new Set(), I = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), v = /* @__PURE__ */ new WeakMap();
+function O(e) {
+  let t = I.get(e);
+  return t || (t = S(0), I.set(e, t)), t;
 }
-function q(e) {
-  v(e).value++;
+function x(e) {
+  O(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] };
+function _(e, t) {
+  const n = d.get(e);
+  if (!n || !Object.hasOwn(n, t)) return [];
+  const o = n[t];
+  return o != null && o.length ? C(t, o) : [];
+}
+async function z(e, t = ["purchasePlaceId"]) {
+  await Promise.resolve();
+  const n = f.get(e);
+  n && await n;
+  const o = m.get(e) ?? /* @__PURE__ */ new Set();
+  t.forEach((r) => o.add(r)), m.set(e, o);
+  const a = d.get(e) ?? {};
+  t.some((r) => !Object.hasOwn(a, r)) && await h(e);
+}
+function C(e, t = []) {
+  let n = v.get(t);
+  n || (n = /* @__PURE__ */ new Map(), v.set(t, n));
+  const o = n.get(e);
+  if (o) return o.slice();
+  const [a, r] = q[e], i = t.map((s) => {
+    const c = e === "purchasePlaceId" ? s.purchaseInfo || {} : s;
+    return { ...s, label: c[a], value: c[r] };
   });
-  return o.set(e, c), c.slice();
+  return n.set(e, i), i.slice();
 }
 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
+  const t = e.filter((s) => s !== "userId"), n = e.includes("userId"), [o, a] = await Promise.allSettled([
+    t.length ? M({ dataTypeName: t }).then(
+      (s) => s
     ) : Promise.resolve([]),
-    o ? N() : Promise.resolve(void 0)
+    n ? R() : 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 || []);
+  if (o.status === "fulfilled") {
+    for (const s of t)
+      r[s] = [];
+    for (const s of o.value) {
+      const c = s == null ? void 0 : s.dataTypeCode;
+      c && (r[c] = s.originalItems || []);
     }
   }
-  const c = l.status === "fulfilled" ? l.value : void 0;
-  return c != null && c.length && (r.userId = c), r;
+  const i = a.status === "fulfilled" ? a.value : void 0;
+  return i != null && i.length && (r.userId = i), 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));
+async function h(e, t = !1) {
+  const n = f.get(e);
+  n && await n;
+  const o = d.get(e) ?? {}, a = [...m.get(e) ?? []], r = t ? a : a.filter((c) => !Object.hasOwn(o, c));
   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);
+  const i = g.get(e) ?? 0, s = (async () => {
+    const c = await L(r);
+    if ((g.get(e) ?? 0) !== i) return;
+    const p = { ...d.get(e) ?? {}, ...c };
+    d.set(e, p), x(e);
   })();
-  d.set(e, t);
+  f.set(e, s);
   try {
-    await t;
+    await s;
   } finally {
-    d.get(e) === t && d.delete(e);
+    f.get(e) === s && f.delete(e);
   }
 }
 function U(e) {
-  g.has(e) || (g.add(e), Promise.resolve().then(() => {
-    g.delete(e), C(e);
+  w.has(e) || (w.add(e), Promise.resolve().then(() => {
+    w.delete(e), h(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;
+function k(e) {
+  const t = F(), n = O(t), o = m.get(t) ?? /* @__PURE__ */ new Set();
+  e.codes.forEach((s) => o.add(s)), m.set(t, o), U(t);
+  function a(s) {
+    var c;
+    return typeof e.showAll == "boolean" ? e.showAll : ((c = e.showAll) == null ? void 0 : c[s]) ?? !1;
   }
-  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 r = D(() => {
+    n.value;
+    const s = A(e.dataSource), c = d.get(t) ?? {}, y = s ? { ...c, ...s } : c, p = {};
+    for (const l of e.codes) {
+      const u = C(l, y[l]);
+      p[l] = a(l) ? [T, ...u] : u;
     }
-    return new Proxy(m, {
-      get(i, u, b) {
-        return typeof u == "symbol" ? Reflect.get(i, u, b) : i[u] ?? [];
+    return new Proxy(p, {
+      get(l, u, b) {
+        return typeof u == "symbol" ? Reflect.get(l, u, b) : l[u] ?? [];
       },
-      set(i, u) {
+      set(l, u) {
         return !0;
       }
     });
   });
-  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);
+  async function i() {
+    const s = (g.get(t) ?? 0) + 1;
+    g.set(t, s), d.delete(t), f.delete(t), N(), await h(t, !0);
   }
-  return { dataSource: r, reload: c };
+  return { dataSource: r, reload: i };
 }
 export {
-  E as useDataPermissionOptions
+  z as awaitDataPermissionReady,
+  _ as getDataPermissionMainOptions,
+  k as useDataPermissionOptions
 };