Merge remote-tracking branch 'origin/develop3' into develop3

This commit is contained in:
dengqichen 2025-10-24 15:57:47 +08:00
commit f874e9d231
65 changed files with 5098 additions and 480 deletions

View File

@ -149,7 +149,11 @@ public enum ResponseCode {
/**
* 工作流变量反序列化错误
*/
WORKFLOW_VARIABLE_DESERIALIZE_ERROR(50302, "workflow.variable.deserialize.error");
WORKFLOW_VARIABLE_DESERIALIZE_ERROR(50302, "workflow.variable.deserialize.error"),
// 表单管理相关错误码 (2800-2899)
FORM_DEFINITION_NOT_FOUND(2800, "form.definition.not.found"),
FORM_DATA_NOT_FOUND(2801, "form.data.not.found");
private final int code;
private final String messageKey; // 国际化消息key

View File

@ -0,0 +1,44 @@
package com.qqchen.deploy.backend.workflow.api;
import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.framework.controller.BaseController;
import com.qqchen.deploy.backend.workflow.dto.FormCategoryDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormCategoryQuery;
import com.qqchen.deploy.backend.workflow.entity.FormCategory;
import com.qqchen.deploy.backend.workflow.service.IFormCategoryService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 表单分类API控制器
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@RestController
@RequestMapping("/api/v1/forms/categories")
@Tag(name = "表单分类管理", description = "表单分类管理相关接口")
public class FormCategoryApiController extends BaseController<FormCategory, FormCategoryDTO, Long, FormCategoryQuery> {
@Resource
private IFormCategoryService formCategoryService;
@Operation(summary = "查询所有启用的分类")
@GetMapping("/enabled")
public Response<List<FormCategoryDTO>> findAllEnabled() {
List<FormCategoryDTO> result = formCategoryService.findAllEnabled();
return Response.success(result);
}
@Override
protected void exportData(jakarta.servlet.http.HttpServletResponse response, java.util.List<FormCategoryDTO> data) {
// 暂不支持导出
}
}

View File

@ -0,0 +1,52 @@
package com.qqchen.deploy.backend.workflow.api;
import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.framework.controller.BaseController;
import com.qqchen.deploy.backend.workflow.dto.FormDataDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormDataQuery;
import com.qqchen.deploy.backend.workflow.entity.FormData;
import com.qqchen.deploy.backend.workflow.service.IFormDataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
/**
* 表单数据API控制器
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@RestController
@RequestMapping("/api/v1/forms/data")
@Tag(name = "表单数据管理", description = "表单数据管理相关接口")
public class FormDataApiController extends BaseController<FormData, FormDataDTO, Long, FormDataQuery> {
@Resource
private IFormDataService formDataService;
@Operation(summary = "提交表单数据")
@PostMapping("/submit")
public Response<FormDataDTO> submit(@RequestBody FormDataDTO dto) {
FormDataDTO result = formDataService.submit(dto);
return Response.success(result);
}
@Operation(summary = "根据业务标识查询表单数据")
@GetMapping("/business/{businessKey}")
public Response<FormDataDTO> getByBusinessKey(
@Parameter(description = "业务标识", required = true) @PathVariable String businessKey
) {
FormDataDTO result = formDataService.getByBusinessKey(businessKey);
return Response.success(result);
}
@Override
protected void exportData(jakarta.servlet.http.HttpServletResponse response, java.util.List<FormDataDTO> data) {
// 暂不支持导出
}
}

View File

@ -0,0 +1,54 @@
package com.qqchen.deploy.backend.workflow.api;
import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.framework.controller.BaseController;
import com.qqchen.deploy.backend.workflow.dto.FormDefinitionDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormDefinitionQuery;
import com.qqchen.deploy.backend.workflow.entity.FormDefinition;
import com.qqchen.deploy.backend.workflow.service.IFormDefinitionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
/**
* 表单定义API控制器
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@RestController
@RequestMapping("/api/v1/forms/definitions")
@Tag(name = "表单定义管理", description = "表单定义管理相关接口")
public class FormDefinitionApiController extends BaseController<FormDefinition, FormDefinitionDTO, Long, FormDefinitionQuery> {
@Resource
private IFormDefinitionService formDefinitionService;
@Operation(summary = "发布表单")
@PostMapping("/{id}/publish")
public Response<FormDefinitionDTO> publish(
@Parameter(description = "表单定义ID", required = true) @PathVariable Long id
) {
FormDefinitionDTO result = formDefinitionService.publish(id);
return Response.success(result);
}
@Operation(summary = "根据key获取最新版本表单")
@GetMapping("/latest/{key}")
public Response<FormDefinitionDTO> getLatestByKey(
@Parameter(description = "表单标识", required = true) @PathVariable String key
) {
FormDefinitionDTO result = formDefinitionService.getLatestByKey(key);
return Response.success(result);
}
@Override
protected void exportData(jakarta.servlet.http.HttpServletResponse response, java.util.List<FormDefinitionDTO> data) {
// 暂不支持导出
}
}

View File

@ -0,0 +1,33 @@
package com.qqchen.deploy.backend.workflow.api;
import com.qqchen.deploy.backend.framework.controller.BaseController;
import com.qqchen.deploy.backend.workflow.dto.WorkflowCategoryDTO;
import com.qqchen.deploy.backend.workflow.dto.query.WorkflowCategoryQuery;
import com.qqchen.deploy.backend.workflow.entity.WorkflowCategory;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 工作流分类API Controller
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@RestController
@RequestMapping("/api/v1/workflow/categories")
@Tag(name = "工作流分类管理", description = "工作流分类相关接口")
public class WorkflowCategoryApiController extends BaseController<WorkflowCategory, WorkflowCategoryDTO, Long, WorkflowCategoryQuery> {
@Override
protected void exportData(HttpServletResponse response, List<WorkflowCategoryDTO> data) {
// TODO: 实现工作流分类数据导出逻辑
log.warn("工作流分类数据导出功能暂未实现");
}
}

View File

@ -0,0 +1,17 @@
package com.qqchen.deploy.backend.workflow.converter;
import com.qqchen.deploy.backend.framework.converter.BaseConverter;
import com.qqchen.deploy.backend.workflow.dto.FormCategoryDTO;
import com.qqchen.deploy.backend.workflow.entity.FormCategory;
import org.mapstruct.Mapper;
/**
* 表单分类转换器
*
* @author qqchen
* @date 2025-10-24
*/
@Mapper(config = BaseConverter.class)
public interface FormCategoryConverter extends BaseConverter<FormCategory, FormCategoryDTO> {
}

View File

@ -0,0 +1,17 @@
package com.qqchen.deploy.backend.workflow.converter;
import com.qqchen.deploy.backend.framework.converter.BaseConverter;
import com.qqchen.deploy.backend.workflow.dto.FormDataDTO;
import com.qqchen.deploy.backend.workflow.entity.FormData;
import org.mapstruct.Mapper;
/**
* 表单数据转换器
*
* @author qqchen
* @date 2025-10-24
*/
@Mapper(config = BaseConverter.class)
public interface FormDataConverter extends BaseConverter<FormData, FormDataDTO> {
}

View File

@ -0,0 +1,17 @@
package com.qqchen.deploy.backend.workflow.converter;
import com.qqchen.deploy.backend.framework.converter.BaseConverter;
import com.qqchen.deploy.backend.workflow.dto.FormDefinitionDTO;
import com.qqchen.deploy.backend.workflow.entity.FormDefinition;
import org.mapstruct.Mapper;
/**
* 表单定义转换器
*
* @author qqchen
* @date 2025-10-24
*/
@Mapper(config = BaseConverter.class)
public interface FormDefinitionConverter extends BaseConverter<FormDefinition, FormDefinitionDTO> {
}

View File

@ -0,0 +1,17 @@
package com.qqchen.deploy.backend.workflow.converter;
import com.qqchen.deploy.backend.framework.converter.BaseConverter;
import com.qqchen.deploy.backend.workflow.dto.WorkflowCategoryDTO;
import com.qqchen.deploy.backend.workflow.entity.WorkflowCategory;
import org.mapstruct.Mapper;
/**
* 工作流分类转换器
*
* @author qqchen
* @date 2025-10-24
*/
@Mapper(config = BaseConverter.class)
public interface WorkflowCategoryConverter extends BaseConverter<WorkflowCategory, WorkflowCategoryDTO> {
}

View File

@ -0,0 +1,55 @@
package com.qqchen.deploy.backend.workflow.dto;
import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 表单分类DTO
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "表单分类DTO")
public class FormCategoryDTO extends BaseDTO {
/**
* 分类名称
*/
@Schema(description = "分类名称", example = "审批表单")
private String name;
/**
* 分类编码
*/
@Schema(description = "分类编码", example = "APPROVAL")
private String code;
/**
* 分类描述
*/
@Schema(description = "分类描述", example = "用于审批流程的表单")
private String description;
/**
* 图标
*/
@Schema(description = "图标", example = "CheckCircleOutlined")
private String icon;
/**
* 排序
*/
@Schema(description = "排序", example = "1")
private Integer sort;
/**
* 是否启用
*/
@Schema(description = "是否启用", example = "true")
private Boolean enabled;
}

View File

@ -0,0 +1,96 @@
package com.qqchen.deploy.backend.workflow.dto;
import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import com.qqchen.deploy.backend.workflow.enums.FormBusinessTypeEnums;
import com.qqchen.deploy.backend.workflow.enums.FormDataStatusEnums;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Map;
/**
* 表单数据DTO
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "表单数据DTO")
public class FormDataDTO extends BaseDTO {
/**
* 表单定义ID
*/
@Schema(description = "表单定义ID", example = "1")
private Long formDefinitionId;
/**
* 表单标识冗余存储避免JOIN
*/
@Schema(description = "表单标识", example = "employee_info_form")
private String formKey;
/**
* 表单版本冗余存储用于历史追溯
*/
@Schema(description = "表单版本", example = "1")
private Integer formVersion;
/**
* 表单分类ID冗余存储便于统计和查询
*/
@Schema(description = "表单分类ID", example = "1")
private Long categoryId;
/**
* 表单分类信息用于展示
*/
@Schema(description = "表单分类信息")
private FormCategoryDTO category;
/**
* 业务标识如工作流实例ID订单号等
*/
@Schema(description = "业务标识", example = "workflow_instance_123")
private String businessKey;
/**
* 业务类型WORKFLOW-工作流ORDER-订单STANDALONE-独立表单
*/
@Schema(description = "业务类型")
private FormBusinessTypeEnums businessType;
/**
* 表单填写数据用户提交的实际数据
*/
@Schema(description = "表单填写数据")
private Map<String, Object> data;
/**
* 表单Schema快照用于历史追溯确保数据可还原原样存储
*/
@Schema(description = "表单Schema快照")
private Map<String, Object> schemaSnapshot;
/**
* 提交人
*/
@Schema(description = "提交人", example = "admin")
private String submitter;
/**
* 提交时间
*/
@Schema(description = "提交时间", example = "2025-10-24T12:00:00")
private LocalDateTime submitTime;
/**
* 状态DRAFT-草稿SUBMITTED-已提交COMPLETED-已完成REJECTED-已拒绝
*/
@Schema(description = "状态")
private FormDataStatusEnums status;
}

View File

@ -0,0 +1,83 @@
package com.qqchen.deploy.backend.workflow.dto;
import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import com.qqchen.deploy.backend.workflow.enums.FormDefinitionStatusEnums;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
import java.util.Map;
/**
* 表单定义DTO
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "表单定义DTO")
public class FormDefinitionDTO extends BaseDTO {
/**
* 表单名称
*/
@Schema(description = "表单名称", example = "员工信息登记表")
private String name;
/**
* 表单标识业务唯一
*/
@Schema(description = "表单标识", example = "employee_info_form")
private String key;
/**
* 表单版本号
*/
@Schema(description = "表单版本号", example = "1")
private Integer formVersion;
/**
* 表单分类ID
*/
@Schema(description = "表单分类ID", example = "1")
private Long categoryId;
/**
* 表单分类信息用于展示
*/
@Schema(description = "表单分类信息")
private FormCategoryDTO category;
/**
* 表单描述
*/
@Schema(description = "表单描述", example = "用于采集员工基本信息")
private String description;
/**
* 表单Schema前端设计器导出的JSON结构原样存储
*/
@Schema(description = "表单Schema")
private Map<String, Object> schema;
/**
* 标签用于分类和搜索
*/
@Schema(description = "标签列表", example = "[\"员工管理\", \"信息采集\"]")
private List<String> tags;
/**
* 状态DRAFT-草稿PUBLISHED-已发布DISABLED-已禁用
*/
@Schema(description = "状态")
private FormDefinitionStatusEnums status;
/**
* 是否为模板
*/
@Schema(description = "是否为模板", example = "false")
private Boolean isTemplate;
}

View File

@ -1,19 +1,64 @@
package com.qqchen.deploy.backend.workflow.dto;
import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 工作流分类DTO
*
* @author qqchen
* @date 2025-10-24
*/
@Data
public class WorkflowCategoryDTO {
@EqualsAndHashCode(callSuper = true)
@Schema(description = "工作流分类DTO")
public class WorkflowCategoryDTO extends BaseDTO {
private Long id;
/**
* 分类名称
*/
@Schema(description = "分类名称", example = "脚本执行")
private String name;
/**
* 分类编码唯一
*/
@Schema(description = "分类编码", example = "SCRIPT_EXECUTION")
private String code;
private String lable;
/**
* 分类描述
*/
@Schema(description = "分类描述", example = "用于执行各类脚本的流程")
private String description;
private List<WorkflowTriggerTypeDTO> supportedTriggers;
/**
* 图标
*/
@Schema(description = "图标", example = "CodeOutlined")
private String icon;
/**
* 排序
*/
@Schema(description = "排序", example = "1")
private Integer sort;
/**
* 支持的触发方式列表
*/
@Schema(description = "支持的触发方式列表", example = "[\"MANUAL\",\"SCHEDULED\"]")
private List<String> supportedTriggers;
/**
* 是否启用
*/
@Schema(description = "是否启用", example = "true")
private Boolean enabled;
}

View File

@ -1,16 +1,12 @@
package com.qqchen.deploy.backend.workflow.dto;
import com.fasterxml.jackson.databind.JsonNode;
import com.qqchen.deploy.backend.framework.dto.BaseDTO;
import com.qqchen.deploy.backend.workflow.dto.FormDefinitionDTO;
import com.qqchen.deploy.backend.workflow.dto.definition.workflow.WorkflowDefinitionGraph;
import com.qqchen.deploy.backend.workflow.enums.WorkflowCategoryEnum;
import com.qqchen.deploy.backend.workflow.enums.WorkflowDefinitionStatusEnums;
import com.qqchen.deploy.backend.workflow.enums.WorkflowTriggerTypeEnum;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 工作流定义DTO
*
@ -32,14 +28,24 @@ public class WorkflowDefinitionDTO extends BaseDTO {
private String key;
/**
* 分类
* 分类ID
*/
private WorkflowCategoryEnum category;
private Long categoryId;
/**
* 触发类型列表
* 分类信息用于展示
*/
private List<WorkflowTriggerTypeEnum> triggers;
private WorkflowCategoryDTO category;
/**
* 启动表单ID
*/
private Long formDefinitionId;
/**
* 启动表单信息用于展示
*/
private FormDefinitionDTO formDefinition;
/**
* 流程版本

View File

@ -0,0 +1,37 @@
package com.qqchen.deploy.backend.workflow.dto.query;
import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.framework.query.BaseQuery;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 表单分类查询对象
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class FormCategoryQuery extends BaseQuery {
/**
* 分类名称模糊查询
*/
@QueryField(field = "name", type = QueryType.LIKE)
private String name;
/**
* 分类编码精确查询
*/
@QueryField(field = "code", type = QueryType.EQUAL)
private String code;
/**
* 是否启用精确查询
*/
@QueryField(field = "enabled", type = QueryType.EQUAL)
private Boolean enabled;
}

View File

@ -0,0 +1,63 @@
package com.qqchen.deploy.backend.workflow.dto.query;
import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.framework.query.BaseQuery;
import com.qqchen.deploy.backend.workflow.enums.FormBusinessTypeEnums;
import com.qqchen.deploy.backend.workflow.enums.FormDataStatusEnums;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 表单数据查询对象
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class FormDataQuery extends BaseQuery {
/**
* 表单定义ID精确查询
*/
@QueryField(field = "formDefinitionId", type = QueryType.EQUAL)
private Long formDefinitionId;
/**
* 表单标识精确查询
*/
@QueryField(field = "formKey", type = QueryType.EQUAL)
private String formKey;
/**
* 表单分类ID精确查询
*/
@QueryField(field = "categoryId", type = QueryType.EQUAL)
private Long categoryId;
/**
* 业务标识精确查询
*/
@QueryField(field = "businessKey", type = QueryType.EQUAL)
private String businessKey;
/**
* 业务类型精确查询
*/
@QueryField(field = "businessType", type = QueryType.EQUAL)
private FormBusinessTypeEnums businessType;
/**
* 提交人精确查询
*/
@QueryField(field = "submitter", type = QueryType.EQUAL)
private String submitter;
/**
* 状态精确查询
*/
@QueryField(field = "status", type = QueryType.EQUAL)
private FormDataStatusEnums status;
}

View File

@ -0,0 +1,56 @@
package com.qqchen.deploy.backend.workflow.dto.query;
import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.framework.query.BaseQuery;
import com.qqchen.deploy.backend.workflow.enums.FormDefinitionStatusEnums;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 表单定义查询对象
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class FormDefinitionQuery extends BaseQuery {
/**
* 表单名称模糊查询
*/
@QueryField(field = "name", type = QueryType.LIKE)
private String name;
/**
* 表单标识精确查询
*/
@QueryField(field = "key", type = QueryType.EQUAL)
private String key;
/**
* 表单版本精确查询
*/
@QueryField(field = "formVersion", type = QueryType.EQUAL)
private Integer formVersion;
/**
* 表单分类ID精确查询
*/
@QueryField(field = "categoryId", type = QueryType.EQUAL)
private Long categoryId;
/**
* 状态精确查询
*/
@QueryField(field = "status", type = QueryType.EQUAL)
private FormDefinitionStatusEnums status;
/**
* 是否为模板精确查询
*/
@QueryField(field = "isTemplate", type = QueryType.EQUAL)
private Boolean isTemplate;
}

View File

@ -0,0 +1,37 @@
package com.qqchen.deploy.backend.workflow.dto.query;
import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.framework.query.BaseQuery;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 工作流分类查询对象
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WorkflowCategoryQuery extends BaseQuery {
/**
* 分类名称模糊查询
*/
@QueryField(field = "name", type = QueryType.LIKE)
private String name;
/**
* 分类编码精确查询
*/
@QueryField(field = "code", type = QueryType.EQUAL)
private String code;
/**
* 是否启用精确查询
*/
@QueryField(field = "enabled", type = QueryType.EQUAL)
private Boolean enabled;
}

View File

@ -3,6 +3,7 @@ package com.qqchen.deploy.backend.workflow.dto.query;
import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.framework.query.BaseQuery;
import com.qqchen.deploy.backend.workflow.enums.WorkflowDefinitionStatusEnums;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -25,9 +26,21 @@ public class WorkflowDefinitionQuery extends BaseQuery {
@QueryField(field = "key", type = QueryType.EQUAL)
private String key;
/**
* 分类ID
*/
@QueryField(field = "categoryId", type = QueryType.EQUAL)
private Long categoryId;
/**
* 流程版本
*/
@QueryField(field = "version", type = QueryType.EQUAL)
private Integer version;
@QueryField(field = "flowVersion", type = QueryType.EQUAL)
private Integer flowVersion;
/**
* 流程状态
*/
@QueryField(field = "status", type = QueryType.EQUAL)
private WorkflowDefinitionStatusEnums status;
}

View File

@ -0,0 +1,58 @@
package com.qqchen.deploy.backend.workflow.entity;
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 表单分类实体
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@Table(name = "form_category")
@jakarta.persistence.Entity
@EqualsAndHashCode(callSuper = true)
@LogicDelete
public class FormCategory extends Entity<Long> {
/**
* 分类名称
*/
@Column(nullable = false, length = 100)
private String name;
/**
* 分类编码唯一
*/
@Column(nullable = false, length = 50, unique = true)
private String code;
/**
* 分类描述
*/
@Column(length = 500)
private String description;
/**
* 图标
*/
@Column(length = 50)
private String icon;
/**
* 排序
*/
@Column(nullable = false)
private Integer sort;
/**
* 是否启用
*/
@Column(nullable = false)
private Boolean enabled;
}

View File

@ -0,0 +1,99 @@
package com.qqchen.deploy.backend.workflow.entity;
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.workflow.enums.FormBusinessTypeEnums;
import com.qqchen.deploy.backend.workflow.enums.FormDataStatusEnums;
import com.vladmihalcea.hibernate.type.json.JsonType;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Type;
import java.time.LocalDateTime;
import java.util.Map;
/**
* 表单数据实体
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@Table(name = "form_data")
@jakarta.persistence.Entity
@EqualsAndHashCode(callSuper = true)
@LogicDelete
public class FormData extends Entity<Long> {
/**
* 表单定义ID
*/
@Column(name = "form_definition_id", nullable = false)
private Long formDefinitionId;
/**
* 表单标识冗余存储避免JOIN
*/
@Column(name = "form_key", nullable = false)
private String formKey;
/**
* 表单版本冗余存储用于历史追溯
*/
@Column(name = "form_version", nullable = false)
private Integer formVersion;
/**
* 表单分类ID冗余存储便于统计和查询
*/
@Column(name = "category_id")
private Long categoryId;
/**
* 业务标识如工作流实例ID订单号等
*/
@Column(name = "business_key")
private String businessKey;
/**
* 业务类型WORKFLOW-工作流ORDER-订单STANDALONE-独立表单
*/
@Column(name = "business_type")
@Enumerated(EnumType.STRING)
private FormBusinessTypeEnums businessType;
/**
* 表单填写数据用户提交的实际数据
*/
@Type(JsonType.class)
@Column(name = "data", nullable = false, columnDefinition = "json")
private Map<String, Object> data;
/**
* 表单Schema快照用于历史追溯确保数据可还原原样存储
*/
@Type(JsonType.class)
@Column(name = "schema_snapshot", nullable = false, columnDefinition = "json")
private Map<String, Object> schemaSnapshot;
/**
* 提交人
*/
@Column(name = "submitter")
private String submitter;
/**
* 提交时间
*/
@Column(name = "submit_time")
private LocalDateTime submitTime;
/**
* 状态DRAFT-草稿SUBMITTED-已提交COMPLETED-已完成REJECTED-已拒绝
*/
@Column(name = "status", nullable = false)
@Enumerated(EnumType.STRING)
private FormDataStatusEnums status;
}

