From 5ed37c2f5f90f2151b5c9dafbfbdbf9893adb8b1 Mon Sep 17 00:00:00 2001 From: wtifs Date: Fri, 15 Nov 2024 18:01:53 +0800 Subject: [PATCH 1/9] feat: support properties diff --- .../main/resources/static/config/diff.html | 21 +++++++++++++------ .../src/main/resources/static/i18n/zh-CN.json | 4 ++-- .../controller/config/DiffConfigController.js | 6 ++++-- .../resources/static/styles/common-style.css | 15 ++++++++++++- .../static/views/component/diff.html | 2 +- .../static/views/component/release-modal.html | 19 ++++++++++------- 6 files changed, 47 insertions(+), 20 deletions(-) diff --git a/apollo-portal/src/main/resources/static/config/diff.html b/apollo-portal/src/main/resources/static/config/diff.html index bbfc3098ee5..0bd2adb8922 100644 --- a/apollo-portal/src/main/resources/static/config/diff.html +++ b/apollo-portal/src/main/resources/static/config/diff.html @@ -127,10 +127,11 @@

{{'Config.Diff.Title' | translate }}
- - + +
+ - + @@ -142,16 +143,24 @@

{{'Config.Diff.Title' | translate }}

- +
KeyKey Value ( {{'Common.Environment' | translate }} : , {{'Common.Cluster' | translate }} : )
+ + + + + + ng-bind="(itemsKeyedByCluster[cluster.compositedKey] || {}).comment">
+ + diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json index 8ae676eda59..8fdade14be9 100644 --- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json +++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json @@ -291,10 +291,10 @@ "Component.Publish.ToSeeChange": "查看变更", "Component.Publish.CompareWithMasterValue": "与主版本对比", "Component.Publish.CompareWithPublishedValue": "与已发布对比", - "Component.Publish.PublishedValue": "待发布的值", + "Component.Publish.PublishedValue": "已发布的值", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", - "Component.Publish.NoPublishedValue": "未发布的值", + "Component.Publish.NoPublishedValue": "待发布的值", "Component.Publish.ModifyUser": "修改人", "Component.Publish.ModifyTime": "修改时间", "Component.Publish.NewAdded": "新", diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js index 488169ac3c0..7354ac670cb 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js @@ -164,17 +164,19 @@ diff_item_module.controller("DiffItemController", function parseSyncSourceData() { var syncData = { syncToNamespaces: [], - syncItems: [] + syncItems: [], + firstClusterKey: "", }; var namespaceName = $scope.pageContext.namespaceName; selectedClusters.forEach(function (cluster) { if (cluster.checked) { cluster.clusterName = cluster.name; cluster.namespaceName = namespaceName; + cluster.compositedKey = cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName; syncData.syncToNamespaces.push(cluster); } }); - + syncData.firstClusterKey = selectedClusters[0].compositedKey; return syncData; } diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css index fe92365f48c..b396156c687 100644 --- a/apollo-portal/src/main/resources/static/styles/common-style.css +++ b/apollo-portal/src/main/resources/static/styles/common-style.css @@ -95,7 +95,7 @@ p, td, span { color: #797979; } -pre, .pre { +pre { white-space: pre-wrap; /* Since CSS 2.1 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -pre-wrap; /* Opera 4-6 */ @@ -103,6 +103,10 @@ pre, .pre { word-wrap: break-word; /* Internet Explorer 5.5+ */ } +.pre { + white-space: pre; +} + .hover:hover { background: #f5f5f5; cursor: pointer @@ -1172,4 +1176,13 @@ table th { #consumer-list .create-btn img { width: 16px; height: 16px; +} + +.left-overflow { + overflow-x: auto; + text-align: left; +} + +.table-fixed{ + table-layout: fixed; } \ No newline at end of file diff --git a/apollo-portal/src/main/resources/static/views/component/diff.html b/apollo-portal/src/main/resources/static/views/component/diff.html index 3e36e174add..0caebc37bd7 100644 --- a/apollo-portal/src/main/resources/static/views/component/diff.html +++ b/apollo-portal/src/main/resources/static/views/component/diff.html @@ -1,4 +1,4 @@ -
+
 
                         
-                        
+                        

