From e7dd9dbd347eea4ef953c93ced10f0bec017a60d Mon Sep 17 00:00:00 2001
From: liaoxuezhi <2698393+2betop@users.noreply.github.com>
Date: Mon, 6 May 2024 16:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20inputTable=20?=
 =?UTF-8?q?=E5=9C=A8=E5=88=86=E9=A1=B5=E6=83=85=E5=86=B5=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=8D=95=E9=A1=B9=E4=B8=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98=20(#10157)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renderers/Form/inputTable.test.tsx        | 73 ++++++++++++++++++-
 .../amis/src/renderers/Form/InputTable.tsx    |  1 +
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/packages/amis/__tests__/renderers/Form/inputTable.test.tsx b/packages/amis/__tests__/renderers/Form/inputTable.test.tsx
index d3e5392af..a750ba8d1 100644
--- a/packages/amis/__tests__/renderers/Form/inputTable.test.tsx
+++ b/packages/amis/__tests__/renderers/Form/inputTable.test.tsx
@@ -1020,8 +1020,6 @@ test('Renderer:input-table canAccessSuperData', async () => {
   expect(inputs).toEqual(['a1', '']);
 });
 
-
-
 // 对应 github issue: https://github.com/baidu/amis/issues/9537
 test('Renderer:input-table item confirm validate', async () => {
   const onSubmit = jest.fn();
@@ -1085,3 +1083,74 @@ test('Renderer:input-table item confirm validate', async () => {
 
   expect(container.querySelector('.has-error--isRequired')).toBeInTheDocument();
 });
+
+// 问题：分页切换后，新行数据中不存在原始行中的某个数据，但是切换后，表单项还是展示的原来的值
+// 比如下面的例子，新行 c 字段不存在，但是切过去后，c 显示 c1
+test('Renderer:input-table pagination data issue', async () => {
+  const onSubmit = jest.fn();
+  const {container, findByRole, findByText} = render(
+    amisRender(
+      {
+        type: 'page',
+        body: {
+          type: 'form',
+          data: {
+            table: [
+              {
+                a: 'a1',
+                b: 'b1',
+                c: 'c1'
+              },
+              {
+                a: 'a2',
+                b: 'b2'
+              }
+            ]
+          },
+          body: [
+            {
+              showIndex: true,
+              type: 'input-table',
+              needConfirm: false,
+              perPage: 1,
+              name: 'table',
+              columns: [
+                {
+                  name: 'a',
+                  label: 'A'
+                },
+                {
+                  name: 'b',
+                  label: 'B',
+                  quickEdit: {
+                    type: 'form',
+                    body: [
+                      {
+                        type: 'input-text',
+                        name: 'b'
+                      },
+                      {
+                        type: 'input-text',
+                        name: 'c'
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      },
+      {},
+      makeEnv({})
+    )
+  );
+
+  await wait(200);
+  const nextBtn = container.querySelector('.cxd-Pagination-next');
+  fireEvent.click(nextBtn!);
+  await wait(200);
+
+  const c = container.querySelector('input[name="c"]');
+  expect(c).toHaveValue('');
+});
diff --git a/packages/amis/src/renderers/Form/InputTable.tsx b/packages/amis/src/renderers/Form/InputTable.tsx
index 1cd87d5e4..4a2f83cc1 100644
--- a/packages/amis/src/renderers/Form/InputTable.tsx
+++ b/packages/amis/src/renderers/Form/InputTable.tsx
@@ -1876,6 +1876,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
             draggable: draggable && !this.state.editIndex,
             items: items,
             getEntryId: this.getEntryId,
+            reUseRow: false, // 这个会导致 getEntryId 无效，因为复用的话，row 的 id 不会更新
             onSave: this.handleTableSave,
             onRadioChange: this.handleRadioChange,
             onSaveOrder: this.handleSaveTableOrder,