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 => { 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(['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【附件汇总需要】