vue-devui 1.6.11 → 1.6.12

package/data-grid/index.es.js

@@ -8834,6 +8834,9 @@ const dataGridProps = {
     type: Boolean,
     default: false
   },
+  columnVirtualScroll: {
+    type: Boolean
+  },
   reserveCheck: {
     type: Boolean,
     default: false
@@ -9990,6 +9993,7 @@ var GridTh = defineComponent({
       allChecked,
       halfAllChecked,
       virtualScroll,
+      columnVirtualScroll,
       resizable,
       addGridThContextToMap,
       toggleAllRowChecked
@@ -10011,7 +10015,7 @@ var GridTh = defineComponent({
       onFilterChange
     } = useGridThFilter(columnConfig);
     const classes = computed(() => {
-      var _a;
+      var _a, _b;
       return {
         [ns2.e("th")]: true,
         [ns2.m(columnConfig.value.align)]: true,
@@ -10019,7 +10023,7 @@ var GridTh = defineComponent({
         [ns2.em("th", size.value)]: true,
         [ns2.em("th", "filter-active")]: filterActive.value,
         [ns2.em("th", "sort-active")]: Boolean(direction.value),
-        [ns2.em("th", "operable")]: columnConfig.value.filterable || columnConfig.value.sortable || !virtualScroll.value && ((_a = columnConfig.value.resizable) != null ? _a : resizable.value)
+        [ns2.em("th", "operable")]: columnConfig.value.filterable || columnConfig.value.sortable || !((_a = columnVirtualScroll.value) != null ? _a : virtualScroll.value) && ((_b = columnConfig.value.resizable) != null ? _b : resizable.value)
       };
     });
     const {
@@ -10046,7 +10050,7 @@ var GridTh = defineComponent({
       }, [columnConfig.value.header])
     };
     return () => {
-      var _a;
+      var _a, _b;
       return createVNode("div", {
         "ref": thRef,
         "class": classes.value,
@@ -10070,7 +10074,7 @@ var GridTh = defineComponent({
         "filterMenu": columnConfig.value.filterMenu,
         "setFilterStatus": setFilterStatus,
         "onFilterChange": onFilterChange
-      }, null), !virtualScroll.value && ((_a = columnConfig.value.resizable) != null ? _a : resizable.value) && createVNode("span", {
+      }, null), !((_a = columnVirtualScroll.value) != null ? _a : virtualScroll.value) && ((_b = columnConfig.value.resizable) != null ? _b : resizable.value) && createVNode("span", {
         "class": "resize-handle"
       }, null)]);
     };
@@ -11148,7 +11152,7 @@ function useDataGridColumnDrag(bodyContentWidth, scrollRef, renderFixedLeftColum
   return { afterColumnDragend };
 }
 function useDataGrid(props, ctx) {
-  const { data, columns, size, virtualScroll } = toRefs(props);
+  const { data, columns, size, virtualScroll, columnVirtualScroll } = toRefs(props);
   const scrollRef = ref();
   const headBoxRef = ref();
   const bodyContentWidth = ref(0);
@@ -11220,7 +11224,7 @@ function useDataGrid(props, ctx) {
     calcVirtualRowData(scrollYParams);
   };
   const initOriginColumnData = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let bodyTotalWidth = 0;
     let columnId = 0;
     const scrollViewWidth = ((_a = scrollRef.value) == null ? void 0 : _a.clientWidth) || 0;
@@ -11253,9 +11257,9 @@ function useDataGrid(props, ctx) {
       }
       bodyTotalWidth += itemColumn.width;
     }
-    if (!virtualScroll.value) {
+    if (!((_b = columnVirtualScroll.value) != null ? _b : virtualScroll.value)) {
       renderColumnData.value = scrollXParams.originColumnData;
-      translateX.value = (_c = (_b = renderColumnData.value[0]) == null ? void 0 : _b.offsetLeft) != null ? _c : 0;
+      translateX.value = (_d = (_c = renderColumnData.value[0]) == null ? void 0 : _c.offsetLeft) != null ? _d : 0;
     }
     bodyContentWidth.value = bodyTotalWidth;
   };
@@ -11302,8 +11306,9 @@ function useDataGrid(props, ctx) {
     }
     let distance = 0;
     nextTick(() => {
+      var _a;
       initOriginColumnData();
-      if (virtualScroll.value && scrollRef.value) {
+      if (((_a = columnVirtualScroll.value) != null ? _a : virtualScroll.value) && scrollRef.value) {
         distance = scrollRef.value.scrollLeft;
         initVirtualColumnData(distance, scrollRef.value.clientWidth);
       }
@@ -11315,11 +11320,13 @@ function useDataGrid(props, ctx) {
     }
   }, { immediate: true });
   watch(virtualColumnData, (val) => {
-    if (virtualScroll.value) {
+    var _a;
+    if ((_a = columnVirtualScroll.value) != null ? _a : virtualScroll.value) {
       renderColumnData.value = val;
     }
   }, { immediate: true });
   const onScroll = (e) => {
+    var _a;
     if (tick) {
       return;
     }
@@ -11336,7 +11343,7 @@ function useDataGrid(props, ctx) {
         return;
       }
       scrollXParams.distance = scrollLeft;
-      virtualScroll.value && calcVirtualColumnData(scrollXParams);
+      ((_a = columnVirtualScroll.value) != null ? _a : virtualScroll.value) && calcVirtualColumnData(scrollXParams);
     } else if (scrollTop !== scrollYParams.distance) {
       if (scrollYParams.originRowData.length === 0) {
         return;
@@ -11350,11 +11357,12 @@ function useDataGrid(props, ctx) {
     (_a = scrollRef.value) == null ? void 0 : _a.addEventListener("scroll", onScroll);
     if (typeof window !== "undefined" && scrollRef.value) {
       resizeObserver = new ResizeObserver(() => {
+        var _a2;
         if (scrollRef.value && sliceColumns.value.length) {
           let distance = 0;
           initOriginColumnData();
           distance = scrollRef.value.scrollLeft;
-          virtualScroll.value && initVirtualColumnData(distance, scrollRef.value.clientWidth);
+          ((_a2 = columnVirtualScroll.value) != null ? _a2 : virtualScroll.value) && initVirtualColumnData(distance, scrollRef.value.clientWidth);
         }
       });
       resizeObserver.observe(scrollRef.value);
@@ -11453,6 +11461,7 @@ var DataGrid = defineComponent({
       size,
       indent,
       virtualScroll,
+      columnVirtualScroll,
       resizable
     } = toRefs(props);
     const rootRef = ref();
@@ -11495,6 +11504,7 @@ var DataGrid = defineComponent({
       lazy,
       indent,
       virtualScroll,
+      columnVirtualScroll,
       resizable,
       bodyContentWidth,
       bodyContentHeight,