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

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

@@ -2,10 +2,10 @@
   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;
+  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;
@@ -46,14 +46,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 {
@@ -78,6 +78,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;
 }
@@ -95,17 +98,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 {
@@ -135,10 +138,10 @@
   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;
+  line-height: 18px;
   list-style: none;
   font-size: 14px;
   font-weight: 700;
@@ -149,12 +152,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;
+  line-height: 18px;
   list-style: none;
-  color: #8896b0;
+  color: var(--ap-text-color-3);
 }
 .aplus-search-form-sorter-header-action-wrapper {
   padding: 8px;
@@ -165,12 +168,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;
+  line-height: 18px;
   list-style: none;
-  color: #0070ff;
+  color: var(--ap-color-link);
 }
 .aplus-search-form-sorter-sorter-wrapper {
   display: flex;
@@ -191,13 +194,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;
@@ -206,10 +210,10 @@
   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;
+  line-height: 18px;
   list-style: none;
   padding-left: 4px;
   max-width: 100%;
@@ -250,6 +254,14 @@
 .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;
 }
@@ -276,5 +288,5 @@
   padding-inline: 12px;
 }
 .aplus-ap-form-search-form-action-btn-reset {
-  background-color: #E9EDF3;
+  background-color: var(--ap-color-bg);
 }

package/theme/ap-form/search-form.less

@@ -42,6 +42,14 @@
       }
     }
   }
+  &-trigger-btn {
+    font-size: 0px;
+    &-active {
+      color: var(--ap-hover-color-base);
+      border-color: var(--ap-hover-color-base);
+      z-index: 1;
+    }
+  }
   &-column-setting-trigger-wrapper {
     flex-shrink: 0;
     .ant-btn:not(:only-child) {
@@ -70,6 +78,6 @@
     padding-inline: @spacing-lg;
   }
   &-action-btn-reset {
-    background-color: #E9EDF3;
+    background-color: var(--ap-color-bg);
   }
 });

package/theme/ap-grid/editable.css

@@ -2,10 +2,10 @@
   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;
+  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-grid/index.css

@@ -2,10 +2,10 @@
   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;
+  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;
@@ -55,14 +55,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 {
@@ -87,6 +87,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;
 }
@@ -104,17 +107,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 {
@@ -180,10 +183,10 @@
   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;
+  line-height: 18px;
   list-style: none;
   font-size: 14px;
   font-weight: 700;
@@ -194,12 +197,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;
+  line-height: 18px;
   list-style: none;
-  color: #8896b0;
+  color: var(--ap-text-color-3);
 }
 .aplus-search-form-sorter-header-action-wrapper {
   padding: 8px;
@@ -210,12 +213,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;
+  line-height: 18px;
   list-style: none;
-  color: #0070ff;
+  color: var(--ap-color-link);
 }
 .aplus-search-form-sorter-sorter-wrapper {
   display: flex;
@@ -236,13 +239,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;
@@ -251,10 +255,10 @@
   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;
+  line-height: 18px;
   list-style: none;
   padding-left: 4px;
   max-width: 100%;
@@ -295,6 +299,14 @@
 .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;
 }
@@ -321,7 +333,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;
@@ -401,28 +413,28 @@
   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;
+  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;
@@ -433,9 +445,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%;
 }
@@ -455,7 +478,7 @@
   height: 10px;
 }
 .aplus-ap-grid ::-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;
