amis-ui 6.14.0-beta.4 → 6.14.0-beta.5

package/lib/components/table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -225,6 +225,7 @@ var Table = /** @class */ (function (_super) {
         if (tableContentHeight > 0) {
             tableContent.style[heightField] = "".concat(tableContentHeight, "px");
             tableContent.style['overflow'] = 'auto';
+            tableContent.classList.add('is-autoFillHeight');
         }
     };
     Table.prototype.initDragging = function () {
@@ -316,9 +317,10 @@ var Table = /** @class */ (function (_super) {
         // 点击记录起始坐标
         this.resizeStart = event.clientX;
         this.resizeTarget = event.currentTarget;
-        var column = this.tdColumns[index];
         this.resizeIndex = index;
-        var colWidth = this.state.colWidths[column.name];
+        var th = this.resizeTarget.closest('th,td');
+        var colIndex = th.cellIndex;
+        var colWidth = this.state.colWidths[colIndex];
         this.resizeWidth = colWidth.width || colWidth.realWidth;
         this.resizeTarget.classList.add('is-resizing');
         document.addEventListener('mousemove', this.onResizeMouseMove);
@@ -339,8 +341,10 @@ var Table = /** @class */ (function (_super) {
                 // 缩短列
                 newWidth = Math.max(this.resizeWidth + distance, DefaultCellWidth, column.minWidth || 0);
             }
+            var th = this.resizeTarget.closest('th,td');
+            var colIndex = th.cellIndex;
             var colWidths = this.state.colWidths;
-            colWidths[column.name].width = newWidth;
+            colWidths[colIndex].width = newWidth;
             this.setState({ colWidths: tslib.__assign({}, colWidths) });
         }
         event && event.stopPropagation();
@@ -712,6 +716,11 @@ var Table = /** @class */ (function (_super) {
         else {
             table === null || table === void 0 ? void 0 : table.classList.remove(rightClass);
         }
+        if (this.contentDom.current && table) {
+            var scrollBarWidth = this.contentDom.current.offsetWidth -
+                this.contentDom.current.clientWidth;
+            table.style.cssText += "--Table-scrollbar-width: ".concat(scrollBarWidth, "px;");
+        }
     };
     Table.prototype.onTableContentScroll = function (event) {
         this.updateTableDom(event.target);
@@ -757,11 +766,7 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.renderScrollTableHeader = function () {
         var _a;
         var _b = this.props, scroll = _b.scroll, headSummary = _b.headSummary, sticky = _b.sticky, showHeader = _b.showHeader, cx = _b.classnames, headerClassName = _b.headerClassName;
-        // paddingRight 30 用来解决有内容区有滚动条时，到最右端对不齐问题
-        var style = {
-            overflow: 'hidden',
-            paddingRight: 30
-        };
+        var style = {};
         if (!!sticky) {
             Object.assign(style, { top: 0 });
         }
@@ -776,7 +781,7 @@ var Table = /** @class */ (function (_super) {
                     : '100%'
             });
         }
-        return (_J$X_("div", { ref: this.headerDom, className: cx('Table-header', (_a = {},
+        return (_J$X_("div", { ref: this.headerDom, className: cx('Table-header', 'Table-header--affixed', (_a = {},
                 _a[cx('Table-sticky-holder')] = !!sticky,
                 _a), headerClassName), style: style },
             _J$X_("table", { className: cx('Table-table', widthReady ? 'Table-table--fixed' : ''), style: tslib.__assign({}, tableStyle) },
@@ -827,25 +832,27 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.syncTableWidth = function () {
         var _this = this;
+        var _a;
         var tbodyDom = this.tbodyDom.current;
-        if (!tbodyDom) {
+        if (!tbodyDom || this.resizeTarget) {
             return;
         }
-        var cols = [].slice.call(tbodyDom === null || tbodyDom === void 0 ? void 0 : tbodyDom.querySelectorAll(':scope>tr:last-child>td[data-col]'));
+        var colgroup = (_a = tbodyDom.parentElement) === null || _a === void 0 ? void 0 : _a.querySelector(':scope>colgroup');
+        if (!colgroup) {
+            return;
+        }
+        var cols = [].slice.call(colgroup === null || colgroup === void 0 ? void 0 : colgroup.querySelectorAll(':scope>col'));
         var colWidths = {};
-        cols.forEach(function (col) {
+        cols.forEach(function (col, colIndex) {
             var index = parseInt(col.getAttribute('data-col'), 10);
             var column = _this.tdColumns[index];
-            var item = _this.state.colWidths[column.name];
-            if (column) {
-                colWidths[column.name] = {
-                    width: (item === null || item === void 0 ? void 0 : item.originWidth) !== (column === null || column === void 0 ? void 0 : column.width) ? column === null || column === void 0 ? void 0 : column.width : item === null || item === void 0 ? void 0 : item.width,
-                    minWidth: column === null || column === void 0 ? void 0 : column.minWidth,
-                    realWidth: col.getBoundingClientRect().width,
-                    originWidth: column === null || column === void 0 ? void 0 : column.width
-                };
-                colWidths[index] = colWidths[column.name];
-            }
+            var item = _this.state.colWidths[colIndex];
+            colWidths[colIndex] = {
+                width: (item === null || item === void 0 ? void 0 : item.originWidth) !== (column === null || column === void 0 ? void 0 : column.width) ? column === null || column === void 0 ? void 0 : column.width : item === null || item === void 0 ? void 0 : item.width,
+                minWidth: column === null || column === void 0 ? void 0 : column.minWidth,
+                realWidth: col.getBoundingClientRect().width,
+                originWidth: column === null || column === void 0 ? void 0 : column.width
+            };
         });
         if (!isEqual__default["default"](colWidths, this.state.colWidths)) {
             this.setState({ colWidths: colWidths, widthReady: true });
@@ -854,7 +861,7 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.initTableWidth = function () {
         var _this = this;
         var tableWrapperDom = this.contentDom.current;
-        if (!tableWrapperDom) {
+        if (!tableWrapperDom || this.resizeTarget) {
             return;
         }
         var _a = this.props, scroll = _a.scroll, tableLayout = _a.tableLayout;
@@ -908,29 +915,29 @@ var Table = /** @class */ (function (_super) {
         document.body.appendChild(div);
         var colWidths = {};
         ths1.forEach(function (th) {
-            var index = parseInt(th.getAttribute('data-col'), 10);
-            var column = _this.tdColumns[index];
-            minWidths[index] = th.clientWidth;
-            if (colWidths[index]) {
-                colWidths[column === null || column === void 0 ? void 0 : column.name].minWidth = th.clientWidth;
+            var colIndex = th.cellIndex;
+            minWidths[colIndex] = th.clientWidth;
+            if (colWidths[colIndex]) {
+                colWidths[colIndex].minWidth = th.clientWidth;
             }
             else {
-                colWidths[column === null || column === void 0 ? void 0 : column.name] = { minWidth: th.clientWidth };
+                colWidths[colIndex] = { minWidth: th.clientWidth };
             }
         });
         ths2.forEach(function (col) {
+            var colIndex = col.cellIndex;
             var index = parseInt(col.getAttribute('data-col'), 10);
             var column = _this.tdColumns[index];
             if (column && (column.width || isFixed)) {
                 var width = Math.max(typeof column.width === 'number' ? column.width : col.clientWidth, minWidths[index] || 0);
-                if (colWidths[column === null || column === void 0 ? void 0 : column.name]) {
-                    colWidths[column === null || column === void 0 ? void 0 : column.name].width = width;
+                if (colWidths[colIndex]) {
+                    colWidths[colIndex].width = width;
                 }
                 else {
-                    colWidths[column === null || column === void 0 ? void 0 : column.name] = { width: width };
+                    colWidths[colIndex] = { width: width };
                 }
                 if (column.width) {
-                    colWidths[column === null || column === void 0 ? void 0 : column.name].originWidth = column.width;
+                    colWidths[colIndex].originWidth = column.width;
                 }
             }
         });
@@ -940,9 +947,6 @@ var Table = /** @class */ (function (_super) {
         document.body.removeChild(div);
     };
     Table.prototype.updateTableInfo = function () {
-        if (this.resizeTarget) {
-            return;
-        }
         this.syncTableWidth();
         this.initTableWidth();
     };
@@ -965,15 +969,18 @@ var Table = /** @class */ (function (_super) {
         }
         var mainStyle = tslib.__assign({}, this.props.style);
         if (this.state.widthReady) {
-            Object.keys(this.state.colWidths).forEach(function (key) {
-                if (!/^\d+$/.test(key)) {
-                    return;
-                }
-                var width = _this.state.colWidths[key].realWidth;
+            Object.keys(this.state.colWidths).forEach(function (key, index, list) {
+                var width = _this.state.colWidths[index].realWidth;
                 if (width) {
                     mainStyle["--Table-column-".concat(key, "-width")] = "".concat(width, "px");
                 }
             });
+            if (this.contentDom.current) {
+                // 严格来说不应该这么写，但是不想折腾了
+                var scrollBarWidth = this.contentDom.current.offsetWidth -
+                    this.contentDom.current.clientWidth;
+                mainStyle['--Table-scrollbar-width'] = scrollBarWidth + 'px';
+            }
         }
         return (_J$X_("div", { ref: this.tableDom, className: cx('Table2', className, (_a = {},
                 _a[cx('Table-scroll-horizontal')] = hasScrollX,
@@ -984,7 +991,7 @@ var Table = /** @class */ (function (_super) {
             title ? (_J$X_("div", { className: cx('Table-title') }, typeof title === 'function' ? title() : title)) : null,
             hasScrollY && !autoFillHeight ? (this.renderScrollTable()) : (_J$X_("div", { className: cx('Table-container', (_b = {},
                     _b[cx('Table-container-self-sticky')] = hasScrollY || (sticky && autoFillHeight),
-                    _b)), style: style, ref: this.containerDom }, this.renderTable())),
+                    _b)), onScroll: this.onTableScroll, style: style, ref: this.containerDom }, this.renderTable())),
             footer ? (_J$X_("div", { className: cx('Table-footer') }, typeof footer === 'function' ? footer() : footer)) : null));
     };
     Table.defaultProps = {

package/lib/components/table/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -168,7 +168,7 @@ function getPreviousTopHeight(thead, rowIndex) {
 }
 function getAfterRightWidth(index, columns) {
     var widths = [];
-    for (var i = columns.length - 0; i > index; i--) {
+    for (var i = columns.length - 1; i > index; i--) {
         if (columns && columns[i] && isFixedRightColumn(columns[i].fixed)) {
             widths.push("var(--Table-column-".concat(i, "-width)"));
         }

package/lib/components/virtual-list/AutoSizer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/components/virtual-list/SizeAndPositionManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/components/virtual-list/constants.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/components/virtual-list/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/components/withBadge.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-click-away.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-on-screen.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-set-state.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-sub-form.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-touch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-update-effect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/hooks/use-validation-resolver.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/alert-danger.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/alert-info.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/alert-success.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/alert-warning.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/arrow-double-left.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/arrow-double-right.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/back.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/calendar.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/caret.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/check.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/clock.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/close-small.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/close.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/cloud-upload.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/column-filter.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/columns.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/compress-alt.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/copy.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/date.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/department.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/desk-empty.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/dot.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/down-arrow-bold.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/down.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/download.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/drag-bar.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/drag.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/edit.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/ellipsis-v.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/enter.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/exchange.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/expand-alt.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/fail.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/file.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/filter.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/folder.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/fullscreen.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/function.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/home.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/lib/icons/if.svg.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.4
+ * amis-ui v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */