amis-ui 6.14.0-beta.1 → 6.14.0-beta.11

package/package.json

@@ -3,7 +3,7 @@
   "main": "lib/index.js",
   "module": "esm/index.js",
   "types": "lib/index.d.ts",
-  "version": "6.14.0-beta.1",
+  "version": "6.14.0-beta.11",
   "description": "",
   "scripts": {
     "build": "npm run clean-dist && cross-env NODE_ENV=production rollup -c ",
@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-core": "^6.14.0-beta.1",
-    "amis-formula": "^6.14.0-beta.1",
+    "amis-core": "^6.14.0-beta.11",
+    "amis-formula": "^6.14.0-beta.11",
     "animate.css": "4.1.1",
     "classnames": "2.3.2",
     "codemirror": "^5.63.0",
@@ -110,7 +110,7 @@
     "sass": "^1.54.9",
     "ts-jest": "^29.0.2",
     "ts-node": "^10.4.0",
-    "typescript": "^4.6.4"
+    "typescript": "^5.8.3"
   },
   "peerDependencies": {
     "amis-core": "*",

package/scss/components/_anchor-nav.scss

@@ -13,7 +13,7 @@
       top: var(--affix-offset-top);
       height: fit-content;
       max-height: 100%;
-      overflow-y: scroll;
+      // overflow-y: scroll;
 
       > .#{$ns}AnchorNav-link {
         position: relative;

package/scss/components/_condition-builder.scss

@@ -1,6 +1,7 @@
 .#{$ns}ConditionBuilderControl.is-mobile {
   overflow-x: auto;
 }
+
 .#{$ns}CBGroup {
   font-size: var(--fontSizeSm);
   position: relative;
@@ -10,6 +11,7 @@
   // padding: px2rem(30px) px2rem(27px) px2rem(17px);
   // margin-top: px2rem(30px);
   display: flex;
+
   &-toolbarCondition {
     // text-align: center;
     // margin-top: px2rem(-44px);
@@ -111,6 +113,7 @@
 
   &-body {
     position: relative;
+
     &-wrapper {
       flex: 1;
       min-width: 0;
@@ -170,6 +173,7 @@
     .#{$ns}CBGroup-toolbarConditionAdd {
       display: flex;
       align-items: center;
+
       .#{$ns}ButtonGroup {
         & > .cxd-Button:not(:last-child) {
           margin-right: px2rem(24px);
@@ -181,6 +185,7 @@
       // }
     }
   }
+
   .#{$ns}ResultBox {
     padding-right: px2rem(3px);
   }
@@ -199,6 +204,7 @@
     margin: 5px;
     display: flex;
     color: var(--Form-select-caret-iconColor);
+
     &:hover {
       color: var(--Form-select-caret-onHover-iconColor);
     }
@@ -223,6 +229,7 @@
       var(--conditionBuilder-body-paddingRight)
       var(--conditionBuilder-body-paddingBottom) px2rem(10px);
     background: var(--conditionBuilder-body-bg-color);
+
     &.simple {
       margin-left: 0;
     }
@@ -258,6 +265,7 @@
   &.is-active {
     color: #2468f1;
   }
+
   cursor: pointer;
   // margin-left: auto;
 }
@@ -274,6 +282,7 @@
   & + & {
     margin-top: px2rem(10px);
   }
+
   &-dragbar {
     cursor: move;
     width: 20px;
@@ -290,6 +299,7 @@
     align-items: center;
     position: relative;
     transition: all var(--animation-duration) ease-out;
+
     &-group {
       width: 100%;
       flex-direction: row;
@@ -309,10 +319,12 @@
         background: $white;
         z-index: $zindex-dropdown;
       }
+
       > .#{$ns}CBGroupOrItem-dragbar {
         left: px2rem(-5px);
         position: absolute;
       }
+
       > .#{$ns}CBGroup {
         margin: 0px;
       }
