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

package/theme/ap-table/ap-table.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(--ap-scrollbar-thumb-color-base);
+  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(--ap-scrollbar-thumb-color-hover);
+}
 .clear-fix::before {
   display: table;
   content: '';
@@ -43,12 +61,13 @@
   flex-direction: row;
   flex-wrap: nowrap;
   height: 100%;
+  padding-block-end: 12px;
 }
 .aplus-ap-column-setting-wrapper .aplus-ap-table-table-header__title {
   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;
@@ -77,12 +96,14 @@
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: center;
-  padding: 12px;
+  padding: 8px;
+}
+.aplus-ap-column-setting-left__header-tips {
+  color: var(--ap-text-color-3);
 }
 .aplus-ap-column-setting-left__content {
   flex: 1;
-  padding-inline: 12px;
-  padding-block: 16px;
+  padding: 12px;
   overflow-y: auto;
 }
 .aplus-ap-column-setting-left__content .ant-checkbox-wrapper {
@@ -101,8 +122,9 @@
   background-color: #F2F6F9;
   padding: 4px 12px;
   border-radius: 4px;
-  margin-bottom: 16px;
+  margin-bottom: 12px;
   margin-inline: -12px;
+  display: flex;
 }
 .aplus-sortable-item-meta {
   padding: 6px 8px;
@@ -122,7 +144,7 @@
   display: block;
 }
 .aplus-sortable-item-meta:hover .aplus-sortable-item-meta-left__holder {
-  color: var(--basic-color-primary, #0070ff) !important;
+  color: var(--ap-color-primary) !important;
 }
 .aplus-sortable-item-meta-left {
   flex: 1;
@@ -152,7 +174,7 @@
   margin-left: 16px;
 }
 .aplus-sortable-item-meta-action-icon:hover {
-  color: var(--basic-color-primary, #0070ff);
+  color: var(--ap-color-primary);
 }
 .aplus-sortable-item .is-hidden {
   display: none;
@@ -165,29 +187,29 @@
 .aplus-column-setting-sorter-section-title {
   font-size: 12px;
   line-height: 20px;
-  color: #8896b0;
+  color: var(--ap-text-color-3);
   padding: 2px 8px;
   margin: 4px;
 }
 .aplus-column-setting-sorter-header {
-  padding: 16px 20px;
+  padding: 12px 20px;
 }
 .aplus-column-setting-sorter-header-title {
   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;
   font-weight: bold;
-  color: #182948;
+  color: var(--ap-text-color-2);
 }
 .aplus-column-setting-sorter-content {
   flex: 1;
   overflow-y: auto;
-  padding: 8px 12px 12px 8px;
+  padding: 8px 12px 0px 8px;
 }
 .aplus-ap-table-paragraph-ellipsis {
   display: flex;
@@ -212,7 +234,7 @@
   flex-shrink: 0;
   margin-left: 8px;
   cursor: pointer;
-  color: var(--ap-action-color-primary-base, #0070ff);
+  color: var(--ap-color-link);
 }
 .aplus-ap-form-item-group .ant-form-item-control .ant-picker {
   display: flex;
@@ -225,13 +247,16 @@
 }
 .aplus-ap-form-item--bordered {
   box-sizing: border-box;
-  border: 1px solid var(--ap-form-bordered-border-color-base, #DEE4ED);
+  border: 1px solid var(--ap-border-color-base);
   border-radius: 4px;
   padding-inline: 8px;
 }
 .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;
 }
@@ -245,7 +270,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;
@@ -271,22 +296,22 @@
   min-height: 30px;
 }
 .aplus-ap-form-item--bordered:hover {
-  border-color: var(--ap-form-bordered-border-color-hover, #66a9ff);
+  border-color: var(--ap-hover-color-base);
 }
 .aplus-ap-form-item--bordered:focus {
-  border-color: var(--ap-form-bordered-border-color-active, #66a9ff);
+  border-color: var(--ap-active-color-base);
   box-shadow: 0 0 0 2px var(--ap-form-bordered-shadow-color, rgba(5, 155, 255, 0.1));
 }
 .aplus-ap-form-item--bordered .aplus-batch-input-group-popover-input__popover {
   width: calc(100% + 12px);
 }
 .aplus-ap-form-item--focused {
-  border-color: var(--ap-form-bordered-border-color-active, #66a9ff);
+  border-color: var(--ap-active-color-base);
   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;
@@ -298,7 +323,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 {
@@ -347,7 +372,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;
@@ -361,12 +386,12 @@
   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;
-  color: #8896b0;
+  color: var(--ap-text-color-3);
 }
 .aplus-search-form-sorter-header-action-wrapper {
   padding: 8px;
@@ -377,12 +402,12 @@
   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;
-  color: #0070ff;
+  color: var(--ap-color-link);
 }
 .aplus-search-form-sorter-sorter-wrapper {
   display: flex;
@@ -403,13 +428,14 @@
   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);
+  border-color: var(--ap-color-primary);
   cursor: pointer;
 }
 .aplus-search-form-sorter-sorter-item > div:hover .aplus-search-form-sorter-sorter-item-holder {
-  color: var(--basic-color-primary, #0070ff) !important;
+  color: var(--ap-color-primary) !important;
 }
 .aplus-search-form-sorter-sorter-item--hidden {
   display: none;
@@ -418,7 +444,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;
@@ -459,6 +485,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-hover-color-base);
+  border-color: var(--ap-hover-color-base);
+  z-index: 1;
+}
 .aplus-ap-form-search-form-column-setting-trigger-wrapper {
   flex-shrink: 0;
 }
@@ -485,7 +522,7 @@
   padding-inline: 12px;
 }
 .aplus-ap-form-search-form-action-btn-reset {
-  background-color: #E9EDF3;
+  background-color: var(--ap-color-bg);
 }
 .aplus-ap-form-item-text-group-compact .ant-select-focused {
   z-index: 1;
@@ -565,7 +602,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;
@@ -574,19 +611,19 @@
   cursor: pointer;
 }
 .aplus-action-item--primary {
-  color: var(--ap-action-color-primary-base, #0070FF);
+  color: var(--ap-color-link);
 }
 .aplus-action-item--primary:not(.aplus-action-item--disabled):hover {
-  color: var(--ap-action-color-primary-hover, #66A9FF);
+  color: var(--ap-color-link-hover);
 }
 .aplus-action-item--success {
-  color: var(--ap-action-color-success, #2ED1A3);
+  color: var(--ap-color-success);
 }
 .aplus-action-item--error {
-  color: var(--ap-action-color-error, #FF4D4F);
+  color: var(--ap-color-error);
 }
 .aplus-action-item--warn {
-  color: var(--ap-action-color-warn, #FFA940);
+  color: var(--ap-color-warn);
 }
 .aplus-action-item--loading {
   opacity: 0.35;
@@ -597,9 +634,20 @@
   margin-right: 4px;
 }
 .aplus-action-item--disabled {
-  color: #CCE2FF;
   cursor: not-allowed;
 }
+.aplus-action-item--primary.aplus-action-item--disabled {
+  color: var(--ap-color-link-disabled);
+}
+.aplus-action-item--success.aplus-action-item--disabled {
+  color: var(--ap-color-success-disabled);
+}
+.aplus-action-item--error.aplus-action-item--disabled {
+  color: var(--ap-color-error-disabled);
+}
+.aplus-action-item--warn.aplus-action-item--disabled {
+  color: var(--ap-color-warn-disabled);
+}
 .aplus-action-item-dropdown__item .aplus-action-item {
   width: 100%;
 }
@@ -660,10 +708,31 @@
   width: var(--aplus-scroll-bar-bar-width, 8px);
   left: calc(var(--aplus-scroll-bar-track-width, 10px) / 2 - var(--aplus-scroll-bar-bar-width, 8px) / 2);
 }
+.aplus-ap-table ::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.aplus-ap-table ::-webkit-scrollbar-thumb {
+  background-color: var(--ap-scrollbar-thumb-color-base);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.aplus-ap-table ::-webkit-scrollbar-track,
+.aplus-ap-table ::-webkit-scrollbar-corner {
+  background-color: var(--ap-table-header-bg, #f2f6f9);
+}
+.aplus-ap-table ::-webkit-scrollbar-thumb:hover,
+.aplus-ap-table ::-webkit-scrollbar-thumb:active {
+  background-color: var(--ap-scrollbar-thumb-color-hover);
+}
 .aplus-ap-table-wrapper {
-  padding: 8px 8px 12px;
+  padding: 8px;
   background-color: #fff;
 }
+.aplus-ap-table-wrapper:has(.ant-pagination) {
+  padding-bottom: 0;
+}
 .aplus-ap-table-adaptive {
   height: 100%;
   display: flex;
@@ -704,16 +773,24 @@
   flex-direction: column;
 }
 .aplus-ap-table__table-wrapper-card {
-  padding: 8px 8px 12px;
+  padding: 8px;
   border-radius: 4px;
   background-color: #fff;
   overflow: hidden;
 }
-.aplus-ap-table-table .ant-pagination {
-  margin-bottom: 0 !important;
+.aplus-ap-table__table-wrapper-card:has(.ant-pagination) {
+  padding-bottom: 0;
 }
-.aplus-ap-table-table .ant-pagination .ant-pagination-total-text {
+.aplus-ap-table-table ul.ant-table-pagination.ant-pagination {
+  margin-block: 8px;
+  align-items: center;
+}
+.aplus-ap-table-table ul.ant-table-pagination.ant-pagination .ant-pagination-total-text {
   flex: 1;
+  height: unset;
+  line-height: 1.5;
+  display: flex;
+  align-items: center;
 }
 .aplus-ap-table-table tr > th.ant-table-cell {
   background-color: var(--ap-table-header-bg, #F2F6F9);
@@ -722,16 +799,16 @@
   background-color: #D8DDE5 !important;
 }
 .aplus-ap-table .ant-table.ant-table-middle .ant-table-row .ant-table-cell:not(.ant-table-selection-column) {
-  padding: 12px;
+  padding: 9px 12px;
 }
 .aplus-ap-table .ant-table.ant-table-middle .ant-table-thead .ant-table-cell:not(.ant-table-selection-column) {
-  padding: 12px;
+  padding: 9px 12px;
 }
 .aplus-ap-table .ant-table.ant-table-small .ant-table-row .ant-table-cell:not(.ant-table-selection-column) {
-  padding: 8px;
+  padding: 6px 9px;
 }
 .aplus-ap-table .ant-table.ant-table-small .ant-table-thead .ant-table-cell:not(.ant-table-selection-column) {
-  padding: 8px;
+  padding: 6px 9px;
 }
 .aplus-ap-table .ant-table-placeholder .ant-table-expanded-row-fixed::after {
   border-inline-end-width: 0px !important;
@@ -758,13 +835,13 @@
   margin-bottom: 0;
 }
 .aplus-ap-table-pagination-count-text {
-  color: var(--ap-table-pagination-total-count-color, #182948);
+  color: var(--ap-text-color-2);
 }
 .aplus-ap-table-pagination--total-right {
   padding-left: 12px;
 }
 .aplus-ap-table-pagination-total-wrapper {
-  color: var(--ap-table-pagination-total-color, #526A90);
+  color: var(--ap-text-color-1);
 }
 .aplus-ap-table-header {
   padding-bottom: 8px;
@@ -791,7 +868,7 @@
   flex: 1;
 }
 .aplus-ap-table-setting-trigger-button {
-  color: var(--ap-table-setting-button-color, #8896B0);
+  color: var(--ap-text-color-3);
 }
 .aplus-ap-table-setting-trigger-button:hover {
   color: unset;

package/theme/ap-table/ap-table.less

@@ -13,9 +13,13 @@
 @sw: ~'--@{ns}-ap-table-scroll-bar-width';
 
 .b(ap-table, {
+  .reset-scrollbar();
   &-wrapper {
-    padding: @spacing @spacing @spacing-lg;
+    padding: @spacing;
     background-color: #fff;
+    &:has(.ant-pagination) {
+      padding-bottom: 0;
+    }
   }
   &-adaptive {
     height: 100%;
@@ -55,16 +59,25 @@
     flex-direction: column;
   }
   &__table-wrapper-card {
-    padding: @spacing @spacing @spacing-lg;
+    padding: @spacing;
     border-radius: @border-radius;
     background-color: #fff;
     overflow: hidden;
+
+    &:has(.ant-pagination) {
+      padding-bottom: 0;
+    }
   }
   &-table {
-    .ant-pagination {
-      margin-bottom: 0 !important;
+    ul.ant-table-pagination.ant-pagination {
+      margin-block: @spacing;
+      align-items: center;
       .ant-pagination-total-text {
         flex: 1;
+        height: unset;
+        line-height: @line-height-base;
+        display: flex;
+        align-items: center;
       }
     }
     tr > th.ant-table-cell {
@@ -75,16 +88,16 @@
     }
   }
   .ant-table.ant-table-middle .ant-table-row .ant-table-cell:not(.ant-table-selection-column) {
-    padding: 12px;
+    padding: 9px 12px;
   }
   .ant-table.ant-table-middle .ant-table-thead .ant-table-cell:not(.ant-table-selection-column) {
-    padding: 12px;
+    padding: 9px 12px;
   }
   .ant-table.ant-table-small .ant-table-row .ant-table-cell:not(.ant-table-selection-column) {
-    padding: 8px;
+    padding: 6px 9px;
   }
   .ant-table.ant-table-small .ant-table-thead .ant-table-cell:not(.ant-table-selection-column) {
-    padding: 8px;
+    padding: 6px 9px;
   }
   .ant-table-placeholder .ant-table-expanded-row-fixed {
     // 这里不需要滚动的时候显示单边框，因为默认情况下会显示双边框
@@ -117,13 +130,13 @@
     margin-bottom: 0;
   }
   &-pagination-count-text {
-    color: var(--ap-table-pagination-total-count-color, #182948);
+    color: var(--ap-text-color-2);
   }
   &-pagination--total-right {
     padding-left: 12px;
   }
   &-pagination-total-wrapper {
-    color: var(--ap-table-pagination-total-color, #526A90);
+    color: var(--ap-text-color-1);
   }
   &-header-wrapper {
   }
@@ -156,7 +169,7 @@
     }
   }
   &-setting-trigger-button {
-    color: var(--ap-table-setting-button-color, #8896B0);
+    color: var(--ap-text-color-3);
     &:hover {
       color: unset;
     }

package/theme/ap-table/setting/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(--ap-scrollbar-thumb-color-base);
+  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(--ap-scrollbar-thumb-color-hover);
+}
 .clear-fix::before {
   display: table;
   content: '';
@@ -31,12 +49,13 @@
   flex-direction: row;
   flex-wrap: nowrap;
   height: 100%;
+  padding-block-end: 12px;
 }
 .aplus-ap-column-setting-wrapper .aplus-ap-table-table-header__title {
   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;
@@ -65,12 +84,14 @@
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: center;
-  padding: 12px;
+  padding: 8px;
+}
+.aplus-ap-column-setting-left__header-tips {
+  color: var(--ap-text-color-3);
 }
 .aplus-ap-column-setting-left__content {
   flex: 1;
-  padding-inline: 12px;
-  padding-block: 16px;
+  padding: 12px;
   overflow-y: auto;
 }
 .aplus-ap-column-setting-left__content .ant-checkbox-wrapper {
@@ -89,8 +110,9 @@
   background-color: #F2F6F9;
   padding: 4px 12px;
   border-radius: 4px;
-  margin-bottom: 16px;
+  margin-bottom: 12px;
   margin-inline: -12px;
+  display: flex;
 }
 .aplus-sortable-item-meta {
   padding: 6px 8px;
@@ -110,7 +132,7 @@
   display: block;
 }
 .aplus-sortable-item-meta:hover .aplus-sortable-item-meta-left__holder {
-  color: var(--basic-color-primary, #0070ff) !important;
+  color: var(--ap-color-primary) !important;
 }
 .aplus-sortable-item-meta-left {
   flex: 1;
@@ -140,7 +162,7 @@
   margin-left: 16px;
 }
 .aplus-sortable-item-meta-action-icon:hover {
-  color: var(--basic-color-primary, #0070ff);
+  color: var(--ap-color-primary);
 }
 .aplus-sortable-item .is-hidden {
   display: none;
@@ -153,27 +175,27 @@
 .aplus-column-setting-sorter-section-title {
   font-size: 12px;
   line-height: 20px;
-  color: #8896b0;
+  color: var(--ap-text-color-3);
   padding: 2px 8px;
   margin: 4px;
 }
 .aplus-column-setting-sorter-header {
-  padding: 16px 20px;
+  padding: 12px 20px;
 }
 .aplus-column-setting-sorter-header-title {
   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;
   font-weight: bold;
-  color: #182948;
+  color: var(--ap-text-color-2);
 }
 .aplus-column-setting-sorter-content {
   flex: 1;
   overflow-y: auto;
-  padding: 8px 12px 12px 8px;
+  padding: 8px 12px 0px 8px;
 }