@@ -466,18 +489,20 @@
 }
 .aplus-ap-grid ::-webkit-scrollbar-thumb:hover,
 .aplus-ap-grid ::-webkit-scrollbar-thumb:active {
-  background-color: var(--basic-scrollbar-thumb-color-hover, #787878);
+  background-color: var(--ap-scrollbar-thumb-color-hover);
 }
-.aplus-ap-grid .vxe-table .vxe-cell {
+.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell,
+.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-header--column.is--padding div.vxe-cell {
   min-height: unset !important;
-  padding: 9px 12px !important;
+  padding: 9px 12px;
   font-size: 12px;
-  line-height: 1.5;
+  line-height: 18px;
 }
-.aplus-ap-grid .vxe-table.size--mini .vxe-cell {
+.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell,
+.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-header--column.is--padding div.vxe-cell {
   min-height: unset !important;
-  padding: 6px 9px !important;
-  line-height: 1.5;
+  padding: 6px 9px;
+  line-height: 18px;
 }
 .aplus-ap-grid-adaptive {
   height: 100%;
@@ -489,7 +514,7 @@
   flex: 1;
 }
 .aplus-ap-grid .aplus-ap-grid-pagination-wrapper ul.ant-pagination {
-  margin-block: 12px;
+  margin-block: 8px;
 }
 .aplus-ap-grid-sticky .aplus-ap-grid-pagination-wrapper {
   background-color: #fff;
@@ -549,19 +574,24 @@
   margin-block: 12px;
   display: flex;
   flex-wrap: wrap;
+  align-items: center;
   row-gap: 8px;
 }
 .aplus-ap-grid-pagination .ant-pagination-total-text {
   flex: 1;
+  height: unset;
+  line-height: 18px;
+  display: flex;
+  align-items: center;
 }
 .aplus-ap-grid-pagination-count-text {
-  color: var(--ap-table-pagination-total-count-color, #182948);
+  color: var(--ap-text-color-2);
 }
 .aplus-ap-grid-pagination--total-right {
   padding-left: 12px;
 }
 .aplus-ap-grid-pagination-total-wrapper {
-  color: var(--ap-table-pagination-total-color, #526A90);
+  color: var(--ap-text-color-1);
 }
 .aplus-ap-grid-table-header__title {
   display: -webkit-inline-box;
@@ -575,13 +605,22 @@
   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;
+}
+.aplus-ap-grid .fixed-left--wrapper .vxe-table--header,
+.aplus-ap-grid .fixed-right--wrapper .vxe-table--header {
+  height: 100%;
+}
+.aplus-ap-grid .fixed-left--wrapper .vxe-table--footer,
+.aplus-ap-grid .fixed-right--wrapper .vxe-table--footer {
+  height: 100%;
 }

package/theme/ap-grid/index.less

@@ -11,15 +11,15 @@
 
 .b(ap-grid, {
   .reset-scrollbar();
-  .vxe-table .vxe-cell {
+  .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell, .vxe-table--render-default.size--medium .vxe-header--column.is--padding div.vxe-cell {
     min-height: unset !important;
-    padding: 9px 12px !important;
+    padding: 9px 12px;
     font-size: @font-size-base;
     line-height: @line-height-base;
   }
-  .vxe-table.size--mini .vxe-cell {
+  .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell, .vxe-table--render-default.size--mini .vxe-header--column.is--padding div.vxe-cell {
     min-height: unset !important;
-    padding: 6px 9px !important;
+    padding: 6px 9px;
     line-height: @line-height-base;
   }
   &-adaptive {
@@ -33,7 +33,7 @@
   }
   .@{pg} {
     ul.ant-pagination {
-      margin-block: @spacing-lg;
+      margin-block: @spacing;
     }
   }
   &-sticky {
@@ -102,19 +102,24 @@
     margin-block: @spacing-lg;
     display: flex;
     flex-wrap: wrap;
+    align-items: center;
     row-gap: 8px;
     .ant-pagination-total-text {
       flex: 1;
+      height: unset;
+      line-height: @line-height-base;
+      display: flex;
+      align-items: center;
     }
   }
   &-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 {
   }
@@ -134,14 +139,26 @@
     }
   }
   // 实现表头不换行排列
-  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;
+    }
+  }
+
+  // 浮动表头和浮动页脚为对齐问题
+  .fixed-left--wrapper,
+  .fixed-right--wrapper {
+    .vxe-table--header {
+      height: 100%;
+    }
+    .vxe-table--footer {
+      height: 100%;
     }
   }
 });

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

@@ -2,10 +2,10 @@
   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;
+  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-group-search/ap-group-search.css

@@ -2,10 +2,10 @@
   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;
+  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;