@aplus-frontend/ui 0.6.0-beta.0 → 0.6.0-beta.2

package/theme/ap-grid/index.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,
@@ -39,7 +39,7 @@
   box-sizing: border-box;
   border: 1px solid var(--ap-form-bordered-border-color-base, #DEE4ED);
   border-radius: 4px;
-  padding-inline: 12px;
+  padding-inline: 8px;
 }
 .aplus-ap-form-item--bordered .ant-input-affix-wrapper {
   padding: 0;
@@ -69,8 +69,11 @@
 .aplus-ap-form-item--bordered:has(.ant-select) {
   padding-right: 0px;
 }
+.aplus-ap-form-item--bordered:has(.ant-select) .ant-form-item-label > label {
+  padding-right: 4px;
+}
 .aplus-ap-form-item--bordered .ant-form-item-label > label {
-  padding-right: 16px;
+  padding-right: 12px;
   height: 30px;
 }
 .aplus-ap-form-item--bordered .ant-form-item-label > label::after {
@@ -94,9 +97,8 @@
   box-shadow: 0 0 0 2px var(--ap-form-bordered-shadow-color, rgba(5, 155, 255, 0.1));
 }
 .aplus-ap-form-item .ant-form-show-help .ant-form-item-explain-error {
-  font-size: 12px;
-  line-height: 18px;
-  margin-top: 2px;
+  font-size: 10px;
+  line-height: 1.6;
 }
 .aplus-ap-form-item .ant-col .ant-form-item-extra {
   line-height: 22px;
@@ -158,11 +160,11 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 700;
   display: inline-block;
   padding-bottom: 4px;
@@ -172,9 +174,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
   color: #8896b0;
 }
@@ -188,9 +190,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
   color: #0070ff;
 }
@@ -229,9 +231,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
   padding-left: 4px;
   max-width: 100%;
@@ -240,7 +242,7 @@
   text-overflow: ellipsis;
 }
 .aplus-ap-form-search-form .ant-form-item {
-  margin-bottom: 16px;
+  margin-bottom: 8px;
 }
 .aplus-ap-form-search-form .ant-form-item-control .ant-picker {
   display: flex;
@@ -249,7 +251,7 @@
   width: 100%;
 }
 .aplus-ap-form-search-form__popover .ant-form-item {
-  margin-bottom: 16px;
+  margin-bottom: 8px;
 }
 .aplus-ap-form-search-form__popover .ant-popover-arrow {
   display: none;
@@ -354,7 +356,7 @@
 }
 .aplus-field-checkbox--vertical label.ant-checkbox-wrapper:not(:last-child) {
   display: flex;
-  margin-block-end: 16px;
+  margin-block-end: 12px;
 }
 .aplus-field-number-label-left {
   padding-right: 4px;
@@ -364,7 +366,7 @@
 }
 .aplus-field-radio--vertical label.ant-radio-wrapper:not(:last-child) {
   display: flex;
-  margin-block-end: 16px;
+  margin-block-end: 12px;
 }
 .aplus-field-text-area {
   white-space: pre-wrap;
@@ -376,9 +378,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
   display: inline-block;
   cursor: pointer;
@@ -420,8 +422,8 @@
 }
 .aplus-action-item-dropdown__icon {
   color: #0070ff;
-  margin-left: 4px;
-  font-size: 14px;
+  margin-left: 2px;
+  font-size: 12px;
   display: inline-flex;
 }
 .aplus-ap-grid-adaptive {
@@ -434,18 +436,17 @@
   flex: 1;
 }
 .aplus-ap-grid .aplus-ap-grid-pagination-wrapper ul.ant-pagination {
-  margin: 16px 0px 0px;
+  margin-block: 12px;
 }
 .aplus-ap-grid-sticky .aplus-ap-grid-pagination-wrapper {
   background-color: #fff;
   z-index: 10;
   position: sticky;
   bottom: 0;
-  padding-bottom: 16px;
 }
 .aplus-ap-grid-sticky:has(.aplus-scroll-bar) .aplus-ap-grid-pagination-wrapper ul.ant-pagination {
   margin-top: 0;
-  padding-top: 8px;
+  padding-top: 4px;
 }
 .aplus-ap-grid-sticky:has(.aplus-scroll-bar) .vxe-table--scroll-x-wrapper {
   opacity: 0;
@@ -454,9 +455,13 @@
   height: 0px !important;
 }
 .aplus-ap-grid-wrapper {
-  padding: 16px;
+  padding: 8px;
+  padding-bottom: 12px;
   background-color: #fff;
 }