View File

@ -0,0 +1,85 @@
package com.qqchen.deploy.backend.workflow.entity;
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.workflow.enums.FormDefinitionStatusEnums;
import com.vladmihalcea.hibernate.type.json.JsonType;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Type;
import java.util.List;
import java.util.Map;
/**
* 表单定义实体
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@Table(name = "form_definition")
@jakarta.persistence.Entity
@EqualsAndHashCode(callSuper = true)
@LogicDelete
public class FormDefinition extends Entity<Long> {
/**
* 表单名称
*/
@Column(nullable = false)
private String name;
/**
* 表单标识业务唯一
*/
@Column(name = "`key`", nullable = false)
private String key;
/**
* 表单版本号
*/
@Column(name = "form_version", nullable = false)
private Integer formVersion;
/**
* 表单分类ID
*/
@Column(name = "category_id")
private Long categoryId;
/**
* 表单描述
*/
@Column(name = "description", columnDefinition = "TEXT")
private String description;
/**
* 表单Schema前端设计器导出的JSON结构原样存储
*/
@Type(JsonType.class)
@Column(name = "`schema`", nullable = false, columnDefinition = "json")
private Map<String, Object> schema;
/**
* 标签用于分类和搜索
*/
@Type(JsonType.class)
@Column(name = "tags", columnDefinition = "json")
private List<String> tags;
/**
* 状态DRAFT-草稿PUBLISHED-已发布DISABLED-已禁用
*/
@Column(name = "status", nullable = false)
@Enumerated(EnumType.STRING)
private FormDefinitionStatusEnums status;
/**
* 是否为模板
*/
@Column(name = "is_template", nullable = false)
private Boolean isTemplate;
}

View File

@ -0,0 +1,69 @@
package com.qqchen.deploy.backend.workflow.entity;
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.framework.domain.Entity;
import com.vladmihalcea.hibernate.type.json.JsonType;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Type;
import java.util.List;
/**
* 工作流分类实体
*
* @author qqchen
* @date 2025-10-24
*/
@Data
@Table(name = "workflow_category")
@jakarta.persistence.Entity
@EqualsAndHashCode(callSuper = true)
@LogicDelete
public class WorkflowCategory extends Entity<Long> {
/**
* 分类名称
*/
@Column(name = "name", nullable = false, length = 100)
private String name;
/**
* 分类编码唯一如SCRIPT_EXECUTION
*/
@Column(name = "code", nullable = false, length = 50, unique = true)
private String code;
/**
* 分类描述
*/
@Column(name = "description", length = 500)
private String description;
/**
* 图标
*/
@Column(name = "icon", length = 50)
private String icon;
/**
* 排序
*/
@Column(name = "sort", nullable = false)
private Integer sort = 0;
/**
* 支持的触发方式列表JSON数组["MANUAL","SCHEDULED"]
*/
@Type(JsonType.class)
@Column(name = "supported_triggers", columnDefinition = "json")
private List<String> supportedTriggers;
/**
* 是否启用
*/
@Column(name = "enabled", nullable = false)
private Boolean enabled = true;
}

View File

@ -1,16 +1,11 @@
package com.qqchen.deploy.backend.workflow.entity;
import com.fasterxml.jackson.databind.JsonNode;
import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.workflow.dto.definition.workflow.WorkflowDefinitionGraph;
import com.qqchen.deploy.backend.workflow.enums.WorkflowCategoryEnum;
import com.qqchen.deploy.backend.workflow.enums.WorkflowDefinitionStatusEnums;
import com.qqchen.deploy.backend.workflow.enums.WorkflowTriggerTypeEnum;
import com.qqchen.deploy.backend.workflow.entity.converter.WorkflowGraphType;
import com.qqchen.deploy.backend.framework.domain.Entity;
import com.vladmihalcea.hibernate.type.json.JsonType;
import jakarta.persistence.Column;
import jakarta.persistence.Convert;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Table;
@ -18,8 +13,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.Type;
import java.util.List;
/**
* 工作流定义实体
*/
@ -43,18 +36,18 @@ public class WorkflowDefinition extends Entity<Long> {
private String key;
/**
* 流程分类
* 流程分类ID外键关联workflow_category
*/
@Column(name = "category", nullable = false)
@Enumerated(EnumType.STRING)
private WorkflowCategoryEnum category;
@Column(name = "category_id")
private Long categoryId;
/**
* 启动表单ID外键关联form_definition
*/
@Column(name = "form_definition_id")
private Long formDefinitionId;
@Column(name = "triggers", nullable = false)
@Convert(converter = WorkflowTriggerTypeListConverter.class)
private List<WorkflowTriggerTypeEnum> triggers;
@Column(name = "process_definition_id", nullable = false)
@Column(name = "process_definition_id")
private String processDefinitionId;
/**
@ -89,12 +82,4 @@ public class WorkflowDefinition extends Entity<Long> {
*/
@Column(columnDefinition = "TEXT")
private String description;
/**
* 流程标签用于分组和过滤
*/
@Type(JsonType.class)
@Column(name = "tags", columnDefinition = "json")
private JsonNode tags;
}

View File

@ -0,0 +1,28 @@
package com.qqchen.deploy.backend.workflow.enums;
import lombok.Getter;
/**
* 表单业务类型枚举
*
* @author qqchen
* @date 2025-10-24
*/
@Getter
public enum FormBusinessTypeEnums {
WORKFLOW("WORKFLOW", "工作流"),
ORDER("ORDER", "订单"),
STANDALONE("STANDALONE", "独立表单");
private final String code;
private final String description;
FormBusinessTypeEnums(String code, String description) {
this.code = code;
this.description = description;
}
}

View File

@ -0,0 +1,29 @@
package com.qqchen.deploy.backend.workflow.enums;
import lombok.Getter;
/**
* 表单数据状态枚举
*
* @author qqchen
* @date 2025-10-24
*/
@Getter
public enum FormDataStatusEnums {
DRAFT("DRAFT", "草稿"),
SUBMITTED("SUBMITTED", "已提交"),
COMPLETED("COMPLETED", "已完成"),
REJECTED("REJECTED", "已拒绝");
private final String code;
private final String description;
FormDataStatusEnums(String code, String description) {
this.code = code;
this.description = description;
}
}

View File

@ -0,0 +1,28 @@
package com.qqchen.deploy.backend.workflow.enums;
import lombok.Getter;
/**
* 表单定义状态枚举
*
* @author qqchen
* @date 2025-10-24
*/
@Getter
public enum FormDefinitionStatusEnums {
DRAFT("DRAFT", "草稿"),
PUBLISHED("PUBLISHED", "已发布"),
DISABLED("DISABLED", "已禁用");
private final String code;
private final String description;
FormDefinitionStatusEnums(String code, String description) {
this.code = code;
this.description = description;
}
}

View File

@ -1,72 +0,0 @@
package com.qqchen.deploy.backend.workflow.enums;
import lombok.Getter;
import java.util.Arrays;
import java.util.List;
/**
* 工作流节点分类枚举
*/
@Getter
public enum WorkflowCategoryEnum {
// 1. 脚本执行类
SCRIPT_EXECUTION(
"脚本执行",
"用于执行各类脚本的流程",
Arrays.asList(WorkflowTriggerTypeEnum.MANUAL, WorkflowTriggerTypeEnum.SCHEDULED)
),
// 2. 部署类
DEPLOYMENT(
"应用部署",
"用于应用部署的流程",
Arrays.asList(WorkflowTriggerTypeEnum.MANUAL, WorkflowTriggerTypeEnum.SCHEDULED, WorkflowTriggerTypeEnum.APPROVAL)
),
// 3. 数据同步类
DATA_SYNC(
"数据同步",
"用于第三方系统数据同步的流程",
Arrays.asList(WorkflowTriggerTypeEnum.MANUAL, WorkflowTriggerTypeEnum.SCHEDULED)
),
// 4. 配置同步类
CONFIG_SYNC(
"配置同步",
"用于配置中心数据同步的流程",
Arrays.asList(WorkflowTriggerTypeEnum.MANUAL, WorkflowTriggerTypeEnum.APPROVAL)
),
// 5. 审批流程类
APPROVAL(
"审批流程",
"纯审批流程",
Arrays.asList(WorkflowTriggerTypeEnum.MANUAL)
),
// 6. 其他类型用于扩展
OTHER(
"其他",
"其他类型流程",
Arrays.asList(WorkflowTriggerTypeEnum.MANUAL)
);
private final String label; // 显示名称
private final String description; // 描述
private final List<WorkflowTriggerTypeEnum> supportedTriggers; // 支持的触发方式
WorkflowCategoryEnum(String label, String description, List<WorkflowTriggerTypeEnum> supportedTriggers) {
this.label = label;
this.description = description;
this.supportedTriggers = supportedTriggers;
}
// 判断是否支持某种触发方式
public boolean supportsTriggerType(WorkflowTriggerTypeEnum triggerType) {
return supportedTriggers.contains(triggerType);
}
}

View File

@ -0,0 +1,42 @@
package com.qqchen.deploy.backend.workflow.repository;
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
import com.qqchen.deploy.backend.workflow.entity.FormCategory;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
/**
* 表单分类Repository接口
*
* @author qqchen
* @date 2025-10-24
*/
@Repository
public interface IFormCategoryRepository extends IBaseRepository<FormCategory, Long> {
/**
* 根据编码查询
*
* @param code 分类编码
* @return 表单分类
*/
Optional<FormCategory> findByCodeAndDeletedFalse(String code);
/**
* 检查编码是否存在
*
* @param code 分类编码
* @return 是否存在
*/
boolean existsByCodeAndDeletedFalse(String code);
/**
* 查询所有启用的分类按排序
*
* @return 分类列表
*/
List<FormCategory> findByEnabledTrueAndDeletedFalseOrderBySortAsc();
}

View File

@ -0,0 +1,65 @@
package com.qqchen.deploy.backend.workflow.repository;
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
import com.qqchen.deploy.backend.workflow.entity.FormData;
import com.qqchen.deploy.backend.workflow.enums.FormDataStatusEnums;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
/**
* 表单数据Repository接口
*
* @author qqchen
* @date 2025-10-24
*/
@Repository
public interface IFormDataRepository extends IBaseRepository<FormData, Long> {
/**
* 根据业务标识查询
*
* @param businessKey 业务标识
* @return 表单数据
*/
Optional<FormData> findByBusinessKeyAndDeletedFalse(String businessKey);
/**
* 根据表单标识分页查询
*
* @param formKey 表单标识
* @param pageable 分页参数
* @return 分页结果
*/
Page<FormData> findByFormKeyAndDeletedFalse(String formKey, Pageable pageable);
/**
* 根据提交人分页查询
*
* @param submitter 提交人
* @param pageable 分页参数
* @return 分页结果
*/
Page<FormData> findBySubmitterAndDeletedFalse(String submitter, Pageable pageable);
/**
* 根据状态分页查询
*
* @param status 状态
* @param pageable 分页参数
* @return 分页结果
*/
Page<FormData> findByStatusAndDeletedFalse(FormDataStatusEnums status, Pageable pageable);
/**
* 根据表单定义ID查询列表
*
* @param formDefinitionId 表单定义ID
* @return 表单数据列表
*/
List<FormData> findByFormDefinitionIdAndDeletedFalse(Long formDefinitionId);
}

View File

@ -0,0 +1,64 @@
package com.qqchen.deploy.backend.workflow.repository;
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
import com.qqchen.deploy.backend.workflow.entity.FormDefinition;
import com.qqchen.deploy.backend.workflow.enums.FormDefinitionStatusEnums;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
/**
* 表单定义Repository接口
*
* @author qqchen
* @date 2025-10-24
*/
@Repository
public interface IFormDefinitionRepository extends IBaseRepository<FormDefinition, Long> {
/**
* 根据表单标识和版本查询
*
* @param key 表单标识
* @param formVersion 表单版本
* @return 表单定义
*/
Optional<FormDefinition> findByKeyAndFormVersionAndDeletedFalse(String key, Integer formVersion);
/**
* 根据表单标识查询最新版本
*
* @param key 表单标识
* @return 表单定义
*/
Optional<FormDefinition> findFirstByKeyAndDeletedFalseOrderByFormVersionDesc(String key);
/**
* 检查表单标识是否存在
*
* @param key 表单标识
* @return 是否存在
*/
boolean existsByKeyAndDeletedFalse(String key);
/**
* 根据状态分页查询
*
* @param status 状态
* @param pageable 分页参数
* @return 分页结果
*/
Page<FormDefinition> findByStatusAndDeletedFalse(FormDefinitionStatusEnums status, Pageable pageable);
/**
* 根据状态查询列表
*
* @param status 状态
* @return 表单定义列表
*/
List<FormDefinition> findByStatusAndDeletedFalse(FormDefinitionStatusEnums status);
}

View File

@ -0,0 +1,24 @@
package com.qqchen.deploy.backend.workflow.repository;
import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
import com.qqchen.deploy.backend.workflow.entity.WorkflowCategory;
import org.springframework.stereotype.Repository;
/**
* 工作流分类Repository
*
* @author qqchen
* @date 2025-10-24
*/
@Repository
public interface IWorkflowCategoryRepository extends IBaseRepository<WorkflowCategory, Long> {
/**
* 根据编码查询分类
*
* @param code 分类编码
* @return 工作流分类
*/
WorkflowCategory findByCodeAndDeletedFalse(String code);
}

View File

@ -0,0 +1,25 @@
package com.qqchen.deploy.backend.workflow.service;
import com.qqchen.deploy.backend.framework.service.IBaseService;
import com.qqchen.deploy.backend.workflow.dto.FormCategoryDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormCategoryQuery;
import com.qqchen.deploy.backend.workflow.entity.FormCategory;
import java.util.List;
/**
* 表单分类服务接口
*
* @author qqchen
* @date 2025-10-24
*/
public interface IFormCategoryService extends IBaseService<FormCategory, FormCategoryDTO, FormCategoryQuery, Long> {
/**
* 查询所有启用的分类
*
* @return 分类列表
*/
List<FormCategoryDTO> findAllEnabled();
}

View File

@ -0,0 +1,32 @@
package com.qqchen.deploy.backend.workflow.service;
import com.qqchen.deploy.backend.framework.service.IBaseService;
import com.qqchen.deploy.backend.workflow.dto.FormDataDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormDataQuery;
import com.qqchen.deploy.backend.workflow.entity.FormData;
/**
* 表单数据服务接口
*
* @author qqchen
* @date 2025-10-24
*/
public interface IFormDataService extends IBaseService<FormData, FormDataDTO, FormDataQuery, Long> {
/**
* 提交表单数据
*
* @param dto 表单数据DTO
* @return 提交后的表单数据
*/
FormDataDTO submit(FormDataDTO dto);
/**
* 根据业务标识查询表单数据
*
* @param businessKey 业务标识
* @return 表单数据
*/
FormDataDTO getByBusinessKey(String businessKey);
}

View File

@ -0,0 +1,33 @@
package com.qqchen.deploy.backend.workflow.service;
import com.qqchen.deploy.backend.framework.service.IBaseService;
import com.qqchen.deploy.backend.workflow.dto.FormDefinitionDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormDefinitionQuery;
import com.qqchen.deploy.backend.workflow.entity.FormDefinition;
/**
* 表单定义服务接口
*
* @author qqchen
* @date 2025-10-24
*/
public interface IFormDefinitionService extends IBaseService<FormDefinition, FormDefinitionDTO, FormDefinitionQuery, Long> {
/**
* 发布表单版本不可变
* 如果当前表单已发布则创建新版本否则直接发布
*
* @param id 表单定义ID
* @return 发布后的表单定义
*/
FormDefinitionDTO publish(Long id);
/**
* 根据表单标识获取最新版本
*
* @param key 表单标识
* @return 表单定义
*/
FormDefinitionDTO getLatestByKey(String key);
}

View File

@ -0,0 +1,16 @@
package com.qqchen.deploy.backend.workflow.service;
import com.qqchen.deploy.backend.framework.service.IBaseService;
import com.qqchen.deploy.backend.workflow.dto.WorkflowCategoryDTO;
import com.qqchen.deploy.backend.workflow.dto.query.WorkflowCategoryQuery;
import com.qqchen.deploy.backend.workflow.entity.WorkflowCategory;
/**
* 工作流分类Service接口
*
* @author qqchen
* @date 2025-10-24
*/
public interface IWorkflowCategoryService extends IBaseService<WorkflowCategory, WorkflowCategoryDTO, WorkflowCategoryQuery, Long> {
}

View File

@ -9,7 +9,6 @@ import com.qqchen.deploy.backend.workflow.dto.WorkflowInstanceCreateDTO;
import com.qqchen.deploy.backend.workflow.dto.WorkflowInstanceDTO;
import com.qqchen.deploy.backend.workflow.dto.query.WorkflowDefinitionQuery;
import com.qqchen.deploy.backend.workflow.entity.WorkflowDefinition;
import com.qqchen.deploy.backend.workflow.enums.WorkflowCategoryEnum;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.runtime.ProcessInstance;
import org.springframework.transaction.annotation.Transactional;

View File

@ -0,0 +1,42 @@
package com.qqchen.deploy.backend.workflow.service.impl;
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import com.qqchen.deploy.backend.workflow.dto.FormCategoryDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormCategoryQuery;
import com.qqchen.deploy.backend.workflow.entity.FormCategory;
import com.qqchen.deploy.backend.workflow.repository.IFormCategoryRepository;
import com.qqchen.deploy.backend.workflow.service.IFormCategoryService;
import com.qqchen.deploy.backend.workflow.converter.FormCategoryConverter;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
* 表单分类服务实现
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@Service
public class FormCategoryServiceImpl extends BaseServiceImpl<FormCategory, FormCategoryDTO, FormCategoryQuery, Long> implements IFormCategoryService {
@Resource
private IFormCategoryRepository formCategoryRepository;
@Resource
private FormCategoryConverter formCategoryConverter;
@Override
public List<FormCategoryDTO> findAllEnabled() {
log.info("查询所有启用的表单分类");
List<FormCategory> categories = formCategoryRepository.findByEnabledTrueAndDeletedFalseOrderBySortAsc();
return categories.stream()
.map(formCategoryConverter::toDto)
.collect(Collectors.toList());
}
}

