@aplus-frontend/ui 0.6.0-beta.1 → 0.6.0-beta.11

package/theme/ap-grid/editable.css

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

package/theme/ap-grid/editable.less

@@ -19,10 +19,11 @@
       flex: 1;
     }
   }
+  // 总的可编辑单元格为上下16px 左右8px
   .ant-form-item {
-    margin-bottom: 16px;
+    margin-bottom: @spacing-xl;
   }
   .vxe-cell:has(.is-editable) {
-    padding-block: 16px 0px !important;
+    padding-block: @spacing-xl 0px !important;
   }
 });

package/theme/ap-grid/index.css

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';
@@ -44,6 +62,9 @@
 .aplus-ap-form-item--bordered .ant-input-affix-wrapper {
   padding: 0;
 }
+.aplus-ap-form-item--bordered:has(.aplus-batch-input-group):has(.ant-select) .ant-input-affix-wrapper {
+  padding-right: 8px;
+}
 .aplus-ap-form-item--bordered .ant-input {
   padding: 0;
 }
@@ -57,7 +78,7 @@
   inset-inline-end: 0;
 }
 .aplus-ap-form-item--bordered .ant-space-compact-block .ant-input {
-  padding-left: 11px;
+  padding-left: 8px;
 }
 .aplus-ap-form-item--bordered .ant-select-selector {
   border-width: 0 !important;
@@ -97,8 +118,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: 10px;
-  line-height: 1.6;
+  font-size: 12px;
+  line-height: 16px;
 }
 .aplus-ap-form-item .ant-col .ant-form-item-extra {
   line-height: 22px;
@@ -110,7 +131,7 @@
   width: 100%;
 }
 .aplus-ap-form-item .ant-input-group .ant-select + .ant-picker {
-  padding-inline: 11px;
+  padding-inline: 8px;
   flex: 1;
 }
 .aplus-ap-form-drawer-form__resize-bar {
@@ -159,7 +180,7 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
@@ -173,7 +194,7 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
@@ -189,7 +210,7 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
@@ -215,6 +236,7 @@
   padding: 8px;
   display: flex;
   align-items: center;
+  background-color: #fff;
 }
 .aplus-search-form-sorter-sorter-item > div:hover {
   border-color: var(--basic-color-primary, #0070ff);
@@ -230,7 +252,7 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
@@ -271,6 +293,17 @@
 .aplus-ap-form-search-form__popover-footer-confirm-btn {
   margin-left: 10px;
 }
+.aplus-ap-form-search-form__popover-footer button.ant-btn {
+  padding-inline: 16px;
+}
+.aplus-ap-form-search-form-trigger-btn {
+  font-size: 0px;
+}
+.aplus-ap-form-search-form-trigger-btn-active {
+  color: var(--ap-form-bordered-border-color-hover);
+  border-color: var(--ap-form-bordered-border-color-hover);
+  z-index: 1;
+}
 .aplus-ap-form-search-form-column-setting-trigger-wrapper {
   flex-shrink: 0;
 }
@@ -297,7 +330,7 @@
   padding-inline: 12px;
 }
 .aplus-ap-form-search-form-action-btn-reset {
-  background-color: #E9EDF3;
+  background-color: var(--basic-bg-color);
 }
 .aplus-ap-form-item-text-group-compact .ant-select-focused {
   z-index: 1;
@@ -377,7 +410,7 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
@@ -426,6 +459,35 @@
   font-size: 12px;
   display: inline-flex;
 }
+.aplus-ap-grid ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.aplus-ap-grid ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.aplus-ap-grid ::-webkit-scrollbar-track,
+.aplus-ap-grid ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.aplus-ap-grid ::-webkit-scrollbar-thumb:hover,
+.aplus-ap-grid ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
+.aplus-ap-grid .vxe-table .vxe-cell {
+  min-height: unset !important;
+  padding: 9px 12px !important;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.aplus-ap-grid .vxe-table.size--mini .vxe-cell {
+  min-height: unset !important;
+  padding: 6px 9px !important;
+  line-height: 1.5;
+}
 .aplus-ap-grid-adaptive {
   height: 100%;
   display: flex;
@@ -470,7 +532,7 @@
 }
 .aplus-ap-grid__search-wrapper {
   padding: 8px;
-  padding-bottom: 2px;
+  padding-bottom: 0;
   background-color: #fff;
   border-radius: 4px;
   margin-bottom: 10px;
@@ -522,13 +584,14 @@
   word-break: break-all;
   flex: 1;
 }
-.aplus-ap-grid th .vxe-cell--wrapper {
+.aplus-ap-grid th.vxe-header--column .vxe-cell--wrapper {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
+  min-width: unset;
 }
-.aplus-ap-grid th .vxe-cell--wrapper .vxe-cell--title {
+.aplus-ap-grid th.vxe-header--column .vxe-cell--wrapper .vxe-cell--title {
   flex-shrink: 1;
-  flex-grow: 1;
+  flex-grow: 0;
 }

package/theme/ap-grid/index.less

@@ -10,6 +10,18 @@
 @sb: ~'@{ns}-scroll-bar';
 
 .b(ap-grid, {
+  .reset-scrollbar();
+  .vxe-table .vxe-cell {
+    min-height: unset !important;
+    padding: 9px 12px !important;
+    font-size: @font-size-base;
+    line-height: @line-height-base;
+  }
+  .vxe-table.size--mini .vxe-cell {
+    min-height: unset !important;
+    padding: 6px 9px !important;
+    line-height: @line-height-base;
+  }
   &-adaptive {
     height: 100%;
     display: flex;
@@ -31,6 +43,7 @@
       position: sticky;
       bottom: 0;
     }
+    // 如果粘贴模式下渲染了自定义滚动条，则隐藏默认滚动条及其区域，重设分页器顶部间距
     &:has(.@{sb}) {
       .@{pg} {
         ul.ant-pagination {
@@ -49,6 +62,7 @@
   &-wrapper {
     padding: @spacing;
     padding-bottom: @spacing-lg;
+    // 如果渲染了分页器，则取消容器的底部边距，防止双重边距
     &:has(ul.ant-pagination) {
       padding-bottom: 0;
     }
@@ -61,8 +75,8 @@
     padding-bottom: 0;
   }
   &__search-wrapper {
-    padding:8px;
-    padding-bottom: 2px;
+    padding: @spacing;
+    padding-bottom: 0;
     background-color: #fff;
     border-radius: @border-radius;
     margin-bottom: 10px;
@@ -104,7 +118,7 @@
   }
   &-header-wrapper {
   }
-  // ApTable中Table的Header区域
+  // ApGrid中表格表头的样式
   &-table-header {
     &__title {
       display: -webkit-inline-box;
@@ -119,15 +133,16 @@
       flex: 1;
     }
   }
-
-  th .vxe-cell--wrapper {
+  // 实现表头不换行排列
+  th.vxe-header--column .vxe-cell--wrapper {
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
     align-items: center;
+    min-width: unset;
     .vxe-cell--title {
       flex-shrink: 1;
-      flex-grow: 1;
+      flex-grow: 0;
     }
   }
 });

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';
@@ -29,7 +47,8 @@
 .aplus-ap-ladder {
   position: relative;
   width: inherit;
-  font-size: 14px;
+  font-size: 12px;
+  line-height: 1.5;
   /** 自动溢出省略 */
   /** Aplus端样式  */
   /** Admin端样式  */
@@ -132,11 +151,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,8 @@
   @root-cls: ~'@{ns}@{common-separator}ap-ladder';
   position: relative;
   width: inherit;
-  font-size: 14px;
+  font-size: @font-size-base;
+  line-height: @line-height-base;
 
 
   &__value-group-item{
@@ -110,11 +111,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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

package/theme/ap-list/index.css

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';

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

@@ -2,12 +2,30 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  color: rgba(0 0 0 / 85%);
+  color: #182948;
   font-size: 12px;
   font-family: inherit;
   line-height: 1.5;
   list-style: none;
 }
+.reset-scrollbar ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb {
+  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.reset-scrollbar ::-webkit-scrollbar-track,
+.reset-scrollbar ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.reset-scrollbar ::-webkit-scrollbar-thumb:hover,
+.reset-scrollbar ::-webkit-scrollbar-thumb:active {
+  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+}
 .clear-fix::before {
   display: table;
   content: '';