@aplus-frontend/ui 0.6.0-beta.9 → 0.6.0

package/theme/ap-table/ap-table.css

@@ -5,7 +5,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
 }
 .reset-scrollbar ::-webkit-scrollbar {
@@ -13,7 +13,7 @@
   height: 10px;
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-color: var(--ap-scrollbar-thumb-color-base);
   background-clip: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -24,7 +24,7 @@
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb:hover,
 .reset-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  background-color: var(--ap-scrollbar-thumb-color-hover);
 }
 .clear-fix::before {
   display: table;
@@ -61,6 +61,7 @@
   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;
@@ -69,7 +70,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
   display: inline-block;
   -webkit-line-clamp: unset;
@@ -95,7 +96,10 @@
   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;
@@ -140,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;
@@ -170,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;
@@ -183,28 +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: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   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;
@@ -229,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;
@@ -242,14 +247,14 @@
 }
 .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) .ant-input-affix-wrapper {
+.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 {
@@ -274,6 +279,9 @@
 .aplus-ap-form-item--bordered .ant-select-single .ant-select-selector {
   height: 30px !important;
 }
+.aplus-ap-form-item--bordered:has(.ant-input-number) {
+  padding-right: 0;
+}
 .aplus-ap-form-item--bordered:has(.ant-select) {
   padding-right: 0px;
 }
@@ -291,17 +299,17 @@
   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 {
@@ -370,7 +378,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
   font-size: 14px;
   font-weight: 700;
@@ -384,9 +392,9 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
-  color: #8896b0;
+  color: var(--ap-text-color-3);
 }
 .aplus-search-form-sorter-header-action-wrapper {
   padding: 8px;
@@ -400,9 +408,9 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
-  color: #0070ff;
+  color: var(--ap-color-link);
 }
 .aplus-search-form-sorter-sorter-wrapper {
   display: flex;
@@ -426,11 +434,11 @@
   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;
@@ -442,7 +450,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
   padding-left: 4px;
   max-width: 100%;
@@ -487,8 +495,8 @@
   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);
+  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 {
@@ -517,7 +525,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;
@@ -600,25 +608,25 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
   display: inline-block;
   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;
@@ -629,9 +637,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%;
 }
@@ -697,7 +716,7 @@
   height: 10px;
 }
 .aplus-ap-table ::-webkit-scrollbar-thumb {
-  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-color: var(--ap-scrollbar-thumb-color-base);
   background-clip: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -708,12 +727,15 @@
 }
 .aplus-ap-table ::-webkit-scrollbar-thumb:hover,
 .aplus-ap-table ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  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;
@@ -754,16 +776,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 ul.ant-table-pagination.ant-pagination {
+  margin-block: 8px;
+  align-items: center;
 }
-.aplus-ap-table-table .ant-pagination .ant-pagination-total-text {
+.aplus-ap-table-table ul.ant-table-pagination.ant-pagination .ant-pagination-total-text {
   flex: 1;
+  height: unset;
+  line-height: 18px;
+  display: flex;
+  align-items: center;
 }
 .aplus-ap-table-table tr > th.ant-table-cell {
   background-color: var(--ap-table-header-bg, #F2F6F9);
@@ -808,13 +838,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;
@@ -841,7 +871,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

@@ -15,8 +15,11 @@
 .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%;
@@ -56,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 {
@@ -118,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 {
   }
@@ -157,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

@@ -5,7 +5,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
 }
 .reset-scrollbar ::-webkit-scrollbar {
@@ -13,7 +13,7 @@
   height: 10px;
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-color: var(--ap-scrollbar-thumb-color-base);
   background-clip: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -24,7 +24,7 @@
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb:hover,
 .reset-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  background-color: var(--ap-scrollbar-thumb-color-hover);
 }
 .clear-fix::before {
   display: table;
@@ -49,6 +49,7 @@
   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;
@@ -57,7 +58,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
   display: inline-block;
   -webkit-line-clamp: unset;
@@ -83,7 +84,10 @@
   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;
@@ -128,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;
@@ -158,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;
@@ -171,26 +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: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   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;
 }

package/theme/ap-table/setting/modal.css

@@ -5,7 +5,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
 }
 .reset-scrollbar ::-webkit-scrollbar {
@@ -13,7 +13,7 @@
   height: 10px;
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-color: var(--ap-scrollbar-thumb-color-base);
   background-clip: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -24,7 +24,7 @@
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb:hover,
 .reset-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  background-color: var(--ap-scrollbar-thumb-color-hover);
 }
 .clear-fix::before {
   display: table;
@@ -49,6 +49,7 @@
   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;
@@ -57,7 +58,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
   display: inline-block;
   -webkit-line-clamp: unset;
@@ -83,7 +84,10 @@
   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;

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

@@ -9,6 +9,7 @@
     flex-direction: row;
     flex-wrap: nowrap;
     height: 100%;
+    padding-block-end: 12px;
     .@{tht} {
       .reset-component();
       // 重置默认两行ellipsis样式
@@ -37,7 +38,10 @@
       flex-wrap: nowrap;
       justify-content: space-between;
       align-items: center;
-      padding: 12px;
+      padding: @spacing;
+      &-tips {
+        color: var(--ap-text-color-3);
+      }
     }
     &__content {
       flex: 1;

package/theme/ap-table/setting/select-group.css

@@ -5,7 +5,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
 }
 .reset-scrollbar ::-webkit-scrollbar {
@@ -13,7 +13,7 @@
   height: 10px;
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-color: var(--ap-scrollbar-thumb-color-base);
   background-clip: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -24,7 +24,7 @@
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb:hover,
 .reset-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  background-color: var(--ap-scrollbar-thumb-color-hover);
 }
 .clear-fix::before {
   display: table;

package/theme/ap-table/setting/sortable-item-meta.css

@@ -5,7 +5,7 @@
   color: #182948;
   font-size: 12px;
   font-family: inherit;
-  line-height: 1.5;
+  line-height: 18px;
   list-style: none;
 }
 .reset-scrollbar ::-webkit-scrollbar {
@@ -13,7 +13,7 @@
   height: 10px;
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: var(--basic-scrollbar-thumb-color-base, #bfbfbf);
+  background-color: var(--ap-scrollbar-thumb-color-base);
   background-clip: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -24,7 +24,7 @@
 }
 .reset-scrollbar ::-webkit-scrollbar-thumb:hover,
 .reset-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  background-color: var(--ap-scrollbar-thumb-color-hover);
 }
 .clear-fix::before {
   display: table;
@@ -62,7 +62,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;
@@ -92,5 +92,5 @@
   margin-left: 16px;
 }
 .aplus-sortable-item-meta-action-icon:hover {
-  color: var(--basic-color-primary, #0070ff);
+  color: var(--ap-color-primary);
 }

package/theme/ap-table/setting/sortable-item-meta.less

@@ -20,7 +20,7 @@
       display: block;
     }
     .@{mlh} {
-      color: var(--basic-color-primary, #0070ff) !important;
+      color: var(--ap-color-primary) !important;
     }
   }
   &-left {
@@ -52,7 +52,7 @@
   }
   &-action-icon {
     &:hover {
-      color: var(--basic-color-primary, #0070ff);
+      color: var(--ap-color-primary);
     }
   }
 });