update: 更新

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/App.vue

@@ -17,4 +17,7 @@ onMounted(()=>{
   height: 100%;
   width: 100%;
 }
+.app-loading-x {
+  display: none;
+}
 </style>
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/common/app-user.vue

 <script setup lang="ts">
-/**
- *
- *
- * @param {*} name
- * @param {*} value
- * @param {*} bb
- * @memberof IbizUser
- */
+import { toggleFullScreen } from '@core';
+import { FullscreenOutlined, FullscreenExitOutlined, LockOutlined, PoweroffOutlined  } from '@ant-design/icons-vue';
+import { Ref } from 'vue';
+
+let isFullScreen: Ref<boolean> = ref(false);
+
 const dropdownClick = (value: any) => {
   const { key } = value;
   
   // todo
   switch (key) {
     case 'fullScreen':
+      isFullScreen.value = toggleFullScreen();
       break;
     case 'screenLock':
       break;
@@ -22,12 +21,11 @@ const dropdownClick = (value: any) => {
       break;
     case 'logout':
       break;
-
-    default:
-      break;
   }
 };
 
+
+
 /**
  * 用户数据
  *
@@ -43,68 +41,27 @@ onMounted(() => {
   // initUser todo
 });
 
-/**
- * 用户下拉列表
- *
- * @memberof IbizUser
- */
-const dropdownList = [
-  {
-    tag: 'fullScreen',
-    label: '应用全屏',
-  },
-  {
-    tag: 'screenLock',
-    label: '应用屏锁',
-  },
-  {
-    tag: 'changeTheme',
-    label: '修改主题',
-  },
-  {
-    tag: 'updatePwd',
-    label: '修改密码',
-  },
-  {
-    tag: 'logout',
-    label: '退出登录',
-  },
-];
 </script>
 
 <template>
   <div class="app-user">
-    <span class="user-name">{{ user.name }}</span>
     <a-dropdown>
+      <div class="user-info">
+        <span class="user-name">{{ user.name }}</span>
         <a-avatar size="large" :src="user.avatar" @click.prevent>
           <template #icon><AppIconText iconClass="fa fa-user-o"></AppIconText></template>
         </a-avatar>
+      </div>
       <template #overlay>
         <a-menu @click="dropdownClick">
-          <a-menu-item :value="item.tag" v-for="item in dropdownList" :key="item.tag">
-            {{ item.label }}
+          <a-menu-item value="fullScreen" key="fullScreen">
+            <fullscreen-outlined v-show="!isFullScreen" class="app-user-icon"/>
+            <fullscreen-exit-outlined v-show="isFullScreen" class="app-user-icon"/>应用全屏
           </a-menu-item>
+          <a-menu-item value="screenLock" key="screenLock"><lock-outlined class="app-user-icon"/>应用屏锁</a-menu-item>
+          <a-menu-item value="logout" key="logout"><poweroff-outlined class="app-user-icon"/>退出登录</a-menu-item>
         </a-menu>
       </template>
     </a-dropdown>
   </div>
 </template>
-
-<style lang='scss'>
-.app-user {
-  .user-name {
-    padding-right: 10px;
-  }
-  .app-icon-text {
-    text-align: center;
-    width: 100%;
-    height: 100%;
-    i {
-      width: 100%;
-      text-align: center;
-      font-size: 20px;
-      line-height: 16px;
-    }
-  }
-}
-</style>

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/common/ui-base.ts

@@ -92,4 +92,33 @@ export class UIBase {
         );
         return { context: _context, viewParams: _viewParams };
     }
+
+}
+
+/**
+ * @description 切换应用全屏
+ * @export
+ * @return {*}  {boolean}
+ */
+export function toggleFullScreen(): boolean {
+  const isFullscreen = (document as any).isFullScreen || (document as any).mozIsFullScreen || (document as any).webkitIsFullScreen;
+  if (isFullscreen) {
+    if ((document as any).documentElement.requestFullScreen) {
+      (document as any).exitFullScreen();
+    } else if ((document as any).documentElement.webkitRequestFullScreen) {
+      (document as any).webkitCancelFullScreen();
+    } else if ((document as any).documentElement.mozRequestFullScreen) {
+      (document as any).mozCancelFullScreen();
+    }
+    return false;
+  } else {
+    if ((document as any).documentElement.requestFullScreen) {
+      (document as any).documentElement.requestFullScreen();
+    } else if ((document as any).documentElement.webkitRequestFullScreen) {
+      (document as any).documentElement.webkitRequestFullScreen();
+    } else if ((document as any).documentElement.mozRequestFullScreen) {
+      (document as any).documentElement.mozRequestFullScreen();
+    }
+    return true;
+  }
 }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/components/common/app-user.scss

+.app-user {
+  .user-info {
+    cursor: pointer;
+    .user-name {
+      padding-right: 10px;
+    }
+  }
+  .app-icon-text {
+    text-align: center;
+    width: 100%;
+    height: 100%;
+    i {
+      width: 100%;
+      text-align: center;
+      font-size: 20px;
+      line-height: 16px;
+    }
+  }
+}
+.app-user-icon {
+  margin-right: 8px;
+}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/components/common/index.scss

@@ -3,3 +3,4 @@
 @use './icon-text.scss';
 @use './app-quick-group.scss';
 @use './app-menu-center.scss';
+@use './app-user.scss';
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/components/layout/app-default-index-view-base-layout.scss

@@ -2,16 +2,22 @@
   height: 100%;
   width: 100%;
   .index-view-header {
-    
+    display: flex;
+    align-items: center;
+    font-size: 18px;
+    .sys-title {
+      width: 180px;
+      padding-left: 12px;
+    }
+    .trigger:hover {
+      color: var(--app-color-primary);
+    }
   }
   .center-menu-card {
     height: 100%;
     overflow: auto;
   }
-  .index-view-header {
-    font-size: 18px;
-    .trigger:hover {
-      color: #1890ff;
-    }
+  .ant-layout-content {
+    padding: 12px;
   }
 }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/components/layout/app-index-view-base-layout.scss

@@ -3,17 +3,18 @@
   height: 100%;
   .ant-layout-sider {
     overflow-y: auto;
-    background-color: var(--app-view-layout-header-bg-color);
+    background-color: var(--app-index-view-layout-side-bg-color);
   }
 }
 .app-index-view-layout__header {
   display: flex;
   padding: 0 20px;
-  background-color: var(--app-view-layout-header-bg-color);
+  color: var(--app-index-view-layout-header-color);
+  background-color: var(--app-index-view-layout-header-bg-color);
   justify-content: space-between;
 }
 .app-index-view-layout__body {
-  background-color: var(--app-view-layout-header-bg-color);
+  background-color: var(--app-index-view-layout-body-bg-color);
 }
 .app-index-view-layout__footer {
   padding: 0;

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/var/component.scss

@@ -13,9 +13,11 @@
 // layout 组件样式
 
 .app-index-view-layout{
-  --app-view-layout-header-bg-color: var(--app-color-white);
-  --app-view-layout-body-bg-color: var(--app-color-white);
-  --app-view-layout-footer-bg-color: var(--app-color-white);
+  --app-index-view-layout-header-color: var(--app-color-white);
+  --app-index-view-layout-header-bg-color: #0B3F80;
+  --app-index-view-layout-side-bg-color: var(--app-color-white);
+  --app-index-view-layout-body-bg-color: #f6f6f6;
+  --app-index-view-layout-footer-bg-color: var(--app-color-white);
 }
 .app-view-layout{
   --app-view-layout-padding: 8px 12px 10px;