bkui-vue 2.0.1-beta.44 → 2.0.1-beta.46

package/lib/table/index.js

@@ -17775,9 +17775,7 @@ var tableProps = {
   /**
    * 单元格数据为空展示
    */
-  emptyCellText: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.string, shared_namespaceObject.PropTypes.func.def(function () {
-    return '';
-  })]).def(''),
+  emptyCellText: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.string, shared_namespaceObject.PropTypes.func]).def(''),
   /**
    * 判定单元格是否为空
    * 支持数组：判定条件为 arr.some(item => item === cellText)
@@ -23261,7 +23259,7 @@ function use_render_isSlot(s) {
   var renderAppendLastRow = function renderAppendLastRow() {
     var rowId = 'append-last-row';
     var rowStyle = [].concat(_toConsumableArray(formatPropAsArray(props.rowStyle, [])), [{
-      '--row-height': "".concat(getRowHeight(null, null), "px")
+      '--row-height': "".concat(getRowHeight(null, null, 'append-last-row'), "px")
     }]);
     if (props.appendLastRow.type === 'default') {
       if (ctx.slots.appendLastRow) {
@@ -23315,9 +23313,13 @@ function use_render_isSlot(s) {
       return result;
     }), renderAppendLastRow()]);
   };
-  var getRowHeight = function getRowHeight(row, rowIndex) {
+  var getRowHeight = function getRowHeight(row, rowIndex, type) {
     if (typeof props.rowHeight === 'function' || /^\d+/.test("".concat(props.rowHeight))) {
-      return resolvePropVal(props, 'rowHeight', ['tbody', row, rowIndex]);
+      return resolvePropVal(props, 'rowHeight', [{
+        index: rowIndex,
+        type: type !== null && type !== void 0 ? type : 'tbody',
+        row: row
+      }]);
     }
     var _settings$options = settings.options,
       size = _settings$options.size,
@@ -24155,6 +24157,79 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
     immediate: true,
     deep: true
   });
+  var getRenderContent = function getRenderContent() {
+    var _slot2;
+    var _ctx$slots$settings, _ctx$slots$settings2, _ctx$slots, _ctx$slots$setting, _ctx$slots2;
+    return (_ctx$slots$settings = (_ctx$slots$settings2 = (_ctx$slots = ctx.slots).settings) === null || _ctx$slots$settings2 === void 0 ? void 0 : _ctx$slots$settings2.call(_ctx$slots)) !== null && _ctx$slots$settings !== void 0 ? _ctx$slots$settings : (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)("div", {
+      "class": "setting-head"
+    }, [(0,external_vue_namespaceObject.createVNode)("span", {
+      "class": "head-title"
+    }, [t.value.setting.title]), (0,external_vue_namespaceObject.createVNode)(_namespaceObject.CloseLine, {
+      "class": "icon-close-action",
+      "onClick": handleCancelClick
+    }, null)]), (0,external_vue_namespaceObject.createVNode)("div", {
+      "class": "setting-body"
+    }, [(0,external_vue_namespaceObject.createVNode)("div", {
+      "class": "setting-body-title"
+    }, [(0,external_vue_namespaceObject.createVNode)("div", null, [(0,external_vue_namespaceObject.createVNode)("span", {
+      "class": "field-setting-label"
+    }, [t.value.setting.fields.title]), isLimit.value ? (0,external_vue_namespaceObject.createVNode)("span", {
+      "class": "limit"
+    }, [t.value.setting.fields.subtitle(options.limit)]) : '']), isLimit.value ? '' : (0,external_vue_namespaceObject.createVNode)("span", {
+      "class": "check-all",
+      "onClick": handleCheckAllClick
+    }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
+      "indeterminate": Boolean(indeterminate.value),
+      "label": t.value.setting.fields.selectAll,
+      "modelValue": checkedFields.value.length > 0
+    }, {
+      "default": function _default() {
+        return [t.value.setting.fields.selectAll];
+      }
+    })])]), (0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject.BkCheckboxGroup, {
+      "class": "setting-body-fields",
+      "modelValue": checkedFields.value,
+      "onUpdate:modelValue": function onUpdateModelValue($event) {
+        return checkedFields.value = $event;
+      }
+    }, use_settings_isSlot(_slot2 = renderFields.value.map(function (item, index) {
+      var _slot;
+      return (0,external_vue_namespaceObject.createVNode)("div", {
+        "class": "field-item"
+      }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
+        "checked": checkedFields.value.includes(resolvedColVal(item, index)),
+        "disabled": isItemReadonly(item, index),
+        "label": resolvedColVal(item, index)
+      }, use_settings_isSlot(_slot = resolvePropVal(item, ['name', 'label'], [item, index])) ? _slot : {
+        "default": function _default() {
+          return [_slot];
+        }
+      })]);
+    })) ? _slot2 : {
+      "default": function _default() {
+        return [_slot2];
+      }
+    }), (_ctx$slots$setting = (_ctx$slots2 = ctx.slots).setting) === null || _ctx$slots$setting === void 0 ? void 0 : _ctx$slots$setting.call(_ctx$slots2), showLineHeight.value ? (0,external_vue_namespaceObject.createVNode)("div", {
+      "class": "setting-body-line-height"
+    }, [t.value.setting.lineHeight.title, (0,external_vue_namespaceObject.createTextVNode)("\uFF1A"), renderSize()]) : '']), (0,external_vue_namespaceObject.createVNode)("div", {
+      "class": "setting-footer"
+    }, [(0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
+      "style": buttonStyle,
+      "theme": "primary",
+      "onClick": handleSaveClick
+    }, {
+      "default": function _default() {
+        return [t.value.setting.options.ok];
+      }
+    }), (0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
+      "style": buttonStyle,
+      "onClick": handleCancelClick
+    }, {
+      "default": function _default() {
+        return [t.value.setting.options.cancel];
+      }
+    })])]);
+  };
   var renderSettings = function renderSettings() {
     var _options$trigger;
     if (!props.settings) {
@@ -24178,79 +24253,9 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
         }, null)]);
       },
       content: function content() {
-        var _ctx$slots$setting, _ctx$slots;
-        var _slot2;
         return (0,external_vue_namespaceObject.createVNode)("div", {
           "class": "setting-content"
-        }, [(0,external_vue_namespaceObject.createVNode)("div", {
-          "class": "setting-head"
-        }, [(0,external_vue_namespaceObject.createVNode)("span", {
-          "class": "head-title"
-        }, [t.value.setting.title]), (0,external_vue_namespaceObject.createVNode)(_namespaceObject.CloseLine, {
-          "class": "icon-close-action",
-          "onClick": handleCancelClick
-        }, null)]), (0,external_vue_namespaceObject.createVNode)("div", {
-          "class": "setting-body"
-        }, [(0,external_vue_namespaceObject.createVNode)("div", {
-          "class": "setting-body-title"
-        }, [(0,external_vue_namespaceObject.createVNode)("div", null, [(0,external_vue_namespaceObject.createVNode)("span", {
-          "class": "field-setting-label"
-        }, [t.value.setting.fields.title]), isLimit.value ? (0,external_vue_namespaceObject.createVNode)("span", {
-          "class": "limit"
-        }, [t.value.setting.fields.subtitle(options.limit)]) : '']), isLimit.value ? '' : (0,external_vue_namespaceObject.createVNode)("span", {
-          "class": "check-all",
-          "onClick": handleCheckAllClick
-        }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
-          "indeterminate": Boolean(indeterminate.value),
-          "label": t.value.setting.fields.selectAll,
-          "modelValue": checkedFields.value.length > 0
-        }, {
-          "default": function _default() {
-            return [t.value.setting.fields.selectAll];
-          }
-        })])]), (0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject.BkCheckboxGroup, {
-          "class": "setting-body-fields",
-          "modelValue": checkedFields.value,
-          "onUpdate:modelValue": function onUpdateModelValue($event) {
-            return checkedFields.value = $event;
-          }
-        }, use_settings_isSlot(_slot2 = renderFields.value.map(function (item, index) {
-          var _slot;
-          return (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "field-item"
-          }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
-            "checked": checkedFields.value.includes(resolvedColVal(item, index)),
-            "disabled": isItemReadonly(item, index),
-            "label": resolvedColVal(item, index)
-          }, use_settings_isSlot(_slot = resolvePropVal(item, ['name', 'label'], [item, index])) ? _slot : {
-            "default": function _default() {
-              return [_slot];
-            }
-          })]);
-        })) ? _slot2 : {
-          "default": function _default() {
-            return [_slot2];
-          }
-        }), (_ctx$slots$setting = (_ctx$slots = ctx.slots).setting) === null || _ctx$slots$setting === void 0 ? void 0 : _ctx$slots$setting.call(_ctx$slots), showLineHeight.value ? (0,external_vue_namespaceObject.createVNode)("div", {
-          "class": "setting-body-line-height"
-        }, [t.value.setting.lineHeight.title, (0,external_vue_namespaceObject.createTextVNode)("\uFF1A"), renderSize()]) : '']), (0,external_vue_namespaceObject.createVNode)("div", {
-          "class": "setting-footer"
-        }, [(0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
-          "style": buttonStyle,
-          "theme": "primary",
-          "onClick": handleSaveClick
-        }, {
-          "default": function _default() {
-            return [t.value.setting.options.ok];
-          }
-        }), (0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
-          "style": buttonStyle,
-          "onClick": handleCancelClick
-        }, {
-          "default": function _default() {
-            return [t.value.setting.options.cancel];
-          }
-        })])]);
+        }, [getRenderContent()]);
       }
     });
   };

package/lib/table/table.css

@@ -1303,6 +1303,10 @@
   table-layout: fixed;
   align-self: flex-start;
 }
+.bk-table .bk-table-head table.bk-table-col-resizing th,
+.bk-table .bk-table-body table.bk-table-col-resizing th {
+  cursor: col-resize !important;
+}
 .bk-table .bk-table-head table th,
 .bk-table .bk-table-body table th,
 .bk-table .bk-table-head table td,

package/lib/table/table.less

@@ -103,6 +103,12 @@
       table-layout: fixed;
       align-self: flex-start;
 
+      &.@{bk-prefix}-table-col-resizing {
+        th {
+          cursor: col-resize !important;
+        }
+      }
+
       th,
       td {
         height: var(--row-height);

package/lib/table/table.variable.css

@@ -1693,6 +1693,10 @@
   table-layout: fixed;
   align-self: flex-start;
 }
+.bk-table .bk-table-head table.bk-table-col-resizing th,
+.bk-table .bk-table-body table.bk-table-col-resizing th {
+  cursor: col-resize !important;
+}
 .bk-table .bk-table-head table th,
 .bk-table .bk-table-body table th,
 .bk-table .bk-table-head table td,

package/lib/table-column/index.js

@@ -17750,9 +17750,7 @@ var tableProps = {
   /**
    * 单元格数据为空展示
    */