View File

@ -0,0 +1,75 @@
package com.qqchen.deploy.backend.workflow.service.impl;
import com.qqchen.deploy.backend.framework.exception.BusinessException;
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import com.qqchen.deploy.backend.workflow.dto.FormDataDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormDataQuery;
import com.qqchen.deploy.backend.workflow.entity.FormData;
import com.qqchen.deploy.backend.workflow.entity.FormDefinition;
import com.qqchen.deploy.backend.workflow.enums.FormDataStatusEnums;
import com.qqchen.deploy.backend.workflow.repository.IFormDataRepository;
import com.qqchen.deploy.backend.workflow.repository.IFormDefinitionRepository;
import com.qqchen.deploy.backend.workflow.service.IFormDataService;
import com.qqchen.deploy.backend.workflow.converter.FormDataConverter;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
/**
* 表单数据服务实现
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@Service
public class FormDataServiceImpl extends BaseServiceImpl<FormData, FormDataDTO, FormDataQuery, Long> implements IFormDataService {
@Resource
private IFormDataRepository formDataRepository;
@Resource
private IFormDefinitionRepository formDefinitionRepository;
@Resource
private FormDataConverter formDataConverter;
@Override
@Transactional
public FormDataDTO submit(FormDataDTO dto) {
log.info("提交表单数据: formKey={}, submitter={}", dto.getFormKey(), dto.getSubmitter());
// 1. 查询表单定义获取schema快照
FormDefinition formDefinition = formDefinitionRepository.findById(dto.getFormDefinitionId())
.orElseThrow(() -> new BusinessException(com.qqchen.deploy.backend.framework.enums.ResponseCode.FORM_DEFINITION_NOT_FOUND));
// 2. 创建表单数据
FormData formData = formDataConverter.toEntity(dto);
formData.setFormKey(formDefinition.getKey());
formData.setFormVersion(formDefinition.getFormVersion());
formData.setCategoryId(formDefinition.getCategoryId()); // 冗余存储分类ID
formData.setSchemaSnapshot(formDefinition.getSchema()); // 保存schema快照
formData.setSubmitTime(LocalDateTime.now());
formData.setStatus(FormDataStatusEnums.SUBMITTED);
// 3. 保存
FormData savedFormData = formDataRepository.save(formData);
log.info("表单数据提交成功: id={}, formKey={}", savedFormData.getId(), savedFormData.getFormKey());
return formDataConverter.toDto(savedFormData);
}
@Override
public FormDataDTO getByBusinessKey(String businessKey) {
log.info("根据业务标识查询表单数据: businessKey={}", businessKey);
FormData formData = formDataRepository.findByBusinessKeyAndDeletedFalse(businessKey)
.orElseThrow(() -> new BusinessException(com.qqchen.deploy.backend.framework.enums.ResponseCode.FORM_DATA_NOT_FOUND));
return formDataConverter.toDto(formData);
}
}

View File

@ -0,0 +1,133 @@
package com.qqchen.deploy.backend.workflow.service.impl;
import com.qqchen.deploy.backend.framework.exception.BusinessException;
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import com.qqchen.deploy.backend.workflow.dto.FormDefinitionDTO;
import com.qqchen.deploy.backend.workflow.dto.query.FormDefinitionQuery;
import com.qqchen.deploy.backend.workflow.entity.FormDefinition;
import com.qqchen.deploy.backend.workflow.enums.FormDefinitionStatusEnums;
import com.qqchen.deploy.backend.workflow.repository.IFormDefinitionRepository;
import com.qqchen.deploy.backend.workflow.service.IFormDefinitionService;
import com.qqchen.deploy.backend.workflow.converter.FormDefinitionConverter;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 表单定义服务实现
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@Service
public class FormDefinitionServiceImpl extends BaseServiceImpl<FormDefinition, FormDefinitionDTO, FormDefinitionQuery, Long> implements IFormDefinitionService {
@Resource
private IFormDefinitionRepository formDefinitionRepository;
@Resource
private FormDefinitionConverter formDefinitionConverter;
@Override
@Transactional
public FormDefinitionDTO create(FormDefinitionDTO dto) {
log.info("创建表单定义: name={}, key={}", dto.getName(), dto.getKey());
// 1. 转换为实体
FormDefinition formDefinition = formDefinitionConverter.toEntity(dto);
// 2. 后端控制版本号和状态前端传递的值会被覆盖
formDefinition.setFormVersion(1); // 新建表单版本号固定为 1
formDefinition.setStatus(FormDefinitionStatusEnums.DRAFT); // 新建表单状态固定为草稿
// 3. 保存
FormDefinition savedForm = formDefinitionRepository.save(formDefinition);
log.info("表单定义创建成功: id={}, key={}, version={}", savedForm.getId(), savedForm.getKey(), savedForm.getFormVersion());
return formDefinitionConverter.toDto(savedForm);
}
@Override
@Transactional
public FormDefinitionDTO update(Long id, FormDefinitionDTO dto) {
log.info("更新表单定义: id={}, name={}", id, dto.getName());
// 1. 查询原始表单定义
FormDefinition existingForm = formDefinitionRepository.findById(id)
.orElseThrow(() -> new BusinessException(com.qqchen.deploy.backend.framework.enums.ResponseCode.FORM_DEFINITION_NOT_FOUND));
// 2. 保留后端控制的字段版本号和状态由后端控制不允许前端修改
Integer originalFormVersion = existingForm.getFormVersion();
FormDefinitionStatusEnums originalStatus = existingForm.getStatus();
// 3. 转换并更新允许修改的字段
FormDefinition formDefinition = formDefinitionConverter.toEntity(dto);
formDefinition.setId(id); // 使用路径参数的ID
formDefinition.setFormVersion(originalFormVersion); // 保留原始版本号
formDefinition.setStatus(originalStatus); // 保留原始状态
// 4. 保存
FormDefinition savedForm = formDefinitionRepository.save(formDefinition);
log.info("表单定义更新成功: id={}, version={}, status={}", savedForm.getId(), savedForm.getFormVersion(), savedForm.getStatus());
return formDefinitionConverter.toDto(savedForm);
}
@Override
@Transactional
public FormDefinitionDTO publish(Long id) {
log.info("发布表单定义ID: {}", id);
// 1. 查询当前表单定义
FormDefinition currentForm = formDefinitionRepository.findById(id)
.orElseThrow(() -> new BusinessException(com.qqchen.deploy.backend.framework.enums.ResponseCode.FORM_DEFINITION_NOT_FOUND));
// 2. 检查是否已发布
if (FormDefinitionStatusEnums.PUBLISHED.equals(currentForm.getStatus())) {
log.info("表单已发布,创建新版本: key={}, currentVersion={}", currentForm.getKey(), currentForm.getFormVersion());
// 创建新版本
FormDefinition newVersion = new FormDefinition();
newVersion.setName(currentForm.getName());
newVersion.setKey(currentForm.getKey());
newVersion.setFormVersion(currentForm.getFormVersion() + 1);
newVersion.setCategoryId(currentForm.getCategoryId());
newVersion.setDescription(currentForm.getDescription());
newVersion.setSchema(currentForm.getSchema());
newVersion.setTags(currentForm.getTags());
newVersion.setStatus(FormDefinitionStatusEnums.PUBLISHED);
newVersion.setIsTemplate(currentForm.getIsTemplate());
FormDefinition savedNewVersion = formDefinitionRepository.save(newVersion);
log.info("新版本创建成功: id={}, version={}", savedNewVersion.getId(), savedNewVersion.getFormVersion());
return formDefinitionConverter.toDto(savedNewVersion);
} else {
// 3. 首次发布直接更新状态
log.info("首次发布表单: key={}, version={}", currentForm.getKey(), currentForm.getFormVersion());
currentForm.setStatus(FormDefinitionStatusEnums.PUBLISHED);
if (currentForm.getFormVersion() == null) {
currentForm.setFormVersion(1);
}
FormDefinition savedForm = formDefinitionRepository.save(currentForm);
log.info("表单发布成功: id={}, version={}", savedForm.getId(), savedForm.getFormVersion());
return formDefinitionConverter.toDto(savedForm);
}
}
@Override
public FormDefinitionDTO getLatestByKey(String key) {
log.info("根据key获取最新版本表单: key={}", key);
FormDefinition formDefinition = formDefinitionRepository
.findFirstByKeyAndDeletedFalseOrderByFormVersionDesc(key)
.orElseThrow(() -> new BusinessException(com.qqchen.deploy.backend.framework.enums.ResponseCode.FORM_DEFINITION_NOT_FOUND));
return formDefinitionConverter.toDto(formDefinition);
}
}

View File

@ -0,0 +1,21 @@
package com.qqchen.deploy.backend.workflow.service.impl;
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import com.qqchen.deploy.backend.workflow.dto.WorkflowCategoryDTO;
import com.qqchen.deploy.backend.workflow.dto.query.WorkflowCategoryQuery;
import com.qqchen.deploy.backend.workflow.entity.WorkflowCategory;
import com.qqchen.deploy.backend.workflow.service.IWorkflowCategoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* 工作流分类Service实现
*
* @author qqchen
* @date 2025-10-24
*/
@Slf4j
@Service
public class WorkflowCategoryServiceImpl extends BaseServiceImpl<WorkflowCategory, WorkflowCategoryDTO, WorkflowCategoryQuery, Long> implements IWorkflowCategoryService {
}

View File

@ -8,7 +8,6 @@ import com.qqchen.deploy.backend.workflow.dto.WorkflowTriggerTypeDTO;
import com.qqchen.deploy.backend.workflow.dto.definition.workflow.WorkflowDefinitionGraph;
import com.qqchen.deploy.backend.workflow.dto.query.WorkflowDefinitionQuery;
import com.qqchen.deploy.backend.workflow.entity.WorkflowDefinition;
import com.qqchen.deploy.backend.workflow.enums.WorkflowCategoryEnum;
import com.qqchen.deploy.backend.workflow.enums.WorkflowDefinitionStatusEnums;
import com.qqchen.deploy.backend.workflow.enums.WorkflowNodeInstanceStatusEnums;
import com.qqchen.deploy.backend.workflow.repository.IWorkflowDefinitionRepository;
@ -68,6 +67,11 @@ public class WorkflowDefinitionServiceImpl extends BaseServiceImpl<WorkflowDefin
@Resource
private IWorkflowDefinitionRepository workflowDefinitionRepository;
@Resource
private com.qqchen.deploy.backend.workflow.repository.IWorkflowCategoryRepository workflowCategoryRepository;
@Resource
private com.qqchen.deploy.backend.workflow.converter.WorkflowCategoryConverter workflowCategoryConverter;
@Resource
private BpmnConverter bpmnConverter;
@ -337,25 +341,11 @@ public class WorkflowDefinitionServiceImpl extends BaseServiceImpl<WorkflowDefin
@Override
public List<WorkflowCategoryDTO> getWorkflowCategories() {
return Arrays.stream(WorkflowCategoryEnum.values())
.map(category -> {
WorkflowCategoryDTO dto = new WorkflowCategoryDTO();
dto.setCode(category.name());
dto.setLable(category.getLabel());
dto.setDescription(category.getDescription());
// 获取该类别支持的触发方式
dto.setSupportedTriggers(
category.getSupportedTriggers().stream()
.map(triggerType -> {
WorkflowTriggerTypeDTO triggerDto = new WorkflowTriggerTypeDTO();
triggerDto.setCode(triggerType.name());
triggerDto.setLable(triggerType.getLabel());
return triggerDto;
})
.collect(Collectors.toList())
);
return dto;
})
// 从数据库查询启用的工作流分类按排序字段排序
return workflowCategoryRepository.findAll().stream()
.filter(category -> category.getEnabled() && !category.getDeleted())
.sorted((a, b) -> a.getSort().compareTo(b.getSort()))
.map(workflowCategoryConverter::toDto)
.collect(Collectors.toList());
}

View File

