@juzhenfe/page-model 3.18.1 → 3.18.3

package/dist/components/table/type.d.ts

@@ -186,6 +186,12 @@ declare global {
        * 显示索引列
        */
       showIndex?: boolean
+
+      /**
+       * 辅助横向滚动
+       */
+      assistScrollX?: boolean
+      
       /**
        * 显示多选条数提示
        */

package/dist/components/table/utils/use-column-drag.d.ts

@@ -3,5 +3,6 @@ export declare const useColumnDrag: () => {
         element: HTMLDivElement;
         cb: (oldIndex: number, newIndex: number) => void;
     }) => void;
+    clearSelectStart: () => void;
     destroyTableDrag(): void;
 };

package/dist/index.es.js

@@ -8959,14 +8959,36 @@ const useSelectionsTable = () => {
   };
 };
 function useListenScroll(tableManager) {
+  let scrollBarWrapEle;
   const handleScroll = throttle(function handleScroll2(e) {
     tableManager.updateScrollTop(e.target.scrollTop);
     tableManager.updateScrollLeft(e.target.scrollLeft);
-  }, 120);
-  let scrollBarWrapEle;
+  }, 10);
+  const getScrollable = () => {
+    const wrapRect = scrollBarWrapEle.getBoundingClientRect();
+    const contentRect = scrollBarWrapEle.querySelector(".el-scrollbar__view").getBoundingClientRect();
+    return {
+      scrollY: wrapRect.height < contentRect.height,
+      scrollX: wrapRect.width < contentRect.width
+    };
+  };
+  const setScrollX = (scrollLeft) => {
+    tableManager.tableRef.setScrollLeft(scrollLeft);
+  };
+  const handleWheel = (e) => {
+    const { scrollX, scrollY } = getScrollable();
+    if (!scrollY && scrollX) {
+      const wheelDelta = e.wheelDelta;
+      const currentScrollLeft = scrollBarWrapEle.scrollLeft;
+      setScrollX(currentScrollLeft + Number(wheelDelta * -1));
+    }
+  };
   function onMounted2() {
     scrollBarWrapEle = tableManager.tableRef.$el.querySelector(".el-scrollbar__wrap");
     scrollBarWrapEle.addEventListener("scroll", handleScroll);
+    if (tableManager.table.assistScrollX) {
+      scrollBarWrapEle.addEventListener("mousewheel", handleWheel);
+    }
   }
   function onActivated2() {
     tableManager.tableRef.scrollBarRef.setScrollTop(tableManager.scrollTop);
@@ -8974,6 +8996,9 @@ function useListenScroll(tableManager) {
   }
   function onUnmounted2() {
     scrollBarWrapEle.removeEventListener("scroll", handleScroll);
+    if (tableManager.table.assistScrollX) {
+      scrollBarWrapEle.removeEventListener("mousewheel", handleWheel);
+    }
     scrollBarWrapEle = null;
   }
   return {
@@ -9252,8 +9277,12 @@ const useColumnDrag = () => {
       }
     });
   };
+  const clearSelectStart = () => {
+    document.removeEventListener("selectstart", sortable);
+  };
   return {
     initTableDrag,
+    clearSelectStart,
     destroyTableDrag() {
       sortable && sortable.destroy();
       sortable = null;
@@ -9603,7 +9632,7 @@ const _sfc_main$n = defineComponent({
       tableManager.updateColumnToolsVisible(false);
     };
     const scrollLifecycle = useListenScroll(tableManager);
-    const { initTableDrag, destroyTableDrag } = useColumnDrag();
+    const { initTableDrag, destroyTableDrag, clearSelectStart } = useColumnDrag();
     onMounted(() => {
       tableManager.updateTableRef(tableRef.value);
       scrollLifecycle.onMounted();
@@ -9631,6 +9660,7 @@ const _sfc_main$n = defineComponent({
       }, 2e3);
     });
     const handleTableHeaderDragEnd = (newWidth, oldWidth, column, event) => {
+      clearSelectStart();
       if (newWidth === oldWidth) {
         return false;
       }
@@ -14898,7 +14928,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.18.0";
+const version = "3.18.3";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [