@aplus-frontend/ui 0.4.15 → 0.4.17

package/theme/antd-global-overwrite/admin/index.css

@@ -655,6 +655,14 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
 [class$='-basic-table-row__striped'] td {
   background-color: #fafafa;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination) {
+  padding-bottom: 0;
+}
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
 [class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
@@ -760,6 +768,26 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
   bottom: 56px;
   z-index: 99;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar {
+  bottom: -1px;
+}
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,

package/theme/antd-global-overwrite/admin/table.css

@@ -138,6 +138,14 @@
 [class$='-basic-table-row__striped'] td {
   background-color: #fafafa;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination) {
+  padding-bottom: 0;
+}
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
 [class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
@@ -243,6 +251,26 @@
   bottom: 56px;
   z-index: 99;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar {
+  bottom: -1px;
+}
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,

package/theme/antd-global-overwrite/admin/table.less

@@ -134,6 +134,10 @@
 [class*='-pro-table'].ap-table--sticky {
   .@{tw},
   .ant-table-wrapper {
+    &:has(ul.ant-pagination) {
+      padding-bottom: 0;
+    }
+
     & .ant-spin-container,
     &,
     .ant-spin-container {
@@ -160,6 +164,12 @@
         z-index: 99;
       }
 
+      &:not(ul.ant-pagination) {
+        .@{ns}-scroll-bar {
+          bottom: -1px;
+        }
+      }
+
       ul.ant-pagination {
         position: sticky;
         bottom: 0;

package/theme/antd-global-overwrite/aplus/index.css

@@ -687,12 +687,12 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
 [class$='-basic-table-row__striped'] td {
   background-color: #f6f9fa;
 }
-[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper,
-[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper,
-[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper,
-[class*='-basic-table'].ap-table--sticky .ant-table-wrapper,
-[class*='-ap-table'].ap-table--sticky .ant-table-wrapper,
-[class*='-pro-table'].ap-table--sticky .ant-table-wrapper {
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination) {
   padding-bottom: 0;
 }
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
@@ -800,6 +800,26 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
   bottom: 56px;
   z-index: 99;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar {
+  bottom: -1px;
+}
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,

package/theme/antd-global-overwrite/aplus/table.css

@@ -123,12 +123,12 @@
 [class$='-basic-table-row__striped'] td {
   background-color: #f6f9fa;
 }
-[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper,
-[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper,
-[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper,
-[class*='-basic-table'].ap-table--sticky .ant-table-wrapper,
-[class*='-ap-table'].ap-table--sticky .ant-table-wrapper,
-[class*='-pro-table'].ap-table--sticky .ant-table-wrapper {
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(ul.ant-pagination),
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination),
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:has(ul.ant-pagination) {
   padding-bottom: 0;
 }
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container,
@@ -236,6 +236,26 @@
   bottom: 56px;
   z-index: 99;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:not(ul.ant-pagination) .'aplus'-scroll-bar {
+  bottom: -1px;
+}
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,
 [class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container ul.ant-pagination,

package/theme/antd-global-overwrite/aplus/table.less

@@ -136,7 +136,9 @@
 [class*='-pro-table'].ap-table--sticky {
   .@{tw},
   .ant-table-wrapper {
-    padding-bottom: 0;
+    &:has(ul.ant-pagination) {
+      padding-bottom: 0;
+    }
 
     & .ant-spin-container,
     &,
@@ -163,6 +165,12 @@
         z-index: 99;
       }
 
+      &:not(ul.ant-pagination) {
+        .@{ns}-scroll-bar {
+          bottom: -1px;
+        }
+      }
+
       ul.ant-pagination {
         position: sticky;
         bottom: 0;

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

@@ -566,10 +566,12 @@
 .aplus-ap-table-setting-trigger-button:hover {
   color: unset;
 }
-.aplus-ap-table .ant-table-container {
-  overflow: hidden;
-}
-.aplus-ap-table-horizontal--scrollable .ant-table-container > div:last-child {
+.aplus-ap-table--sticky-relative .ant-table-container > div:last-child {
   margin-bottom: calc(var(--basic-scrollbar-size) * -1);
-  clip-path: inset(0px 0px var(--basic-scrollbar-size) 0px);
+  clip-path: inset(0 0 var(--basic-scrollbar-size) 0);
+}
+.aplus-ap-table--sticky-absolute .ant-table-container > div:last-child {
+  padding-bottom: 15px;
+  margin-bottom: -15px;
+  clip-path: inset(0 0 15px 0);
 }

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

@@ -157,14 +157,24 @@
       color: unset;
     }
   }
-  .ant-table-container{
-    overflow: hidden;
+  // 粘贴布局并且滚动条占据空间
+  &--sticky-relative {
+    .ant-table-container{
+      & > div:last-child {
+        margin-bottom: calc(var(--basic-scrollbar-size) * -1);
+        clip-path: inset(0 0 var(--basic-scrollbar-size) 0);
+      }
+    }
   }
-  &-horizontal--scrollable {
-    // 隐藏默认可滚动容器的滚动条
-    .ant-table-container > div:last-child {
-      margin-bottom: calc(var(--basic-scrollbar-size) * -1);
-      clip-path: inset(0px 0px var(--basic-scrollbar-size) 0px);
+  // 粘贴布局滚动条不占据空间
+  &--sticky-absolute {
+    .ant-table-container{
+      & > div:last-child {
+        padding-bottom: 15px;
+        margin-bottom: -15px;
+        clip-path: inset(0 0 15px 0);
+      }
     }
   }
+
 });

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

@@ -566,12 +566,14 @@
 .aplus-ap-table-setting-trigger-button:hover {
   color: unset;
 }
-.aplus-ap-table .ant-table-container {
-  overflow: hidden;
-}
-.aplus-ap-table-horizontal--scrollable .ant-table-container > div:last-child {
+.aplus-ap-table--sticky-relative .ant-table-container > div:last-child {
   margin-bottom: calc(var(--basic-scrollbar-size) * -1);
-  clip-path: inset(0px 0px var(--basic-scrollbar-size) 0px);
+  clip-path: inset(0 0 var(--basic-scrollbar-size) 0);
+}
+.aplus-ap-table--sticky-absolute .ant-table-container > div:last-child {
+  padding-bottom: 15px;
+  margin-bottom: -15px;
+  clip-path: inset(0 0 15px 0);
 }
 .aplus-ap-table-modal--table-layout {
   display: flex;

package/theme/index.css

@@ -1157,12 +1157,14 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
 .aplus-ap-table-setting-trigger-button:hover {
   color: unset;
 }
-.aplus-ap-table .ant-table-container {
-  overflow: hidden;
-}
-.aplus-ap-table-horizontal--scrollable .ant-table-container > div:last-child {
+.aplus-ap-table--sticky-relative .ant-table-container > div:last-child {
   margin-bottom: calc(var(--basic-scrollbar-size) * -1);
-  clip-path: inset(0px 0px var(--basic-scrollbar-size) 0px);
+  clip-path: inset(0 0 var(--basic-scrollbar-size) 0);
+}
+.aplus-ap-table--sticky-absolute .ant-table-container > div:last-child {
+  padding-bottom: 15px;
+  margin-bottom: -15px;
+  clip-path: inset(0 0 15px 0);
 }
 .aplus-tag-wrapper {
   text-wrap: nowrap;