bmp-layout 0.0.23 → 0.0.24

package/bmp-layout.es.js

@@ -1,4 +1,4 @@
-import { openBlock, createBlock, unref, normalizeClass, nextTick, ref, computed, watch, withCtx, createElementBlock, createElementVNode, normalizeStyle, createVNode, Fragment, resolveComponent, defineComponent, isVNode, renderList, createCommentVNode, createTextVNode, toDisplayString, renderSlot, onBeforeMount, withModifiers, Teleport, Transition, provide, KeepAlive, resolveDynamicComponent, onMounted, TransitionGroup, mergeProps, isRef, onUnmounted, withDirectives, resolveDirective, watchEffect, vShow, useSlots, useAttrs, createSlots, inject, onBeforeUnmount, reactive, onUpdated, render, useCssVars } from "vue";
+import { openBlock, createBlock, unref, normalizeClass, nextTick, ref, computed, watch, withCtx, createElementBlock, createElementVNode, normalizeStyle, createVNode, Fragment, resolveComponent, defineComponent, isVNode, renderList, createCommentVNode, createTextVNode, toDisplayString, renderSlot, onBeforeMount, withModifiers, onMounted, onUnmounted, Teleport, Transition, provide, KeepAlive, resolveDynamicComponent, TransitionGroup, mergeProps, isRef, withDirectives, resolveDirective, watchEffect, vShow, useSlots, useAttrs, createSlots, inject, onBeforeUnmount, reactive, onUpdated, render, useCssVars } from "vue";
 import { createPinia, setActivePinia, defineStore } from "pinia";
 import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
 import { cloneDeep, omit } from "lodash-es";
@@ -7664,7 +7664,7 @@ const useTagsViewStore = defineStore("layout-tagsView", {
       }
       this.visitedViews.push(visitedView);
     },
-    // 新增缓存
+    // 新增缓存 —— 根据当前 visitedViews 重新计算需要缓存的路由 name 列表
     addCachedView() {
       var _a2;
       const cacheMap = /* @__PURE__ */ new Set();
@@ -7675,16 +7675,19 @@ const useTagsViewStore = defineStore("layout-tagsView", {
           continue;
         }
         const name = item.name;
+        if (!name) {
+          continue;
+        }
         cacheMap.add(name);
       }
       if (Array.from(this.cachedViews).sort().toString() === Array.from(cacheMap).sort().toString())
         return;
       this.cachedViews = cacheMap;
     },
-    // 删除某个
+    // 删除某个tag及其缓存
     delView(view) {
       this.delVisitedView(view);
-      this.delCachedView();
+      this.addCachedView();
     },
     // 删除tag
     delVisitedView(view) {
@@ -7695,17 +7698,18 @@ const useTagsViewStore = defineStore("layout-tagsView", {
         }
       }
     },
