From a61d313f5a2839ad59ddf728774b784bad35647a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com>
Date: Tue, 1 Oct 2024 19:17:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(BaTable):=E8=A1=A8=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=9A=84=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/table/column/index.vue | 21 ---------------------
 web/src/components/table/index.vue        | 14 +++++++++-----
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 web/src/components/table/column/index.vue

diff --git a/web/src/components/table/column/index.vue b/web/src/components/table/column/index.vue
deleted file mode 100644
index e1d50962..00000000
--- a/web/src/components/table/column/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<script lang="ts">
-import { defineComponent, createVNode, reactive } from 'vue'
-import { ElTableColumn } from 'element-plus'
-import { uuid } from '/@/utils/random'
-export default defineComponent({
-    name: 'Column',
-    props: {
-        attr: {
-            type: Object,
-            required: true,
-        },
-    },
-    setup(props, { slots }) {
-        const attr = reactive(props.attr)
-        attr['column-key'] = attr['column-key'] ? attr['column-key'] : attr.prop || uuid()
-        return () => {
-            return createVNode(ElTableColumn, attr, slots.default)
-        }
-    },
-})
-</script>
diff --git a/web/src/components/table/index.vue b/web/src/components/table/index.vue
index 1f24d98d..12c30753 100644
--- a/web/src/components/table/index.vue
+++ b/web/src/components/table/index.vue
@@ -24,8 +24,12 @@
                     <!-- 渲染为 slot -->
                     <slot v-if="item.render == 'slot'" :name="item.slotName"></slot>
 
-                    <!-- Column 组件内部是 el-table-column -->
-                    <Column v-else :attr="item" :key="key + '-column'">
+                    <el-table-column
+                        v-else
+                        :key="key + '-column'"
+                        v-bind="item"
+                        :column-key="(item['columnKey'] ? item['columnKey'] : `table-column-${item.prop}`) || shortUuid()"
+                    >
                         <!-- baTable 预设的列 render 方案 -->
                         <template v-if="item.render" #default="scope">
                             <FieldRender
@@ -44,7 +48,7 @@
                                 "
                             />
                         </template>
-                    </Column>
+                    </el-table-column>
                 </template>
             </template>
             <slot name="columnAppend"></slot>
@@ -66,12 +70,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref, nextTick, inject, computed } from 'vue'
 import type { ElTable, TableInstance } from 'element-plus'
-import Column from '/@/components/table/column/index.vue'
+import { computed, inject, nextTick, ref } from 'vue'
 import FieldRender from '/@/components/table/fieldRender/index.vue'
 import { useConfig } from '/@/stores/config'
 import type baTableClass from '/@/utils/baTable'
+import { shortUuid } from '/@/utils/random'
 
 const config = useConfig()
 const tableRef = ref<TableInstance>()