diff --git a/react-ui/config/routes.ts b/react-ui/config/routes.ts
index 46e8682a..1c4d3d07 100644
--- a/react-ui/config/routes.ts
+++ b/react-ui/config/routes.ts
@@ -102,34 +102,34 @@ export default [
},
],
},
+ {
+ name: '开发环境',
+ path: 'developmentEnvironment',
+ routes: [
+ {
+ name: '开发环境',
+ path: '',
+ component: './DevelopmentEnvironment/List',
+ },
+ {
+ name: '创建开发环境',
+ path: 'create',
+ component: './DevelopmentEnvironment/Create',
+ },
+ {
+ name: '开发环境详情',
+ path: 'editor',
+ component: './DevelopmentEnvironment/Editor',
+ },
+ ],
+ },
{
name: '流水线',
path: '/pipeline',
routes: [
{
path: '',
- redirect: 'developmentEnvironment',
- },
- {
- name: '开发环境',
- path: 'developmentEnvironment',
- routes: [
- {
- name: '开发环境',
- path: '',
- component: './DevelopmentEnvironment/List',
- },
- {
- name: '创建开发环境',
- path: 'create',
- component: './DevelopmentEnvironment/Create',
- },
- {
- name: '开发环境详情',
- path: 'editor',
- component: './DevelopmentEnvironment/Editor',
- },
- ],
+ redirect: 'template',
},
{
name: '流水线模板',
@@ -825,205 +825,205 @@ export default [
// microApp: 'flint-service',
// layout: true,
// },
- // {
- // path: '/training',
- // name: '模型训练',
- // routes: [
- // {
- // name: '小模型训练',
- // path: 'pipeline',
- // routes: [
- // {
- // path: '',
- // redirect: 'template',
- // },
- // {
- // name: '流水线模板',
- // path: 'template',
- // routes: [
- // {
- // name: '流水线模板',
- // path: '',
- // component: './Pipeline/index',
- // },
- // {
- // name: '流水线详情',
- // path: 'info/:id',
- // component: './Pipeline/Info/index',
- // },
- // ],
- // },
- // {
- // name: '实验',
- // path: 'experiment',
- // routes: [
- // {
- // name: '实验',
- // path: '',
- // component: './Experiment/index',
- // },
- // {
- // name: '实验实例',
- // path: 'instance/:workflowId/:id',
- // component: './Experiment/Info/index',
- // },
- // {
- // name: '实验对比',
- // path: 'compare',
- // routes: [
- // {
- // name: '实验对比',
- // path: '',
- // component: './Experiment/Comparison/index',
- // },
- // {
- // name: '可视化对比',
- // path: 'compare-visual',
- // component: './Experiment/Aim/index',
- // },
- // ],
- // },
- // {
- // name: '可视化',
- // path: 'visual',
- // component: './Experiment/Tensorboard/index',
- // },
- // ],
- // },
- // {
- // name: '自动机器学习',
- // path: 'automl',
- // routes: [
- // {
- // name: '自动机器学习',
- // path: '',
- // component: './AutoML/List/index',
- // },
- // {
- // name: '实验详情',
- // path: 'info/:id',
- // component: './AutoML/Info/index',
- // },
- // {
- // name: '创建实验',
- // path: 'create',
- // component: './AutoML/Create/index',
- // },
- // {
- // name: '编辑实验',
- // path: 'edit/:id',
- // component: './AutoML/Create/index',
- // },
- // {
- // name: '复制实验',
- // path: 'copy/:id',
- // component: './AutoML/Create/index',
- // },
- // {
- // name: '实验实例详情',
- // path: 'instance/:experimentId/:id',
- // component: './AutoML/Instance/index',
- // },
- // ],
- // },
- // {
- // name: '超参数自动寻优',
- // path: 'hyperparameter',
- // routes: [
- // {
- // name: '超参数寻优',
- // path: '',
- // component: './HyperParameter/List/index',
- // },
- // {
- // name: '实验详情',
- // path: 'info/:id',
- // component: './HyperParameter/Info/index',
- // },
- // {
- // name: '创建实验',
- // path: 'create',
- // component: './HyperParameter/Create/index',
- // },
- // {
- // name: '编辑实验',
- // path: 'edit/:id',
- // component: './HyperParameter/Create/index',
- // },
- // {
- // name: '复制实验',
- // path: 'copy/:id',
- // component: './HyperParameter/Create/index',
- // },
- // {
- // name: '实验实例详情',
- // path: 'instance/:experimentId/:id',
- // routes: [
- // {
- // name: '实验实例详情',
- // path: '',
- // component: './HyperParameter/Instance/index',
- // },
- // {
- // name: '可视化对比',
- // path: 'compare-visual',
- // component: './Experiment/Aim/index',
- // },
- // ],
- // },
- // ],
- // },
- // {
- // name: '主动学习',
- // path: 'active-learn',
- // routes: [
- // {
- // name: '主动学习',
- // path: '',
- // component: './ActiveLearn/List/index',
- // },
- // {
- // name: '实验详情',
- // path: 'info/:id',
- // component: './ActiveLearn/Info/index',
- // },
- // {
- // name: '创建实验',
- // path: 'create',
- // component: './ActiveLearn/Create/index',
- // },
- // {
- // name: '编辑实验',
- // path: 'edit/:id',
- // component: './ActiveLearn/Create/index',
- // },
- // {
- // name: '复制实验',
- // path: 'copy/:id',
- // component: './ActiveLearn/Create/index',
- // },
- // {
- // name: '实验实例详情',
- // path: 'instance/:experimentId/:id',
- // routes: [
- // {
- // name: '实验实例详情',
- // path: '',
- // component: './ActiveLearn/Instance/index',
- // },
- // {
- // name: '数据标注',
- // path: 'label',
- // component: './ActiveLearn/Label/index',
- // },
- // ],
- // },
- // ],
- // },
- // ],
- // },
- // ],
- // },
+ {
+ path: '/training',
+ name: '模型训练',
+ routes: [
+ {
+ name: '小模型训练',
+ path: 'pipeline',
+ routes: [
+ {
+ path: '',
+ redirect: 'template',
+ },
+ {
+ name: '流水线模板',
+ path: 'template',
+ routes: [
+ {
+ name: '流水线模板',
+ path: '',
+ component: './Pipeline/index',
+ },
+ {
+ name: '流水线详情',
+ path: 'info/:id',
+ component: './Pipeline/Info/index',
+ },
+ ],
+ },
+ {
+ name: '实验',
+ path: 'experiment',
+ routes: [
+ {
+ name: '实验',
+ path: '',
+ component: './Experiment/index',
+ },
+ {
+ name: '实验实例',
+ path: 'instance/:workflowId/:id',
+ component: './Experiment/Info/index',
+ },
+ {
+ name: '实验对比',
+ path: 'compare',
+ routes: [
+ {
+ name: '实验对比',
+ path: '',
+ component: './Experiment/Comparison/index',
+ },
+ {
+ name: '可视化对比',
+ path: 'compare-visual',
+ component: './Experiment/Aim/index',
+ },
+ ],
+ },
+ {
+ name: '可视化',
+ path: 'visual',
+ component: './Experiment/Tensorboard/index',
+ },
+ ],
+ },
+ {
+ name: '自动机器学习',
+ path: 'automl',
+ routes: [
+ {
+ name: '自动机器学习',
+ path: '',
+ component: './AutoML/List/index',
+ },
+ {
+ name: '实验详情',
+ path: 'info/:id',
+ component: './AutoML/Info/index',
+ },
+ {
+ name: '创建实验',
+ path: 'create',
+ component: './AutoML/Create/index',
+ },
+ {
+ name: '编辑实验',
+ path: 'edit/:id',
+ component: './AutoML/Create/index',
+ },
+ {
+ name: '复制实验',
+ path: 'copy/:id',
+ component: './AutoML/Create/index',
+ },
+ {
+ name: '实验实例详情',
+ path: 'instance/:experimentId/:id',
+ component: './AutoML/Instance/index',
+ },
+ ],
+ },
+ {
+ name: '超参数自动寻优',
+ path: 'hyperparameter',
+ routes: [
+ {
+ name: '超参数寻优',
+ path: '',
+ component: './HyperParameter/List/index',
+ },
+ {
+ name: '实验详情',
+ path: 'info/:id',
+ component: './HyperParameter/Info/index',
+ },
+ {
+ name: '创建实验',
+ path: 'create',
+ component: './HyperParameter/Create/index',
+ },
+ {
+ name: '编辑实验',
+ path: 'edit/:id',
+ component: './HyperParameter/Create/index',
+ },
+ {
+ name: '复制实验',
+ path: 'copy/:id',
+ component: './HyperParameter/Create/index',
+ },
+ {
+ name: '实验实例详情',
+ path: 'instance/:experimentId/:id',
+ routes: [
+ {
+ name: '实验实例详情',
+ path: '',
+ component: './HyperParameter/Instance/index',
+ },
+ {
+ name: '可视化对比',
+ path: 'compare-visual',
+ component: './Experiment/Aim/index',
+ },
+ ],
+ },
+ ],
+ },
+ {
+ name: '主动学习',
+ path: 'active-learn',
+ routes: [
+ {
+ name: '主动学习',
+ path: '',
+ component: './ActiveLearn/List/index',
+ },
+ {
+ name: '实验详情',
+ path: 'info/:id',
+ component: './ActiveLearn/Info/index',
+ },
+ {
+ name: '创建实验',
+ path: 'create',
+ component: './ActiveLearn/Create/index',
+ },
+ {
+ name: '编辑实验',
+ path: 'edit/:id',
+ component: './ActiveLearn/Create/index',
+ },
+ {
+ name: '复制实验',
+ path: 'copy/:id',
+ component: './ActiveLearn/Create/index',
+ },
+ {
+ name: '实验实例详情',
+ path: 'instance/:experimentId/:id',
+ routes: [
+ {
+ name: '实验实例详情',
+ path: '',
+ component: './ActiveLearn/Instance/index',
+ },
+ {
+ name: '数据标注',
+ path: 'label',
+ component: './ActiveLearn/Label/index',
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
]
: []),
{
diff --git a/react-ui/public/scripts/loading.js b/react-ui/public/scripts/loading.js
index c1ced54c..0288e29b 100644
--- a/react-ui/public/scripts/loading.js
+++ b/react-ui/public/scripts/loading.js
@@ -43,7 +43,7 @@
margin: 0;
padding: 0;
color: rgba(0, 0, 0, 0.65);
- color: #1890ff;
+ color: #514cf9;
font-size: 14px;
font-variant: tabular-nums;
line-height: 1.5;
@@ -80,7 +80,7 @@
display: block;
width: 9px;
height: 9px;
- background-color: #1890ff;
+ background-color: #514cf9;
border-radius: 100%;
-webkit-transform: scale(0.75);
-ms-transform: scale(0.75);
diff --git a/react-ui/src/pages/Application/Featured/index.less b/react-ui/src/pages/Application/Featured/index.less
index 1f98a2d8..6a9aae9d 100644
--- a/react-ui/src/pages/Application/Featured/index.less
+++ b/react-ui/src/pages/Application/Featured/index.less
@@ -3,7 +3,7 @@
display: flex;
flex-direction: column;
height: 100%;
- padding: @page-padding-top 0 @page-padding-bottom;
+ padding: @page-padding-bottom 0 @page-padding-bottom;
&__header {
flex: none;
@@ -33,9 +33,11 @@
font-size: 15px;
border-radius: 17px;
cursor: pointer;
+
&:hover {
color: @text-color;
}
+
&:active,
&--selected {
color: white !important;
@@ -54,9 +56,11 @@
border: 1px solid rgba(65, 84, 241, 0.06);
border-radius: 16px;
cursor: pointer;
+
&:hover {
color: @primary-color;
}
+
&:active,
&--selected {
color: @primary-color;
@@ -87,4 +91,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/react-ui/src/pages/DevelopmentEnvironment/List/index.less b/react-ui/src/pages/DevelopmentEnvironment/List/index.less
index f8809d6c..92960617 100644
--- a/react-ui/src/pages/DevelopmentEnvironment/List/index.less
+++ b/react-ui/src/pages/DevelopmentEnvironment/List/index.less
@@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
height: 100%;
- padding: @page-padding-top @content-padding @page-padding-bottom;
+ padding: @page-padding-bottom @content-padding @page-padding-bottom;
.backgroundPageImage(url(@/assets/img/app/app-bg-2.png));
:global {
@@ -57,4 +57,4 @@
&__empty {
flex: 1;
}
-}
+}
\ No newline at end of file
diff --git a/react-ui/src/utils/loading.tsx b/react-ui/src/utils/loading.tsx
index 0180a243..660103f5 100644
--- a/react-ui/src/utils/loading.tsx
+++ b/react-ui/src/utils/loading.tsx
@@ -5,6 +5,7 @@
*/
import KFSpin from '@/components/KFSpin';
+import themes from '@/styles/theme.less';
import { ConfigProvider, SpinProps } from 'antd';
import { globalConfig } from 'antd/es/config-provider';
import zhCN from 'antd/locale/zh_CN';
@@ -40,13 +41,16 @@ export class Loading {
renderTimeoutId = setTimeout(() => {
const rootPrefixCls = global.getPrefixCls();
const iconPrefixCls = global.getIconPrefixCls();
- const theme = global.getTheme();
const dom = ;
root.render(
{global.holderRender ? global.holderRender(dom) : dom}