zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ISSUE #10318]fix import bug (#10319)

Browse Source 
* fix import bug

* fix import bug
This commit is contained in:
zhanghong 2023-04-14 14:43:37 +08:00 committed by GitHub
parent fb8255c8b7
commit 1c97d715eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console-ui/src/globalLib.js
View File

@ -563,5 +563,6 @@ export {
getParams, getParams,
setParam, setParam,
setParams, setParams,
goLogin,
request, request,
}; };

23
console-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
View File

@ -43,13 +43,14 @@ import ShowCodeing from 'components/ShowCodeing';
import DeleteDialog from 'components/DeleteDialog'; import DeleteDialog from 'components/DeleteDialog';
import DashboardCard from './DashboardCard'; import DashboardCard from './DashboardCard';
import { getParams, setParams, request } from '@/globalLib'; import { getParams, setParams, request } from '@/globalLib';
import { goLogin } from '../../../globalLib';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { getConfigs, getConfigsV2 } from '../../../reducers/configuration'; import { getConfigs, getConfigsV2 } from '../../../reducers/configuration';
import PageTitle from '../../../components/PageTitle'; import PageTitle from '../../../components/PageTitle';
import QueryResult from '../../../components/QueryResult'; import QueryResult from '../../../components/QueryResult';
import './index.scss'; import './index.scss';
import { LANGUAGE_KEY, GLOBAL_PAGE_SIZE_LIST } from '../../../constants'; import { LANGUAGE_KEY, GLOBAL_PAGE_SIZE_LIST, LOGINPAGE_ENABLED } from '../../../constants';
const { Item } = MenuButton; const { Item } = MenuButton;
const { Panel } = Collapse; const { Panel } = Collapse;
@ -1013,12 +1014,22 @@ class ConfigurationManagement extends React.Component {
const { locale = {} } = this.props; const { locale = {} } = this.props;
const self = this; const self = this;
self.field.setValue('sameConfigPolicy', 'ABORT'); self.field.setValue('sameConfigPolicy', 'ABORT');
const _LOGINPAGE_ENABLED = localStorage.getItem(LOGINPAGE_ENABLED);
let token = {}; let token = {};
try {
token = JSON.parse(localStorage.token); if (_LOGINPAGE_ENABLED !== 'false') {
} catch (e) { try {
console.log(e); token = JSON.parse(localStorage.token);
goLogin(); } catch (e) {
console.log(e);
goLogin();
Dialog.alert({
title: locale.importFail,
content: locale.authFail,
});
return;
}
} }
const { accessToken = '', username = '' } = token; const { accessToken = '', username = '' } = token;
const uploadProps = { const uploadProps = {

4
console/src/main/resources/static/index.html
View File

@ -35,7 +35,7 @@
<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css"> <link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css"> <link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
<!-- 第三方css结束 --> <!-- 第三方css结束 -->
<link href="./css/main.css?6279658183dab105bcb6" rel="stylesheet"></head> <link href="./css/main.css?711c34427bb0227d8941" rel="stylesheet"></head>
<body> <body>
<div id="root" style="overflow:hidden"></div> <div id="root" style="overflow:hidden"></div>
@ -56,6 +56,6 @@
<script src="console-ui/public/js/merge.js"></script> <script src="console-ui/public/js/merge.js"></script>
<script src="console-ui/public/js/loader.js"></script> <script src="console-ui/public/js/loader.js"></script>
<!-- 第三方js结束 --> <!-- 第三方js结束 -->
<script type="text/javascript" src="./js/main.js?6279658183dab105bcb6"></script></body> <script type="text/javascript" src="./js/main.js?711c34427bb0227d8941"></script></body>
</html> </html>

10
console/src/main/resources/static/js/main.js
View File

File diff suppressed because one or more lines are too long