From 38d0e5602b7e1ebbfd17edb5c71569794d625bc0 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 30 Oct 2023 15:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=A5=E9=87=8Dbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91online=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96tab=E4=B8=8D=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20issues/815=E3=80=81issues/813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/JVxeTable/src/hooks/useToolbar.ts   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/jeecg/JVxeTable/src/hooks/useToolbar.ts b/src/components/jeecg/JVxeTable/src/hooks/useToolbar.ts
index 05b51c1..01fa36d 100644
--- a/src/components/jeecg/JVxeTable/src/hooks/useToolbar.ts
+++ b/src/components/jeecg/JVxeTable/src/hooks/useToolbar.ts
@@ -20,12 +20,20 @@ export function useToolbar(props: JVxeTableProps, data: JVxeDataProps, methods:
           // 保存事件
           onSave: () => methods.trigger('save'),
           onRemove() {
-            let $table = methods.getXTable();
-            let deleteRows = methods.filterNewRows(data.selectedRows.value);
+            const $table = methods.getXTable();
+            // update-begin--author:liaozhiyang---date:20231018---for：【QQYUN-6805】修复asyncRemove字段不生效
             // 触发删除事件
-            if (deleteRows.length > 0) {
-              let removeEvent: any = { deleteRows, $table};
-              if (props.asyncRemove) {
+            if (data.selectedRows.value.length > 0) {
+              const deleteOldRows = methods.filterNewRows(data.selectedRows.value);
+              const removeEvent: any = { deleteRows: data.selectedRows.value, $table };
+              const insertRecords = $table.getInsertRecords();
+              if (props.asyncRemove && deleteOldRows.length) {
+                data.selectedRows.value.forEach((item) => {
+                  // 删除新添加的数据id
+                  if (insertRecords.includes(item)) {
+                    delete item.id;
+                  }
+                });
                 // 确认删除，只有调用这个方法才会真删除
                 removeEvent.confirmRemove = () => methods.removeSelection();
               } else {
@@ -35,6 +43,7 @@ export function useToolbar(props: JVxeTableProps, data: JVxeDataProps, methods:
             } else {
               methods.removeSelection();
             }
+            // update-end--author:liaozhiyang---date:20231018---for：【QQYUN-6805】修复asyncRemove字段不生效
           },
           // 清除选择事件
           onClearSelection: () => methods.clearSelection(),