@das-fed/ui 7.1.0-dev.11 → 7.1.0-dev.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "7.1.0-dev.11",
+  "version": "7.1.0-dev.12",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -26,7 +26,7 @@
     "@antv/x6-plugin-snapline": "^2.1.7",
     "@antv/x6-plugin-transform": "^2.1.8",
     "@antv/x6-vue-shape": "^2.1.2",
-    "@das-fed/cli": "7.1.0-dev.11",
+    "@das-fed/cli": "7.1.0-dev.12",
     "@element-plus/icons-vue": "^2.3.1",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.9",
@@ -56,9 +56,9 @@
     "vue-tsc": "^2.0.29"
   },
   "dependencies": {
-    "@das-fed/ui": "7.1.0-dev.11",
-    "@das-fed/utils": "7.1.0-dev.11",
-    "@das-fed/web": "7.1.0-dev.11",
+    "@das-fed/ui": "7.1.0-dev.12",
+    "@das-fed/utils": "7.1.0-dev.12",
+    "@das-fed/web": "7.1.0-dev.12",
     "@types/markdown-it": "^14.1.2",
     "@wangeditor-next/editor": "5.6.31",
     "@wangeditor-next/editor-for-vue": "5.1.14",

package/packages/business-components/layout-breadcrumb/index.js

@@ -1,113 +1,111 @@
 import '@das-fed/ui/packages/business-components/layout-breadcrumb/style.css';
-import { ref as S, computed as T, watch as L, nextTick as R, defineComponent as q, createElementBlock as N, createCommentVNode as U, unref as y, openBlock as x, createVNode as D } from "vue";
-import { withInstall as P } from "@das-fed/utils/with-install/index";
-import { DasBreadCrumb as O } from "@das-fed/ui/packages/components/breadcrumb/index";
-import { useRouter as $, useRoute as j } from "vue-router";
-import { flatTree as I } from "@das-fed/utils/common-tools";
-import { getSubApps as _ } from "@das-fed/utils/common-info";
-import { setThemeRule as E } from "@das-fed/web/packages/theme/index";
-const J = (s, f) => {
-  const a = S([]), l = T(() => [...a.value, ...s.data || []]), m = (e) => new Promise((n) => {
-    const { app: o = "", menu: d = "" } = e || {};
-    if (!o) return n(!1);
-    const c = () => {
-      const t = _() ?? {}, r = t.currentSubAppCode, i = t.currentSubApp.currentMenuCode;
-      if (o === r && d === i) return n(!0);
-      setTimeout(() => c(), 100);
+import { ref as _, computed as T, watch as I, nextTick as q, defineComponent as N, createElementBlock as R, createCommentVNode as U, unref as g, openBlock as x, createVNode as D } from "vue";
+import { withInstall as O } from "@das-fed/utils/with-install/index";
+import { DasBreadCrumb as P } from "@das-fed/ui/packages/components/breadcrumb/index";
+import { useRouter as J, useRoute as $ } from "vue-router";
+import { flatTree as L } from "@das-fed/utils/common-tools";
+import { getSubApps as S } from "@das-fed/utils/common-info";
+import { setThemeRule as j } from "@das-fed/web/packages/theme/index";
+const E = (s, l) => {
+  const a = _([]), b = T(() => [...a.value, ...s.data || []]), p = (e) => new Promise((c) => {
+    const { app: r = "", menu: i = "" } = e || {};
+    if (!r) return c(!1);
+    const u = () => {
+      const t = S() ?? {}, o = t.currentSubAppCode, d = t.currentSubApp.currentMenuCode;
+      if (JSON.parse(sessionStorage.getItem("breadcrumb") || "{}")[r] && r === o && i === d)
+        return c(!0);
+      setTimeout(() => u(), 100);
     };
-    c();
-  }), h = async (e, n) => {
-    var i, u;
-    await m(n);
-    const o = [], d = n.menu || "", c = ((u = (i = _()) == null ? void 0 : i.currentSubApp) == null ? void 0 : u.menus) ?? [];
-    if (!c || !c.length) return;
+    u();
+  }), h = async (e, c) => {
+    var d, n;
+    await p(c);
+    const r = [], i = c.menu || "", u = ((n = (d = S()) == null ? void 0 : d.currentSubApp) == null ? void 0 : n.menus) ?? [];
+    if (!u || !u.length) return;
     let t = null;
-    const r = I(c);
-    if (d ? t = r.find((p) => p.code === d) : t = r.find((p) => p.routeUrl && p.routeUrl === e), t) {
-      const p = t.code.split(".");
-      if (p.length === 3) {
-        const B = p.slice(0, 2).join("."), k = r.find((v) => v.code === B || v.originalCode === B);
-        o.push({ name: (k == null ? void 0 : k.name) ?? "", isMenu: !0, disabled: !0 });
+    const o = L(u);
+    if (i ? t = o.find((m) => m.code === i) : t = o.find((m) => m.routeUrl && m.routeUrl === e), t) {
+      const m = t.code.split(".");
+      if (m.length === 3) {
+        const B = m.slice(0, 2).join("."), k = o.find((v) => v.code === B || v.originalCode === B);
+        r.push({ name: (k == null ? void 0 : k.name) ?? "", isMenu: !0, disabled: !0 });
       }
       const M = {
         name: (t == null ? void 0 : t.name) ?? "",
         routerPath: (t == null ? void 0 : t.routeUrl) ?? "",
         isMenu: !0
       };
-      o.push(M);
+      r.push(M);
     }
-    a.value = o;
-  }, g = (e) => {
-    e.disabled || f("click-item", e);
-  }, C = $(), b = j();
-  L(
+    a.value = r;
+  }, y = (e) => {
+    e.disabled || l("click-item", e);
+  }, C = J(), f = $();
+  I(
     () => C.currentRoute.value,
     (e) => {
-      const n = (e == null ? void 0 : e.path) ?? "", o = (e == null ? void 0 : e.query) ?? {};
+      const c = (e == null ? void 0 : e.path) ?? "", r = (e == null ? void 0 : e.query) ?? {};
       setTimeout(() => {
-        h(n, o);
+        h(c, r);
       }, 200);
     }
-  ), h(b.path, b.query);
-  const A = S(!1);
-  return L(
+  ), h(f.path, f.query);
+  const A = _(!1);
+  return I(
     () => s.data,
-    () => {
-      R(() => {
-        m().then(() => {
-          var t;
-          const e = _(), n = b.query.app || e.currentSubApp.code || "";
-          let o = b.query.menu || "";
-          if (!o) {
-            const r = ((t = e.currentSubApp) == null ? void 0 : t.menus) ?? [], i = I(r).find(
-              (u) => `/${(u == null ? void 0 : u.applicationPath) ?? ""}${(u == null ? void 0 : u.routeUrl) ?? ""}`.replace(/\/\//g, "/") === location.pathname
-            );
-            i && (o = i.code);
-          }
-          const d = JSON.parse(sessionStorage.getItem("breadcrumb") || "{}")[n], c = [];
-          for (let r in d) d[r] && c.push(r);
-          A.value = !!c.find((r) => o === r);
-        });
-      });
+    async () => {
+      var t;
+      await q(), await p(f.query);
+      const e = S(), c = f.query.app || e.currentSubApp.code || "";
+      let r = f.query.menu || "";
+      if (!r) {
+        const o = ((t = e.currentSubApp) == null ? void 0 : t.menus) ?? [], d = L(o).find(
+          (n) => `/${(n == null ? void 0 : n.applicationPath) ?? ""}${(n == null ? void 0 : n.routeUrl) ?? ""}`.replace(/\/\//g, "/") === location.pathname
+        );
+        d && (r = d.code);
+      }
+      const i = JSON.parse(sessionStorage.getItem("breadcrumb") || "{}")[c], u = [];
+      for (let o in i) i[o] && u.push(o);
+      A.value = !!u.find((o) => r === o);
     },
     { deep: !0, immediate: !0 }
   ), {
     isShow: A,
-    breadcrumbList: l,
-    clickItem: g
+    breadcrumbList: b,
+    clickItem: y
   };
-}, z = {
+}, w = {
   key: 0,
   class: "layout-breadcrumb"
-}, F = {
+}, z = {
   name: "LayoutBreadCrumb"
-}, G = /* @__PURE__ */ q({
-  ...F,
+}, F = /* @__PURE__ */ N({
+  ...z,
   props: {
     data: { default: () => [] }
   },
   emits: ["click-item"],
-  setup(s, { emit: f }) {
-    const a = s, l = f, { isShow: m, breadcrumbList: h, clickItem: g } = J(a, l);
-    return (C, b) => y(m) && C.data && C.data.length ? (x(), N("div", z, [
-      D(y(O), {
-        data: y(h),
-        onClickItem: y(g)
+  setup(s, { emit: l }) {
+    const a = s, b = l, { isShow: p, breadcrumbList: h, clickItem: y } = E(a, b);
+    return (C, f) => g(p) && C.data && C.data.length ? (x(), R("div", w, [
+      D(g(P), {
+        data: g(h),
+        onClickItem: g(y)
       }, null, 8, ["data", "onClickItem"])
     ])) : U("v-if", !0);
   }
-}), H = (s, f) => {
+}), G = (s, l) => {
   const a = s.__vccOpts || s;
-  for (const [l, m] of f)
-    a[l] = m;
+  for (const [b, p] of l)
+    a[b] = p;
   return a;
-}, K = /* @__PURE__ */ H(G, [["__scopeId", "data-v-878cd70a"]]), Q = {
+}, H = /* @__PURE__ */ G(F, [["__scopeId", "data-v-878cd70a"]]), K = {
   "--das-layout-micro-container-bg-color": "#e2e7ef",
   "--das-layout-breadcrumb-bg-color": "#ffffff"
 };
-E(Q);
-const te = P(K), oe = () => S(null);
+j(K);
+const te = O(H), re = () => _(null);
 export {
   te as DasLayoutBreadcrumb,
-  oe as DasLayoutBreadcrumbRef
+  re as DasLayoutBreadcrumbRef
 };