From b93a8c6a6fe812d6b1f6b3e71f6ccf95ad1daad4 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 25 四月 2025 20:49:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

---
 src/components/HxlhTable/index.vue |    5 +++--
 package.json                       |    8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index b3d39e0..c43b476 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,9 @@
     "vue-router": "4.4.0",
     "vuedraggable": "4.1.0",
     "vxe-pc-ui": "4.5.15",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "vxe-table": "^4.13.8",
+    "xe-utils": "^3.7.4"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "5.0.5",
@@ -46,8 +48,6 @@
     "unplugin-vue-setup-extend-plus": "1.0.1",
     "vite": "5.3.2",
     "vite-plugin-compression": "0.5.1",
-    "vite-plugin-svg-icons": "2.0.1",
-    "vxe-table": "^4.13.8",
-    "xe-utils": "^3.7.4"
+    "vite-plugin-svg-icons": "2.0.1"
   }
 }
diff --git a/src/components/HxlhTable/index.vue b/src/components/HxlhTable/index.vue
index dfe0172..6ecc5ea 100644
--- a/src/components/HxlhTable/index.vue
+++ b/src/components/HxlhTable/index.vue
@@ -16,7 +16,8 @@
       :pager-config="tablePage"
       :form-config="tableForm"
       :columns="columns"
-      :column-config="{ resizable: true }"
+      :column-config="{ resizable: true, useKey: true }"
+      :row-config="{ useKey: true }"
       :data.sync="data"
       :checkbox-config="checkboxConfig"
       :height="height"
@@ -168,7 +169,7 @@
   treeConfig: {
     type: Object,
     default: () => {
-      return {};
+      return null;
     },
   },
   rowStyle: {

--
Gitblit v1.9.3