@dazhicheng/ui 1.6.22 → 1.6.23

package/dist/hooks/useDataPermissionOptions.js

@@ -2,7 +2,7 @@ import { queryDataPermissionDetailDataTypeContext as E } from "../api/dataTypeCo
 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 = {
+const u = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), W = "all", G = { label: "全部", value: W }, T = /* @__PURE__ */ new WeakMap(), H = {
   platformId: ["platformName", "platformId"],
   shopId: ["shopName", "shopId"],
   purchasePlaceId: ["purchasePlaceName", "purchasePlaceCode"],
@@ -10,23 +10,23 @@ const o = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), y = /* @__PU
   lockUserId: ["userName", "userId"],
   userId: ["fullName", "id"]
 };
-function J(n, a = []) {
-  const h = T.get(a) || /* @__PURE__ */ new Map(), c = h.get(n);
+function J(n, s = []) {
+  const i = T.get(s) || /* @__PURE__ */ new Map(), c = i.get(n);
   if (c) return c.slice();
-  const [D, v] = H[n], C = a.map((p) => {
-    const u = n === "purchasePlaceId" ? p.purchaseInfo || {} : p;
+  const [D, S] = H[n], w = s.map((p) => {
+    const o = n === "purchasePlaceId" ? p.purchaseInfo || {} : p;
     return {
       ...p,
-      label: u == null ? void 0 : u[D],
-      value: u == null ? void 0 : u[v]
+      label: o == null ? void 0 : o[D],
+      value: o == null ? void 0 : o[S]
     };
   });
-  return h.set(n, C), T.set(a, h), C.slice();
+  return i.set(n, w), T.set(s, i), w.slice();
 }
 function K(n) {
-  const a = F(), h = j({});
+  const s = F(), i = j({});
   function c(t = {}) {
-    h.value = n.codes.reduce(
+    i.value = n.codes.reduce(
       (e, r) => (e[r] = J(r, t[r]), e),
       {}
     );
@@ -35,89 +35,90 @@ function K(n) {
     var e;
     return typeof n.showAll == "boolean" ? n.showAll : ((e = n.showAll) == null ? void 0 : e[t]) ?? !1;
   }
-  function v() {
-    y.clear(), f.clear(), o.clear(), i.clear(), w.clear(), _();
+  function S() {
+    y.clear(), g.clear(), u.clear(), d.clear(), m.clear(), _();
   }
-  function C(t) {
-    o.delete(t), i.delete(t), f.delete(t);
+  function w(t) {
+    u.delete(t), d.delete(t), g.delete(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));
+    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 && O(t);
   }
-  async function u(t = !1) {
-    const e = a, r = R(n.dataSource);
+  async function o(t = !1) {
+    const e = s, r = R(n.dataSource);
     if (r) {
-      c({ ...o.get(e) || {}, ...r });
+      c({ ...u.get(e) || {}, ...r });
       return;
     }
-    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 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) {
+    for (; ; ) {
+      const l = u.get(e) || {}, A = [...d.get(e) || n.codes], C = t ? A : A.filter((a) => !Object.prototype.hasOwnProperty.call(l, a));
+      if (t = !1, !C.length) {
         c(l);
         return;
       }
-    }
-    const M = m.filter((s) => s !== "userId"), z = m.includes("userId"), N = Promise.allSettled([
-      M.length ? E({ dataTypeName: M }).then(
-        (s) => s
-      ) : Promise.resolve([]),
-      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 {
-        ...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;
-        }, {})
-      };
-    }), O = (w.get(e) || 0) + 1;
-    w.set(e, O), y.set(e, N);
-    try {
-      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) === O && y.delete(e);
+      const L = y.get(e);
+      if (L) {
+        await L;
+        continue;
+      }
+      const M = C.filter((a) => a !== "userId"), z = C.includes("userId"), N = Promise.allSettled([
+        M.length ? E({ dataTypeName: M }).then(
+          (a) => a
+        ) : Promise.resolve([]),
+        z ? V() : Promise.resolve(void 0)
+      ]).then(([a, q]) => {
+        const P = a.status === "fulfilled" ? a.value : [], I = q.status === "fulfilled" ? q.value : void 0;
+        return {
+          // 请求过的 code 一定落键：接口没返回的（无该维度权限、请求失败）也写成空数组，
+          // 否则它永远算「缺失」，上面的复查循环会一直重发同一个请求
+          ...C.reduce((f, h) => (f[h] = [], f), {}),
+          ...I != null && I.length ? { userId: I } : {},
+          ...P.reduce((f, h) => {
+            const x = h == null ? void 0 : h.dataTypeCode;
+            return x && (f[x] = h.originalItems || []), f;
+          }, {})
+        };
+      }), v = (m.get(e) || 0) + 1;
+      m.set(e, v), y.set(e, N);
+      try {
+        const a = await N;
+        if (m.get(e) !== v) continue;
+        const P = { ...u.get(e) || {}, ...a };
+        u.set(e, P), c(P);
+      } finally {
+        m.get(e) === v && y.delete(e);
+      }
     }
   }
-  async function b() {
-    const t = a, e = new Set(i.get(t) || n.codes);
-    v(), i.set(t, e), C(t), await u(!0);
+  async function U() {
+    const t = s, e = new Set(d.get(t) || n.codes);
+    S(), w(t), d.set(t, e), await o(!0);
   }
-  function A(t) {
-    const e = f.get(t);
+  function O(t) {
+    const e = g.get(t);
     if (e) return e;
-    const r = Promise.resolve().then(() => u());
-    return f.set(t, r), r.finally(() => {
-      f.get(t) === r && f.delete(t);
+    const r = Promise.resolve().then(() => o());
+    return g.set(t, r), r.finally(() => {
+      g.get(t) === r && g.delete(t);
     }), r;
   }
   k(() => {
     const t = R(n.dataSource);
-    t && c({ ...o.get(a) || {}, ...t });
+    t && c({ ...u.get(s) || {}, ...t });
   });
-  function U(t) {
-    c(o.get(t));
+  function b(t) {
+    c(u.get(t));
   }
-  return p(a), A(a).then(() => U(a)), {
+  return p(s), O(s).then(() => b(s)), {
     /**
      * 数据源
      */
     dataSource: B(() => {
       const t = n.codes.reduce(
         (e, r) => {
-          const d = h.value[r] || [];
-          return e[r] = D(r) ? [G, ...d] : d, e;
+          const l = i.value[r] || [];
+          return e[r] = D(r) ? [G, ...l] : l, e;
         },
         {}
       );
@@ -133,7 +134,7 @@ function K(n) {
     /**
      * @description 清空所有缓存，重新请求
      */
-    reload: b
+    reload: U
   };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.22",
+  "version": "1.6.23",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",