@@ -78,7 +79,7 @@ 

                                         {{'Component.Publish.NoPublishedValue' | translate }}
                                     
                                     

@@ -121,6 +122,7 @@ 

                             

@@ -172,7 +174,8 @@ 

                             

@@ -182,7 +185,7 @@ 

                                         {{'Component.Publish.MasterValue' | translate }}
                                     
-                                    


From 227a2ceca412bdeab5ca17d760dd1c08c31dbc64 Mon Sep 17 00:00:00 2001
From: wtifs 
Date: Mon, 18 Nov 2024 15:03:53 +0800
Subject: [PATCH 2/9] feat: support gray scale diff

---
 .../src/main/resources/static/i18n/zh-CN.json |  6 ++---
 .../scripts/directive/diff-directive.js       |  1 +
 .../static/views/component/release-modal.html | 27 +++++++++++--------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
index 8fdade14be9..c21773e3dbd 100644
--- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json
+++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
@@ -292,7 +292,7 @@
   "Component.Publish.CompareWithMasterValue": "与主版本对比",
   "Component.Publish.CompareWithPublishedValue": "与已发布对比",
   "Component.Publish.PublishedValue": "已发布的值",
-  "Component.Publish.Changes": "Changes",
+  "Component.Publish.Changes": "改动",
   "Component.Publish.Key": "Key",
   "Component.Publish.NoPublishedValue": "待发布的值",
   "Component.Publish.ModifyUser": "修改人",
@@ -310,8 +310,8 @@
   "Component.Publish.ItemNoChange": "配置没有变化",
   "Component.Publish.GrayItemNoChange": "灰度配置没有变化",
   "Component.Publish.NoGrayItems": "没有灰度的配置项",
