}>
-
+
{intl.get('menu.release')}
-
-
+
+
{intl.get('configServer.clear')}
diff --git a/app-v2/pages/MainPage/Header/index.less b/app-v2/pages/MainPage/Header/index.less
index c27d5d95..7b34be04 100644
--- a/app-v2/pages/MainPage/Header/index.less
+++ b/app-v2/pages/MainPage/Header/index.less
@@ -16,10 +16,17 @@
}
.main-menu {
flex: auto;
- font-family: Roboto-Bold, serif;
+ font-family: Roboto, serif;
font-style: normal;
font-size: 16px;
- .nebula-studio-icon {
+ .nav-link {
+ display: flex;
+ align-items: center;
+ color: white;
+ }
+ .nav-icon > svg {
+ width: 16px;
+ height: 16px;
margin-right: 5px;
}
}
diff --git a/app-v2/pages/MainPage/Header/index.tsx b/app-v2/pages/MainPage/Header/index.tsx
index 63f74237..b60fa4a0 100644
--- a/app-v2/pages/MainPage/Header/index.tsx
+++ b/app-v2/pages/MainPage/Header/index.tsx
@@ -55,12 +55,13 @@ const PageHeader = (props: IProps) => {
>
{menus.map(item =>
-
+
{intl.get(item.intlKey)}
)}
diff --git a/app-v2/pages/MainPage/routes.tsx b/app-v2/pages/MainPage/routes.tsx
index adc2ba52..974f40bb 100644
--- a/app-v2/pages/MainPage/routes.tsx
+++ b/app-v2/pages/MainPage/routes.tsx
@@ -42,7 +42,7 @@ export const MENU_LIST = [
action: 'view_schema',
label: 'from_navigation'
},
- icon: 'iconnav-model',
+ icon: 'icon-nav-schema',
intlKey: 'common.schema'
},
{
@@ -53,7 +53,7 @@ export const MENU_LIST = [
action: 'view_import',
label: 'from_navigation'
},
- icon: 'iconnav-model',
+ icon: 'icon-btn-download',
intlKey: 'common.import'
},
{
@@ -64,7 +64,7 @@ export const MENU_LIST = [
action: 'view_console',
label: 'from_navigation'
},
- icon: 'iconnav-model',
+ icon: 'icon-nav-console',
intlKey: 'common.console'
},
];
\ No newline at end of file
diff --git a/app-v2/pages/Schema/Edge/index.tsx b/app-v2/pages/Schema/Edge/index.tsx
index 67fa5f89..b83fee5e 100644
--- a/app-v2/pages/Schema/Edge/index.tsx
+++ b/app-v2/pages/Schema/Edge/index.tsx
@@ -2,7 +2,7 @@ import { Button, Popconfirm, Table, message } from 'antd';
import React, { useEffect, useMemo, useState } from 'react';
import intl from 'react-intl-universal';
import { Link, useParams } from 'react-router-dom';
-import { DeleteTwoTone, FormOutlined } from '@ant-design/icons';
+import Icon from '@appv2/components/Icon';
import { observer } from 'mobx-react-lite';
import { useStore } from '@appv2/stores';
import { sortByFieldAndFilter } from '@appv2/utils/function';
@@ -44,7 +44,7 @@ function renderEdgeInfo(edge: IEdge) {
}
const EdgeList = () => {
- const { space } = useParams() as {space :string, type: string};
+ const { space } = useParams() as { space :string };
const { schema: { edgeList, deleteEdge, getEdgeList } } = useStore();
const [searchVal, setSearchVal] = useState('');
const [loading, setLoading] = useState(false);
@@ -89,7 +89,7 @@ const EdgeList = () => {
data-track-action="view_edge_edit"
data-track-label="from_edge_list"
>
-
+
{
cancelText={intl.get('common.cancel')}
>
@@ -124,6 +122,7 @@ const EdgeList = () => {
}));
}, [edgeList, searchVal]);
return