fix button value and diff code (#4981)

apolloconfig · Sep 22, 2023 · 1deb136 · 1deb136
1 parent 57cca96
commit 1deb136
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json
@@ -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",

diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
@@ -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",

diff --git a/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
@@ -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) {