bkui-vue 2.0.1-beta.55 → 2.0.1-beta.56

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.55";
+export const version = "2.0.1-beta.56";
 window.__bkui_vue_version__ = version;

package/lib/table/const.d.ts

@@ -31,6 +31,7 @@ export declare const TABLE_ROW_ATTRIBUTE: {
     ROW_SOURCE_DATA: string;
     ROW_SKIP_CFG: string;
     ROW_SPAN: string;
+    ROW_HEIGHT: string;
 };
 export declare const COLUMN_ATTRIBUTE: {
     COL_UID: string;

package/lib/table/hooks/use-layout.d.ts

@@ -13,7 +13,7 @@ declare const _default: (props: TablePropTypes, ctx: any) => {
     setDragOffsetX: (val: number) => void;
     setFixedColumns: (values: Column[]) => void;
     setOffsetRight: () => void;
-    setLineHeight: (val: number) => void;
+    setLineHeight: (val: number | ((...args: any[]) => number)) => void;
     setHeaderRowCount: (val: number) => void;
     initRootStyleVars: () => void;
     refRoot: Ref<HTMLElement>;

package/lib/table/hooks/use-render.d.ts

@@ -3,16 +3,14 @@ import { TablePropTypes } from '../props';
 import { UseColumns } from './use-columns';
 import { UsePagination } from './use-pagination';
 import { UseRows } from './use-rows';
-import { UseSettings } from './use-settings';
 type RenderType = {
     props: TablePropTypes;
     ctx: SetupContext;
     columns: UseColumns;
     rows: UseRows;
     pagination: UsePagination;
-    settings: UseSettings;
 };
-declare const _default: ({ props, ctx, columns, rows, pagination, settings }: RenderType) => {
+declare const _default: ({ props, ctx, columns, rows, pagination }: RenderType) => {
     renderColumns: () => JSX.Element;
     renderTBody: (list?: any) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;

package/lib/table/hooks/use-rows.d.ts

@@ -12,6 +12,7 @@ declare const useRows: (props: TablePropTypes) => {
     setRowSelectionAll: (val: boolean) => void;
     setRowSelection: (row: Record<string, unknown>, isSelected: boolean, index?: number) => void;
     setAllRowExpand: (value?: boolean) => void;
+    setRowHeight: (height: number, row?: any) => void;
     setTableIsNeedRowSpan: (val: boolean) => void;
     getRowAttribute: (item: IEmptyObject | object, attrName: string) => any;
     getRowSelection: () => any[];
@@ -19,6 +20,7 @@ declare const useRows: (props: TablePropTypes) => {
     getRowCheckedAllValue: () => any;
     changePageRowIndex: (sourceIndex: any, targetIndex: any) => void;
     toggleAllSelection: (value?: boolean) => void;
+    getRowHeight: (row?: any, index?: any, type?: any) => any;
     tableRowList: import("vue").Ref<any[]>;
     tableRowSchema: WeakMap<object, any> & Omit<WeakMap<object, any>, keyof WeakMap<any, any>>;
     pageRowList: any[];

package/lib/table/index.js

@@ -17436,7 +17436,8 @@ var TABLE_ROW_ATTRIBUTE = {
   ROW_SELECTION_INDETERMINATE: 'row_selection_indeterminate',
   ROW_SOURCE_DATA: 'row_source_data',
   ROW_SKIP_CFG: 'row_skip_config',
-  ROW_SPAN: 'row_span'
+  ROW_SPAN: 'row_span',
+  ROW_HEIGHT: 'row_height'
 };
 var COLUMN_ATTRIBUTE = {
   COL_UID: 'col_$uuid',
@@ -21187,7 +21188,6 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
 
 
 /* harmony default export */ const use_layout = (function (props, ctx) {
-  var _props$rowHeight;
   var refRoot = (0,external_vue_namespaceObject.ref)(null);
   var refHead = (0,external_vue_namespaceObject.ref)(null);
   var refBody = (0,external_vue_namespaceObject.ref)(null);
@@ -21199,7 +21199,7 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
   var offsetRight = (0,external_vue_namespaceObject.ref)(0);
   var layout = (0,external_vue_namespaceObject.reactive)({});
   var fixedColumns = (0,external_vue_namespaceObject.reactive)([]);
-  var lineHeight = (0,external_vue_namespaceObject.ref)((_props$rowHeight = props.rowHeight) !== null && _props$rowHeight !== void 0 ? _props$rowHeight : LINE_HEIGHT);
+  var lineHeight = (0,external_vue_namespaceObject.ref)(LINE_HEIGHT);
   var headerRowCount = (0,external_vue_namespaceObject.ref)(1);
   var fixedBottomHeight = (0,external_vue_namespaceObject.computed)(function () {
     var _ctx$slots;
@@ -21396,11 +21396,11 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
   });
   var fixedBottomRow = resolveClassName('table-fixed-bottom');
   var fixedBottomLoadingStyle = (0,external_vue_namespaceObject.computed)(function () {
-    var _props$fixedBottom$po, _props$fixedBottom3, _props$fixedBottom$he2, _props$fixedBottom4;
+    var _props$fixedBottom$mi, _props$fixedBottom3, _props$fixedBottom$po, _props$fixedBottom4, _props$fixedBottom$he2, _props$fixedBottom5;
     return {
-      minHeight: "".concat(lineHeight.value, "px"),
-      position: (_props$fixedBottom$po = (_props$fixedBottom3 = props.fixedBottom) === null || _props$fixedBottom3 === void 0 ? void 0 : _props$fixedBottom3.position) !== null && _props$fixedBottom$po !== void 0 ? _props$fixedBottom$po : 'absolute',
-      height: (_props$fixedBottom$he2 = (_props$fixedBottom4 = props.fixedBottom) === null || _props$fixedBottom4 === void 0 ? void 0 : _props$fixedBottom4.height) !== null && _props$fixedBottom$he2 !== void 0 ? _props$fixedBottom$he2 : null
+      minHeight: "".concat((_props$fixedBottom$mi = (_props$fixedBottom3 = props.fixedBottom) === null || _props$fixedBottom3 === void 0 ? void 0 : _props$fixedBottom3.minHeight) !== null && _props$fixedBottom$mi !== void 0 ? _props$fixedBottom$mi : LINE_HEIGHT, "px"),
+      position: (_props$fixedBottom$po = (_props$fixedBottom4 = props.fixedBottom) === null || _props$fixedBottom4 === void 0 ? void 0 : _props$fixedBottom4.position) !== null && _props$fixedBottom$po !== void 0 ? _props$fixedBottom$po : 'absolute',
+      height: (_props$fixedBottom$he2 = (_props$fixedBottom5 = props.fixedBottom) === null || _props$fixedBottom5 === void 0 ? void 0 : _props$fixedBottom5.height) !== null && _props$fixedBottom$he2 !== void 0 ? _props$fixedBottom$he2 : null
     };
   });
   (0,external_vue_namespaceObject.onMounted)(function () {
@@ -23257,8 +23257,7 @@ function use_render_isSlot(s) {
     ctx = _ref.ctx,
     columns = _ref.columns,
     rows = _ref.rows,
-    pagination = _ref.pagination,
-    settings = _ref.settings;
+    pagination = _ref.pagination;
   var t = (0,config_provider_namespaceObject.useLocale)('table');
   var uuid = esm_browser_v4();
   var dragEvents = {};
@@ -23378,23 +23377,7 @@ function use_render_isSlot(s) {
       return result;
     }), renderAppendLastRow()]);
   };
-  var getRowHeight = function getRowHeight(row, rowIndex, type) {
-    if (typeof props.rowHeight === 'function' || /^\d+/.test("".concat(props.rowHeight))) {
-      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,
-      height = _settings$options.height,
-      enabled = _settings$options.enabled;
-    if (enabled && height !== null && height !== undefined) {
-      return resolvePropVal(settings.options, 'height', ['tbody', row, rowIndex, size]);
-    }
-    return LINE_HEIGHT;
-  };
+  var getRowHeight = rows.getRowHeight;
   var setDragEvents = function setDragEvents(events) {
     dragEvents = events;
   };
@@ -23742,6 +23725,16 @@ var useRows = function useRows(props) {
     }
     return false;
   };
+  var getSelfRowHeight = function getSelfRowHeight(row, rowIndex, type) {
+    if (typeof props.rowHeight === 'function' || /^\d+/.test("".concat(props.rowHeight))) {
+      return resolvePropVal(props, 'rowHeight', [{
+        index: rowIndex,
+        type: type !== null && type !== void 0 ? type : 'tbody',
+        row: row
+      }]);
+    }
+    return LINE_HEIGHT;
+  };
   /**
    * 格式化传入数据配置
    * @param data
@@ -23766,6 +23759,7 @@ var useRows = function useRows(props) {
       var target = tableRowSchema.get(row);
       rowId = target[TABLE_ROW_ATTRIBUTE.ROW_UID];
       target[TABLE_ROW_ATTRIBUTE.ROW_INDEX] = index + 1;
+      target[TABLE_ROW_ATTRIBUTE.ROW_HEIGHT] = getSelfRowHeight(item, index);
     });
     tableRowSchema.set(CHECK_ALL_OBJ, defineProperty_defineProperty(defineProperty_defineProperty({}, TABLE_ROW_ATTRIBUTE.ROW_SELECTION, hasSelectedRow), TABLE_ROW_ATTRIBUTE.ROW_SELECTION_INDETERMINATE, hasSelectedRow && hasUnSelectedRow));
   };
@@ -23859,6 +23853,21 @@ var useRows = function useRows(props) {
   var getRowCheckedAllValue = function getRowCheckedAllValue() {
     return getRowAttribute(CHECK_ALL_OBJ, TABLE_ROW_ATTRIBUTE.ROW_SELECTION);
   };
+  var setRowHeight = function setRowHeight(height, row) {
+    if (row) {
+      setRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_HEIGHT, height);
+      return;
+    }
+    tableRowList.value.forEach(function (row) {
+      return setRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_HEIGHT, height);
+    });
+  };
+  var getRowHeight = function getRowHeight(row, index, type) {
+    if (row) {
+      return getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_HEIGHT);
+    }
+    return getSelfRowHeight(row, index, type);
+  };
   /**
    * 设置列属性
    * @param row
@@ -23976,6 +23985,7 @@ var useRows = function useRows(props) {
     setRowSelectionAll: setRowSelectionAll,
     setRowSelection: setRowSelection,
     setAllRowExpand: setAllRowExpand,
+    setRowHeight: setRowHeight,
     setTableIsNeedRowSpan: setTableIsNeedRowSpan,
     getRowAttribute: getRowAttribute,
     getRowSelection: getRowSelection,
@@ -23983,6 +23993,7 @@ var useRows = function useRows(props) {
     getRowCheckedAllValue: getRowCheckedAllValue,
     changePageRowIndex: changePageRowIndex,
     toggleAllSelection: toggleAllSelection,
+    getRowHeight: getRowHeight,
     tableRowList: tableRowList,
     tableRowSchema: tableRowSchema,
     pageRowList: pageRowList
@@ -24115,7 +24126,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
     Object.assign(options, result);
     columns.setColumnAttributeBySettings(options, result.checked);
     columns.setVisibleColumns();
-    afterSetting === null || afterSetting === void 0 || afterSetting(result.checked);
+    afterSetting === null || afterSetting === void 0 || afterSetting(result);
     (_refSetting$value = refSetting.value) === null || _refSetting$value === void 0 || _refSetting$value.hide();
     ctx.emit(EMIT_EVENTS.SETTING_CHANGE, result);
   };
@@ -24391,6 +24402,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       setDragOffsetX = _useLayout.setDragOffsetX,
       setOffsetRight = _useLayout.setOffsetRight,
       setHeaderRowCount = _useLayout.setHeaderRowCount,
+      setLineHeight = _useLayout.setLineHeight,
       refBody = _useLayout.refBody,
       refRoot = _useLayout.refRoot;
     var scrollTo = function scrollTo() {
@@ -24400,15 +24412,28 @@ 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 (typeof props.rowHeight === 'function') {
+      setLineHeight(function (args) {
+        return rows.getRowHeight(args.rows[0], args.index);
+      });
+    } else {
+      setLineHeight(props.rowHeight);
+    }
     /**
      * 设置字段结束，展示字段改变，设置表格偏移量为0
      * 避免太长横向滚动导致数据不可见
      * @param fields
      */
-    var afterSetting = function afterSetting(fields) {
-      if ((fields === null || fields === void 0 ? void 0 : fields.length) > 0) {
+    var afterSetting = function afterSetting(_ref) {
+      var checked = _ref.checked,
+        height = _ref.height;
+      if ((checked === null || checked === void 0 ? void 0 : checked.length) > 0) {
         scrollTo(0, 0);
       }
+      if (typeof props.rowHeight !== 'function') {
+        rows.setRowHeight(height);
+        setLineHeight(height);
+      }
     };
     var settings = use_settings(props, ctx, columns, afterSetting);
     var dragEvents = use_draggable(props, rows, ctx);
@@ -24417,8 +24442,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
         ctx: ctx,
         columns: columns,
         rows: rows,
-        pagination: pagination,
-        settings: settings
+        pagination: pagination
       }),
       renderColumns = _useRender.renderColumns,
       renderTBody = _useRender.renderTBody,
@@ -24444,8 +24468,8 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
      * 计算每一列的实际宽度
      */
     var computedColumnRect = function computedColumnRect() {
-      var _ref, _refRoot$value;
-      var width = (_ref = ((_refRoot$value = refRoot.value) === null || _refRoot$value === void 0 ? void 0 : _refRoot$value.offsetWidth) - (props.scrollbar ? 1 : SCROLLY_WIDTH)) !== null && _ref !== void 0 ? _ref : 0;
+      var _ref2, _refRoot$value;
+      var width = (_ref2 = ((_refRoot$value = refRoot.value) === null || _refRoot$value === void 0 ? void 0 : _refRoot$value.offsetWidth) - (props.scrollbar ? 1 : SCROLLY_WIDTH)) !== null && _ref2 !== void 0 ? _ref2 : 0;
       columns.resolveColsCalcWidth(width);
       resolveFixedColumnStyle();
     };

package/lib/table/props.d.ts

@@ -249,6 +249,7 @@ export declare enum IColSortBehavior {
 export type FixedBottomOption = {
     position: 'absolute' | 'relative';
     height: number;
+    minHeight?: number;
     loading?: boolean;
 };
 export type AppendLastRowOption = {

package/lib/table-column/index.js

@@ -17411,7 +17411,8 @@ var TABLE_ROW_ATTRIBUTE = {
   ROW_SELECTION_INDETERMINATE: 'row_selection_indeterminate',
   ROW_SOURCE_DATA: 'row_source_data',
   ROW_SKIP_CFG: 'row_skip_config',
-  ROW_SPAN: 'row_span'
+  ROW_SPAN: 'row_span',
+  ROW_HEIGHT: 'row_height'
 };
 var COLUMN_ATTRIBUTE = {
   COL_UID: 'col_$uuid',

package/lib/upload/index.js

@@ -1294,8 +1294,8 @@ var EThemes;
 })(EThemes || (EThemes = {}));
 var ETypes;
 (function (ETypes) {
-  ETypes["FORMDATA"] = "formdata";
   ETypes["BINARY"] = "binary";
+  ETypes["FORMDATA"] = "formdata";
 })(ETypes || (ETypes = {}));
 var EUploadStatus;
 (function (EUploadStatus) {
@@ -1304,7 +1304,6 @@ var EUploadStatus;
   EUploadStatus["SUCCESS"] = "success";
   EUploadStatus["UPLOADING"] = "uploading";
 })(EUploadStatus || (EUploadStatus = {}));
-;
 ;// CONCATENATED MODULE: ../../packages/upload/src/props.ts
 /*
  * Tencent is pleased to support the open source community by making

package/lib/upload/upload.type.d.ts

@@ -8,8 +8,8 @@ export declare const enum EThemes {
 }
 export type Theme = Lowercase<keyof typeof EThemes>;
 export declare const enum ETypes {
-    FORMDATA = "formdata",
-    BINARY = "binary"
+    BINARY = "binary",
+    FORMDATA = "formdata"
 }
 export type Type = Lowercase<keyof typeof ETypes>;
 export declare const enum EUploadStatus {
@@ -66,7 +66,7 @@ export interface UploadRequestOptions {
     formDataAttributes?: FormDataAttr | FormDataAttr[];
     filename: string;
     file: File;
-    headers?: Headers | Record<string, string | number | null | undefined>;
+    headers?: Headers | Record<string, null | number | string | undefined>;
     header?: HeaderDataAttr | HeaderDataAttr[];
     withCredentials: boolean;
     sliceUrl: string;

package/lib/virtual-render/index.js

@@ -17705,16 +17705,14 @@ var lodash = __webpack_require__(6635);
  * Copyright © 2012-2019 Tencent BlueKing. All Rights Reserved. 蓝鲸智云 版权所有
  */
 
-function getMatchedIndex(maxCount, maxHeight, groupItemCount, callback) {
+function getMatchedIndex(maxCount, maxHeight, callback) {
   var startIndex = 0;
   var height = 0;
   var diffHeight = 0;
   var lastHeight = 0;
   for (; startIndex < maxCount; startIndex++) {
     lastHeight = callback({
-      index: startIndex,
-      items: [startIndex * groupItemCount, (startIndex + 1) * groupItemCount],
-      type: 'virtual'
+      index: startIndex
     });
     if (height + lastHeight > maxHeight) {
       diffHeight = maxHeight - height;
@@ -17748,10 +17746,11 @@ function computedVirtualIndex(lineHeight, callback, pagination, wrapper, event)
     translateY = elScrollTop % lineHeight;
   }
   if (typeof lineHeight === 'function') {
-    var startValue = getMatchedIndex(count, elScrollTop, groupItemCount, lineHeight);
+    var maxCount = Math.ceil(count / groupItemCount);
+    var startValue = getMatchedIndex(maxCount, elScrollTop, lineHeight);
     targetStartIndex = startValue.startIndex > 0 ? startValue.startIndex : 0;
     translateY = startValue.diffHeight;
-    var endValue = getMatchedIndex(count, elOffsetHeight, groupItemCount, lineHeight);
+    var endValue = getMatchedIndex(maxCount, elOffsetHeight, lineHeight);
     targetEndIndex = endValue.startIndex + targetStartIndex + 1;
   }
   var bottom = elScrollHeight - elOffsetHeight - elScrollTop;
@@ -18074,9 +18073,28 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         rendAsTag = _useTagRender.rendAsTag;
       return rendAsTag;
     }
+    var getRowHeightArgs = function getRowHeightArgs(startIndex) {
+      var start = startIndex * props.groupItemCount;
+      var end = (startIndex + 1) * props.groupItemCount;
+      return {
+        index: startIndex,
+        rows: props.list.slice(start, end),
+        items: [start, end],
+        type: 'virtual'
+      };
+    };
+    var getLineHeight = function getLineHeight() {
+      if (typeof props.lineHeight === 'function') {
+        return function (_ref) {
+          var index = _ref.index;
+          return props.lineHeight(getRowHeightArgs(index));
+        };
+      }
+      return props.lineHeight;
+    };
     var binding = (0,external_vue_namespaceObject.computed)(function () {
       return {
-        lineHeight: props.lineHeight,
+        lineHeight: getLineHeight(),
         handleScrollCallback: handleScrollCallback,
         pagination: pagination,
         throttleDelay: props.throttleDelay,
@@ -18110,16 +18128,12 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
     var getLastPageIndex = function getLastPageIndex() {
       // @ts-ignore
       var elHeight = virtualRoot.value.offsetHeight;
-      var startIndex = listLength.value;
+      var startIndex = Math.ceil(listLength.value / props.groupItemCount);
       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'
-        });
+        lastHeight = props.lineHeight(getRowHeightArgs(startIndex));
         rowsHeight = rowsHeight + lastHeight;
         if (rowsHeight > elHeight) {
           diffHeight = rowsHeight - elHeight;
@@ -18201,12 +18215,9 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         if (typeof props.lineHeight === 'function') {
           innerHeight.value = 0;
           var fnValue = 0;
-          for (var i = 0; i < listLength.value; i++) {
-            var fnVal = props.lineHeight.apply(_this, [{
-              index: i,
-              type: 'virtual',
-              items: [i * props.groupItemCount, props.groupItemCount]
-            }]);
+          var rowsLength = Math.ceil(listLength.value / props.groupItemCount);
+          for (var i = 0; i < rowsLength; i++) {
+            var fnVal = props.lineHeight.apply(_this, [getRowHeightArgs(i)]);
             fnValue += typeof fnVal === 'number' ? fnVal : 0;
           }
           innerHeight.value = fnValue;

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

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

package/package.json

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