Merge remote-tracking branch 'origin/master'

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

@@ -27,38 +27,5 @@
 </template>
 
 <style lang="scss">
-.ibiz-view-layout {
-  padding: 8px 12px 10px;
-  display: flex;
-  flex-direction: column;
-  .ibiz-view-layout__header {
-    flex: none;
-    display: flex;
-    flex-direction: column;
-    background: #fff;
-    .ibiz-view-layout__header-content {
-      height: 48px;
-      display: flex;
-      justify-content: space-between;
-      margin: 0 10px;
-      border-bottom: 1px solid #E4E4E4;
-      .ibiz-view__caption {
-        font-size: 18px;
-      }
-    }
-  }
-  .ibiz-view-layout__body {
-    flex: auto;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-  }
-  .ibiz-view-footer {
-    flex: none;
-    display: flex;
-    justify-content: space-between;
-  }
-}
 
 </style>
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/page/{{appModules}}/{{pages@DEEDITVIEW}}/{{pages@DEEDITVIEW}}.vue.hbs

@@ -68,9 +68,4 @@ const { state, handleToolbarEvent } = new EditView(ViewConfig).moduleInstall(pro
 </template>
 
 <style lang="scss">
-.ibiz-edit-view {
-  height: 100%;
-  width: 100%;
-  overflow: auto;
-}
 </style>
\ No newline at end of file

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

-@use './render'
\ No newline at end of file
+@use './render';
+@use './layout';
\ No newline at end of file

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

+.ibiz-view-layout {
+  display: flex;
+  flex-direction: column;
+  padding: var(--ibiz-view-layout-padding);
+  background-color: var(--ibiz-view-layout-bg-color);
+}
+.ibiz-view-layout__header {
+  flex: none;
+  display: flex;
+  flex-direction: column;
+}
+.ibiz-view-layout__header-content {
+  display: flex;
+  justify-content: space-between;
+  height: var(--ibiz-view-layout-header-height);
+  border-bottom:var(--ibiz-view-layout-header-border-bottom);
+  margin: --ibiz-view-layout-header-padding;
+  .ibiz-view__caption {
+    font-size: var(--ibiz-view-caption-font-size);
+  }
+}
+.ibiz-view-layout__body {
+  display: flex;
+  flex: auto;
+  height: 100%;
+  flex-direction: column;
+  overflow: auto;
+}
+.ibiz-view-layout__footer {
+  flex: none;
+  display: flex;
+  justify-content: space-between;
+}
\ No newline at end of file

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

+@use './ibiz-view-base-layout.scss';
\ No newline at end of file

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

@@ -9,3 +9,15 @@
   --ibiz-icon-text-icon-width-lg: var(--ibiz-font-size-lg);
   --ibiz-icon-text-icon-height-lg: var(--ibiz-font-size-lg);
 }
+
+// layout 组件样式
+
+// ibiz-view-layout
+.ibiz-view-layout{
+  --ibiz-view-layout-padding: 8px 12px 10px;
+  --ibiz-view-layout-header-padding: 0 10px;
+  --ibiz-view-layout-bg-color: var(--ibiz-bg-color);
+  --ibiz-view-layout-header-height: 48px;
+  --ibiz-view-layout-header-border-bottom: var(--ibiz-border-base);
+  --ibiz-view-caption-font-size: var(--ibiz-font-size-lg)
+}
\ No newline at end of file