Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature:support non-properties-diff #4533

Merged
merged 6 commits into from
Aug 31, 2022
+99 −9
Merged

feature:support non-properties-diff #4533

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c014f13
feature:support non-properties-diff
SunnyBoy-WYH Aug 23, 2022
3ca6d3d
disable show searchKey when textDiff
SunnyBoy-WYH Aug 23, 2022
4ac162d
fix review problem
SunnyBoy-WYH Aug 30, 2022
eeb8de9
better code
SunnyBoy-WYH Aug 30, 2022
197cf40
better code
SunnyBoy-WYH Aug 30, 2022
99fc252
Merge branch 'master' into feature-non-properties-diff
lepdou Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix review problem
@SunnyBoy-WYH
SunnyBoy-WYH committed Aug 30, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 4ac162d06f9233076981977c293bf86857c6b5bf
32 changes: 19 additions & 13 deletions apollo-portal/src/main/resources/static/config/diff.html
View file
Original file line number Diff line number Diff line change
@@ -68,18 +68,6 @@ <h4 class="modal-title">{{'Config.Diff.Title' | translate }}
<!--step 1-->
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="radio-inline">
<label >
<input type="radio" name="tableDiff" ng-click="isTableDiff = true" checked="true" ng-checked="isTableDiff == true">
{{'Config.Diff.TableDiff' | translate }}
</label>
</div>
<div class="radio-inline">
<label >
<input type="radio" name="tableDiff" ng-click="isTableDiff = false" ng-checked="isTableDiff == false">
{{'Config.Diff.TextDiff' | translate }}
</label>
</div>
<div class="alert-info alert no-radius">
<strong>{{'Config.Diff.TipsTitle' | translate }}:</strong>
<ul>
@@ -97,6 +85,23 @@ <h4 class="modal-title">{{'Config.Diff.Title' | translate }}
</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Diff.DiffType' | translate }}</label>
<div class="radio-inline">
<label >
<input type="radio" name="tableDiff" ng-click="isTableDiff = true" checked="true" ng-checked="isTableDiff">
{{'Config.Diff.TableDiff' | translate }}
</label>
</div>
<div class="radio-inline">
<label >
<input type="radio" name="tableDiff" ng-click="isTableDiff = false" ng-checked="!isTableDiff">
{{'Config.Diff.TextDiff' | translate }}
</label>
</div>
</div>
</div>
<hr>
</div>

@@ -181,6 +186,7 @@ <h4 class="modal-title">{{'Config.Diff.Title' | translate }}

<script type="text/javascript" src="../vendor/yaml.min.js"></script>
<script type="text/javascript" src="../vendor/xml2json.min.js"></script>
<script type="text/javascript" src="../vendor/diff.min.js"></script>

<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
@@ -203,7 +209,7 @@ <h4 class="modal-title">{{'Config.Diff.Title' | translate }}
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
<script type="application/javascript" src="../scripts/directive/diff-directive.js"></script>

<script src="../vendor/diff.min.js" type="text/javascript"></script>

</body>

</html>
3 changes: 3 additions & 0 deletions apollo-portal/src/main/resources/static/i18n/en.json
View file
Original file line number Diff line number Diff line change
@@ -721,7 +721,10 @@
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters",
"Config.Diff.DiffCluster": "Clusters to be compared",
"Config.Diff.DiffType": "Diff Type",
"Config.Diff.HasDiffComment": "Whether to compare comments or not",
"Config.Diff.TextDiff": "Text",
"Config.Diff.TableDiff": "Table",
"Config.Diff.SearchKey": "search configuration",
"Config.Diff.OnlyShowDiffKeys": "Only display configuration items with different values",
"Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters",
5 changes: 3 additions & 2 deletions apollo-portal/src/main/resources/static/i18n/zh-CN.json
View file
Original file line number Diff line number Diff line change
@@ -721,9 +721,10 @@
"Config.Diff.TipsTitle": "Tips",
"Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异",
"Config.Diff.DiffCluster": "要比较的集群",
"Config.Diff.DiffType": "比对方式",
"Config.Diff.HasDiffComment": "是否比较注释",
"Config.Diff.TextDiff": "文本比对",
"Config.Diff.TableDiff": "表格比对",
"Config.Diff.TextDiff": "文本",
"Config.Diff.TableDiff": "表格",
"Config.Diff.SearchKey": "搜索配置项",
"Config.Diff.OnlyShowDiffKeys": "是否只显示值不一样的配置项",
"Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群",
21 changes: 12 additions & 9 deletions apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
View file
Original file line number Diff line number Diff line change
@@ -74,19 +74,22 @@ diff_item_module.controller("DiffItemController",
}
let res = [];
// prop
if(suffixArray.length===0){
if (suffixArray.length === 0) {
res.push(originItem)
}else{
} else {
namespace.originTextInfo = originItem.value
const suffix = suffixArray[0];
if(suffix==='yml'){
res = Obj2Prop(YAML.parse(originItem.value))
}else if(suffix==='json'){
res = Obj2Prop(JSON.parse(originItem.value))
}else if(suffix==='xml'){
if (suffix === 'yml') {
res = Obj2Prop(
YAML.parse(originItem.value))
} else if (suffix === 'json') {
res = Obj2Prop(
JSON.parse(originItem.value))
} else if (suffix === 'xml') {
const x2js = new X2JS();
res = Obj2Prop(x2js.xml_str2json(originItem.value))
}else{
res = Obj2Prop(
x2js.xml_str2json(originItem.value))
} else {
//txt
res.push(originItem)
}