From 473d7d29428b41239b6dda06dba9424e496c5f99 Mon Sep 17 00:00:00 2001 From: Cheng Jinbao Date: Fri, 21 Aug 2026 11:12:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(core):=20=E7=BB=9F=E4=B8=80=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=E8=A7=A6=E5=8F=91=E5=99=A8=E7=B1=BB=E5=9E=8B=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=80=BC=E4=BB=8E=20SCHEDULED=20=E6=94=B9=E4=B8=BA=20?= =?UTF-8?q?SCHEDULE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 TriggerType 枚举中的 SCHEDULED 值统一更改为 SCHEDULE - 更新 FlowEventRabbitmqBridge 和 RealtimeRabbitmqListener 中 RabbitMQ 消息持久化配置 - 修改 TriggerService 中调度触发器类型的查询条件和文档注释 - 更新 dev_test.fml 和 project.fml 中的触发器类型配置数据 - 修正 PermissionFilterTest 和 TriggerResourceTest 中的测试断言和注释 - 更新前端 TriggerForm、TriggerList 组件中的触发器类型判断逻辑 - 修改前端 trigger.ts 和 types/trigger.ts 中的类型定义 --- src/pages/Scheduling/components/TriggerForm.tsx | 8 ++++---- src/pages/Scheduling/components/TriggerList.tsx | 4 ++-- src/services/trigger.ts | 2 +- src/types/trigger.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/Scheduling/components/TriggerForm.tsx b/src/pages/Scheduling/components/TriggerForm.tsx index 26f82bba..88a94f7d 100644 --- a/src/pages/Scheduling/components/TriggerForm.tsx +++ b/src/pages/Scheduling/components/TriggerForm.tsx @@ -99,7 +99,7 @@ const TriggerForm: React.FC = ({ form.setFieldsValue(formValues); - if (trigger.type === 'SCHEDULED') { + if (trigger.type === 'SCHEDULE') { const triggerFormType = trigger.config?.type || 'interval'; setTriggerFormType(triggerFormType); form.setFieldValue('triggerForm', triggerFormType); @@ -119,7 +119,7 @@ const TriggerForm: React.FC = ({ }, [trigger, mode, form, eventOnly, model]); const handleSubmit = async (values: any) => { - if (values.type === 'SCHEDULED' && values.triggerForm) { + if (values.type === 'SCHEDULE' && values.triggerForm) { values.config = { ...values.config, type: values.triggerForm @@ -187,7 +187,7 @@ const TriggerForm: React.FC = ({ placeholder={t('trigger.select_type')} disabled={mode === 'view'} > - + )} @@ -196,7 +196,7 @@ const TriggerForm: React.FC = ({ prevValues.type !== currentValues.type}> {({ getFieldValue }) => { const triggerType = getFieldValue('type'); - if (triggerType === 'SCHEDULED') { + if (triggerType === 'SCHEDULE') { return ( <> = ({model, eventOnly = false}) => const getTypeColor = (type: string) => { switch (type) { - case 'SCHEDULED': + case 'SCHEDULE': return 'blue'; case 'EVENT': return 'green'; @@ -141,7 +141,7 @@ const TriggerList: React.FC = ({model, eventOnly = false}) => const getTypeText = (type: string) => { switch (type) { - case 'SCHEDULED': + case 'SCHEDULE': return t('trigger.type_scheduled'); case 'EVENT': return t('trigger.type_event'); diff --git a/src/services/trigger.ts b/src/services/trigger.ts index 79d2133a..75d29baa 100644 --- a/src/services/trigger.ts +++ b/src/services/trigger.ts @@ -1,7 +1,7 @@ import {api} from "@/utils/request"; // 根据OpenAPI规范定义的触发器类型 -export type TriggerType = "EVENT" | "SCHEDULED"; +export type TriggerType = "EVENT" | "SCHEDULE"; export interface Trigger { id?: string; diff --git a/src/types/trigger.ts b/src/types/trigger.ts index dd65107a..945454b9 100644 --- a/src/types/trigger.ts +++ b/src/types/trigger.ts @@ -39,7 +39,7 @@ export interface Trigger { id: string; name: string; description?: string; - type: 'scheduled' | 'event'; + type: 'schedule' | 'event'; status: 'active' | 'inactive'; flowId: string; flowName: string; From 56ef273607971f21673f418d026fa1bbc5e27eed Mon Sep 17 00:00:00 2001 From: Cheng Jinbao Date: Fri, 21 Aug 2026 22:11:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(config):=20=E7=BB=9F=E4=B8=80=20Ra?= =?UTF-8?q?bbitMQ=20=E9=85=8D=E7=BD=AE=E5=B1=9E=E6=80=A7=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=20OpenAPI=20=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将配置属性从 flexmodel.rabbitmq.* 重命名为 flexmodel.events.rabbitmq.* - 更新 docker-compose.yml 中的环境变量名称为 FLEXMODEL_EVENTS_RABBITMQ_ENABLED - 修改 FlowEventRabbitmqBridge.java 中的文档注释以反映新的配置键名 - 移除 application.properties 和 application-dev.properties 中的旧配置引用 - 从路由配置中删除 OpenAPI 相关的页面和图标导入 - 更新导航菜单结构，移除 OpenAPI 菜单项 --- src/routes.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/routes.tsx b/src/routes.tsx index b5615f0e..c1129e4a 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -16,7 +16,6 @@ import { ContainerOutlined, DatabaseOutlined, DeploymentUnitOutlined, - FileTextOutlined, LineChartOutlined, NodeIndexOutlined, PlayCircleOutlined, @@ -29,7 +28,6 @@ import { KeyOutlined, FunctionOutlined, } from "@ant-design/icons"; import GraphQLAPI from "@/pages/GraphQLAPI"; -import OpenAPI from "@/pages/OpenAPI"; import Flow from "@/pages/Flow"; import FlowList from "@/pages/Flow/components/FlowList.tsx"; import FlowDesign from "@/pages/FlowDesign/index.tsx"; @@ -101,12 +99,6 @@ export const projectRoutes: RouteConfig[] = [ icon: DeploymentUnitOutlined, translationKey: "graphql_api", }, - { - path: "/project/:projectId/api/open-api", - element: , - icon: FileTextOutlined, - translationKey: "open_api", - }, { path: "/project/:projectId/api/log", element: ,