@dazhicheng/ui 1.6.23 → 1.6.24

package/dist/hooks/useDataPermissionOptions.js

@@ -1,8 +1,8 @@
-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 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 = {
+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 = {
   platformId: ["platformName", "platformId"],
   shopId: ["shopName", "shopId"],
   purchasePlaceId: ["purchasePlaceName", "purchasePlaceCode"],
@@ -10,115 +10,119 @@ const u = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map(), y = /* @__PU
   lockUserId: ["userName", "userId"],
   userId: ["fullName", "id"]
 };
-function J(n, s = []) {
-  const i = T.get(s) || /* @__PURE__ */ new Map(), c = i.get(n);
-  if (c) return c.slice();
-  const [D, S] = H[n], w = s.map((p) => {
-    const o = n === "purchasePlaceId" ? p.purchaseInfo || {} : p;
+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 {
-      ...p,
-      label: o == null ? void 0 : o[D],
-      value: o == null ? void 0 : o[S]
+      ...h,
+      label: c == null ? void 0 : c[y],
+      value: c == null ? void 0 : c[S]
     };
   });
-  return i.set(n, w), T.set(s, i), w.slice();
+  return i.set(n, m), b.set(a, i), m.slice();
 }
-function K(n) {
-  const s = F(), i = j({});
-  function c(t = {}) {
+function re(n) {
+  const a = H(), i = F({});
+  function o(t = {}) {
     i.value = n.codes.reduce(
-      (e, r) => (e[r] = J(r, t[r]), e),
+      (e, r) => (e[r] = Y(r, t[r]), e),
       {}
     );
   }
-  function D(t) {
+  function y(t) {
     var e;
     return typeof n.showAll == "boolean" ? n.showAll : ((e = n.showAll) == null ? void 0 : e[t]) ?? !1;
   }
   function S() {
-    y.clear(), g.clear(), u.clear(), d.clear(), m.clear(), _();
+    p.clear(), f.clear(), u.clear(), d.clear(), I.clear(), B();
   }
-  function w(t) {
-    u.delete(t), d.delete(t), g.delete(t);
+  function m(t) {
+    u.delete(t), d.delete(t), f.delete(t);
   }
-  function p(t) {
+  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 && O(t);
+    n.codes.forEach((l) => e.add(l)), d.set(t, e), e.size !== r && A(t);
   }
-  async function o(t = !1) {
-    const e = s, r = R(n.dataSource);
+  async function c(t = !1) {
+    const e = a, r = U(n.dataSource);
     if (r) {
-      c({ ...u.get(e) || {}, ...r });
+      o({ ...u.get(e) || {}, ...r });
       return;
     }
-    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);
+    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 L = y.get(e);
-      if (L) {
-        await L;
+      const N = p.get(e);
+      if (N) {
+        await N;
         continue;
       }
-      const M = C.filter((a) => a !== "userId"), z = C.includes("userId"), N = Promise.allSettled([
-        M.length ? E({ dataTypeName: M }).then(
-          (a) => a
+      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([]),
-        z ? V() : Promise.resolve(void 0)
-      ]).then(([a, q]) => {
-        const P = a.status === "fulfilled" ? a.value : [], I = q.status === "fulfilled" ? q.value : void 0;
+        _ ? k() : Promise.resolve(void 0)
+      ]).then(([s, q]) => {
+        const w = s.status === "fulfilled" ? s.value : [], C = 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;
+          ...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;
           }, {})
         };
-      }), v = (m.get(e) || 0) + 1;
-      m.set(e, v), y.set(e, N);
+      }), R = (I.get(e) || 0) + 1;
+      I.set(e, R), p.set(e, D);
       try {
-        const a = await N;
-        if (m.get(e) !== v) continue;
-        const P = { ...u.get(e) || {}, ...a };
-        u.set(e, P), c(P);
+        const s = await D;
+        if (I.get(e) !== R) continue;
+        const w = { ...u.get(e) || {}, ...s };
+        u.set(e, w), o(w);
       } finally {
-        m.get(e) === v && y.delete(e);
+        p.get(e) === D && p.delete(e);
       }
     }
+    o(u.get(e) || {});
   }
-  async function U() {
-    const t = s, e = new Set(d.get(t) || n.codes);
-    S(), w(t), d.set(t, e), await o(!0);
+  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 O(t) {
-    const e = g.get(t);
+  function A(t) {
+    const e = f.get(t);
     if (e) return e;
-    const r = Promise.resolve().then(() => o());
-    return g.set(t, r), r.finally(() => {
-      g.get(t) === r && g.delete(t);
+    const r = Promise.resolve().then(() => c());
+    return f.set(t, r), r.finally(() => {
+      f.get(t) === r && f.delete(t);
     }), r;
   }
-  k(() => {
-    const t = R(n.dataSource);
-    t && c({ ...u.get(s) || {}, ...t });
+  W(() => {
+    const t = U(n.dataSource);
+    t && o({ ...u.get(a) || {}, ...t });
   });
-  function b(t) {
-    c(u.get(t));
+  function z(t) {
+    o(u.get(t));
   }
-  return p(s), O(s).then(() => b(s)), {
+  return h(a), A(a).then(() => z(a)), {
     /**
      * 数据源
      */
-    dataSource: B(() => {
+    dataSource: G(() => {
       const t = n.codes.reduce(
         (e, r) => {
           const l = i.value[r] || [];
-          return e[r] = D(r) ? [G, ...l] : l, e;
+          return e[r] = y(r) ? [Q, ...l] : l, e;
         },
         {}
       );
@@ -134,9 +138,9 @@ function K(n) {
     /**
      * @description 清空所有缓存，重新请求
      */
-    reload: U
+    reload: E
   };
 }
 export {
-  K as useDataPermissionOptions
+  re as useDataPermissionOptions
 };

package/package.json

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