From 68c818a9673ccfa50b92bfdb1ef705af930fa196 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xlz26296x@163.com>
Date: Thu, 13 Jun 2024 08:57:15 +0800
Subject: [PATCH] releases 4.7.12

---
 package.json                |  4 ++--
 packages/table/src/table.ts | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 7523b54cf..7500c83ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.11",
+  "version": "4.7.12",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.0.9"
+    "vxe-pc-ui": "^4.0.10"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index 4ce920ca5..07ac82510 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -249,7 +249,8 @@ export default defineComponent({
         isFooter: false
       },
       scrollVMLoading: false,
-      _isResize: false
+      _isResize: false,
+      _isLoading: false
     })
 
     const internalData: TableInternalData = {
@@ -2493,8 +2494,10 @@ export default defineComponent({
       internalData.collectColumn = collectColumn
       const tableFullColumn = getColumnList(collectColumn)
       internalData.tableFullColumn = tableFullColumn
+      reactData._isLoading = true
       initColumnSort()
       return restoreCustomStorage().then(() => {
+        reactData._isLoading = false
         cacheColumnMap()
         parseColumns().then(() => {
           if (reactData.scrollXLoad) {
@@ -6751,6 +6754,7 @@ export default defineComponent({
       const validTipOpts = computeValidTipOpts.value
       const loadingOpts = computeLoadingOpts.value
       const isMenu = computeIsMenu.value
+      const currLoading = reactData._isLoading || loading
       return h('div', {
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
@@ -6772,8 +6776,8 @@ export default defineComponent({
           'is--animat': !!props.animat,
           'is--round': props.round,
           'is--stripe': !treeConfig && stripe,
-          'is--loading': loading,
-          'is--empty': !loading && !tableData.length,
+          'is--loading': currLoading,
+          'is--empty': !currLoading && !tableData.length,
           'is--scroll-y': overflowY,
           'is--scroll-x': overflowX,
           'is--virtual-x': scrollXLoad,
@@ -6870,7 +6874,7 @@ export default defineComponent({
          */
         h(resolveComponent('vxe-loading') as VxeLoadingComponent, {
           class: 'vxe-table--loading',
-          modelValue: loading,
+          modelValue: currLoading,
           icon: loadingOpts.icon,
           text: loadingOpts.text
         }, loadingSlot