v3.7.2 版本代码合并

jeecgboot-vue3/src/layouts/default/sider/LayoutSider.vue

@@ -30,12 +30,15 @@
 
   import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
 
+  import { useAppStore } from "@/store/modules/app";
+  import { useGlobSetting } from "/@/hooks/setting";
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useTrigger, useDragLine, useSiderEvent } from './useLayoutSider';
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useDesign } from '/@/hooks/web/useDesign';
 
   import DragBar from './DragBar.vue';
+
   export default defineComponent({
     name: 'LayoutSideBar',
     components: { Sider: Layout.Sider, LayoutMenu, DragBar, LayoutTrigger },
@@ -48,6 +51,9 @@
 
       const { prefixCls } = useDesign('layout-sideBar');
 
+      const glob = useGlobSetting()
+      const appStore = useAppStore()
+
       const { getIsMobile } = useAppInject();
 
       const { getTriggerAttr, getShowTrigger } = useTrigger(getIsMobile);
@@ -65,6 +71,10 @@
       });
 
       const showClassSideBarRef = computed(() => {
+        // 控制是否显示侧边栏
+        if (appStore.mainAppProps.hideSider) {
+          return false;
+        }
         return unref(getSplit) ? !unref(getMenuHidden) : true;
       });
 
@@ -74,6 +84,8 @@
           {
             [`${prefixCls}--fixed`]: unref(getMenuFixed),
             [`${prefixCls}--mix`]: unref(getIsMixMode) && !unref(getIsMobile),
+            // 【JEECG作为乾坤子应用】
+            [`${prefixCls}--qiankun-micro`]: glob.isQiankunMicro,
           },
         ];
       });
@@ -131,6 +143,11 @@
       height: 100%;
     }
 
+    // 【JEECG作为乾坤子应用】
+    &--qiankun-micro {
+      position: absolute !important;
+    }
+
     &--mix {
       top: @header-height;
       height: calc(100% - @header-height);