@pubinfo/core 2.1.10 → 2.1.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "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.12",
+    "@pubinfo/devtools": "2.1.12",
+    "@pubinfo/vite": "2.1.12"
   },
   "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.12"
   },
   "devDependencies": {
     "@alova/mock": "^2.0.18",
@@ -89,12 +89,12 @@
     "unplugin-auto-import": "^21.0.0",
     "unplugin-icons": "^23.0.1",
     "unplugin-vue-components": "^31.0.0",
-    "vite": "^8.0.0-beta.13",
+    "vite": "^8.0.0",
     "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.12",
+    "@pubinfo/vite": "2.1.12"
   },
   "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,
     });
 

package/dist/AppSetting-7jlhUzze.js

@@ -1,105 +0,0 @@
-import { n as useClipboard } from "./dist-7OjQvlya.js";
-import { t as _plugin_vue_export_helper_default } from "./_plugin-vue_export-helper-sUTDUeGO.js";
-import { n as useContext } from "./useContext-DLtu9F7E.js";
-import { t as HButton_default } from "./HButton-Dt6qGhhR.js";
-import { t as HSlideover_default } from "./HSlideover-DVQDc9q6.js";
-import { Fragment, computed, createBlock, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineAsyncComponent, defineComponent, markRaw, openBlock, renderList, resolveComponent, resolveDynamicComponent, unref, useModel, watch, withCtx } from "vue";
-import { useRoute } from "vue-router";
-import Message from "vue-m-message";
-var _hoisted_1$1 = {
-	viewBox: "0 0 1024 1024",
-	width: "1.2em",
-	height: "1.2em"
-};
-function render$1(e, t) {
-	return openBlock(), createElementBlock("svg", _hoisted_1$1, [...t[0] ||= [createElementVNode("path", {
-		fill: "currentColor",
-		d: "M128 320v576h576V320zm-32-64h640a32 32 0 0 1 32 32v640a32 32 0 0 1-32 32H96a32 32 0 0 1-32-32V288a32 32 0 0 1 32-32M960 96v704a32 32 0 0 1-32 32h-96v-64h64V128H384v64h-64V96a32 32 0 0 1 32-32h576a32 32 0 0 1 32 32M256 672h320v64H256zm0-192h320v64H256z"
-	}, null, -1)]]);
-}
-var document_copy_default = markRaw({
-	name: "ep-document-copy",
-	render: render$1
-}), _hoisted_1 = { class: "settong-warp" }, AppSetting_default = /* @__PURE__ */ _plugin_vue_export_helper_default(/* @__PURE__ */ defineComponent({
-	name: "AppSetting",
-	components: {
-		SettingThemes: defineAsyncComponent(() => import("./SettingThemes-CkdzS1xt.js")),
-		SettingsMode: defineAsyncComponent(() => import("./SettingMode-B8H_eQc8.js")),
-		SettingWidthMode: defineAsyncComponent(() => import("./SettingWidthMode-DlG6lXjA.js")),
-		SettingEnableTransition: defineAsyncComponent(() => import("./SettingEnableTransition-61O7W00b.js")),
-		SettingMenu: defineAsyncComponent(() => import("./SettingMenu-BvwJOUZV.js")),
-		SettingTopbar: defineAsyncComponent(() => import("./SettingTopbar-1shjoe3s.js")),
-		SettingTabbar: defineAsyncComponent(() => import("./SettingTabbar-Bky2xvH-.js")),
-		SettingToolbar: defineAsyncComponent(() => import("./SettingToolbar-CD4qns1J.js")),
-		SettingBreadcrumb: defineAsyncComponent(() => import("./SettingBreadcrumb-O9-PhAFT.js")),
-		SettingPage: defineAsyncComponent(() => import("./SettingPage-B82lW41P.js")),
-		SettingNavSearch: defineAsyncComponent(() => import("./SettingNavSearch-BHsmYBA7.js")),
-		SettingCopyright: defineAsyncComponent(() => import("./SettingCopyright-DIKsWTuf.js")),
-		SettingHome: defineAsyncComponent(() => import("./SettingHome-Sv65TPH8.js")),
-		SettingOther: defineAsyncComponent(() => import("./SettingOther-CyyNnaDX.js"))
-	},
-	__name: "AppSetting",
-	props: {
-		open: { default: !1 },
-		openModifiers: {}
-	},
-	emits: ["update:open"],
-	setup(t) {
-		let i = useModel(t, "open"), a = useRoute(), { settingsStore: o, menuStore: s } = useContext(), c = computed(() => o.mode !== "pc"), l = computed(() => m([
-			"SettingThemes",
-			"SettingsMode",
-			"SettingWidthMode",
-			"SettingEnableTransition",
-			"SettingMenu",
-			"SettingTopbar",
-			"SettingTabbar",
-			"SettingToolbar",
-			"SettingBreadcrumb",
-			"SettingPage",
-			"SettingNavSearch",
-			"SettingHome",
-			"SettingCopyright",
-			"SettingOther"
-		], [
-			"SettingsMode",
-			"SettingWidthMode",
-			"SettingEnableTransition",
-			"SettingBreadcrumb"
-		]));
-		watch(() => o.settings.menu.menuMode, (e) => {
-			e === "single" ? s.setActived(0) : s.setActived(a.fullPath);
-		});
-		let { copy: u, copied: d, isSupported: f } = useClipboard();
-		watch(d, (e) => {
-			e && Message.success("复制成功，请粘贴到 src/settings.ts 文件中！", { zIndex: 2e3 });
-		});
-		function p() {
-			u(JSON.stringify(o.settings, null, 2));
-		}
-		function m(e, t) {
-			return e.filter((e) => c.value ? !t.includes(e) : e);
-		}
-		return (e, t) => {
-			let n = HButton_default, r = HSlideover_default;
-			return openBlock(), createBlock(r, {
-				modelValue: i.value,
-				"onUpdate:modelValue": t[0] ||= (e) => i.value = e,
-				title: "应用配置"
-			}, createSlots({
-				default: withCtx(() => [createElementVNode("div", _hoisted_1, [t[1] ||= createElementVNode("div", { class: "rounded-2 bg-rose/20 px-4 py-2 text-sm/6 c-rose" }, [createElementVNode("p", { class: "my-1" }, " 应用配置可实时预览效果，但只是临时生效，要想真正应用于项目，可以点击下方的「复制配置」按钮，并将配置粘贴到 src/settings.ts 文件中。 "), createElementVNode("p", { class: "my-1" }, " 注意：在生产环境中应关闭该模块。 ")], -1), (openBlock(!0), createElementBlock(Fragment, null, renderList(unref(l), (e) => (openBlock(), createBlock(resolveDynamicComponent(e), { key: e }))), 128))])]),
-				_: 2
-			}, [unref(f) ? {
-				name: "footer",
-				fn: withCtx(() => [createVNode(n, {
-					block: "",
-					onClick: p
-				}, {
-					default: withCtx(() => [createVNode(unref(document_copy_default)), t[2] ||= createTextVNode(" 复制配置 ", -1)]),
-					_: 1
-				})]),
-				key: "0"
-			} : void 0]), 1032, ["modelValue"]);
-		};
-	}
-}), [["__scopeId", "data-v-10c15033"]]);
-export { AppSetting_default as default };

