bkui-vue 0.0.1-beta.370 → 0.0.1-beta.372

package/dist/index.esm.js

@@ -14848,7 +14848,7 @@ function computedVirtualIndex(lineHeight, callback, pagination2, el, event) {
   }
   const elScrollTop = el.scrollTop;
   const elScrollLeft = el.scrollLeft;
-  const { scrollTop: scrollTop2, count, groupItemCount, startIndex, endIndex } = pagination2;
+  const { scrollTop: scrollTop2, count, groupItemCount, startIndex, endIndex, scrollLeft } = pagination2;
   const { offsetHeight } = el;
   let targetStartIndex = 0;
   let targetEndIndex = 0;
@@ -14865,7 +14865,7 @@ function computedVirtualIndex(lineHeight, callback, pagination2, el, event) {
     const endValue = getMatchedIndex(count, offsetHeight, groupItemCount, lineHeight);
     targetEndIndex = endValue.startIndex + targetStartIndex + 1;
   }
-  if (elScrollTop !== scrollTop2 || targetStartIndex !== startIndex || targetEndIndex !== endIndex) {
+  if (elScrollTop !== scrollTop2 || targetStartIndex !== startIndex || targetEndIndex !== endIndex || scrollLeft !== elScrollLeft) {
     const bottom2 = el.scrollHeight - el.offsetHeight - el.scrollTop;
     typeof callback === "function" && callback(event, targetStartIndex, targetEndIndex, elScrollTop, translateY, elScrollLeft, { bottom: bottom2 >= 0 ? bottom2 : 0 });
   }
@@ -14879,8 +14879,8 @@ function visibleRender(e, wrapper, binding) {
     handleScrollCallback(e, null, null, elScrollTop, elScrollTop, elScrollLeft, { bottom: bottom2 >= 0 ? bottom2 : 0 });
     return;
   }
-  const { startIndex, endIndex, groupItemCount, count, scrollTop: scrollTop2 } = pagination2;
-  computedVirtualIndex(lineHeight, handleScrollCallback, { scrollTop: scrollTop2, startIndex, endIndex, groupItemCount, count }, wrapper, e);
+  const { startIndex, endIndex, groupItemCount, count, scrollTop: scrollTop2, scrollLeft } = pagination2;
+  computedVirtualIndex(lineHeight, handleScrollCallback, { scrollTop: scrollTop2, startIndex, endIndex, groupItemCount, count, scrollLeft }, wrapper, e);
 }
 const throttledRender = (delay = 60) => lodash.exports.throttle((e, wrapper, binding) => visibleRender(e, wrapper, binding), delay);
 const executeThrottledRender = (e, wrapper, binding, delay = 60) => {
@@ -14936,6 +14936,7 @@ var Component$l = defineComponent({
       startIndex: 0,
       endIndex: 0,
       scrollTop: 1,
+      scrollLeft: 0,
       translateY: 0,
       translateX: 0,
       count: 0,
@@ -14948,6 +14949,7 @@ var Component$l = defineComponent({
       pagination2.scrollTop = scrollTop2;
       pagination2.translateY = translateY;
       pagination2.translateX = scrollLeft;
+      pagination2.scrollLeft = scrollLeft;
       pagination2.pos = pos;
       ctx.emit("content-scroll", [event, pagination2]);
     };
@@ -16505,6 +16507,7 @@ const tableProps = {
     PropTypes.string
   ]).def([BORDER_OPTION.ROW]),
   pagination: PropTypes.oneOfType([PropTypes.bool.def(false), PropTypes.object.def({})]).def(false),
+  paginationHeihgt: PropTypes.number.def(LINE_HEIGHT),
   remotePagination: PropTypes.bool.def(false),
   emptyText: PropTypes.string.def("\u6682\u65E0\u6570\u636E"),
   settings: PropTypes.oneOfType([
@@ -18515,8 +18518,7 @@ var Settings = defineComponent({
     }) : "";
   }
 });
-var useFixedColumn = (props2, colgroups, hasScrollY) => {
-  const footHeight = computed(() => props2.pagination && props2.data.length ? LINE_HEIGHT : 0);
+var useFixedColumn = (_props, colgroups, hasScrollY) => {
   const resolveColumnClass = (column, scrollX, offsetRight) => ({
     column_fixed: !!column.fixed,
     column_fixed_left: column.fixed !== "right",
@@ -18574,7 +18576,7 @@ var useFixedColumn = (props2, colgroups, hasScrollY) => {
   };
   const resolveColumnStyle = (colPos) => ({
     width: `${resolveFixOffset[colPos](false)}px`,
-    bottom: `${footHeight.value}px`
+    bottom: "0px"
   });
   const colPosExist = {
     left: false,
@@ -19332,7 +19334,7 @@ const useClass = (props2, targetColumns, root, reactiveProp, pageData) => {
     const resolveHeight = resolvePropHeight(props2.height, autoHeight.value);
     const resolveHeadHeight = getHeadHeight();
     const resolveMinHeight = resolvePropHeight(props2.minHeight, autoHeight.value);
-    const resolveFooterHeight = props2.pagination && props2.data.length ? LINE_HEIGHT : 0;
+    const resolveFooterHeight = props2.pagination && props2.data.length ? props2.paginationHeihgt : 0;
     const contentHeight = resolveHeight - resolveHeadHeight - resolveFooterHeight;
     const height = props2.height !== "auto" ? `${contentHeight}px` : false;
     const minHeight = resolveMinHeight - resolveHeadHeight - resolveFooterHeight;
@@ -20000,6 +20002,9 @@ var Component$e = defineComponent({
       height: 0,
       display: "none"
     };
+    const footerStyle = computed(() => ({
+      "--footer-height": hasFooter.value ? `${props2.paginationHeihgt}px` : "0"
+    }));
     const {
       renderScrollLoading
     } = useScrollLoading(props2, ctx);
@@ -20038,7 +20043,8 @@ var Component$e = defineComponent({
           }, null)
         }),
         createVNode("div", {
-          "class": fixedWrapperClass
+          "class": fixedWrapperClass,
+          "style": footerStyle.value
         }, [renderFixedColumns(reactiveSchema.scrollTranslateX, tableOffsetRight.value), createVNode("div", {
           "class": resizeColumnClass,
           "style": resizeColumnStyle.value
@@ -20046,7 +20052,8 @@ var Component$e = defineComponent({
           "class": loadingRowClass
         }, [renderScrollLoading()])]),
         createVNode("div", {
-          "class": footerClass.value
+          "class": footerClass.value,
+          "style": footerStyle.value
         }, [hasFooter.value && tableRender.renderTableFooter(localPagination.value)]),
         createVNode("div", {
           "style": columnGhostStyle