bkui-vue 0.0.1-beta.120 → 0.0.1-beta.123

package/dist/index.esm.js

@@ -14902,8 +14902,8 @@ const virtualRenderProps = __spreadValues({
   className: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.object, PropTypes.arrayOf(PropTypes.object), PropTypes.string]).def(""),
   contentClassName: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.object, PropTypes.arrayOf(PropTypes.object), PropTypes.string]).def(""),
   contentStyle: PropTypes.object.def({}),
-  scrollXName: PropTypes.string.def("bk-scroll-x"),
-  scrollYName: PropTypes.string.def("bk-scroll-y"),
+  scrollXName: PropTypes.string.def(resolveClassName("F-scroll-x")),
+  scrollYName: PropTypes.string.def(resolveClassName("F-scroll-y")),
   groupItemCount: PropTypes.number.def(1),
   preloadItemCount: PropTypes.number.def(1),
   renderAs: PropTypes.string.def("div"),
@@ -15036,7 +15036,7 @@ var Component$d = defineComponent({
       renderAs,
       contentAs
     } = props;
-    const resolveClassName2 = (prop) => {
+    const resolvePropClassName = (prop) => {
       if (typeof prop === "string") {
         return [prop];
       }
@@ -15144,8 +15144,8 @@ var Component$d = defineComponent({
         display: isHidden ? "none" : "block"
       };
     });
-    const wrapperClass = computed(() => ["bk-virtual-render", props.scrollXName, props.scrollYName, ...resolveClassName2(props.className), props.scrollPosition === "container" ? "bk-virtual-content" : ""]);
-    const innerClass = computed(() => [props.scrollPosition === "content" ? "bk-virtual-content" : "", ...resolveClassName2(props.contentClassName)]);
+    const wrapperClass = computed(() => [resolveClassName("virtual-render"), props.scrollXName, props.scrollYName, ...resolvePropClassName(props.className), props.scrollPosition === "container" ? resolveClassName("virtual-content") : ""]);
+    const innerClass = computed(() => [props.scrollPosition === "content" ? resolveClassName("virtual-content") : "", ...resolvePropClassName(props.contentClassName)]);
     const vVirtualRender = resolveDirective("bkVirtualRender");
     const dirModifier = {
       lineHeight: props.lineHeight,
@@ -15172,7 +15172,7 @@ var Component$d = defineComponent({
       }, [(_f = (_e = (_d = ctx.slots).default) == null ? void 0 : _e.call(_d, {
         data: calcList.value
       })) != null ? _f : ""]), [[vVirtualRender, dirModifier]]), (_i = (_h = (_g = ctx.slots).afterContent) == null ? void 0 : _h.call(_g)) != null ? _i : "", h$1("div", {
-        class: ["bk-virtual-section"],
+        class: [resolveClassName("virtual-section")],
         style: innerStyle.value
       })]);
     };
@@ -15225,6 +15225,7 @@ const TABLE_ROW_ATTRIBUTE = {
   ROW_UID: "__$uuid",
   ROW_EXPAND: "__row_expand"
 };
+const SCROLLY_WIDTH = 4;
 const resolvePaginationOption = (propPagination, defVal) => {
   if (!!propPagination) {
     if (typeof propPagination === "object") {
@@ -15377,7 +15378,7 @@ 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(200),
+  minHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def(80),
   maxHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).def("auto"),
   rowHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.func]).def(40),
   headHeight: PropTypes.number.def(40),
@@ -16413,7 +16414,7 @@ var useFixedColumn = (props, colgroups, hasScrollY) => {
     right: (ignoreFirst = true) => colgroups.filter((col) => col.fixed === "right").reduce((offset2, curr, index) => {
       const outOffset = ignoreFirst && index === 0 ? offset2 : offset2 + getColumnReactWidth(curr);
       return outOffset;
-    }, hasScrollY ? 4 : 0)
+    }, hasScrollY ? SCROLLY_WIDTH : 0)
   };
   const reolveFixRightOffset = resolveFixOffset.right;
   const getFixedColumnStyleResolve = () => {
@@ -17015,8 +17016,18 @@ const useClass = (props, root, reactiveProp, pageData) => {
     [resolveClassName("table-footer")]: true,
     ["is-hidden"]: !props.pagination || !props.data.length
   }));