-  emptyCellText: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.string, shared_namespaceObject.PropTypes.func.def(function () {
-    return '';
-  })]).def(''),
+  emptyCellText: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.string, shared_namespaceObject.PropTypes.func]).def(''),
   /**
    * 判定单元格是否为空
    * 支持数组：判定条件为 arr.some(item => item === cellText)

package/lib/virtual-render/index.js

@@ -17711,9 +17711,14 @@ function getMatchedIndex(maxCount, maxHeight, groupItemCount, callback) {
   var diffHeight = 0;
   var lastHeight = 0;
   for (; startIndex < maxCount; startIndex++) {
-    lastHeight = callback(startIndex, [startIndex * groupItemCount, (startIndex + 1) * groupItemCount, 'virtual']);
+    lastHeight = callback({
+      index: startIndex,
+      items: [startIndex * groupItemCount, (startIndex + 1) * groupItemCount],
+      type: 'virtual'
+    });
     if (height + lastHeight > maxHeight) {
       diffHeight = maxHeight - height;
+      startIndex = startIndex + Math.round(diffHeight / lastHeight);
       break;
     }
     height += lastHeight;
@@ -18083,6 +18088,7 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
     var listLength = (0,external_vue_namespaceObject.ref)(0);
     /** 实际高度，根据行高和总行数计算出来的实际高度 */
     var innerHeight = (0,external_vue_namespaceObject.ref)(0);
