Merge pull request '合并dev' (#177) from dev-zw into dev

react-ui/config/routes.ts

@@ -291,60 +291,61 @@ export default [
           },
         ],
       },
-    ],
-  },
-  {
-    name: '模型部署',
-    path: '/modelDeployment',
-    routes: [
       {
         name: '模型部署',
-        path: '',
-        component: './ModelDeployment/List',
-      },
-      {
-        name: '创建推理服务',
-        path: 'createService',
-        component: './ModelDeployment/CreateService',
-      },
-      {
-        name: '编辑推理服务',
-        path: 'editService/:serviceId',
-        component: './ModelDeployment/CreateService',
-      },
-      {
-        name: '服务详情',
-        path: 'serviceInfo/:serviceId',
+        path: 'modelDeployment',
         routes: [
           {
-            name: '服务详情',
+            name: '模型部署',
             path: '',
-            component: './ModelDeployment/ServiceInfo',
+            component: './ModelDeployment/List',
           },
           {
-            name: '新增服务版本',
-            path: 'createVersion',
-            component: './ModelDeployment/CreateVersion',
+            name: '创建推理服务',
+            path: 'createService',
+            component: './ModelDeployment/CreateService',
           },
           {
-            name: '更新服务版本',
-            path: 'updateVersion',
-            component: './ModelDeployment/CreateVersion',
+            name: '编辑推理服务',
+            path: 'editService/:serviceId',
+            component: './ModelDeployment/CreateService',
           },
           {
-            name: '重启服务版本',
-            path: 'restartVersion',
-            component: './ModelDeployment/CreateVersion',
-          },
-          {
-            name: '服务版本详情',
-            path: 'versionInfo/:id',
-            component: './ModelDeployment/VersionInfo',
+            name: '服务详情',
+            path: 'serviceInfo/:serviceId',
+            routes: [
+              {
+                name: '服务详情',
+                path: '',
+                component: './ModelDeployment/ServiceInfo',
+              },
+              {
+                name: '新增服务版本',
+                path: 'createVersion',
+                component: './ModelDeployment/CreateVersion',
+              },
+              {
+                name: '更新服务版本',
+                path: 'updateVersion',
+                component: './ModelDeployment/CreateVersion',
+              },
+              {
+                name: '重启服务版本',
+                path: 'restartVersion',
+                component: './ModelDeployment/CreateVersion',
+              },
+              {
+                name: '服务版本详情',
+                path: 'versionInfo/:id',
+                component: './ModelDeployment/VersionInfo',
+              },
+            ],
           },
         ],
       },
     ],
   },
+
   {
     name: '应用开发',
     path: '/appsDeployment',

react-ui/src/app.tsx

@@ -250,7 +250,7 @@ export const antd: RuntimeAntdConfig = (memo) => {
   };
 
   memo.theme.cssVar = true;
-  // memo.theme.hashed = false;
+  memo.theme.hashed = false;
 
   memo.appConfig = {
     message: {

react-ui/src/pages/Dataset/config.tsx

@@ -25,9 +25,10 @@ export enum ResourceType {
 }
 
 export enum DataSource {
-  AtuoExport = 'auto_export', // 自动导出
+  AutoExport = 'auto_export', // 自动导出
   HandExport = 'hand_export', // 手动导出
   Create = 'add', // 新增
+  LabelStudioExport = 'label_studio_export', // LabelStudio 导出
 }
 
 type ResourceTypeInfo = {

react-ui/src/pages/Experiment/Info/index.less

@@ -30,10 +30,4 @@
     background-image: url(@/assets/img/pipeline-canvas-bg.png);
     background-size: 100% 100%;
   }
-
-  :global {
-    .ant-drawer-mask {
-      background: transparent !important;
-    }
-  }
 }

react-ui/src/pages/Experiment/components/ExperimentDrawer/index.less

@@ -1,4 +1,5 @@
 .experiment-drawer {
+  line-height: var(--ant-line-height);
   :global {
     .ant-drawer-body {
       overflow-y: hidden;
@@ -12,7 +13,7 @@
   }
 
   &__tabs {
-    height: calc(100% - 170px);
+    height: calc(100% - 169px);
     :global {
       .ant-tabs-nav {
         padding-left: 24px;

react-ui/src/pages/Experiment/components/ExperimentDrawer/index.tsx

@@ -95,10 +95,9 @@ const ExperimentDrawer = ({
 
   return (
     <Drawer
-      rootStyle={{ marginTop: '55px' }}
+      rootStyle={{ marginTop: '111px' }}
       title="任务执行详情"
       placement="right"
-      getContainer={false}
       closeIcon={<CloseOutlined className={styles['experiment-drawer__close']} />}
       onClose={onClose}
       open={open}

react-ui/src/pages/HyperParameter/components/ParameterInfo/index.tsx

@@ -34,7 +34,7 @@ function ParameterInfo({ info }: ParameterInfoProps) {
     }
     return info.points_to_evaluate.map((item, index) => ({
       ...item,
-      id: index,
+      id: index, // 作为 key，这个数组不会变化
     }));
   }, [info]);
 

react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx

@@ -168,7 +168,7 @@ function CreateServiceVersion() {
       if (lastPage === CreateServiceVersionFrom.ServiceInfo) {
         navigate(-1);
       } else {
-        navigate(`/modelDeployment/serviceInfo/${serviceId}`, { replace: true });
+        navigate(`/dataset/modelDeployment/serviceInfo/${serviceId}`, { replace: true });
       }
     }
   };

react-ui/src/pages/Workspace/components/QuickStart/index.tsx

@@ -92,7 +92,7 @@ function QuickStart() {
             buttonTop={20}
             x={left + 4 * (192 + space) + 60 + space}
             y={263}
-            onClick={() => navigate('/modelDeployment')}
+            onClick={() => navigate('/dataset/modelDeployment')}
           />
           <div
             className={styles['quick-start__content__canvas__model']}

react-ui/src/utils/format.ts

@@ -98,8 +98,10 @@ export const formatSource = (source?: string) => {
     return '用户上传';
   } else if (source === DataSource.HandExport) {
     return '手动导入';
-  } else if (source === DataSource.AtuoExport) {
+  } else if (source === DataSource.AutoExport) {
     return '实验自动导入';
+  } else if (source === DataSource.LabelStudioExport) {
+    return '数据标注导入';
   }
   return source;
 };