Merge branch 'hotfix/box-sizing' of https://gitee.com/preschooler/platform-admin-ui

src/App.vue

@@ -54,8 +54,4 @@ body {
 .#{$prefix-cls}-grey-mode {
 .#{$prefix-cls}-grey-mode {
   filter: grayscale(100%);
   filter: grayscale(100%);
 }
 }
-
-.scrollbar__view {
-  height: 99%!important;
-}
 </style>
 </style>

src/components/Icon/src/IconSelect.vue

@@ -122,7 +122,7 @@ watch(
             placement: 'auto'
             placement: 'auto'
           }"
           }"
           :visible="visible"
           :visible="visible"
-          :width="350"
+          :width="355"
           popper-class="pure-popper"
           popper-class="pure-popper"
           trigger="click"
           trigger="click"
         >
         >
@@ -147,7 +147,7 @@ watch(
             >
             >
               <ElDivider border-style="dashed" class="tab-divider" />
               <ElDivider border-style="dashed" class="tab-divider" />
               <ElScrollbar height="220px">
               <ElScrollbar height="220px">
-                <ul class="ml-2 flex flex-wrap px-2">
+                <ul class="ml-2 flex flex-wrap">
                   <li
                   <li
                     v-for="(item, key) in pageList"
                     v-for="(item, key) in pageList"
                     :key="key"
                     :key="key"
@@ -171,7 +171,7 @@ watch(
             background
             background
             class="h-10 flex items-center justify-center"
             class="h-10 flex items-center justify-center"
             layout="prev, pager, next"
             layout="prev, pager, next"
-            small
+            size="small"
             @current-change="onCurrentChange"
             @current-change="onCurrentChange"
           />
           />
         </ElPopover>
         </ElPopover>

src/layout/Layout.vue

@@ -71,8 +71,5 @@ $prefix-cls: #{$namespace}-layout;
 
 
 .#{$prefix-cls} {
 .#{$prefix-cls} {
   background-color: var(--app-content-bg-color);
   background-color: var(--app-content-bg-color);
-  :deep(.#{$elNamespace}-scrollbar__view) {
-    height: 99% !important;
-  }
 }
 }
 </style>
 </style>

src/layout/components/AppView.vue

@@ -36,27 +36,10 @@ provide('reload', reload)
 <template>
 <template>
   <section
   <section
     :class="[
     :class="[
-      'p-[var(--app-content-padding)] w-[calc(100%-var(--app-content-padding)-var(--app-content-padding))] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
+      'p-[var(--app-content-padding)] w-full bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
       {
       {
-        '!min-h-[calc(100%-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height))]':
-          (fixedHeader &&
-            (layout === 'classic' || layout === 'topLeft' || layout === 'top') &&
-            footer) ||
-          (!tagsView && layout === 'top' && footer),
-        '!min-h-[calc(100%-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height)-var(--tags-view-height))]':
-          tagsView && layout === 'top' && footer,
-
-        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-var(--top-tool-height)-var(--app-footer-height))]':
-          !fixedHeader && layout === 'classic' && footer,
-
-        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height))]':
-          !fixedHeader && layout === 'topLeft' && footer,
-
-        '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding))]':
-          fixedHeader && layout === 'cutMenu' && footer,
-
-        '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding)-var(--tags-view-height))]':
-          !fixedHeader && layout === 'cutMenu' && footer
+        '!min-h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))] pb-0':
+          footer
       }
       }
     ]"
     ]"
   >
   >

src/styles/var.css

@@ -64,3 +64,11 @@ body {
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }
+
+*,
+:after,
+:before {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}