bkui-vue 2.1.0-dev-beta.1 → 2.1.0-dev-beta.2

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.1.0-dev-beta.1";
+export const version = "2.1.0-dev-beta.2";
 window.__bkui_vue_version__ = version;

package/lib/table/index.js

@@ -8748,8 +8748,11 @@ function use_render_isSlot(s) {
   var getRowRender = function getRowRender(row, rowIndex, preRow, rowList, rowSpanMap, needRowSpan) {
     var isChild = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var rowLength = rowList.length;
-    var rowStyle = [].concat(_toConsumableArray(_formatPropAsArray(props.rowStyle, [row, rowIndex])), [{
-      '--row-height': "".concat(getRowHeight(row, rowIndex), "px")
+    var rowHeightPx = "".concat(getRowHeight(row, rowIndex), "px");
+    var rowStyle = [].concat(_toConsumableArray(_formatPropAsArray(props.rowStyle, [row, rowIndex])), [props.rowHeight === 'auto' ? {
+      '--row-min-height': rowHeightPx
+    } : {
+      '--row-height': rowHeightPx
     }]);
     var rowClass = [].concat(_toConsumableArray(_formatPropAsArray(props.rowClass, [row, rowIndex])), ["hover-".concat(props.rowHover), rowIndex % 2 === 1 && props.stripe ? 'stripe-row' : '', props.rowHeight === 'auto' ? 'row-height-auto' : '']);
     var rowId = rows.getRowAttribute(row, const_TABLE_ROW_ATTRIBUTE.ROW_UID);
@@ -9742,6 +9745,9 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       }
       return (_refBody$value = refBody.value) === null || _refBody$value === void 0 ? void 0 : _refBody$value.scrollTo.apply(_refBody$value, args);
     };
+    if (props.rowHeight === 'auto' && props.virtualEnabled) {
+      console.warn('[BkTable] rowHeight="auto" 与 virtualEnabled 不兼容：虚拟滚动依赖固定行高计算，auto 模式下行高由内容决定，滚动位置将不准确。请勿同时使用。');
+    }
     if (typeof props.rowHeight === 'function') {
       setLineHeight(function (args) {
         return rows.getRowHeight(args.rows[0], args.index);
@@ -9899,14 +9905,22 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
      * 滚动容器 (.bk-table-body) 内包含：
      *   1. 表头 — 由 showHead 控制是否展示，高度 = headHeight(受 headHeight/thead props) × headerRowCount（多级表头）
      *   2. 数据行 — 高度 = 各行行高之和（受 rowHeight prop 和行数据影响）
+     *
+     * rowHeight='auto' 时每行 schema 存储的是估算值(LINE_HEIGHT=42)，
+     * 不反映实际渲染高度，故改为从 DOM 读取 scrollHeight 获得真实内容高度。
      */
     var getScrollContentHeight = function getScrollContentHeight() {
+      var _refBody$value3;
+      var scrollEl = (_refBody$value3 = refBody.value) === null || _refBody$value3 === void 0 ? void 0 : _refBody$value3.refRoot;
+      if (props.rowHeight === 'auto') {
+        if (scrollEl && scrollEl.scrollHeight > 0) {
+          return scrollEl.scrollHeight;
+        }
+      }
       var rowsHeight = rows.getCurrentPageRowsHeight();
       var scrollHeaderHeight = props.showHead ? headHeight.value : 0;
       var calculatedHeight = rowsHeight + scrollHeaderHeight;
       if (rows.pageRowList.length === 0) {
-        var _refBody$value3;
-        var scrollEl = (_refBody$value3 = refBody.value) === null || _refBody$value3 === void 0 ? void 0 : _refBody$value3.refRoot;
         if (scrollEl && scrollEl.scrollHeight > calculatedHeight) {
           return scrollEl.scrollHeight;
         }

package/lib/table/table.css

@@ -1449,14 +1449,18 @@
 .bk-table .bk-table-head table tbody tr.row-height-auto td,
 .bk-table .bk-table-body table tbody tr.row-height-auto td {
   height: auto !important;
-  min-height: var(--row-height);
+  min-height: var(--row-min-height, 42px);
 }
 .bk-table .bk-table-head table tbody tr.row-height-auto td .cell,
 .bk-table .bk-table-body table tbody tr.row-height-auto td .cell {
   display: flex;
   align-items: center;
   height: auto;
-  min-height: calc(var(--row-height) - 4px);
+  min-height: calc(var(--row-min-height, 42px) - 4px);
+  white-space: normal;
+  overflow: visible;
+  text-overflow: unset;
+  word-break: break-word;
   line-height: normal;
 }
 .bk-table .bk-table-head table tbody tr:hover.hover-highlight td:not(.empty-cell),

package/lib/table/table.less

@@ -406,14 +406,20 @@
           &.row-height-auto {
             td {
               // 覆盖全局 th, td { height: var(--row-height) }，让内容撑起行高
+              // auto 模式使用独立的 --row-min-height 变量，语义上明确表示最小高度而非固定高度
               height: auto !important;
-              min-height: var(--row-height);
+              min-height: var(--row-min-height, 42px);
 
               .cell {
                 display: flex;
                 align-items: center;
                 height: auto;
-                min-height: calc(var(--row-height) - 4px);
+                min-height: calc(var(--row-min-height, 42px) - 4px);
+                // 允许文字换行，覆盖全局 white-space: nowrap / overflow: hidden / text-overflow: ellipsis
+                white-space: normal;
+                overflow: visible;
+                text-overflow: unset;
+                word-break: break-word;
                 line-height: normal;
               }
             }

package/lib/table/table.variable.css

@@ -1580,14 +1580,18 @@
 .bk-table .bk-table-head table tbody tr.row-height-auto td,
 .bk-table .bk-table-body table tbody tr.row-height-auto td {
   height: auto !important;
-  min-height: var(--row-height);
+  min-height: var(--row-min-height, 42px);
 }
 .bk-table .bk-table-head table tbody tr.row-height-auto td .cell,
 .bk-table .bk-table-body table tbody tr.row-height-auto td .cell {
   display: flex;
   align-items: center;
   height: auto;
-  min-height: calc(var(--row-height) - 4px);
+  min-height: calc(var(--row-min-height, 42px) - 4px);
+  white-space: normal;
+  overflow: visible;
+  text-overflow: unset;
+  word-break: break-word;
   line-height: normal;
 }
 .bk-table .bk-table-head table tbody tr:hover.hover-highlight td:not(.empty-cell),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.1.0-dev-beta.1",
+  "version": "2.1.0-dev-beta.2",
   "workspaces": [
     "packages/**",
     "scripts/cli",