From 57dbd93e05de2777f9371beb480247f97b98e75f Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 19 Mar 2023 17:05:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(ant-design-v):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=BC=83=E7=94=A8=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            |  3 +-
 pnpm-lock.yaml                          | 20 +++++++------
 src/components/Table/src/BasicTable.vue | 40 +++++++++++--------------
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 17a2646..ac18c1c 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "@types/sortablejs": "^1.10.7",
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
-    "@vitejs/plugin-legacy": "^2.0.0",
+    "@vitejs/plugin-legacy": "^1.8.1",
     "@vitejs/plugin-vue": "^2.3.3",
     "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/compiler-sfc": "^3.2.33",
@@ -94,6 +94,7 @@
     "less": "^4.1.2",
     "postcss": "^8.4.12",
     "rimraf": "^3.0.2",
+    "rollup": "^2.70.2",
     "rollup-plugin-visualizer": "^5.6.0",
     "typescript": "^4.6.3",
     "vite": "^2.9.15",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5be16b..bd7980b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,7 +21,7 @@ specifiers:
   '@types/sortablejs': ^1.10.7
   '@typescript-eslint/eslint-plugin': ^5.20.0
   '@typescript-eslint/parser': ^5.20.0
-  '@vitejs/plugin-legacy': ^2.0.0
+  '@vitejs/plugin-legacy': ^1.8.1
   '@vitejs/plugin-vue': ^2.3.3
   '@vitejs/plugin-vue-jsx': ^1.3.10
   '@vue/compiler-sfc': ^3.2.33
@@ -61,6 +61,7 @@ specifiers:
   qs: ^6.10.3
   resize-observer-polyfill: ^1.5.1
   rimraf: ^3.0.2
+  rollup: 2.72.0
   rollup-plugin-visualizer: ^5.6.0
   sortablejs: ^1.15.0
   tinymce: ^5.10.3
@@ -143,7 +144,7 @@ devDependencies:
   '@types/sortablejs': 1.15.1
   '@typescript-eslint/eslint-plugin': 5.55.0_342y7v4tc7ytrrysmit6jo4wri
   '@typescript-eslint/parser': 5.55.0_vgl77cfdswitgr47lm5swmv43m
-  '@vitejs/plugin-legacy': 2.3.1_vite@2.9.15
+  '@vitejs/plugin-legacy': 1.8.2_vite@2.9.15
   '@vitejs/plugin-vue': 2.3.4_vite@2.9.15+vue@3.2.47
   '@vitejs/plugin-vue-jsx': 1.3.10
   '@vue/compiler-sfc': 3.2.47
@@ -161,7 +162,8 @@ devDependencies:
   picocolors: 1.0.0
   postcss: 8.4.21
   rimraf: 3.0.2
-  rollup-plugin-visualizer: 5.9.0
+  rollup: 2.72.0
+  rollup-plugin-visualizer: 5.9.0_rollup@2.72.0
   typescript: 4.9.5
   vite: 2.9.15_less@4.1.3
   vite-plugin-compression: 0.5.1_vite@2.9.15
@@ -2246,12 +2248,11 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-legacy/2.3.1_vite@2.9.15:
-    resolution: {integrity: sha512-J5KaGBlSt2tEYPVjM/C8dA6DkRzkFkbPe+Xb4IX5G+XOV5OGbVAfkMjKywdrkO3gGynO8S98i71Lmsff4cWkCQ==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  /@vitejs/plugin-legacy/1.8.2_vite@2.9.15:
+    resolution: {integrity: sha512-NCOKU+pU+cxLMR9P9RTolEuOK+h+zYBXlknj+zGcKSj/NXBZYgA1GAH1FnO4zijoWRiTaiOm2ha9LQrELE7XHg==}
+    engines: {node: '>=12.0.0'}
     peerDependencies:
-      terser: ^5.4.0
-      vite: ^3.0.0
+      vite: ^2.8.0
     dependencies:
       '@babel/standalone': 7.21.3
       core-js: 3.29.1
@@ -7853,7 +7854,7 @@ packages:
       terser: 5.16.6
     dev: true
 
-  /rollup-plugin-visualizer/5.9.0:
+  /rollup-plugin-visualizer/5.9.0_rollup@2.72.0:
     resolution: {integrity: sha512-bbDOv47+Bw4C/cgs0czZqfm8L82xOZssk4ayZjG40y9zbXclNk7YikrZTDao6p7+HDiGxrN0b65SgZiVm9k1Cg==}
     engines: {node: '>=14'}
     hasBin: true
@@ -7865,6 +7866,7 @@ packages:
     dependencies:
       open: 8.4.2
       picomatch: 2.3.1
+      rollup: 2.72.0
       source-map: 0.7.4
       yargs: 17.7.1
     dev: true
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index c728f24..9aea4d9 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -15,28 +15,24 @@
       </template>
     </BasicForm>
 
-    <!-- antd v3 升级兼容，阻止数据的收集，防止控制台报错 -->
-    <!-- https://antdv.com/docs/vue/migration-v3-cn -->
-    <a-form-item-rest>
-      <Table
-        v-show="getEmptyDataIsShowTable"
-        ref="tableElRef"
-        v-bind="getBindValues"
-        :rowClassName="getRowClassName"
-        @change="handleTableChange"
-      >
-        <template v-for="item in Object.keys($slots)" #[item]="data" :key="item">
-          <slot :name="item" v-bind="data || {}"/>
-        </template>
-        <template #headerCell="{ column }">
-          <HeaderCell :column="column"/>
-        </template>
-        <!-- 增加对antdv3.x兼容 -->
-        <template #bodyCell="data">
-          <slot name="bodyCell" v-bind="data || {}"/>
-        </template>
-      </Table>
-    </a-form-item-rest>
+    <Table
+      v-show="getEmptyDataIsShowTable"
+      ref="tableElRef"
+      v-bind="getBindValues"
+      :rowClassName="getRowClassName"
+      @change="handleTableChange"
+    >
+      <template v-for="item in Object.keys($slots)" #[item]="data" :key="item">
+        <slot :name="item" v-bind="data || {}"/>
+      </template>
+      <template #headerCell="{ column }">
+        <HeaderCell :column="column"/>
+      </template>
+      <!-- 增加对antdv3.x兼容 -->
+      <template #bodyCell="data">
+        <slot name="bodyCell" v-bind="data || {}"/>
+      </template>
+    </Table>
   </div>
 </template>
 <script lang="ts">