Merge branch 'dev-cjw' into 'dev'

修复生成移动端代码，在审批时会触发组件再次请求接口。

See merge request itc-framework/ma/2024/front!59

src/utils/helper/generatorHelper.ts

@@ -2670,23 +2670,24 @@ 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(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);
 	}