Merge branch 'master' into feature/comment_and_blank_repeat

youngzil · youngzil · commit 84180a2852ce · 2024-09-30T11:04:08.000+08:00
# Conflicts:
#	CHANGES.md
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,7 @@ Apollo 2.4.0
 * [Feature support portal restTemplate Client connection pool config](https://github.com/apolloconfig/apollo/pull/5200)
 * [Feature added the ability for administrators to globally search for Value](https://github.com/apolloconfig/apollo/pull/5182)
 * [Fix: Resolve issues with duplicate comments and blank lines in configuration management](https://github.com/apolloconfig/apollo/pull/5232)
+* [Fix link namespace published items show missing some items](https://github.com/apolloconfig/apollo/pull/5240)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/15?closed=1)
diff --git a/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html b/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
@@ -624,7 +624,7 @@ <h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }
                                 </thead>
                                 <tbody>
                                     <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
-                                        ng-if="config.item.key && !config.isModified && !config.isDeleted">
+                                        ng-if="config.item.key && ((!config.isModified && !config.isDeleted) || config.oldValue)">
                                         <td width="15%" class="cursor-pointer"
                                             title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
                                             ng-click="showText(config.item.key)">
@@ -643,9 +643,11 @@ <h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }
                                         </td>
                                         <td width="30%" class="cursor-pointer"
                                             title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
-                                            ng-click="showText(config.item.value)">
-                                            <span ng-bind="config.item.value | limitTo: 250"></span>
-                                            <span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
+                                            ng-click="(config.isModified || config.isDeleted) ? showText(config.oldValue) : showText(config.item.value)">
+                                            <span ng-if="config.isModified || config.isDeleted" ng-bind="config.oldValue | limitTo: 250"></span>
+                                            <span ng-if="config.isModified || config.isDeleted" ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
+                                            <span ng-if="!config.isModified && !config.isDeleted" ng-bind="config.item.value | limitTo: 250"></span>
+                                            <span ng-if="!config.isModified && !config.isDeleted" ng-bind="config.item.value.length > 250 ? '...': ''"></span>
                                         </td>
                                         <td width="13%" title="{{config.item.comment}}">
                                             <span ng-bind="config.item.comment | limitTo: 250"></span>