@ -91,7 +91,12 @@ VALUES
(230, '集成工具', '/integration', 'Layout', 'ApiOutlined', 1, NULL, 6, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
(231, 'Jenkins集成', '/deploy/jenkins-manager', '/src/pages/Deploy/JenkinsManager/List', 'BuildOutlined', 2, 230, 10, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
(232, 'Git仓库', '/deploy/git-manager', '/src/pages/Deploy/GitManager/List', 'GithubOutlined', 2, 230, 20, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
(233, '外部服务', '/deploy/external', '/src/pages/Deploy/external/index', 'LinkOutlined', 2, 230, 30, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE);
(233, '外部服务', '/deploy/external', '/src/pages/Deploy/external/index', 'LinkOutlined', 2, 230, 30, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
-- 📄 表单管理
(300, '表单管理', '/form', 'Layout', 'FormOutlined', 1, NULL, 7, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
(301, '表单定义', '/form/definitions', '/src/pages/form/definitions/index', 'FileTextOutlined', 2, 300, 10, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE),
(302, '表单数据', '/form/data', '/src/pages/form/data/index', 'DatabaseOutlined', 2, 300, 20, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE);
-- 初始化角色数据
INSERT INTO sys_role (id, create_time, code, name, type, description, sort)
@ -130,6 +135,7 @@ SELECT 1, id FROM sys_menu; -- 超级管理员拥有所有菜单权限
INSERT INTO sys_role_menu (role_id, menu_id)
VALUES
(2, 1), (2, 2), (2, 3), (2, 4), (2, 5), -- 系统管理员拥有系统管理相关权限
(2, 300), (2, 301), (2, 302), -- 系统管理员拥有表单管理权限
(3, 233); -- 普通用户拥有外部服务权限
-- 初始化权限模板
@ -143,7 +149,9 @@ INSERT INTO sys_template_menu (template_id, menu_id)
SELECT 1, id FROM sys_menu; -- 完整权限模板关联所有菜单
INSERT INTO sys_template_menu (template_id, menu_id)
VALUES (2, 233); -- 基础权限模板关联外部服务菜单
VALUES
(2, 233), -- 基础权限模板关联外部服务菜单
(2, 300), (2, 302); -- 基础权限模板关联表单管理和表单数据(不包括表单定义)
-- 初始化权限数据
INSERT INTO sys_permission (id, create_time, menu_id, code, name, type, sort)
@ -166,7 +174,21 @@ VALUES
(11, NOW(), 233, 'system:external:update', '外部服务修改', 'FUNCTION', 3),
(12, NOW(), 233, 'system:external:delete', '外部服务删除', 'FUNCTION', 4),
(13, NOW(), 233, 'system:external:test', '连接测试', 'FUNCTION', 5),
(14, NOW(), 233, 'system:external:sync', '数据同步', 'FUNCTION', 6);
(14, NOW(), 233, 'system:external:sync', '数据同步', 'FUNCTION', 6),
-- 表单定义权限
(15, NOW(), 301, 'form:definition:list', '表单定义列表', 'FUNCTION', 1),
(16, NOW(), 301, 'form:definition:create', '创建表单定义', 'FUNCTION', 2),
(17, NOW(), 301, 'form:definition:update', '修改表单定义', 'FUNCTION', 3),
(18, NOW(), 301, 'form:definition:delete', '删除表单定义', 'FUNCTION', 4),
(19, NOW(), 301, 'form:definition:publish', '发布表单', 'FUNCTION', 5),
-- 表单数据权限
(20, NOW(), 302, 'form:data:list', '表单数据列表', 'FUNCTION', 1),
(21, NOW(), 302, 'form:data:view', '查看表单数据', 'FUNCTION', 2),
(22, NOW(), 302, 'form:data:submit', '提交表单数据', 'FUNCTION', 3),
(23, NOW(), 302, 'form:data:delete', '删除表单数据', 'FUNCTION', 4),
(24, NOW(), 302, 'form:data:export', '导出表单数据', 'FUNCTION', 5);
-- --------------------------------------------------------------------------------------
-- 初始化外部系统数据
@ -197,12 +219,23 @@ INSERT INTO sys_external_system (
-- --------------------------------------------------------------------------------------
-- 初始化工作流相关数据
-- --------------------------------------------------------------------------------------
-- 工作流分类初始数据
INSERT INTO workflow_category (name, code, description, icon, sort, supported_triggers, enabled, create_by, create_time, update_by, update_time, version, deleted)
VALUES
('脚本执行', 'SCRIPT_EXECUTION', '用于执行各类脚本的流程', 'CodeOutlined', 1, '["MANUAL","SCHEDULED"]', 1, 'system', NOW(), 'system', NOW(), 0, 0),
('应用部署', 'DEPLOYMENT', '用于应用部署的流程', 'DeploymentUnitOutlined', 2, '["MANUAL","SCHEDULED","APPROVAL"]', 1, 'system', NOW(), 'system', NOW(), 0, 0),
('数据同步', 'DATA_SYNC', '用于第三方系统数据同步的流程', 'SyncOutlined', 3, '["MANUAL","SCHEDULED"]', 1, 'system', NOW(), 'system', NOW(), 0, 0),
('配置同步', 'CONFIG_SYNC', '用于配置中心数据同步的流程', 'SettingOutlined', 4, '["MANUAL","APPROVAL"]', 1, 'system', NOW(), 'system', NOW(), 0, 0),
('审批流程', 'APPROVAL', '纯审批流程', 'AuditOutlined', 5, '["MANUAL"]', 1, 'system', NOW(), 'system', NOW(), 0, 0),
('其他', 'OTHER', '其他类型流程', 'AppstoreOutlined', 99, '["MANUAL"]', 1, 'system', NOW(), 'system', NOW(), 0, 0);
-- 工作流定义测试数据
INSERT INTO workflow_definition (
-- 基础信息
name, `key`, process_definition_id, flow_version, description, category, triggers,
name, `key`, process_definition_id, flow_version, description, category_id, form_definition_id,
-- 流程配置
graph, tags,
graph,
-- 流程属性
status,
-- 审计字段
@ -210,7 +243,7 @@ INSERT INTO workflow_definition (
) VALUES
-- 简单脚本流程:开始 -> 脚本任务 -> 结束
(
'简单脚本流程', 'simple_script_flow', null, 1, '一个包含脚本任务的简单流程', 'SCRIPT_EXECUTION', null,
'简单脚本流程', 'simple_script_flow', null, 1, '一个包含脚本任务的简单流程', 1, null,
'{
"nodes" : [ {
"id" : "startEvent1",
@ -371,14 +404,13 @@ INSERT INTO workflow_definition (
"properties" : null
} ]
}',
'["simple","script","test"]',
'DRAFT',
NOW(), NOW(), NULL, NULL, 0, 0
),
-- 复杂业务流程:开始 -> 脚本任务A -> 脚本任务B -> 结束
(
'复杂业务流程', 'complex_business_flow', null, 1, '包含多个脚本任务节点的业务流程', 'SCRIPT_EXECUTION', null,
'复杂业务流程', 'complex_business_flow', null, 1, '包含多个脚本任务节点的业务流程', 1, null,
'{
"nodes" : [ {
"id" : "startEvent1",
@ -602,7 +634,6 @@ INSERT INTO workflow_definition (
"properties" : null
} ]
}',
'["complex","business","multi-task"]',
'DRAFT',
NOW(), NOW(), NULL, NULL, 0, 0
);
@ -835,3 +866,14 @@ VALUES
-- 'DISABLED',
-- '管理员邮件通知渠道(示例数据,请修改为实际配置)',
-- 'admin', NOW(), 'admin', NOW(), 0, 0);
-- --------------------------------------------------------------------------------------
-- 初始化表单分类数据
-- --------------------------------------------------------------------------------------
INSERT INTO form_category (name, code, description, icon, sort, enabled, create_by, create_time, update_by, update_time, version, deleted)
VALUES
('审批表单', 'APPROVAL', '用于审批流程的表单', 'CheckCircleOutlined', 1, 1, 'system', NOW(), 'system', NOW(), 0, 0),
('数据采集', 'DATA_COLLECTION', '用于数据采集的表单', 'DatabaseOutlined', 2, 1, 'system', NOW(), 'system', NOW(), 0, 0),
('问卷调查', 'SURVEY', '用于问卷调查的表单', 'FormOutlined', 3, 1, 'system', NOW(), 'system', NOW(), 0, 0),
('其他', 'OTHER', '其他类型的表单', 'FileOutlined', 99, 1, 'system', NOW(), 'system', NOW(), 0, 0);

View File

@ -371,6 +371,113 @@ CREATE TABLE deploy_repo_branch
-- 工作流相关表
-- --------------------------------------------------------------------------------------
-- 工作流分类表
CREATE TABLE workflow_category
(
-- 主键
id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
-- 基础信息
name VARCHAR(100) NOT NULL COMMENT '分类名称',
code VARCHAR(50) NOT NULL COMMENT '分类编码唯一如SCRIPT_EXECUTION',
description VARCHAR(500) NULL COMMENT '分类描述',
icon VARCHAR(50) NULL COMMENT '图标',
sort INT NOT NULL DEFAULT 0 COMMENT '排序',
-- 支持的触发方式JSON数组如["MANUAL","SCHEDULED"]
supported_triggers JSON NULL COMMENT '支持的触发方式列表',
-- 状态
enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用',
-- 审计字段
create_by VARCHAR(255) NULL COMMENT '创建人',
create_time DATETIME(6) NULL COMMENT '创建时间',
deleted BIT NOT NULL DEFAULT 0 COMMENT '是否删除',
update_by VARCHAR(255) NULL COMMENT '更新人',
update_time DATETIME(6) NULL COMMENT '更新时间',
version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
-- 约束和索引
UNIQUE KEY uk_code (code),
INDEX idx_enabled (enabled),
INDEX idx_deleted (deleted),
INDEX idx_sort (sort)
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci
COMMENT = '工作流分类表';
CREATE TABLE form_category
(
-- 主键
id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
-- 基础信息
name VARCHAR(100) NOT NULL COMMENT '分类名称',
code VARCHAR(50) NOT NULL COMMENT '分类编码(唯一)',
description VARCHAR(500) NULL COMMENT '分类描述',
icon VARCHAR(50) NULL COMMENT '图标',
sort INT NOT NULL DEFAULT 0 COMMENT '排序',
-- 状态
enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用',
-- 审计字段
create_by VARCHAR(255) NULL COMMENT '创建人',
create_time DATETIME(6) NULL COMMENT '创建时间',
deleted BIT NOT NULL DEFAULT 0 COMMENT '是否删除',
update_by VARCHAR(255) NULL COMMENT '更新人',
update_time DATETIME(6) NULL COMMENT '更新时间',
version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
-- 约束和索引
UNIQUE KEY uk_code (code),
INDEX idx_enabled (enabled),
INDEX idx_deleted (deleted),
INDEX idx_sort (sort)
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci
COMMENT = '表单分类表';
-- 表单定义表
CREATE TABLE form_definition
(
-- 主键
id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
-- 基础信息
name VARCHAR(255) NOT NULL COMMENT '表单名称',
`key` VARCHAR(255) NOT NULL COMMENT '表单标识(业务唯一)',
form_version INT NOT NULL DEFAULT 1 COMMENT '表单版本号',
category_id BIGINT NULL COMMENT '表单分类ID外键关联form_category',
description TEXT NULL COMMENT '表单描述',
-- 表单配置
`schema` JSON NOT NULL COMMENT '表单Schema前端设计器导出的JSON结构',
tags JSON NULL COMMENT '标签(用于分类和搜索)',
-- 表单属性
status VARCHAR(50) NOT NULL DEFAULT 'DRAFT' COMMENT '状态DRAFT-草稿、PUBLISHED-已发布、DISABLED-已禁用)',
is_template BIT NOT NULL DEFAULT 0 COMMENT '是否为模板',
-- 审计字段
create_by VARCHAR(255) NULL COMMENT '创建人',
create_time DATETIME(6) NULL COMMENT '创建时间',
deleted BIT NOT NULL DEFAULT 0 COMMENT '是否删除',
update_by VARCHAR(255) NULL COMMENT '更新人',
update_time DATETIME(6) NULL COMMENT '更新时间',
version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
-- 约束和索引
UNIQUE KEY uk_key_version (`key`, form_version),
INDEX idx_category_id (category_id),
INDEX idx_status (status),
INDEX idx_is_template (is_template),
INDEX idx_deleted (deleted),
-- 外键约束
CONSTRAINT fk_form_definition_category FOREIGN KEY (category_id) REFERENCES form_category(id)
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci
COMMENT = '表单定义表';
-- 工作流定义表
CREATE TABLE workflow_definition
(
@ -380,8 +487,8 @@ CREATE TABLE workflow_definition
-- 基础信息
name VARCHAR(255) NOT NULL COMMENT '流程名称',
`key` VARCHAR(255) NOT NULL COMMENT '流程标识',
category VARCHAR(100) COMMENT '流程分类',
triggers VARCHAR(200) COMMENT '流程分类',
category_id BIGINT NULL COMMENT '流程分类ID外键关联workflow_category',
form_definition_id BIGINT NULL COMMENT '启动表单ID外键关联form_definition',
process_definition_id VARCHAR(100) NULL COMMENT '工作流定义ID',
flow_version INT NOT NULL COMMENT '流程版本',
description TEXT COMMENT '流程描述',
@ -389,7 +496,6 @@ CREATE TABLE workflow_definition
-- 流程配置
bpmn_xml TEXT COMMENT 'BPMN XML内容',
graph JSON COMMENT '流程图数据,包含节点和连线的位置、样式等信息',
tags JSON COMMENT '流程标签',
-- 流程属性
status VARCHAR(50) NOT NULL COMMENT '流程状态DRAFT-草稿、PUBLISHED-已发布、DISABLED-已禁用)',
@ -402,8 +508,14 @@ CREATE TABLE workflow_definition
update_time DATETIME(6) NULL COMMENT '更新时间',
version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
-- 约束
UNIQUE KEY uk_key_version (`key`, flow_version)
-- 约束和索引
UNIQUE KEY uk_key_version (`key`, flow_version),
INDEX idx_category_id (category_id),
INDEX idx_form_definition_id (form_definition_id),
INDEX idx_status (status),
INDEX idx_deleted (deleted),
CONSTRAINT fk_workflow_definition_category FOREIGN KEY (category_id) REFERENCES workflow_category(id),
CONSTRAINT fk_workflow_definition_form FOREIGN KEY (form_definition_id) REFERENCES form_definition(id)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_unicode_ci COMMENT ='工作流定义表';
@ -689,3 +801,51 @@ CREATE TABLE sys_notification_channel (
INDEX idx_deleted (deleted)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='通知渠道配置表';
-- 表单数据表
CREATE TABLE form_data
(
-- 主键
id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
-- 关联表单定义
form_definition_id BIGINT NOT NULL COMMENT '表单定义ID',
form_key VARCHAR(255) NOT NULL COMMENT '表单标识冗余存储避免JOIN',
form_version INT NOT NULL COMMENT '表单版本(冗余存储,用于历史追溯)',
category_id BIGINT NULL COMMENT '表单分类ID冗余存储便于统计和查询',
-- 业务关联(松耦合)
business_key VARCHAR(255) NULL COMMENT '业务标识如工作流实例ID、订单号等',
business_type VARCHAR(50) NULL COMMENT '业务类型WORKFLOW-工作流、ORDER-订单、STANDALONE-独立表单)',
-- 表单数据
data JSON NOT NULL COMMENT '表单填写数据(用户提交的实际数据)',
schema_snapshot JSON NOT NULL COMMENT '表单Schema快照用于历史追溯确保数据可还原',
-- 提交信息
submitter VARCHAR(255) NULL COMMENT '提交人',
submit_time DATETIME(6) NULL COMMENT '提交时间',
-- 状态
status VARCHAR(50) NOT NULL DEFAULT 'SUBMITTED' COMMENT '状态DRAFT-草稿、SUBMITTED-已提交、COMPLETED-已完成、REJECTED-已拒绝)',
-- 审计字段
create_by VARCHAR(255) NULL COMMENT '创建人',
create_time DATETIME(6) NULL COMMENT '创建时间',
deleted BIT NOT NULL DEFAULT 0 COMMENT '是否删除',
update_by VARCHAR(255) NULL COMMENT '更新人',
update_time DATETIME(6) NULL COMMENT '更新时间',
version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
-- 索引
INDEX idx_form_definition_id (form_definition_id),
INDEX idx_form_key (form_key),
INDEX idx_category_id (category_id),
INDEX idx_business_key (business_key),
INDEX idx_business_type (business_type),
INDEX idx_submitter (submitter),
INDEX idx_status (status),
INDEX idx_submit_time (submit_time),
INDEX idx_deleted (deleted)
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci
COMMENT = '表单数据表';

View File

@ -241,3 +241,7 @@ workflow.variable.serialize.error=\u5DE5\u4F5C\u6D41\u53D8\u91CF\u5E8F\u5217\u53
workflow.variable.deserialize.error=\u5DE5\u4F5C\u6D41\u53D8\u91CF\u53CD\u5E8F\u5217\u5316\u5931\u8D25: {0}
workflow.config.error=\u5DE5\u4F5C\u6D41\u914D\u7F6E\u9519\u8BEF: {0}
# \u8868\u5355\u7BA1\u7406\u76F8\u5173\u9519\u8BEF\u7801 (2800-2899)
form.definition.not.found=\u8868\u5355\u5B9A\u4E49\u4E0D\u5B58\u5728\u6216\u5DF2\u5220\u9664
form.data.not.found=\u8868\u5355\u6570\u636E\u4E0D\u5B58\u5728\u6216\u5DF2\u5220\u9664

View File

@ -0,0 +1,199 @@
import * as React from "react"
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { Check, ChevronRight, Circle } from "lucide-react"
import { cn } from "@/lib/utils"
const DropdownMenu = DropdownMenuPrimitive.Root
const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger
const DropdownMenuGroup = DropdownMenuPrimitive.Group
const DropdownMenuPortal = DropdownMenuPrimitive.Portal
const DropdownMenuSub = DropdownMenuPrimitive.Sub
const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup
const DropdownMenuSubTrigger = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
inset?: boolean
}
>(({ className, inset, children, ...props }, ref) => (
<DropdownMenuPrimitive.SubTrigger
ref={ref}
className={cn(
"flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
inset && "pl-8",
className
)}
{...props}
>
{children}
<ChevronRight className="ml-auto" />
</DropdownMenuPrimitive.SubTrigger>
))
DropdownMenuSubTrigger.displayName =
DropdownMenuPrimitive.SubTrigger.displayName
const DropdownMenuSubContent = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
>(({ className, ...props }, ref) => (
<DropdownMenuPrimitive.SubContent
ref={ref}
className={cn(
"z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-dropdown-menu-content-transform-origin]",
className
)}
{...props}
/>
))
DropdownMenuSubContent.displayName =
DropdownMenuPrimitive.SubContent.displayName
const DropdownMenuContent = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
>(({ className, sideOffset = 4, ...props }, ref) => (
<DropdownMenuPrimitive.Portal>
<DropdownMenuPrimitive.Content
ref={ref}
sideOffset={sideOffset}
className={cn(
"z-50 max-h-[var(--radix-dropdown-menu-content-available-height)] min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md",
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-dropdown-menu-content-transform-origin]",
className
)}
{...props}
/>
</DropdownMenuPrimitive.Portal>
))
DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName
const DropdownMenuItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
inset?: boolean
}
>(({ className, inset, ...props }, ref) => (
<DropdownMenuPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
inset && "pl-8",
className
)}
{...props}
/>
))
DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName
const DropdownMenuCheckboxItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
>(({ className, children, checked, ...props }, ref) => (
<DropdownMenuPrimitive.CheckboxItem
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
className
)}
checked={checked}
{...props}
>
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
<Check className="h-4 w-4" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
</DropdownMenuPrimitive.CheckboxItem>
))
DropdownMenuCheckboxItem.displayName =
DropdownMenuPrimitive.CheckboxItem.displayName
const DropdownMenuRadioItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
>(({ className, children, ...props }, ref) => (
<DropdownMenuPrimitive.RadioItem
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
className
)}
{...props}
>
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
<DropdownMenuPrimitive.ItemIndicator>
<Circle className="h-2 w-2 fill-current" />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
</DropdownMenuPrimitive.RadioItem>
))
DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName
const DropdownMenuLabel = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
inset?: boolean
}
>(({ className, inset, ...props }, ref) => (
<DropdownMenuPrimitive.Label
ref={ref}
className={cn(
"px-2 py-1.5 text-sm font-semibold",
inset && "pl-8",
className
)}
{...props}
/>
))
DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName
const DropdownMenuSeparator = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
>(({ className, ...props }, ref) => (
<DropdownMenuPrimitive.Separator
ref={ref}
className={cn("-mx-1 my-1 h-px bg-muted", className)}
{...props}
/>
))
DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName
const DropdownMenuShortcut = ({
className,
...props
}: React.HTMLAttributes<HTMLSpanElement>) => {
return (
<span
className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
{...props}
/>
)
}
DropdownMenuShortcut.displayName = "DropdownMenuShortcut"
export {
DropdownMenu,
DropdownMenuTrigger,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuCheckboxItem,
DropdownMenuRadioItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuShortcut,
DropdownMenuGroup,
DropdownMenuPortal,
DropdownMenuSub,
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuRadioGroup,
}

View File

@ -0,0 +1,46 @@
import request from '@/utils/request';
import type { Page } from '@/types/base';
import type {
FormCategoryQuery,
FormCategoryResponse,
FormCategoryRequest,
} from './types';
const BASE_URL = '/api/v1/forms/categories';
/**
*
*/
export const getCategories = (params?: FormCategoryQuery) =>
request.get<Page<FormCategoryResponse>>(`${BASE_URL}/page`, { params });
/**
*
*/
export const getCategoryById = (id: number) =>
request.get<FormCategoryResponse>(`${BASE_URL}/${id}`);
/**
*
*/
export const getEnabledCategories = () =>
request.get<FormCategoryResponse[]>(`${BASE_URL}/enabled`);
/**
*
*/
export const createCategory = (data: FormCategoryRequest) =>
request.post<FormCategoryResponse>(BASE_URL, data);
/**
*
*/
export const updateCategory = (id: number, data: FormCategoryRequest) =>
request.put<FormCategoryResponse>(`${BASE_URL}/${id}`, data);
/**
*
*/
export const deleteCategory = (id: number) =>
request.delete(`${BASE_URL}/${id}`);

View File

@ -0,0 +1,40 @@
import { BaseQuery } from '@/types/base';
/**
*
*/
export interface FormCategoryQuery extends BaseQuery {
name?: string;
code?: string;
enabled?: boolean;
}
/**
*
*/
export interface FormCategoryResponse {
id: number;
name: string;
code: string;
description?: string;
icon?: string;
sort: number;
enabled: boolean;
createBy?: string;
createTime?: string;
updateBy?: string;
updateTime?: string;
}
/**
* /
*/
export interface FormCategoryRequest {
name: string;
code: string;
description?: string;
icon?: string;
sort?: number;
enabled?: boolean;
}

View File

@ -0,0 +1,150 @@
import React, { useState, useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/card';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { FormRenderer } from '@/components/FormDesigner';
import { ArrowLeft, Loader2 } from 'lucide-react';
import { getFormDataById } from './service';
import type { FormDataResponse, FormDataStatus, FormDataBusinessType } from './types';
/**
*
*/
const FormDataDetail: React.FC = () => {
const navigate = useNavigate();
const { id } = useParams<{ id: string }>();
const [loading, setLoading] = useState(false);
const [data, setData] = useState<FormDataResponse | null>(null);
// 加载数据
useEffect(() => {
if (id) {
loadData(Number(id));
}
}, [id]);
const loadData = async (dataId: number) => {
setLoading(true);
try {
const result = await getFormDataById(dataId);
setData(result);
} catch (error) {
console.error('加载表单数据失败:', error);
} finally {
setLoading(false);
}
};
// 返回列表
const handleBack = () => {
navigate('/form/data');
};
// 状态徽章
const getStatusBadge = (status: FormDataStatus) => {
const statusMap: Record<FormDataStatus, { variant: 'default' | 'secondary' | 'destructive' | 'success' | 'outline'; text: string }> = {
DRAFT: { variant: 'outline', text: '草稿' },
SUBMITTED: { variant: 'success', text: '已提交' },
COMPLETED: { variant: 'default', text: '已完成' },
};
const statusInfo = statusMap[status];
return <Badge variant={statusInfo.variant}>{statusInfo.text}</Badge>;
};
// 业务类型徽章
const getBusinessTypeBadge = (type: FormDataBusinessType) => {
const typeMap: Record<FormDataBusinessType, { variant: 'default' | 'secondary' | 'outline'; text: string }> = {
STANDALONE: { variant: 'outline', text: '独立' },
WORKFLOW: { variant: 'default', text: '工作流' },
ORDER: { variant: 'secondary', text: '订单' },
};
const typeInfo = typeMap[type];
return <Badge variant={typeInfo.variant}>{typeInfo.text}</Badge>;
};
// 描述项组件
const DescriptionItem: React.FC<{ label: string; value: React.ReactNode }> = ({ label, value }) => (
<div className="flex py-3 border-b last:border-b-0">
<div className="w-32 text-muted-foreground flex-shrink-0">{label}</div>
<div className="flex-1 font-medium">{value}</div>
</div>
);
if (loading) {
return (
<div className="p-6">
<Card>
<CardContent className="py-12">
<div className="flex items-center justify-center">
<Loader2 className="h-8 w-8 animate-spin mr-2" />
<span>...</span>
</div>
</CardContent>
</Card>
</div>
);
}
if (!data) {
return (
<div className="p-6">
<Card>
<CardContent className="py-12">
<div className="text-center text-muted-foreground"></div>
</CardContent>
</Card>
</div>
);
}
return (
<div className="p-6">
<Card className="mb-4">
<CardHeader>
<div className="flex items-center justify-between">
<CardTitle></CardTitle>
<Button variant="outline" onClick={handleBack}>
<ArrowLeft className="h-4 w-4 mr-2" />
</Button>
</div>
</CardHeader>
<CardContent>
<div className="space-y-0">
<DescriptionItem label="表单标识" value={data.formKey} />
<DescriptionItem label="表单版本" value={`v${data.formVersion}`} />
<DescriptionItem label="业务类型" value={getBusinessTypeBadge(data.businessType)} />
<DescriptionItem label="业务标识" value={data.businessKey || '-'} />
<DescriptionItem label="提交人" value={data.submitter || '-'} />
<DescriptionItem label="提交时间" value={data.submitTime || '-'} />
<DescriptionItem label="状态" value={getStatusBadge(data.status)} />
<DescriptionItem label="创建时间" value={data.createTime || '-'} />
<DescriptionItem label="更新时间" value={data.updateTime || '-'} />
</div>
</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle></CardTitle>
</CardHeader>
<CardContent>
{/* 使用 FormRenderer 以只读模式展示数据 */}
<FormRenderer
schema={data.schemaSnapshot}
value={data.data}
readonly={true}
showSubmit={false}
showCancel={true}
cancelText="返回"
onCancel={handleBack}
/>
</CardContent>
</Card>
</div>
);
};
export default FormDataDetail;

View File

@ -0,0 +1,408 @@
import React, { useState, useEffect, useMemo } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/card';
import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from '@/components/ui/table';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { DataTablePagination } from '@/components/ui/pagination';
import {
Loader2, Search, Eye, Trash2, Download, Folder,
Activity, Clock, CheckCircle2, FileCheck, Database
} from 'lucide-react';
import { getFormDataList, deleteFormData, exportFormData } from './service';
import { getEnabledCategories } from '../Category/service';
import type { FormDataResponse, FormDataStatus, FormDataBusinessType } from './types';
import type { FormCategoryResponse } from '../Category/types';
import type { Page } from '@/types/base';
import { DEFAULT_PAGE_SIZE, DEFAULT_CURRENT } from '@/utils/page';
import dayjs from 'dayjs';
/**
*
*/
const FormDataList: React.FC = () => {
const navigate = useNavigate();
const [searchParams] = useSearchParams();
const [loading, setLoading] = useState(false);
const [data, setData] = useState<Page<FormDataResponse> | null>(null);
const [categories, setCategories] = useState<FormCategoryResponse[]>([]);
const [query, setQuery] = useState({
pageNum: DEFAULT_CURRENT - 1,
pageSize: DEFAULT_PAGE_SIZE,
formDefinitionId: searchParams.get('formDefinitionId') ? Number(searchParams.get('formDefinitionId')) : undefined,
businessKey: '',
categoryId: undefined as number | undefined,
status: undefined as FormDataStatus | undefined,
businessType: undefined as FormDataBusinessType | undefined,
});
// 加载分类列表
const loadCategories = async () => {
try {
const result = await getEnabledCategories();
setCategories(result || []);
} catch (error) {
console.error('加载分类失败:', error);
}
};
// 加载数据
const loadData = async () => {
setLoading(true);
try {
const result = await getFormDataList(query);
setData(result);
} catch (error) {
console.error('加载表单数据失败:', error);
} finally {
setLoading(false);
}
};
useEffect(() => {
loadCategories();
}, []);
useEffect(() => {
loadData();
}, [query]);
// 搜索
const handleSearch = () => {
setQuery(prev => ({
...prev,
pageNum: 0,
}));
};
// 重置搜索
const handleReset = () => {
setQuery({
pageNum: 0,
pageSize: DEFAULT_PAGE_SIZE,
formDefinitionId: undefined,
businessKey: '',
categoryId: undefined,
status: undefined,
businessType: undefined,
});
};
// 根据分类 ID 获取分类信息
const getCategoryInfo = (categoryId?: number) => {
return categories.find(cat => cat.id === categoryId);
};
// 查看详情
const handleView = (record: FormDataResponse) => {
navigate(`/form/data/${record.id}`);
};
// 删除
const handleDelete = async (record: FormDataResponse) => {
if (!confirm('确定要删除该数据吗?')) return;
try {
await deleteFormData(record.id);
loadData();
} catch (error) {
console.error('删除数据失败:', error);
}
};
// 导出
const handleExport = async () => {
try {
await exportFormData(query);
} catch (error) {
console.error('导出数据失败:', error);
}
};
// 状态徽章
const getStatusBadge = (status: FormDataStatus) => {
const statusMap: Record<FormDataStatus, {
variant: 'default' | 'secondary' | 'destructive' | 'success' | 'outline';
text: string;
icon: React.ElementType
}> = {
DRAFT: { variant: 'outline', text: '草稿', icon: Clock },
SUBMITTED: { variant: 'success', text: '已提交', icon: CheckCircle2 },
COMPLETED: { variant: 'default', text: '已完成', icon: FileCheck },
};
const statusInfo = statusMap[status];
const Icon = statusInfo.icon;
return (
<Badge variant={statusInfo.variant} className="flex items-center gap-1">
<Icon className="h-3 w-3" />
{statusInfo.text}
</Badge>
);
};
// 业务类型徽章
const getBusinessTypeBadge = (type: FormDataBusinessType) => {
const typeMap: Record<FormDataBusinessType, { variant: 'default' | 'secondary' | 'outline'; text: string }> = {
STANDALONE: { variant: 'outline', text: '独立' },
WORKFLOW: { variant: 'default', text: '工作流' },
ORDER: { variant: 'secondary', text: '订单' },
};
const typeInfo = typeMap[type];
return <Badge variant={typeInfo.variant}>{typeInfo.text}</Badge>;
};
// 统计数据
const stats = useMemo(() => {
const total = data?.totalElements || 0;
const draftCount = data?.content?.filter(d => d.status === 'DRAFT').length || 0;
const submittedCount = data?.content?.filter(d => d.status === 'SUBMITTED').length || 0;
const completedCount = data?.content?.filter(d => d.status === 'COMPLETED').length || 0;
return { total, draftCount, submittedCount, completedCount };
}, [data]);
const pageCount = data?.totalElements ? Math.ceil(data.totalElements / query.pageSize) : 0;
return (
<div className="p-6">
<div className="mb-6">
<h1 className="text-3xl font-bold text-foreground"></h1>
<p className="text-muted-foreground mt-2">
</p>
</div>
{/* 统计卡片 */}
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
<Card className="bg-gradient-to-br from-blue-500/10 to-blue-500/5 border-blue-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-blue-700"></CardTitle>
<Activity className="h-4 w-4 text-blue-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.total}</div>
<p className="text-xs text-muted-foreground mt-1"></p>
</CardContent>
</Card>
<Card className="bg-gradient-to-br from-yellow-500/10 to-yellow-500/5 border-yellow-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-yellow-700">稿</CardTitle>
<Clock className="h-4 w-4 text-yellow-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.draftCount}</div>
<p className="text-xs text-muted-foreground mt-1"></p>
</CardContent>
</Card>
<Card className="bg-gradient-to-br from-green-500/10 to-green-500/5 border-green-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-green-700"></CardTitle>
<CheckCircle2 className="h-4 w-4 text-green-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.submittedCount}</div>
<p className="text-xs text-muted-foreground mt-1"></p>
</CardContent>
</Card>
<Card className="bg-gradient-to-br from-purple-500/10 to-purple-500/5 border-purple-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-purple-700"></CardTitle>
<FileCheck className="h-4 w-4 text-purple-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.completedCount}</div>
<p className="text-xs text-muted-foreground mt-1"></p>
</CardContent>
</Card>
</div>
<Card>
<CardHeader>
<CardTitle></CardTitle>
</CardHeader>
<CardContent>
{/* 搜索栏 */}
<div className="flex flex-wrap items-center gap-4 mb-4">
<div className="flex-1 max-w-md">
<Input
placeholder="搜索业务标识"
value={query.businessKey}
onChange={(e) => setQuery(prev => ({ ...prev, businessKey: e.target.value }))}
onKeyDown={(e) => e.key === 'Enter' && handleSearch()}
className="h-9"
/>
</div>
<Select
value={query.categoryId?.toString() || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, categoryId: Number(value) }))}
>
<SelectTrigger className="w-[160px] h-9">
<SelectValue placeholder="全部分类" />
</SelectTrigger>
<SelectContent>
{categories.map(cat => (
<SelectItem key={cat.id} value={cat.id.toString()}>
<div className="flex items-center gap-2">
{cat.icon && <Folder className="h-3.5 w-3.5" />}
{cat.name}
</div>
</SelectItem>
))}
</SelectContent>
</Select>
<Select
value={query.businessType || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, businessType: value as FormDataBusinessType }))}
>
<SelectTrigger className="w-[140px] h-9">
<SelectValue placeholder="全部类型" />
</SelectTrigger>
<SelectContent>
<SelectItem value="STANDALONE"></SelectItem>
<SelectItem value="WORKFLOW"></SelectItem>
<SelectItem value="ORDER"></SelectItem>
</SelectContent>
</Select>
<Select
value={query.status || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, status: value as FormDataStatus }))}
>
<SelectTrigger className="w-[130px] h-9">
<SelectValue placeholder="全部状态" />
</SelectTrigger>
<SelectContent>
<SelectItem value="DRAFT">稿</SelectItem>
<SelectItem value="SUBMITTED"></SelectItem>
<SelectItem value="COMPLETED"></SelectItem>
</SelectContent>
</Select>
<Button onClick={handleSearch} className="h-9">
<Search className="h-4 w-4 mr-2" />
</Button>
<Button variant="outline" onClick={handleReset} className="h-9">
</Button>
<Button variant="outline" onClick={handleExport} className="h-9">
<Download className="h-4 w-4 mr-2" />
</Button>
</div>
{/* 表格 */}
<div className="rounded-md border">
<Table>
<TableHeader>
<TableRow>
<TableHead className="w-[180px]"></TableHead>
<TableHead className="w-[120px]"></TableHead>
<TableHead className="w-[100px]"></TableHead>
<TableHead className="w-[150px]"></TableHead>
<TableHead className="w-[100px]"></TableHead>
<TableHead className="w-[180px]"></TableHead>
<TableHead className="w-[100px]"></TableHead>
<TableHead className="text-right"></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{loading ? (
<TableRow>
<TableCell colSpan={8} className="h-24 text-center">
<div className="flex items-center justify-center">
<Loader2 className="h-6 w-6 animate-spin mr-2" />
<span className="text-sm text-muted-foreground">...</span>
</div>
</TableCell>
</TableRow>
) : data?.content && data.content.length > 0 ? (
data.content.map((record) => {
const categoryInfo = getCategoryInfo(record.categoryId);
return (
<TableRow key={record.id} className="hover:bg-muted/50">
<TableCell>
<code className="relative rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold">
{record.formKey}
</code>
</TableCell>
<TableCell>
{categoryInfo ? (
<Badge variant="outline" className="flex items-center gap-1 w-fit">
{categoryInfo.icon && <Folder className="h-3 w-3" />}
{categoryInfo.name}
</Badge>
) : (
<Badge variant="outline"></Badge>
)}
</TableCell>
<TableCell>{getBusinessTypeBadge(record.businessType)}</TableCell>
<TableCell>
<span className="text-sm">{record.businessKey || '-'}</span>
</TableCell>
<TableCell>
<span className="text-sm">{record.submitter || '匿名'}</span>
</TableCell>
<TableCell>
<span className="text-sm">
{record.submitTime ? dayjs(record.submitTime).format('YYYY-MM-DD HH:mm:ss') : '-'}
</span>
</TableCell>
<TableCell>{getStatusBadge(record.status)}</TableCell>
<TableCell className="text-right">
<div className="flex justify-end gap-2">
<Button
variant="ghost"
size="sm"
onClick={() => handleView(record)}
title="查看详情"
>
<Eye className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="sm"
onClick={() => handleDelete(record)}
className="text-red-600 hover:text-red-700 hover:bg-red-50"
title="删除"
>
<Trash2 className="h-4 w-4" />
</Button>
</div>
</TableCell>
</TableRow>
);
})
) : (
<TableRow>
<TableCell colSpan={8} className="h-24 text-center">
<div className="flex flex-col items-center justify-center py-12 text-muted-foreground">
<Database className="w-16 h-16 mb-4 text-muted-foreground/50" />
<div className="text-lg font-semibold mb-2"></div>
<div className="text-sm"></div>
</div>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
{/* 分页 */}
{pageCount > 1 && (
<DataTablePagination
pageIndex={query.pageNum + 1}
pageSize={query.pageSize}
pageCount={pageCount}
onPageChange={(page) => setQuery(prev => ({
...prev,
pageNum: page - 1
}))}
/>
)}
</CardContent>
</Card>
</div>
);
};
export default FormDataList;

