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

package/lib/components/table/ColGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.1
+ * amis-ui v6.14.0-beta.3
  * Copyright 2018-2025 fex
  */
 
@@ -23,28 +23,36 @@ function ColGroup(_a) {
     var tdColumns = util.getBuildColumns(columns).tdColumns;
     var domRef = React__default["default"].createRef();
     React__default["default"].useEffect(function () {
-        if (domRef.current) {
-            initTableWidth === null || initTableWidth === void 0 ? void 0 : initTableWidth();
-            syncTableWidth === null || syncTableWidth === void 0 ? void 0 : syncTableWidth();
-        }
-    }, []);
-    React__default["default"].useEffect(function () {
+        initTableWidth === null || initTableWidth === void 0 ? void 0 : initTableWidth();
         if (!syncTableWidth) {
             return;
         }
         var table = domRef.current.parentElement;
-        var observer = new MutationObserver(function () {
+        var trs = [];
+        function reConnect() {
+            // 整体监听不准，因为整体可能不会宽度变化
+            // 监控 thead 下面所有的 th 的 resize 变化
+            // 如果变化了，需要重新更新表格宽度计算
+            var doms = [].slice.call(table.querySelectorAll(':scope > tbody > tr:first-child > *'));
+            // 先看 th 本身有没有变化，如果没变化，就不要重新监听了
+            if (doms.some(function (d, index) { return trs[index] !== d; })) {
+                observer.disconnect();
+                trs = doms;
+                doms.forEach(function (dom) {
+                    observer.observe(dom);
+                });
+            }
+        }
+        var observer = new ResizeObserver(function () {
+            reConnect();
             syncTableWidth();
         });
-        observer.observe(table, {
-            attributes: true,
-            childList: true,
-            subtree: true
-        });
+        reConnect();
+        syncTableWidth();
         return function () {
             observer.disconnect();
         };
-    }, []);
+    }, [columns.length]);
     return (_J$X_("colgroup", { ref: domRef },
         draggable ? _J$X_("col", { style: { width: index.DefaultCellWidth + 'px' } }) : null,
         selectable ? (_J$X_("col", { style: { width: rowSelectionColumnWidth + 'px' } })) : null,

package/lib/components/table/Head.js

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

package/lib/components/table/HeadCellDropDown.js

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

package/lib/components/table/HeadCellFilter.js

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

package/lib/components/table/HeadCellSelect.js

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

package/lib/components/table/HeadCellSort.js

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

package/lib/components/table/ItemActionsWrapper.js

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

package/lib/components/table/Row.js

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

package/lib/components/table/SummaryRow.js

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

package/lib/components/table/index.d.ts

@@ -141,7 +141,7 @@ export interface TableState {
     expandedRowKeys: Array<string | number>;
     widthReady: boolean;
     colWidths: {
-        [name: string]: {
+        [name: string | number]: {
             width: number;
             realWidth: number;
             minWidth: number;

package/lib/components/table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.1
+ * amis-ui v6.14.0-beta.3
  * Copyright 2018-2025 fex
  */
 
@@ -757,7 +757,11 @@ 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;
-        var style = { overflow: 'hidden' };
+        // paddingRight 30 用来解决有内容区有滚动条时，到最右端对不齐问题
+        var style = {
+            overflow: 'hidden',
+            paddingRight: 30
+        };
         if (!!sticky) {
             Object.assign(style, { top: 0 });
         }
@@ -837,9 +841,10 @@ var Table = /** @class */ (function (_super) {
                 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.offsetWidth,
+                    realWidth: col.getBoundingClientRect().width,
                     originWidth: column === null || column === void 0 ? void 0 : column.width
                 };
+                colWidths[index] = colWidths[column.name];
             }
         });
         if (!isEqual__default["default"](colWidths, this.state.colWidths)) {
@@ -930,7 +935,7 @@ var Table = /** @class */ (function (_super) {
             }
         });
         if (!isEqual__default["default"](colWidths, this.state.colWidths)) {
-            this.setState({ colWidths: colWidths, widthReady: true });
+            this.setState({ colWidths: colWidths }, this.syncTableWidth);
         }
         document.body.removeChild(div);
     };
@@ -943,6 +948,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.render = function () {
         var _a, _b;
+        var _this = this;
         var _c = this.props, title = _c.title, footer = _c.footer, className = _c.className, scroll = _c.scroll, size = _c.size, bordered = _c.bordered, resizable = _c.resizable, columns = _c.columns, sticky = _c.sticky, autoFillHeight = _c.autoFillHeight, cx = _c.classnames;
         var _d = util.getBuildColumns(columns), thColumns = _d.thColumns, tdColumns = _d.tdColumns;
         this.thColumns = thColumns;
@@ -957,12 +963,24 @@ var Table = /** @class */ (function (_super) {
                 maxHeight: scroll.y
             });
         }
+        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;
+                if (width) {
+                    mainStyle["--Table-column-".concat(key, "-width")] = "".concat(width, "px");
+                }
+            });
+        }
         return (_J$X_("div", { ref: this.tableDom, className: cx('Table2', className, (_a = {},
                 _a[cx('Table-scroll-horizontal')] = hasScrollX,
                 _a[cx("Table-".concat(size))] = size,
                 _a[cx('Table-bordered')] = bordered,
                 _a[cx('Table-resizable')] = resizable,
-                _a)) },
+                _a)), style: mainStyle },
             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),

