@pubinfo/core 2.1.8 → 2.1.9

package/dist/built-in/layout-component/composables/useGetComputedStyle.d.ts

@@ -1,3 +1,4 @@
+import { LayoutProps } from '../interface';
 /**
  * 获取指定元素的计算样式属性值
  * @param property - 要获取的样式属性
@@ -9,7 +10,7 @@ export declare function useGetComputedStyle(property: string, root?: HTMLElement
  * 根据各种设置和条件计算主侧边栏和子侧边栏的实际宽度。
  * @returns 包含主侧边栏和子侧边栏实际宽度的计算属性对象。
  */
-export declare function useGetSidebarActualWidth(): {
+export declare function useGetSidebarActualWidth(props?: LayoutProps): {
     mainSidebarActualWidth: any;
     subSidebarActualWidth: any;
 };

package/dist/index.js

@@ -858,7 +858,7 @@ function useLayoutVisible(e) {
 		}, Dv = I.sidebarMenus, { menuMode: Ov, subMenuOnlyOneHide: kv, enableSubMenuCollapseButton: Av } = M.settings.menu, jv = M.mode, Mv = M.settings.tabbar.enable, Nv = M.settings.favorites.enable, Pv = M.settings.breadcrumb.enable;
 		return {
 			header: jv === "pc" && ["head", "only-head"].includes(Ov) && e.header && V?.showHeader,
-			mainSidebar: (jv === "mobile" && Ov !== "single" || ["side", "only-side"].includes(Ov)) && V?.showSidebar,
+			mainSidebar: (jv === "mobile" && Ov !== "single" || ["side", "only-side"].includes(Ov)) && e.sidebar && V?.showSidebar,
 			subSidebar: (jv === "mobile" || [
 				"side",
 				"head",
@@ -6406,16 +6406,16 @@ var star_16_regular_default = markRaw({
 function useGetComputedStyle(e, j = document.documentElement) {
 	return getComputedStyle(j).getPropertyValue(e).trim();
 }
-function useGetSidebarActualWidth() {
-	let { settingsStore: e, menuStore: j } = useContext();
+function useGetSidebarActualWidth(e) {
+	let { settingsStore: j, menuStore: M } = useContext(), { show: I } = useLayoutVisible(e);
 	return {
 		mainSidebarActualWidth: computed(() => {
-			let j = e.settings.menu.menuMode, M = e.mode !== "mobile", I = j === "single", V = ["head", "only-head"].includes(j);
-			return I || V && M ? "0px" : useGetComputedStyle("--g-main-sidebar-width");
+			let e = j.settings.menu.menuMode, M = j.mode !== "mobile", V = e === "single", J = ["head", "only-head"].includes(e);
+			return !I.value.mainSidebar || V || J && M ? "0px" : useGetComputedStyle("--g-main-sidebar-width");
 		}),
 		subSidebarActualWidth: computed(() => {
-			let M = useGetComputedStyle("--g-sub-sidebar-width"), I = e.settings.menu.subMenuCollapse, V = e.settings.menu.subMenuOnlyOneHide, J = e.settings.menu.menuMode, Dv = e.mode !== "mobile", Ov = ["only-side", "only-head"].includes(J);
-			return I && Dv && (M = useGetComputedStyle("--g-sub-sidebar-collapse-width")), Ov && Dv && (M = "0px"), V && j.sidebarMenus.length === 1 && (!j.sidebarMenus[0].children || j.sidebarMenus[0]?.children.every((e) => e.meta?.sidebar === !1)) && (M = "0px"), M;
+			let e = useGetComputedStyle("--g-sub-sidebar-width"), V = j.settings.menu.subMenuCollapse, J = j.settings.menu.subMenuOnlyOneHide, Dv = j.settings.menu.menuMode, Ov = j.mode !== "mobile", kv = ["only-side", "only-head"].includes(Dv);
+			return V && Ov && (e = useGetComputedStyle("--g-sub-sidebar-collapse-width")), I.value.subSidebar || (e = "0px"), kv && Ov && (e = "0px"), J && M.sidebarMenus.length === 1 && (!M.sidebarMenus[0].children || M.sidebarMenus[0]?.children.every((e) => e.meta?.sidebar === !1)) && (e = "0px"), e;
 		})
 	};
 }
@@ -6530,7 +6530,7 @@ var _hoisted_1$1 = { class: "wrapper" }, _hoisted_2$1 = { class: "main" }, Layou
 	setup(e) {
 		let j = e;
 		createLayoutVisible(j);
-		let { show: M } = useLayoutVisible(j), I = useRoute(), { auth: V } = useAuth(), { settingsStore: J } = useContext(), { mainSidebarActualWidth: Dv, subSidebarActualWidth: Ov } = useGetSidebarActualWidth();
+		let { show: M } = useLayoutVisible(j), I = useRoute(), { auth: V } = useAuth(), { settingsStore: J } = useContext(), { mainSidebarActualWidth: Dv, subSidebarActualWidth: Ov } = useGetSidebarActualWidth(j);
 		useHotkey(), useWatermark();
 		let kv = computed(() => I.matched.every((e) => V(e.meta.auth ?? "")));
 		watch(() => J.settings.menu.subMenuCollapse, (e) => {
@@ -6592,7 +6592,7 @@ var _hoisted_1$1 = { class: "wrapper" }, _hoisted_2$1 = { class: "main" }, Layou
 			createVNode(BackTop_default)
 		], 4));
 	}
-}), [["__scopeId", "data-v-54c1c8e1"]]), sides = [
+}), [["__scopeId", "data-v-486fb888"]]), sides = [
 	"top",
 	"right",
 	"bottom",