From bf266274ec45424ecb3f21c174b481fca8b56e98 Mon Sep 17 00:00:00 2001 From: yuanchengjie_fh Date: Mon, 6 May 2024 17:15:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=A6=96=E6=AC=A1=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/edit/src/mixin.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/edit/src/mixin.js b/packages/edit/src/mixin.js index fa9016a738..008329bddf 100644 --- a/packages/edit/src/mixin.js +++ b/packages/edit/src/mixin.js @@ -126,7 +126,10 @@ function handleInsertRowAt (_vm, records, row, isInsertNextRow) { if (isInsertNextRow) { targetIndex = targetIndex + 1 } - parentChilds.splice(targetIndex, 0, ...newRecords) + // 在开启懒加载的情况下，首次 insert row 会导致重复添加 + if (parentChilds !== parentMapChilds) { + parentChilds.splice(targetIndex, 0, ...newRecords) + } } } } else { From c330268a2bde7ff21e5e03323b9e4be7e798d398 Mon Sep 17 00:00:00 2001 From: yuanchengjie_fh Date: Mon, 6 May 2024 17:18:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=A6=96=E6=AC=A1=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/edit/src/mixin.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/edit/src/mixin.js b/packages/edit/src/mixin.js index 008329bddf..47725d9e42 100644 --- a/packages/edit/src/mixin.js +++ b/packages/edit/src/mixin.js @@ -28,7 +28,10 @@ function insertTreeRow (_vm, newRecords, isAppend) { mapChilds = parentRow[childrenField] = [] } parentChilds[funcName](item) - mapChilds[funcName](item) + // 在开启懒加载的情况下，首次 insert row 会导致重复添加 + if (mapChilds !== parentChilds) { + mapChilds[funcName](item) + } const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1 } fullDataRowIdData[rowid] = rest fullAllDataRowIdData[rowid] = rest From ba4ba9f33f4c85cd9575c47fbc16f655a93a9719 Mon Sep 17 00:00:00 2001 From: yuanchengjie_fh Date: Mon, 6 May 2024 18:09:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=A6=96=E6=AC=A1=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c31b68f74c..266c55e34a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "vxe-table", + "name": "vxe-table-ycj", "version": "3.8.4", "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { From 50a9d0d4360f709e159b2c9b70f15a01e6e08e3b Mon Sep 17 00:00:00 2001 From: yuanchengjie_fh Date: Mon, 6 May 2024 19:38:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=A6=96=E6=AC=A1=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 266c55e34a..8d5540d7c6 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "vxe-table-ycj", + "name": "vxe-table-ycjlazy", "version": "3.8.4", "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { From 5b8806b83ebcec2765abd487800ba9c940dc4fd6 Mon Sep 17 00:00:00 2001 From: yuanchengjie_fh Date: Tue, 7 May 2024 09:59:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=A6=96=E6=AC=A1=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8d5540d7c6..8a6d59fa9a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table-ycjlazy", - "version": "3.8.4", + "version": "3.8.4-ycj-beta", "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", @@ -88,8 +88,8 @@ "vue grid" ], "author": { - "name": "Xu Liangzhan", - "email": "xu_liangzhan@163.com" + "name": "Yuan Chengjie", + "email": "1210611769@qq.com" }, "license": "MIT", "bugs": {