From aa95887a963a36e807252fc138e4cb86ae0c3bf7 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xlz26296x@163.com>
Date: Thu, 31 Oct 2024 13:36:06 +0800
Subject: [PATCH] releases 4.8.0

---
 examples/views/table/TableTest9.vue | 205 ++++++++--------------------
 package.json                        |   2 +-
 packages/table/src/table.ts         |   2 +-
 3 files changed, 57 insertions(+), 152 deletions(-)

diff --git a/examples/views/table/TableTest9.vue b/examples/views/table/TableTest9.vue
index 9c42e7bc9b..09ba100d4c 100644
--- a/examples/views/table/TableTest9.vue
+++ b/examples/views/table/TableTest9.vue
@@ -2,133 +2,21 @@
   <div>
     <vxe-button @click="loadData(5000)">加载5k条</vxe-button>
     <vxe-button @click="loadData(10000)">加载1w条</vxe-button>
-    <vxe-table
-      border
-      show-overflow
-      show-footer
-      height="800"
-      :loading="loading"
-      :column-config="{resizable: true}"
-      :scroll-x="{enabled: true, gt: 0}"
-      :scroll-y="{enabled: true, gt: 0}"
-      :data="tableData"
-      :footer-data="footerData">
-      <vxe-column type="checkbox" width="60" fixed="left"></vxe-column>
-      <vxe-column field="col0" title="列0" width="100" fixed="left"></vxe-column>
-      <vxe-column field="imgUrl" title="列1" width="80" fixed="left" :cell-render="imgUrlCellRender"></vxe-column>
-      <vxe-column field="col2" title="列2" width="90"></vxe-column>
-      <vxe-column field="col3" title="列3" width="200"></vxe-column>
-      <vxe-column field="col4" title="列4" width="140"></vxe-column>
-      <vxe-column field="col5" title="列5" width="300"></vxe-column>
-      <vxe-column field="col6" title="列6" width="160"></vxe-column>
-      <vxe-column field="col7" title="列7" width="120"></vxe-column>
-      <vxe-column field="col8" title="列8" width="400"></vxe-column>
-      <vxe-column field="col9" title="列9" width="160"></vxe-column>
-      <vxe-column field="col10" title="列10" width="160"></vxe-column>
-      <vxe-column field="col11" title="列11" width="180"></vxe-column>
-      <vxe-column field="col12" title="列12" width="160"></vxe-column>
-      <vxe-column field="col13" title="列13" width="80"></vxe-column>
-      <vxe-column field="col14" title="列14" width="120"></vxe-column>
-      <vxe-column field="col15" title="列15" width="360"></vxe-column>
-      <vxe-column field="col16" title="列16" width="150"></vxe-column>
-      <vxe-column field="col17" title="列17" width="380"></vxe-column>
-      <vxe-column field="col18" title="列18" width="100"></vxe-column>
-      <vxe-column field="col19" title="列19" width="290"></vxe-column>
-      <vxe-column field="col20" title="列20" width="80"></vxe-column>
-      <vxe-column field="col21" title="列21" width="100"></vxe-column>
-      <vxe-column field="col22" title="列22" width="120"></vxe-column>
-      <vxe-column field="col23" title="列23" width="270"></vxe-column>
-      <vxe-column field="col24" title="列24" width="330"></vxe-column>
-      <vxe-column field="col25" title="列25" width="460"></vxe-column>
-      <vxe-column field="col26" title="列26" width="280"></vxe-column>
-      <vxe-column field="col27" title="列27" width="220"></vxe-column>
-      <vxe-column field="col28" title="列28" width="120"></vxe-column>
-      <vxe-column field="col29" title="列29" width="180"></vxe-column>
-      <vxe-column field="col30" title="列30" width="500"></vxe-column>
-      <vxe-column field="col31" title="列31" width="600"></vxe-column>
-      <vxe-column field="col32" title="列32" width="100"></vxe-column>
-      <vxe-column field="col33" title="列33" width="490"></vxe-column>
-      <vxe-column field="col34" title="列34" width="100"></vxe-column>
-      <vxe-column field="col35" title="列35" width="150"></vxe-column>
-      <vxe-column field="col36" title="列36" width="800"></vxe-column>
-      <vxe-column field="col37" title="列37" width="400"></vxe-column>
-      <vxe-column field="col38" title="列38" width="800"></vxe-column>
-      <vxe-column field="col39" title="列39" width="360"></vxe-column>
-      <vxe-column field="col40" title="列40" width="420"></vxe-column>
-      <vxe-column field="col41" title="列41" width="100"></vxe-column>
-      <vxe-column field="col42" title="列42" width="120"></vxe-column>
-      <vxe-column field="col43" title="列43" width="280"></vxe-column>
-      <vxe-column field="col44" title="列44" width="170"></vxe-column>
-      <vxe-column field="col45" title="列45" width="370"></vxe-column>
-      <vxe-column field="col46" title="列46" width="120"></vxe-column>
-      <vxe-column field="col47" title="列47" width="170"></vxe-column>
-      <vxe-column field="col48" title="列48" width="400"></vxe-column>
-      <vxe-column field="col49" title="列49" width="220"></vxe-column>
-      <vxe-column field="col50" title="列50" width="170"></vxe-column>
-      <vxe-column field="col51" title="列51" width="160"></vxe-column>
-      <vxe-column field="col52" title="列52" width="100"></vxe-column>
-      <vxe-column field="col53" title="列53" width="280"></vxe-column>
-      <vxe-column field="col54" title="列54" width="170"></vxe-column>
-      <vxe-column field="col55" title="列55" width="370"></vxe-column>
-      <vxe-column field="col56" title="列56" width="120"></vxe-column>
-      <vxe-column field="col57" title="列57" width="170"></vxe-column>
-      <vxe-column field="col58" title="列58" width="400"></vxe-column>
-      <vxe-column field="col59" title="列59" width="220"></vxe-column>
-      <vxe-column field="col60" title="列60" width="500"></vxe-column>
-      <vxe-column field="col61" title="列61" width="600"></vxe-column>
-      <vxe-column field="col62" title="列62" width="100"></vxe-column>
-      <vxe-column field="col63" title="列63" width="490"></vxe-column>
-      <vxe-column field="col64" title="列64" width="100"></vxe-column>
-      <vxe-column field="col65" title="列65" width="150"></vxe-column>
-      <vxe-column field="col66" title="列66" width="800"></vxe-column>
-      <vxe-column field="col67" title="列67" width="400"></vxe-column>
-      <vxe-column field="col68" title="列68" width="800"></vxe-column>
-      <vxe-column field="col69" title="列69" width="360"></vxe-column>
-      <vxe-column field="col70" title="列70" width="500"></vxe-column>
-      <vxe-column field="col71" title="列71" width="600"></vxe-column>
-      <vxe-column field="col72" title="列72" width="100"></vxe-column>
-      <vxe-column field="col73" title="列73" width="490"></vxe-column>
-      <vxe-column field="col74" title="列74" width="100"></vxe-column>
-      <vxe-column field="col75" title="列75" width="150"></vxe-column>
-      <vxe-column field="col76" title="列76" width="800"></vxe-column>
-      <vxe-column field="col77" title="列77" width="400"></vxe-column>
-      <vxe-column field="col78" title="列78" width="800"></vxe-column>
-      <vxe-column field="col79" title="列79" width="360"></vxe-column>
-      <vxe-column field="col80" title="列80" width="500"></vxe-column>
-      <vxe-column field="col81" title="列81" width="600"></vxe-column>
-      <vxe-column field="col82" title="列82" width="100"></vxe-column>
-      <vxe-column field="col83" title="列83" width="490"></vxe-column>
-      <vxe-column field="col84" title="列84" width="100"></vxe-column>
-      <vxe-column field="col85" title="列85" width="150"></vxe-column>
-      <vxe-column field="col86" title="列86" width="800"></vxe-column>
-      <vxe-column field="imgList1" title="列88" width="120" fixed="right" :cell-render="imgList1CellRender"></vxe-column>
-      <vxe-column field="flag1" title="列89" width="100" fixed="right" :cell-render="flag1CellRender"></vxe-column>
-      <vxe-column field="action" title="操作" width="120" fixed="right">
-        <template #default>
-          <vxe-button mode="text" status="primary">编辑</vxe-button>
-          <vxe-button mode="text" status="error">删除</vxe-button>
-        </template>
-      </vxe-column>
-    </vxe-table>
+    <vxe-button @click="loadData(50000)">加载5w条</vxe-button>
+    <vxe-grid v-bind="gridOptions"></vxe-grid>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, nextTick } from 'vue'
-import { VxeColumnPropTypes } from '../../../types'
+import { reactive, nextTick } from 'vue'
+import { VxeUI } from '../../../packages'
+import { VxeGridProps, VxeColumnPropTypes } from '../../../types'
 
 interface RowVO {
   id: number
   [key: string]: string | number | boolean | any[]
 }
 