package/lib/components/table/util.d.ts

@@ -20,7 +20,7 @@ export declare function getBuildColumns(columns: Array<any>): {
 };
 export declare function updateFixedRow(row: HTMLTableRowElement, columns: Array<ColumnProps | SummaryProps>, cx: Function): void;
 export declare function updateStickyRow(thead: HTMLCollection, rowIndex: number): void;
-export declare function hasFixedColumn(columns: Array<ColumnProps | SummaryProps>): number | ColumnProps | SummaryProps | (() => IterableIterator<ColumnProps | SummaryProps>) | (() => {
+export declare function hasFixedColumn(columns: Array<ColumnProps | SummaryProps>): number | ColumnProps | SummaryProps | ((predicate: (value: ColumnProps | SummaryProps, index: number, obj: (ColumnProps | SummaryProps)[]) => unknown, thisArg?: any) => number) | (() => IterableIterator<ColumnProps | SummaryProps>) | (() => {
     copyWithin: boolean;
     entries: boolean;
     fill: boolean;
@@ -51,6 +51,6 @@ export declare function hasFixedColumn(columns: Array<ColumnProps | SummaryProps
 } | {
     <S_2 extends ColumnProps | SummaryProps>(predicate: (this: void, value: ColumnProps | SummaryProps, index: number, obj: (ColumnProps | SummaryProps)[]) => value is S_2, thisArg?: any): S_2 | undefined;
     (predicate: (value: ColumnProps | SummaryProps, index: number, obj: (ColumnProps | SummaryProps)[]) => unknown, thisArg?: any): ColumnProps | SummaryProps | undefined;
-} | ((predicate: (value: ColumnProps | SummaryProps, index: number, obj: (ColumnProps | SummaryProps)[]) => unknown, thisArg?: any) => number) | ((value: ColumnProps | SummaryProps, start?: number | undefined, end?: number | undefined) => (ColumnProps | SummaryProps)[]) | ((target: number, start: number, end?: number | undefined) => (ColumnProps | SummaryProps)[]) | (() => IterableIterator<[number, ColumnProps | SummaryProps]>) | (() => IterableIterator<number>) | (() => IterableIterator<ColumnProps | SummaryProps>) | (<U_3, This = undefined>(callback: (this: This, value: ColumnProps | SummaryProps, index: number, array: (ColumnProps | SummaryProps)[]) => U_3 | readonly U_3[], thisArg?: This | undefined) => U_3[]) | (<A, D extends number = 1>(this: A, depth?: D | undefined) => FlatArray<A, D>[]) | (() => string) | undefined;
+} | ((value: ColumnProps | SummaryProps, start?: number | undefined, end?: number | undefined) => (ColumnProps | SummaryProps)[]) | ((target: number, start: number, end?: number | undefined) => (ColumnProps | SummaryProps)[]) | (() => IterableIterator<[number, ColumnProps | SummaryProps]>) | (() => IterableIterator<number>) | (() => IterableIterator<ColumnProps | SummaryProps>) | (<U_3, This = undefined>(callback: (this: This, value: ColumnProps | SummaryProps, index: number, array: (ColumnProps | SummaryProps)[]) => U_3 | readonly U_3[], thisArg?: This | undefined) => U_3[]) | (<A, D extends number = 1>(this: A, depth?: D | undefined) => FlatArray<A, D>[]) | (() => string) | undefined;
 export declare function levelsSplit(level: string): number[];
 export declare function getSortData(data: Array<any>, columns: Array<ColumnProps>, childrenColumnName: string, sort?: SortProps): Array<any>;

package/lib/components/table/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.14.0-beta.1
+ * amis-ui v6.14.0-beta.3
  * Copyright 2018-2025 fex
  */
 
@@ -143,15 +143,18 @@ function isFixedLeftColumn(fixed) {
 function isFixedRightColumn(fixed) {
     return fixed === 'right';
 }
-function getPreviousLeftWidth(doms, index, columns) {
-    var width = 0;
+function getPreviousLeftWidth(index, columns) {
+    var widths = [];
     for (var i = 0; i < index; i++) {
         if (columns && columns[i] && isFixedLeftColumn(columns[i].fixed)) {
-            var dom = doms[i];
-            width += dom.offsetWidth;
+            widths.push("var(--Table-column-".concat(i, "-width)"));
         }
     }
-    return width;
+    return widths.length
+        ? widths.length > 1
+            ? "calc(".concat(widths.join(' + '), ")")
+            : widths[0]
+        : '0';
 }
 function getPreviousTopHeight(thead, rowIndex) {
     var height = 0;
@@ -163,17 +166,18 @@ function getPreviousTopHeight(thead, rowIndex) {
     }
     return height;
 }
-function getAfterRightWidth(doms, index, columns) {
-    var width = 0;
-    for (var i = doms.length - 0; i > index; i--) {
+function getAfterRightWidth(index, columns) {
+    var widths = [];
+    for (var i = columns.length - 0; i > index; i--) {
         if (columns && columns[i] && isFixedRightColumn(columns[i].fixed)) {
-            var dom = doms[i];
-            if (dom) {
-                width += dom.offsetWidth;
-            }
+            widths.push("var(--Table-column-".concat(i, "-width)"));
         }
     }
-    return width;
+    return widths.length
+        ? widths.length > 1
+            ? "calc(".concat(widths.join(' + '), ")")
+            : widths[0]
+        : '0';
 }
 // 更新一个tr下的td的left和class
 function updateFixedRow(row, columns, cx) {
@@ -189,13 +193,12 @@ function updateFixedRow(row, columns, cx) {
         var dom = children[i];
         classRemovals.push(dom);
         var fixed = columns[i] ? columns[i].fixed || '' : '';
-        var left = void 0, right = void 0;
+        var left = '', right = '';
         if (isFixedLeftColumn(fixed)) {
-            left = i > 0 ? getPreviousLeftWidth(children, i, columns) + 'px' : '0';
+            left = i > 0 ? getPreviousLeftWidth(i, columns) : '0';
         }
         else if (isFixedRightColumn(fixed)) {
-            right =
-                i < length - 1 ? getAfterRightWidth(children, i, columns) + 'px' : '0';
+            right = i < length - 1 ? getAfterRightWidth(i, columns) : '0';
         }
         styleUpdates.push({ dom: dom, left: left, right: right });
     }

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

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

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

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

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

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

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

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

package/lib/components/withBadge.js

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

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

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

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

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

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

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

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

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

package/lib/hooks/use-touch.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/lib/icons/back.svg.js

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

package/lib/icons/calendar.svg.js

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

package/lib/icons/caret.svg.js

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

package/lib/icons/check.svg.js

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

package/lib/icons/clock.svg.js

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

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

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

package/lib/icons/close.svg.js

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

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

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

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

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

package/lib/icons/columns.svg.js

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

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

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

package/lib/icons/copy.svg.js

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

package/lib/icons/date.svg.js

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

package/lib/icons/department.svg.js

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

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

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

package/lib/icons/dot.svg.js

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

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

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

package/lib/icons/down.svg.js

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

package/lib/icons/download.svg.js

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

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

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

package/lib/icons/drag.svg.js

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

package/lib/icons/edit.svg.js

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

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

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

package/lib/icons/enter.svg.js

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