@das-fed/ui 6.4.0-dev.100 → 6.4.0-dev.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "6.4.0-dev.100",
+  "version": "6.4.0-dev.102",
   "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": "6.4.0-dev.100",
+    "@das-fed/cli": "6.4.0-dev.102",
     "@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": "6.4.0-dev.100",
-    "@das-fed/utils": "6.4.0-dev.100",
-    "@das-fed/web": "6.4.0-dev.100",
+    "@das-fed/ui": "6.4.0-dev.102",
+    "@das-fed/utils": "6.4.0-dev.102",
+    "@das-fed/web": "6.4.0-dev.102",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@wangeditor/plugin-upload-attachment": "^1.1.0",

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

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