From f43207a44a25111bef7697fec35e511b82d5e32e Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Wed, 4 Jan 2023 18:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=87=87=E8=B4=AD=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/business/process-detail.ftl | 8 +++++++- .../resources/templates/admin/business/process-edit.ftl | 5 +++-- .../resources/templates/admin/business/process-new.ftl | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index 1f91898..3583ab1 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -287,6 +287,10 @@ return response.json() } + function isImage(path) { + return /\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(path); + } + const data = () => { return { process: {}, @@ -339,7 +343,9 @@ const mapAttachment = attachment => { if (hasText(attachment)) { try { - return JSON.parse(attachment) + return JSON.parse(attachment).map(item => ({ + ...item, isImage: isImage(item.name) + })) } catch (e) { return [] } diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index 0d2b13d..ee9c39a 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -1120,10 +1120,11 @@ const { row } = scope const { children } = row const newRow = { - ...row, + // ...row, rowKey: this.rowKeyCounter++, newRow: true, - parent: row // 记录上一级元素,在删除的时候使用 + parent: row, // 记录上一级元素,在删除的时候使用 + amountCurrent: row.amountCurrent } delete newRow['children'] diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index b9703bb..77494c0 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -1311,7 +1311,8 @@ // ...row, // 不显示数据相同的部分 rowKey: this.rowKeyCounter++, newRow: true, - parent: row // 记录上一级元素,在删除的时候使用 + parent: row, // 记录上一级元素,在删除的时候使用 + amountCurrent: row.amountCurrent } delete newRow['children']