bkui-vue 0.0.1-beta.129 → 0.0.1-beta.131

package/dist/index.esm.js

@@ -10759,7 +10759,7 @@ var isEventSupported_1 = isEventSupported$1;
 var UserAgent_DEPRECATED = UserAgent_DEPRECATED_1;
 var isEventSupported = isEventSupported_1;
 var PIXEL_STEP = 10;
-var LINE_HEIGHT = 40;
+var LINE_HEIGHT$1 = 40;
 var PAGE_HEIGHT = 800;
 function normalizeWheel$1(event) {
   var sX = 0, sY = 0, pX = 0, pY = 0;
@@ -10789,8 +10789,8 @@ function normalizeWheel$1(event) {
   }
   if ((pX || pY) && event.deltaMode) {
     if (event.deltaMode == 1) {
-      pX *= LINE_HEIGHT;
-      pY *= LINE_HEIGHT;
+      pX *= LINE_HEIGHT$1;
+      pY *= LINE_HEIGHT$1;
     } else {
       pX *= PAGE_HEIGHT;
       pY *= PAGE_HEIGHT;
@@ -15299,11 +15299,17 @@ const TABLE_ROW_ATTRIBUTE = {
   ROW_EXPAND: "__row_expand"
 };
 const SCROLLY_WIDTH = 4;
+const LINE_HEIGHT = 42;
 const SETTING_SIZE = {
-  large: 56,
-  default: 40,
-  small: 32
-};
+  large: 78,
+  medium: 60,
+  small: 42
+};
+const DEFAULT_SIZE_LIST = [
+  { value: "small", label: "\u5C0F", height: SETTING_SIZE.small },
+  { value: "medium", label: "\u4E2D", height: SETTING_SIZE.medium },
+  { value: "large", label: "\u5927", height: SETTING_SIZE.large }
+];
 const resolvePaginationOption = (propPagination, defVal) => {
   if (!!propPagination) {
     if (typeof propPagination === "object") {
@@ -15456,13 +15462,13 @@ const tableProps = {
   activeColumn: PropTypes.oneOfType([PropTypes.number.def(-1), PropTypes.arrayOf(PropTypes.number.def(-1))]),
   columnPick: PropTypes.commonType(["multi", "single", "disabled"], "columnPick").def("disabled"),
   height: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def("auto"),
-  minHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def(80),
+  minHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def(LINE_HEIGHT * 2),
   maxHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def("auto"),
-  rowHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.func]).def(40),
-  headHeight: PropTypes.number.def(40),
+  rowHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.func]).def(LINE_HEIGHT),
+  headHeight: PropTypes.number.def(LINE_HEIGHT),
   showHead: PropTypes.bool.def(true),
   thead: PropTypes.shape({
-    height: PropTypes.number.def(40),
+    height: PropTypes.number.def(LINE_HEIGHT),
     isShow: PropTypes.bool.def(true),
     cellFn: PropTypes.func.def(void 0)
   }),
@@ -15480,7 +15486,7 @@ const tableProps = {
       })),
       checked: PropTypes.arrayOf(PropTypes.string),
       limit: PropTypes.number.def(0),
-      size: PropTypes.size(["small", "default", "large"]).def("default"),
+      size: PropTypes.size(["small", "medium", "large"]).def("small"),
       sizeList: PropTypes.shape([])
     }),
     PropTypes.bool
@@ -16153,11 +16159,11 @@ const getRowKey = (item, props, index) => {
   }
   return uuid_1.v4();
 };