-    // 删除缓存
-    delCachedView() {
+    // 删除指定视图的缓存，未传 view 时使用 selectedTag（用于刷新场景）
+    delCachedView(view) {
       var _a2;
-      if (((_a2 = this.selectedTag) == null ? void 0 : _a2.name) && this.cachedViews.has(this.selectedTag.name)) {
-        this.cachedViews.delete(this.selectedTag.name);
+      const routeName = (view == null ? void 0 : view.name) || ((_a2 = this.selectedTag) == null ? void 0 : _a2.name);
+      if (routeName && this.cachedViews.has(routeName)) {
+        this.cachedViews.delete(routeName);
       }
     },
     // 删除所有缓存和tag
     delAllViews() {
       this.delAllVisitedViews();
-      this.delCachedView();
+      this.addCachedView();
     },
     // 删除所有tag
     delAllVisitedViews() {
@@ -7905,7 +7909,7 @@ const useTagsView = () => {
     callback2 == null ? void 0 : callback2();
   };
   const refreshPage = async (view, callback2) => {
-    tagsViewStore.delCachedView();
+    tagsViewStore.delCachedView(view || unref(currentRoute));
     const { path, query } = view || unref(currentRoute);
     await nextTick();
     replace({
@@ -8274,6 +8278,8 @@ const _hoisted_1$c = { class: "sidebar-inner" };
 const _hoisted_2$a = ["onClick"];
 const _hoisted_3$9 = ["onClick"];
 const _hoisted_4$7 = ["onClick"];
+const _hoisted_5$5 = { key: 0 };
+const _hoisted_6$4 = { key: 1 };
 const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel" }, {
   __name: "ProductServicePanel",
   props: {
@@ -8291,53 +8297,64 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
     const emit = __emit;
     const router = useRouter();
     const permissionStore = usePermissionStore();
+    const getMenuTitle = (item) => {
+      var _a2;
+      const rawTitle = ((_a2 = item.meta) == null ? void 0 : _a2.title) || item.name || "";
+      return t2(rawTitle) || rawTitle;
+    };
+    const isVisible = (item) => {
+      var _a2;
+      return item.visible !== false && !((_a2 = item.meta) == null ? void 0 : _a2.hidden);
+    };
+    const searchInputRef = ref(null);
     const searchKeyword = ref("");
+    const debouncedKeyword = ref("");
+    let debounceTimer = null;
+    watch(searchKeyword, (val) => {
+      clearTimeout(debounceTimer);
+      if (!val) {
+        debouncedKeyword.value = "";
+      } else {
+        debounceTimer = setTimeout(() => {
+          debouncedKeyword.value = val;
+        }, 300);
+      }
+    });
     const activeCategory = ref(0);
     const routers = computed(() => permissionStore.getRoleRouters);
     const filteredMenus = computed(() => {
-      const keyword = searchKeyword.value.toLowerCase().trim();
-      const filterHiddenMenus = (items) => {
-        if (!items || !Array.isArray(items))
-          return [];
-        return items.filter((item) => !!item.visible).map((item) => ({
-          ...item,
-          children: item.children ? filterHiddenMenus(item.children) : []
-        }));
-      };
-      const baseMenus = filterHiddenMenus(routers.value);
-      if (!keyword) {
-        return baseMenus;
-      }
-      const filterFn = (items) => {
-        return items.reduce((result, item) => {
-          var _a2;
-          const title = ((_a2 = item.meta) == null ? void 0 : _a2.title) || "";
-          const isMatch = title.toLowerCase().includes(keyword);
+      const keyword = debouncedKeyword.value.toLowerCase().trim();
+      const items = routers.value;
+      if (!items || !Array.isArray(items))
+        return [];
+      const filterFn = (list) => {
+        return list.reduce((result, item) => {
+          if (!item.visible)
+            return result;
+          const displayTitle = getMenuTitle(item);
+          const isMatch = keyword && displayTitle.toLowerCase().includes(keyword);
           const children = item.children ? filterFn(item.children) : [];
-          if (isMatch || children.length > 0) {
+          if (!keyword || isMatch || children.length > 0) {
             result.push({
               ...item,
-              children: children.length > 0 ? children : item.children
+              children: isMatch ? item.children || [] : children
             });
           }
           return result;
         }, []);
       };
-      return filterFn(baseMenus);
+      return filterFn(items);
     });
     const groupedMenus = computed(() => {
       return filteredMenus.value.map((menu) => {
-        var _a2, _b;
+        var _a2;
         return {
           id: menu.id,
-          title: ((_a2 = menu.meta) == null ? void 0 : _a2.title) || menu.name,
-          icon: (_b = menu.meta) == null ? void 0 : _b.icon,
+          title: getMenuTitle(menu),
+          icon: (_a2 = menu.meta) == null ? void 0 : _a2.icon,
           path: menu.path,
           modulePath: menu.modulePath,
-          children: (menu.children || []).filter((item) => {
-            var _a3;
-            return !((_a3 = item.meta) == null ? void 0 : _a3.hidden);
-          })
+          children: (menu.children || []).filter(isVisible)
         };
       });
     });
@@ -8359,10 +8376,7 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
     const getAccessiblePath = (item, parentPath = "") => {
       const fullPath = joinPath(parentPath, item.path);
       if (item.children && item.children.length > 0) {
-        const visibleChildren = item.children.filter((child) => {
-          var _a2;
-          return !((_a2 = child.meta) == null ? void 0 : _a2.hidden);
-        });
+        const visibleChildren = item.children.filter(isVisible);
         if (visibleChildren.length > 0) {
           return getAccessiblePath(visibleChildren[0], fullPath);
         }
@@ -8371,7 +8385,9 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
     };
     const closePanel = () => {
       emit("update:visible", false);
+      clearTimeout(debounceTimer);
       searchKeyword.value = "";
+      debouncedKeyword.value = "";
       activeCategory.value = 0;
     };
     const handleSelect = (item, parentPath = "") => {
@@ -8395,12 +8411,42 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
     const handleCategorySelect = (index) => {
       activeCategory.value = index;
     };
+    watch(groupedMenus, () => {
+      var _a2;
+      if (activeCategory.value >= groupedMenus.value.length) {
+        activeCategory.value = 0;
+      }
+      if (groupedMenus.value.length > 0) {
+        const currentGroup = groupedMenus.value[activeCategory.value];
+        if (!((_a2 = currentGroup == null ? void 0 : currentGroup.children) == null ? void 0 : _a2.length)) {
+          const firstWithChildren = groupedMenus.value.findIndex((g) => {
+            var _a3;
+            return ((_a3 = g.children) == null ? void 0 : _a3.length) > 0;
+          });
+          if (firstWithChildren !== -1) {
+            activeCategory.value = firstWithChildren;
+          }
+        }
+      }
+    });
     watch(() => props.visible, (val) => {
       if (val) {
         searchKeyword.value = "";
+        debouncedKeyword.value = "";
         activeCategory.value = 0;
+        nextTick(() => {
+          var _a2;
+          (_a2 = searchInputRef.value) == null ? void 0 : _a2.focus();
+        });
       }
     });
+    const handleKeydown = (e2) => {
+      if (e2.key === "Escape" && props.visible) {
+        closePanel();
+      }
+    };
+    onMounted(() => document.addEventListener("keydown", handleKeydown));
+    onUnmounted(() => document.removeEventListener("keydown", handleKeydown));
     return (_ctx, _cache) => {
       return openBlock(), createBlock(Teleport, { to: "body" }, [
         createVNode(Transition, { name: "fade" }, {
@@ -8434,7 +8480,7 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
                             createElementVNode("div", _hoisted_1$c, [
                               (openBlock(true), createElementBlock(Fragment, null, renderList(groupedMenus.value, (group, index) => {
                                 return openBlock(), createElementBlock("div", {
-                                  key: index,
+                                  key: group.id || index,
                                   class: normalizeClass([
                                     unref(prefixCls2) + "__category",
                                     { "is-active": activeCategory.value === index }
@@ -8456,6 +8502,8 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
                           class: normalizeClass([unref(prefixCls2) + "__header"])
                         }, [
                           createVNode(unref(ElInput), {
+                            ref_key: "searchInputRef",
+                            ref: searchInputRef,
                             modelValue: searchKeyword.value,
                             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => searchKeyword.value = $event),
                             placeholder: unref(t2)("layout.common.searchMenu"),
@@ -8485,34 +8533,29 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
                             createElementVNode("div", {
                               class: normalizeClass([unref(prefixCls2) + "__grid-container"])
                             }, [
-                              currentCategoryMenus.value.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(currentCategoryMenus.value, (secondMenu, index) => {
-                                var _a2, _b;
+                              currentCategoryMenus.value.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(currentCategoryMenus.value, (secondMenu) => {
                                 return openBlock(), createElementBlock("div", {
-                                  key: index,
+                                  key: secondMenu.id || secondMenu.path,
                                   class: normalizeClass([unref(prefixCls2) + "__column"])
                                 }, [
                                   createElementVNode("div", {
                                     class: normalizeClass([unref(prefixCls2) + "__column-title"])
                                   }, [
-                                    createElementVNode("span", null, toDisplayString(((_a2 = secondMenu.meta) == null ? void 0 : _a2.title) || secondMenu.name), 1)
+                                    createElementVNode("span", null, toDisplayString(getMenuTitle(secondMenu)), 1)
                                   ], 2),
                                   createElementVNode("div", {
                                     class: normalizeClass([unref(prefixCls2) + "__column-list"])
                                   }, [
-                                    secondMenu.children && secondMenu.children.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(secondMenu.children.filter((c) => {
-                                      var _a3;
-                                      return !((_a3 = c.meta) == null ? void 0 : _a3.hidden);
-                                    }), (thirdMenu) => {
-                                      var _a3;
+                                    secondMenu.children && secondMenu.children.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(secondMenu.children.filter(isVisible), (thirdMenu) => {
                                       return openBlock(), createElementBlock("div", {
                                         key: thirdMenu.path,
                                         class: normalizeClass([unref(prefixCls2) + "__column-item"]),
                                         onClick: ($event) => {
-                                          var _a4;
-                                          return handleSelect(thirdMenu, joinPath((_a4 = groupedMenus.value[activeCategory.value]) == null ? void 0 : _a4.path, secondMenu.path));
+                                          var _a2;
+                                          return handleSelect(thirdMenu, joinPath((_a2 = groupedMenus.value[activeCategory.value]) == null ? void 0 : _a2.path, secondMenu.path));
                                         }
                                       }, [
-                                        createElementVNode("span", null, toDisplayString(((_a3 = thirdMenu.meta) == null ? void 0 : _a3.title) || thirdMenu.name), 1)
+                                        createElementVNode("span", null, toDisplayString(getMenuTitle(thirdMenu)), 1)
                                       ], 10, _hoisted_3$9);
                                     }), 128)) : (openBlock(), createElementBlock("div", {
                                       key: 1,
@@ -8521,11 +8564,11 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
                                         { [unref(prefixCls2) + "__column-item--disabled"]: secondMenu.type === 1 }
                                       ]),
                                       onClick: ($event) => {
-                                        var _a3;
-                                        return secondMenu.type === 2 && handleSelect(secondMenu, (_a3 = groupedMenus.value[activeCategory.value]) == null ? void 0 : _a3.path);
+                                        var _a2;
+                                        return secondMenu.type === 2 && handleSelect(secondMenu, (_a2 = groupedMenus.value[activeCategory.value]) == null ? void 0 : _a2.path);
                                       }
                                     }, [
-                                      createElementVNode("span", null, toDisplayString(secondMenu.type === 1 ? unref(t2)("layout.common.noData") || "暂无" : ((_b = secondMenu.meta) == null ? void 0 : _b.title) || secondMenu.name), 1)
+                                      secondMenu.type === 1 ? (openBlock(), createElementBlock("span", _hoisted_5$5, toDisplayString(unref(t2)("layout.common.noData") || "暂无"), 1)) : (openBlock(), createElementBlock("span", _hoisted_6$4, toDisplayString(getMenuTitle(secondMenu)), 1))
                                     ], 10, _hoisted_4$7))
                                   ], 2)
                                 ], 2);
@@ -8570,7 +8613,7 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
     };
   }
 });
-const ProductServicePanel = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-ab102b18"]]);
+const ProductServicePanel = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-909615b6"]]);
 const _sfc_main$q = /* @__PURE__ */ Object.assign({ name: "Logo" }, {
   __name: "Logo",
   emits: ["logo-click"],
@@ -8641,9 +8684,28 @@ const _sfc_main$p = /* @__PURE__ */ Object.assign({ name: "AppView" }, {
   __name: "AppView",
   setup(__props) {
     const tagsViewStore = useTagsViewStore();
+    useRoute();
     const getCaches = computed(() => {
       return tagsViewStore.getCachedViews;
     });
+    const wrapperCache = /* @__PURE__ */ new Map();
+    const getWrappedComponent = (Component, routeName) => {
+      if (!Component || !routeName)
+        return Component;
+      if (wrapperCache.has(routeName))
+        return wrapperCache.get(routeName);
+      const wrapper = defineComponent({
+        name: routeName,
+        setup(_, { slots }) {
+          return () => {
+            var _a2;
+            return (_a2 = slots.default) == null ? void 0 : _a2.call(slots);
+          };
+        }
+      });
+      wrapperCache.set(routeName, wrapper);
+      return wrapper;
+    };
     const routerAlive = ref(true);
     const reload = () => {
       routerAlive.value = false;
@@ -8656,9 +8718,14 @@ const _sfc_main$p = /* @__PURE__ */ Object.assign({ name: "AppView" }, {
         unref(routerAlive) ? (openBlock(), createBlock(_component_router_view, { key: 0 }, {
           default: withCtx(({ Component, route }) => [
             (openBlock(), createBlock(KeepAlive, { include: unref(getCaches) }, [
-              (openBlock(), createBlock(resolveDynamicComponent(Component), {
-                key: route.fullPath
-              }))
+              (openBlock(), createBlock(resolveDynamicComponent(getWrappedComponent(Component, route.name)), {
+                key: route.path
+              }, {
+                default: withCtx(() => [
+                  (openBlock(), createBlock(resolveDynamicComponent(Component)))
+                ]),
+                _: 2
+              }, 1024))
             ], 1032, ["include"]))
           ]),
           _: 1
@@ -10285,7 +10352,7 @@ const _sfc_main$b = /* @__PURE__ */ Object.assign({ name: "PageNavBar" }, {
     };
   }
 });
-const PageNavBar = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-0d587176"]]);
+const PageNavBar = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-17aee006"]]);
 const _sfc_main$a = /* @__PURE__ */ Object.assign({ name: "Badge" }, {
   __name: "Badge",
   props: {