From 53dc40411306dc86c3a025342ae1953ee90c7b99 Mon Sep 17 00:00:00 2001
From: cp3hnu <cp3hnu@gmail.com>
Date: Thu, 6 Jun 2024 11:18:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E6=BC=94=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 react-ui/package.json                         |   1 +
 .../components/ResourceIntro/index.less       |  23 +-
 .../components/ResourceIntro/index.tsx        |  85 ++-
 .../components/ResourceVersion/index.tsx      |  50 +-
 .../DatasetAnnotation/index.tsx               |   2 +-
 .../Model/components/GraphLegand/index.less   |  17 +
 .../Model/components/GraphLegand/index.tsx    |  55 ++
 .../components/ModelEvolution/index.less      |  18 +
 .../Model/components/ModelEvolution/index.tsx | 484 ++++++++++++++++++
 .../Model/components/NodeTooltips/index.less  |  56 ++
 .../Model/components/NodeTooltips/index.tsx   |  73 +++
 .../Pipeline/components/ModelMenu/index.less  |  12 +-
 .../Pipeline/components/ModelMenu/index.tsx   |   1 +
 .../pages/Pipeline/editPipeline/index.less    |   9 +-
 .../Workspace/components/QuickStart/index.tsx |   4 +-
 react-ui/src/requestConfig.ts                 |   1 +
 react-ui/src/services/dataset/index.js        |   8 +
 react-ui/src/types.ts                         |   7 +-
 react-ui/src/utils/index.ts                   |  99 +++-
 react-ui/src/utils/ui.tsx                     |   2 +
 20 files changed, 934 insertions(+), 73 deletions(-)
 create mode 100644 react-ui/src/pages/Model/components/GraphLegand/index.less
 create mode 100644 react-ui/src/pages/Model/components/GraphLegand/index.tsx
 create mode 100644 react-ui/src/pages/Model/components/NodeTooltips/index.less
 create mode 100644 react-ui/src/pages/Model/components/NodeTooltips/index.tsx

diff --git a/react-ui/package.json b/react-ui/package.json
index 1534f11..ac2bc99 100644
--- a/react-ui/package.json
+++ b/react-ui/package.json
@@ -57,6 +57,7 @@
     "@ant-design/pro-components": "^2.4.4",
     "@ant-design/use-emotion-css": "1.0.4",
     "@antv/g6": "^4.8.24",
+    "@antv/hierarchy": "^0.6.12",
     "@umijs/route-utils": "^4.0.1",
     "antd": "^5.4.4",
     "classnames": "^2.3.2",
diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.less b/react-ui/src/pages/Dataset/components/ResourceIntro/index.less
index cff0a9e..3c4fcae 100644
--- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.less
+++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.less
@@ -2,13 +2,10 @@
   height: 100%;
 
   &__top {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
     width: 100%;
     height: 110px;
     margin-bottom: 10px;
-    padding: 25px 30px;
+    padding: 20px 30px 0;
     background-image: url(/assets/images/dataset-back.png);
     background-repeat: no-repeat;
     background-position: top center;
@@ -17,7 +14,7 @@
     &__name {
       margin-bottom: 12px;
       color: @text-color;
-      font-size: 20;
+      font-size: 20px;
     }
 
     &__tag {
@@ -36,6 +33,22 @@
     background: #ffffff;
     border-radius: 10px;
     box-shadow: 0px 2px 12px rgba(180, 182, 191, 0.09);
+
+    :global {
+      .ant-tabs {
+        height: 100%;
+        .ant-tabs-content-holder {
+          height: 100%;
+          .ant-tabs-content {
+            height: 100%;
+            .ant-tabs-tabpane {
+              height: 100%;
+              overflow-y: auto;
+            }
+          }
+        }
+      }
+    }
   }
 
   &__title {
diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
index 813abdb..0a0717f 100644
--- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
@@ -1,3 +1,4 @@
+import ModelEvolution from '@/pages/Model/components/ModelEvolution';
 import { to } from '@/utils/promise';
 import { useParams, useSearchParams } from '@umijs/max';
 import { Flex, Tabs } from 'antd';
@@ -12,14 +13,19 @@ type ResourceIntroProps = {
 
 const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
   const [info, setInfo] = useState<ResourceData>({} as ResourceData);
-  const locationParams = useParams(); //新版本获取路由参数接口
+  const locationParams = useParams();
   const [searchParams] = useSearchParams();
+  const [versionList, setVersionList] = useState([]);
+  const [version, setVersion] = useState<string | undefined>(undefined);
   const isPublic = searchParams.get('isPublic') === 'true';
+  const defaultTab = searchParams.get('tab') || '1';
+  let versionParam = searchParams.get('version');
   const resourceId = Number(locationParams.id);
-  const name = resourceConfig[resourceType].name;
+  const typeName = resourceConfig[resourceType].name; // 数据集/模型
 
   useEffect(() => {
     getModelByDetail();
+    getVersionList();
   }, []);
 
   // 获取详情
@@ -31,10 +37,39 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
     }
   };
 
+  // 获取版本列表
+  const getVersionList = async () => {
+    const request = resourceConfig[resourceType].getVersions;
+    const [res] = await to(request(resourceId));
+    if (res && res.data && res.data.length > 0) {
+      setVersionList(
+        res.data.map((item: string) => {
+          return {
+            label: item,
+            value: item,
+          };
+        }),
+      );
+      if (versionParam) {
+        setVersion(versionParam);
+        versionParam = null;
+      } else {
+        setVersion(res.data[0]);
+      }
+    } else {
+      setVersion(undefined);
+    }
+  };
+
+  // 版本变化
+  const handleVersionChange = (value: string) => {
+    setVersion(value);
+  };
+
   const items = [
     {
       key: '1',
-      label: `${name}简介`,
+      label: `${typeName}简介`,
       children: (
         <>
           <div className={styles['resource-intro__title']}>简介</div>
@@ -44,18 +79,38 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
     },
     {
       key: '2',
-      label: `${name}文件/版本`,
+      label: `${typeName}文件/版本`,
       children: (
         <ResourceVersion
           resourceType={resourceType}
           resourceId={resourceId}
           resourceName={info.name}
           isPublic={isPublic}
+          versionList={versionList}
+          version={version}
+          getVersionList={getVersionList}
+          onVersionChange={handleVersionChange}
         ></ResourceVersion>
       ),
     },
   ];
 
+  if (resourceType === ResourceType.Model) {
+    items.push({
+      key: '3',
+      label: `模型演化`,
+      children: (
+        <ModelEvolution
+          resourceId={resourceId}
+          resourceName={info.name}
+          versionList={versionList}
+          version={version}
+          onVersionChange={handleVersionChange}
+        ></ModelEvolution>
+      ),
+    });
+  }
+
   const infoTypePropertyName = resourceConfig[resourceType]
     .infoTypePropertyName as keyof ResourceData;
   const infoTagPropertyName = resourceConfig[resourceType]
@@ -64,21 +119,25 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
   return (
     <div className={styles['resource-intro']}>
       <div className={styles['resource-intro__top']}>
-        <span className={styles['resource-intro__top__name']}>{info.name}</span>
+        <div className={styles['resource-intro__top__name']}>{info.name}</div>
         <Flex align="center">
           <div className={styles['resource-intro__top__tag']}>
-            {name} id：{info.id}
-          </div>
-          <div className={styles['resource-intro__top__tag']}>
-            {info[infoTypePropertyName] || '--'}
-          </div>
-          <div className={styles['resource-intro__top__tag']}>
-            {info[infoTagPropertyName] || '--'}
+            {typeName} id：{info.id}
           </div>
+          {info[infoTypePropertyName] && (
+            <div className={styles['resource-intro__top__tag']}>
+              {info[infoTypePropertyName] || '--'}
+            </div>
+          )}
+          {info[infoTagPropertyName] && (
+            <div className={styles['resource-intro__top__tag']}>
+              {info[infoTagPropertyName] || '--'}
+            </div>
+          )}
         </Flex>
       </div>
       <div className={styles['resource-intro__bottom']}>
-        <Tabs defaultActiveKey="1" items={items}></Tabs>
+        <Tabs defaultActiveKey={defaultTab} items={items}></Tabs>
       </div>
     </div>
   );
diff --git a/react-ui/src/pages/Dataset/components/ResourceVersion/index.tsx b/react-ui/src/pages/Dataset/components/ResourceVersion/index.tsx
index 08035fd..ec35387 100644
--- a/react-ui/src/pages/Dataset/components/ResourceVersion/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceVersion/index.tsx
@@ -2,14 +2,13 @@ import CommonTableCell from '@/components/CommonTableCell';
 import DateTableCell from '@/components/DateTableCell';
 import KFIcon from '@/components/KFIcon';
 import AddVersionModal from '@/pages/Dataset/components/AddVersionModal';
-import { ResourceType } from '@/pages/Dataset/config';
+import { ResourceFileData, ResourceType, resourceConfig } from '@/pages/Dataset/config';
 import { downLoadZip } from '@/utils/downloadfile';
 import { openAntdModal } from '@/utils/modal';
 import { to } from '@/utils/promise';
 import { modalConfirm } from '@/utils/ui';
 import { App, Button, Flex, Select, Table } from 'antd';
 import { useEffect, useState } from 'react';
-import { ResourceFileData, resourceConfig } from '../../config';
 import styles from './index.less';
 
 type ResourceVersionProps = {
@@ -17,42 +16,32 @@ type ResourceVersionProps = {
   resourceId: number;
   resourceName: string;
   isPublic: boolean;
+  versionList: { label: string; value: string }[];
+  version?: string;
+  getVersionList: () => void;
+  onVersionChange: (version: string) => void;
 };
 function ResourceVersion({
   resourceType,
   resourceId,
   resourceName,
   isPublic,
+  versionList,
+  version,
+  getVersionList,
+  onVersionChange,
 }: ResourceVersionProps) {
-  const [versionList, setVersionList] = useState([]);
-  const [version, setVersion] = useState<string | undefined>(undefined);
   const [fileList, setFileList] = useState<ResourceFileData[]>([]);
   const { message } = App.useApp();
 
+  // 获取版本文件列表
   useEffect(() => {
-    getVersionList();
-  }, []);
-
-  // 获取版本列表
-  const getVersionList = async () => {
-    const request = resourceConfig[resourceType].getVersions;
-    const [res] = await to(request(resourceId));
-    if (res && res.data && res.data.length > 0) {
-      setVersionList(
-        res.data.map((item: string) => {
-          return {
-            label: item,
-            value: item,
-          };
-        }),
-      );
-      setVersion(res.data[0]);
-      getFileList(res.data[0]);
+    if (version) {
+      getFileList(version);
     } else {
-      setVersion(undefined);
       setFileList([]);
     }
-  };
+  }, [resourceId, version]);
 
   // 获取版本下的文件列表
   const getFileList = async (version: string) => {
@@ -120,16 +109,6 @@ function ResourceVersion({
     downLoadZip(`${url}/${record.id}`);
   };
 
-  // 版本变化
-  const handleChange = (value: string) => {
-    if (value) {
-      getFileList(value);
-      setVersion(value);
-    } else {
-      setVersion(undefined);
-    }
-  };
-
   const columns = [
     {
       title: '序号',
@@ -194,8 +173,7 @@ function ResourceVersion({
             placeholder="请选择版本号"
             style={{ width: '160px', marginRight: '20px' }}
             value={version}
-            allowClear
-            onChange={handleChange}
+            onChange={onVersionChange}
             options={versionList}
           />
           <Button type="default" onClick={showModal} icon={<KFIcon type="icon-xinjian2" />}>
diff --git a/react-ui/src/pages/DatasetPreparation/DatasetAnnotation/index.tsx b/react-ui/src/pages/DatasetPreparation/DatasetAnnotation/index.tsx
index 385be97..3ba7f54 100644
--- a/react-ui/src/pages/DatasetPreparation/DatasetAnnotation/index.tsx
+++ b/react-ui/src/pages/DatasetPreparation/DatasetAnnotation/index.tsx
@@ -16,7 +16,7 @@ function DatasetAnnotation() {
   };
   return (
     <div className={styles.container}>
-      <iframe src="http://172.20.32.181:31213/label-studio" className={styles.frame}></iframe>
+      <iframe src={iframeUrl} className={styles.frame}></iframe>
     </div>
   );
 }
diff --git a/react-ui/src/pages/Model/components/GraphLegand/index.less b/react-ui/src/pages/Model/components/GraphLegand/index.less
new file mode 100644
index 0000000..9a7faee
--- /dev/null
+++ b/react-ui/src/pages/Model/components/GraphLegand/index.less
@@ -0,0 +1,17 @@
+.graph-legend {
+  &__item {
+    margin-right: 20px;
+    color: @text-color;
+    font-size: @font-size-content;
+
+    &:last-child {
+      margin-right: 0;
+    }
+
+    &__name {
+      margin-left: 10px;
+      color: @text-color-secondary;
+      font-size: @font-size-content;
+    }
+  }
+}
diff --git a/react-ui/src/pages/Model/components/GraphLegand/index.tsx b/react-ui/src/pages/Model/components/GraphLegand/index.tsx
new file mode 100644
index 0000000..a70c994
--- /dev/null
+++ b/react-ui/src/pages/Model/components/GraphLegand/index.tsx
@@ -0,0 +1,55 @@
+import { Flex } from 'antd';
+import styles from './index.less';
+
+type GraphLegandData = {
+  name: string;
+  color: string;
+  radius: number;
+  fill: boolean;
+};
+
+type GraphLegandProps = {
+  style?: React.CSSProperties;
+};
+
+function GraphLegand({ style }: GraphLegandProps) {
+  const legends: GraphLegandData[] = [
+    {
+      name: '父模型',
+      color: '#76b1ff',
+      radius: 2,
+      fill: true,
+    },
+    {
+      name: '当前模型',
+      color: '#1664ff',
+      radius: 2,
+      fill: true,
+    },
+    {
+      name: '衍生模型',
+      color: '#b7cfff',
+      radius: 2,
+      fill: true,
+    },
+  ];
+  return (
+    <Flex align="center" className={styles['graph-legend']} style={style}>
+      {legends.map((item) => (
+        <Flex align="center" key={item.name} className={styles['graph-legend__item']}>
+          <div
+            style={{
+              width: '16px',
+              height: '12px',
+              borderRadius: item.radius,
+              backgroundColor: item.color,
+            }}
+          ></div>
+          <div className={styles['graph-legend__item__name']}>{item.name}</div>
+        </Flex>
+      ))}
+    </Flex>
+  );
+}
+
+export default GraphLegand;
diff --git a/react-ui/src/pages/Model/components/ModelEvolution/index.less b/react-ui/src/pages/Model/components/ModelEvolution/index.less
index e69de29..40ea58e 100644
--- a/react-ui/src/pages/Model/components/ModelEvolution/index.less
+++ b/react-ui/src/pages/Model/components/ModelEvolution/index.less
@@ -0,0 +1,18 @@
+.model-evolution {
+  width: 100%;
+  height: 100%;
+  background-color: white;
+
+  &__top {
+    padding: 30px 0;
+    color: @text-color;
+    font-size: @font-size-content;
+  }
+
+  &__graph {
+    height: calc(100% - 92px);
+    background-color: @background-color;
+    background-image: url(/assets/images/pipeline-canvas-back.png);
+    background-size: 100% 100%;
+  }
+}
diff --git a/react-ui/src/pages/Model/components/ModelEvolution/index.tsx b/react-ui/src/pages/Model/components/ModelEvolution/index.tsx
index e69de29..a1de7f7 100644
--- a/react-ui/src/pages/Model/components/ModelEvolution/index.tsx
+++ b/react-ui/src/pages/Model/components/ModelEvolution/index.tsx
@@ -0,0 +1,484 @@
+import { getModelAtlasReq } from '@/services/dataset/index.js';
+import themes from '@/styles/theme.less';
+import { changePropertyName, fittingString } from '@/utils';
+import { to } from '@/utils/promise';
+import G6, {
+  EdgeConfig,
+  G6GraphEvent,
+  Graph,
+  GraphData,
+  LayoutConfig,
+  NodeConfig,
+  TreeGraphData,
+  Util,
+} from '@antv/g6';
+// @ts-ignore
+import Hierarchy from '@antv/hierarchy';
+import { Flex, Select } from 'antd';
+import { useEffect, useRef, useState } from 'react';
+import GraphLegand from '../GraphLegand';
+import NodeTooltips from '../NodeTooltips';
+import styles from './index.less';
+const nodeWidth = 98;
+const nodeHeight = 58;
+const vGap = 30;
+const hGap = 30;
+
+enum NodeType {
+  current = 'current',
+  parent = 'parent',
+  children = 'children',
+  project = 'project',
+  trainDataset = 'trainDataset',
+  testDataset = 'testDataset',
+}
+
+type TrainTask = {
+  ins_id: number;
+  name: string;
+  task_id: string;
+};
+
+interface TrainDataset extends NodeConfig {
+  dataset_id: number;
+  dataset_name: string;
+  dataset_version: string;
+  model_type: NodeType;
+}
+
+interface ProjectDependency extends NodeConfig {
+  url: string;
+  name: string;
+  branch: string;
+  model_type: NodeType;
+}
+
+export interface ModelDepsAPIData {
+  current_model_id: number;
+  version: string;
+  exp_ins_id: number;
+  model_type: NodeType;
+  current_model_name: string;
+  project_dependency: ProjectDependency;
+  test_dataset: TrainDataset[];
+  train_dataset: TrainDataset[];
+  train_task: TrainTask;
+  children_models: ModelDepsAPIData[];
+  parent_models: ModelDepsAPIData[];
+}
+
+interface ModelDepsData extends Omit<ModelDepsAPIData, 'children_models'>, TreeGraphData {
+  children: ModelDepsData[];
+}
+
+// 规范化子数据
+function normalizeChildren(data: ModelDepsData[]) {
+  if (Array.isArray(data)) {
+    data.forEach((item) => {
+      item.id = `$M_${item.current_model_id}_${item.version}`;
+      item.label = getLabel(item);
+      item.style = getStyle(NodeType.children);
+      item.model_type = NodeType.children;
+      normalizeChildren(item.children);
+    });
+  }
+}
+
+// 获取 label
+function getLabel(node: { current_model_name: string; version: string }) {
+  return (
+    fittingString(`${node.current_model_name}`, 87, 8) +
+    '\n' +
+    fittingString(`${node.version}`, 87, 8)
+  );
+}
+
+// 获取 style
+function getStyle(model_type: NodeType) {
+  let fill = '';
+  switch (model_type) {
+    case NodeType.current:
+      fill = '#1664ff';
+      break;
+    case NodeType.parent:
+      fill = '#76b1ff';
+      break;
+    case NodeType.children:
+      fill = '#b7cfff';
+      break;
+    case NodeType.project:
+      fill = '#0000ff';
+      break;
+    case NodeType.trainDataset:
+      fill = '#ff0000';
+      break;
+    case NodeType.testDataset:
+      fill = '#ff00ff';
+      break;
+    default:
+      break;
+  }
+  return {
+    fill,
+  };
+}
+
+// 将后台返回的数据转换成树形数据
+function normalizeTreeData(apiData: ModelDepsAPIData, currentNodeName: string): ModelDepsData {
+  // 将 children_models 转换成 children
+  let normalizedData = changePropertyName(apiData, {
+    children_models: 'children',
+  }) as ModelDepsData;
+
+  // 设置当前模型的数据
+  normalizedData.label = getLabel(normalizedData);
+  normalizedData.id = `$M_${normalizedData.current_model_id}_${normalizedData.version}`;
+  normalizedData.style = getStyle(NodeType.current);
+  normalizedData.model_type = NodeType.current;
+  normalizedData.current_model_name = currentNodeName;
+  normalizeChildren(normalizedData.children as ModelDepsData[]);
+
+  // 将 parent_models 转换成树形结构
+  let parent_models = normalizedData.parent_models || [];
+  while (parent_models.length > 0) {
+    const parent = parent_models[0];
+    normalizedData = {
+      ...parent,
+      id: `$M_${parent.current_model_id}_${parent.version}`,
+      model_type: NodeType.parent,
+      label: getLabel(parent),
+      style: getStyle(NodeType.parent),
+      children: [
+        {
+          ...normalizedData,
+          parent_models: [],
+        },
+      ],
+    };
+    parent_models = normalizedData.parent_models || [];
+  }
+  return normalizedData;
+}
+
+// 将树形数据，使用 Hierarchy 进行布局，计算出坐标，然后转换成 G6 的数据
+function getGraphData(data: ModelDepsData): GraphData {
+  const config = {
+    direction: 'LR',
+    getHeight: () => nodeHeight,
+    getWidth: () => nodeWidth,
+    getVGap: () => vGap,
+    getHGap: () => hGap,
+  };
+
+  // 树形布局计算出坐标
+  const treeLayoutData: LayoutConfig = Hierarchy['compactBox'](data, config);
+
+  const nodes: NodeConfig[] = [];
+  const edges: EdgeConfig[] = [];
+  Util.traverseTree(treeLayoutData, (node: NodeConfig, parent: NodeConfig) => {
+    const data = node.data as ModelDepsData;
+    nodes.push({
+      ...data,
+      x: node.x,
+      y: node.y,
+    });
+    if (parent) {
+      edges.push({
+        source: parent.id,
+        target: node.id,
+      });
+    }
+
+    // 当前模型显示数据集和项目
+    if (data.model_type === NodeType.current) {
+      const { project_dependency, train_dataset, test_dataset } = data;
+      train_dataset.forEach((item) => {
+        item.id = `$DTrain_${item.dataset_id}`;
+        item.model_type = NodeType.trainDataset;
+        item.type = 'ellipse';
+        item.label = fittingString(`${item.dataset_name}`, 87, 8);
+        item.style = getStyle(NodeType.trainDataset);
+      });
+      test_dataset.forEach((item) => {
+        item.id = `$DTest_${item.dataset_id}`;
+        item.model_type = NodeType.testDataset;
+        item.type = 'ellipse';
+        item.label = fittingString(item.dataset_name, 87, 8);
+        item.style = getStyle(NodeType.testDataset);
+      });
+
+      const len = train_dataset.length + test_dataset.length;
+      [...train_dataset, ...test_dataset].forEach((item, index) => {
+        const half = len / 2 - 0.5;
+        item.x = node.x! - (half - index) * (nodeWidth + 30);
+        item.y = node.y! - nodeHeight - 30;
+        nodes.push(item);
+        edges.push({
+          source: node.id,
+          target: item.id,
+          sourceAnchor: 2,
+          targetAnchor: 3,
+          type: 'cubic-vertical',
+        });
+      });
+
+      if (project_dependency.url) {
+        project_dependency.id = `$P_${project_dependency.url}`;
+        project_dependency.model_type = NodeType.project;
+        project_dependency.type = 'rect';
+        project_dependency.size = [nodeHeight, nodeHeight];
+        project_dependency.label = fittingString(project_dependency.name, 48, 8);
+        project_dependency.style = getStyle(NodeType.project);
+        project_dependency.x = node.x;
+        project_dependency.y = node.y! + nodeHeight + 30;
+        nodes.push(project_dependency);
+        edges.push({
+          source: node.id,
+          target: project_dependency.id,
+          sourceAnchor: 3,
+          targetAnchor: 2,
+          type: 'cubic-vertical',
+        });
+      }
+    }
+  });
+  return { nodes, edges };
+}
+
+type modeModelEvolutionProps = {
+  resourceId: number;
+  resourceName: string;
+  versionList: { label: string; value: string }[];
+  version?: string;
+  onVersionChange: (version: string) => void;
+};
+
+let graph: Graph;
+function ModelEvolution({
+  resourceId,
+  resourceName,
+  versionList,
+  version,
+  onVersionChange,
+}: modeModelEvolutionProps) {
+  const graphRef = useRef<HTMLDivElement>(null);
+  const [showNodeTooltip, setShowNodeTooltip] = useState(false);
+  const [enterTooltip, setEnterTooltip] = useState(false);
+  const [nodeTooltipX, setNodeToolTipX] = useState(0);
+  const [nodeTooltipY, setNodeToolTipY] = useState(0);
+  const [hoverNodeData, setHoverNodeData] = useState<ModelDepsData | undefined>(undefined);
+
+  useEffect(() => {
+    initGraph();
+    const changSize = () => {
+      if (!graph || graph.get('destroyed')) return;
+      if (!graphRef.current) return;
+      graph.changeSize(graphRef.current.clientWidth, graphRef.current.clientHeight);
+      graph.fitView();
+    };
+
+    window.addEventListener('resize', changSize);
+    return () => {
+      window.removeEventListener('resize', changSize);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (version) {
+      getModelAtlas();
+    } else {
+      graph.data({
+        nodes: [],
+        edges: [],
+      });
+      graph.render();
+      graph.fitView();
+    }
+  }, [resourceId, version]);
+
+  // 初始化图
+  const initGraph = () => {
+    graph = new G6.Graph({
+      container: graphRef.current!,
+      width: graphRef.current!.clientWidth,
+      height: graphRef.current!.clientHeight,
+      // animate: false,
+      fitView: true,
+      fitViewPadding: [50, 100, 50, 100],
+      minZoom: 0.5,
+      maxZoom: 5,
+      defaultNode: {
+        type: 'rect',
+        size: [nodeWidth, nodeHeight],
+        anchorPoints: [
+          [0, 0.5],
+          [1, 0.5],
+          [0.5, 0],
+          [0.5, 1],
+        ],
+        style: {
+          fill: themes['primaryColor'],
+          lineWidth: 0,
+          radius: 6,
+          cursor: 'pointer',
+        },
+        labelCfg: {
+          position: 'center',
+          style: {
+            fill: '#ffffff',
+            fontSize: 8,
+            textAlign: 'center',
+          },
+        },
+      },
+      defaultEdge: {
+        type: 'cubic-horizontal',
+        labelCfg: {
+          autoRotate: true,
+        },
+        style: {
+          stroke: '#a2c1ff',
+          lineWidth: 1,
+        },
+      },
+      modes: {
+        default: [
+          'drag-canvas',
+          'zoom-canvas',
+          // {
+          //   type: 'collapse-expand',
+          //   onChange(item?: Item, collapsed?: boolean) {
+          //     const data = item!.getModel();
+          //     data.collapsed = collapsed;
+          //     return true;
+          //   },
+          // },
+        ],
+      },
+    });
+
+    bindEvents();
+  };
+
+  // 绑定事件
+  const bindEvents = () => {
+    graph.on('node:mouseenter', (e: G6GraphEvent) => {
+      const nodeItem = e.item;
+      graph.setItemState(nodeItem, 'hover', true);
+
+      const model = nodeItem.getModel() as ModelDepsData;
+      const { x, y, model_type } = model;
+      if (
+        model_type === NodeType.project ||
+        model_type === NodeType.trainDataset ||
+        model_type === NodeType.testDataset
+      ) {
+        return;
+      }
+      const point = graph.getCanvasByPoint(x!, y!);
+      const canvasWidth = graphRef.current!.clientWidth;
+      if (point.x + 300 > canvasWidth) {
+        point.x = canvasWidth - 300;
+      }
+
+      setHoverNodeData(model as ModelDepsData);
+      setNodeToolTipX(point.x);
+      setNodeToolTipY(point.y - 240);
+      setShowNodeTooltip(true);
+    });
+
+    graph.on('node:mouseleave', (e: G6GraphEvent) => {
+      const nodeItem = e.item;
+      graph.setItemState(nodeItem, 'hover', false);
+      setShowNodeTooltip(false);
+    });
+
+    graph.on('node:click', (e: G6GraphEvent) => {
+      const nodeItem = e.item;
+      const model = nodeItem.getModel() as ModelDepsChildren;
+      const { model_type } = model;
+      const { origin } = location;
+      let url: string = '';
+      switch (model_type) {
+        case NodeType.children:
+        case NodeType.current:
+        case NodeType.parent: {
+          const { current_model_id, version } = model as ModelDepsData;
+          url = `${origin}/dataset/model/${current_model_id}?isPublic=true&tab=3&version=${version}`;
+          break;
+        }
+        case NodeType.project: {
+          const { url: projectUrl } = model as ProjectDependency;
+          url = projectUrl;
+          break;
+        }
+        case NodeType.trainDataset:
+        case NodeType.testDataset: {
+          const { dataset_id, dataset_version } = model as TrainDataset;
+          url = `${origin}/dataset/dataset/${dataset_id}?isPublic=true&tab=2&version=${dataset_version}`;
+          break;
+        }
+        default:
+          break;
+      }
+
+      if (url) {
+        window.open(url, '_blank');
+      }
+    });
+  };
+
+  const handleTooltipsMouseEnter = () => {
+    setEnterTooltip(true);
+  };
+
+  const handleTooltipsMouseLeave = () => {
+    setEnterTooltip(false);
+  };
+
+  // 获取模型依赖
+  const getModelAtlas = async () => {
+    const params = {
+      model_id: resourceId,
+      version,
+    };
+    const [res] = await to(getModelAtlasReq(params));
+    if (res && res.data) {
+      const data = normalizeTreeData(res.data, resourceName);
+      const graphData = getGraphData(data);
+
+      graph.data(graphData);
+      graph.render();
+      graph.fitView();
+    }
+  };
+
+  return (
+    <div className={styles['model-evolution']}>
+      <Flex align="center" className={styles['model-evolution__top']}>
+        <span style={{ marginRight: '10px' }}>版本号：</span>
+        <Select
+          placeholder="请选择版本号"
+          style={{ width: '160px', marginRight: '20px' }}
+          value={version}
+          allowClear
+          onChange={onVersionChange}
+          options={versionList}
+        />
+        <GraphLegand style={{ marginRight: 0, marginLeft: 'auto' }}></GraphLegand>
+      </Flex>
+      <div className={styles['model-evolution__graph']} id="canvas" ref={graphRef}></div>
+      {(showNodeTooltip || enterTooltip) && (
+        <NodeTooltips
+          x={nodeTooltipX}
+          y={nodeTooltipY}
+          data={hoverNodeData!}
+          onMouseEnter={handleTooltipsMouseEnter}
+          onMouseLeave={handleTooltipsMouseLeave}
+        />
+      )}
+    </div>
+  );
+}
+
+export default ModelEvolution;
diff --git a/react-ui/src/pages/Model/components/NodeTooltips/index.less b/react-ui/src/pages/Model/components/NodeTooltips/index.less
new file mode 100644
index 0000000..b8fbbd9
--- /dev/null
+++ b/react-ui/src/pages/Model/components/NodeTooltips/index.less
@@ -0,0 +1,56 @@
+.node-tooltips {
+  position: absolute;
+  top: -100px;
+  left: -300px;
+  width: 300px;
+  padding: 10px;
+  background: white;
+  border: 1px solid #eaeaea;
+  border-radius: 4px;
+  box-shadow: 0px 3px 6px rgba(146, 146, 146, 0.09);
+
+  &__title {
+    margin: 10px 0;
+    color: @text-color;
+    font-weight: 500;
+    font-size: @font-size-content;
+  }
+
+  &__row {
+    display: flex;
+    align-items: center;
+    margin: 4px 0;
+    color: @text-color;
+    font-size: 14px;
+
+    &:first-child {
+      margin-top: 0;
+    }
+
+    &:last-child {
+      margin-bottom: 10px;
+    }
+
+    &__title {
+      display: inline-block;
+      width: 100px;
+      color: @text-color-secondary;
+      text-align: right;
+    }
+
+    &__value {
+      flex: 1;
+      min-width: 0;
+      color: @text-color;
+      font-weight: 500;
+      .singleLine();
+    }
+
+    &__link {
+      flex: 1;
+      min-width: 0;
+      font-weight: 500;
+      .singleLine();
+    }
+  }
+}
diff --git a/react-ui/src/pages/Model/components/NodeTooltips/index.tsx b/react-ui/src/pages/Model/components/NodeTooltips/index.tsx
new file mode 100644
index 0000000..2dae10a
--- /dev/null
+++ b/react-ui/src/pages/Model/components/NodeTooltips/index.tsx
@@ -0,0 +1,73 @@
+import { useNavigate } from '@umijs/max';
+import { useEffect } from 'react';
+import { ModelDepsData } from '../ModelEvolution';
+import styles from './index.less';
+
+type NodeTooltipsProps = {
+  data: ModelDepsData;
+  x: number;
+  y: number;
+  onMouseEnter?: () => void;
+  onMouseLeave?: () => void;
+};
+
+function NodeTooltips({ data, x, y, onMouseEnter, onMouseLeave }: NodeTooltipsProps) {
+  const navigate = useNavigate();
+  useEffect(() => {}, []);
+
+  const gotoExperimentPage = () => {
+    if (data.train_task?.ins_id) {
+      navigate(`/pipeline/experiment/144/${data.train_task.ins_id}`);
+    }
+  };
+
+  return (
+    <div
+      className={styles['node-tooltips']}
+      style={{ left: `${x}px`, top: `${y}px` }}
+      onMouseEnter={onMouseEnter}
+      onMouseLeave={onMouseLeave}
+    >
+      <div className={styles['node-tooltips__title']}>模型信息</div>
+      <div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>模型名称：</span>
+          <span className={styles['node-tooltips__row__value']}>{data.current_model_name}</span>
+        </div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>版本：</span>
+          <span className={styles['node-tooltips__row__value']}>{data.version}</span>
+        </div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>模型框架：</span>
+          <span className={styles['node-tooltips__row__value']}>{data.version}</span>
+        </div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>模型大小：</span>
+          <span className={styles['node-tooltips__row__value']}>{data.version}</span>
+        </div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>创建时间：</span>
+          <span className={styles['node-tooltips__row__value']}>{data.version}</span>
+        </div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>模型权限：</span>
+          <span className={styles['node-tooltips__row__value']}>{data.version}</span>
+        </div>
+      </div>
+      <div className={styles['node-tooltips__title']}>训练相关信息</div>
+      <div>
+        <div className={styles['node-tooltips__row']}>
+          <span className={styles['node-tooltips__row__title']}>训练任务：</span>
+          {data.train_task?.name ? (
+            <a className={styles['node-tooltips__row__link']} onClick={gotoExperimentPage}>
+              {data.train_task?.name}
+            </a>
+          ) : null}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default NodeTooltips;
diff --git a/react-ui/src/pages/Pipeline/components/ModelMenu/index.less b/react-ui/src/pages/Pipeline/components/ModelMenu/index.less
index b756583..127058a 100644
--- a/react-ui/src/pages/Pipeline/components/ModelMenu/index.less
+++ b/react-ui/src/pages/Pipeline/components/ModelMenu/index.less
@@ -1,4 +1,5 @@
 .collapse {
+  flex: none;
   width: 250px;
   height: 100%;
 
@@ -35,14 +36,15 @@
   align-items: center;
   height: 40px;
   padding: 0 16px;
-  color: #575757;
+  color: @text-color-secondary;
   font-size: 14px;
   border-radius: 4px;
   cursor: pointer;
-}
-.collapseItem:hover {
-  color: #1664ff;
-  background: rgba(22, 100, 255, 0.08);
+
+  &:hover {
+    color: @primary-color;
+    background: rgba(22, 100, 255, 0.08);
+  }
 }
 .modelMenusTitle {
   margin-bottom: 10px;
diff --git a/react-ui/src/pages/Pipeline/components/ModelMenu/index.tsx b/react-ui/src/pages/Pipeline/components/ModelMenu/index.tsx
index 1ce0ab0..38f6806 100644
--- a/react-ui/src/pages/Pipeline/components/ModelMenu/index.tsx
+++ b/react-ui/src/pages/Pipeline/components/ModelMenu/index.tsx
@@ -75,6 +75,7 @@ const ModelMenu = ({ onComponentDragEnd }: ModelMenuProps) => {
   return (
     <div className={Styles.collapse}>
       <div className={Styles.modelMenusTitle}>组件库</div>
+      {/* 这样 defaultActiveKey 才能生效 */}
       {modelMenusList.length > 0 ? (
         <Collapse
           collapsible="header"
diff --git a/react-ui/src/pages/Pipeline/editPipeline/index.less b/react-ui/src/pages/Pipeline/editPipeline/index.less
index b3354fd..1189e4f 100644
--- a/react-ui/src/pages/Pipeline/editPipeline/index.less
+++ b/react-ui/src/pages/Pipeline/editPipeline/index.less
@@ -4,7 +4,8 @@
   background-color: #fff;
 
   &__workflow {
-    flex: 1;
+    flex: 1 1 0;
+    min-width: 0;
     height: 100%;
 
     &__top {
@@ -12,15 +13,15 @@
       align-items: center;
       justify-content: end;
       width: 100%;
-      height: 45px;
-      padding: 0 30px;
+      height: 52px;
+      padding: 0 20px;
       background: #ffffff;
       box-shadow: 0px 3px 6px rgba(146, 146, 146, 0.09);
     }
 
     &__graph {
       width: 100%;
-      height: calc(100% - 45px);
+      height: calc(100% - 52px);
       background-color: @background-color;
       background-image: url(/assets/images/pipeline-canvas-back.png);
       background-size: 100% 100%;
diff --git a/react-ui/src/pages/Workspace/components/QuickStart/index.tsx b/react-ui/src/pages/Workspace/components/QuickStart/index.tsx
index f070fcf..17949dc 100644
--- a/react-ui/src/pages/Workspace/components/QuickStart/index.tsx
+++ b/react-ui/src/pages/Workspace/components/QuickStart/index.tsx
@@ -148,14 +148,14 @@ function QuickStart() {
             x={left + 2 * (192 + space) + 56}
             y={139}
             width={taskLeftArrowWidth}
-            height={125}
+            height={120}
             arrowLeft={taskLeftArrowWidth}
             arrorwTop={-4}
             borderLeft={1}
             borderTop={1}
           />
           <WorkArrow
-            x={left + 2 * (192 + space) + 56 + taskLeftArrowWidth + 16 + 131 + 6}
+            x={left + 2 * (192 + space) + 56 + taskLeftArrowWidth + 16 + 131 + 4}
             y={127}
             width={taskRightArrowWidth}
             height={156}
diff --git a/react-ui/src/requestConfig.ts b/react-ui/src/requestConfig.ts
index d2cd41b..8a976ab 100644
--- a/react-ui/src/requestConfig.ts
+++ b/react-ui/src/requestConfig.ts
@@ -42,6 +42,7 @@ export const requestConfig: RequestConfig = {
           message.error('请重新登录');
           return Promise.reject(response);
         } else {
+          console.log(message, data);
           message.error(data?.msg ?? '请求失败');
           return Promise.reject(response);
         }
diff --git a/react-ui/src/services/dataset/index.js b/react-ui/src/services/dataset/index.js
index 30bf282..e59d7a2 100644
--- a/react-ui/src/services/dataset/index.js
+++ b/react-ui/src/services/dataset/index.js
@@ -130,3 +130,11 @@ export function deleteDataset(id) {
     method: 'DELETE',
   });
 }
+
+// 获取模型依赖
+export function getModelAtlasReq(data) {
+  return request(`/api/mmp/modelDependency/queryModelAtlas`, {
+    method: 'POST',
+    data
+  });
+}
diff --git a/react-ui/src/types.ts b/react-ui/src/types.ts
index 9f55861..57dc385 100644
--- a/react-ui/src/types.ts
+++ b/react-ui/src/types.ts
@@ -62,7 +62,12 @@ export type PipelineNodeModelParameter = {
   checkedKeys?: string[]; // ResourceSelectorModal checkedKeys
 };
 
-// type ChangePropertyType<T, K extends keyof T, NewType> = Omit<T, K> & { [P in K]: NewType }
+// 修改属性类型
+export type ChangePropertyType<T, K extends keyof T, NewType> = Omit<T, K> & { [P in K]: NewType };
+
+// export type PascalCaseType<T> = {
+//   [K in keyof T as `${Capitalize<string & K>}`]: T[K];
+// }
 
 // 序列化后的流水线节点
 export type PipelineNodeModelSerialize = Omit<
diff --git a/react-ui/src/utils/index.ts b/react-ui/src/utils/index.ts
index 4672fd1..2dd9ad7 100644
--- a/react-ui/src/utils/index.ts
+++ b/react-ui/src/utils/index.ts
@@ -4,6 +4,8 @@
  * @Description: 工具类
  */
 
+import G6 from '@antv/g6';
+
 // 生成 8 位随机数
 export function s8() {
   return (((1 + Math.random()) * 0x100000000) | 0).toString(16).substring(1);
@@ -29,8 +31,22 @@ export function parseJsonText(text?: string | null): any | null {
   }
 }
 
-// underscore-to-camelCase
+// 判断是否为对象
+function isPlainObject(value: any) {
+  if (value === null || typeof value !== 'object') return false;
+  let proto = Object.getPrototypeOf(value);
+  while (proto !== null) {
+    if (proto.constructor && proto.constructor !== Object) return false;
+    proto = Object.getPrototypeOf(proto);
+  }
+  return true;
+}
+
+// underscore to camelCase
 export function underscoreToCamelCase(obj: Record<string, any>) {
+  if (!isPlainObject(obj)) {
+    return obj;
+  }
   const newObj: Record<string, any> = {};
   for (const key in obj) {
     if (obj.hasOwnProperty(key)) {
@@ -38,7 +54,9 @@ export function underscoreToCamelCase(obj: Record<string, any>) {
         return $1.toUpperCase().replace('[-_]', '').replace('_', '');
       });
       let value = obj[key];
-      if (typeof value === 'object' && value !== null) {
+      if (Array.isArray(value)) {
+        value = value.map((item) => underscoreToCamelCase(item));
+      } else if (isPlainObject(value)) {
         value = underscoreToCamelCase(value);
       }
       newObj[newKey] = value;
@@ -47,14 +65,19 @@ export function underscoreToCamelCase(obj: Record<string, any>) {
   return newObj;
 }
 
-// camelCase-to-underscore
+// camelCase to underscore
 export function camelCaseToUnderscore(obj: Record<string, any>) {
+  if (!isPlainObject(obj)) {
+    return obj;
+  }
   const newObj: Record<string, any> = {};
   for (const key in obj) {
     if (obj.hasOwnProperty(key)) {
       const newKey = key.replace(/([A-Z])/g, '_$1').toLowerCase();
       let value = obj[key];
-      if (typeof value === 'object' && value !== null) {
+      if (Array.isArray(value)) {
+        value = value.map((item) => camelCaseToUnderscore(item));
+      } else if (isPlainObject(value)) {
         value = camelCaseToUnderscore(value);
       }
       newObj[newKey] = value;
@@ -63,15 +86,20 @@ export function camelCaseToUnderscore(obj: Record<string, any>) {
   return newObj;
 }
 
-// null 转 undefined
+// null to undefined
 export function nullToUndefined(obj: Record<string, any>) {
+  if (!isPlainObject(obj)) {
+    return obj;
+  }
   const newObj: Record<string, any> = {};
   for (const key in obj) {
     if (obj.hasOwnProperty(key)) {
       const value = obj[key];
       if (value === null) {
         newObj[key] = undefined;
-      } else if (typeof value === 'object' && value !== null) {
+      } else if (Array.isArray(value)) {
+        newObj[key] = value.map((item) => nullToUndefined(item));
+      } else if (isPlainObject(value)) {
         newObj[key] = nullToUndefined(value);
       } else {
         newObj[key] = value;
@@ -80,3 +108,62 @@ export function nullToUndefined(obj: Record<string, any>) {
   }
   return newObj;
 }
+
+/**
+ * Changes the property names of an object based on a mapping provided.
+ *
+ * @param obj - The object whose property names need to be changed.
+ * @param mapping - The mapping of old property names to new property names.
+ * @return The object with the changed property names.
+ */
+export function changePropertyName(obj: Record<string, any>, mapping: Record<string, string>) {
+  if (!isPlainObject(obj)) {
+    return obj;
+  }
+  const newObj: Record<string, any> = {};
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      let value = obj[key];
+      const newKey = mapping.hasOwnProperty(key) ? mapping[key] : key;
+      if (Array.isArray(value)) {
+        value = value.map((item) => changePropertyName(item, mapping));
+      } else if (isPlainObject(value)) {
+        value = changePropertyName(value, mapping);
+      }
+      newObj[newKey] = value;
+    }
+  }
+  return newObj;
+}
+
+/**
+ * 计算显示的字符串
+ * @param tr 要裁剪的字符串
+ * @param maxWidth 最大宽度
+ * @param fontSize 字体大小
+ * @return 处理后的字符串
+ */
+export const fittingString = (str: string, maxWidth: number, fontSize: number) => {
+  if (!str) {
+    return '';
+  }
+  const ellipsis = '...';
+  const ellipsisLength = G6.Util.getTextSize(ellipsis, fontSize)[0];
+  let currentWidth = 0;
+  let res = str;
+  const pattern = new RegExp('[\u4E00-\u9FA5]+'); // distinguish the Chinese charactors and letters
+  str.split('').forEach((letter, i) => {
+    if (currentWidth > maxWidth - ellipsisLength) return;
+    if (pattern.test(letter)) {
+      // Chinese charactors
+      currentWidth += fontSize;
+    } else {
+      // get the width of single letter according to the fontSize
+      currentWidth += G6.Util.getLetterWidth(letter, fontSize);
+    }
+    if (currentWidth > maxWidth - ellipsisLength) {
+      res = `${str.substring(0, i)}${ellipsis}`;
+    }
+  });
+  return res;
+};
diff --git a/react-ui/src/utils/ui.tsx b/react-ui/src/utils/ui.tsx
index 91e18c7..7eec549 100644
--- a/react-ui/src/utils/ui.tsx
+++ b/react-ui/src/utils/ui.tsx
@@ -4,6 +4,7 @@
  * @Description: UI 公共方法
  */
 import { PageEnum } from '@/enums/pagesEnums';
+import { removeAllPageCacheState } from '@/hooks/pageCacheState';
 import themes from '@/styles/theme.less';
 import { history } from '@umijs/max';
 import { Modal, message, type ModalFuncProps, type UploadFile } from 'antd';
@@ -60,6 +61,7 @@ export const gotoLoginPage = (toHome: boolean = true) => {
   console.log('search', search);
   if (window.location.pathname !== PageEnum.LOGIN) {
     closeAllModals();
+    removeAllPageCacheState();
     history.replace({
       pathname: PageEnum.LOGIN,
       search: newSearch,

From ffa7120cd6516684aaea1ae26af495c25ae6f498 Mon Sep 17 00:00:00 2001
From: cp3hnu <cp3hnu@gmail.com>
Date: Thu, 6 Jun 2024 17:23:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResourceIntro/index.tsx        |  3 +--
 .../Dataset/components/ResourceList/index.tsx |  2 +-
 react-ui/src/pages/Dataset/config.tsx         |  1 +
 .../Experiment/components/LogGroup/index.tsx  |  5 +++-
 react-ui/src/pages/Mirror/Info/index.tsx      | 23 +++++++------------
 react-ui/src/pages/Mirror/List/index.tsx      |  2 +-
 .../pages/ModelDeployment/Create/index.tsx    |  2 +-
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
index 0a0717f..8636e64 100644
--- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
@@ -17,7 +17,6 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
   const [searchParams] = useSearchParams();
   const [versionList, setVersionList] = useState([]);
   const [version, setVersion] = useState<string | undefined>(undefined);
-  const isPublic = searchParams.get('isPublic') === 'true';
   const defaultTab = searchParams.get('tab') || '1';
   let versionParam = searchParams.get('version');
   const resourceId = Number(locationParams.id);
@@ -85,7 +84,7 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
           resourceType={resourceType}
           resourceId={resourceId}
           resourceName={info.name}
-          isPublic={isPublic}
+          isPublic={info.available_range === 1}
           versionList={versionList}
           version={version}
           getVersionList={getVersionList}
diff --git a/react-ui/src/pages/Dataset/components/ResourceList/index.tsx b/react-ui/src/pages/Dataset/components/ResourceList/index.tsx
index acfd9fd..830a9e1 100644
--- a/react-ui/src/pages/Dataset/components/ResourceList/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceList/index.tsx
@@ -130,7 +130,7 @@ function ResourceList(
       activeTag: dataTag,
     });
     const prefix = resourceConfig[resourceType].prefix;
-    navigate(`/dataset/${prefix}/${record.id}?isPublic=${isPublic}`);
+    navigate(`/dataset/${prefix}/${record.id}`);
   };
 
   // 分页切换
diff --git a/react-ui/src/pages/Dataset/config.tsx b/react-ui/src/pages/Dataset/config.tsx
index 285efd9..c013912 100644
--- a/react-ui/src/pages/Dataset/config.tsx
+++ b/react-ui/src/pages/Dataset/config.tsx
@@ -148,6 +148,7 @@ export type ResourceData = {
   description: string;
   create_by: string;
   update_time: string;
+  available_range: number;
   model_type_name?: string;
   model_tag_name?: string;
   dataset_type_name?: string;
diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
index 38b98af..244b9c7 100644
--- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
+++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
@@ -99,7 +99,10 @@ function LogGroup({
           scrollToBottom();
         }, 100);
       }
-    } else {
+    }
+
+    // 判断是否日志是否加载完成
+    if (!log_detail?.log_content) {
       setCompleted(true);
     }
   };
diff --git a/react-ui/src/pages/Mirror/Info/index.tsx b/react-ui/src/pages/Mirror/Info/index.tsx
index 5f56c67..c99c919 100644
--- a/react-ui/src/pages/Mirror/Info/index.tsx
+++ b/react-ui/src/pages/Mirror/Info/index.tsx
@@ -20,7 +20,7 @@ import { formatDate } from '@/utils/date';
 import { to } from '@/utils/promise';
 import { mirrorNameKey, setSessionStorageItem } from '@/utils/sessionStorage';
 import { modalConfirm } from '@/utils/ui';
-import { useNavigate, useParams, useSearchParams } from '@umijs/max';
+import { useNavigate, useParams } from '@umijs/max';
 import {
   App,
   Button,
@@ -33,7 +33,7 @@ import {
   type TableProps,
 } from 'antd';
 import classNames from 'classnames';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import MirrorStatusCell from '../components/MirrorStatusCell';
 import styles from './index.less';
 
@@ -42,6 +42,7 @@ type MirrorInfoData = {
   description?: string;
   version_count?: string;
   create_time?: string;
+  image_type?: number;
 };
 
 type MirrorVersionData = {
@@ -56,7 +57,6 @@ type MirrorVersionData = {
 function MirrorInfo() {
   const navigate = useNavigate();
   const urlParams = useParams();
-  const [searchParams] = useSearchParams();
   const [cacheState, setCacheState] = useCacheState();
   const [mirrorInfo, setMirrorInfo] = useState<MirrorInfoData>({});
   const [tableData, setTableData] = useState<MirrorVersionData[]>([]);
@@ -69,7 +69,7 @@ function MirrorInfo() {
     },
   );
   const { message } = App.useApp();
-  const isPublic = searchParams.get('isPublic') === 'true';
+  const isPublic = useMemo(() => mirrorInfo.image_type === 1, [mirrorInfo]);
 
   useEffect(() => {
     getMirrorInfo();
@@ -84,14 +84,7 @@ function MirrorInfo() {
     const id = Number(urlParams.id);
     const [res] = await to(getMirrorInfoReq(id));
     if (res && res.data) {
-      const { name = '', description = '', version_count = '', create_time: time } = res.data;
-      const create_time = formatDate(time);
-      setMirrorInfo({
-        name,
-        description,
-        version_count,
-        create_time,
-      });
+      setMirrorInfo(res.data);
     }
   };
 
@@ -258,7 +251,7 @@ function MirrorInfo() {
               <Col span={10}>
                 <div className={styles['mirror-info__basic__item']}>
                   <div className={styles['label']}>创建时间：</div>
-                  <div className={styles['value']}>{mirrorInfo.create_time}</div>
+                  <div className={styles['value']}>{formatDate(mirrorInfo.create_time)}</div>
                 </div>
               </Col>
             </Row>
@@ -270,7 +263,7 @@ function MirrorInfo() {
             ></SubAreaTitle>
             {!isPublic && (
               <Button
-                style={{ marginRight: 0, marginLeft: 'auto' }}
+                style={{ marginLeft: 'auto' }}
                 type="default"
                 onClick={createMirrorVersion}
                 icon={<KFIcon type="icon-xinjian2" />}
@@ -279,7 +272,7 @@ function MirrorInfo() {
               </Button>
             )}
             <Button
-              style={{ marginLeft: '20px' }}
+              style={{ marginLeft: isPublic ? 'auto' : '20px', marginRight: 0 }}
               type="default"
               onClick={getMirrorVersionList}
               icon={<KFIcon type="icon-shuaxin" />}
diff --git a/react-ui/src/pages/Mirror/List/index.tsx b/react-ui/src/pages/Mirror/List/index.tsx
index 5f0aa17..f0b2bf7 100644
--- a/react-ui/src/pages/Mirror/List/index.tsx
+++ b/react-ui/src/pages/Mirror/List/index.tsx
@@ -125,7 +125,7 @@ function MirrorList() {
 
   // 查看详情
   const toDetail = (record: MirrorData) => {
-    navigate(`/dataset/mirror/${record.id}?isPublic=${activeTab === CommonTabKeys.Public}`);
+    navigate(`/dataset/mirror/${record.id}`);
     setCacheState({
       activeTab,
       pagination,
diff --git a/react-ui/src/pages/ModelDeployment/Create/index.tsx b/react-ui/src/pages/ModelDeployment/Create/index.tsx
index 1c9d25b..41eabc0 100644
--- a/react-ui/src/pages/ModelDeployment/Create/index.tsx
+++ b/react-ui/src/pages/ModelDeployment/Create/index.tsx
@@ -104,7 +104,7 @@ function ModelDeploymentCreate() {
       onOk: (res) => {
         if (res) {
           if (type === ResourceSelectorType.Mirror) {
-            form.setFieldValue(name, res);
+            form.setFieldValue(name, res.path);
           } else {
             const response = res as ResourceSelectorResponse;
             const showValue = `${response.name}:${response.version}`;