- Data ID: + Data ID {this.state.dataId}
- Group: + Group {this.state.group}
{this.state.isok ? '' :{this.state.message}
} diff --git a/console-ui/src/components/NameSpaceList/NameSpaceList.js b/console-ui/src/components/NameSpaceList/NameSpaceList.js index f5da020fc13..aa9873b6b11 100644 --- a/console-ui/src/components/NameSpaceList/NameSpaceList.js +++ b/console-ui/src/components/NameSpaceList/NameSpaceList.js @@ -165,13 +165,12 @@ class NameSpaceList extends React.Component { const namespacesBtn = namespaceList.map((obj, index) => { const style = obj.namespace === nownamespace - ? { color: '#00C1DE', paddingRight: 10, border: 'none', fontSize: 12 } - : { color: '#666', paddingRight: 10, border: 'none', fontSize: 12 }; + ? { color: '#209BFA', paddingRight: 10, border: 'none', fontSize: 14 } + : { color: '#666', paddingRight: 10, border: 'none', fontSize: 14 }; return ( -- Data ID: + Data ID {this.state.dataId}
- Group: + Group {this.state.group}
{this.state.isok ? '' :{this.state.message}
} diff --git a/console-ui/src/globalLib.js b/console-ui/src/globalLib.js index 90d772cb135..fd78a93271b 100644 --- a/console-ui/src/globalLib.js +++ b/console-ui/src/globalLib.js @@ -504,7 +504,6 @@ const request = (function(_global) { const [url, paramsStr] = config.url.split('?'); const params = paramsStr ? paramsStr.split('&') : []; params.push(`accessToken=${accessToken}`); - params.push('message=true'); return $.ajax( Object.assign({}, config, { diff --git a/console-ui/src/index.js b/console-ui/src/index.js index cd495a01535..7b2728e53c6 100644 --- a/console-ui/src/index.js +++ b/console-ui/src/index.js @@ -55,6 +55,8 @@ import reducers from './reducers'; import { changeLanguage } from './reducers/locale'; import './index.scss'; +import '@alifd/theme-design-pro/variables.css'; +import '@alifd/theme-design-pro/dist/next.var.css'; import PropTypes from 'prop-types'; module.hot && module.hot.accept(); diff --git a/console-ui/src/index.scss b/console-ui/src/index.scss index 8d5ec5acfea..4a0948badee 100644 --- a/console-ui/src/index.scss +++ b/console-ui/src/index.scss @@ -14,6 +14,7 @@ * limitations under the License. */ + html, body, :global(#root) { @@ -64,7 +65,23 @@ body, :global(.viewFramework-product-navbar .product-nav-list li .active) { background-color: #fff !important; } +.next-menu .next-menu-icon-arrow-down { + transform: rotate(0deg)!important; +} + +li.next-menu-item:not(.next-disabled):hover, li.next-menu-item:not(.next-disabled).next-selected:hover, li.next-menu-item:not(.next-disabled).next-selected:focus:hover { + background: #E4F3FE; + background: var(--nav-normal-sub-nav-hover-bg-color, #E4F3FE); + color: #209BFA; + color: var(--nav-normal-sub-nav-hover-text-color, #209BFA); +} +.next-menu.next-normal .next-menu-item.next-selected{ + background: #E4F3FE!important;; + background: var(--nav-normal-sub-nav-selected-bg-color, #E4F3FE)!important; + color: #209BFA!important; + color: var(--nav-normal-sub-nav-selected-text-color, #209BFA)!important; +} .clearfix:after { content: '.'; clear: both; @@ -78,6 +95,12 @@ body, zoom: 1; } +.copy-icon { + cursor: pointer; + margin-left: 4px; + color: var(--color-link-1, #298dff); +} + .layouttitle { height: 40px; width: 200px; @@ -578,7 +601,7 @@ form.vertical-margin-lg .form-group { .namespacewrapper { padding: 5px 15px; overflow: hidden; - background-color: #eee; + background-color: #efefef; } /* diff --git a/console-ui/src/layouts/MainLayout.js b/console-ui/src/layouts/MainLayout.js index 69e1c53ce61..b90f6286925 100644 --- a/console-ui/src/layouts/MainLayout.js +++ b/console-ui/src/layouts/MainLayout.js @@ -59,7 +59,7 @@ class MainLayout extends React.Component { isCurrentPath(url) { const { location } = this.props; - return url === location.pathname ? 'current-path' : undefined; + return url === location.pathname ? 'current-path next-selected' : undefined; } defaultOpenKeys() { @@ -86,60 +86,70 @@ class MainLayout extends React.Component { const { locale = {}, version, functionMode } = this.props; const MenuData = getMenuData(functionMode); return ( - <> +