bkui-vue 0.0.2-beta.95 → 0.0.2-beta.97

package/lib/table/index.js

@@ -5441,7 +5441,7 @@ function use_render_objectSpread(target) { for (var i = 1; i < arguments.length;
 function use_render_isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0,external_vue_namespaceObject.isVNode)(s);
 }
-/* harmony default export */ const use_render = (function (props, context, tableResp, styleRef, head) {
+/* harmony default export */ const use_render = (function (props, context, tableResp, styleRef, head, root, resetTableHeight) {
   var t = (0,external_config_provider_namespaceObject.useLocale)('table');
   var uuid = (0,node_modules_uuid.v4)();
   var formatData = (0,external_vue_namespaceObject.computed)(function () {
@@ -5483,6 +5483,9 @@ function use_render_isSlot(s) {
       tableResp.formatData.settings.height = height;
       if (checked.length) {
         tableResp.setColumnAttributeBySettings(props.settings, checked);
+        (0,external_vue_namespaceObject.nextTick)(function () {
+          resetTableHeight(root.value);
+        });
       }
       context.emit(EMIT_EVENTS.SETTING_CHANGE, {
         checked: checked,
@@ -6266,7 +6269,7 @@ function table_objectSpread(target) { for (var i = 1; i < arguments.length; i++)
         hasScrollY: hasScrollYRef.value
       };
     });
-    var _useRender = use_render(props, ctx, tableSchema, styleRef, head),
+    var _useRender = use_render(props, ctx, tableSchema, styleRef, head, root, resetTableHeight),
       renderTableBodySchema = _useRender.renderTableBodySchema,
       renderTableFooter = _useRender.renderTableFooter,
       renderTableHeadSchema = _useRender.renderTableHeadSchema;

package/lib/table/table.d.ts

@@ -228,9 +228,7 @@ declare const _default: import("vue").DefineComponent<{
         rowIndex: number;
         columnIndex: number;
     }) => boolean;
-    rowMouseEnter: (_e: MouseEvent, _row: any, _index: number, _rows: any[], _this: any) => boolean; /**
-     * 确保在所有数据渲染完毕再执行fix column计算
-     */
+    rowMouseEnter: (_e: MouseEvent, _row: any, _index: number, _rows: any[], _this: any) => boolean;
     rowMouseLeave: (_e: MouseEvent, _row: any, _index: number, _rows: any[], _this: any) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: import("vue-types").VueTypeDef<any[]> & {

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

@@ -1,7 +1,7 @@
 import { SetupContext } from 'vue';
 import { TablePropTypes } from './props';
 import { ITableResponse } from './use-attributes';
-declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, styleRef: any, head: any) => {
+declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, styleRef: any, head: any, root: any, resetTableHeight: any) => {
     renderTableHeadSchema: () => (string | JSX.Element)[];
     renderTableBodySchema: (rows: any[]) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;

package/lib/tree/index.js

@@ -1747,6 +1747,7 @@ var use_node_action_this = undefined;
    * @returns
    */
   var getVirtualLines = function getVirtualLines(node) {
+    var _getNodeAttr;
     if (!props.levelLine) {
       return null;
     }
@@ -1755,7 +1756,7 @@ var use_node_action_this = undefined;
         '--depth': dpth
       };
     };
-    var maxDeep = getNodeAttr(node, NODE_ATTRIBUTES.DEPTH) + 1;
+    var maxDeep = ((_getNodeAttr = getNodeAttr(node, NODE_ATTRIBUTES.DEPTH)) !== null && _getNodeAttr !== void 0 ? _getNodeAttr : 0) + 1;
     return new Array(maxDeep).fill('').map(function (_, index) {
       return index;
     }).filter(function (depth) {
@@ -2191,6 +2192,9 @@ var use_tree_init_this = undefined;
         var target = treeSchema.get(node);
         if (Object.prototype.hasOwnProperty.call(target, attrName)) {
           if (typeof callFn === 'function' && Reflect.apply(callFn, self, [target, attrName, attrValue, node])) {
+            if (target[attrName] === attrValue) {
+              return;
+            }
             Object.assign(target, _defineProperty({}, attrName, attrValue));
             loopUpdateNodeAttr(target[NODE_ATTRIBUTES.PARENT], attrName, attrValue, callFn);
           }

package/lib/virtual-render/index.js

@@ -327,40 +327,35 @@ function getMatchedIndex(maxCount, maxHeight, groupItemCount, callback) {
     diffHeight: diffHeight
   };
 }
-function computedVirtualIndex(lineHeight, callback, pagination, el, event, height) {
-  if (!el) {
+function computedVirtualIndex(lineHeight, callback, pagination, _el, event) {
+  if (!event.target) {
     return;
   }
-  var elScrollTop = el.scrollTop;
-  var elScrollLeft = el.scrollLeft;
-  var scrollTop = pagination.scrollTop,
-    count = pagination.count,
-    groupItemCount = pagination.groupItemCount,
-    startIndex = pagination.startIndex,
-    endIndex = pagination.endIndex,
-    scrollLeft = pagination.scrollLeft;
-  var offsetHeight = /^\d+(\.\d*)?$/.test(height) ? height : el.offsetHeight;
+  var elScrollTop = event.target.scrollTop;
+  var elScrollLeft = event.target.scrollLeft;
+  var elScrollHeight = event.target.scrollHeight;
+  var elOffsetHeight = event.target.offsetHeight;
+  var count = pagination.count,
+    groupItemCount = pagination.groupItemCount;
   var targetStartIndex = 0;
   var targetEndIndex = 0;
   var translateY = 0;
   if (typeof lineHeight === 'number') {
     targetStartIndex = Math.floor(elScrollTop / lineHeight);
-    targetEndIndex = Math.ceil(offsetHeight / lineHeight) + targetStartIndex;
+    targetEndIndex = Math.ceil(elOffsetHeight / lineHeight) + targetStartIndex;
     translateY = elScrollTop % lineHeight;
   }
   if (typeof lineHeight === 'function') {
     var startValue = getMatchedIndex(count, elScrollTop, groupItemCount, lineHeight);
     targetStartIndex = startValue.startIndex > 0 ? startValue.startIndex : 0;
     translateY = startValue.diffHeight;
-    var endValue = getMatchedIndex(count, offsetHeight, groupItemCount, lineHeight);
-    targetEndIndex = endValue.startIndex + targetStartIndex + 1;
-  }
-  if (elScrollTop !== scrollTop || targetStartIndex !== startIndex || targetEndIndex !== endIndex || scrollLeft !== elScrollLeft) {
-    var bottom = el.scrollHeight - el.offsetHeight - el.scrollTop;
-    typeof callback === 'function' && callback(event, targetStartIndex, targetEndIndex, elScrollTop, translateY, elScrollLeft, {
-      bottom: bottom >= 0 ? bottom : 0
-    });
+    var endValue = getMatchedIndex(count, elOffsetHeight, groupItemCount, lineHeight);
+    targetEndIndex = endValue.startIndex + targetStartIndex;
   }
+  var bottom = elScrollHeight - elOffsetHeight - elScrollTop;
+  typeof callback === 'function' && callback(event, targetStartIndex, targetEndIndex, elScrollTop, translateY, elScrollLeft, {
+    bottom: bottom >= 0 ? bottom : 0
+  });
   return {
     targetStartIndex: targetStartIndex,
     targetEndIndex: targetEndIndex,
@@ -402,7 +397,6 @@ var VisibleRender = /*#__PURE__*/function () {
         count = pagination.count,
         scrollTop = pagination.scrollTop,
         scrollLeft = pagination.scrollLeft;
-      var height = this.binding.height;
       computedVirtualIndex(lineHeight, handleScrollCallback, {
         scrollTop: scrollTop,
         startIndex: startIndex,
@@ -410,7 +404,7 @@ var VisibleRender = /*#__PURE__*/function () {
         groupItemCount: groupItemCount,
         count: count,
         scrollLeft: scrollLeft
-      }, this.wrapper, e, height);
+      }, this.wrapper, e);
     }
   }, {
     key: "executeThrottledRender",
@@ -646,16 +640,31 @@ function virtual_render_objectSpread(target) { for (var i = 1; i < arguments.len
       pos: {},
       groupItemCount: props.groupItemCount
     });
+    var calcList = (0,external_vue_namespaceObject.ref)([]);
     /** 指令触发Scroll事件，计算当前startIndex & endIndex & scrollTop & translateY */
     var handleScrollCallback = function handleScrollCallback(event, startIndex, endIndex, scrollTop, translateY, scrollLeft, pos) {
-      pagination.startIndex = startIndex;
-      pagination.endIndex = endIndex;
-      pagination.scrollTop = scrollTop;
-      // 设置偏移量，避免行高较大时出现卡顿式的滚动
-      pagination.translateY = translateY;
-      pagination.translateX = scrollLeft;
-      pagination.scrollLeft = scrollLeft;
-      Object.assign(pagination.pos, pos || {});
+      var translateX = scrollLeft;
+      Object.assign(pagination, {
+        startIndex: startIndex,
+        endIndex: endIndex,
+        scrollTop: scrollTop,
+        translateX: translateX,
+        translateY: translateY,
+        scrollLeft: scrollLeft,
+        pos: pos
+      });
+      var start = pagination.startIndex * props.groupItemCount;
+      var end = (pagination.endIndex + props.preloadItemCount) * props.groupItemCount;
+      var total = localList.value.length;
+      if (total < end) {
+        var contentLength = end - start;
+        calcList.value = localList.value.slice(start, total);
+        end = total + 1;
+        start = end - contentLength;
+        start = start < 0 ? 0 : start;
+      }
+      var value = localList.value.slice(start, end + 10);
+      calcList.value = value;
       if (event) {
         ctx.emit('content-scroll', [event, pagination]);
       }
@@ -668,12 +677,6 @@ function virtual_render_objectSpread(target) { for (var i = 1; i < arguments.len
       var _instance;
       (_instance = instance) === null || _instance === void 0 ? void 0 : _instance.uninstall();
     });
-    var resolveHeight = (0,external_vue_namespaceObject.computed)(function () {
-      if (/^\d+(\.\d*)?(px)?$/.test("".concat(props.height))) {
-        return Number("".concat(props.height).replace(/px$/, ''));
-      }
-      return props.height;
-    });
     (0,external_vue_namespaceObject.watch)(function () {
       return [props.lineHeight, props.height, props.list, props.maxHeight];
     }, function () {
@@ -723,15 +726,11 @@ function virtual_render_objectSpread(target) { for (var i = 1; i < arguments.len
         left: 0,
         top: 0
       };
+      var el = refRoot.value;
       (0,external_vue_namespaceObject.nextTick)(function () {
-        var el = refRoot.value;
-        var _computedVirtualIndex = computedVirtualIndex(props.lineHeight, handleScrollCallback, pagination, el, null, resolveHeight.value),
-          targetStartIndex = _computedVirtualIndex.targetStartIndex,
-          targetEndIndex = _computedVirtualIndex.targetEndIndex,
-          elScrollTop = _computedVirtualIndex.elScrollTop,
-          translateY = _computedVirtualIndex.translateY,
-          elScrollLeft = _computedVirtualIndex.elScrollLeft;
-        handleScrollCallback(null, targetStartIndex, targetEndIndex, elScrollTop, translateY, elScrollLeft, {});
+        computedVirtualIndex(props.lineHeight, handleScrollCallback, pagination, el, {
+          target: el
+        });
       });
     };
     /** 映射传入的数组为新的数组，增加 $index属性，用来处理唯一Index */
@@ -745,10 +744,6 @@ function virtual_render_objectSpread(target) { for (var i = 1; i < arguments.len
         });
       });
     });
-    /** 计算出来的当前页数据 */
-    var calcList = (0,external_vue_namespaceObject.computed)(function () {
-      return localList.value.slice(pagination.startIndex * props.groupItemCount, (pagination.endIndex + props.preloadItemCount) * props.groupItemCount);
-    });
     /** 展示列表内容区域样式 */
     var innerContentStyle = (0,external_vue_namespaceObject.computed)(function () {
       return props.scrollPosition === 'content' ? {

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

@@ -1,4 +1,4 @@
-export declare function computedVirtualIndex(lineHeight: any, callback: any, pagination: any, el: any, event: any, height: any): {
+export declare function computedVirtualIndex(lineHeight: any, callback: any, pagination: any, _el: any, event: any): {
     targetStartIndex: number;
     targetEndIndex: number;
     elScrollTop: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.2-beta.95",
+  "version": "0.0.2-beta.97",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",
@@ -52,7 +52,7 @@
     "@babel/plugin-transform-runtime": "~7.22.9",
     "@babel/preset-env": "~7.22.9",
     "@babel/preset-typescript": "~7.22.5",
-    "@blueking/magicbox-header": "~1.1.60",
+    "@blueking/magicbox-header": "~1.1.61",
     "@commitlint/cli": "~16.2.3",
     "@commitlint/config-conventional": "~16.2.1",
     "@types/jest": "~29.5.3",