+    var contentHeight = (0,external_vue_namespaceObject.ref)(0);
     var virtualRoot = (0,external_vue_namespaceObject.ref)(null);
     var _useScrollbar = use_scrollbar(props),
       init = _useScrollbar.init,
@@ -18101,6 +18107,30 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       groupItemCount: props.groupItemCount
     });
     var calcList = (0,external_vue_namespaceObject.ref)([]);
+    var getLastPageIndex = function getLastPageIndex() {
+      // @ts-ignore
+      var elHeight = virtualRoot.value.offsetHeight;
+      var startIndex = listLength.value;
+      var rowsHeight = 0;
+      var lastHeight = 0;
+      var diffHeight = 0;
+      for (; startIndex > 0; startIndex--) {
+        lastHeight = props.lineHeight({
+          index: startIndex,
+          items: [startIndex, startIndex * props.groupItemCount],
+          type: 'virtual'
+        });
+        rowsHeight = rowsHeight + lastHeight;
+        if (rowsHeight > elHeight) {
+          diffHeight = rowsHeight - elHeight;
+          break;
+        }
+      }
+      return {
+        diffHeight: diffHeight,
+        startIndex: startIndex
+      };
+    };
     /** 指令触发Scroll事件，计算当前startIndex & endIndex & scrollTop & translateY */
     var handleScrollCallback = function handleScrollCallback(event, startIndex, endIndex, scrollTop, translateY, scrollLeft, pos) {
       var translateX = scrollLeft;
@@ -18118,13 +18148,17 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       var total = localList.value.length;
       if (total < end) {
         end = total;
-        start = end - Math.floor(refRoot.value.offsetHeight / props.lineHeight);
-        start = start < 0 ? 0 : start;
-      }
-      if (end > total) {
-        end = total;
-        start = end - Math.floor(refRoot.value.offsetHeight / props.lineHeight);
+        if (typeof props.lineHeight === 'function') {
+          start = getLastPageIndex().startIndex;
+        } else {
+          start = end - Math.floor(refRoot.value.offsetHeight / props.lineHeight);
+          start = start < 0 ? 0 : start;
+        }
       }
+      // if (end > total) {
+      //   end = total;
+      //   start = end - Math.floor(refRoot.value.offsetHeight / props.lineHeight);
+      // }
       var value = localList.value.slice(start, end);
       calcList.value = value;
       if (event) {
@@ -18172,7 +18206,11 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
           innerHeight.value = 0;
           var fnValue = 0;
           for (var i = 0; i < listLength.value; i++) {
-            var fnVal = props.lineHeight.call(_this, i, list.slice(i * props.groupItemCount, props.groupItemCount));
+            var fnVal = props.lineHeight.apply(_this, [{
+              index: i,
+              type: 'virtual',
+              items: [i * props.groupItemCount, props.groupItemCount]
+            }]);
             fnValue += typeof fnVal === 'number' ? fnVal : 0;
           }
           innerHeight.value = fnValue;
@@ -18182,6 +18220,7 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       } else {
         innerHeight.value = props.abosuteHeight;
       }
+      setContentHeight();
     };
     /** 列表数据重置之后的处理事项 */
     var afterListDataReset = function afterListDataReset() {
@@ -18220,9 +18259,9 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         minHeight: props.minHeight ? "".concat(props.minHeight, "px") : false
       }, props.scrollPosition === 'container' ? innerContentStyle.value : {}), props.wrapperStyle);
     });