View File

@ -0,0 +1,53 @@
import request from '@/utils/request';
import type { Page } from '@/types/base';
import type {
FormDataQuery,
FormDataResponse,
FormDataSubmitRequest,
FormDataUpdateRequest,
} from './types';
const BASE_URL = '/api/v1/forms/data';
/**
*
*/
export const getFormDataList = (params?: FormDataQuery) =>
request.get<Page<FormDataResponse>>(`${BASE_URL}/page`, { params });
/**
*
*/
export const getFormDataById = (id: number) =>
request.get<FormDataResponse>(`${BASE_URL}/${id}`);
/**
*
*/
export const submitFormData = (data: FormDataSubmitRequest) =>
request.post<FormDataResponse>(BASE_URL, data);
/**
*
*/
export const updateFormData = (id: number, data: FormDataUpdateRequest) =>
request.put<FormDataResponse>(`${BASE_URL}/${id}`, data);
/**
*
*/
export const deleteFormData = (id: number) =>
request.delete(`${BASE_URL}/${id}`);
/**
*
*/
export const batchDeleteFormData = (ids: number[]) =>
request.post(`${BASE_URL}/batch-delete`, { ids });
/**
*
*/
export const exportFormData = (params?: FormDataQuery) =>
request.download(`${BASE_URL}/export`, undefined, { params });

View File

@ -0,0 +1,70 @@
import { BaseQuery } from '@/types/base';
import type { FormSchema } from '@/components/FormDesigner';
/**
*
*/
export type FormDataBusinessType = 'STANDALONE' | 'WORKFLOW' | 'ORDER';
/**
*
*/
export type FormDataStatus = 'DRAFT' | 'SUBMITTED' | 'COMPLETED';
/**
*
*/
export interface FormDataQuery extends BaseQuery {
formDefinitionId?: number;
formKey?: string;
categoryId?: number; // 分类ID筛选
businessType?: FormDataBusinessType;
businessKey?: string;
submitter?: string;
status?: FormDataStatus;
submitTimeStart?: string;
submitTimeEnd?: string;
}
/**
*
*/
export interface FormDataResponse {
id: number;
formDefinitionId: number;
formKey: string;
formVersion: number;
categoryId?: number; // 分类ID
businessKey?: string;
businessType: FormDataBusinessType;
data: Record<string, any>;
schemaSnapshot: FormSchema;
submitter?: string;
submitTime?: string;
status: FormDataStatus;
createBy?: string;
createTime?: string;
updateBy?: string;
updateTime?: string;
}
/**
*
*/
export interface FormDataSubmitRequest {
formDefinitionId: number;
formKey: string;
businessType?: FormDataBusinessType;
businessKey?: string;
data: Record<string, any>;
status?: FormDataStatus;
}
/**
*
*/
export interface FormDataUpdateRequest {
data: Record<string, any>;
status?: FormDataStatus;
}

View File

