From 9d7cc40b6a66f5936be059866c923b5cc8049cca Mon Sep 17 00:00:00 2001
From: suguangxu <274928232@qq.com>
Date: Tue, 13 May 2025 15:56:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=89=E6=B5=81=E7=A8=8B=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E6=80=A7=E5=8C=96=E9=85=8D=E7=BD=AE=202.=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E9=A1=B5=EF=BC=9A=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3=EF=BC=88?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E4=B8=8D=E5=B0=8F=E5=BF=83=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=86let=20a=3D5;=E7=8E=B0=E5=9C=A8=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateCodeStep/src/EntireConfigStep.vue      |  2 +-
 src/utils/helper/generatorHelper.ts              | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateCodeStep/src/EntireConfigStep.vue b/src/components/CreateCodeStep/src/EntireConfigStep.vue
index d80d7a9..c7febf7 100644
--- a/src/components/CreateCodeStep/src/EntireConfigStep.vue
+++ b/src/components/CreateCodeStep/src/EntireConfigStep.vue
@@ -88,7 +88,7 @@
            columns:generatorConfig.renderConfig.columns||{},
            formProps:generatorConfig.renderConfig.formProps||{}
       }, null, 2);*/
-        renderConfigObject.value= customFormConfig.renderConfig||'let a=5;';
+        renderConfigObject.value= customFormConfig.renderConfig||'';
   }
     
   const validateStep = async (): Promise<boolean> => {
diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index 3272204..382dbbd 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -774,7 +774,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
   }
   
   //所有按钮
-  const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,"type":"primary"},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
+  const buttons = ref(${JSON.stringify(model.listConfig.buttonConfigs.filter((x) => x.isUse))});
   //展示在列表内的按钮
   const actionButtons = ref<string[]>(['view', 'edit', 'copyData', 'delete', 'startwork','flowRecord']);
   const buttonConfigs = computed(()=>{
@@ -1750,7 +1750,10 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
   async function setCustomFormSchemas() {
      const cloneProps=cloneDeep(formProps);
       if (formConfig.useCustomConfig) {
-         await mergeFormSchemas(cloneProps.schemas!,currentRoute.value.query.formId);
+         let formId=currentRoute.value.query.formId;
+         if(props.fromPage !== FromPageType.FLOW){
+              cloneProps.schemas=await mergeFormSchemas(cloneProps.schemas!,currentRoute.value.query.formId);
+         }
       }
      data.formDataProps=cloneProps;
   }
@@ -1832,7 +1835,14 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
   // 根据工作流页面权限，设置表单属性（必填，禁用，显示）
   async function setWorkFlowForm(obj: WorkFlowFormParams) {
     try {
-      let flowData = changeWorkFlowForm(cloneDeep(formProps), obj);
+      const cloneProps=cloneDeep(formProps);
+      if (formConfig.useCustomConfig) {
+        const parts = obj.formConfigKey.split('_');
+        const formId=parts[1];
+        cloneProps.schemas=await mergeFormSchemas(cloneProps.schemas!,formId);
+      }
+      
+      let flowData = changeWorkFlowForm(cloneProps, obj);
       let { buildOptionJson, uploadComponentIds, formModels, isViewProcess } = flowData;
       data.formDataProps = buildOptionJson;
       emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】