-    var contentHeight = (0,external_vue_namespaceObject.computed)(function () {
-      return innerHeight.value < props.minHeight ? props.minHeight : innerHeight.value;
-    });
+    var setContentHeight = function setContentHeight() {
+      contentHeight.value = innerHeight.value < props.minHeight ? props.minHeight : innerHeight.value;
+    };
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
     /** 外层样式列表 */
@@ -18247,7 +18286,7 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
     var _useFixTop = use_fix_top(props, scrollTo),
       fixToTop = _useFixTop.fixToTop;
     (0,external_vue_namespaceObject.watch)(function () {
-      return [contentHeight.value, props.list];
+      return [props.list];
     }, function () {
       var _instance3;
       (_instance3 = instance) === null || _instance3 === void 0 || _instance3.setBinding(binding);

package/lib/virtual-render/v-virtual-render.d.ts

@@ -1,4 +1,8 @@
-export declare function getMatchedIndex(maxCount: number, maxHeight: number, groupItemCount: number, callback: (index: number, items: (number | string)[]) => 0): {
+export declare function getMatchedIndex(maxCount: number, maxHeight: number, groupItemCount: number, callback: (agrs: {
+    index: number;
+    items: number[];
+    type: string;
+}) => 0): {
     startIndex: number;
     height: number;
     diffHeight: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.44",
+  "version": "2.0.1-beta.46",
   "workspaces": [
     "packages/**",
     "scripts/cli",