bkui-vue 0.0.1-beta.383 → 0.0.1-beta.384

package/dist/index.esm.js

@@ -9187,7 +9187,9 @@ var BreadcrumbItem = defineComponent({
     to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).def(""),
     replace: PropTypes.bool
   },
+  emits: ["click"],
   setup(props2, {
+    emit,
     slots
   }) {
     const {
@@ -9195,7 +9197,8 @@ var BreadcrumbItem = defineComponent({
     } = getCurrentInstance();
     const parent = inject("breadcrumb");
     const router = appContext.config.globalProperties.$router;
-    const handleClick = () => {
+    const handleClick = (e) => {
+      emit("click", e);
       const {
         to,
         replace
@@ -18686,7 +18689,7 @@ var useFixedColumn = (_props, colgroups, hasScrollY) => {
       return outOffset;
     }, hasScrollY ? SCROLLY_WIDTH : 0)
   };
-  const getPreColumnOffset = (fixedPos, column) => {
+  const getPreColumnOffset = (fixedPos, column, offset2 = 0) => {
     const sourceId = column[COLUMN_ATTRIBUTE.COL_UID];
     const opt = fixedPos === "right" ? -1 : 1;
     const {
@@ -18708,18 +18711,18 @@ var useFixedColumn = (_props, colgroups, hasScrollY) => {
         break;
       }
     }
-    return preOffset;
+    return preOffset + offset2;
   };
-  const resolveFixedColumnStyle = (column) => {
+  const resolveFixedColumnStyle = (column, hasScrollY2 = false) => {
     if (!column.fixed) {
       return {};
     }
     const fixedOffset = {
       left: 0,
-      right: 0
+      right: hasScrollY2 ? SCROLLY_WIDTH : -1
     };
     const fixedPos = resolveFixColPos(column);
-    fixedOffset[fixedPos] = getPreColumnOffset(fixedPos, column);
+    fixedOffset[fixedPos] = getPreColumnOffset(fixedPos, column, fixedOffset[fixedPos]);
     return {
       [fixedPos]: `${fixedOffset[fixedPos]}px`
     };
@@ -18761,7 +18764,7 @@ function _isSlot$1(s2) {
   return typeof s2 === "function" || Object.prototype.toString.call(s2) === "[object Object]" && !isVNode(s2);
 }
 class TableRender {
-  constructor(props2, ctx, reactiveProp, colgroups) {
+  constructor(props2, ctx, reactiveProp, colgroups, styleRef) {
     __publicField(this, "getRowHeight", (row, rowIndex) => {
       const {
         size,
@@ -18788,6 +18791,7 @@ class TableRender {
     this.plugins = new TablePlugins(props2, ctx);
     this.uuid = uuid_1.v4();
     this.events = /* @__PURE__ */ new Map();
+    this.styleRef = styleRef;
   }
   get propActiveCols() {
     return this.reactiveProp.activeColumns;
@@ -19006,6 +19010,18 @@ class TableRender {
     const {
       resolveFixedColumnStyle
     } = useFixedColumn(this.props, this.colgroups);
+    const getScrollFix = () => {
+      if (this.styleRef.value.hasScrollY) {
+        const fixStyle = {
+          width: `${SCROLLY_WIDTH + 2}px`,
+          right: "-1px"
+        };
+        return createVNode("th", {
+          "style": fixStyle,
+          "class": "column_fixed"
+        }, null);
+      }
+    };
     return createVNode("thead", {
       "style": rowStyle
     }, [createVNode(TableRow, null, {
@@ -19013,9 +19029,9 @@ class TableRender {
         "colspan": 1,
         "rowspan": 1,
         "class": this.getHeadColumnClass(column, index2),
-        "style": resolveFixedColumnStyle(column),
+        "style": resolveFixedColumnStyle(column, this.styleRef.value.hasScrollY),
         "onClick": () => this.handleColumnHeadClick(index2, column)
-      }, resolveEventListener(column)), [renderHeadCell(column, index2)]))])]
+      }, resolveEventListener(column)), [renderHeadCell(column, index2)])), getScrollFix()])]
     })]);
   }
   renderTBody(rows) {
@@ -19436,8 +19452,12 @@ var useColumnResize = (colgroups, immediate = true) => {
 const useClass = (props2, targetColumns, root, reactiveProp, pageData) => {
   const { getColumns } = useColumn(props2, targetColumns);
   const autoHeight = ref(200);
-  const hasScrollY = ref(void 0);
+  const hasScrollY = ref(false);
   const hasFooter = computed(() => props2.pagination && props2.data.length);
+  const hasScrollYRef = computed(() => {
+    console.log("--", hasScrollY.value);
+    return hasScrollY.value;
+  });
   const tableClass = computed(() => classes({
     [resolveClassName("table")]: true,
     "has-footer": hasFooter.value,
@@ -19553,7 +19573,8 @@ const useClass = (props2, targetColumns, root, reactiveProp, pageData) => {
     updateBorderClass,
     getColumnsWidthOffsetWidth,
     hasFooter,
-    hasScrollY
+    hasScrollY,
+    hasScrollYRef
   };
 };
 const useInit = (props2, targetColumns) => {
@@ -19948,12 +19969,16 @@ var Component$e = defineComponent({
       wrapperStyle,
       contentStyle,
       headStyle,
+      hasScrollYRef,
       updateBorderClass,
       resetTableHeight,
       getColumnsWidthOffsetWidth,
       hasFooter
     } = useClass(props2, targetColumns, root, reactiveSchema, pageData);
-    const tableRender = new TableRender(props2, ctx, reactiveSchema, colgroups);
+    const styleRef = computed(() => ({
+      hasScrollY: hasScrollYRef.value
+    }));
+    const tableRender = new TableRender(props2, ctx, reactiveSchema, colgroups, styleRef);
     const updateOffsetRight = () => {
       const $tableContent = root.value.querySelector(".bk-table-body-content");
       const $table = $tableContent.querySelector("table");
@@ -20170,6 +20195,12 @@ var Component$e = defineComponent({
     const footerStyle = computed(() => ({
       "--footer-height": hasFooter.value ? `${props2.paginationHeihgt}px` : "0"
     }));
+    const fixedContainerStyle = computed(() => {
+      console.log("-x-x", hasScrollYRef.value);
+      return __spreadValues({
+        right: hasScrollYRef.value ? `${SCROLLY_WIDTH}px` : 0
+      }, footerStyle.value);
+    });
     const {
       renderScrollLoading
     } = useScrollLoading(props2, ctx);
@@ -20209,7 +20240,7 @@ var Component$e = defineComponent({
         }),
         createVNode("div", {
           "class": fixedWrapperClass,
-          "style": footerStyle.value
+          "style": fixedContainerStyle.value
         }, [renderFixedColumns(reactiveSchema.scrollTranslateX, tableOffsetRight.value), createVNode("div", {
           "class": resizeColumnClass,
           "style": resizeColumnStyle.value