bkui-vue 0.0.1-beta.404 → 0.0.1-beta.406

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",
@@ -12812,15 +12812,23 @@ var useFloating = (props2, ctx, {
   };
   let popHideTimerId = 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 = () => {
+    const delay = resolvePopoverDelay()[0];
     setTimeout(() => {
       !props2.disabled && (localIsShow.value = true);
-    }, props2.popoverDelay);
+    }, delay);
   };
   const hidePopover = () => {
+    const delay = resolvePopoverDelay()[1];
     popHideTimerId = setTimeout(() => {
       localIsShow.value = false;
-    }, props2.popoverDelay);
+    }, delay);
   };
   const hanldePopoverShow = () => {
     var _a;
@@ -16968,7 +16976,8 @@ const tableProps = {
   ]).def(true),
   resizerWay: j("ResizerWay", {
     default: "throttle"
-  })
+  }),
+  observerResize: PropTypes.bool.def(true)
 };
 var Column = defineComponent({
   name: "TableColumn",
@@ -18360,7 +18369,8 @@ var TableCell = defineComponent({
       watchCellResize: PropTypes.bool.def(true),
       mode: overflowModeType
     })]).def(void 0),
-    title: PropTypes.string.def(void 0)
+    title: PropTypes.string.def(void 0),
+    observerResize: PropTypes.bool.def(true)
   },
   setup(props2, {
     slots
@@ -18378,7 +18388,6 @@ var TableCell = defineComponent({
     const {
       showOverflowTooltip = false
     } = resolveSetting();
-    let observerIns = null;
     let bkEllipsisIns = null;
     const resolveTooltipOption = () => {
       let disabled = true;
@@ -18436,11 +18445,15 @@ var TableCell = defineComponent({
       } = resolveTooltipOption();
       if (!disabled) {
         resolveOverflowTooltip();
-        if (((_a = props2.column.showOverflowTooltip) == null ? void 0 : _a.watchCellResize) !== false) {
-          observerIns = observerResize(refRoot.value, () => {
+        if (((_a = props2.column.showOverflowTooltip) == null ? void 0 : _a.watchCellResize) !== false && props2.observerResize) {
+          let observerIns = observerResize(refRoot.value, () => {
             resolveOverflowTooltip();
           }, 60, true);
           observerIns.start();
+          onBeforeUnmount(() => {
+            observerIns.disconnect();
+            observerIns = null;
+          });
         }
       }
     });
@@ -18948,15 +18961,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)
@@ -18987,7 +19000,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 = {
@@ -19004,33 +19017,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) {
@@ -19274,7 +19283,8 @@ class TableRender {
       cells.unshift(cellText);
       const showTitle = typeof cellText === "string" ? cellText : void 0;
       return createVNode(TableCell, {
-        "title": showTitle
+        "title": showTitle,
+        "observerResize": this.props.observerResize
       }, _isSlot$1(cells) ? cells : {
         default: () => [cells]
       });
@@ -19381,7 +19391,8 @@ class TableRender {
               "class": tdCtxClass,
               "column": column,
               "row": row,
-              "parentSetting": this.props.showOverflowTooltip
+              "parentSetting": this.props.showOverflowTooltip,
+              "observerResize": this.props.observerResize
             }, _isSlot$1(_slot = this.renderCell(row, column, rowIndex, rows)) ? _slot : {
               default: () => [_slot]
             })]);
@@ -19886,6 +19897,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], () => {
@@ -20178,7 +20192,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,
@@ -20187,9 +20206,11 @@ const useInit = (props2, targetColumns) => {
     reactiveSchema,
     indexData,
     fixedWrapperClass,
+    fixedColumns,
+    resolveColumnStyle,
+    resolveColumnClass,
     initIndexData,
     updateIndexData,
-    renderFixedColumns,
     setRowExpand,
     updateColGroups,
     clearSelection,
@@ -20208,7 +20229,6 @@ var Component$e = defineComponent({
     let columnSortFn = null;
     let activeSortColumn = null;
     let columnFilterFn = null;
-    let observerIns = null;
     const targetColumns = reactive([]);
     const {
       initColumns
@@ -20223,7 +20243,9 @@ var Component$e = defineComponent({
       dragOffsetX,
       reactiveSchema,
       indexData,
-      renderFixedColumns,
+      fixedColumns,
+      resolveColumnStyle,
+      resolveColumnClass,
       setRowExpand,
       initIndexData,
       fixedWrapperClass,
@@ -20424,22 +20446,26 @@ var Component$e = defineComponent({
       (_b = (_a = refVirtualRender.value) == null ? void 0 : _a.scrollTo) == null ? void 0 : _b.call(_a, option);
     };
     onMounted(() => {
-      observerIns = observerResize(root.value, () => {
-        if (!root.value) {
-          return;
-        }
-        if (props2.height === "100%" || props2.height === "auto") {
-          resetTableHeight(root.value);
-        }
-        updateBorderClass(root.value);
-        const offset2 = getColumnsWidthOffsetWidth();
-        resolveColumnWidth(root.value, colgroups, 20, offset2);
-      }, 180, true, props2.resizerWay);
-      observerIns.start();
+      if (props2.observerResize) {
+        let observerIns = observerResize(root.value, () => {
+          if (!root.value) {
+            return;
+          }
+          if (props2.height === "100%" || props2.height === "auto") {
+            resetTableHeight(root.value);
+          }
+          updateBorderClass(root.value);
+          const offset2 = getColumnsWidthOffsetWidth();
+          resolveColumnWidth(root.value, colgroups, 20, offset2);
+        }, 180, true, props2.resizerWay);
+        observerIns.start();
+        onBeforeUnmount(() => {
+          observerIns.disconnect();
+          observerIns = null;
+        });
+      }
     });
     onBeforeUnmount(() => {
-      observerIns.disconnect();
-      observerIns = null;
       tableRender.destroy();
     });
     ctx.expose({
@@ -20525,7 +20551,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", {