-const hasRootScrollY = (root, querySelector) => {
+const hasRootScrollY = (root, querySelector, offsetHeight = 0) => {
   if (root) {
     const tableBody = root.querySelector(querySelector);
     if (tableBody) {
-      return tableBody.offsetHeight > root.offsetHeight;
+      return tableBody.offsetHeight > root.offsetHeight - offsetHeight;
     }
   }
   return false;
@@ -16169,7 +16175,7 @@ var HeadFilter = defineComponent({
   name: "HeadFilter",
   props: {
     column: PropTypes.any.def({}),
-    height: PropTypes.number.def(40)
+    height: PropTypes.number.def(LINE_HEIGHT)
   },
   emits: ["change"],
   setup(props, {
@@ -16344,30 +16350,17 @@ var Settings = defineComponent({
       })),
       checked: PropTypes.arrayOf(PropTypes.string),
       limit: PropTypes.number.def(0),
-      size: PropTypes.size(["small", "default", "large"]).def("default"),
+      size: PropTypes.size(["small", "medium", "large"]).def("small"),
       sizeList: PropTypes.shape([])
     }), PropTypes.bool]).def(false),
     columns: PropTypes.array.def([]),
-    rowHeight: PropTypes.number.def(40)
+    rowHeight: PropTypes.number.def(LINE_HEIGHT)
   },
   emits: ["change"],
   setup(props, {
     emit
   }) {
-    var _a;
-    const defaultSizeList = [{
-      value: "small",
-      label: "\u5C0F",
-      height: SETTING_SIZE.small
-    }, {
-      value: "default",
-      label: "\u4E2D",
-      height: props.rowHeight
-    }, {
-      value: "large",
-      label: "\u5927",
-      height: SETTING_SIZE.large
-    }];
+    const defaultSizeList = DEFAULT_SIZE_LIST;
     const checkAll = ref(false);
     const isShow = ref(false);
     const localSettings = typeof props.settings === "boolean" ? ref({
@@ -16376,10 +16369,10 @@ var Settings = defineComponent({
       })),
       checked: [],
       limit: 0,
-      size: "default",
+      size: "small",
       sizeList: defaultSizeList
     }) : ref(props.settings);
-    const activeSize = ref(localSettings.value.size || "default");
+    const activeSize = ref(localSettings.value.size || "small");
     const activeHeight = ref(props.rowHeight);
     const checkedFields = ref(localSettings.value.checked);
     const className = resolveClassName("table-settings");
@@ -16426,10 +16419,10 @@ var Settings = defineComponent({
       }
     };
     const isLimit = computed(() => {
-      var _a2;
-      return ((_a2 = localSettings.value.limit) != null ? _a2 : 0) > 0;
+      var _a;
+      return ((_a = localSettings.value.limit) != null ? _a : 0) > 0;
     });