+  const resolveWidth2 = () => {
+    if (props.columns.every((col) => /^\d+\.?\d*(px)?$/ig.test(`${col.width}`))) {
+      const rectWidth = props.columns.reduce((width, col) => width + Number(`${col.width}`.replace(/px/ig, "")), 0);
+      const offset2 = hasScrollY.value ? SCROLLY_WIDTH : 0;
+      return `${rectWidth + offset2}px`;
+    }
+    return "100%";
+  };
   const wrapperStyle = computed(() => ({
-    minHeight: resolveNumberOrStringToPix(props.minHeight, "auto")
+    minHeight: resolveNumberOrStringToPix(props.minHeight, "auto"),
+    width: resolveWidth2(),
+    maxWidth: "100%"
   }));
   const resolvePropHeight = (height, defaultValue) => {
     const strHeight = String(height);
@@ -17065,7 +17076,7 @@ const useClass = (props, root, reactiveProp, pageData) => {
   const getColumnsWidthOffsetWidth = () => {
     let offsetWidth = 0;
     if (hasScrollY.value) {
-      offsetWidth = offsetWidth + 4;
+      offsetWidth = offsetWidth + SCROLLY_WIDTH;
     }
     if (props.border.includes(BORDER_OPTION.OUTER) && !props.border.includes(BORDER_OPTION.NONE)) {
       offsetWidth = offsetWidth + 2;
@@ -17314,9 +17325,11 @@ var Component$b = defineComponent({
     };
     onMounted(() => {
       observerIns = observerResize(root.value, () => {
-        if (props.height === "100%") {
+        if (props.height === "100%" || props.height === "auto") {
           resetTableHeight(root.value);
         }
+        const offset2 = getColumnsWidthOffsetWidth();
+        resolveColumnWidth(root.value, colgroups, 20, offset2);
       }, 60, true);
       observerIns.start();
     });
@@ -17328,9 +17341,9 @@ var Component$b = defineComponent({
     ctx.expose({
       setRowExpand
     });
-    const tableBodyClass = __spreadProps(__spreadValues({}, contentClass), {
+    const tableBodyClass = computed(() => __spreadProps(__spreadValues({}, contentClass), {
       "__is-empty": !pageData.length
-    });
+    }));
     const tableBodyContentClass = {
       [resolveClassName("table-body-content")]: true,
       "with-virtual-render": props.virtualEnabled
@@ -17349,6 +17362,10 @@ var Component$b = defineComponent({
     const {
       renderScrollLoading
     } = useScrollLoading(props, ctx);
+    const scrollClass = props.virtualEnabled ? {} : {
+      scrollXName: "",
+      scrollYName: ""
+    };
     return () => createVNode("div", {
       "class": tableClass.value,
       "style": wrapperStyle.value,
@@ -17358,18 +17375,19 @@ var Component$b = defineComponent({
         "class": headClass,
         "style": headStyle.value
       }, [tableRender.renderTableHeadSchema()]),
-      createVNode(BkVirtualRender, {
+      createVNode(BkVirtualRender, mergeProps({
         "ref": refVirtualRender,
         "lineHeight": tableRender.getRowHeight,
-        "class": tableBodyClass,
+        "class": tableBodyClass.value,
         "style": contentStyle,
-        "list": pageData,
+        "list": pageData
+      }, scrollClass, {
         "contentClassName": tableBodyContentClass,
         "onContentScroll": handleScrollChanged,
         "throttleDelay": 0,
         "scrollEvent": true,
         "enabled": props.virtualEnabled
-      }, {
+      }), {
         default: (scope) => tableRender.renderTableBodySchema(scope.data || props.data)
       }),
       createVNode("div", {