-  "Component.Publish.Release": "Release Name",
-  "Component.Publish.ReleaseComment": "Comment",
+  "Component.Publish.Release": "版本名称",
+  "Component.Publish.ReleaseComment": "说明",
   "Component.Publish.OpPublish": "发布",
   "Component.Rollback.To": "回滚到",
   "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本",
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
index b78525faf81..c06ebf30244 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
@@ -60,6 +60,7 @@ directive_module.directive('apollodiff',
                             part.removed ? 'red' : 'grey';
                         span = document.createElement('span');
                         span.style.color = color;
+                        span.style.display = 'block'
                         pre = part.added ? '+' :
                             part.removed ? '-' : '';
                         span.appendChild(document.createTextNode(pre + part.value));
diff --git a/apollo-portal/src/main/resources/static/views/component/release-modal.html b/apollo-portal/src/main/resources/static/views/component/release-modal.html
index e38fabcbfac..ce90ca7ea81 100644
--- a/apollo-portal/src/main/resources/static/views/component/release-modal.html
+++ b/apollo-portal/src/main/resources/static/views/component/release-modal.html
@@ -39,8 +39,8 @@ 

 
                 

-                    

-                        

+                    

+                        

                             

                                 

-                    
 
                     

                             

-                                    
-                                    
@@ -161,8 +160,14 @@ 

                                         
                                     
-                                    

@@ -211,7 +216,7 @@ 

                                     
                                     


From 9323e1bd286d78fff5464e9877aac12b366378b7 Mon Sep 17 00:00:00 2001
From: wtifs 
Date: Mon, 18 Nov 2024 15:10:42 +0800
Subject: [PATCH 3/9] style: add semicolon

---
 .../main/resources/static/scripts/directive/diff-directive.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c06ebf30244..b9cdc7aaa2b 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
@@ -60,7 +60,7 @@ directive_module.directive('apollodiff',
                             part.removed ? 'red' : 'grey';
                         span = document.createElement('span');
                         span.style.color = color;
-                        span.style.display = 'block'
+                        span.style.display = 'block';
                         pre = part.added ? '+' :
                             part.removed ? '-' : '';
                         span.appendChild(document.createTextNode(pre + part.value));

From aeb715b4238ffedc09f55e08a712ee172b72c83b Mon Sep 17 00:00:00 2001
From: wtifs 
Date: Tue, 19 Nov 2024 17:34:18 +0800
Subject: [PATCH 4/9] feat: support diff in history

---
 .../main/resources/static/config/history.html   | 17 ++++++++++-------
 .../src/main/resources/static/i18n/zh-CN.json   |  8 ++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/config/history.html b/apollo-portal/src/main/resources/static/config/history.html
index 9c7d46e7727..cf6d0420e0e 100644
--- a/apollo-portal/src/main/resources/static/config/history.html
+++ b/apollo-portal/src/main/resources/static/config/history.html
@@ -157,11 +157,11 @@ 

                             
{{'Config.History.ChangedItem' | translate }}

                             

-                                

                             
                                 

@@ -108,8 +109,8 @@ 

                                         
                                     
-                                    

-                                        
+                                    
+                                        
                                     
                                     
                                     

                                 

+                                    
                                         {{'Component.Publish.GrayValue' | translate }}
                                     
                                     
@@ -207,8 +210,8 @@ 

                                         
                                     
-                                    

-                                        
+                                    
+                                        
                                     
                                     
                                     

                                 

+                                    
                                         {{'Component.Publish.Key' | translate }}
                                     
                                     
@@ -139,10 +138,10 @@ 

                                         {{'Component.Publish.ModifyUser' | translate }}
                                     

+                                    
                                         {{'Component.Publish.ModifyTime' | translate }}
                                     
                                 

-                                        
+                                    
+                                        
+                                            
+                                        
+                                        
+                                            
+                                        
+                                        
                                     
                                     
                                     
-                                        
+                                        
                                     
                                     
                                     

+                                

-                                            
-                                            
+                                            
+                                            
@@ -188,11 +188,14 @@ 
{{'Config.History.ChangedItem' | translate }}

-                                            
diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
index c21773e3dbd..f9f82e28dfe 100644
--- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json
+++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
@@ -731,11 +731,11 @@
   "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更",
   "Config.History.AllItem": "全部配置",
   "Config.History.AllItemTips": "查看此次发布的所有配置信息",
-  "Config.History.ChangeType": "Type",
+  "Config.History.ChangeType": "类型",
   "Config.History.ChangeKey": "Key",
-  "Config.History.ChangeValue": "Value",
-  "Config.History.ChangeOldValue": "Old Value",
-  "Config.History.ChangeNewValue": "New Value",
+  "Config.History.ChangeValue": "值",
+  "Config.History.ChangeOldValue": "旧值",
+  "Config.History.ChangeNewValue": "新值",
   "Config.History.ChangeTypeNew": "新增",
   "Config.History.ChangeTypeModify": "修改",
   "Config.History.ChangeTypeDelete": "删除",

From cc217d6c357da57085ba16485f01d5de4a79f5af Mon Sep 17 00:00:00 2001
From: wtifs 
Date: Thu, 21 Nov 2024 15:59:46 +0800
Subject: [PATCH 5/9] feat: adjust ui

---
 .../main/resources/static/config/diff.html    | 24 +++---
 .../main/resources/static/config/history.html | 14 ++-
 .../src/main/resources/static/i18n/en.json    |  1 +
 .../src/main/resources/static/i18n/zh-CN.json |  1 +
 .../controller/config/DiffConfigController.js |  7 +-
 .../config/ReleaseHistoryController.js        |  9 ++
 .../directive/release-modal-directive.js      |  4 +
 .../directive/show-text-modal-directive.js    |  5 +-
 .../resources/static/styles/common-style.css  | 10 +--
 .../static/views/component/diff.html          |  2 +-
 .../static/views/component/release-modal.html | 86 ++++++++-----------
 .../views/component/show-text-modal.html      | 12 +--
 12 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/config/diff.html b/apollo-portal/src/main/resources/static/config/diff.html
index 0bd2adb8922..b2aac9c9a00 100644
--- a/apollo-portal/src/main/resources/static/config/diff.html
+++ b/apollo-portal/src/main/resources/static/config/diff.html
@@ -128,28 +128,26 @@ 
{{'Config.Diff.Title' | translate }}
                             
                             

                                 
-                                

                                     
                                         
{{'Config.History.ChangeType' | translate }}{{'Config.History.ChangeKey' | translate }}{{'Config.History.ChangeType' | translate }}{{'Config.History.ChangeKey' | translate }}
                                             {{'Config.History.ChangeOldValue' | translate }}
                                             {{'Config.History.ChangeNewValue' | translate }}
                                         

                                                 
                                             

-                                                
-                                                
+                                                
+                                                    
+                                                    
+                                                
                                             
                                         

                                     

+                                

-                                            
-                                            
+                                            
-                                            
-                                            
@@ -313,7 +309,7 @@ 

             
         
 
-        
+        
 
         
         
diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json
index 69ae8e5e4cf..7cab764e0c6 100644
--- a/apollo-portal/src/main/resources/static/i18n/en.json
+++ b/apollo-portal/src/main/resources/static/i18n/en.json
@@ -297,6 +297,7 @@
   "Component.Publish.NoPublishedValue": "Unreleased values",
   "Component.Publish.ModifyUser": "Modifier",
   "Component.Publish.ModifyTime": "Modified Time",
+  "Component.Publish.ModifyRecord": "Record",
   "Component.Publish.NewAdded": "New",
   "Component.Publish.NewAddedTips": "New Configuration",
   "Component.Publish.Modified": "Modified",
diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
index f9f82e28dfe..8c00fee807f 100644
--- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json
+++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
@@ -297,6 +297,7 @@
   "Component.Publish.NoPublishedValue": "待发布的值",
   "Component.Publish.ModifyUser": "修改人",
   "Component.Publish.ModifyTime": "修改时间",
+  "Component.Publish.ModifyRecord": "修改记录",
   "Component.Publish.NewAdded": "新",
   "Component.Publish.NewAddedTips": "新增的配置",
   "Component.Publish.Modified": "改",
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
index 7354ac670cb..8272ba7d28d 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
@@ -38,7 +38,7 @@ diff_item_module.controller("DiffItemController",
             $scope.backToAppHomePage = backToAppHomePage;
             $scope.switchSelect = switchSelect;
 
-            $scope.showText = showText;
+            $scope.showTextDiff = showTextDiff;
 
             $scope.itemsKeyedByKey = {};
             $scope.allNamespaceValueEqualed = {};
@@ -195,8 +195,9 @@ diff_item_module.controller("DiffItemController",
                 o.checked = !o.checked;
             }
 
-            function showText(text) {
-                $scope.text = text;
+            function showTextDiff(oldStr, newStr) {
+                $scope.oldStr = oldStr;
+                $scope.newStr = newStr;
                 AppUtil.showModal('#showTextModal');
             }
         }]);
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js
index 028cb554b04..45302596938 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js
@@ -53,6 +53,7 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, EventM
     $scope.switchConfigViewType = switchConfigViewType;
     $scope.findReleaseHistory = findReleaseHistory;
     $scope.showText = showText;
+    $scope.showTextDiff = showTextDiff;
 
     EventManager.subscribe(EventManager.EventType.REFRESH_RELEASE_HISTORY, function () {
         location.reload(true);
@@ -207,8 +208,16 @@ function releaseHistoryController($scope, $location, $translate, AppUtil, EventM
     }
 
     function showText(text) {
+        $scope.enableTextDiff = false;
         $scope.text = text;
         AppUtil.showModal("#showTextModal");
     }
+
+    function showTextDiff(oldStr, newStr) {
+        $scope.enableTextDiff = true;
+        $scope.oldStr = oldStr;
+        $scope.newStr = newStr;
+        AppUtil.showModal('#showTextModal');
+    }
 }
 
diff --git a/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js
index 89d82a4e97b..9b285c9a8a2 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/release-modal-directive.js
@@ -34,6 +34,7 @@ function releaseModalDirective($translate, toastr, AppUtil, EventManager, Releas
 
             scope.releaseBtnDisabled = false;
             scope.releaseChangeViewType = 'compareWithPublishedValue';
+            scope.isComparePublished = true;
             scope.releaseComment = '';
             scope.isEmergencyPublish = false;
 
@@ -170,6 +171,9 @@ function releaseModalDirective($translate, toastr, AppUtil, EventManager, Releas
 
             function switchReleaseChangeViewType(type) {
                 scope.releaseChangeViewType = type;
+                scope.isCompareMaster = type === 'compareWithMasterValue';
+                scope.isComparePublished = type === 'compareWithPublishedValue';
+                scope.isNoCompare = type === 'release';
             }
         }
     }
diff --git a/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js
index ff55de3dc1c..f023a03ef07 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/show-text-modal-directive.js
@@ -74,7 +74,10 @@ function showTextModalDirective(AppUtil) {
         transclude: true,
         replace: true,
         scope: {
-            text: '='
+            text: '=',
+            oldStr: '=',
+            newStr: '=',
+            enableTextDiff: '='
         },
         link: function (scope) {
             scope.$watch('text', init);
diff --git a/apollo-portal/src/main/resources/static/styles/common-style.css b/apollo-portal/src/main/resources/static/styles/common-style.css
index b396156c687..7d90f4b6fe9 100644
--- a/apollo-portal/src/main/resources/static/styles/common-style.css
+++ b/apollo-portal/src/main/resources/static/styles/common-style.css
@@ -95,7 +95,7 @@ p, td, span {
     color: #797979;
 }
 
-pre {
+pre .pre{
     white-space: pre-wrap; /* Since CSS 2.1 */
     white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
     white-space: -pre-wrap; /* Opera 4-6 */
@@ -103,10 +103,6 @@ pre {
     word-wrap: break-word; /* Internet Explorer 5.5+ */
 }
 
-.pre {
-    white-space: pre;
-}
-
 .hover:hover {
     background: #f5f5f5;
     cursor: pointer
@@ -1185,4 +1181,8 @@ table th {
 
 .table-fixed{
     table-layout: fixed;
+}
+
+.block {
+    display: block;
 }
\ No newline at end of file
diff --git a/apollo-portal/src/main/resources/static/views/component/diff.html b/apollo-portal/src/main/resources/static/views/component/diff.html
index 0caebc37bd7..938819c001a 100644
--- a/apollo-portal/src/main/resources/static/views/component/diff.html
+++ b/apollo-portal/src/main/resources/static/views/component/diff.html
@@ -1,4 +1,4 @@
-
+
 

                                 
                                         
Key
+                                            Key
                                                 Value ( {{'Common.Environment' | translate }} :  , {{'Common.Cluster' | translate }} :  )
-                                            
-                                            
+                                            
+                                            
                                                 Comment ( {{'Common.Environment' | translate }} :  , {{'Common.Cluster' | translate }} :  )
-                                            
+                                            
                                         

                                     
                                     
                                         

                                             
                                             
-                                                
-                                                    
-                                                    
+                                            
+                                                
                                                 
                                             
                                             {{'Config.Diff.Title' | translate }}
             
         
 
-        
+        
     
 
 
diff --git a/apollo-portal/src/main/resources/static/config/history.html b/apollo-portal/src/main/resources/static/config/history.html
index cf6d0420e0e..fb81125339d 100644
--- a/apollo-portal/src/main/resources/static/config/history.html
+++ b/apollo-portal/src/main/resources/static/config/history.html
@@ -188,14 +188,10 @@ 
{{'Config.History.ChangedItem' | translate }}

                                                 
                                             		
-                                                
-                                                    
-                                                    
-                                                
+                                            
+                                                
+