-    const sizeList = (_a = localSettings.value.sizeList) != null ? _a : defaultSizeList;
+    const sizeList = localSettings.value.sizeList || defaultSizeList;
     const isFiledDisabled = computed(() => isLimit.value && (localSettings.value.limit ? localSettings.value.limit : 0) <= checkedFields.value.length);
     const isItemReadonly = (item, index) => item.disabled || isFiledDisabled.value && !checkedFields.value.includes(resolvePropVal(item, "field", [item, index]));
     const handleSizeItemClick = (item) => {
@@ -16438,7 +16431,7 @@ var Settings = defineComponent({
     };
     const getItemClass = (item) => ({
       "line-size": true,
-      "is-default": activeSize.value === "default",
+      "is-medium": activeSize.value === "medium",
       active: item.value === activeSize.value
     });
     const buttonStyle = {
@@ -16547,7 +16540,7 @@ var Settings = defineComponent({
   }
 });
 var useFixedColumn = (props, colgroups, hasScrollY) => {
-  const footHeight = computed(() => props.pagination && props.data.length ? 40 : 0);
+  const footHeight = computed(() => props.pagination && props.data.length ? LINE_HEIGHT : 0);
   const resolveColumnClass = (column) => ({
     column_fixed: !!column.fixed,
     column_fixed_left: column.fixed !== "right",
@@ -17193,11 +17186,12 @@ const useClass = (props, root, reactiveProp, pageData) => {
     return defaultValue;
   };
   const contentStyle = reactive({});
+  const getHeadHeight = () => props.showHead ? resolvePropHeight(props.headHeight, LINE_HEIGHT) : 0;
   const resolveContentStyle = () => {
     const resolveHeight = resolvePropHeight(props.height, autoHeight.value);
-    const resolveHeadHeight = props.showHead ? resolvePropHeight(props.headHeight, 40) + 2 : 0;
+    const resolveHeadHeight = getHeadHeight();
     const resolveMinHeight = resolvePropHeight(props.minHeight, autoHeight.value);
-    const resolveFooterHeight = props.pagination && props.data.length ? 40 : 0;
+    const resolveFooterHeight = props.pagination && props.data.length ? LINE_HEIGHT : 0;
     const contentHeight = resolveHeight - resolveHeadHeight - resolveFooterHeight;
     const height = props.height !== "auto" ? `${contentHeight}px` : false;
     const minHeight = resolveMinHeight - resolveHeadHeight - resolveFooterHeight;
@@ -17220,7 +17214,8 @@ const useClass = (props, root, reactiveProp, pageData) => {
   };
   const updateBorderClass = (root2) => {
     const querySelector = props.virtualEnabled ? `.${resolveClassName("virtual-section")}` : `.${resolveClassName("table-body-content")}`;
-    hasScrollY.value = hasRootScrollY(root2, querySelector);
+    const rootBody = root2.querySelector(".bk-table-body");
+    hasScrollY.value = hasRootScrollY(rootBody, querySelector, 0);
   };
   const getColumnsWidthOffsetWidth = () => {
     let offsetWidth = 0;
@@ -17251,18 +17246,19 @@ const useInit = (props) => {
   var _a, _b;
   const colgroups = reactive([]);
   const updateColGroups = () => {
-    var _a2;
-    colgroups.splice(0, colgroups.length, ...((_a2 = props.columns) != null ? _a2 : []).map((col) => __spreadProps(__spreadValues({}, col), {
+    colgroups.splice(0, colgroups.length, ...(props.columns || []).map((col) => __spreadProps(__spreadValues({}, col), {
       calcWidth: null,
       resizeWidth: null,
       listeners: /* @__PURE__ */ new Map()
     })));
   };
+  const { dragOffsetXStyle, dragOffsetX, resetResizeEvents, registerResizeEvent } = useColumnResize(colgroups, true);
+  const { activeColumns } = useActiveColumns(props);
   watch(() => props.columns, () => {
     updateColGroups();
+    resetResizeEvents();
+    registerResizeEvent();
   }, { immediate: true, deep: true });
-  const { dragOffsetXStyle, dragOffsetX } = useColumnResize(colgroups, true);
-  const { activeColumns } = useActiveColumns(props);
   const reactiveSchema = reactive({
     rowActions: /* @__PURE__ */ new Map(),
     scrollTranslateY: 0,
@@ -17419,19 +17415,22 @@ var Component$b = defineComponent({
         index
       });
     }).on(EVENTS$1.ON_SETTING_CHANGE, (args) => {
-      var _a, _b;
       const {
         checked = [],
         size,
         height
       } = args;
-      const offset2 = getColumnsWidthOffsetWidth();
-      checked.length && resolveColumnWidth(root.value, colgroups, 20, offset2);
-      (_b = (_a = refVirtualRender.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a);
-      ctx.emit(EMITEVENTS.SETTING_CHANGE, {
-        checked,
-        size,
-        height
+      nextTick(() => {
+        var _a, _b;
+        updateBorderClass(root.value);
+        const offset2 = getColumnsWidthOffsetWidth();
+        checked.length && resolveColumnWidth(root.value, colgroups, 20, offset2);
+        (_b = (_a = refVirtualRender.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a);
+        ctx.emit(EMITEVENTS.SETTING_CHANGE, {
+          checked,
+          size,
+          height
+        });
       });
     }).on(EVENTS$1.ON_ROW_EXPAND_CLICK, (args) => {
       const {
@@ -17479,6 +17478,7 @@ var Component$b = defineComponent({
         if (props.height === "100%" || props.height === "auto") {
           resetTableHeight(root.value);
         }
+        updateBorderClass(root.value);
         const offset2 = getColumnsWidthOffsetWidth();
         resolveColumnWidth(root.value, colgroups, 20, offset2);
       }, 60, true);