From 3f79cbe406551c68ff1397ae497b48d0a6a39937 Mon Sep 17 00:00:00 2001 From: chen_junior Date: Mon, 7 Apr 2025 10:51:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=BB=BA=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E8=A7=A6=E5=8F=91=E5=A4=9A=E6=AC=A1=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/helper/generatorHelper.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index 13fd87f..5e7e315 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -2643,19 +2643,23 @@ function getUploadComponentIds(){ async function validate() { await formRef.value.validate(); } +const isFirst = ref(true); +let formModelIdVal = reactive({ + id: '' +}); // 提交 async function submit() { - let formModelIdVal = {}; try { await formRef.value.validate(); const formData = await formRef.value.getFormData(); - if(formConfig.type == FromPageType.EDIT){ + if(formConfig.type == FromPageType.EDIT || formModelIdVal[listProps.rowKey]){ formData[listProps.rowKey]=formConfig.id; await update${pascalMainTableName}(formData); - formModelIdVal[listProps.rowKey]=formConfig.id; + formModelIdVal[listProps.rowKey] = isFirst.value ? formConfig.id : formModelIdVal[listProps.rowKey]; } else{ let res = await add${pascalMainTableName}(formData); + isFirst.value = false; formModelIdVal[listProps.rowKey]=res.data; } } catch (err) { From cf7f2a4d902a9f7b7624f390442839deff8ed472 Mon Sep 17 00:00:00 2001 From: chen_junior Date: Thu, 10 Apr 2025 17:43:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=97=B6=E4=BC=9A=E8=A7=A6=E5=8F=91=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=86=8D=E6=AC=A1=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/helper/generatorHelper.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index 3429d2a..72dcf65 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -2672,14 +2672,12 @@ let formModelIdVal = reactive({ if(formData[rowKey]){ formConfig.id = formData[rowKey] await update${pascalMainTableName}(formData); - formModelIdVal[rowKey]=formConfig.id; } else{ let res = await add${pascalMainTableName}(formData); - formModelIdVal[rowKey]=res.data; formConfig.id = res.data } - await setFormDataFromId(formConfig.id) + formModelIdVal = await setFormDataFromId(formConfig.id, true); } catch (err) { console.log(err); }