package/dist/HCheckList-cPBgATmv.js

@@ -1,33 +0,0 @@
-import { a as PubinfoIcon_default } from "./components-DFNyaAb9.js";
-import { Fragment, createBlock, createElementBlock, createTextVNode, defineComponent, normalizeClass, openBlock, renderList, toDisplayString, unref, watch } from "vue";
-var _hoisted_1 = { class: "inline-flex select-none items-center justify-center of-hidden rounded-md bg-stone-3 dark:bg-stone-7" }, _hoisted_2 = ["disabled", "onClick"], HCheckList_default = /* @__PURE__ */ defineComponent({
-	__name: "HCheckList",
-	props: {
-		modelValue: {},
-		options: {},
-		disabled: {
-			type: Boolean,
-			default: !1
-		}
-	},
-	emits: ["update:modelValue", "change"],
-	setup(t, { emit: i }) {
-		let a = t, o = i;
-		watch(() => a.modelValue, (e) => {
-			o("change", e);
-		});
-		function s(e) {
-			o("update:modelValue", e);
-		}
-		return (r, i) => (openBlock(), createElementBlock("div", _hoisted_1, [(openBlock(!0), createElementBlock(Fragment, null, renderList(t.options, (n) => (openBlock(), createElementBlock("button", {
-			key: n.value,
-			disabled: t.disabled || n.disabled,
-			class: normalizeClass(["flex cursor-pointer items-center truncate border-size-0 bg-inherit px-2 py-1.5 text-sm disabled:cursor-not-allowed disabled:opacity-50 hover:not-disabled:(bg-ui-primary text-ui-text)", { "text-ui-text bg-ui-primary": t.modelValue === n.value }]),
-			onClick: (e) => s(n.value)
-		}, [n.icon ? (openBlock(), createBlock(unref(PubinfoIcon_default), {
-			key: 0,
-			name: n.icon
-		}, null, 8, ["name"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [createTextVNode(toDisplayString(n.label), 1)], 64))], 10, _hoisted_2))), 128))]));
-	}
-});
-export { HCheckList_default as t };

package/dist/HDivider-BwvBr5OE.js

@@ -1,11 +0,0 @@
-import { createElementBlock, createElementVNode, defineComponent, openBlock, renderSlot, toDisplayString } from "vue";
-var _hoisted_1 = { "w-full": "" }, _hoisted_2 = { class: "flex items-center justify-between gap-4 my-4 whitespace-nowrap text-sm font-500 before:content-empty before:w-full before:h-1px before:bg-stone-2 dark:before:bg-stone-6 after:content-empty after:w-full after:h-1px after:bg-stone-2 dark:after:bg-stone-6" }, _hoisted_3 = { class: "px-2.5 py-[5px]" }, HDivider_default = /* @__PURE__ */ defineComponent({
-	name: "HDivider",
-	__name: "HDivider",
-	props: { title: {} },
-	setup(e) {
-		let t = e;
-		return (e, n) => (openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [createElementVNode("div", _hoisted_3, toDisplayString(t.title), 1)]), renderSlot(e.$slots, "default")]));
-	}
-});
-export { HDivider_default as t };

