bkui-vue 0.0.1-beta.405 → 0.0.1-beta.407

package/dist/index.esm.js

@@ -11288,7 +11288,7 @@ const PopoverProps = __spreadValues({
   disableTransform: PropTypes.bool.def(false),
   reference: PropTypes.any.def(null),
   modifiers: PropTypes.array.def([]),
-  popoverDelay: PropTypes.number.def(100)
+  popoverDelay: PropTypes.oneOfType([PropTypes.number, PropTypes.arrayOf(PropTypes.number)]).def(100)
 }, EventProps$1);
 var Reference = defineComponent({
   name: "PopReference",
@@ -12811,16 +12811,27 @@ var useFloating = (props2, ctx, {
     });
   };
   let popHideTimerId = void 0;
+  let popShowTimerId = void 0;
   let isMouseenter = false;
+  const resolvePopoverDelay = () => {
+    if (Array.isArray(props2.popoverDelay)) {
+      return [props2.popoverDelay[0], props2.popoverDelay.slice(-1)[0]];
+    }
+    return [props2.popoverDelay, props2.popoverDelay];
+  };
   const showPopover = () => {
-    setTimeout(() => {
+    const delay = resolvePopoverDelay()[0];
+    popShowTimerId = setTimeout(() => {
+      popHideTimerId && clearTimeout(popHideTimerId);
       !props2.disabled && (localIsShow.value = true);
-    }, props2.popoverDelay);
+    }, delay);
   };
   const hidePopover = () => {
+    const delay = resolvePopoverDelay()[1];
     popHideTimerId = setTimeout(() => {
+      popShowTimerId && clearTimeout(popShowTimerId);
       localIsShow.value = false;
-    }, props2.popoverDelay);
+    }, delay);
   };
   const hanldePopoverShow = () => {
     var _a;
@@ -18953,15 +18964,15 @@ var useFixedColumn = (_props, colgroups, hasScrollY) => {
     column_fixed: !!column.fixed,
     column_fixed_left: column.fixed !== "right",
     column_fixed_right: column.fixed === "right",
-    shadow: column.fixed === "right" ? scrollX < offsetRight : scrollX > 0
+    shadow: column.fixed === "right" ? offsetRight - scrollX > 2 : scrollX > 0
   });
   const resolveFixColPos = (column) => column.fixed === "right" ? "right" : "left";
   const resolveFixOffset = {
-    left: (ignoreFirst = true) => colgroups.filter((col) => col.fixed && col.fixed !== "right").reduce((offset2, curr, index2) => {
+    left: (ignoreFirst = true) => colgroups.filter((col) => !col.isHidden && col.fixed && col.fixed !== "right").reduce((offset2, curr, index2) => {
       const outOffset = ignoreFirst && index2 === 0 ? offset2 : offset2 + getColumnReactWidth(curr);
       return outOffset;
     }, 0),
-    right: (ignoreFirst = true) => colgroups.filter((col) => col.fixed === "right").reduce((offset2, curr, index2) => {
+    right: (ignoreFirst = true) => colgroups.filter((col) => !col.isHidden && col.fixed === "right").reduce((offset2, curr, index2) => {
       const outOffset = ignoreFirst && index2 === 0 ? offset2 : offset2 + getColumnReactWidth(curr);
       return outOffset;
     }, hasScrollY ? SCROLLY_WIDTH : 0)
@@ -18992,7 +19003,7 @@ var useFixedColumn = (_props, colgroups, hasScrollY) => {
     return preOffset + offset2;
   };
   const resolveFixedColumnStyle = (column, hasScrollY2 = false) => {
-    if (!column.fixed) {
+    if (!column.fixed || column.isHidden) {
       return {};
     }
     const fixedOffset = {
@@ -19009,33 +19020,29 @@ var useFixedColumn = (_props, colgroups, hasScrollY) => {
     width: `${resolveFixOffset[colPos](false)}px`,
     bottom: "0px"
   });
-  const colPosExist = {
-    left: false,
-    right: false
-  };
-  const fixedColumns = computed(() => colgroups.filter((col) => !col.isHidden && col.fixed).map((col) => {
-    const colPos = resolveFixColPos(col);
-    const isExist = colPosExist[colPos];
-    colPosExist[colPos] = true;
-    return {
-      isExist,
-      colPos,
-      column: col
-    };
-  }));
-  const renderFixedColumns = (scrollX, offsetRight) => fixedColumns.value.map(({
-    isExist,
-    colPos,
-    column
-  }) => isExist ? "" : createVNode("div", {
-    "class": resolveColumnClass(column, scrollX, offsetRight),
-    "style": resolveColumnStyle(colPos)
-  }, null));
+  const fixedColumns = computed(() => {
+    const colPosExist = {
+      left: false,
+      right: false
+    };
+    return colgroups.filter((col) => !col.isHidden && col.fixed).map((col) => {
+      const colPos = resolveFixColPos(col);
+      const isExist = colPosExist[colPos];
+      colPosExist[colPos] = true;
+      return {
+        isExist,
+        colPos,
+        column: col
+      };
+    });
+  });
   const fixedWrapperClass = resolveClassName("table-fixed");
   return {
-    renderFixedColumns,
     fixedWrapperClass,
-    resolveFixedColumnStyle
+    resolveFixedColumnStyle,
+    fixedColumns,
+    resolveColumnStyle,
+    resolveColumnClass
   };
 };
 function _isSlot$1(s2) {
@@ -19893,6 +19900,9 @@ const useInit = (props2, targetColumns) => {
       [COLUMN_ATTRIBUTE.COL_SOURCE_DATA]: col
     })));
   };
+  if (typeof props2.settings === "object") {
+    updateColGroups(props2.settings);
+  }
   const { dragOffsetXStyle, dragOffsetX, resetResizeEvents, registerResizeEvent } = useColumnResize(colgroups, true);
   const { activeColumns } = useActiveColumns(props2, targetColumns);
   watch(() => [props2.settings], () => {
@@ -20185,7 +20195,12 @@ const useInit = (props2, targetColumns) => {
       }
     }
   };
-  const { renderFixedColumns, fixedWrapperClass } = useFixedColumn(props2, colgroups, false);
+  const {
+    fixedColumns,
+    resolveColumnStyle,
+    resolveColumnClass,
+    fixedWrapperClass
+  } = useFixedColumn(props2, colgroups, false);
   const getSelection = () => indexData.filter((row) => resolveSelection(row));
   return {
     colgroups,
@@ -20194,9 +20209,11 @@ const useInit = (props2, targetColumns) => {
     reactiveSchema,
     indexData,
     fixedWrapperClass,
+    fixedColumns,
+    resolveColumnStyle,
+    resolveColumnClass,
     initIndexData,
     updateIndexData,
-    renderFixedColumns,
     setRowExpand,
     updateColGroups,
     clearSelection,
@@ -20229,7 +20246,9 @@ var Component$e = defineComponent({
       dragOffsetX,
       reactiveSchema,
       indexData,
-      renderFixedColumns,
+      fixedColumns,
+      resolveColumnStyle,
+      resolveColumnClass,
       setRowExpand,
       initIndexData,
       fixedWrapperClass,
@@ -20535,7 +20554,17 @@ var Component$e = defineComponent({
         createVNode("div", {
           "class": fixedWrapperClass,
           "style": fixedContainerStyle.value
-        }, [renderFixedColumns(reactiveSchema.scrollTranslateX, tableOffsetRight.value), createVNode("div", {
+        }, [fixedColumns.value.map(({
+          isExist,
+          colPos,
+          column
+        }) => {
+          console.log("fixedWrapperClass");
+          return isExist ? "" : createVNode("div", {
+            "class": resolveColumnClass(column, reactiveSchema.scrollTranslateX, tableOffsetRight.value),
+            "style": resolveColumnStyle(colPos)
+          }, null);
+        }), createVNode("div", {
           "class": resizeColumnClass,
           "style": resizeColumnStyle.value
         }, null), createVNode("div", {