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

替换 yamljs 为 js-yaml 进行 yaml 格式校验，处理 yaml 同 key 不报错的问题 (#10647)

Browse Source 
* 替换 yamljs 为 js-yaml 进行 yaml 格式校验，处理 yaml 同 key 不报错的问题

* 听说要build一下
This commit is contained in:
Darren Luo 2023-06-19 10:44:32 +08:00 committed by GitHub
parent 1311df0663
commit 4095d172d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11127 additions and 6447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17539
console-ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
console-ui/package.json
View File

@ -68,6 +68,7 @@
"@alifd/next": "^1.19.4",
"@alifd/theme-design-pro": "0.x",
"axios": "^0.21.1",
"js-yaml": "^4.1.0",
"moment": "^2.23.0",
"prop-types": "^15.6.2",
"qs": "^6.8.2",
@ -78,7 +79,6 @@
"react-router-dom": "^5.1.2",
"react-router-redux": "^4.0.8",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"yamljs": "^0.3.0"
"redux-thunk": "^2.3.0"
}
}

4
console-ui/src/utils/validateContent.js
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
import * as yamljs from 'yamljs';
import * as yaml from 'js-yaml';
/**
* 校验一个配置项
@ -141,7 +141,7 @@ export default {
*/
validateYaml(str) {
try {
return yamljs.parse(str);
return yaml.parse(str);
} catch (e) {
return false;
}

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/font-awesome.css">
<!-- 第三方css结束 -->
<link href="./css/main.css?c65099d9e1d3b503ffb6" rel="stylesheet"></head>
<link href="./css/main.css?f8ce6847060d8e383da7" rel="stylesheet"></head>
<body>
<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/loader.js"></script>
<!-- 第三方js结束 -->
<script type="text/javascript" src="./js/main.js?c65099d9e1d3b503ffb6"></script></body>
<script type="text/javascript" src="./js/main.js?f8ce6847060d8e383da7"></script></body>
</html>

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

File diff suppressed because one or more lines are too long