diff --git a/react-ui/config/routes.ts b/react-ui/config/routes.ts
index e9363f91..b2c41f14 100644
--- a/react-ui/config/routes.ts
+++ b/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',
diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx
index 857d2650..26dfa334 100644
--- a/react-ui/src/app.tsx
+++ b/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: {
diff --git a/react-ui/src/pages/Dataset/config.tsx b/react-ui/src/pages/Dataset/config.tsx
index d24586a6..61c63531 100644
--- a/react-ui/src/pages/Dataset/config.tsx
+++ b/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 = {
diff --git a/react-ui/src/pages/Experiment/Info/index.less b/react-ui/src/pages/Experiment/Info/index.less
index f6df0cb6..70b27284 100644
--- a/react-ui/src/pages/Experiment/Info/index.less
+++ b/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;
- }
- }
}
diff --git a/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.less b/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.less
index c1f1b7ef..e524a987 100644
--- a/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.less
+++ b/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;
diff --git a/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.tsx b/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.tsx
index cdcaea19..58077267 100644
--- a/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.tsx
+++ b/react-ui/src/pages/Experiment/components/ExperimentDrawer/index.tsx
@@ -95,10 +95,9 @@ const ExperimentDrawer = ({
return (
}
onClose={onClose}
open={open}
diff --git a/react-ui/src/pages/HyperParameter/Create/index.tsx b/react-ui/src/pages/HyperParameter/Create/index.tsx
index bd7aedb9..4cddd4a7 100644
--- a/react-ui/src/pages/HyperParameter/Create/index.tsx
+++ b/react-ui/src/pages/HyperParameter/Create/index.tsx
@@ -51,7 +51,7 @@ function CreateHyperParameter() {
...rest,
name,
parameters,
- points_to_evaluate: points_to_evaluate ?? [undefined],
+ points_to_evaluate: points_to_evaluate ?? [],
};
form.setFieldsValue(formData);
@@ -138,7 +138,7 @@ function CreateHyperParameter() {
name: '',
},
],
- points_to_evaluate: [undefined],
+ points_to_evaluate: [],
}}
>
diff --git a/react-ui/src/pages/HyperParameter/components/CreateForm/ExecuteConfig.tsx b/react-ui/src/pages/HyperParameter/components/CreateForm/ExecuteConfig.tsx
index 307bc5dd..976b6467 100644
--- a/react-ui/src/pages/HyperParameter/components/CreateForm/ExecuteConfig.tsx
+++ b/react-ui/src/pages/HyperParameter/components/CreateForm/ExecuteConfig.tsx
@@ -513,7 +513,6 @@ function ExecuteConfig() {
marginRight: '3px',
}}
shape="circle"
- disabled={fields.length === 1}
type="text"
size="middle"
icon={}
@@ -538,6 +537,20 @@ function ExecuteConfig() {
))}
+ {fields.length === 0 && (
+
+
+
+ )}
>
diff --git a/react-ui/src/pages/HyperParameter/components/CreateForm/ParameterRange/index.tsx b/react-ui/src/pages/HyperParameter/components/CreateForm/ParameterRange/index.tsx
index e4b700c9..43cd25f2 100644
--- a/react-ui/src/pages/HyperParameter/components/CreateForm/ParameterRange/index.tsx
+++ b/react-ui/src/pages/HyperParameter/components/CreateForm/ParameterRange/index.tsx
@@ -1,5 +1,6 @@
import { MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons';
import { Button, Flex, Form, Input, InputNumber } from 'antd';
+import React from 'react';
import { ParameterType, getFormOptions, parameterTooltip } from '../utils';
import styles from './index.less';
@@ -115,9 +116,8 @@ function ParameterRange({ type, value, onConfirm }: ParameterRangeProps) {
{formOptions.map((item, index) => {
return (
- <>
+
)}
- >
+
);
})}
diff --git a/react-ui/src/pages/HyperParameter/components/CreateForm/index.less b/react-ui/src/pages/HyperParameter/components/CreateForm/index.less
index 06bbd5b7..bd264d3c 100644
--- a/react-ui/src/pages/HyperParameter/components/CreateForm/index.less
+++ b/react-ui/src/pages/HyperParameter/components/CreateForm/index.less
@@ -11,6 +11,7 @@
// 增加样式权重
& &__button {
+ width: calc(100% - 126px);
border-color: .addAlpha(@primary-color, 0.5) [];
box-shadow: none !important;
&:hover {
diff --git a/react-ui/src/pages/HyperParameter/components/ExperimentLog/index.tsx b/react-ui/src/pages/HyperParameter/components/ExperimentLog/index.tsx
index b27c20fe..a9c598b8 100644
--- a/react-ui/src/pages/HyperParameter/components/ExperimentLog/index.tsx
+++ b/react-ui/src/pages/HyperParameter/components/ExperimentLog/index.tsx
@@ -38,28 +38,28 @@ function ExperimentLog({ instanceInfo, nodes }: ExperimentLogProps) {
});
const tabItems = [
- {
- key: 'git-clone-framework',
- label: '框架代码日志',
- // icon: ,
- children: (
-
- {frameworkCloneNodeStatus && (
-
- )}
-
- ),
- },
+ // {
+ // key: 'git-clone-framework',
+ // label: '框架代码日志',
+ // // icon: ,
+ // children: (
+ //
+ // {frameworkCloneNodeStatus && (
+ //
+ // )}
+ //
+ // ),
+ // },
{
key: 'git-clone-train',
- label: '训练代码日志',
+ label: '系统日志',
// icon: ,
children: (
diff --git a/react-ui/src/pages/HyperParameter/components/ParameterInfo/index.tsx b/react-ui/src/pages/HyperParameter/components/ParameterInfo/index.tsx
index d946a080..337f43f7 100644
--- a/react-ui/src/pages/HyperParameter/components/ParameterInfo/index.tsx
+++ b/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]);
diff --git a/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx b/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx
index 430eae87..86f21f4e 100644
--- a/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx
+++ b/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 });
}
}
};
diff --git a/react-ui/src/pages/Workspace/components/QuickStart/index.tsx b/react-ui/src/pages/Workspace/components/QuickStart/index.tsx
index 621efead..d155dae9 100644
--- a/react-ui/src/pages/Workspace/components/QuickStart/index.tsx
+++ b/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')}
/>
{
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;
};
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java
index f2ba22d1..2c60c3e6 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java
@@ -13,9 +13,11 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Nullable;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
@RestController
@RequestMapping("newdataset")
@@ -70,12 +72,15 @@ public class NewDatasetFromGitController {
@GetMapping("/queryDatasets")
@ApiOperation("数据集广场公开数据集分页查询,根据data_type,data_tag筛选,true公开false私有")
- public AjaxResult queryDatasets(@RequestParam("page") int page,
- @RequestParam("size") int size,
- @RequestParam(value = "is_public") Boolean isPublic,
+ public AjaxResult queryDatasets(@RequestParam(value = "page", required = false) @Nullable Integer page,
+ @RequestParam(value = "size", required = false) @Nullable Integer size,
+ @RequestParam(value = "is_public", required = false) @Nullable Boolean isPublic,
@RequestParam(value = "data_type", required = false) String dataType,
@RequestParam(value = "data_tag", required = false) String dataTag,
@RequestParam(value = "name", required = false) String name) throws Exception {
+ page = Optional.ofNullable(page).orElse(0); // 默认 page 为 0
+ size = Optional.ofNullable(size).orElse(10000); // 默认 size 为 10000
+ isPublic = Optional.ofNullable(isPublic).orElse(false);
PageRequest pageRequest = PageRequest.of(page, size);
Dataset dataset = new Dataset();
dataset.setDataTag(dataTag);