+.aplus-ap-grid-wrapper:has(ul.ant-pagination) {
+  padding-bottom: 0;
+}
 .aplus-ap-grid-wrapper.aplus-ap-grid-sticky {
   padding-bottom: 0;
 }
@@ -464,9 +469,10 @@
   padding-bottom: 0;
 }
 .aplus-ap-grid__search-wrapper {
-  padding: 16px;
+  padding: 8px;
   padding-bottom: 0;
   background-color: #fff;
+  border-radius: 4px;
   margin-bottom: 10px;
 }
 .aplus-ap-grid__table-wrapper {
@@ -478,11 +484,16 @@
   flex-direction: column;
 }
 .aplus-ap-grid__table-wrapper-card {
-  padding: 12px 16px 16px;
+  padding: 8px;
+  padding-bottom: 12px;
+  border-radius: 4px;
   background-color: #fff;
 }
+.aplus-ap-grid__table-wrapper-card:has(ul.ant-pagination) {
+  padding-bottom: 0;
+}
 .aplus-ap-grid-pagination {
-  margin-top: 16px;
+  margin-block: 12px;
   display: flex;
   flex-wrap: wrap;
   row-gap: 8px;

package/theme/ap-grid/index.less

@@ -21,7 +21,7 @@
   }
   .@{pg} {
     ul.ant-pagination {
-      margin: 16px 0px 0px;
+      margin-block: @spacing-lg;
     }
   }
   &-sticky {
@@ -30,13 +30,13 @@
       z-index: 10;
       position: sticky;
       bottom: 0;
-      padding-bottom: 16px;
     }
+    // 如果粘贴模式下渲染了自定义滚动条，则隐藏默认滚动条及其区域，重设分页器顶部间距
     &:has(.@{sb}) {
       .@{pg} {
         ul.ant-pagination {
           margin-top: 0;
-          padding-top: 8px;
+          padding-top: 4px;
         }
       }
       .vxe-table--scroll-x-wrapper {
@@ -48,7 +48,12 @@
     }
   }
   &-wrapper {
-    padding: 16px;
+    padding: @spacing;
+    padding-bottom: @spacing-lg;
+    // 如果渲染了分页器，则取消容器的底部边距，防止双重边距
+    &:has(ul.ant-pagination) {
+      padding-bottom: 0;
+    }
     background-color: #fff;
   }
   &-wrapper&-sticky {
@@ -58,9 +63,10 @@
     padding-bottom: 0;
   }
   &__search-wrapper {
-    padding:16px;
+    padding: @spacing;
     padding-bottom: 0;
     background-color: #fff;
+    border-radius: @border-radius;
     margin-bottom: 10px;
   }
   &__table-wrapper {
@@ -72,11 +78,16 @@
     flex-direction: column;
   }
   &__table-wrapper-card {
-    padding: 12px 16px 16px;
+    padding: @spacing;
+    padding-bottom: @spacing-lg;
+    &:has(ul.ant-pagination) {
+      padding-bottom: 0;
+    }
+    border-radius: @border-radius;
     background-color: #fff;
   }
   &-pagination {
-    margin-top: 16px;
+    margin-block: @spacing-lg;
     display: flex;
     flex-wrap: wrap;
     row-gap: 8px;
@@ -95,7 +106,7 @@
   }
   &-header-wrapper {
   }
-  // ApTable中Table的Header区域
+  // ApGrid中表格表头的样式
   &-table-header {
     &__title {
       display: -webkit-inline-box;
@@ -110,7 +121,7 @@
       flex: 1;
     }
   }
