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

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.43";
+export const version = "2.0.1-beta.44";
 window.__bkui_vue_version__ = version;

package/lib/table/index.js

@@ -21392,7 +21392,9 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
   var scrollContentClass = (0,external_vue_namespaceObject.computed)(function () {
     return defineProperty_defineProperty(defineProperty_defineProperty({}, resolveClassName('table-body-content'), true), resolveClassName('stripe'), props.stripe);
   });
-  var fixedWrapperClass = resolveClassName('table-fixed');
+  var fixedWrapperClass = (0,external_vue_namespaceObject.computed)(function () {
+    return defineProperty_defineProperty(defineProperty_defineProperty({}, resolveClassName('table-fixed'), true), 'has-virtual-scroll', props.virtualEnabled);
+  });
   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;
@@ -21445,7 +21447,7 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
         return [(0,external_vue_namespaceObject.createVNode)("div", {
           "class": resizeColumnClass
         }, null), (0,external_vue_namespaceObject.createVNode)("div", {
-          "class": fixedWrapperClass
+          "class": fixedWrapperClass.value
         }, [fixedRows === null || fixedRows === void 0 ? void 0 : fixedRows()])];
       }
     });
@@ -24321,6 +24323,13 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       setHeaderRowCount = _useLayout.setHeaderRowCount,
       refBody = _useLayout.refBody,
       refRoot = _useLayout.refRoot;
+    var scrollTo = function scrollTo() {
+      var _refBody$value;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return (_refBody$value = refBody.value) === null || _refBody$value === void 0 ? void 0 : _refBody$value.scrollTo.apply(_refBody$value, args);
+    };
     /**
      * 设置字段结束，展示字段改变，设置表格偏移量为0
      * 避免太长横向滚动导致数据不可见
@@ -24328,8 +24337,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
      */
     var afterSetting = function afterSetting(fields) {
       if ((fields === null || fields === void 0 ? void 0 : fields.length) > 0) {
-        var _refBody$value;
-        (_refBody$value = refBody.value) === null || _refBody$value === void 0 || _refBody$value.scrollTo(0, 0);
+        scrollTo(0, 0);
       }
     };
     var settings = use_settings(props, ctx, columns, afterSetting);
@@ -24434,8 +24442,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       (0,external_vue_namespaceObject.nextTick)(function () {
         setOffsetRight();
         if (resetScroll) {
-          var _refBody$value2;
-          (_refBody$value2 = refBody.value) === null || _refBody$value2 === void 0 || _refBody$value2.scrollTo(0, 0);
+          scrollTo(0, 0);
         }
       });
     }, 64);
@@ -24443,7 +24450,6 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
     var observerResizingTimer = null;
     use_observer_resize(refRoot, function () {
       if (!observerResizing.value) {
-        var _refBody$value3;
         observerResizing.value = true;
         if ((props.height === '100%' || props.virtualEnabled) && (0,lodash.isElement)(refRoot.value)) {
           if (isResizeBodyHeight.value) {
@@ -24459,7 +24465,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
         }
         computedColumnRect();
         setOffsetRight();
-        (_refBody$value3 = refBody.value) === null || _refBody$value3 === void 0 || _refBody$value3.scrollTo(0, 0);
+        scrollTo(0, 0);
         return;
       }
       observerResizingTimer && clearTimeout(observerResizingTimer);

package/lib/table/table.css

@@ -1647,6 +1647,9 @@
   pointer-events: none;
   transform: translate(var(--translate-x), var(--translate-y));
 }
+.bk-table .bk-table-fixed.has-virtual-scroll {
+  transform: translate(var(--translate-x), 0);
+}
 .bk-table .bk-table-fixed .column_fixed_right {
   box-shadow: var(--shadow-right);
 }

package/lib/table/table.less

@@ -506,6 +506,10 @@
     pointer-events: none;
     transform: translate(var(--translate-x), var(--translate-y));
 
+    &.has-virtual-scroll {
+      transform: translate(var(--translate-x), 0);
+    }
+
     .column_fixed_right {
       box-shadow: var(--shadow-right);
     }

package/lib/table/table.variable.css

@@ -2037,6 +2037,9 @@
   pointer-events: none;
   transform: translate(var(--translate-x), var(--translate-y));
 }
+.bk-table .bk-table-fixed.has-virtual-scroll {
+  transform: translate(var(--translate-x), 0);
+}
 .bk-table .bk-table-fixed .column_fixed_right {
   box-shadow: var(--shadow-right);
 }

package/lib/table/utils.d.ts

@@ -106,10 +106,10 @@ export declare const getColumnClass: (column: Column, colIndex?: number, uuid?:
 };
 export declare const getElementTextWidth: (element: HTMLElement, text?: string) => any;
 export declare const isColumnHidden: (settingFields: any, column: any, checked: any) => boolean;
-export declare const resolveColumnSpan: (column: Column, colIndex: number, row: Record<string, unknown>, rowIndex: number, key: string) => any;
+export declare const resolveColumnSpan: (column: Column, colIndex: number, row: Record<string, unknown>, rowIndex: number, key: string) => number;
 export declare const resolveCellSpan: (column: Column, colIndex: number, row: Record<string, unknown>, rowIndex: number) => {
-    colspan: any;
-    rowspan: any;
+    colspan: number;
+    rowspan: number;
 };
 export declare const skipThisColumn: (columns: Column[], colIndex: number, row: Record<string, unknown>, rowIndex: number) => number | false;
 export declare const getSortFn: (column: any, sortType: any, format?: any[]) => ((_a: any, _b: any) => boolean) | ((a: Record<string, unknown>, b: Record<string, unknown>, index0: number, index1: number) => number);

package/lib/tree/index.js

@@ -18319,10 +18319,11 @@ var getNodeItemStyle = function getNodeItemStyle(item, props, flatData) {
   var schema = flatData.schema;
   var depth = (_schema$get = schema.get(item)) === null || _schema$get === void 0 ? void 0 : _schema$get[NODE_ATTRIBUTES.DEPTH];
   if (showTree) {
+    var args = ['node'];
     return _objectSpread({
       '--depth': depth
     }, typeof props.levelLine === 'function' ? {
-      '--level-line': getPropsOneOfBoolValueWithDefault(props, 'levelLine', item, DEFAULT_LEVLE_LINE, null, ['node'])
+      '--level-line': getPropsOneOfBoolValueWithDefault(props, 'levelLine', item, DEFAULT_LEVLE_LINE, null, args)
     } : {});
   }
   return {};

package/package.json

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