From a05c04f23c64d5562a78f5599d2d9a9d9535489a Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Mon, 4 Nov 2024 18:25:34 +0800
Subject: [PATCH] vxetable

---
 src/components/HColSet/index.vue        |  7 ++++++-
 src/components/Table/src/BasicTable.vue | 16 +++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/HColSet/index.vue b/src/components/HColSet/index.vue
index 4ce6a55c..4bd9bc14 100644
--- a/src/components/HColSet/index.vue
+++ b/src/components/HColSet/index.vue
@@ -66,8 +66,13 @@
     },
     // 表格唯一编码
     code: {
-      type: String,
+      type: [String, Number],
       default: null
+    },
+    // 表格类型(正常的vxe表格、handsontable)
+    type: {
+      type: String,
+      defalult: 'excel'
     }
   })
   const emits = defineEmits(['updateCol'])
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 20a0e88a..93c42e3d 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -14,10 +14,13 @@
           <span class="iconfont icon-refresh-1-copy"></span>
           刷新
         </a-button>
-        <a-button type="link" @click="initColSet">
-          <span class="iconfont icon-shuliebiao"></span>
-          列设置
-        </a-button>
+        <!-- 列设置 -->
+        <HColSet
+          :ref="`dsTb${getBindValues.id}`"
+          :code="getBindValues.id"
+          :columns="getBindValues.columns"
+          type="normal"
+        />
       </div>
     </div>
     <div class="table-wrapper" >
@@ -88,7 +91,6 @@
       <slot name="right" class="right" ></slot>
     </div>
     <Pagination v-if="getBindValues.tableComponent === 'vxe'" v-bind="getBindValues.pagination" @change="pageChange" />
-    <DsTableSet />
   </div>
 </template>
 <script lang="ts">
@@ -98,7 +100,7 @@ import { Table, Pagination } from 'ant-design-vue'
 import { BasicForm, useForm } from '/@/components/Form/index'
 import { PageWrapperFixedHeightKey } from '/@/components/Page'
 import HeaderCell from './components/HeaderCell.vue'
-import DsTableSet from './components/settings/DsTableSet.vue'
+import HColSet from '/@/components/HColSet/index.vue'
 import { InnerHandlers } from './types/table'
 
 import { usePagination } from './hooks/usePagination'
@@ -129,7 +131,7 @@ export default defineComponent({
     BasicForm,
     HeaderCell,
     Pagination,
-    DsTableSet
+    HColSet
   },
   props: basicProps,
   emits: [