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

fix button value and diff code #4981

Merged
merged 1 commit into from
Sep 22, 2023
Merged

fix button value and diff code #4981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/static/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
"Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)",
"Component.Publish.ToSeeChange": "View changes",
"Component.Publish.CompareWithMasterValue": "Compare with master",
"Component.Publish.CompareWithPublishedValue": "Compare with grayscale",
"Component.Publish.CompareWithPublishedValue": "Compare with published",
"Component.Publish.PublishedValue": "Released values",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
Expand Down
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/static/i18n/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
"Component.Publish.AllPublishTips": "（全量发布的配置会作用于全部的实例）",
"Component.Publish.ToSeeChange": "查看变更",
"Component.Publish.CompareWithMasterValue": "与主版本对比",
"Component.Publish.CompareWithPublishedValue": "与灰度版本对比",
"Component.Publish.CompareWithPublishedValue": "与已发布对比",
"Component.Publish.PublishedValue": "待发布的值",
"Component.Publish.Changes": "Changes",
"Component.Publish.Key": "Key",
Expand Down
3 changes: 2 additions & 1 deletion apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ directive_module.directive('apollodiff',
var newStr = scope.newStr == undefined ? '' : scope.newStr;

var oldStrRes = oldStr.replace(/\r/g, "");
var diff = JsDiff.diffLines(oldStrRes, newStr),
var newStrRes = newStr.replace(/\r/g, "");
var diff = JsDiff.diffLines(oldStrRes, newStrRes),
fragment = document.createDocumentFragment();

diff.forEach(function (part) {
Expand Down