diff --git a/src/layouts/admin-menu.jsx b/src/layouts/admin-menu.jsx index 80ffdefd..c4ed28a1 100644 --- a/src/layouts/admin-menu.jsx +++ b/src/layouts/admin-menu.jsx @@ -558,20 +558,6 @@ const renderMenu = (t) => { key: '/configuration-admin', icon: , children: [ - { - path: '/configuration-admin/metadata', - name: t('Metadata Definitions'), - key: '/configuration-admin/metadata', - level: 1, - children: [ - { - path: /^\/configuration-admin\/metadata\/detail\/.[^/]+$/, - name: t('Metadata Detail'), - key: 'metadata-detail', - level: 2, - }, - ], - }, { path: '/configuration-admin/info', name: t('System Info'), @@ -592,6 +578,20 @@ const renderMenu = (t) => { key: '/configuration-admin/setting', level: 1, }, + { + path: '/configuration-admin/metadata', + name: t('Metadata Definitions'), + key: '/configuration-admin/metadata', + level: 1, + children: [ + { + path: /^\/configuration-admin\/metadata\/detail\/.[^/]+$/, + name: t('Metadata Detail'), + key: 'metadata-detail', + level: 2, + }, + ], + }, ], }, ]; diff --git a/src/pages/base/containers/Overview/index.jsx b/src/pages/base/containers/Overview/index.jsx index df8d7f3e..a0badef8 100644 --- a/src/pages/base/containers/Overview/index.jsx +++ b/src/pages/base/containers/Overview/index.jsx @@ -55,9 +55,9 @@ const actions = [ @observer class Overview extends Component { renderAction = (item) => ( - + - avatar + avatar {item.label} diff --git a/src/pages/base/containers/Overview/style.less b/src/pages/base/containers/Overview/style.less index 83c0d514..9430e9d4 100644 --- a/src/pages/base/containers/Overview/style.less +++ b/src/pages/base/containers/Overview/style.less @@ -22,6 +22,13 @@ color: #a3a3a3; } + .actionIcon { + display: block; + width: 50px; + height: 50px; + margin-left: 60px; + } + :global { .ant-card { box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.09); diff --git a/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx b/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx index aa8f6ff8..c3a6505f 100644 --- a/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx +++ b/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx @@ -16,6 +16,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import { MetadataStore } from 'stores/glance/metadata'; import Base from 'containers/BaseDetail'; +import styles from './styles.less'; @inject('rootStore') @observer @@ -69,9 +70,9 @@ export default class BaseDetail extends Base { get jsonCard() { const content = ( -
-
{JSON.stringify(this.detailData, null, 4)}
-
+
+        {JSON.stringify(this.detailData, null, 4)}
+      
); const options = [ { diff --git a/src/pages/configuration/containers/Metadata/Detail/styles.less b/src/pages/configuration/containers/Metadata/Detail/styles.less new file mode 100644 index 00000000..10bcd7f3 --- /dev/null +++ b/src/pages/configuration/containers/Metadata/Detail/styles.less @@ -0,0 +1,4 @@ +.json_data { + white-space: pre-wrap; + word-wrap: break-word; +}