@ -0,0 +1,107 @@
import React, { useState, useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { Card, CardContent } from '@/components/ui/card';
import { Button } from '@/components/ui/button';
import { FormDesigner } from '@/components/FormDesigner';
import type { FormSchema } from '@/components/FormDesigner';
import { ArrowLeft, Workflow } from 'lucide-react';
import { getDefinitionById, updateDefinition } from './service';
import type { FormDefinitionRequest } from './types';
/**
*
*/
const FormDesignerPage: React.FC = () => {
const navigate = useNavigate();
const { id } = useParams<{ id: string }>();
const [formSchema, setFormSchema] = useState<FormSchema | null>(null);
const [formDefinition, setFormDefinition] = useState<any>(null);
// 加载表单定义
useEffect(() => {
if (id) {
loadFormDefinition(Number(id));
}
}, [id]);
const loadFormDefinition = async (definitionId: number) => {
try {
const result = await getDefinitionById(definitionId);
setFormDefinition(result);
setFormSchema(result.schema);
} catch (error) {
console.error('加载表单定义失败:', error);
}
};
// 保存表单(只更新 schema不修改基本信息
const handleSave = async (schema: FormSchema) => {
if (!id || !formDefinition) {
alert('表单信息加载失败');
return;
}
const request: FormDefinitionRequest = {
name: formDefinition.name,
key: formDefinition.key,
categoryId: formDefinition.categoryId,
description: formDefinition.description,
isTemplate: formDefinition.isTemplate,
schema,
status: formDefinition.status || 'DRAFT',
};
try {
await updateDefinition(Number(id), request);
alert('保存成功');
} catch (error) {
console.error('保存表单失败:', error);
alert('保存失败');
}
};
// 返回列表
const handleBack = () => {
navigate('/form/definitions');
};
return (
<div className="flex flex-col gap-6 p-6">
{/* 页面标题 */}
<div className="flex items-center justify-between">
<div className="flex items-center gap-3">
<div className="p-2 rounded-lg bg-blue-500/10">
<Workflow className="h-6 w-6 text-blue-600" />
</div>
<div>
<h1 className="text-3xl font-bold tracking-tight">
{formDefinition?.name || '表单设计'}
</h1>
<p className="text-sm text-muted-foreground mt-1">
{formDefinition?.description || '拖拽左侧组件到画布,配置字段属性和验证规则'}
</p>
</div>
</div>
<Button variant="outline" onClick={handleBack}>
<ArrowLeft className="h-4 w-4 mr-2" />
</Button>
</div>
{/* 表单设计器区域 */}
<Card>
<CardContent className="p-0">
<div className="rounded-lg">
<FormDesigner
value={formSchema || undefined}
onChange={setFormSchema}
onSave={handleSave}
/>
</div>
</CardContent>
</Card>
</div>
);
};
export default FormDesignerPage;

View File

@ -0,0 +1,283 @@
import React, { useState, useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription } from '@/components/ui/dialog';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Textarea } from '@/components/ui/textarea';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Switch } from '@/components/ui/switch';
import { Separator } from '@/components/ui/separator';
import { FileText, Tag, Folder, AlignLeft, Copy, Loader2 } from 'lucide-react';
import { useToast } from '@/components/ui/use-toast';
import { createDefinition } from '../service';
import { getEnabledCategories } from '../../Category/service';
import type { FormDefinitionRequest } from '../types';
import type { FormCategoryResponse } from '../../Category/types';
interface CreateModalProps {
visible: boolean;
onClose: () => void;
onSuccess: (id: number) => void;
}
/**
*
*/
const CreateModal: React.FC<CreateModalProps> = ({ visible, onClose, onSuccess }) => {
const navigate = useNavigate();
const { toast } = useToast();
const [submitting, setSubmitting] = useState(false);
const [categories, setCategories] = useState<FormCategoryResponse[]>([]);
const [formData, setFormData] = useState({
name: '',
key: '',
categoryId: undefined as number | undefined,
description: '',
isTemplate: false,
});
// 加载分类列表
useEffect(() => {
if (visible) {
loadCategories();
}
}, [visible]);
const loadCategories = async () => {
try {
const result = await getEnabledCategories();
setCategories(result || []);
} catch (error) {
console.error('加载分类失败:', error);
}
};
// 重置表单
const resetForm = () => {
setFormData({
name: '',
key: '',
categoryId: undefined,
description: '',
isTemplate: false,
});
};
// 关闭弹窗
const handleClose = () => {
resetForm();
onClose();
};
// 提交表单
const handleSubmit = async () => {
// 验证
if (!formData.name.trim()) {
toast({
title: '验证失败',
description: '请输入表单名称',
variant: 'destructive'
});
return;
}
if (!formData.key.trim()) {
toast({
title: '验证失败',
description: '请输入表单标识',
variant: 'destructive'
});
return;
}
// 验证表单标识格式(英文字母、数字、中划线)
if (!/^[a-zA-Z0-9-]+$/.test(formData.key)) {
toast({
title: '验证失败',
description: '表单标识只能包含英文字母、数字和中划线',
variant: 'destructive'
});
return;
}
setSubmitting(true);
try {
// 创建表单定义只保存基本信息schema 为空)
const request: FormDefinitionRequest = {
name: formData.name,
key: formData.key,
categoryId: formData.categoryId,
description: formData.description,
isTemplate: formData.isTemplate,
status: 'DRAFT',
schema: {
version: '1.0',
formConfig: {
labelAlign: 'right',
size: 'middle'
},
fields: []
}
};
const result = await createDefinition(request);
toast({
title: '创建成功',
description: '表单基本信息已保存,现在可以开始设计表单'
});
// 跳转到设计器页面
navigate(`/form/definitions/${result.id}/design`);
handleClose();
onSuccess(result.id);
} catch (error) {
console.error('创建表单失败:', error);
toast({
title: '创建失败',
description: error instanceof Error ? error.message : '创建表单失败',
variant: 'destructive'
});
} finally {
setSubmitting(false);
}
};
return (
<Dialog open={visible} onOpenChange={handleClose}>
<DialogContent className="max-w-2xl max-h-[85vh] overflow-y-auto">
<DialogHeader>
<DialogTitle></DialogTitle>
<DialogDescription>
"下一步"
</DialogDescription>
</DialogHeader>
<Separator />
<div className="space-y-6">
{/* 第一行:表单名称 + 表单标识 */}
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div className="space-y-2">
<Label htmlFor="create-name" className="flex items-center gap-2">
<FileText className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
</Label>
<Input
id="create-name"
placeholder="例如:员工请假申请表"
value={formData.name}
onChange={(e) => setFormData(prev => ({ ...prev, name: e.target.value }))}
className="h-10"
/>
<p className="text-xs text-muted-foreground">
</p>
</div>
<div className="space-y-2">
<Label htmlFor="create-key" className="flex items-center gap-2">
<Tag className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
</Label>
<Input
id="create-key"
placeholder="例如employee-leave-form"
value={formData.key}
onChange={(e) => setFormData(prev => ({ ...prev, key: e.target.value }))}
className="h-10 font-mono"
/>
<p className="text-xs text-muted-foreground">
线 API
</p>
</div>
</div>
{/* 第二行:分类 + 设为模板 */}
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div className="space-y-2">
<Label htmlFor="create-category" className="flex items-center gap-2">
<Folder className="h-4 w-4 text-muted-foreground" />
</Label>
<Select
value={formData.categoryId?.toString() || undefined}
onValueChange={(value) => setFormData(prev => ({ ...prev, categoryId: Number(value) }))}
>
<SelectTrigger id="create-category" className="h-10">
<SelectValue placeholder="选择表单所属分类" />
</SelectTrigger>
<SelectContent>
{categories.map(cat => (
<SelectItem key={cat.id} value={cat.id.toString()}>
<div className="flex items-center gap-2">
<Folder className="h-3.5 w-3.5" />
{cat.name}
</div>
</SelectItem>
))}
</SelectContent>
</Select>
<p className="text-xs text-muted-foreground">
</p>
</div>
<div className="space-y-2">
<Label htmlFor="create-isTemplate" className="flex items-center gap-2">
<Copy className="h-4 w-4 text-muted-foreground" />
</Label>
<div className="flex items-center h-10 rounded-lg border px-4 bg-muted/30">
<div className="flex-1">
<span className="text-sm"></span>
</div>
<Switch
id="create-isTemplate"
checked={formData.isTemplate}
onCheckedChange={(checked) => setFormData(prev => ({ ...prev, isTemplate: checked }))}
/>
</div>
<p className="text-xs text-muted-foreground">
</p>
</div>
</div>
{/* 第三行:描述 */}
<div className="space-y-2">
<Label htmlFor="create-description" className="flex items-center gap-2">
<AlignLeft className="h-4 w-4 text-muted-foreground" />
</Label>
<Textarea
id="create-description"
placeholder="简要说明此表单的用途和填写注意事项..."
value={formData.description}
onChange={(e) => setFormData(prev => ({ ...prev, description: e.target.value }))}
className="min-h-[100px] resize-none"
/>
<p className="text-xs text-muted-foreground">
</p>
</div>
</div>
<DialogFooter>
<Button variant="outline" onClick={handleClose} disabled={submitting}>
</Button>
<Button onClick={handleSubmit} disabled={submitting}>
{submitting && <Loader2 className="h-4 w-4 mr-2 animate-spin" />}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
};
export default CreateModal;

View File

@ -0,0 +1,229 @@
import React, { useState, useEffect } from 'react';
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogDescription,
DialogFooter,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Textarea } from '@/components/ui/textarea';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Switch } from '@/components/ui/switch';
import { Loader2, FileText, Tag, Folder, AlignLeft, Copy } from 'lucide-react';
import { getEnabledCategories } from '../../Category/service';
import { updateDefinition } from '../service';
import type { FormCategoryResponse } from '../../Category/types';
import type { FormDefinitionRequest, FormDefinitionResponse } from '../types';
interface EditBasicInfoModalProps {
visible: boolean;
record: FormDefinitionResponse | null;
onClose: () => void;
onSuccess: () => void;
}
const EditBasicInfoModal: React.FC<EditBasicInfoModalProps> = ({ visible, record, onClose, onSuccess }) => {
const [submitting, setSubmitting] = useState(false);
const [categories, setCategories] = useState<FormCategoryResponse[]>([]);
const [formData, setFormData] = useState({
name: '',
key: '',
categoryId: undefined as number | undefined,
description: '',
isTemplate: false,
});
useEffect(() => {
const loadCategories = async () => {
try {
const result = await getEnabledCategories();
setCategories(result || []);
} catch (error) {
console.error('加载分类失败:', error);
}
};
if (visible) {
loadCategories();
if (record) {
setFormData({
name: record.name,
key: record.key,
categoryId: record.categoryId,
description: record.description || '',
isTemplate: record.isTemplate || false,
});
}
}
}, [visible, record]);
const handleClose = () => {
if (!submitting) {
onClose();
}
};
const handleSubmit = async () => {
if (!record) return;
if (!formData.name.trim()) {
alert('请输入表单名称');
return;
}
if (!formData.key.trim()) {
alert('请输入表单标识');
return;
}
if (!/^[a-zA-Z0-9-]+$/.test(formData.key)) {
alert('表单标识只能包含英文字母、数字和中划线');
return;
}
setSubmitting(true);
try {
const request: FormDefinitionRequest = {
name: formData.name,
key: formData.key,
categoryId: formData.categoryId,
description: formData.description,
schema: record.schema,
status: record.status,
isTemplate: formData.isTemplate,
};
await updateDefinition(record.id, request);
alert('更新成功');
onSuccess();
onClose();
} catch (error) {
console.error('更新表单失败:', error);
alert('更新表单失败: ' + (error as Error).message);
} finally {
setSubmitting(false);
}
};
return (
<Dialog open={visible} onOpenChange={handleClose}>
<DialogContent className="sm:max-w-[600px]">
<DialogHeader>
<DialogTitle></DialogTitle>
<DialogDescription>
</DialogDescription>
</DialogHeader>
<div className="grid gap-6 py-4">
{/* 第一行:表单名称 + 表单标识 */}
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div className="space-y-2">
<Label htmlFor="edit-name" className="flex items-center gap-2">
<FileText className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
</Label>
<Input
id="edit-name"
placeholder="例如:员工请假申请表"
value={formData.name}
onChange={(e) => setFormData(prev => ({ ...prev, name: e.target.value }))}
className="h-10"
/>
</div>
<div className="space-y-2">
<Label htmlFor="edit-key" className="flex items-center gap-2">
<Tag className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
</Label>
<Input
id="edit-key"
placeholder="例如employee-leave-form"
value={formData.key}
onChange={(e) => setFormData(prev => ({ ...prev, key: e.target.value }))}
className="h-10 font-mono"
/>
<p className="text-xs text-muted-foreground">
线
</p>
</div>
</div>
{/* 第二行:分类 + 设为模板 */}
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div className="space-y-2">
<Label htmlFor="edit-category" className="flex items-center gap-2">
<Folder className="h-4 w-4 text-muted-foreground" />
</Label>
<Select
value={formData.categoryId?.toString() || undefined}
onValueChange={(value) => setFormData(prev => ({ ...prev, categoryId: Number(value) }))}
>
<SelectTrigger id="edit-category" className="h-10">
<SelectValue placeholder="选择表单所属分类" />
</SelectTrigger>
<SelectContent>
{categories.map(cat => (
<SelectItem key={cat.id} value={cat.id.toString()}>
<div className="flex items-center gap-2">
<Folder className="h-3.5 w-3.5" />
{cat.name}
</div>
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div className="space-y-2">
<Label htmlFor="edit-isTemplate" className="flex items-center gap-2">
<Copy className="h-4 w-4 text-muted-foreground" />
</Label>
<div className="flex items-center h-10 rounded-lg border px-4 bg-muted/30">
<div className="flex-1">
<span className="text-sm"></span>
</div>
<Switch
id="edit-isTemplate"
checked={formData.isTemplate}
onCheckedChange={(checked) => setFormData(prev => ({ ...prev, isTemplate: checked }))}
/>
</div>
</div>
</div>
{/* 第三行:描述 */}
<div className="space-y-2">
<Label htmlFor="edit-description" className="flex items-center gap-2">
<AlignLeft className="h-4 w-4 text-muted-foreground" />
</Label>
<Textarea
id="edit-description"
placeholder="简要说明此表单的用途和填写注意事项..."
value={formData.description}
onChange={(e) => setFormData(prev => ({ ...prev, description: e.target.value }))}
className="min-h-[100px] resize-none"
/>
</div>
</div>
<DialogFooter>
<Button variant="outline" onClick={handleClose} disabled={submitting}>
</Button>
<Button onClick={handleSubmit} disabled={submitting}>
{submitting && <Loader2 className="h-4 w-4 mr-2 animate-spin" />}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
};
export default EditBasicInfoModal;

View File

@ -0,0 +1,613 @@
import React, { useState, useEffect, useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { Card, CardHeader, CardTitle, CardContent, CardDescription } from '@/components/ui/card';
import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from '@/components/ui/table';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription } from '@/components/ui/dialog';
import { DataTablePagination } from '@/components/ui/pagination';
import { FormRenderer } from '@/components/FormDesigner';
import {
Loader2, Plus, Search, Eye, Edit, FileText, Ban, Trash2,
Database, MoreHorizontal, CheckCircle2, XCircle, Clock, AlertCircle,
Folder, Activity, Settings
} from 'lucide-react';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Separator } from '@/components/ui/separator';
import { getDefinitions, publishDefinition, disableDefinition, deleteDefinition } from './service';
import { getEnabledCategories } from '../Category/service';
import type { FormDefinitionResponse, FormDefinitionStatus } from './types';
import type { FormCategoryResponse } from '../Category/types';
import type { Page } from '@/types/base';
import { DEFAULT_PAGE_SIZE, DEFAULT_CURRENT } from '@/utils/page';
import CreateModal from './components/CreateModal';
import EditBasicInfoModal from './components/EditBasicInfoModal';
/**
*
*/
const FormDefinitionList: React.FC = () => {
const navigate = useNavigate();
const [loading, setLoading] = useState(false);
const [data, setData] = useState<Page<FormDefinitionResponse> | null>(null);
const [categories, setCategories] = useState<FormCategoryResponse[]>([]);
const [query, setQuery] = useState({
pageNum: DEFAULT_CURRENT - 1,
pageSize: DEFAULT_PAGE_SIZE,
name: '',
categoryId: undefined as number | undefined,
status: undefined as FormDefinitionStatus | undefined,
});
// 创建表单弹窗
const [createModalVisible, setCreateModalVisible] = useState(false);
// 编辑基本信息弹窗
const [editBasicInfoVisible, setEditBasicInfoVisible] = useState(false);
const [editBasicInfoRecord, setEditBasicInfoRecord] = useState<FormDefinitionResponse | null>(null);
// 预览弹窗
const [previewVisible, setPreviewVisible] = useState(false);
const [previewForm, setPreviewForm] = useState<FormDefinitionResponse | null>(null);
// 删除确认弹窗
const [deleteVisible, setDeleteVisible] = useState(false);
const [deleteForm, setDeleteForm] = useState<FormDefinitionResponse | null>(null);
const [deleting, setDeleting] = useState(false);
// 加载分类列表
const loadCategories = async () => {
try {
const result = await getEnabledCategories();
setCategories(result || []);
} catch (error) {
console.error('加载分类失败:', error);
}
};
// 加载数据
const loadData = async () => {
setLoading(true);
try {
const result = await getDefinitions(query);
setData(result);
} catch (error) {
console.error('加载表单定义失败:', error);
} finally {
setLoading(false);
}
};
useEffect(() => {
loadCategories();
}, []);
useEffect(() => {
loadData();
}, [query]);
// 统计数据
const stats = useMemo(() => {
const total = data?.totalElements || 0;
const draftCount = data?.content?.filter(item => item.status === 'DRAFT').length || 0;
const publishedCount = data?.content?.filter(item => item.status === 'PUBLISHED').length || 0;
const disabledCount = data?.content?.filter(item => item.status === 'DISABLED').length || 0;
return { total, draftCount, publishedCount, disabledCount };
}, [data]);
// 搜索
const handleSearch = () => {
setQuery(prev => ({
...prev,
pageNum: 0,
}));
};
// 重置搜索
const handleReset = () => {
setQuery({
pageNum: 0,
pageSize: DEFAULT_PAGE_SIZE,
name: '',
categoryId: undefined,
status: undefined,
});
};
// 创建表单
const handleCreate = () => {
setCreateModalVisible(true);
};
// 编辑表单设计
const handleEdit = (record: FormDefinitionResponse) => {
navigate(`/form/definitions/${record.id}/design`);
};
// 编辑基本信息
const handleEditBasicInfo = (record: FormDefinitionResponse) => {
setEditBasicInfoRecord(record);
setEditBasicInfoVisible(true);
};
// 预览表单
const handlePreview = (record: FormDefinitionResponse) => {
setPreviewForm(record);
setPreviewVisible(true);
};
// 发布表单
const handlePublish = async (record: FormDefinitionResponse) => {
try {
await publishDefinition(record.id);
loadData();
} catch (error) {
console.error('发布表单失败:', error);
}
};
// 禁用表单
const handleDisable = async (record: FormDefinitionResponse) => {
try {
await disableDefinition(record.id);
loadData();
} catch (error) {
console.error('禁用表单失败:', error);
}
};
// 打开删除确认弹窗
const handleDeleteClick = (record: FormDefinitionResponse) => {
setDeleteForm(record);
setDeleteVisible(true);
};
// 确认删除
const handleDeleteConfirm = async () => {
if (!deleteForm) return;
setDeleting(true);
try {
await deleteDefinition(deleteForm.id);
setDeleteVisible(false);
setDeleteForm(null);
loadData();
} catch (error) {
console.error('删除表单失败:', error);
} finally {
setDeleting(false);
}
};
// 查看数据
const handleViewData = (record: FormDefinitionResponse) => {
navigate(`/form/data?formDefinitionId=${record.id}`);
};
// 根据分类 ID 获取分类信息
const getCategoryInfo = (categoryId?: number) => {
return categories.find(cat => cat.id === categoryId);
};
// 状态徽章(带图标)
const getStatusBadge = (status: FormDefinitionStatus) => {
const statusMap: Record<FormDefinitionStatus, {
variant: 'default' | 'secondary' | 'destructive' | 'success' | 'outline';
text: string;
icon: React.ReactNode;
}> = {
DRAFT: {
variant: 'outline',
text: '草稿',
icon: <Clock className="h-3 w-3 mr-1" />
},
PUBLISHED: {
variant: 'success',
text: '已发布',
icon: <CheckCircle2 className="h-3 w-3 mr-1" />
},
DISABLED: {
variant: 'secondary',
text: '已禁用',
icon: <XCircle className="h-3 w-3 mr-1" />
},
};
const statusInfo = statusMap[status];
return (
<Badge variant={statusInfo.variant} className="flex items-center w-fit">
{statusInfo.icon}
{statusInfo.text}
</Badge>
);
};
const pageCount = data?.totalElements ? Math.ceil(data.totalElements / query.pageSize) : 0;
return (
<div className="flex flex-col gap-6 p-6">
{/* 统计卡片 */}
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium"></CardTitle>
<Activity className="h-4 w-4 text-muted-foreground" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.total}</div>
<p className="text-xs text-muted-foreground mt-1">
</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">稿</CardTitle>
<Clock className="h-4 w-4 text-muted-foreground" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.draftCount}</div>
<p className="text-xs text-muted-foreground mt-1">
</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium"></CardTitle>
<CheckCircle2 className="h-4 w-4 text-muted-foreground" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.publishedCount}</div>
<p className="text-xs text-muted-foreground mt-1">
使
</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium"></CardTitle>
<XCircle className="h-4 w-4 text-muted-foreground" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.disabledCount}</div>
<p className="text-xs text-muted-foreground mt-1">
</p>
</CardContent>
</Card>
</div>
<Card>
<CardHeader>
<div className="flex items-center justify-between">
<div>
<CardTitle></CardTitle>
<CardDescription className="mt-2">
</CardDescription>
</div>
<Button onClick={handleCreate} size="default">
<Plus className="h-4 w-4 mr-2" />
</Button>
</div>
</CardHeader>
<Separator />
<CardContent className="pt-6">
{/* 搜索栏 */}
<div className="flex items-center gap-4 mb-6">
<div className="flex-1 max-w-md">
<Input
placeholder="搜索表单名称或标识..."
value={query.name}
onChange={(e) => setQuery(prev => ({ ...prev, name: e.target.value }))}
onKeyDown={(e) => e.key === 'Enter' && handleSearch()}
className="h-9"
/>
</div>
<Select
value={query.categoryId?.toString() || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, categoryId: Number(value) }))}
>
<SelectTrigger className="w-[160px] h-9">
<SelectValue placeholder="全部分类" />
</SelectTrigger>
<SelectContent>
{categories.map(cat => (
<SelectItem key={cat.id} value={cat.id.toString()}>
<div className="flex items-center gap-2">
{cat.icon && <Folder className="h-3.5 w-3.5" />}
{cat.name}
</div>
</SelectItem>
))}
</SelectContent>
</Select>
<Select
value={query.status || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, status: value as FormDefinitionStatus }))}
>
<SelectTrigger className="w-[140px] h-9">
<SelectValue placeholder="全部状态" />
</SelectTrigger>
<SelectContent>
<SelectItem value="DRAFT">稿</SelectItem>
<SelectItem value="PUBLISHED"></SelectItem>
<SelectItem value="DISABLED"></SelectItem>
</SelectContent>
</Select>
<Button onClick={handleSearch} size="sm">
<Search className="h-4 w-4 mr-2" />
</Button>
<Button variant="outline" onClick={handleReset} size="sm">
</Button>
</div>
{/* 表格 */}
<div className="rounded-md border">
<Table>
<TableHeader>
<TableRow>
<TableHead className="w-[250px]"></TableHead>
<TableHead className="w-[200px]"></TableHead>
<TableHead className="w-[150px]"></TableHead>
<TableHead className="w-[80px]"></TableHead>
<TableHead className="w-[120px]"></TableHead>
<TableHead className="w-[180px]"></TableHead>
<TableHead className="w-[100px] text-right"></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{loading ? (
<TableRow>
<TableCell colSpan={7} className="h-32 text-center">
<div className="flex items-center justify-center">
<Loader2 className="h-6 w-6 animate-spin mr-2" />
<span className="text-sm text-muted-foreground">...</span>
</div>
</TableCell>
</TableRow>
) : data?.content && data.content.length > 0 ? (
data.content.map((record) => {
const categoryInfo = getCategoryInfo(record.categoryId);
return (
<TableRow key={record.id} className="hover:bg-muted/50">
<TableCell>
<div>
<div className="font-medium">{record.name}</div>
{record.description && (
<div className="text-xs text-muted-foreground mt-1 line-clamp-1">
{record.description}
</div>
)}
</div>
</TableCell>
<TableCell>
<code className="text-xs bg-muted px-2 py-1 rounded">{record.key}</code>
</TableCell>
<TableCell>
{categoryInfo ? (
<div className="flex items-center gap-2">
<Folder className="h-4 w-4 text-muted-foreground" />
<span className="text-sm">{categoryInfo.name}</span>
</div>
) : (
<span className="text-sm text-muted-foreground">-</span>
)}
</TableCell>
<TableCell>
<Badge variant="outline" className="font-mono">
v{record.formVersion}
</Badge>
</TableCell>
<TableCell>{getStatusBadge(record.status)}</TableCell>
<TableCell className="text-sm text-muted-foreground">
{record.updateTime || record.createTime}
</TableCell>
<TableCell>
<div className="flex items-center justify-end gap-2">
<Button
variant="ghost"
size="sm"
onClick={() => handlePreview(record)}
className="h-8 w-8 p-0"
>
<Eye className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="sm"
onClick={() => handleEdit(record)}
className="h-8 w-8 p-0"
>
<Edit className="h-4 w-4" />
</Button>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" size="sm" className="h-8 w-8 p-0">
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-[160px]">
<DropdownMenuItem onClick={() => handleEditBasicInfo(record)}>
<Settings className="h-4 w-4 mr-2" />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => handleViewData(record)}>
<Database className="h-4 w-4 mr-2" />
</DropdownMenuItem>
<DropdownMenuSeparator />
{record.status === 'DRAFT' && (
<DropdownMenuItem onClick={() => handlePublish(record)}>
<FileText className="h-4 w-4 mr-2" />
</DropdownMenuItem>
)}
{record.status === 'PUBLISHED' && (
<DropdownMenuItem onClick={() => handleDisable(record)}>
<Ban className="h-4 w-4 mr-2" />
</DropdownMenuItem>
)}
<DropdownMenuSeparator />
<DropdownMenuItem
onClick={() => handleDeleteClick(record)}
className="text-destructive focus:text-destructive"
>
<Trash2 className="h-4 w-4 mr-2" />
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
</TableCell>
</TableRow>
);
})
) : (
<TableRow>
<TableCell colSpan={7} className="h-32 text-center">
<div className="flex flex-col items-center justify-center py-12 text-muted-foreground">
<FileText className="w-12 h-12 mb-4 opacity-20" />
<div className="text-sm font-medium"></div>
<div className="text-xs mt-1">"创建表单"</div>
</div>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
{/* 分页 */}
{pageCount > 1 && (
<div className="mt-4">
<DataTablePagination
pageIndex={query.pageNum + 1}
pageSize={query.pageSize}
pageCount={pageCount}
onPageChange={(page) => setQuery(prev => ({
...prev,
pageNum: page - 1
}))}
/>
</div>
)}
</CardContent>
</Card>
{/* 预览弹窗 */}
{previewForm && (
<Dialog open={previewVisible} onOpenChange={setPreviewVisible}>
<DialogContent className="max-w-4xl max-h-[85vh] overflow-y-auto">
<DialogHeader>
<DialogTitle></DialogTitle>
<DialogDescription>
{previewForm.name} - {previewForm.key} (v{previewForm.formVersion})
</DialogDescription>
</DialogHeader>
<Separator className="my-4" />
<div className="py-4">
<FormRenderer
schema={previewForm.schema}
value={{}}
readonly={true}
showSubmit={false}
onCancel={() => setPreviewVisible(false)}
/>
</div>
</DialogContent>
</Dialog>
)}
{/* 删除确认弹窗 */}
{deleteForm && (
<Dialog open={deleteVisible} onOpenChange={setDeleteVisible}>
<DialogContent>
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<AlertCircle className="h-5 w-5 text-destructive" />
</DialogTitle>
<DialogDescription>
</DialogDescription>
</DialogHeader>
<div className="py-4">
<div className="rounded-lg bg-muted p-4 space-y-2">
<div className="flex items-center justify-between">
<span className="text-sm text-muted-foreground"></span>
<span className="text-sm font-medium">{deleteForm.name}</span>
</div>
<div className="flex items-center justify-between">
<span className="text-sm text-muted-foreground"></span>
<code className="text-xs bg-background px-2 py-1 rounded">{deleteForm.key}</code>
</div>
<div className="flex items-center justify-between">
<span className="text-sm text-muted-foreground"></span>
<span className="text-sm">v{deleteForm.formVersion}</span>
</div>
</div>
</div>
<DialogFooter>
<Button
variant="outline"
onClick={() => setDeleteVisible(false)}
disabled={deleting}
>
</Button>
<Button
variant="destructive"
onClick={handleDeleteConfirm}
disabled={deleting}
>
{deleting && <Loader2 className="h-4 w-4 mr-2 animate-spin" />}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)}
{/* 创建表单弹窗 */}
<CreateModal
visible={createModalVisible}
onClose={() => setCreateModalVisible(false)}
onSuccess={() => {
setCreateModalVisible(false);
loadData();
}}
/>
{/* 编辑基本信息弹窗 */}
<EditBasicInfoModal
visible={editBasicInfoVisible}
record={editBasicInfoRecord}
onClose={() => {
setEditBasicInfoVisible(false);
setEditBasicInfoRecord(null);
}}
onSuccess={() => {
loadData();
}}
/>
</div>
);
};
export default FormDefinitionList;