package/dist/HInput-KJ5nFBpF.js

@@ -1,34 +0,0 @@
-import { createElementBlock, createElementVNode, defineComponent, openBlock, ref } from "vue";
-var _hoisted_1 = { class: "relative w-full lg:w-48" }, _hoisted_2 = [
-	"value",
-	"placeholder",
-	"disabled"
-], HInput_default = /* @__PURE__ */ defineComponent({
-	__name: "HInput",
-	props: {
-		modelValue: {},
-		placeholder: {},
-		disabled: {
-			type: Boolean,
-			default: !1
-		}
-	},
-	emits: ["update:modelValue"],
-	setup(t, { expose: r, emit: i }) {
-		let a = i, o = ref();
-		function s(e) {
-			a("update:modelValue", e.target.value);
-		}
-		return r({ ref: o }), (n, r) => (openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("input", {
-			ref_key: "inputRef",
-			ref: o,
-			type: "text",
-			value: t.modelValue,
-			placeholder: t.placeholder,
-			disabled: t.disabled,
-			class: "relative block w-full border-0 rounded-md bg-white px-2.5 py-1.5 text-sm shadow-sm ring-1 ring-stone-2 ring-inset disabled:cursor-not-allowed dark:bg-dark disabled:opacity-50 focus:outline-none focus:ring-2 dark:ring-stone-8 focus:ring-ui-primary placeholder-stone-4 dark:placeholder-stone-5",
-			onInput: s
-		}, null, 40, _hoisted_2)]));
-	}
-});
-export { HInput_default as t };