diff --git a/src/components/SystemForm/src/Form.vue b/src/components/SystemForm/src/Form.vue index 9ad4e5d..002738b 100644 --- a/src/components/SystemForm/src/Form.vue +++ b/src/components/SystemForm/src/Form.vue @@ -180,7 +180,7 @@ values[rowKey] = id; values['_id'] = id; //重新查一遍 - let newValues=await SystemFormRef.value.setFormDataFromId(id); + let newValues=await SystemFormRef.value.setFormDataFromId(id,true); if(newValues){ values=newValues; } diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index ae2080b..fb79b06 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -1717,14 +1717,15 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf return values; } // 根据行唯一ID查询行数据,并设置表单数据 【编辑】 - async function setFormDataFromId(rowId) { + async function setFormDataFromId(rowId, skipUpdate) { try { const record = await get${pascalMainTableName}(rowId); + if (skipUpdate) { + return record; + } setFieldsValue(record); state.formModel = record; - await getFormDataEvent(formEventConfigs, state.formModel, - systemFormRef.value, - formProps.schemas); //表单事件:获取表单数据 + await getFormDataEvent(formEventConfigs, state.formModel, systemFormRef.value, formProps.schemas); //表单事件:获取表单数据 return record; } catch (error) { diff --git a/src/views/system/systemConfig/components/Form.vue b/src/views/system/systemConfig/components/Form.vue index 5044327..2582173 100644 --- a/src/views/system/systemConfig/components/Form.vue +++ b/src/views/system/systemConfig/components/Form.vue @@ -87,14 +87,15 @@ return values; } // 根据行唯一ID查询行数据,并设置表单数据 【编辑】 - async function setFormDataFromId(rowId) { + async function setFormDataFromId(rowId, skipUpdate) { try { const record = await getXjrSystemConfig(rowId); + if (skipUpdate) { + return record; + } setFieldsValue(record); state.formModel = record; - await getFormDataEvent(formEventConfigs, state.formModel, - systemFormRef.value, - formProps.schemas); //表单事件:获取表单数据 + await getFormDataEvent(formEventConfigs, state.formModel, systemFormRef.value, formProps.schemas); //表单事件:获取表单数据 return record; } catch (error) { diff --git a/src/views/system/systemNotice/components/Form.vue b/src/views/system/systemNotice/components/Form.vue index dc01e54..a901b5a 100644 --- a/src/views/system/systemNotice/components/Form.vue +++ b/src/views/system/systemNotice/components/Form.vue @@ -87,14 +87,15 @@ return values; } // 根据行唯一ID查询行数据,并设置表单数据 【编辑】 - async function setFormDataFromId(rowId) { + async function setFormDataFromId(rowId, skipUpdate) { try { const record = await getXjrNotice(rowId); + if (skipUpdate) { + return record; + } setFieldsValue(record); state.formModel = record; - await getFormDataEvent(formEventConfigs, state.formModel, - systemFormRef.value, - formProps.schemas); //表单事件:获取表单数据 + await getFormDataEvent(formEventConfigs, state.formModel, systemFormRef.value, formProps.schemas); //表单事件:获取表单数据 return record; } catch (error) {