1.代码生成器:有流程的表单个性化配置
2.表单编辑页:完整配置问题修正(之前不小心提交了let a=5;现在去掉)
This commit is contained in:
@ -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> => {
|
||||
|
||||
@ -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【附件汇总需要】
|
||||
|
||||
Reference in New Issue
Block a user