From 2ba929c609381a95bb0d1b593ddb9807d29d46f9 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Thu, 13 Aug 2026 20:49:45 +0800
Subject: [PATCH 01/12] =?UTF-8?q?refactor(core):=20=E5=B0=86=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E5=AD=97=E6=AE=B5=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=BC=95=E7=94=A8=E5=AD=97=E6=AE=B5=E4=BB=A5?=
 =?UTF-8?q?=E6=8F=90=E9=AB=98=E8=AF=AD=E4=B9=89=E6=B8=85=E6=99=B0=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 RelationField 重命名为 ModelRefField
- 将 ModelRelation 注解重命名为 ModelRef
- 将 ScalarType 中的 RELATION 类型重命名为 MODEL_REF
- 更新所有相关字段、方法和变量名称以匹配新命名
- 修改测试资源文件中的类型定义以使用新命名约定
- 更新 Jackson 序列化配置以使用新的字段类型名称
---
 .../DataModeling/components/FieldForm.tsx     | 34 +++++++++----------
 .../DataModeling/components/FieldList.tsx     |  8 ++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/pages/DataModeling/components/FieldForm.tsx b/src/pages/DataModeling/components/FieldForm.tsx
index bc17ba5..f8e0482 100644
--- a/src/pages/DataModeling/components/FieldForm.tsx
+++ b/src/pages/DataModeling/components/FieldForm.tsx
@@ -112,8 +112,8 @@ export const FieldInitialValues: any = {
     nullable: true,
     identity: false,
   },
-  RELATION: {
-    type: 'Relation',
+  MODEL_REF: {
+    type: 'ModelRef',
     multiple: true,
     localField: null,
     foreignField: null,
@@ -151,7 +151,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
     validateFields: form.validateFields,
   }));
   const [modelList, setModelList] = useState<any[]>([]);
