@das-fed/upf-ui 6.4.0-dev.195 → 6.4.0-dev.196

package/package.json

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

package/packages/business-components/layout-breadcrumb/style.css

@@ -1 +1 @@
-.layout-breadcrumb[data-v-304a86a2]{height:40px;flex-shrink:0;display:flex;align-items:center;background-color:var(--das-layout-breadcrumb-bg-color);padding-left:18px}
+.layout-breadcrumb[data-v-511908ae]{height:40px;flex-shrink:0;display:flex;align-items:center;background-color:var(--das-layout-breadcrumb-bg-color);padding-left:18px}