@pubinfo/core 2.1.10 → 2.1.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -31,9 +31,9 @@
     "pinia": "^3.0.4",
     "vue": "^3.5.28",
     "vue-router": "^5.0.2",
-    "@pubinfo/config": "2.1.10",
-    "@pubinfo/devtools": "2.1.10",
-    "@pubinfo/vite": "2.1.10"
+    "@pubinfo/config": "2.1.11",
+    "@pubinfo/devtools": "2.1.11",
+    "@pubinfo/vite": "2.1.11"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.17",
@@ -63,7 +63,7 @@
     "unctx": "^2.5.0",
     "vue-m-message": "^4.0.2",
     "zxcvbn": "^4.4.2",
-    "@pubinfo/shared": "2.1.10"
+    "@pubinfo/shared": "2.1.11"
   },
   "devDependencies": {
     "@alova/mock": "^2.0.18",
@@ -93,8 +93,8 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.28",
     "vue-router": "^5.0.2",
-    "@pubinfo/config": "2.1.10",
-    "@pubinfo/vite": "2.1.10"
+    "@pubinfo/config": "2.1.11",
+    "@pubinfo/vite": "2.1.11"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/built-in/layout-component/components/Menu/item.vue

@@ -18,7 +18,7 @@ const props = withDefaults(
 );
 
 const rootMenu = inject(rootMenuInjectionKey)!;
-const { generateTitle } = useContext();
+const { generateTitle, indentSize } = useContext();
 
 const itemRef = ref<HTMLElement>();
 
@@ -70,7 +70,7 @@ const safeIconColor = computed<string | undefined>(() => iconOptions.value?.icon
 // 缩进样式
 const indentStyle = computed(() => {
   return !rootMenu.isMenuPopup
-    ? `padding-left: ${32 * (props.level ?? 0)}px`
+    ? `padding-left: ${indentSize * (props.level ?? 0)}px`
     : '';
 });
 

package/src/built-in/layout-component/components/Menu/sub.vue

@@ -193,8 +193,9 @@ function handleMouseleave() {
   />
   <Teleport v-if="hasChildren" to="body" :disabled="!rootMenu.isMenuPopup">
     <Transition v-bind="transitionClass" v-on="transitionEvent">
+      <!-- Popup submenu: use OverlayScrollbars so it can scroll independently -->
       <OverlayScrollbarsComponent
-        v-if="opened"
+        v-if="opened && rootMenu.isMenuPopup"
         ref="subMenuRef"
         :options="{ scrollbars: { visibility: 'hidden' } }"
         defer
@@ -215,6 +216,24 @@ function handleMouseleave() {
           />
         </template>
       </OverlayScrollbarsComponent>
+
+      <!-- Inline submenu (non-popup): render as plain container to allow parent scroll -->
+      <div
+        v-else-if="opened"
+        class="sub-menu"
+        :class="{
+          'rounded-2 py-1': rootMenu.props.rounded && !rootMenu.isMenuPopup,
+        }"
+      >
+        <template v-for="item in menu.children" :key="item.path ?? JSON.stringify(item)">
+          <SubMenu
+            v-if="item.meta?.sidebar !== false"
+            :unique-key="[...uniqueKey, item.path ?? JSON.stringify(item)]"
+            :menu="item"
+            :level="level + 1"
+          />
+        </template>
+      </div>
     </Transition>
   </Teleport>
 </template>

package/src/built-in/layout-component/composables/useContext.ts

@@ -22,6 +22,7 @@ interface LayoutContext {
 
   appTitle: string
   isDev: boolean
+  indentSize: number
   generateTitle: (titile?: string | (() => any)) => string
 }
 

package/src/built-in/layout-component/provider.ts

@@ -24,6 +24,10 @@ export const Provider = defineComponent({
       type: Boolean,
       default: false,
     },
+    indentSize: {
+      type: Number,
+      default: 32,
+    },
   },
   setup(props, { slots }) {
     const settingsStore = useSettingsStore();
@@ -49,6 +53,7 @@ export const Provider = defineComponent({
 
       appTitle: props.appTitle,
       isDev: props.isDev,
+      indentSize: props.indentSize,
       generateTitle,
     });