-  const [RelationModel, setRelationModel] = useState<any>();
+  const [ModelRefModel, setModelRefModel] = useState<any>();
   const [tmpType, setTmpType] = useState<string>("");
 
   const reqModelList = React.useCallback(async () => {
@@ -190,8 +190,8 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
       });
       let tmpTypeValue = currentValue.tmpType;
       if (!tmpTypeValue) {
-        if (currentValue.type === 'Relation' && currentValue.from) {
-          tmpTypeValue = `Relation:${currentValue.from}`;
+        if (currentValue.type === 'ModelRef' && currentValue.from) {
+          tmpTypeValue = `ModelRef:${currentValue.from}`;
         } else if (currentValue.type === 'Enum' && currentValue.from) {
           tmpTypeValue = `Enum:${currentValue.from}`;
         } else {
@@ -206,23 +206,23 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
   }, [currentValue, form, initialValues, reqModelList]);
 
   useEffect(() => {
-    if (tmpType?.startsWith("Relation:")) {
-      const relatedModelName = tmpType.replace("Relation:", "");
+    if (tmpType?.startsWith("ModelRef:")) {
+      const relatedModelName = tmpType.replace("ModelRef:", "");
       const relatedModel = modelList.find((m) => m.name === relatedModelName);
-      setRelationModel(relatedModel);
+      setModelRefModel(relatedModel);
     } else {
-      setRelationModel(null);
+      setModelRefModel(null);
     }
   }, [modelList, tmpType]);
 
   const handleTypeChange = (value: string) => {
     setTmpType(value);
     console.log("----");
-    if (value.startsWith("Relation")) {
+    if (value.startsWith("ModelRef")) {
       form.setFieldsValue({
-        ...FieldInitialValues["RELATION"],
-        type: "Relation",
-        from: value.replace("Relation:", ""),
+        ...FieldInitialValues["MODEL_REF"],
+        type: "ModelRef",
+        from: value.replace("ModelRef:", ""),
         multiple: false,
         defaultValue: { type: "fixed", value: null },
       });
@@ -333,7 +333,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
               .map((item) => (
                 <Select.Option
                   key={item.name}
-                  value={`Relation:${item.name}`}
+                  value={`ModelRef:${item.name}`}
                 >
                   {item.name}
                 </Select.Option>
@@ -370,7 +370,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
         </>
       )}
 
-      {form.getFieldValue("tmpType")?.startsWith("Relation") && (
+      {form.getFieldValue("tmpType")?.startsWith("ModelRef") && (
         <>
           <Form.Item
             label={t("local_field")}
@@ -391,7 +391,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
             rules={[{ required: true }]}
           >
             <Select>
-              {RelationModel?.fields?.map((field: any) => (
+              {ModelRefModel?.fields?.map((field: any) => (
                 <Select.Option key={field.name} value={field.name}>
                   {field.name}
                 </Select.Option>
@@ -463,4 +463,4 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
   );
 });
 
-export default FieldForm;
+export default FieldForm;
\ No newline at end of file
diff --git a/src/pages/DataModeling/components/FieldList.tsx b/src/pages/DataModeling/components/FieldList.tsx
index 527d659..b800b21 100644
--- a/src/pages/DataModeling/components/FieldList.tsx
+++ b/src/pages/DataModeling/components/FieldList.tsx
@@ -82,8 +82,8 @@ const FieldList: React.FC<FieldListProps> = ({ model }) => {
 
     let tmpTypeValue = field.tmpType;
     if (!tmpTypeValue) {
-      if (field.type === 'Relation' && field.from) {
-        tmpTypeValue = `Relation:${field.from}`;
+      if (field.type === 'ModelRef' && field.from) {
+        tmpTypeValue = `ModelRef:${field.from}`;
       } else if (field.type === 'Enum' && field.from) {
         tmpTypeValue = `Enum:${field.from}`;
       } else {
@@ -171,7 +171,7 @@ const FieldList: React.FC<FieldListProps> = ({ model }) => {
         return <CalendarOutlined style={{ color: '#d9a441', marginRight: 4 }} />;
       case 'JSON':
         return <FileTextOutlined style={{ color: '#aa2d00', marginRight: 4 }} />;
-      case 'Relation':
+      case 'ModelRef':
         return <LinkOutlined style={{ color: '#254fad', marginRight: 4 }} />;
       case 'EnumRef':
         return <TagsOutlined style={{ color: '#aa2d00', marginRight: 4 }} />;
@@ -204,7 +204,7 @@ const FieldList: React.FC<FieldListProps> = ({ model }) => {
       dataIndex: "type",
       key: "type",
       render: (type: string, f: Field) => {
-        if (type === "Relation") {
+        if (type === "ModelRef") {
           return (
             <Tooltip
               title={

From c7da28fdf4d1e6ba4a4d8fe2edf8c152c1bddf59 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Sat, 15 Aug 2026 04:23:10 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix(core):=20=E7=BB=9F=E4=B8=80NativeQuer?=
 =?UTF-8?q?y=E7=B1=BB=E5=9E=8B=E6=A0=87=E8=AF=86=E7=AC=A6=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将NativeQueryDefinition.getType()返回值从"native_query"改为"NativeQuery"
- 更新ModelMixIn中NativeQueryDefinition的类型名称映射
- 修改sample_input.json测试文件中的类型值
- 更新ModelingTools工具描述中的类型说明
- 修正ModelingResource中所有示例对象的类型值
- 更新ModelingResource中API文档的类型枚举说明
- 修改UI组件ProvidersTab中的类型过滤条件
- 更新ModelExplorer中模型图标获取和分组逻辑的类型判断
- 修正ModelForm中表单提交和标签页切换的类型匹配
- 更新NativeQueryForm中类型赋值和确认逻辑
- 修改DataModeling页面中模型视图渲染的类型判断
- 更新data-modeling.d.ts中TypeWrapper
---
 .../Authentication/components/ProvidersTab.tsx |  2 +-
 .../DataModeling/components/ModelExplorer.tsx  | 17 ++++++++++-------
 .../DataModeling/components/ModelForm.tsx      | 12 ++++++------
 .../components/NativeQueryForm.tsx             | 18 +++++++++---------
 src/pages/DataModeling/index.tsx               |  8 ++++----
 src/types/data-modeling.d.ts                   |  2 +-
 src/utils/modelTreeConvert.ts                  |  8 ++++----
 7 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/pages/Authentication/components/ProvidersTab.tsx b/src/pages/Authentication/components/ProvidersTab.tsx
index 2ef04c9..64c63ce 100644
--- a/src/pages/Authentication/components/ProvidersTab.tsx
+++ b/src/pages/Authentication/components/ProvidersTab.tsx
@@ -38,7 +38,7 @@ const ProvidersTab: React.FC = () => {
       setLoadingModels(true);
       const list = await getModelList(projectId);
       const names = list
-        .filter((m) => (m as EntitySchema).type === "entity" || (m as NativeQuerySchema).type === "native_query")
+        .filter((m) => (m as EntitySchema).type === "Entity" || (m as NativeQuerySchema).type === "NativeQuery")
         .map((m) => m.name)
         .filter((n): n is string => !!n);
       setModelNames(names);
diff --git a/src/pages/DataModeling/components/ModelExplorer.tsx b/src/pages/DataModeling/components/ModelExplorer.tsx
index cc82ad3..cd20804 100644
--- a/src/pages/DataModeling/components/ModelExplorer.tsx
+++ b/src/pages/DataModeling/components/ModelExplorer.tsx
@@ -26,9 +26,12 @@ function getGroupIcon(key: string, expanded: boolean): React.ReactNode {
 
 function getModelIcon(modelType?: string): React.ReactNode {
   switch (modelType) {
-    case 'entity': return <TableOutlined />;
-    case 'enum': return <TagsOutlined />;
-    case 'native_query': return <CodeOutlined />;
+    case 'Entity':
+      return <TableOutlined/>;
+    case 'Enum':
+      return <TagsOutlined/>;
+    case 'NativeQuery':
+      return <CodeOutlined/>;
     default: return <FileOutlined />;
   }
 }
@@ -255,7 +258,7 @@ const ModelExplorer: React.FC<ModelBrowserProps> = ({
       const {type, name, ...rest} = item;
       if (!acc[type]) {
         switch (type) {
-          case "entity":
+          case "Entity":
             acc[type] = {
               type: "__entity_group",
               key: "__entity_group",
@@ -264,7 +267,7 @@ const ModelExplorer: React.FC<ModelBrowserProps> = ({
               isLeaf: false,
             };
             break;
-          case "enum":
+          case "Enum":
             acc[type] = {
               type: "__enum_group",
               key: "__enum_group",
@@ -273,7 +276,7 @@ const ModelExplorer: React.FC<ModelBrowserProps> = ({
               isLeaf: false,
             };
             break;
-          case "native_query":
+          case "NativeQuery":
             acc[type] = {
               type: "__native_query_group",
               key: "__native_query_group",
@@ -298,7 +301,7 @@ const ModelExplorer: React.FC<ModelBrowserProps> = ({
       return acc;
     }, {});
 
-    const order = ["entity", "enum", "native_query"];
+    const order = ["Entity", "Enum", "NativeQuery"];
     return order.map((type) => groups[type]).filter(Boolean);
   };
 
diff --git a/src/pages/DataModeling/components/ModelForm.tsx b/src/pages/DataModeling/components/ModelForm.tsx
index 435c0bd..c98338a 100644
--- a/src/pages/DataModeling/components/ModelForm.tsx
+++ b/src/pages/DataModeling/components/ModelForm.tsx
@@ -115,7 +115,7 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
       const values = await nativeQueryForm.validateFields();
       const queryData = {
         ...values,
-        type: 'native_query',
+        type: 'NativeQuery',
       };
       onConfirm(queryData);
     } catch (error) {
@@ -126,13 +126,13 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
 
   const handleSubmit = async () => {
     switch (activeTab) {
-      case 'entity':
+      case 'Entity':
         await handleEntitySubmit();
         break;
-      case 'enum':
+      case 'Enum':
         await handleEnumSubmit();
         break;
-      case 'nativeQuery':
+      case 'NativeQuery':
         await handleNativeQuerySubmit();
         break;
       default:
@@ -176,8 +176,8 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
       key: 'nativeQuery',
       label: t('new_native_query'),
       children: (
-        <NativeQueryForm 
-          form={nativeQueryForm} 
+        <NativeQueryForm
+          form={nativeQueryForm}
           mode="create"
         />
       ),
diff --git a/src/pages/DataModeling/components/NativeQueryForm.tsx b/src/pages/DataModeling/components/NativeQueryForm.tsx
index d8f2e64..0e59b78 100644
--- a/src/pages/DataModeling/components/NativeQueryForm.tsx
+++ b/src/pages/DataModeling/components/NativeQueryForm.tsx
@@ -22,7 +22,7 @@ const NativeQueryForm = React.forwardRef<any, NativeQueryFormProps>(({
   const { token } = theme.useToken();
   const { currentProject } = useProject();
   const projectId = currentProject?.id || '';
-  
+
   const [internalForm] = Form.useForm();
   const form = externalForm || internalForm;
   const [paramsForm] = Form.useForm();
@@ -87,7 +87,7 @@ const NativeQueryForm = React.forwardRef<any, NativeQueryFormProps>(({
       message.error(t("project_required"));
       return;
     }
-    
+
     message.info(t("native_query_execute_not_supported"));
   };
 
@@ -97,7 +97,7 @@ const NativeQueryForm = React.forwardRef<any, NativeQueryFormProps>(({
       const formData = {
         name: form.getFieldValue("name"),
         statement: form.getFieldValue("statement"),
-        type: "native_query" as const,
+        type: "NativeQuery" as const,
       };
       if (onConfirm) {
         onConfirm(formData);
@@ -125,16 +125,16 @@ const NativeQueryForm = React.forwardRef<any, NativeQueryFormProps>(({
   return (
     <>
       <Form form={form} initialValues={model} layout="vertical" style={formStyle} variant={mode === "view" ? "borderless" : "outlined"}>
-        <Form.Item 
-          name="name" 
-          label={t("name")} 
+        <Form.Item
+          name="name"
+          label={t("name")}
           rules={mode !== 'view' ? [{ required: true }] : []}
         >
           <Input readOnly={mode === 'view' || (!!model && mode === 'edit')} size="small" />
         </Form.Item>
-        <Form.Item 
-          name="statement" 
-          label={t("statement")} 
+        <Form.Item
+          name="statement"
+          label={t("statement")}
           rules={mode !== 'view' ? [{ required: true }] : []}
         >
           <TextArea rows={4} readOnly={mode === 'view'} size="small" />
diff --git a/src/pages/DataModeling/index.tsx b/src/pages/DataModeling/index.tsx
index 6356a6f..43b594a 100644
--- a/src/pages/DataModeling/index.tsx
+++ b/src/pages/DataModeling/index.tsx
@@ -68,9 +68,9 @@ const ModelingPage: React.FC = () => {
   const renderModelView = () => {
     console.log("active:", activeModel);
     switch (true) {
-      case activeModel?.type === "entity":
+      case activeModel?.type === "Entity":
         return <EntityView model={activeModel}/>;
-      case activeModel?.type === "enum":
+      case activeModel?.type === "Enum":
         return (
           <EnumForm
             ref={enumFormRef}
@@ -89,7 +89,7 @@ const ModelingPage: React.FC = () => {
             }}
           />
         );
-      case activeModel?.type === "native_query":
+      case activeModel?.type === "NativeQuery":
         return (
           <NativeQueryForm
             ref={nativeQueryFormRef}
@@ -188,7 +188,7 @@ const ModelingPage: React.FC = () => {
                   </Space>
                 </div>
               )}
-              {activeModel?.type === "native_query" && (
+              {activeModel?.type === "NativeQuery" && (
                 <div style={{marginBottom: spacing.md, display: 'flex', justifyContent: 'flex-end'}}>
                   <Space>
                     {!nativeQueryIsEditing ? (
diff --git a/src/types/data-modeling.d.ts b/src/types/data-modeling.d.ts
index cd88e6d..b748642 100644
--- a/src/types/data-modeling.d.ts
+++ b/src/types/data-modeling.d.ts
@@ -10,7 +10,7 @@ export interface Model extends TypeWrapper {
  */
 export interface TypeWrapper {
   name: string;
-  type: "entity" | "native_query" | "enum";
+  type: "Entity" | "NativeQuery" | "Enum";
 }
 
 /**
diff --git a/src/utils/modelTreeConvert.ts b/src/utils/modelTreeConvert.ts
index 5d84769..90a4a4c 100644
--- a/src/utils/modelTreeConvert.ts
+++ b/src/utils/modelTreeConvert.ts
@@ -18,9 +18,9 @@ export interface AntdTreeNode {
   isLeaf?: boolean;
   children?: AntdTreeNode[];
   icon?: React.ReactNode;
-  /** Original model data (for entity/enum/native_query file nodes) */
+  /** Original model data (for Entity/Enum/NativeQuery file nodes) */
   _data?: any;
-  /** Model type: 'entity' | 'enum' | 'native_query' */
+  /** Model type: 'Entity' | 'Enum' | 'NativeQuery' */
   _modelType?: string;
   /** Original path from TreeItem */
   _path?: string;
@@ -30,11 +30,11 @@ export interface AntdTreeNode {
  * Convert grouped model tree data to antd Tree DataNode array.
  *
  * Input: ModelTree[] from groupByType()
- *   [{ key: '__entity_group', name: '实体', children: [{ name: 'User', data: {...}, type: 'entity' }] }]
+ *   [{ key: '__entity_group', name: '实体', children: [{ name: 'User', data: {...}, type: 'Entity' }] }]
  *
  * Output: AntdTreeNode[]
  *   [{ key: '__entity_group', title: '实体', isLeaf: false,
- *      children: [{ key: '__entity_group/User', title: 'User', isLeaf: true, _data: {...}, _modelType: 'entity' }]
+ *      children: [{ key: '__entity_group/User', title: 'User', isLeaf: true, _data: {...}, _modelType: 'Entity' }]
  *   }]
  */
 export function convertModelTreeToAntdData(list: ModelTree[]): AntdTreeNode[] {

From 59e1260a43804f79221000f95649780773002081 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Sat, 15 Aug 2026 04:37:58 +0800
Subject: [PATCH 03/12] =?UTF-8?q?refactor(datamodeling):=20=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将所有 'enum' 类型统一更改为 'Enum'
- 将所有 'entity' 类型统一更改为 'Entity'
- 更新 ModelForm 中的标签页键值为大写开头
- 修正 ERDiagramView 中实体过滤条件的一致性
- 确保所有组件中的类型判断逻辑保持统一
---
 .../DataModeling/components/ERDiagramView.tsx |  4 +--
 .../DataModeling/components/EnumForm.tsx      |  2 +-
 .../DataModeling/components/FieldForm.tsx     |  8 ++---
 .../DataModeling/components/ModelForm.tsx     | 34 +++++++++----------
 src/pages/DataModeling/index.tsx              |  2 +-
 src/pages/DataView/components/ERView.tsx      |  2 +-
 .../FlowDesign/components/PropertyPanel.tsx   |  2 +-
 .../Scheduling/components/TriggerForm.tsx     |  2 +-
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/pages/DataModeling/components/ERDiagramView.tsx b/src/pages/DataModeling/components/ERDiagramView.tsx
index ddac9d8..9ff721a 100644
--- a/src/pages/DataModeling/components/ERDiagramView.tsx
+++ b/src/pages/DataModeling/components/ERDiagramView.tsx
@@ -56,7 +56,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
   };
 
   useEffect(() => {
-    const newNodes = (data || []).filter(e => e.type === 'entity').map((entity, idx) => {
+    const newNodes = (data || []).filter(e => e.type === 'Entity').map((entity, idx) => {
       const x = 80 + (idx % 5) * 320;
       const y = 80 + Math.floor(idx / 5) * 300;
       const width = 200;
@@ -99,7 +99,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
 
     const edgeMap = new Map<string, any>();
     (data || []).forEach((entity) => {
-      if (entity.type === 'entity') {
+      if (entity.type === 'Entity') {
         (entity.fields || []).forEach((field: Field) => {
           if (field.type === 'Relation' && field.from && field.from !== entity.name) {
             const sourceId = String(field.from);
diff --git a/src/pages/DataModeling/components/EnumForm.tsx b/src/pages/DataModeling/components/EnumForm.tsx
index 22a17ae..f1cb355 100644
--- a/src/pages/DataModeling/components/EnumForm.tsx
+++ b/src/pages/DataModeling/components/EnumForm.tsx
@@ -46,7 +46,7 @@ const EnumForm = React.forwardRef<any, EnumFormProps>(({
       if (onConfirm) {
         onConfirm({
           name: form.getFieldValue("name"),
-          type: "enum",
+          type: "Enum",
           elements: form.getFieldValue("elements"),
           comment: form.getFieldValue("comment"),
         });
diff --git a/src/pages/DataModeling/components/FieldForm.tsx b/src/pages/DataModeling/components/FieldForm.tsx
index f8e0482..c19b052 100644
--- a/src/pages/DataModeling/components/FieldForm.tsx
+++ b/src/pages/DataModeling/components/FieldForm.tsx
@@ -157,7 +157,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
   const reqModelList = React.useCallback(async () => {
     const data = await getModelList(projectId);
     console.log('ModelList data:', data);
-    console.log('Enum models:', data.filter(item => item.type === "enum"));
+    console.log('Enum models:', data.filter(item => item.type === "Enum"));
     setModelList(data);
   }, [projectId]);
 
@@ -329,7 +329,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
           </Select.OptGroup>
           <Select.OptGroup label={t("select_group_relation")}>
             {modelList
-              .filter((item) => item.type === "entity")
+              .filter((item) => item.type === "Entity")
               .map((item) => (
                 <Select.Option
                   key={item.name}
@@ -341,7 +341,7 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
           </Select.OptGroup>
           <Select.OptGroup label={t("select_group_enumeration")}>
             {(() => {
-              const enumModels = modelList.filter((item) => item.type === "enum");
+              const enumModels = modelList.filter((item) => item.type === "Enum");
               console.log('Enum models found:', enumModels.length, enumModels);
               return enumModels.map((item) => (
                 <Select.Option key={item.name} value={`Enum:${item.name}`}>
@@ -463,4 +463,4 @@ const FieldForm = React.forwardRef<any, FieldFormProps>(({
   );
 });
 
-export default FieldForm;
\ No newline at end of file
+export default FieldForm;
diff --git a/src/pages/DataModeling/components/ModelForm.tsx b/src/pages/DataModeling/components/ModelForm.tsx
index c98338a..e2d8d08 100644
--- a/src/pages/DataModeling/components/ModelForm.tsx
+++ b/src/pages/DataModeling/components/ModelForm.tsx
@@ -20,18 +20,18 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
   onCancel,
 }, ref) => {
   const { t } = useTranslation();
-  const [activeTab, setActiveTab] = useState('entity');
+  const [activeTab, setActiveTab] = useState('Entity');
 
   React.useImperativeHandle(ref, () => ({
     submit: handleSubmit,
     reset: handleCancel,
     getFieldsValue: () => {
       switch (activeTab) {
-        case 'entity':
+        case 'Entity':
           return entityForm.getFieldsValue();
-        case 'enum':
+        case 'Enum':
           return enumForm.getFieldsValue();
-        case 'nativeQuery':
+        case 'NativeQuery':
           return nativeQueryForm.getFieldsValue();
         default:
           return {};
@@ -39,24 +39,24 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
     },
     setFieldsValue: (values: any) => {
       switch (activeTab) {
-        case 'entity':
+        case 'Entity':
           entityForm.setFieldsValue(values);
           break;
-        case 'enum':
+        case 'Enum':
           enumForm.setFieldsValue(values);
           break;
-        case 'nativeQuery':
+        case 'NativeQuery':
           nativeQueryForm.setFieldsValue(values);
           break;
       }
     },
     validateFields: async () => {
       switch (activeTab) {
-        case 'entity':
+        case 'Entity':
           return await entityForm.validateFields();
-        case 'enum':
+        case 'Enum':
           return await enumForm.validateFields();
-        case 'nativeQuery':
+        case 'NativeQuery':
           return await nativeQueryForm.validateFields();
         default:
           return {};
@@ -67,7 +67,7 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
   const [entityForm] = Form.useForm();
   const [entityModel, setEntityModel] = useState<Entity>({
     name: '',
-    type: 'entity',
+    type: 'Entity',
     fields: [],
     indexes: [],
   });
@@ -85,7 +85,7 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
       const values = await entityForm.validateFields();
       const entityData = {
         ...values,
-        type: 'entity',
+        type: 'Entity',
         fields: entityModel.fields,
         indexes: entityModel.indexes,
       };
@@ -101,7 +101,7 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
       const values = await enumForm.validateFields();
       const enumData = {
         ...values,
-        type: 'enum',
+        type: 'Enum',
       };
       onConfirm(enumData);
     } catch (error) {
@@ -146,7 +146,7 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
     nativeQueryForm.resetFields();
     setEntityModel({
       name: '',
-      type: 'entity',
+      type: 'Entity',
       fields: [],
       indexes: [],
     });
@@ -155,7 +155,7 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
 
   const items = [
     {
-      key: 'entity',
+      key: 'Entity',
       label: t('new_entity'),
       children: (
         <EntityForm
@@ -166,14 +166,14 @@ const ModelForm = React.forwardRef<any, ModelFormProps>(({
       ),
     },
     {
-      key: 'enum',
+      key: 'Enum',
       label: t('new_enum'),
       children: (
         <EnumForm form={enumForm} />
       ),
     },
     {
-      key: 'nativeQuery',
+      key: 'NativeQuery',
       label: t('new_native_query'),
       children: (
         <NativeQueryForm
diff --git a/src/pages/DataModeling/index.tsx b/src/pages/DataModeling/index.tsx
index 43b594a..ce0f1a3 100644
--- a/src/pages/DataModeling/index.tsx
+++ b/src/pages/DataModeling/index.tsx
@@ -160,7 +160,7 @@ const ModelingPage: React.FC = () => {
           <Splitter.Panel>
             <div
               style={{height: '100%', display: 'flex', flexDirection: 'column', paddingLeft: spacing.lg, minHeight: 0}}>
-              {activeModel?.type === "enum" && (
+              {activeModel?.type === "Enum" && (
                 <div style={{marginBottom: spacing.md, display: 'flex', justifyContent: 'flex-end'}}>
                   <Space>
                     {!isEditing ? (
diff --git a/src/pages/DataView/components/ERView.tsx b/src/pages/DataView/components/ERView.tsx
index cd1b681..ebcc4b5 100644
--- a/src/pages/DataView/components/ERView.tsx
+++ b/src/pages/DataView/components/ERView.tsx
@@ -20,7 +20,7 @@ const ERView: React.FC = () => {
       setLoading(true);
       try {
         const modelList = await getModelList(projectId);
-        const entityModels = modelList.filter(model => model.type === "entity") as Entity[];
+        const entityModels = modelList.filter(model => model.type === "Entity") as Entity[];
         setModels(entityModels);
       } catch (error) {
         console.error(t("get_model_list_failed"), error);
diff --git a/src/pages/FlowDesign/components/PropertyPanel.tsx b/src/pages/FlowDesign/components/PropertyPanel.tsx
index e5b0a55..0d3b45d 100644
--- a/src/pages/FlowDesign/components/PropertyPanel.tsx
+++ b/src/pages/FlowDesign/components/PropertyPanel.tsx
@@ -158,7 +158,7 @@ const PropertyPanel = forwardRef<PropertyPanelRef, PropertyPanelProps>(({
     const fetchModels = async () => {
       try {
         const modelList = await getModelList(projectId);
-        const entityModels = modelList.filter(model => model.type === 'entity');
+        const entityModels = modelList.filter(model => model.type === 'Entity');
         setModels(entityModels);
       } catch (error) {
         console.error('获取模型列表失败:', error);
diff --git a/src/pages/Scheduling/components/TriggerForm.tsx b/src/pages/Scheduling/components/TriggerForm.tsx
index 739be93..26f82bb 100644
--- a/src/pages/Scheduling/components/TriggerForm.tsx
+++ b/src/pages/Scheduling/components/TriggerForm.tsx
@@ -73,7 +73,7 @@ const TriggerForm: React.FC<TriggerFormProps> = ({
     const fetchModels = async () => {
       try {
         const modelList = await getModelList(projectId);
-        const entityModels = modelList.filter(model => model.type === 'entity');
+        const entityModels = modelList.filter(model => model.type === 'Entity');
         setModels(entityModels);
       } catch (error) {
         console.error('获取模型列表失败:', error);

From 644e6dfd7d91908551c9dc2da02b08c1c1c0096a Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Sat, 15 Aug 2026 16:44:31 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix(datamodeling):=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=85=B3=E7=B3=BB=E5=9B=BE=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将字段类型判断从 'Relation' 修改为 'ModelRef'
- 确保只有 ModelRef 类型的字段才会被处理为关联关系
- 修复因类型判断错误导致的关系映射问题
---
 src/pages/DataModeling/components/ERDiagramView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/DataModeling/components/ERDiagramView.tsx b/src/pages/DataModeling/components/ERDiagramView.tsx
index 9ff721a..58123f5 100644
--- a/src/pages/DataModeling/components/ERDiagramView.tsx
+++ b/src/pages/DataModeling/components/ERDiagramView.tsx
@@ -101,7 +101,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
     (data || []).forEach((entity) => {
       if (entity.type === 'Entity') {
         (entity.fields || []).forEach((field: Field) => {
-          if (field.type === 'Relation' && field.from && field.from !== entity.name) {
+          if (field.type === 'ModelRef' && field.from && field.from !== entity.name) {
             const sourceId = String(field.from);
             const targetId = String(entity.name);
             const key = [sourceId, targetId].sort().join('::');

From 98981485eff2ea00b2a9b5284dbb2f03fd549d63 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Mon, 17 Aug 2026 14:42:59 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat(ci):=20=E6=9B=B4=E6=96=B0CI=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E4=BB=A5=E9=9B=86=E6=88=90UI=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=B9=B6=E6=94=B9=E8=BF=9B=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在主CI流程中添加flexmodel-ui镜像构建和推送任务
- 实现从VERSION文件读取基础版本号并与GitHub运行编号组合
- 更新服务器和函数运行时镜像标签策略为版本号加运行编号格式
- 重构部署任务以包含UI镜像的拉取和标记操作
- 添加对UI组件的手动工作流调度支持
- 升级Docker相关Action到最新版本并优化缓存配置
- 添加VERSION文件用于版本控制
---
 .github/workflows/ci.yml | 54 +++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ddf56e4..b362fc4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,37 +1,73 @@
-# Flexmodel CI/CD Pipeline
-# Runs tests for all modules, then builds and pushes Docker images.
-# Deploys to production on push to main.
+# Flexmodel UI CI
+# 可手动触发选择：只跑测试、只构建镜像、或两者都跑。
+# push / PR 默认只跑测试（lint + 类型检查）。
 
-name: Run Tests
+name: Flexmodel UI
 
 on:
   push:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  workflow_dispatch:
+    inputs:
+      run_tests:
+        description: "执行测试（lint + 类型检查）"
+        type: boolean
+        default: true
+      run_build:
+        description: "执行构建并推送 Docker 镜像"
+        type: boolean
+        default: false
 
 jobs:
+  ui-test:
+    name: UI tests (lint + type-check)
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.run_tests == 'true' }}
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: 'recursive'
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Node
+        uses: actions/setup-node@v5
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: 'package-lock.json'
+      - name: Install dependencies
+        run: npm ci
+      - name: Lint
+        run: npm run lint
+      - name: Type check
+        run: npx tsc --noEmit
 
   push-ui-image:
     name: Push UI docker image
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.run_build == 'true' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: 'recursive'
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push UI image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true
-          tags: cjbi/flexmodel-ui:latest
+          tags: |
+            cjbi/flexmodel-ui:latest
+            cjbi/flexmodel-ui:${{ github.run_number }}
+            cjbi/flexmodel-ui:${{ github.run_number }}-${{ github.sha }}
+            cjbi/flexmodel-ui:sha-${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

From 85a36d39d82ac58ddd2b156cb4a3f2ab4aa9f389 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Mon, 17 Aug 2026 16:03:08 +0800
Subject: [PATCH 06/12] =?UTF-8?q?feat(build):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=92=8C=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CI 工作流中添加版本号变量输出和镜像标签
- 为 flexmodel-server 添加版本号配置属性和资源过滤
- 在全局资源配置中添加版本号字段
- 在 UI 侧边栏和关于页面中显示版本号信息
- 更新应用状态管理中的系统配置类型定义
---
 .github/workflows/ci.yml                   | 13 +++++++++++--
 src/components/layouts/PlatformSidebar.tsx | 11 ++++++++++-
 src/components/layouts/ProjectSidebar.tsx  | 11 ++++++++++-
 src/pages/Settings/components/About.tsx    | 15 ++++++++++++++-
 src/store/appStore.ts                      |  3 ++-
 src/types/system.d.ts                      |  1 +
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b362fc4..7c9ed42 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 # Flexmodel UI CI
 # 可手动触发选择：只跑测试、只构建镜像、或两者都跑。
 # push / PR 默认只跑测试（lint + 类型检查）。
+# 镜像版本号取自 VERSION 文件：${VERSION}、${VERSION}.${run_number} 等
 
 name: Flexmodel UI
 
@@ -52,6 +53,13 @@ jobs:
         with:
           submodules: 'recursive'
           token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Read version
+        id: version
+        run: |
+          VERSION=$(cat VERSION | tr -d '[:space:]')
+          echo "ver=${VERSION}" >> $GITHUB_OUTPUT
+          echo "tag=${VERSION}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "full=${VERSION}.${{ github.run_number }}-${{ github.sha }}" >> $GITHUB_OUTPUT
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
       - name: Log in to Docker Hub
@@ -66,8 +74,9 @@ jobs:
           push: true
           tags: |
             cjbi/flexmodel-ui:latest
-            cjbi/flexmodel-ui:${{ github.run_number }}
-            cjbi/flexmodel-ui:${{ github.run_number }}-${{ github.sha }}
+            cjbi/flexmodel-ui:${{ steps.version.outputs.ver }}
+            cjbi/flexmodel-ui:${{ steps.version.outputs.tag }}
+            cjbi/flexmodel-ui:${{ steps.version.outputs.full }}
             cjbi/flexmodel-ui:sha-${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/src/components/layouts/PlatformSidebar.tsx b/src/components/layouts/PlatformSidebar.tsx
index 70e9748..4016f77 100644
--- a/src/components/layouts/PlatformSidebar.tsx
+++ b/src/components/layouts/PlatformSidebar.tsx
@@ -4,6 +4,7 @@ import { useLocation, useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { platformRoutes } from "@/routes";
 import { useSidebar } from "@/store/appStore";
+import {useConfig} from "@/store/appStore";
 import { MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/icons";
 
 const PlatformSidebar: React.FC = () => {
@@ -12,6 +13,8 @@ const PlatformSidebar: React.FC = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const { isSidebarCollapsed, toggleSidebar } = useSidebar();
+  const {config} = useConfig();
+  const version = config.version || 'v0.0.1';
   const [openKeys, setOpenKeys] = useState<string[]>(() => {
     const pathname = location.pathname.replace(/\/$/, '');
     const initialOpenKeys: string[] = [];
@@ -128,9 +131,15 @@ const PlatformSidebar: React.FC = () => {
         <div style={{
           padding: token.padding,
           display: "flex",
-          justifyContent: isSidebarCollapsed ? "center" : "right",
+          alignItems: "center",
+          justifyContent: isSidebarCollapsed ? "center" : "space-between",
           backgroundColor: token.colorBgContainer
         }}>
+          {!isSidebarCollapsed && (
+            <span style={{fontSize: token.fontSizeSM, color: token.colorTextTertiary}}>
+              {version}
+            </span>
+          )}
           <Space>
             <Button
               type="text"
diff --git a/src/components/layouts/ProjectSidebar.tsx b/src/components/layouts/ProjectSidebar.tsx
index 7ff64af..7acb309 100644
--- a/src/components/layouts/ProjectSidebar.tsx
+++ b/src/components/layouts/ProjectSidebar.tsx
@@ -4,6 +4,7 @@ import { useLocation, useNavigate, useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { routes } from "@/routes";
 import { useSidebar } from "@/store/appStore";
+import {useConfig} from "@/store/appStore";
 import { MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/icons";
 
 const ProjectSidebar: React.FC = () => {
@@ -12,6 +13,8 @@ const ProjectSidebar: React.FC = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const { isSidebarCollapsed, toggleSidebar } = useSidebar();
+  const {config} = useConfig();
+  const version = config.version || 'v0.0.1';
   const { projectId } = useParams<{ projectId: string }>();
   const [openKeys, setOpenKeys] = useState<string[]>(() => {
     const pathname = location.pathname.replace(/\/$/, '');
@@ -139,9 +142,15 @@ const ProjectSidebar: React.FC = () => {
         <div style={{
           padding: token.padding,
           display: "flex",
-          justifyContent: isSidebarCollapsed ? "center" : "right",
+          alignItems: "center",
+          justifyContent: isSidebarCollapsed ? "center" : "space-between",
           backgroundColor: token.colorBgContainer
         }}>
+          {!isSidebarCollapsed && (
+            <span style={{fontSize: token.fontSizeSM, color: token.colorTextTertiary}}>
+              {version}
+            </span>
+          )}
           <Space>
             <Button
               type="text"
diff --git a/src/pages/Settings/components/About.tsx b/src/pages/Settings/components/About.tsx
index 3bb7d2b..69f6c15 100644
--- a/src/pages/Settings/components/About.tsx
+++ b/src/pages/Settings/components/About.tsx
@@ -2,12 +2,15 @@ import React from 'react';
 import {Button, Divider, Space, Typography, theme} from 'antd';
 import {BookOutlined, GithubOutlined, GlobalOutlined} from '@ant-design/icons';
 import {useTranslation} from "react-i18next";
+import {useConfig} from "@/store/appStore";
 
 const { Title, Paragraph, Text } = Typography;
 
 const About: React.FC = () => {
   const { t } = useTranslation();
   const { token } = theme.useToken();
+  const {config} = useConfig();
+  const version = config.version || 'v0.0.1';
   return (
     <div style={{
       width: '100%',
@@ -49,12 +52,22 @@ const About: React.FC = () => {
             </Paragraph>
           </div>
 
+        {/* 版本信息 */}
+        <div style={{
+          textAlign: 'center',
+          marginBottom: token.marginLG,
+        }}>
+          <Text type="secondary" style={{fontSize: token.fontSize}}>
+            {version}
+          </Text>
+        </div>
+
           <Divider style={{ margin: '20px 0' }} />
 
 
           {/* 链接和文档 */}
           <div style={{ textAlign: 'center' }}>
-            <Title level={4} style={{ marginBottom: '20px' }}>
+            <Title level={4} style={{marginBottom: '16px'}}>
               了解更多
             </Title>
             <Space size="middle" wrap>
diff --git a/src/store/appStore.ts b/src/store/appStore.ts
index ee3d66b..f5f1741 100644
--- a/src/store/appStore.ts
+++ b/src/store/appStore.ts
@@ -85,7 +85,8 @@ export const useAppStore = create<AppState>()(
                 projectBaseDomain: profile.projectBaseDomain,
                 edgeUrlTemplate: profile.edgeUrlTemplate,
                 routingMode: profile.routingMode,
-                pagesUrlTemplate: profile.pagesUrlTemplate
+                pagesUrlTemplate: profile.pagesUrlTemplate,
+                version: profile.version
               }, isLoading: false
             });
           } catch (error) {
diff --git a/src/types/system.d.ts b/src/types/system.d.ts
index 5895552..3c83300 100644
--- a/src/types/system.d.ts
+++ b/src/types/system.d.ts
@@ -11,4 +11,5 @@ export interface SystemProfile {
   edgeUrlTemplate: string;
   routingMode: string;
   pagesUrlTemplate: string;
+  version: string;
 }

From 4679bd2146c41d23236c041f88621f100b1f0d2f Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Mon, 17 Aug 2026 17:34:05 +0800
Subject: [PATCH 07/12] =?UTF-8?q?fix(layout):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 PlatformSidebar 中的默认版本号 'v0.0.1'
- 移除了 ProjectSidebar 中的默认版本号 'v0.0.1'
- 移除了 About 组件中的默认版本号 'v0.0.1'
---
 src/components/layouts/PlatformSidebar.tsx | 2 +-
 src/components/layouts/ProjectSidebar.tsx  | 2 +-
 src/pages/Settings/components/About.tsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/layouts/PlatformSidebar.tsx b/src/components/layouts/PlatformSidebar.tsx
index 4016f77..e99522c 100644
--- a/src/components/layouts/PlatformSidebar.tsx
+++ b/src/components/layouts/PlatformSidebar.tsx
@@ -14,7 +14,7 @@ const PlatformSidebar: React.FC = () => {
   const location = useLocation();
   const { isSidebarCollapsed, toggleSidebar } = useSidebar();
   const {config} = useConfig();
-  const version = config.version || 'v0.0.1';
+  const version = config.version || '';
   const [openKeys, setOpenKeys] = useState<string[]>(() => {
     const pathname = location.pathname.replace(/\/$/, '');
     const initialOpenKeys: string[] = [];
diff --git a/src/components/layouts/ProjectSidebar.tsx b/src/components/layouts/ProjectSidebar.tsx
index 7acb309..69146b5 100644
--- a/src/components/layouts/ProjectSidebar.tsx
+++ b/src/components/layouts/ProjectSidebar.tsx
@@ -14,7 +14,7 @@ const ProjectSidebar: React.FC = () => {
   const location = useLocation();
   const { isSidebarCollapsed, toggleSidebar } = useSidebar();
   const {config} = useConfig();
-  const version = config.version || 'v0.0.1';
+  const version = config.version || '';
   const { projectId } = useParams<{ projectId: string }>();
   const [openKeys, setOpenKeys] = useState<string[]>(() => {
     const pathname = location.pathname.replace(/\/$/, '');
diff --git a/src/pages/Settings/components/About.tsx b/src/pages/Settings/components/About.tsx
index 69f6c15..4205d2a 100644
--- a/src/pages/Settings/components/About.tsx
+++ b/src/pages/Settings/components/About.tsx
@@ -10,7 +10,7 @@ const About: React.FC = () => {
   const { t } = useTranslation();
   const { token } = theme.useToken();
   const {config} = useConfig();
-  const version = config.version || 'v0.0.1';
+  const version = config.version || '';
   return (
     <div style={{
       width: '100%',

From 0e50896f58c72a9347e1b2e784fec9844b754bec Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Tue, 18 Aug 2026 14:42:06 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat(ERDiagram):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=82=AC=E5=81=9C=E9=AB=98=E4=BA=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在组件中引入 useState 和 useMemo 钩子用于状态管理
- 添加 hoveredNodeId 状态跟踪当前悬停的节点
- 为 ER 节点添加鼠标进入和离开事件处理函数
- 实现邻接关系映射以快速查找关联节点
- 创建 displayEdges 记忆化数据源用于动态样式更新
- 为连线添加过渡动画效果以平滑切换视觉状态
- 调整默认边样式包括宽度、颜色和标签背景设置
---
 .../DataModeling/components/ERDiagramView.tsx | 55 +++++++++++++++++--
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/pages/DataModeling/components/ERDiagramView.tsx b/src/pages/DataModeling/components/ERDiagramView.tsx
index 58123f5..eeea9f7 100644
--- a/src/pages/DataModeling/components/ERDiagramView.tsx
+++ b/src/pages/DataModeling/components/ERDiagramView.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useRef} from "react";
+import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
 import {theme} from "antd";
 import {Entity, Field} from '@/types/data-modeling';
 import {
@@ -30,10 +30,15 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
 
   const [nodes, setNodes, onNodesChange] = useNodesState<Node<any>>([]);
   const [edges, setEdges, onEdgesChange] = useEdgesState<Edge<any>>([]);
+  const [hoveredNodeId, setHoveredNodeId] = useState<string | null>(null);
 
   const nodeTypes = {
     erNode: ({data}: { data: { entity: Entity } }) => (
-      <div style={{position: 'relative'}}>
+      <div
+        style={{position: 'relative'}}
+        onMouseEnter={() => setHoveredNodeId(String(data.entity.name))}
+        onMouseLeave={() => setHoveredNodeId(null)}
+      >
         <Handle id="top" type="source" position={Position.Top}
                 style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
         <Handle id="right" type="source" position={Position.Right}
@@ -151,6 +156,45 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
     };
   }, [resizeGraph]);
 
+  // 邻接关系：节点 -> 关联节点集合
+  const adjacency = useMemo(() => {
+    const map = new Map<string, Set<string>>();
+    edges.forEach(e => {
+      const s = String(e.source);
+      const t = String(e.target);
+      if (!map.has(s)) map.set(s, new Set());
+      if (!map.has(t)) map.set(t, new Set());
+      map.get(s)!.add(t);
+      map.get(t)!.add(s);
+    });
+    return map;
+  }, [edges]);
+
+  // 根据悬浮状态派生展示用的连线（仅连线颜色变化）
+  const displayEdges = useMemo(() => {
+    if (!hoveredNodeId) return edges;
+    const ease = 'cubic-bezier(0.4, 0, 0.2, 1)';
+    const dur = '0.28s';
+    return edges.map(e => {
+      const connected = e.source === hoveredNodeId || e.target === hoveredNodeId;
+      return {
+        ...e,
+        style: {
+          ...e.style,
+          stroke: connected ? token.colorTextSecondary : token.colorFillSecondary,
+          strokeWidth: 1.5,
+          opacity: connected ? 1 : 0.4,
+          transition: `stroke ${dur} ${ease}, stroke-width ${dur} ${ease}, opacity ${dur} ${ease}`,
+        },
+        labelStyle: {
+          fill: connected ? token.colorText : token.colorTextTertiary,
+          opacity: connected ? 1 : 0.4,
+          transition: `fill ${dur} ${ease}, opacity ${dur} ${ease}`,
+        } as any,
+      };
+    });
+  }, [edges, hoveredNodeId, token]);
+
   return (
     <>
       <style
@@ -165,7 +209,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
       <div ref={containerRef} style={{width: '100%', height: '100%', overflow: 'hidden'}}>
         <ReactFlow
           nodes={nodes}
-          edges={edges}
+          edges={displayEdges}
           onNodesChange={onNodesChange}
           onEdgesChange={onEdgesChange}
           nodeTypes={nodeTypes}
@@ -178,7 +222,10 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
           defaultEdgeOptions={{
             type: 'smoothstep',
             markerEnd: {type: MarkerType.ArrowClosed},
-            style: {strokeWidth: 2, stroke: token.colorPrimary},
+            style: {strokeWidth: 1.5, stroke: token.colorBorderSecondary},
+            labelShowBg: true,
+            labelBgStyle: {fill: token.colorBgContainer, fillOpacity: 0.9} as any,
+            labelStyle: {fill: token.colorTextSecondary, fontWeight: 400} as any,
           }}
           proOptions={{ hideAttribution: true }}
         >

From 5e8c1a39a51664874e039f35b5874c8ac9f70748 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Tue, 18 Aug 2026 15:20:31 +0800
Subject: [PATCH 09/12] =?UTF-8?q?feat(er-diagram):=20=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=9B=BE=E9=AB=98=E4=BA=AE=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加节点悬浮高亮效果和相关实体联动显示
- 为边连接添加箭头标记以增强视觉引导
- 使用Ant Design主题token实现深浅色模式自适应
- 添加dim属性控制非相关节点透明度降低
- 优化过渡动画效果提升用户体验
---
 .../DataModeling/components/ERDiagramView.tsx | 41 +++++++---
 .../DataModeling/components/ERNodeView.tsx    | 75 +++++++++++--------
 2 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/src/pages/DataModeling/components/ERDiagramView.tsx b/src/pages/DataModeling/components/ERDiagramView.tsx
index eeea9f7..b877bab 100644
--- a/src/pages/DataModeling/components/ERDiagramView.tsx
+++ b/src/pages/DataModeling/components/ERDiagramView.tsx
@@ -33,29 +33,29 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
   const [hoveredNodeId, setHoveredNodeId] = useState<string | null>(null);
 
   const nodeTypes = {
-    erNode: ({data}: { data: { entity: Entity } }) => (
+    erNode: ({data}: { data: { entity: Entity; dim?: boolean } }) => (
       <div
         style={{position: 'relative'}}
         onMouseEnter={() => setHoveredNodeId(String(data.entity.name))}
         onMouseLeave={() => setHoveredNodeId(null)}
       >
         <Handle id="top" type="source" position={Position.Top}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="right" type="source" position={Position.Right}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="bottom" type="source" position={Position.Bottom}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="left" type="source" position={Position.Left}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="top-t" type="target" position={Position.Top}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="right-t" type="target" position={Position.Right}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="bottom-t" type="target" position={Position.Bottom}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
         <Handle id="left-t" type="target" position={Position.Left}
-                style={{opacity: 0, width: 0, height: 0, border: 'none'}}/>
-        <ERNodeView entity={data.entity}/>
+                style={{opacity: 0, background: 'transparent', border: 'none'}}/>
+        <ERNodeView entity={data.entity} dim={data.dim}/>
       </div>
     ),
   };
@@ -130,6 +130,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
                 targetHandle: opposite(side),
                 label,
                 type: 'smoothstep',
+                markerEnd: {type: MarkerType.ArrowClosed, color: token.colorBorderSecondary},
               } as Edge<any>);
             }
           }
@@ -170,6 +171,20 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
     return map;
   }, [edges]);
 
+  // 根据悬浮状态派生展示用的节点（整个节点背景色变化）
+  const displayNodes = useMemo(() => {
+    if (!hoveredNodeId) return nodes;
+    const related = adjacency.get(hoveredNodeId) || new Set<string>();
+    return nodes.map(n => {
+      const isActive = n.id === hoveredNodeId;
+      const isRelated = related.has(n.id);
+      return {
+        ...n,
+        data: {...n.data, highlight: isActive || isRelated, dim: !isActive && !isRelated},
+      };
+    });
+  }, [nodes, hoveredNodeId, adjacency]);
+
   // 根据悬浮状态派生展示用的连线（仅连线颜色变化）
   const displayEdges = useMemo(() => {
     if (!hoveredNodeId) return edges;
@@ -177,15 +192,17 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
     const dur = '0.28s';
     return edges.map(e => {
       const connected = e.source === hoveredNodeId || e.target === hoveredNodeId;
+      const stroke = connected ? token.colorTextSecondary : token.colorFillSecondary;
       return {
         ...e,
         style: {
           ...e.style,
-          stroke: connected ? token.colorTextSecondary : token.colorFillSecondary,
+          stroke,
           strokeWidth: 1.5,
           opacity: connected ? 1 : 0.4,
           transition: `stroke ${dur} ${ease}, stroke-width ${dur} ${ease}, opacity ${dur} ${ease}`,
         },
+        markerEnd: {type: MarkerType.ArrowClosed, color: stroke},
         labelStyle: {
           fill: connected ? token.colorText : token.colorTextTertiary,
           opacity: connected ? 1 : 0.4,
@@ -208,7 +225,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
       />
       <div ref={containerRef} style={{width: '100%', height: '100%', overflow: 'hidden'}}>
         <ReactFlow
-          nodes={nodes}
+          nodes={displayNodes}
           edges={displayEdges}
           onNodesChange={onNodesChange}
           onEdgesChange={onEdgesChange}
diff --git a/src/pages/DataModeling/components/ERNodeView.tsx b/src/pages/DataModeling/components/ERNodeView.tsx
index cf6e7a1..f471470 100644
--- a/src/pages/DataModeling/components/ERNodeView.tsx
+++ b/src/pages/DataModeling/components/ERNodeView.tsx
@@ -1,58 +1,68 @@
 import React, {useEffect, useState} from 'react';
+import {theme} from 'antd';
 import {Entity} from '@/types/data-modeling';
 import {KeyOutlined} from '@ant-design/icons';
 
 interface ERNodeViewProps {
   entity: Entity;
+  dim?: boolean;
 }
 
-const ERNodeView: React.FC<ERNodeViewProps> = ({ entity }) => {
+const ERNodeView: React.FC<ERNodeViewProps> = ({entity, dim = false}) => {
+  const {token} = theme.useToken();
   const [expanded, setExpanded] = useState(false);
-  const [isDark, setIsDark] = useState(() => document.documentElement.classList.contains('dark'));
   useEffect(() => {
-    const observer = new MutationObserver(() => {
-      setIsDark(document.documentElement.classList.contains('dark'));
-    });
-    observer.observe(document.documentElement, { attributes: true, attributeFilter: ['class'] });
-    return () => observer.disconnect();
+    // 保持组件在 ConfigProvider 主题切换后刷新（token 由 antd 自动派生）
   }, []);
   const fields = entity.fields || [];
   const showFields = expanded ? fields : fields.slice(0, 5);
   const hasMore = fields.length > 5;
 
+  // 配色对齐 DESIGN.md token，经由 antd theme token 语义化（随明暗主题自动适配）
+  // canvas -> colorBgContainer / surface-soft -> colorFillQuaternary / hairline -> colorBorderSecondary
+  // ink -> colorText / body -> colorTextSecondary / info -> colorInfo
+  const ease = 'cubic-bezier(0.4, 0, 0.2, 1)';
+  const dur = '0.28s';
+  const bg = token.colorBgContainer;
+  const headerBg = token.colorFillQuaternary;
+  const border = token.colorBorderSecondary;
+  const ink = token.colorText;
+  const body = token.colorTextSecondary;
+  const accent = token.colorInfo;
+
   return (
     <div
       style={{
-        background: isDark ? '#2c323c' : '#ffffff',
-        border: `1px solid ${isDark ? '#4a5260' : '#dddddd'}`,
-        borderRadius: 10,
+        background: bg,
+        border: `1px solid ${border}`,
+        borderRadius: token.borderRadiusLG,
         minWidth: 220,
         minHeight: 40,
-        boxShadow: isDark ? '0 2px 8px rgba(0,0,0,0.35)' : '0 2px 8px rgba(0, 0, 0, 0.1)',
+        boxShadow: token.boxShadowSecondary,
         padding: '0px 16px 8px 16px',
-        fontSize: 14,
-        color: isDark ? '#f5f6f8' : '#181d26',
+        fontSize: token.fontSize,
+        color: ink,
         position: 'relative',
-        transition: 'box-shadow 0.3s',
+        transition: `box-shadow ${dur} ${ease}, background-color ${dur} ${ease}, opacity ${dur} ${ease}`,
         cursor: 'pointer',
+        opacity: dim ? 0.4 : 1,
       }}
-      onMouseEnter={e => (e.currentTarget.style.boxShadow = '0 4px 12px rgba(0, 0, 0, 0.15)')}
-      onMouseLeave={e => (e.currentTarget.style.boxShadow = '0 2px 8px rgba(0, 0, 0, 0.1)')}
     >
       <div
         style={{
-          fontWeight: 500,
-          color: isDark ? '#f5f6f8' : '#181d26',
+          fontWeight: token.fontWeightStrong ?? 500,
+          color: ink,
           marginBottom: 10,
-          fontSize: 16,
+          fontSize: token.fontSizeLG,
           letterSpacing: 0,
-          background: isDark ? '#232830' : '#f8fafc',
+          background: headerBg,
           padding: '8px 0',
-          borderBottom: `1px solid ${isDark ? '#4a5260' : '#dddddd'}`,
+          borderBottom: `1px solid ${border}`,
           marginLeft: '-16px',
           marginRight: '-16px',
           paddingLeft: '16px',
           paddingRight: '16px',
+          transition: `background-color ${dur} ${ease}`,
         }}
       >
         {entity.name}
@@ -66,21 +76,21 @@ const ERNodeView: React.FC<ERNodeViewProps> = ({ entity }) => {
               justifyContent: 'space-between',
               alignItems: 'center',
               padding: '4px 0',
-              fontSize: 14,
-              color: isDark ? '#9499a6' : '#41454d',
-              borderBottom: idx !== showFields.length - 1 ? `1px solid ${isDark ? '#4a5260' : '#dddddd'}` : 'none',
+              fontSize: token.fontSize,
+              color: body,
+              borderBottom: idx !== showFields.length - 1 ? `1px solid ${border}` : 'none',
             }}
           >
             <span style={{
-              color: isDark ? '#6badff' : '#254fad',
-              fontWeight: 500,
+              color: accent,
+              fontWeight: token.fontWeightStrong ?? 500,
               display: 'flex',
               alignItems: 'center'
             }}>
-              {f.identity && <KeyOutlined style={{ marginRight: 4, fontSize: 12 }} />}
+              {f.identity && <KeyOutlined style={{marginRight: 4, fontSize: 12}}/>}
               {f.name}
             </span>
-            <span style={{ color: isDark ? '#bcc0cc' : '#9297a0', fontWeight: 400 }}>{f.concreteType || f.type}</span>
+            <span style={{color: token.colorTextTertiary, fontWeight: 400}}>{f.concreteType || f.type}</span>
           </div>
         ))}
       </div>
@@ -100,15 +110,16 @@ const ERNodeView: React.FC<ERNodeViewProps> = ({ entity }) => {
           <span
             style={{
               display: 'inline-block',
-              fontSize: 16,
-              color: isDark ? '#6badff' : '#254fad',
+              fontSize: token.fontSizeLG,
+              color: accent,
               transform: expanded ? 'rotate(180deg)' : 'none',
               transition: 'transform 0.3s',
               lineHeight: 1,
             }}
           >
-            <svg width="16" height="16" viewBox="0 0 24 24" style={{ verticalAlign: 'middle' }}>
-              <polyline points="6 10 12 16 18 10" fill="none" stroke={isDark ? '#6badff' : '#254fad'} strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
+            <svg width="16" height="16" viewBox="0 0 24 24" style={{verticalAlign: 'middle'}}>
+              <polyline points="6 10 12 16 18 10" fill="none" stroke={accent} strokeWidth="2" strokeLinecap="round"
+                        strokeLinejoin="round"/>
             </svg>
           </span>
         </div>

From 06f2c6d41ca012ec2c67df51fbb2c319528865d0 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Tue, 18 Aug 2026 16:53:25 +0800
Subject: [PATCH 10/12] =?UTF-8?q?perf(ERDiagramView):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B=E6=B8=B2=E6=9F=93=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用 useMemo 包装 nodeTypes 避免重复创建
- 确保节点类型组件在渲染过程中保持稳定引用
- 提升实体关系图的渲染效率和响应速度
---
 src/pages/DataModeling/components/ERDiagramView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/DataModeling/components/ERDiagramView.tsx b/src/pages/DataModeling/components/ERDiagramView.tsx
index b877bab..49a1bcf 100644
--- a/src/pages/DataModeling/components/ERDiagramView.tsx
+++ b/src/pages/DataModeling/components/ERDiagramView.tsx
@@ -32,7 +32,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
   const [edges, setEdges, onEdgesChange] = useEdgesState<Edge<any>>([]);
   const [hoveredNodeId, setHoveredNodeId] = useState<string | null>(null);
 
-  const nodeTypes = {
+  const nodeTypes = useMemo(() => ({
     erNode: ({data}: { data: { entity: Entity; dim?: boolean } }) => (
       <div
         style={{position: 'relative'}}
@@ -58,7 +58,7 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
         <ERNodeView entity={data.entity} dim={data.dim}/>
       </div>
     ),
-  };
+  }), []);
 
   useEffect(() => {
     const newNodes = (data || []).filter(e => e.type === 'Entity').map((entity, idx) => {

From ca8088c7e2c476ee307a83d61cde178c3528675a Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Tue, 18 Aug 2026 17:12:30 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E4=B9=B1?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96ER?=
 =?UTF-8?q?=E5=9B=BE=E8=8A=82=E7=82=B9=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复Console组件中注释的乱码显示问题
- 优化ERDiagramView中节点中心坐标计算逻辑，使用可选链操作符替代硬编码宽高
- 移除ERDiagramView中冗余的width和height属性定义
- 修正executeFml函数返回类型的大小写错误
- 在ESLint配置中添加no-unused-vars规则配置
---
 eslint.config.js                              |  7 +++-
 src/components/console/Console.tsx            | 34 +++++++++----------
 .../DataModeling/components/ERDiagramView.tsx |  9 ++---
 src/services/model.ts                         |  2 +-
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 278df1a..1d1a2d8 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -23,7 +23,12 @@ export default tseslint.config(
         'warn',
         { allowConstantExport: true },
       ],
-      "@typescript-eslint/no-explicit-any": ["off"]
+      "@typescript-eslint/no-explicit-any": ["off"],
+      "@typescript-eslint/no-unused-vars": ["error", {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "ignoreRestSiblings": true
+      }]
     },
   },
 )
diff --git a/src/components/console/Console.tsx b/src/components/console/Console.tsx
index 0bee328..4d1b902 100644
--- a/src/components/console/Console.tsx
+++ b/src/components/console/Console.tsx
@@ -31,7 +31,7 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
   const [searchKeyword, setSearchKeyword] = useState('');
   const [debouncedSearchKeyword, setDebouncedSearchKeyword] = useState('');
   const [fontSize, setFontSize] = useState(12);
-  const [displayLimit, setDisplayLimit] = useState<number>(100); // 默认显示100条
+  const [displayLimit, setDisplayLimit] = useState<number>(100); // 默认显示100�?
 
   // 使用WebSocket Hook
   const {
@@ -44,35 +44,35 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
     logsEndRef,
     setAutoScrollEnabled
   } = useConsoleLogs({
-    maxLogs: 1000, // 减少到1000条以提高性能
+    maxLogs: 1000, // 减少�?000条以提高性能
     autoScroll: true,
     projectId,
   });
 
-  // 始终置底开关：选中后不管是否滚动，始终保持在底部
+  // 始终置底开关：选中后不管是否滚动，始终保持在底�?
   const [stayAtBottom, setStayAtBottom] = useState(false);
 
-  // 选中“始终置底”时，确保自动滚动始终开启
+  // 选中“始终置底”时，确保自动滚动始终开�?
   useEffect(() => {
     if (stayAtBottom) {
       setAutoScrollEnabled(true);
     }
   }, [stayAtBottom, setAutoScrollEnabled]);
 
-  // 根据滚动位置更新自动滚动开关
+  // 根据滚动位置更新自动滚动开�?
   const handleContentScroll = useCallback((e: React.UIEvent<HTMLDivElement>) => {
     if (stayAtBottom) {
-      // 强制保持在底部
+      // 强制保持在底�?
       setAutoScrollEnabled(true);
       if (logsEndRef.current) {
-        // 使用同步滚动，避免视觉抖动
+        // 使用同步滚动，避免视觉抖�?
         logsEndRef.current.scrollIntoView({ behavior: 'auto' });
       }
       return;
     }
 
     const target = e.currentTarget;
-    const threshold = 16; // 离底部阈值
+    const threshold = 16; // 离底部阈�?
     const distanceToBottom = target.scrollHeight - target.scrollTop - target.clientHeight;
     const isNearBottom = distanceToBottom <= threshold;
     setAutoScrollEnabled(isNearBottom);
@@ -92,7 +92,7 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
     }
   }, [isConnected, reconnect, t]);
 
-  // 手动滚动到底部
+  // 手动滚动到底�?
   const scrollToBottom = useCallback(() => {
     if (logsEndRef.current) {
       logsEndRef.current.scrollIntoView({ behavior: 'smooth' });
@@ -108,7 +108,7 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
     return () => clearTimeout(timer);
   }, [searchKeyword]);
 
-  // 过滤日志 - 只按关键词过滤
+  // 过滤日志 - 只按关键词过�?
   const filteredLogs = useMemo(() => {
     if (!debouncedSearchKeyword) {
       if (displayLimit === -1 || logs.length <= displayLimit) return logs;
@@ -116,7 +116,7 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
     }
 
     const keyword = debouncedSearchKeyword.toLowerCase();
-    let result = logs.filter(log =>
+    const result = logs.filter(log =>
       log.message.toLowerCase().includes(keyword)
     );
 
@@ -129,17 +129,17 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
   useEffect(() => {
     if (import.meta.env.DEV) {
       console.log('Console组件 - 当前日志数量:', logs.length);
-      console.log('Console组件 - 连接状态:', isConnected);
-      console.log('Console组件 - 过滤后日志数量:', filteredLogs.length);
+      console.log('Console组件 - 连接状�?', isConnected);
+      console.log('Console组件 - 过滤后日志数�?', filteredLogs.length);
 
       // 性能警告
       if (logs.length > 400) {
-        console.warn(`Console日志数量较多 (${logs.length}条)，可能影响性能`);
+        console.warn(`Console日志数量较多 (${logs.length}�?，可能影响性能`);
       }
     }
   }, [logs, isConnected, filteredLogs]);
 
-  // 当过滤条件或显示限制变化时，滚动到底部
+  // 当过滤条件或显示限制变化时，滚动到底�?
   useEffect(() => {
     if (filteredLogs.length > 0 && logsEndRef.current) {
       // 使用setTimeout确保DOM更新后再滚动
@@ -151,7 +151,7 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
     }
   }, [filteredLogs.length, displayLimit, debouncedSearchKeyword, logsEndRef]);
 
-  // 打开时滚动到底部（交由父组件控制可见性，这里仅在有日志时尝试）
+  // 打开时滚动到底部（交由父组件控制可见性，这里仅在有日志时尝试�?
   useEffect(() => {
     if (filteredLogs.length > 0) {
       setTimeout(() => {
@@ -169,7 +169,7 @@ const Console: React.FC<ConsoleProps> = ({ onToggle, projectId }) => {
       borderTop: `1px solid ${token.colorBorder}`,
       background: token.colorBgContainer
     }}>
-      {/* 控制栏 */}
+      {/* 控制�?*/}
       <div style={{
         padding: '8px 16px',
         borderBottom: `1px solid ${token.colorBorder}`,
diff --git a/src/pages/DataModeling/components/ERDiagramView.tsx b/src/pages/DataModeling/components/ERDiagramView.tsx
index 49a1bcf..2e1ba14 100644
--- a/src/pages/DataModeling/components/ERDiagramView.tsx
+++ b/src/pages/DataModeling/components/ERDiagramView.tsx
@@ -64,22 +64,19 @@ const ERDiagram: React.FC<ERDiagramProps> = ({data}) => {
     const newNodes = (data || []).filter(e => e.type === 'Entity').map((entity, idx) => {
       const x = 80 + (idx % 5) * 320;
       const y = 80 + Math.floor(idx / 5) * 300;
-      const width = 200;
-      const height = 60 + (entity.fields?.length || 0) * 22;
       return {
         id: String(entity.name),
         position: {x, y},
         data: {entity},
         type: 'erNode',
-        style: {width, height},
-        width,
-        height,
         draggable: true,
       } as Node<any>;
     });
 
     const nodeCenter = (n: any) => {
-      return {cx: n.position.x + (n.width || 200) / 2, cy: n.position.y + (n.height || 60) / 2};
+      const w = n.width ?? n.measured?.width ?? 220;
+      const h = n.height ?? n.measured?.height ?? 80;
+      return {cx: n.position.x + w / 2, cy: n.position.y + h / 2};
     };
 
     const opposite = (side: string) => ({
diff --git a/src/services/model.ts b/src/services/model.ts
index 5bb632f..1068236 100644
--- a/src/services/model.ts
+++ b/src/services/model.ts
@@ -74,6 +74,6 @@ export const dropIndex = (projectId: string, modelName: string, indexName: strin
 /**
  * 执行FML
  */
-export const executeFml = (projectId: string, fml: string): Promise<Boolean> => {
+export const executeFml = (projectId: string, fml: string): Promise<boolean> => {
   return api.post(`/projects/${projectId}/models/fml/execute`, { fml })
 }

From c24d691ad145e2fb36dbb6e73be5ee4a13ebf013 Mon Sep 17 00:00:00 2001
From: Cheng Jinbao <cjbi@outlook.com>
Date: Tue, 18 Aug 2026 17:56:46 +0800
Subject: [PATCH 12/12] =?UTF-8?q?chore(ci):=20=E7=A7=BB=E9=99=A4=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E4=B8=AD=E7=9A=84Docker=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除了Type check步骤
- 移除了push-ui-image作业及其相关配置
- 清理了Docker构建和推送的相关步骤
- 移除了Docker Hub登录和镜像标签配置
---
 .github/workflows/ci.yml | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c9ed42..0692513 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,40 +43,3 @@ jobs:
         run: npm run lint
       - name: Type check
         run: npx tsc --noEmit
-
-  push-ui-image:
-    name: Push UI docker image
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.run_build == 'true' }}
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          submodules: 'recursive'
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Read version
-        id: version
-        run: |
-          VERSION=$(cat VERSION | tr -d '[:space:]')
-          echo "ver=${VERSION}" >> $GITHUB_OUTPUT
-          echo "tag=${VERSION}.${{ github.run_number }}" >> $GITHUB_OUTPUT
-          echo "full=${VERSION}.${{ github.run_number }}-${{ github.sha }}" >> $GITHUB_OUTPUT
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push UI image
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          push: true
-          tags: |
-            cjbi/flexmodel-ui:latest
-            cjbi/flexmodel-ui:${{ steps.version.outputs.ver }}
-            cjbi/flexmodel-ui:${{ steps.version.outputs.tag }}
-            cjbi/flexmodel-ui:${{ steps.version.outputs.full }}
-            cjbi/flexmodel-ui:sha-${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max