bkui-vue 0.0.1-beta.106 → 0.0.1-beta.109

package/dist/index.esm.js

@@ -15024,10 +15024,13 @@ var Component$d = defineComponent({
         innerHeight.value = props.abosuteHeight;
       }
     };
-    const afterListDataReset = () => {
+    const afterListDataReset = (scrollTop = true) => {
       var _a;
       const el = (_a = refRoot.value) == null ? void 0 : _a.parentNode;
       computedVirtualIndex(props.lineHeight, handleScrollCallback, pagination2, el, null);
+      if (scrollTop && refRoot.value) {
+        refRoot.value.scrollTo(0, 0);
+      }
     };
     const localList = computed(() => (props.list || []).map((item, index) => __spreadProps(__spreadValues({}, item), {
       $index: index
@@ -15390,7 +15393,7 @@ var useList = () => {
     showPreBatch.value = false;
     showNextBatch.value = false;
     const stack = [];
-    if (proxy.totalPageNum <= PAGE_ITEMS_NUM) {
+    if (proxy.totalPageNum <= PAGE_ITEMS_NUM + 2) {
       for (let i2 = 2; i2 <= proxy.totalPageNum - 1; i2++) {
         stack.push(i2);
       }
@@ -15935,7 +15938,7 @@ const getRowText = (row, key, column) => {
   if (column.type === "index") {
     return row[TABLE_ROW_ATTRIBUTE.ROW_INDEX] + 1;
   }
-  return row[key];
+  return lodash.exports.get(row, key);
 };
 const formatPropAsArray = (prop, args) => {
   if (Array.isArray(prop)) {
@@ -15967,9 +15970,9 @@ const getRowKey = (item, props, index) => {
   }
   return uuid_1.v4();
 };
-const hasRootScrollY = (root) => {
+const hasRootScrollY = (root, querySelector) => {
   if (root) {
-    const tableBody = root.querySelector(".bk-table-body table");
+    const tableBody = root.querySelector(querySelector);
     if (tableBody) {
       return tableBody.offsetHeight > root.offsetHeight;
     }
@@ -16084,6 +16087,7 @@ var HeadFilter = defineComponent({
 var SortType = /* @__PURE__ */ ((SortType2) => {
   SortType2["ASC"] = "asc";
   SortType2["DESC"] = "desc";
+  SortType2["NULL"] = "null";
   return SortType2;
 })(SortType || {});
 var HeadSort = defineComponent({
@@ -16101,7 +16105,11 @@ var HeadSort = defineComponent({
       e.stopImmediatePropagation();
       e.stopPropagation();
       e.preventDefault();
-      sortType.value = type;
+      if (sortType.value === type) {
+        sortType.value = SortType.NULL;
+      } else {
+        sortType.value = type;
+      }
       if (props.column.sort === "custom") {
         emit("change", null, type);
         return;
@@ -16117,7 +16125,7 @@ var HeadSort = defineComponent({
         return String.prototype.localeCompare.call(val0, val1);
       };
       const sortFn = typeof ((_a = props.column.sort) == null ? void 0 : _a.sortFn) === "function" ? (_b = props.column.sort) == null ? void 0 : _b.sortFn : sortFn0;
-      const execFn = (_a2, _b2) => sortFn(_a2, _b2) * (type === SortType.DESC ? -1 : 1);
+      const execFn = sortType.value === SortType.NULL ? () => true : (_a2, _b2) => sortFn(_a2, _b2) * (type === SortType.DESC ? -1 : 1);
       emit("change", execFn, type);
     };
     return () => createVNode("span", {
@@ -16795,10 +16803,13 @@ var useColumnResize = (colgroups, immediate = true) => {
     const targetTable = e.target.closest("table");
     targetTable.querySelectorAll("th").forEach((th) => th.style.setProperty("user-select", "inherit"));
   };
+  const updateOffsetX = (e) => lodash.exports.throttle(() => {
+    dragOffsetX.value = e.clientX - startX + dragStartOffsetX;
+  }, 60);
   const handleMouseMove = (e) => {
     const bodyStyle = document.body.style;
     bodyStyle.setProperty("cursor", "");
-    dragOffsetX.value = e.clientX - startX + dragStartOffsetX;
+    updateOffsetX(e)();
   };
   const handler = {
     [EVENTS2.MOUSE_DOWN]: (e, column) => {
@@ -16876,7 +16887,7 @@ var useColumnResize = (colgroups, immediate = true) => {
     position: "absolute",
     top: 0,
     bottom: 0,
-    left: `${dragOffsetX.value}px`,
+    left: 0,
     width: "1px",
     "background-color": "#ebeef5"
   }));
@@ -16929,41 +16940,17 @@ const useClass = (props, root, reactiveProp, pageData) => {
     }
     return defaultValue;
   };
-  const getRowsHeight = () => {
-    if (!(pageData == null ? void 0 : pageData.length)) {
-      return 0;
-    }
-    if (typeof props.rowHeight === "function") {
-      return pageData.reduce((out, row, rowIndex) => {
-        const result = Reflect.apply(props.rowHeight, globalThis, ["tbody", row, rowIndex]);
-        let resultHeight = out;
-        if (/^\d+\.?\d*px?$/.test(`${result}`)) {
-          resultHeight += Number(result.replace(/px$/, ""));
-        }
-        return resultHeight;
-      }, 0);
-    }
-    if (/^\d+\.?\d*px?$/.test(`${props.rowHeight}`)) {
-      const rowHeight = props.rowHeight.replace(/px$/, "");
-      return pageData.length * Number(rowHeight);
-    }
-    return 0;
-  };
   const contentStyle = reactive({});
   const resolveContentStyle = () => {
     const resolveHeight = resolvePropHeight(props.height, autoHeight.value);
     const resolveHeadHeight = props.showHead ? resolvePropHeight(props.headHeight, 40) + 2 : 0;
-    const resolveMaxHeight = resolvePropHeight(props.maxHeight, autoHeight.value);
     const resolveMinHeight = resolvePropHeight(props.minHeight, autoHeight.value);
     const resolveFooterHeight = props.pagination && props.data.length ? 40 : 0;
     const contentHeight = resolveHeight - resolveHeadHeight - resolveFooterHeight;
     const height = props.height !== "auto" ? `${contentHeight}px` : false;
-    const maxHeight = resolveMaxHeight - resolveHeadHeight - resolveFooterHeight;
     const minHeight = resolveMinHeight - resolveHeadHeight - resolveFooterHeight;
-    const rowsHeight = getRowsHeight();
     Object.assign(contentStyle, {
       display: (pageData == null ? void 0 : pageData.length) ? "block" : false,
-      "max-height": `${maxHeight > rowsHeight ? maxHeight : rowsHeight}px`,
       "min-height": `${minHeight}px`,
       height
     });
@@ -16980,13 +16967,8 @@ const useClass = (props, root, reactiveProp, pageData) => {
     }
   };
   const updateBorderClass = (root2) => {
-    hasScrollY.value = hasRootScrollY(root2);
-    if (root2) {
-      const tableBody = root2.querySelector(".bk-table-body table");
-      if (tableBody) {
-        hasScrollY.value = tableBody.offsetHeight > root2.offsetHeight;
-      }
-    }
+    const querySelector = props.virtualEnabled ? `.${resolveClassName("virtual-section")}` : `.${resolveClassName("table-body-content")}`;
+    hasScrollY.value = hasRootScrollY(root2, querySelector);
   };
   const getColumnsWidthOffsetWidth = () => {
     let offsetWidth = 0;
@@ -17026,7 +17008,7 @@ const useInit = (props) => {
   watch(() => props.columns, () => {
     updateColGroups();
   }, { immediate: true, deep: true });
-  const { dragOffsetXStyle } = useColumnResize(colgroups, true);
+  const { dragOffsetXStyle, dragOffsetX } = useColumnResize(colgroups, true);
   const { activeColumns } = useActiveColumns(props);
   const reactiveSchema = reactive({
     rowActions: /* @__PURE__ */ new Map(),
@@ -17077,6 +17059,7 @@ const useInit = (props) => {
   return {
     colgroups,
     dragOffsetXStyle,
+    dragOffsetX,
     reactiveSchema,
     indexData,
     fixedWrapperClass,
@@ -17100,6 +17083,7 @@ var Component$b = defineComponent({
     const {
       colgroups,
       dragOffsetXStyle,
+      dragOffsetX,
       reactiveSchema,
       indexData,
       renderFixedColumns,
@@ -17145,6 +17129,7 @@ var Component$b = defineComponent({
       }
     });
     tableRender.on(EVENTS$1.ON_SORT_BY_CLICK, (args) => {
+      var _a, _b;
       const {
         sortFn,
         column,
@@ -17153,7 +17138,8 @@ var Component$b = defineComponent({
       } = args;
       if (typeof sortFn === "function") {
         columnSortFn = sortFn;
-        pageData.sort(columnSortFn);
+        resolvePageData(columnFilterFn, columnSortFn);
+        (_b = (_a = refVirtualRender.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a);
       }
       ctx.emit(EMITEVENTS.COLUMN_SORT, {
         column,
@@ -17161,6 +17147,7 @@ var Component$b = defineComponent({
         type
       });
     }).on(EVENTS$1.ON_FILTER_CLICK, (args) => {
+      var _a, _b;
       const {
         filterFn,
         checked,
@@ -17170,6 +17157,7 @@ var Component$b = defineComponent({
       if (typeof filterFn === "function") {
         columnFilterFn = filterFn;
         resolvePageData(columnFilterFn, columnSortFn);
+        (_b = (_a = refVirtualRender.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a);
       }
       ctx.emit(EMITEVENTS.COLUMN_FILTER, {
         checked,
@@ -17256,9 +17244,12 @@ var Component$b = defineComponent({
       "with-virtual-render": props.virtualEnabled
     };
     const resizeColumnClass = {
-      [resolveClassName("drag-column")]: true,
+      column_drag_line: true,
       "offset-x": true
     };
+    const resizeColumnStyle = computed(() => __spreadProps(__spreadValues({}, dragOffsetXStyle.value), {
+      left: `${dragOffsetX.value - reactiveSchema.scrollTranslateX}px`
+    }));
     const loadingRowClass = {
       "scroll-loading": true,
       _bottom: true
@@ -17293,7 +17284,7 @@ var Component$b = defineComponent({
         "class": fixedWrapperClass
       }, [renderFixedColumns(), createVNode("div", {
         "class": resizeColumnClass,
-        "style": dragOffsetXStyle.value
+        "style": resizeColumnStyle.value
       }, null), createVNode("div", {
         "class": loadingRowClass
       }, [renderScrollLoading()])]),
@@ -18496,7 +18487,7 @@ var TabNav = defineComponent({
       }, null)]);
     });
     const renderSlot = () => {
-      var _a, _b, _c, _d;
+      var _a, _b;
       const list = [];
       if (typeof this.$slots.add === "function") {
         list.push((_b = (_a = this.$slots).add) == null ? void 0 : _b.call(_a, h$1));
@@ -18508,9 +18499,6 @@ var TabNav = defineComponent({
           "height": 26
         }, null)]));
       }
-      if (typeof this.$slots.setting === "function") {
-        list.push((_d = (_c = this.$slots).setting) == null ? void 0 : _d.call(_c, h$1));
-      }
       if (list.length) {
         return createVNode("div", {
           "class": "bk-tab-header-operation"
@@ -18528,7 +18516,9 @@ var TabNav = defineComponent({
       "class": "bk-tab-header"
     }, [createVNode("div", {
       "class": "bk-tab-header-nav"
-    }, [renderNavs()]), renderSlot()]);
+    }, [renderNavs()]), renderSlot(), typeof this.$slots.setting === "function" && createVNode("div", {
+      "class": "bk-tab-header-setting"
+    }, [this.$slots.setting()])]);
   }
 });
 var Tab = defineComponent({
@@ -25140,7 +25130,11 @@ var FormItem = defineComponent({
           return Promise.resolve().then(() => {
             const result = rule.validator(value);
             if (typeof result !== "boolean" && typeof result.then === "function") {
-              return result.then(() => doValidate, () => {
+              return result.then((data2) => {
+                if (data2 === false) {
+                  return Promise.reject(rule.message);
+                }
+              }).then(() => doValidate(), () => {
                 state.isError = true;
                 state.errorMessage = rule.message;
                 return Promise.reject(rule.message);