-const tableData = ref<RowVO[]>([])
-const loading = ref(false)
-
-const flag1CellRender = reactive<VxeColumnPropTypes.CellRender>({
-  name: 'VxeSwitch'
-})
-
 const imgUrlCellRender = reactive<VxeColumnPropTypes.CellRender>({
   name: 'VxeImage',
   props: {
@@ -137,55 +25,72 @@ const imgUrlCellRender = reactive<VxeColumnPropTypes.CellRender>({
   }
 })
 
-const imgList1CellRender = reactive<VxeColumnPropTypes.CellRender>({
-  name: 'VxeUpload',
-  props: {
-    mode: 'image',
-    readonly: true,
-    moreConfig: {
-      maxCount: 2
-    },
-    imageStyle: {
-      width: 40,
-      height: 40
-    }
-  }
+const gridOptions = reactive<VxeGridProps<RowVO>>({
+  border: true,
+  loading: false,
+  height: 800,
+  columnConfig: {
+    resizable: true
+  },
+  scrollX: {
+    enabled: true,
+    gt: 0
+  },
+  scrollY: {
+    enabled: true,
+    gt: 0
+  },
+  columns: [
+    { type: 'checkbox', width: 60 },
+    { title: '列0', field: 'col0', width: 100 },
+    { title: '列1', field: 'imgUrl', width: 80, cellRender: imgUrlCellRender },
+    { title: '列2', field: 'col2', width: 90 },
+    { title: '列3', field: 'col3', width: 200 },
+    { title: '列4', field: 'col4', width: 140 },
+    { title: '列5', field: 'col5', width: 300 },
+    { title: '列6', field: 'col6', width: 160 },
+    { title: '列7', field: 'col7', width: 120 },
+    { title: '列8', field: 'col8' }
+  ],
+  data: []
 })
 
-const footerData = ref([
-  { col0: '-', col2: '2', col3: '3', col85: '85', col86: '86' }
-])
-
 // 模拟行数据
 const loadData = (rowSize: number) => {
-  loading.value = true
+  gridOptions.loading = true
   setTimeout(() => {
     const dataList: RowVO[] = []
     for (let i = 0; i < rowSize; i++) {
       const item: RowVO = {
         id: 10000 + i,
-        imgUrl: i % 3 === 0 ? 'https://vxeui.com/resource/img/546.gif' : 'https://vxeui.com/resource/img/673.gif',
-        imgList1: i % 4 === 0
-          ? [
-              { name: 'fj577.jpg', url: 'https://vxeui.com/resource/img/fj577.jpg' }
-            ]
-          : [
-              { name: 'fj573.jpeg', url: 'https://vxeui.com/resource/img/fj573.jpeg' },
-              { name: 'fj562.png', url: 'https://vxeui.com/resource/img/fj562.png' }
-            ],
-        flag1: i % 5 === 0
+        imgUrl: i % 3 === 0 ? 'https://vxeui.com/resource/img/546.gif' : 'https://vxeui.com/resource/img/673.gif'
       }
-      for (let j = 0; j < 120; j++) {
-        item[`col${j}`] = `值_${i}_${j}` + (i % 2 ? 'sdf sdf' : (i % 3 ? 'sddfgfdgfdgfdggfdgf sddfgfdgfdgfdggfdgf sdfgfdgfddf dsdfgfdggf sdfds dsf ' : 'ssdfdsdf sddffdf sdf sfsdfsd'))
+      for (let j = 0; j < 10; j++) {
+        if (i % 8 === 0) {
+          item[`col${j}`] = `值_${i}_${j} 内容8内容8内容8内容8`
+        } else if (i % 7 === 0) {
+          item[`col${j}`] = `值_${i}_${j} 内容7内容7`
+        } else if (i % 6 === 0) {
+          item[`col${j}`] = `值_${i}_${j} 内容6内容6内容6内容6内容6内容6内容6内容6`
+        } else if (i % 5 === 0) {
+          item[`col${j}`] = `值_${i}_${j} 内容5内容5内容5内容5内容5`
+        } else if (i % 4 === 0) {
+          item[`col${j}`] = `值_${i}_${j} 内容4内容4内容4内容4内容4内容4内容4内容4内容4内容4内容4内容4`
+        } else {
+          item[`col${j}`] = `值_${i}_${j}`
+        }
       }
       dataList.push(item)
     }
 
     const startTime = Date.now()
-    tableData.value = dataList
-    loading.value = false
+    gridOptions.data = dataList
+    gridOptions.loading = false
     nextTick(() => {
-      console.log(`加载时间 ${Date.now() - startTime} 毫秒`)
+      VxeUI.modal.message({
+        content: `加载时间 ${Date.now() - startTime} 毫秒`,
+        status: 'success'
+      })
     })
   }, 350)
 }
diff --git a/package.json b/package.json
index 581e3c1308..a34d46a075 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.8.0-beta.0",
+  "version": "4.8.0-beta.1",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index 35f2018dc2..a0b8c552a7 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -2371,7 +2371,7 @@ export default defineComponent({
         const sXOpts = computeSXOpts.value
         // 计算 X 逻辑
         if (scrollXLoad) {
-          const { visibleSize: visibleXSize } = handleVirtualYVisible()
+          const { visibleSize: visibleXSize } = handleVirtualXVisible()
           const offsetXSize = sXOpts.oSize ? XEUtils.toNumber(sXOpts.oSize) : (browse.edge ? 5 : 0)
           scrollXStore.offsetSize = offsetXSize
           scrollXStore.visibleSize = visibleXSize