View File

@ -0,0 +1,58 @@
import request from '@/utils/request';
import type { Page } from '@/types/base';
import type {
FormDefinitionQuery,
FormDefinitionResponse,
FormDefinitionRequest,
} from './types';
const BASE_URL = '/api/v1/forms/definitions';
/**
*
*/
export const getDefinitions = (params?: FormDefinitionQuery) =>
request.get<Page<FormDefinitionResponse>>(`${BASE_URL}/page`, { params });
/**
*
*/
export const getDefinitionById = (id: number) =>
request.get<FormDefinitionResponse>(`${BASE_URL}/${id}`);
/**
* key
*/
export const getDefinitionByKey = (key: string) =>
request.get<FormDefinitionResponse>(`${BASE_URL}/by-key/${key}`);
/**
*
*/
export const createDefinition = (data: FormDefinitionRequest) =>
request.post<FormDefinitionResponse>(BASE_URL, data);
/**
*
*/
export const updateDefinition = (id: number, data: FormDefinitionRequest) =>
request.put<FormDefinitionResponse>(`${BASE_URL}/${id}`, data);
/**
*
*/
export const publishDefinition = (id: number) =>
request.post<FormDefinitionResponse>(`${BASE_URL}/${id}/publish`);
/**
*
*/
export const disableDefinition = (id: number) =>
request.post<FormDefinitionResponse>(`${BASE_URL}/${id}/disable`);
/**
*
*/
export const deleteDefinition = (id: number) =>
request.delete(`${BASE_URL}/${id}`);

View File

@ -0,0 +1,52 @@
import { BaseQuery } from '@/types/base';
import type { FormSchema } from '@/components/FormDesigner';
/**
*
*/
export type FormDefinitionStatus = 'DRAFT' | 'PUBLISHED' | 'DISABLED';
/**
*
*/
export interface FormDefinitionQuery extends BaseQuery {
name?: string;
key?: string;
categoryId?: number; // 分类ID
status?: FormDefinitionStatus;
}
/**
*
*/
export interface FormDefinitionResponse {
id: number;
name: string;
key: string;
formVersion: number;
categoryId?: number; // 分类ID
description?: string;
schema: FormSchema;
tags?: string[];
status: FormDefinitionStatus;
isTemplate: boolean;
createBy?: string;
createTime?: string;
updateBy?: string;
updateTime?: string;
}
/**
* /
*/
export interface FormDefinitionRequest {
name: string;
key: string;
categoryId?: number; // 分类ID
description?: string;
schema: FormSchema;
tags?: string[];
status?: FormDefinitionStatus;
isTemplate?: boolean;
}

View File

