fix ui

xlorne · xlorne · commit afbd7ecee7d7 · 2026-01-28T10:30:42.000+08:00
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/workflow/Workflow.java b/flow-engine-framework/src/main/java/com/codingapi/flow/workflow/Workflow.java
@@ -58,6 +58,11 @@ public class Workflow {
      */
     private long createdTime;
 
+    /**
+     * 更新时间
+     */
+    private long updatedTime;
+
     /**
      * 流程表单
      */
@@ -93,6 +98,7 @@ protected Workflow() {
         this.id = RandomUtils.generateStringId();
         this.code = RandomUtils.generateWorkflowCode();
         this.createdTime = System.currentTimeMillis();
+        this.updatedTime = System.currentTimeMillis();
         this.operatorCreateScript = OperatorMatchScript.any();
         this.nodes = new ArrayList<>();
         this.edges = new ArrayList<>();
@@ -147,6 +153,10 @@ protected void setCreatedTime(long createdTime) {
         this.createdTime = createdTime;
     }
 
+    protected void setUpdatedTime(long updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
     protected void setStrategies(List<IWorkflowStrategy> strategies) {
         this.strategies = strategies;
     }
@@ -172,6 +182,7 @@ public String toJson(boolean hasSchema) {
         map.put("nodes", nodes.stream().map(IFlowNode::toMap).toList());
         map.put("edges", edges);
         map.put("createdTime", String.valueOf(createdTime));
+        map.put("updatedTime", String.valueOf(updatedTime));
         map.put("schema", hasSchema ? schema : null);
         map.put("strategies", strategies.stream().map(IWorkflowStrategy::toMap).toList());
         return JSON.toJSONString(map);
@@ -189,6 +200,7 @@ public static Workflow formJson(String json) {
         workflow.setTitle((String) data.get("title"));
         workflow.setSchema((String) data.get("schema"));
         workflow.setCreatedTime(Long.parseLong((String) data.get("createdTime")));
+        workflow.setUpdatedTime(Long.parseLong((String) data.get("updatedTime")));
         workflow.setCreatedOperator(GatewayContext.getInstance().getFlowOperator(createOperator));
         workflow.setForm(FormMeta.fromMap((Map<String, Object>) data.get("form")));
         workflow.setOperatorCreateScript(new OperatorMatchScript((String) data.get("operatorCreateScript")));
@@ -376,4 +388,7 @@ public boolean isNextNode(IFlowNode currentNode, IFlowNode nextNode) {
         return false;
     }
 
+    public void updateTime() {
+        this.updatedTime = System.currentTimeMillis();
+    }
 }
diff --git a/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java b/flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java
@@ -44,6 +44,7 @@ public Response save(@RequestBody JSONObject request) {
             request.put("createdOperator", String.valueOf(current.getUserId()));
         }
         Workflow workflow = Workflow.formJson(request.toJSONString());
+        workflow.updateTime();
         workflowRepository.save(workflow);
         return Response.buildSuccess();
     }
diff --git a/flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/WorkflowConvertor.java b/flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/WorkflowConvertor.java
@@ -26,6 +26,7 @@ public static WorkflowEntity convert(Workflow workflow){
 
         entity.setCreatedOperator(flowOperatorConvertor.convertToDatabaseColumn(workflow.getCreatedOperator()));
         entity.setCreatedTime(workflow.getCreatedTime());
+        entity.setUpdatedTime(workflow.getUpdatedTime());
         entity.setForm(formMetaConvertor.convertToDatabaseColumn(workflow.getForm()));
         entity.setOperatorCreateScript(operatorMatchScriptConvertor.convertToDatabaseColumn(workflow.getOperatorCreateScript()));
         entity.setNodes(flowNodeListConvertor.convertToDatabaseColumn(workflow.getNodes()));
@@ -44,6 +45,7 @@ public static Workflow convert(WorkflowEntity entity){
                 entity.getTitle(),
                 flowOperatorConvertor.convertToEntityAttribute(entity.getCreatedOperator()),
                 entity.getCreatedTime(),
+                entity.getUpdatedTime(),
                 formMetaConvertor.convertToEntityAttribute(entity.getForm()),
                 operatorMatchScriptConvertor.convertToEntityAttribute(entity.getOperatorCreateScript()),
                 flowNodeListConvertor.convertToEntityAttribute(entity.getNodes()),
diff --git a/flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/WorkflowEntity.java b/flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/WorkflowEntity.java
@@ -35,6 +35,12 @@ public class WorkflowEntity {
      */
     private Long createdTime;
 
+
+    /**
+     * 更新时间
+     */
+    private Long updatedTime;
+
     /**
      * 流程表单
      */
diff --git a/frontend/packages/flow-design/src/pages/design-list/index.tsx b/frontend/packages/flow-design/src/pages/design-list/index.tsx
@@ -17,12 +17,12 @@ export const DesignList: React.FC<DesignListProps> = (props) => {
             hidden: true,
         },
         {
-            dataIndex: 'code',
-            title: '编码',
+            dataIndex: 'title',
+            title: '流程标题',
         },
         {
-            dataIndex: 'title',
-            title: '名称',
+            dataIndex: 'code',
+            title: '流程编码',
         },
         {
             dataIndex: 'createdTime',
@@ -31,6 +31,13 @@ export const DesignList: React.FC<DesignListProps> = (props) => {
                 return dayjs(value).format("YYYY-MM-DD HH:mm:ss");
             }
         },
+        {
+            dataIndex: 'updatedTime',
+            title: '更新时间',
+            render: (value, record) => {
+                return dayjs(value).format("YYYY-MM-DD HH:mm:ss");
+            }
+        },
         {
             dataIndex: 'option',
             title: '操作',
diff --git a/frontend/packages/flow-design/src/pages/design-panel/manager/workflow/form.ts b/frontend/packages/flow-design/src/pages/design-panel/manager/workflow/form.ts
@@ -50,11 +50,11 @@ export class WorkflowFormManager {
 
     public mergeValue(code: string, values: any):FlowForm {
         const currentFields = this.getFormFields(code);
-        const currentCode = values['code'];
+        const currentFieldCode = values['code'];
         const list:FormField[] = [];
         let exist = false;
         for (const field of currentFields) {
-            if(field.code == currentCode) {
+            if(field.code === currentFieldCode) {
                 list.push(values);
                 exist = true;
             }else {
@@ -65,15 +65,14 @@ export class WorkflowFormManager {
             list.push(values);
         }
         const mainCode = this.form.code;
-        if(code==mainCode){
+        if(code===mainCode){
             return {
                 ...this.form,
                 fields:list,
             }
         }else {
             return {
                 ...this.form,
-                fields:list,
                 subForms:this.form.subForms.map(item=>{
                     if(item.code===code){
                         return {
diff --git a/frontend/packages/flow-design/src/pages/design-panel/presenters/index.ts b/frontend/packages/flow-design/src/pages/design-panel/presenters/index.ts
@@ -26,27 +26,56 @@ export class Presenter {
         this.state = state;
     }
 
+    private mergeWorkflow(prevWorkflow: any, currentWorkflow: any) {
+        return {
+            ...prevWorkflow,
+            ...currentWorkflow,
+            form: {
+                ...prevWorkflow.form,
+                ...currentWorkflow.form,
+            }
+        }
+    }
+
     public updateViewPanelTab(tab: TabPanelType) {
-        const values = this.formActionContext.save();
+        const values = this.formActionContext.save() as any;
         this.dispatch((prevState: State) => {
             return {
                 ...prevState,
                 view: {
                     ...prevState.view,
                     tabPanel: tab,
                 },
+                workflow: this.mergeWorkflow(prevState.workflow, values),
+            }
+        });
+    }
+
+    private updateWorkflowForm(form: any) {
+        this.dispatch((prevState: State) => {
+            return {
+                ...prevState,
                 workflow: {
                     ...prevState.workflow,
-                    ...values,
                     form: {
                         ...prevState.workflow.form,
-                        ...values,
+                        ...form,
                     }
                 }
             }
         });
     }
 
+    public updateWorkflow(data: any) {
+        this.dispatch((prevState: State) => {
+            return {
+                ...prevState,
+                workflow: this.mergeWorkflow(prevState.workflow, data),
+            }
+        });
+    }
+
+
     public removeWorkflowFormField(formCode: string, fieldCode: string) {
         const workflowFormManager = new WorkflowFormManager(this.state.workflow.form);
         const form = workflowFormManager.removeField(formCode, fieldCode);
@@ -65,17 +94,6 @@ export class Presenter {
         this.updateWorkflowForm(form);
     }
 
-    private updateWorkflowForm(form: any) {
-        this.dispatch((prevState: State) => {
-            return {
-                ...prevState,
-                workflow: {
-                    ...prevState.workflow,
-                    form
-                }
-            }
-        });
-    }
 
     public updateWorkflowFormField(code: string, values: any) {
         const workflowFormManager = new WorkflowFormManager(this.state.workflow.form);
@@ -84,31 +102,16 @@ export class Presenter {
     }
 
     public async save() {
-        const values = this.formActionContext.save();
+        const values = this.formActionContext.save() as any;
         this.updateWorkflow(values);
         const latest = {
             ...this.state,
-            workflow: {
-                ...this.state.workflow,
-                ...values
-            }
+            workflow: this.mergeWorkflow(this.state.workflow, values),
         };
         await this.api.save(latest.workflow);
         console.log('save latest:', latest);
     }
 
-    public updateWorkflow(data: any) {
-        this.dispatch((prevState: State) => {
-            return {
-                ...prevState,
-                workflow: {
-                    ...prevState.workflow,
-                    ...data
-                }
-            }
-        });
-    }
-
 
     public initState() {
         this.dispatch(initStateData);
diff --git a/frontend/packages/flow-design/src/pages/design-panel/tabs/base.tsx b/frontend/packages/flow-design/src/pages/design-panel/tabs/base.tsx
@@ -48,15 +48,15 @@ export const TabBase = ()=>{
             >
                 <CardForm.Item
                     name={"title"}
-                    label={"流程名称"}
+                    label={"流程标题"}
                     rules={[
                         {
                             required: true,
-                            message: '请输入流程名称'
+                            message: '请输入流程标题'
                         }
                     ]}
                 >
-                    <Input placeholder={"请输入流程名称"}/>
+                    <Input placeholder={"请输入流程标题"}/>
                 </CardForm.Item>
 
 
diff --git a/frontend/packages/flow-design/src/pages/design-panel/tabs/form.tsx b/frontend/packages/flow-design/src/pages/design-panel/tabs/form.tsx
@@ -52,6 +52,12 @@ const FormFieldModal: React.FC<FormFieldModalProps> = (props) => {
                     name={"name"}
                     label={"字段名称"}
                     labelCol={labelCol}
+                    rules={[
+                        {
+                            required: true,
+                            message: '字段名称不能为空'
+                        }
+                    ]}
                 >
                     <Input placeholder={"请输入字段名称"}/>
                 </Form.Item>
@@ -60,6 +66,12 @@ const FormFieldModal: React.FC<FormFieldModalProps> = (props) => {
                     name={"code"}
                     label={"字段编码"}
                     labelCol={labelCol}
+                    rules={[
+                        {
+                            required: true,
+                            message: '字段编码不能为空'
+                        }
+                    ]}
                 >
                     <Input placeholder={"请输入字段编码"}/>
                 </Form.Item>
@@ -68,6 +80,12 @@ const FormFieldModal: React.FC<FormFieldModalProps> = (props) => {
                     name={"type"}
                     label={"字段类型"}
                     labelCol={labelCol}
+                    rules={[
+                        {
+                            required: true,
+                            message: '字段类型不能为空'
+                        }
+                    ]}
                 >
                     <Select
                         placeholder={"请输入字段类型"}
@@ -177,7 +195,16 @@ const FormTable: React.FC<FormTableProps> = (props) => {
         },
         {
             dataIndex: 'type',
-            title: '字段类型'
+            title: '字段类型',
+            render: (value, record) => {
+                let label = '';
+                for(const option of FormFieldOptions) {
+                    if(option.value == value){
+                        label = option.label;
+                    }
+                }
+                return label
+            }
         },
         {
             dataIndex: 'required',

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public Response save(@RequestBody JSONObject request) {`
`44`	`44`	`request.put("createdOperator", String.valueOf(current.getUserId()));`
`45`	`45`	`}`
`46`	`46`	`Workflow workflow = Workflow.formJson(request.toJSONString());`
	`47`	`+ workflow.updateTime();`
`47`	`48`	`workflowRepository.save(workflow);`
`48`	`49`	`return Response.buildSuccess();`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,15 @@ export const TabBase = ()=>{`
`48`	`48`	`>`
`49`	`49`	`<CardForm.Item`
`50`	`50`	`name={"title"}`
`51`		`- label={"流程名称"}`
	`51`	`+ label={"流程标题"}`
`52`	`52`	`rules={[`
`53`	`53`	`{`
`54`	`54`	`required: true,`
`55`		`- message: '请输入流程名称'`
	`55`	`+ message: '请输入流程标题'`
`56`	`56`	`}`
`57`	`57`	`]}`
`58`	`58`	`>`
`59`		`- <Input placeholder={"请输入流程名称"}/>`
	`59`	`+ <Input placeholder={"请输入流程标题"}/>`
`60`	`60`	`</CardForm.Item>`
`61`	`61`
`62`	`62`