-
+  // 实现表头不换行排列
   th .vxe-cell--wrapper {
     display: flex;
     flex-direction: row;

package/theme/ap-group-search/ap-extension-select.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-group-search/ap-group-search.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-group-search/ap-popover-select.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-image/ap-image.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-input-radio/ap-input-radio.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-label/ap-label.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-ladder/ap-ladder.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,
@@ -29,7 +29,7 @@
 .aplus-ap-ladder {
   position: relative;
   width: inherit;
-  font-size: 14px;
+  font-size: 12px;
   /** 自动溢出省略 */
   /** Aplus端样式  */
   /** Admin端样式  */
@@ -132,11 +132,11 @@
   margin-left: 4px;
 }
 .aplus-ap-ladder__major {
-  line-height: 22px;
+  line-height: 1.5;
   color: #182948;
 }
 .aplus-ap-ladder__minor {
-  line-height: 22px;
+  line-height: 1.5;
   color: #8896B0;
 }
 .aplus-ap-ladder__label {

package/theme/ap-ladder/ap-ladder.less

@@ -5,7 +5,7 @@
   @root-cls: ~'@{ns}@{common-separator}ap-ladder';
   position: relative;
   width: inherit;
-  font-size: 14px;
+  font-size: @font-size-base;
 
 
   &__value-group-item{
@@ -110,11 +110,11 @@
 
   /** Aplus端样式  */
   &__major {
-    line-height: 22px;
+    line-height: @line-height-base;
     color: #182948;
   }
   &__minor {
-    line-height: 22px;
+    line-height: @line-height-base;
     color: #8896B0;
   }
   &__label {

package/theme/ap-layout/ap-info-layout.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-list/index.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,
@@ -37,7 +37,7 @@
   pointer-events: none;
 }
 .aplus-ap-list__footer {
-  margin-top: 16px;
+  margin-top: 8px;
   display: flex;
   justify-content: flex-end;
 }

package/theme/ap-list/index.less

@@ -1,4 +1,5 @@
 @import '../mixins/mixins.less';
+@import '../mixins/config.less';
 
 @listCls: ~'@{ns}-ap-list';
 @listContentContainerCls: ~'@{listCls}-content-container';
@@ -14,7 +15,7 @@
      }
   }
   &__footer {
-    margin-top: 16px;
+    margin-top: @spacing;
     display: flex;
     justify-content: flex-end;
   }

package/theme/ap-product-info/ap-product-info.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,

package/theme/ap-select-layout/ap-select-layout.css

@@ -3,9 +3,9 @@
   margin: 0;
   padding: 0;
   color: rgba(0 0 0 / 85%);
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
-  line-height: 22px;
+  line-height: 1.5;
   list-style: none;
 }
 .clear-fix::before {
@@ -19,7 +19,7 @@
 }
 .common-style {
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 12px;
   font-family: inherit;
 }
 .common-style::before,
@@ -64,17 +64,17 @@
 .aplus-ap-select-layout-side__header > h3 {
   margin: 0;
   color: #333;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: bold;
-  line-height: 18px;
+  line-height: 1.1 0.57142857;
 }
 .aplus-ap-select-layout-side__header--imgWrap {
   border-radius: 2px;
   cursor: pointer;
-  font-size: 24px;
+  font-size: 20px;
   color: #999;
   display: flex;
-  height: 24px;
+  height: 20px;
 }
 .aplus-ap-select-layout-side__header--imgWrap:hover {
   background: #f5f5f5;
@@ -138,9 +138,9 @@
   margin-right: 10px;
   border-radius: 2px;
   cursor: pointer;
-  font-size: 24px;
+  font-size: 20px;
   display: flex;
-  height: 24px;
+  height: 20px;
   color: #999;
 }
 .aplus-ap-select-layout-content__header--imgWrap:hover {
@@ -148,7 +148,7 @@
 }
 .aplus-ap-select-layout-content__header--title {
   margin: 0;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: bold;
-  line-height: 32px;
+  line-height: 1.1 0.57142857;
 }

package/theme/ap-select-layout/ap-select-layout.less

@@ -41,18 +41,18 @@
       & > h3 {
         margin: 0;
         color: #333;
-        font-size: 16px;
+        font-size: @font-size-lg;
         font-weight: bold;
-        line-height: 18px;
+        line-height: @line-height-lg;
       }
 
       &--imgWrap {
         border-radius: 2px;
         cursor: pointer;
-        font-size: 24px;
+        font-size: 20px;
         color: #999;
         display: flex;
-        height: 24px;;
+        height: 20px;
 
         &:hover {
           background: #f5f5f5;
@@ -130,9 +130,9 @@
         margin-right: 10px;
         border-radius: 2px;
         cursor: pointer;
-        font-size: 24px;
+        font-size: 20px;
         display: flex;
-        height: 24px;;
+        height: 20px;
         color: #999;
 
         &:hover {
@@ -142,9 +142,9 @@
 
       &--title {
         margin: 0;
-        font-size: 16px;
+        font-size: @font-size-lg;
         font-weight: bold;
-        line-height: 32px;
+        line-height: @line-height-lg;
       }
     }
   }