@dazhicheng/ui 1.5.212 → 1.5.213

package/dist/hooks/useDataPermissionOptions.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.212",
+  "version": "1.5.213",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -67,8 +67,8 @@
     "vue-router": "^5.0.2",
     "vxe-pc-ui": "^4.12.36",
     "vxe-table": "^4.17.48",
-    "@dazhicheng/utils": "1.3.41",
-    "@dazhicheng/hooks": "1.4.44"
+    "@dazhicheng/hooks": "1.4.44",
+    "@dazhicheng/utils": "1.3.41"
   },
   "files": [
     "dist"