@@ -330,6 +342,7 @@
       align-items: center;
       flex: 1;
       min-width: 0;
+
       > .#{$ns}CBGroupOrItem-dragbar {
         left: px2rem(10px);
         position: absolute;
@@ -391,6 +404,11 @@
 
   &-simple {
     margin-bottom: var(--gap-sm);
+
+    &:only-child .#{$ns}CBGroupOrItem-body > .#{$ns}CBGroupOrItem-body-item {
+      // same as padding-right
+      padding-left: var(--conditionBuilder-body-paddingRight);
+    }
   }
 }
 
@@ -400,6 +418,7 @@
   vertical-align: middle;
   // margin: px2rem(3px);
   cursor: pointer;
+
   > a {
     @include icon-color();
   }
@@ -426,6 +445,7 @@
 
   &-args {
     display: inline-block;
+
     > span {
       display: inline-block;
       padding: 0 5px;

package/scss/components/_table2.scss

@@ -127,6 +127,12 @@
   .#{$ns}Table-header {
     padding: var(--Table-toolbar-marginY) var(--Table-toolbar-marginX);
 
+    &--affixed {
+      overflow: hidden;
+      background-color: var(--Table-thead-bg);
+      padding-right: var(--Table-scrollbar-width) !important;
+    }
+
     &.#{$ns}Table-sticky-holder {
       position: sticky;
       z-index: 3;
@@ -176,7 +182,7 @@
     line-height: var(--table-body-lineHeight);
     background: var(--Table-bg);
     border-spacing: 0;
-    border-collapse: collapse;
+    // border-collapse: collapse;
     border: none;
 
     &--fixed {
@@ -277,6 +283,12 @@
 
       > td {
         border-top: var(--Table-borderWidth) solid var(--Table-borderColor);
+        border-bottom: unset;
+      }
+      &:last-child {
+        > td {
+          border-bottom: var(--Table-borderWidth) solid var(--Table-borderColor);
+        }
       }
 
       > td,
@@ -658,6 +670,24 @@
         z-index: 3 !important;
       }
     }
+
+    &.is-autoFillHeight {
+      overflow: auto;
+      & > .#{$ns}Table-content {
+        overflow: visible !important;
+        transform: unset !important;
+      }
+      & > .#{$ns}Table-content > table > thead > tr > th {
+        position: sticky;
+        top: 0;
+        z-index: 2 !important; // 添加z-index确保显示在最上层
+
+        &.#{$ns}Table-cell-fix-left,
+        &.#{$ns}Table-cell-fix-right {
+          z-index: 3 !important;
+        }
+      }
+    }
   }
 
   &.#{$ns}Table-ping-left {
@@ -670,23 +700,23 @@
         }
       }
 
-      > tbody > tr:not(.#{$ns}Table-row-disabled) {
-        > td.#{$ns}Table-cell-fix-left {
-          border-right: none;
-        }
-      }
+      // > tbody > tr:not(.#{$ns}Table-row-disabled) {
+      //   > td.#{$ns}Table-cell-fix-left {
+      //     border-right-color: var(--table-body-bg-color);
+      //   }
+      // }
 
-      > tfoot > tr > td:not(:last-child) {
-        &.#{$ns}Table-cell-fix-left-last {
-          border-right: none;
-        }
-      }
+      // > tfoot > tr > td:not(:last-child) {
+      //   &.#{$ns}Table-cell-fix-left-last {
+      //     border-right-color: var(--table-body-bg-color);
+      //   }
+      // }
 
-      > thead > tr > th:not(:last-child) {
-        &.#{$ns}Table-cell-fix-left-last {
-          border-right: none;
-        }
-      }
+      // > thead > tr > th:not(:last-child) {
+      //   &.#{$ns}Table-cell-fix-left-last {
+      //     border-right-color: var(--table-body-bg-color);
+      //   }
+      // }
     }
   }