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

package/theme/ap-form/search-form.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: '';
@@ -28,13 +46,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;
 }
@@ -48,7 +69,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;
@@ -74,22 +95,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;
@@ -101,7 +122,7 @@
   width: 100%;
 }
 .aplus-ap-form-item .ant-input-group .ant-select + .ant-picker {
-  padding-inline: 11px;
+  padding-inline: 8px;
   flex: 1;
 }
 .aplus-search-form-sorter-content {
@@ -114,7 +135,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;
@@ -128,12 +149,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;
@@ -144,12 +165,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;
@@ -170,13 +191,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;
@@ -185,7 +207,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;
@@ -226,6 +248,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;
 }
@@ -252,5 +285,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

@@ -37,6 +37,17 @@
       &-confirm-btn {
         margin-left: 10px;
       }
+      & button.ant-btn {
+        padding-inline: @spacing-xl;
+      }
+    }
+  }
+  &-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 {
@@ -67,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,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: '';

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(--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: '';
@@ -37,13 +55,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;
 }
@@ -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;
@@ -83,22 +104,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;
@@ -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,12 +194,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;
@@ -189,12 +210,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;
@@ -215,13 +236,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;
@@ -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-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;
 }
@@ -297,7 +330,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;
@@ -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;
@@ -386,19 +419,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;
@@ -409,9 +442,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%;
 }
@@ -426,6 +470,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(--ap-scrollbar-thumb-color-base);
+  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(--ap-scrollbar-thumb-color-hover);
+}
+.aplus-ap-grid .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell {
+  min-height: unset !important;
+  padding: 9px 12px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.aplus-ap-grid .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell {
+  min-height: unset !important;
+  padding: 6px 9px;
+  line-height: 1.5;
+}
 .aplus-ap-grid-adaptive {
   height: 100%;
   display: flex;
@@ -436,7 +509,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;
@@ -496,19 +569,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: 1.5;
+  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;
@@ -522,13 +600,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

@@ -10,6 +10,18 @@
 @sb: ~'@{ns}-scroll-bar';
 
 .b(ap-grid, {
+  .reset-scrollbar();
+  .vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell {
+    min-height: unset !important;
+    padding: 9px 12px;
+    font-size: @font-size-base;
+    line-height: @line-height-base;
+  }
+  .vxe-table--render-default.size--mini .vxe-body--column.is--padding div.vxe-cell {
+    min-height: unset !important;
+    padding: 6px 9px;
+    line-height: @line-height-base;
+  }
   &-adaptive {
     height: 100%;
     display: flex;
@@ -21,7 +33,7 @@
   }
   .@{pg} {
     ul.ant-pagination {
-      margin-block: @spacing-lg;
+      margin-block: @spacing;
     }
   }
   &-sticky {
@@ -90,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 {
   }
@@ -122,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,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: '';