@dazhicheng/ui 1.6.17 → 1.6.19

package/dist/hooks/useBasicDataOptions.js

@@ -1,8 +1,9 @@
 import { ref as b, watchEffect as j, unref as q, computed as B } 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(), y = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
+const u = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), O = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map();
 function C(r) {
   return Array.isArray(r) ? r : [];
 }
@@ -20,27 +21,27 @@ function S(r) {
   if (!c) return r;
   const a = r[c];
   if (!Array.isArray(a)) return r;
-  const l = { ...r };
+  const d = { ...r };
   let o = !1;
   return M.forEach((f) => {
-    x(c, f) && (D(l, f) || (l[f] = Y(a, f), o = !0));
-  }), o ? l : r;
+    x(c, f) && (D(d, f) || (d[f] = Y(a, f), o = !0));
+  }), o ? d : r;
 }
 function N(r, c) {
-  const a = F(c), l = r.filter(L), o = a || A(l) || void 0;
+  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 $(r) {
-  const c = H(), a = I(), l = b({});
+function ee(r) {
+  const c = H(), a = I(), d = b({});
   function o(t = {}) {
-    l.value = r.codes.reduce(
+    d.value = r.codes.reduce(
       (e, n) => (e[n] = C(t[n]), e),
       {}
     );
   }
   o();
   function f(t) {
-    u.delete(t), y.delete(t);
+    u.delete(t), m.delete(t);
   }
   function _(t) {
     const e = g.get(t) || /* @__PURE__ */ new Set(), n = e.size;
@@ -50,11 +51,11 @@ function $(r) {
     o(u.get(t));
   }
   function P(t) {
-    const e = y.get(t);
+    const e = m.get(t);
     if (e) return e;
     const n = Promise.resolve().then(() => E());
-    return y.set(t, n), n.finally(() => {
-      y.get(t) === n && y.delete(t);
+    return m.set(t, n), n.finally(() => {
+      m.get(t) === n && m.delete(t);
     }), n;
   }
   async function T(t) {
@@ -69,9 +70,9 @@ function $(r) {
           return [i, []];
         }
       })
-    )).reduce((i, d, h) => {
+    )).reduce((i, l, h) => {
       const w = t[h];
-      return d.status === "fulfilled" ? i[d.value[0]] = C(d.value[1]) : i[w] = [], i;
+      return l.status === "fulfilled" ? i[l.value[0]] = C(l.value[1]) : i[w] = [], i;
     }, {});
   }
   async function E(t = !1) {
@@ -86,8 +87,8 @@ function $(r) {
       for (; ; ) {
         const s = S(u.get(e) || {});
         s !== (u.get(e) || {}) && u.set(e, s);
-        const i = [...g.get(e) || r.codes], d = t ? i : i.filter((p) => !D(s, p));
-        if (t = !1, !d.length) {
+        const i = [...g.get(e) || r.codes], l = t ? i : i.filter((p) => !D(s, p));
+        if (t = !1, !l.length) {
           o(s);
           return;
         }
@@ -98,17 +99,17 @@ function $(r) {
             continue;
           } catch {
           }
-        const w = N(d, s);
+        const w = N(l, s);
         if (!w.length) {
           const p = S(s);
           u.set(e, p), o(p);
           return;
         }
-        const G = T(w), R = (m.get(e) || 0) + 1;
-        m.set(e, R), O.set(e, G);
+        const G = T(w), R = (y.get(e) || 0) + 1;
+        y.set(e, R), O.set(e, G);
         try {
           const p = await G;
-          if (m.get(e) !== R)
+          if (y.get(e) !== R)
             continue;
           let v = {
             ...u.get(e) || {},
@@ -116,17 +117,17 @@ function $(r) {
           };
           v = S(v), u.set(e, v), o(v);
         } finally {
-          m.get(e) === R && O.delete(e);
+          y.get(e) === R && O.delete(e);
         }
       }
     } catch {
-      const n = [...g.get(e) || r.codes], s = J(n), d = { ...u.get(e) || {}, ...s };
-      u.set(e, d), o(d);
+      const n = [...g.get(e) || r.codes], s = J(n), l = { ...u.get(e) || {}, ...s };
+      u.set(e, l), o(l);
     }
   }
   async function V() {
     const t = a, e = new Set(g.get(t) || r.codes);
-    O.clear(), y.clear(), u.clear(), g.clear(), m.clear(), g.set(t, e), f(t), await E(!0);
+    O.clear(), m.clear(), u.clear(), g.clear(), y.clear(), U(), g.set(t, e), f(t), await E(!0);
   }
   return j(() => {
     const t = q(r.dataSource);
@@ -137,7 +138,7 @@ function $(r) {
   }), _(a), P(a).then(() => z(a)), {
     dataSource: B(() => {
       const t = r.codes.reduce(
-        (e, n) => (e[n] = C(l.value[n]), e),
+        (e, n) => (e[n] = C(d.value[n]), e),
         {}
       );
       return new Proxy(t, {
@@ -153,5 +154,5 @@ function $(r) {
   };
 }
 export {
-  $ as useBasicDataOptions
+  ee as useBasicDataOptions
 };

package/dist/hooks/useDataPermissionOptions.js

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

package/dist/hooks/userListCache.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 取全量用户列表，整个应用只请求一次
+ *
+ * `useDataPermissionOptions` 的 `userId` 和 `useBasicDataOptions` 的 `USER` 都要这份数据。
+ * 两边各自缓存会把 `/iam/user/page` 打两遍，所以请求收敛到这里，label value 的映射仍由各自负责。
+ *
+ * 空结果和请求失败都不写缓存、不留在途引用，下次调用可以重新请求
+ * @returns 用户原始记录列表
+ */
+export declare function fetchUserListOnce(): Promise<IamAPI.UserDTO[]>;
+/** 清空用户列表缓存，供各 hook 的 reload 使用 */
+export declare function clearUserListCache(): void;

package/dist/hooks/userListCache.js

@@ -0,0 +1,17 @@
+import { pageUser as t } 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) || [];
+    return n.length ? r = n : e = void 0, n;
+  }), e.catch(() => {
+    e = void 0;
+  }), e);
+}
+function s() {
+  r = void 0, e = void 0;
+}
+export {
+  s as clearUserListCache,
+  c as fetchUserListOnce
+};