@ -1,7 +1,20 @@
import React, {useEffect, useState} from 'react';
import {Modal, Form, Input, message, Select} from 'antd';
import type {WorkflowDefinition, WorkflowCategory} from '../types';
import {saveDefinition, updateDefinition, getWorkflowCategories} from '../service';
import React, { useEffect, useState } from 'react';
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogFooter,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Textarea } from '@/components/ui/textarea';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Loader2, FileText, Tag, AlignLeft, Folder } from 'lucide-react';
import { useToast } from '@/components/ui/use-toast';
import type { WorkflowDefinition, WorkflowCategoryResponse } from '../types';
import { saveDefinition, updateDefinition, getWorkflowCategoryList } from '../service';
interface EditModalProps {
visible: boolean;
@ -10,181 +23,262 @@ interface EditModalProps {
record?: WorkflowDefinition;
}
const EditModal: React.FC<EditModalProps> = ({visible, onClose, onSuccess, record}) => {
const [form] = Form.useForm();
const EditModal: React.FC<EditModalProps> = ({ visible, onClose, onSuccess, record }) => {
const { toast } = useToast();
const isEdit = !!record;
const [categories, setCategories] = useState<WorkflowCategory[]>([]);
const [selectedCategory, setSelectedCategory] = useState<WorkflowCategory>();
const [submitting, setSubmitting] = useState(false);
const [categories, setCategories] = useState<WorkflowCategoryResponse[]>([]);
const [formData, setFormData] = useState({
name: '',
key: '',
categoryId: undefined as number | undefined,
description: '',
triggers: [] as string[],
});
useEffect(() => {
if (visible) {
loadCategories();
if (record) {
setFormData({
name: record.name,
key: record.key,
categoryId: record.categoryId,
description: record.description || '',
triggers: record.triggers || [],
});
} else {
setFormData({
name: '',
key: '',
categoryId: undefined,
description: '',
triggers: [],
});
}
}
}, [visible]);
useEffect(() => {
if (visible && record) {
// 找到当前分类
const category = categories.find(c => c.code === record.category);
setSelectedCategory(category);
// 设置表单值使用lable显示
form.setFieldsValue({
...record,
// 分类显示lable
category: {
label: category?.lable,
value: record.category
},
// 触发器显示lable
triggers: record.triggers?.map(triggerCode => ({
label: category?.supportedTriggers.find(t => t.code === triggerCode)?.lable,
value: triggerCode
})) || []
});
}
}, [visible, record, categories]);
}, [visible, record]);
const loadCategories = async () => {
try {
const data = await getWorkflowCategories();
const data = await getWorkflowCategoryList();
setCategories(data);
} catch (error) {
console.error('加载工作流分类失败:', error);
message.error('加载工作流分类失败');
toast({
title: '加载失败',
description: '加载工作流分类失败',
variant: 'destructive',
});
}
};
const handleCategoryChange = (selected: { value: string, label: string }) => {
const category = categories.find(c => c.code === selected.value);
setSelectedCategory(category);
// 当切换分类时,清空触发器选择
form.setFieldValue('triggers', []);
const handleClose = () => {
if (!submitting) {
onClose();
}
};
const handleOk = async () => {
try {
const values = await form.validateFields();
const submitData = {
...values,
// 提取code值提交给后端
category: values.category.value,
triggers: values.triggers.map((t: {value: string}) => t.value),
flowVersion: isEdit ? record.flowVersion : 1,
status: isEdit ? record.status : 'DRAFT'
};
const handleSubmit = async () => {
// 验证
if (!formData.name.trim()) {
toast({
title: '验证失败',
description: '请输入流程名称',
variant: 'destructive',
});
return;
}
if (!formData.key.trim()) {
toast({
title: '验证失败',
description: '请输入流程标识',
variant: 'destructive',
});
return;
}
if (!/^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(formData.key)) {
toast({
title: '验证失败',
description: '流程标识只能包含字母、数字、下划线和连字符,且必须以字母或下划线开头',
variant: 'destructive',
});
return;
}
if (/^xml/i.test(formData.key)) {
toast({
title: '验证失败',
description: '流程标识不能以xml开头',
variant: 'destructive',
});
return;
}
if (!formData.categoryId) {
toast({
title: '验证失败',
description: '请选择流程分类',
variant: 'destructive',
});
return;
}
if (isEdit) {
await updateDefinition(record.id, {
...record,
...submitData,
setSubmitting(true);
try {
const submitData: WorkflowDefinition = {
...formData,
id: record?.id || 0,
flowVersion: isEdit ? record.flowVersion : 1,
status: isEdit ? record.status : 'DRAFT',
graph: record?.graph || { nodes: [], edges: [] },
formConfig: record?.formConfig || { formItems: [] },
} as WorkflowDefinition;
if (isEdit && record) {
await updateDefinition(record.id, submitData);
toast({
title: '更新成功',
description: `工作流 "${formData.name}" 已更新`,
});
} else {
await saveDefinition(submitData as WorkflowDefinition);
await saveDefinition(submitData);
toast({
title: '创建成功',
description: `工作流 "${formData.name}" 已创建`,
});
}
message.success(isEdit ? '更新成功' : '保存成功');
onSuccess?.();
onClose();
form.resetFields();
} catch (error) {
if (error instanceof Error) {
message.error(error.message);
toast({
title: isEdit ? '更新失败' : '创建失败',
description: error.message,
variant: 'destructive',
});
}
} finally {
setSubmitting(false);
}
};
const selectedCategory = categories.find(c => c.id === formData.categoryId);
return (
<Modal
title={isEdit ? '编辑流程' : '新建流程'}
open={visible}
onOk={handleOk}
onCancel={() => {
onClose();
form.resetFields();
}}
destroyOnClose
>
<Form
form={form}
layout="vertical"
preserve={false}
>
<Form.Item
name="category"
label="流程分类"
rules={[{required: true, message: '请选择流程分类'}]}
>
<Select
placeholder="请选择流程分类"
onChange={handleCategoryChange}
disabled={isEdit}
labelInValue
>
{(categories || []).map(category => (
<Select.Option key={category.code} value={category.code}>
{category.lable}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item
name="triggers"
label="触发方式"
rules={[{required: true, message: '请选择触发方式'}]}
>
<Select
mode="multiple"
placeholder="请选择触发方式"
disabled={!selectedCategory || isEdit}
labelInValue
>
{(selectedCategory?.supportedTriggers || []).map(trigger => (
<Select.Option key={trigger.code} value={trigger.code}>
{trigger.lable}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item
name="name"
label="流程名称"
rules={[{required: true, message: '请输入流程名称'}]}
>
<Input placeholder="请输入流程名称"/>
</Form.Item>
<Form.Item
name="key"
label="流程标识"
rules={[
{ required: true, message: '请输入流程标识' },
{
pattern: /^[a-zA-Z_][a-zA-Z0-9_-]*$/,
message: '流程标识只能包含字母、数字、下划线(_)和连字符(-),且必须以字母或下划线开头'
},
{
pattern: /^(?!xml)/i,
message: '流程标识不能以xml开头不区分大小写'
},
{
pattern: /^[^.\s]*$/,
message: '流程标识不能包含空格和点号'
},
{
max: 64,
message: '流程标识长度不能超过64个字符'
}
]}
>
<Input placeholder="请输入流程标识,建议使用小写字母和下划线" disabled={isEdit}/>
</Form.Item>
<Form.Item
name="description"
label="描述"
>
<Input.TextArea placeholder="请输入流程描述"/>
</Form.Item>
</Form>
</Modal>
<Dialog open={visible} onOpenChange={handleClose}>
<DialogContent className="sm:max-w-[600px]">
<DialogHeader>
<DialogTitle>{isEdit ? '编辑流程' : '新建流程'}</DialogTitle>
</DialogHeader>
<div className="grid gap-6 py-4">
{/* 流程分类 */}
<div className="space-y-2">
<Label htmlFor="categoryId" className="flex items-center gap-2">
<Folder className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
</Label>
<Select
value={formData.categoryId?.toString() || undefined}
onValueChange={(value) => {
setFormData(prev => ({
...prev,
categoryId: Number(value),
triggers: [], // 切换分类时清空触发器
}));
}}
disabled={isEdit}
>
<SelectTrigger id="categoryId" className="h-10">
<SelectValue placeholder="请选择流程分类" />
</SelectTrigger>
<SelectContent>
{categories.map(cat => (
<SelectItem key={cat.id} value={cat.id.toString()}>
{cat.name}
</SelectItem>
))}
</SelectContent>
</Select>
{isEdit && (
<p className="text-xs text-muted-foreground">
</p>
)}
</div>
{/* 流程名称 */}
<div className="space-y-2">
<Label htmlFor="name" className="flex items-center gap-2">
<FileText className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
</Label>
<Input
id="name"
placeholder="例如Jenkins 构建流程"
value={formData.name}
onChange={(e) => setFormData(prev => ({ ...prev, name: e.target.value }))}
className="h-10"
/>
</div>
{/* 流程标识 */}
<div className="space-y-2">
<Label htmlFor="key" className="flex items-center gap-2">
<Tag className="h-4 w-4 text-muted-foreground" />
<span className="text-destructive">*</span>
{isEdit && <span className="text-xs text-muted-foreground">()</span>}
</Label>
<Input
id="key"
placeholder="例如jenkins_build_workflow"
value={formData.key}
onChange={(e) => setFormData(prev => ({ ...prev, key: e.target.value }))}
disabled={isEdit}
className="h-10 font-mono"
/>
<p className="text-xs text-muted-foreground">
线使线
</p>
</div>
{/* 描述 */}
<div className="space-y-2">
<Label htmlFor="description" className="flex items-center gap-2">
<AlignLeft className="h-4 w-4 text-muted-foreground" />
</Label>
<Textarea
id="description"
placeholder="简要说明此工作流的用途..."
value={formData.description}
onChange={(e) => setFormData(prev => ({ ...prev, description: e.target.value }))}
className="min-h-[100px] resize-none"
/>
</div>
{/* 提示:触发方式在设计阶段配置 */}
{selectedCategory && selectedCategory.supportedTriggers && selectedCategory.supportedTriggers.length > 0 && (
<div className="rounded-lg border p-4 bg-muted/30">
<p className="text-sm text-muted-foreground">
<strong></strong> {selectedCategory.supportedTriggers.join(', ')}
</p>
<p className="text-xs text-muted-foreground mt-1">
</p>
</div>
)}
</div>
<DialogFooter>
<Button variant="outline" onClick={handleClose} disabled={submitting}>
</Button>
<Button onClick={handleSubmit} disabled={submitting}>
{submitting && <Loader2 className="h-4 w-4 mr-2 animate-spin" />}
{isEdit ? '更新' : '创建'}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
};

View File

@ -1,16 +1,33 @@
import React, {useState, useEffect} from 'react';
import {Table, Card, Button, Space, Tag, message, Modal} from 'antd';
import {PlusOutlined, ExclamationCircleOutlined} from '@ant-design/icons';
import {useNavigate} from 'react-router-dom';
import React, { useState, useEffect, useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/card';
import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from '@/components/ui/table';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription } from '@/components/ui/dialog';
import { DataTablePagination } from '@/components/ui/pagination';
import {
Loader2, Plus, Search, Edit, Trash2, Play, CheckCircle2,
Clock, Activity, Workflow, MoreHorizontal, AlertCircle, Eye
} from 'lucide-react';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { useToast } from '@/components/ui/use-toast';
import * as service from './service';
import type {WorkflowDefinition, WorkflowDefinitionQuery, WorkflowCategory} from './types';
import {DEFAULT_PAGE_SIZE, DEFAULT_CURRENT} from '@/utils/page';
import type { WorkflowDefinition, WorkflowDefinitionQuery, WorkflowCategoryResponse } from './types';
import { DEFAULT_PAGE_SIZE, DEFAULT_CURRENT } from '@/utils/page';
import EditModal from './components/EditModal';
const {confirm} = Modal;
const WorkflowDefinitionList: React.FC = () => {
const navigate = useNavigate();
const { toast } = useToast();
const [loading, setLoading] = useState(false);
const [pageData, setPageData] = useState<{
content: WorkflowDefinition[];
@ -20,10 +37,17 @@ const WorkflowDefinitionList: React.FC = () => {
} | null>(null);
const [modalVisible, setModalVisible] = useState(false);
const [currentRecord, setCurrentRecord] = useState<WorkflowDefinition>();
const [categories, setCategories] = useState<WorkflowCategory[]>([]);
const [categories, setCategories] = useState<WorkflowCategoryResponse[]>([]);
const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
const [deleteRecord, setDeleteRecord] = useState<WorkflowDefinition | null>(null);
const [deployDialogOpen, setDeployDialogOpen] = useState(false);
const [deployRecord, setDeployRecord] = useState<WorkflowDefinition | null>(null);
const [query, setQuery] = useState<WorkflowDefinitionQuery>({
pageNum: DEFAULT_CURRENT - 1,
pageSize: DEFAULT_PAGE_SIZE
pageSize: DEFAULT_PAGE_SIZE,
name: '',
categoryId: undefined,
status: undefined
});
const loadData = async (params: WorkflowDefinitionQuery) => {
@ -33,7 +57,11 @@ const WorkflowDefinitionList: React.FC = () => {
setPageData(data);
} catch (error) {
if (error instanceof Error) {
message.error(error.message);
toast({
title: '加载失败',
description: error.message,
variant: 'destructive'
});
}
} finally {
setLoading(false);
@ -42,17 +70,19 @@ const WorkflowDefinitionList: React.FC = () => {
const loadCategories = async () => {
try {
const data = await service.getWorkflowCategories();
const data = await service.getWorkflowCategoryList();
setCategories(data);
} catch (error) {
console.error('加载工作流分类失败:', error);
message.error('加载工作流分类失败');
}
};
useEffect(() => {
loadData(query);
loadCategories();
}, []);
useEffect(() => {
loadData(query);
}, [query]);
const handleCreateFlow = () => {
@ -74,169 +104,414 @@ const WorkflowDefinitionList: React.FC = () => {
setCurrentRecord(undefined);
};
const handleDeploy = async (id: number) => {
confirm({
title: '确认发布',
icon: <ExclamationCircleOutlined/>,
content: '确定要发布该流程定义吗?发布后将不能修改。',
onOk: async () => {
try {
await service.publishDefinition(id);
message.success('发布成功');
loadData(query);
} catch (error) {
if (error instanceof Error) {
message.error(error.message);
}
}
},
const handleSearch = () => {
setQuery(prev => ({
...prev,
pageNum: 0,
}));
};
const handleReset = () => {
setQuery({
pageNum: 0,
pageSize: DEFAULT_PAGE_SIZE,
name: '',
categoryId: undefined,
status: undefined
});
};
const handleDelete = async (id: number) => {
confirm({
title: '确认删除',
icon: <ExclamationCircleOutlined/>,
content: '确定要删除该流程定义吗?删除后不可恢复。',
onOk: async () => {
try {
await service.deleteDefinition(id);
message.success('删除成功');
loadData(query);
} catch (error) {
if (error instanceof Error) {
message.error(error.message);
}
}
},
});
const handleDeploy = (record: WorkflowDefinition) => {
setDeployRecord(record);
setDeployDialogOpen(true);
};
const handleStartFlow = async (record: WorkflowDefinition) => {
const confirmDeploy = async () => {
if (!deployRecord) return;
try {
await service.startWorkflowInstance(record.key, record.category);
message.success('流程启动成功');
} catch (error) {
if (error instanceof Error) {
message.error(error.message);
await service.publishDefinition(deployRecord.id);
toast({
title: '发布成功',
description: `工作流 "${deployRecord.name}" 已发布`,
});
loadData(query);
setDeployDialogOpen(false);
} catch (error) {
if (error instanceof Error) {
toast({
title: '发布失败',
description: error.message,
variant: 'destructive'
});
}
}
};
const columns = [
{
title: '流程名称',
dataIndex: 'name',
key: 'name',
},
{
title: '流程标识',
dataIndex: 'key',
key: 'key',
},
{
title: '流程分类',
dataIndex: 'category',
key: 'category',
render: (category: string) => {
const categoryInfo = categories.find(c => c.code === category);
return categoryInfo?.label || category;
}
},
{
title: '触发方式',
dataIndex: 'triggers',
key: 'triggers',
render: (triggers: string[], record: WorkflowDefinition) => {
const categoryInfo = categories.find(c => c.code === record.category);
return (triggers || [])?.map(triggerCode => {
const triggerInfo = categoryInfo?.supportedTriggers?.find(t => t.code === triggerCode);
return (
<Tag key={triggerCode}>
{triggerInfo?.lable || triggerCode}
</Tag>
);
const handleDelete = (record: WorkflowDefinition) => {
setDeleteRecord(record);
setDeleteDialogOpen(true);
};
const confirmDelete = async () => {
if (!deleteRecord) return;
try {
await service.deleteDefinition(deleteRecord.id);
toast({
title: '删除成功',
description: `工作流 "${deleteRecord.name}" 已删除`,
});
loadData(query);
setDeleteDialogOpen(false);
} catch (error) {
if (error instanceof Error) {
toast({
title: '删除失败',
description: error.message,
variant: 'destructive'
});
}
},
{
title: '版本',
dataIndex: 'flowVersion',
key: 'flowVersion',
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
render: (status: string) => (
<Tag color={status === 'DRAFT' ? 'orange' : 'green'}>
{status === 'DRAFT' ? '草稿' : '已发布'}
</Tag>
),
},
{
title: '描述',
dataIndex: 'description',
key: 'description',
ellipsis: true,
},
{
title: '操作',
key: 'action',
fixed: 'right',
width: 200,
render: (_: any, record: WorkflowDefinition) => (
<Space size="middle">
{record.status === 'DRAFT' && (
<>
<a onClick={() => handleEditFlow(record)}></a>
<a onClick={() => handleDesignFlow(record)}></a>
</>
)}
{record.status === 'DRAFT' && (
<a onClick={() => handleDeploy(record.id)}></a>
)}
<a onClick={() => handleDelete(record.id)}></a>
{record.status !== 'DRAFT' && (
<a onClick={() => handleStartFlow(record)}></a>
)}
</Space>
),
},
];
}
};
const handleStartFlow = async (record: WorkflowDefinition) => {
try {
await service.startWorkflowInstance(record.key, record.categoryId);
toast({
title: '启动成功',
description: `工作流 "${record.name}" 已启动`,
});
} catch (error) {
if (error instanceof Error) {
toast({
title: '启动失败',
description: error.message,
variant: 'destructive'
});
}
}
};
// 状态徽章
const getStatusBadge = (status: string) => {
const statusMap: Record<string, {
variant: 'default' | 'secondary' | 'destructive' | 'success' | 'outline';
text: string;
icon: React.ElementType
}> = {
DRAFT: { variant: 'outline', text: '草稿', icon: Clock },
PUBLISHED: { variant: 'success', text: '已发布', icon: CheckCircle2 },
};
const statusInfo = statusMap[status] || { variant: 'outline', text: status, icon: Clock };
const Icon = statusInfo.icon;
return (
<Badge variant={statusInfo.variant} className="flex items-center gap-1">
<Icon className="h-3 w-3" />
{statusInfo.text}
</Badge>
);
};
// 统计数据
const stats = useMemo(() => {
const total = pageData?.totalElements || 0;
const draftCount = pageData?.content?.filter(d => d.status === 'DRAFT').length || 0;
const publishedCount = pageData?.content?.filter(d => d.status !== 'DRAFT').length || 0;
return { total, draftCount, publishedCount };
}, [pageData]);
const pageCount = pageData?.totalElements ? Math.ceil(pageData.totalElements / (query.pageSize || DEFAULT_PAGE_SIZE)) : 0;
return (
<Card
title={
<Button type="primary" icon={<PlusOutlined/>} onClick={handleCreateFlow}>
</Button>
}
>
<Table
columns={columns}
dataSource={pageData?.content}
loading={loading}
rowKey="id"
scroll={{ x: 1300 }}
pagination={{
current: (query.pageNum || 0) + 1,
pageSize: query.pageSize,
total: pageData?.totalElements || 0,
onChange: (page, pageSize) => setQuery({
...query,
pageNum: page - 1,
pageSize
}),
}}
/>
<div className="p-6">
<div className="mb-6">
<h1 className="text-3xl font-bold text-foreground"></h1>
</div>
{/* 统计卡片 */}
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4 mb-6">
<Card className="bg-gradient-to-br from-blue-500/10 to-blue-500/5 border-blue-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-blue-700"></CardTitle>
<Activity className="h-4 w-4 text-blue-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.total}</div>
<p className="text-xs text-muted-foreground mt-1"></p>
</CardContent>
</Card>
<Card className="bg-gradient-to-br from-yellow-500/10 to-yellow-500/5 border-yellow-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-yellow-700">稿</CardTitle>
<Clock className="h-4 w-4 text-yellow-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.draftCount}</div>
<p className="text-xs text-muted-foreground mt-1"></p>
</CardContent>
</Card>
<Card className="bg-gradient-to-br from-green-500/10 to-green-500/5 border-green-500/20">
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium text-green-700"></CardTitle>
<CheckCircle2 className="h-4 w-4 text-green-500" />
</CardHeader>
<CardContent>
<div className="text-2xl font-bold">{stats.publishedCount}</div>
<p className="text-xs text-muted-foreground mt-1">使</p>
</CardContent>
</Card>
</div>
<Card>
<CardHeader className="flex flex-row items-center justify-between">
<CardTitle></CardTitle>
<Button onClick={handleCreateFlow}>
<Plus className="h-4 w-4 mr-2" />
</Button>
</CardHeader>
<CardContent>
{/* 搜索栏 */}
<div className="flex flex-wrap items-center gap-4 mb-4">
<div className="flex-1 max-w-md">
<Input
placeholder="搜索工作流名称"
value={query.name}
onChange={(e) => setQuery(prev => ({ ...prev, name: e.target.value }))}
onKeyDown={(e) => e.key === 'Enter' && handleSearch()}
className="h-9"
/>
</div>
<Select
value={query.categoryId?.toString() || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, categoryId: Number(value) }))}
>
<SelectTrigger className="w-[160px] h-9">
<SelectValue placeholder="全部分类" />
</SelectTrigger>
<SelectContent>
{categories.map(cat => (
<SelectItem key={cat.id} value={cat.id.toString()}>
{cat.name}
</SelectItem>
))}
</SelectContent>
</Select>
<Select
value={query.status || undefined}
onValueChange={(value) => setQuery(prev => ({ ...prev, status: value }))}
>
<SelectTrigger className="w-[140px] h-9">
<SelectValue placeholder="全部状态" />
</SelectTrigger>
<SelectContent>
<SelectItem value="DRAFT">稿</SelectItem>
<SelectItem value="PUBLISHED"></SelectItem>
</SelectContent>
</Select>
<Button onClick={handleSearch} className="h-9">
<Search className="h-4 w-4 mr-2" />
</Button>
<Button variant="outline" onClick={handleReset} className="h-9">
</Button>
</div>
{/* 表格 */}
<div className="rounded-md border">
<Table>
<TableHeader>
<TableRow>
<TableHead className="w-[200px]"></TableHead>
<TableHead className="w-[150px]"></TableHead>
<TableHead className="w-[120px]"></TableHead>
<TableHead className="w-[80px]"></TableHead>
<TableHead className="w-[100px]"></TableHead>
<TableHead></TableHead>
<TableHead className="text-right"></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{loading ? (
<TableRow>
<TableCell colSpan={7} className="h-24 text-center">
<div className="flex items-center justify-center">
<Loader2 className="h-6 w-6 animate-spin mr-2" />
<span className="text-sm text-muted-foreground">...</span>
</div>
</TableCell>
</TableRow>
) : pageData?.content && pageData.content.length > 0 ? (
pageData.content.map((record) => {
const categoryInfo = categories.find(c => c.id === record.categoryId);
return (
<TableRow key={record.id} className="hover:bg-muted/50">
<TableCell className="font-medium">{record.name}</TableCell>
<TableCell>
<code className="relative rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold">
{record.key}
</code>
</TableCell>
<TableCell>
{categoryInfo ? (
<Badge variant="outline">
{categoryInfo.name}
</Badge>
) : (
<Badge variant="outline"></Badge>
)}
</TableCell>
<TableCell>
<span className="font-mono text-sm">{record.flowVersion || 1}</span>
</TableCell>
<TableCell>{getStatusBadge(record.status || 'DRAFT')}</TableCell>
<TableCell>
<span className="text-sm line-clamp-1">{record.description || '-'}</span>
</TableCell>
<TableCell className="text-right">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="h-8 w-8 p-0">
<span className="sr-only"></span>
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{record.status === 'DRAFT' && (
<>
<DropdownMenuItem onClick={() => handleEditFlow(record)}>
<Edit className="h-4 w-4 mr-2" />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => handleDesignFlow(record)}>
<Workflow className="h-4 w-4 mr-2" />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => handleDeploy(record)}>
<CheckCircle2 className="h-4 w-4 mr-2" />
</DropdownMenuItem>
</>
)}
{record.status !== 'DRAFT' && (
<>
<DropdownMenuItem onClick={() => handleStartFlow(record)}>
<Play className="h-4 w-4 mr-2" />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => handleDesignFlow(record)}>
<Eye className="h-4 w-4 mr-2" />
</DropdownMenuItem>
</>
)}
<DropdownMenuSeparator />
<DropdownMenuItem
onClick={() => handleDelete(record)}
className="text-red-600 focus:text-red-600"
>
<Trash2 className="h-4 w-4 mr-2" />
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</TableCell>
</TableRow>
);
})
) : (
<TableRow>
<TableCell colSpan={7} className="h-24 text-center">
<div className="flex flex-col items-center justify-center py-12 text-muted-foreground">
<Workflow className="w-16 h-16 mb-4 text-muted-foreground/50" />
<div className="text-lg font-semibold mb-2"></div>
<div className="text-sm">"新建工作流"</div>
</div>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
{/* 分页 */}
{pageCount > 1 && (
<DataTablePagination
pageIndex={(query.pageNum || 0) + 1}
pageSize={query.pageSize || DEFAULT_PAGE_SIZE}
pageCount={pageCount}
onPageChange={(page) => setQuery(prev => ({
...prev,
pageNum: page - 1
}))}
/>
)}
</CardContent>
</Card>
{/* EditModal */}
<EditModal
visible={modalVisible}
onClose={handleModalClose}
onSuccess={() => loadData(query)}
record={currentRecord}
/>
</Card>
{/* 发布确认对话框 */}
{deployRecord && (
<Dialog open={deployDialogOpen} onOpenChange={setDeployDialogOpen}>
<DialogContent>
<DialogHeader>
<DialogTitle className="flex items-center gap-2 text-green-600">
<CheckCircle2 className="h-5 w-5" />
</DialogTitle>
<DialogDescription>
"<span className="font-semibold text-foreground">{deployRecord.name}</span>"
</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button variant="outline" onClick={() => setDeployDialogOpen(false)}>
</Button>
<Button onClick={confirmDeploy}>
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)}
{/* 删除确认对话框 */}
{deleteRecord && (
<Dialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
<DialogContent>
<DialogHeader>
<DialogTitle className="flex items-center gap-2 text-red-600">
<AlertCircle className="h-5 w-5" />
</DialogTitle>
<DialogDescription>
"<span className="font-semibold text-foreground">{deleteRecord.name}</span>"
</DialogDescription>
</DialogHeader>
<div className="space-y-2 text-sm text-muted-foreground">
<p>
<span className="font-medium">:</span> <code className="relative rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold">{deleteRecord.key}</code>
</p>
<p>
<span className="font-medium">:</span> <span className="font-mono text-sm">{deleteRecord.flowVersion || 1}</span>
</p>
<p>
<span className="font-medium">:</span> {getStatusBadge(deleteRecord.status || 'DRAFT')}
</p>
</div>
<DialogFooter>
<Button variant="outline" onClick={() => setDeleteDialogOpen(false)}>
</Button>
<Button variant="destructive" onClick={confirmDelete}>
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)}
</div>
);
};

View File

@ -1,10 +1,16 @@
import request from '@/utils/request';
import {WorkflowDefinition, WorkflowDefinitionQuery} from './types';
import {
WorkflowDefinition,
WorkflowDefinitionQuery,
WorkflowCategoryResponse,
WorkflowCategoryQuery,
WorkflowCategoryRequest
} from './types';
import {Page} from '@/types/base';
import {WorkflowCategory} from './types'; // Add this line
const DEFINITION_URL = '/api/v1/workflow/definition';
const INSTANCE_URL = '/api/v1/workflow/instance';
const CATEGORY_URL = '/api/v1/workflow/categories';
export const getDefinitions = (params?: WorkflowDefinitionQuery) =>
request.get<Page<WorkflowDefinition>>(`${DEFINITION_URL}/page`, {params});
@ -36,21 +42,62 @@ export const publishDefinition = (id: number) =>
request.post<void>(`${DEFINITION_URL}/${id}/published`);
/**
*
* @returns Promise<WorkflowCategory[]>
*
* @param params
* @returns Promise<Page<WorkflowCategoryResponse>>
*/
export const getWorkflowCategories = () =>
request.get<WorkflowCategory[]>(`${DEFINITION_URL}/categories`);
export const getWorkflowCategories = (params?: WorkflowCategoryQuery) =>
request.get<Page<WorkflowCategoryResponse>>(`${CATEGORY_URL}/page`, {params});
/**
*
* @returns Promise<WorkflowCategoryResponse[]>
*/
export const getWorkflowCategoryList = () =>
request.get<WorkflowCategoryResponse[]>(`${CATEGORY_URL}/list`);
/**
*
* @param id ID
* @returns Promise<WorkflowCategoryResponse>
*/
export const getWorkflowCategoryById = (id: number) =>
request.get<WorkflowCategoryResponse>(`${CATEGORY_URL}/${id}`);
/**
*
* @param data
* @returns Promise<WorkflowCategoryResponse>
*/
export const createWorkflowCategory = (data: WorkflowCategoryRequest) =>
request.post<WorkflowCategoryResponse>(CATEGORY_URL, data);
/**
*
* @param id ID
* @param data
* @returns Promise<WorkflowCategoryResponse>
*/
export const updateWorkflowCategory = (id: number, data: WorkflowCategoryRequest) =>
request.put<WorkflowCategoryResponse>(`${CATEGORY_URL}/${id}`, data);
/**
*
* @param id ID
* @returns Promise<void>
*/
export const deleteWorkflowCategory = (id: number) =>
request.delete<void>(`${CATEGORY_URL}/${id}`);
/**
*
* @param processKey key
* @param categoryCode
* @param categoryId ID
* @returns Promise<void>
*/
export const startWorkflowInstance = (processKey: string, categoryCode: string) =>
export const startWorkflowInstance = (processKey: string, categoryId?: number) =>
request.post<void>(`${INSTANCE_URL}/start`, {
processKey,
businessKey: `${categoryCode}_${Date.now()}`,
businessKey: `workflow_${Date.now()}`,
categoryId
});

View File

@ -7,7 +7,7 @@ export interface WorkflowDefinition extends BaseResponse {
description?: string;
flowVersion?: number;
status?: string;
category: string;
categoryId?: number; // 分类ID
triggers: string[];
graph: {
nodes: WorkflowDefinitionNode[];
@ -60,23 +60,46 @@ export interface WorkflowDefinitionNode {
export interface WorkflowDefinitionQuery extends BaseQuery {
name?: string;
key?: string;
categoryId?: number; // 分类ID筛选
status?: string;
}
/**
*
*
*/
export interface WorkflowTrigger {
export interface WorkflowCategoryResponse {
id: number;
name: string;
code: string;
label: string;
description?: string;
icon?: string;
sort: number;
supportedTriggers?: string[]; // 触发方式代码列表,如 ["MANUAL","SCHEDULED"]
enabled: boolean;
createBy?: string;
createTime?: string;
updateBy?: string;
updateTime?: string;
}
/**
*
*
*/
export interface WorkflowCategory {
code: string;
label: string;
description: string;
supportedTriggers: WorkflowTrigger[];
export interface WorkflowCategoryQuery extends BaseQuery {
name?: string;
code?: string;
enabled?: boolean;
}
/**
* /
*/
export interface WorkflowCategoryRequest {
name: string;
code: string;
description?: string;
icon?: string;
sort?: number;
supportedTriggers?: string[];
enabled?: boolean;
}

View File

@ -220,7 +220,7 @@ const DetailModal: React.FC<DetailModalProps> = ({ visible, onCancel, instanceDa
/>
</div>
</CardContent>
</Card>
</Card>
{instanceData.graph ? (
<Card>
@ -272,9 +272,9 @@ const DetailModal: React.FC<DetailModalProps> = ({ visible, onCancel, instanceDa
<CardContent className="pt-6">
<div className="text-center py-10 text-muted-foreground">
</div>
</div>
</CardContent>
</Card>
</Card>
)}
</TabsContent>
@ -308,7 +308,7 @@ const DetailModal: React.FC<DetailModalProps> = ({ visible, onCancel, instanceDa
<span className="text-xs text-muted-foreground font-normal">
{getNodeTypeText(stage.nodeType)}
</span>
</div>
</div>
<div className="text-sm text-muted-foreground mb-2">
{stage.startTime && dayjs(stage.startTime).format('YYYY-MM-DD HH:mm:ss')}
{stage.endTime && `${dayjs(stage.endTime).format('HH:mm:ss')}`}
@ -322,7 +322,7 @@ const DetailModal: React.FC<DetailModalProps> = ({ visible, onCancel, instanceDa
</div>
</div>
))}
</div>
</div>
</CardContent>
</Card>
</TabsContent>
@ -353,7 +353,7 @@ const DetailModal: React.FC<DetailModalProps> = ({ visible, onCancel, instanceDa
<DescriptionItem label="执行节点数" value={instanceData.stages.length} />
</div>
</CardContent>
</Card>
</Card>
</TabsContent>
</Tabs>
</DialogPrimitive.Content>

View File

@ -129,7 +129,7 @@ const HistoryModal: React.FC<HistoryModalProps> = ({ visible, onCancel, workflow
pageSize={query.pageSize}
pageCount={pageCount}
onPageChange={(page) => setQuery(prev => ({
...prev,
...prev,
pageNum: page - 1
}))}
/>

View File

@ -45,6 +45,10 @@ const JenkinsManagerList = lazy(() => import('../pages/Deploy/JenkinsManager/Lis
const GitManagerList = lazy(() => import('../pages/Deploy/GitManager/List'));
const External = lazy(() => import('../pages/Deploy/External'));
const FormDesigner = lazy(() => import('../pages/FormDesigner'));
const FormDefinitionList = lazy(() => import('../pages/Form/Definition'));
const FormDefinitionDesigner = lazy(() => import('../pages/Form/Definition/Designer'));
const FormDataList = lazy(() => import('../pages/Form/Data'));
const FormDataDetail = lazy(() => import('../pages/Form/Data/Detail'));
// Workflow2 相关路由已迁移到 Workflow删除旧路由
@ -148,6 +152,51 @@ const router = createBrowserRouter([
}
]
},
{
path: 'form',
children: [
{
path: 'definitions',
element: (
<Suspense fallback={<LoadingComponent/>}>
<FormDefinitionList/>
</Suspense>
)
},
{
path: 'definitions/create',
element: (
<Suspense fallback={<LoadingComponent/>}>
<FormDefinitionDesigner/>
</Suspense>
)
},
{
path: 'definitions/:id/design',
element: (
<Suspense fallback={<LoadingComponent/>}>
<FormDefinitionDesigner/>
</Suspense>
)
},
{
path: 'data',
element: (
<Suspense fallback={<LoadingComponent/>}>
<FormDataList/>
</Suspense>
)
},
{
path: 'data/:id',
element: (
<Suspense fallback={<LoadingComponent/>}>
<FormDataDetail/>
</Suspense>
)
}
]
},
{
path: 'workflow',
children: [