fix apolloconfig#2167 (apolloconfig#2172)

geohan · Apr 27, 2019 · 05a3229 · 05a3229
1 parent 2ec5d6e
commit 05a3229
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
@@ -191,14 +191,15 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
 
                             //modify master item and set item's masterReleaseValue
                             if (masterItem) {
-                                if (masterItem.isModified && masterItem.oldValue) {
+                                item.masterItemExists = true;
+                                if (masterItem.isModified) {
                                     item.masterReleaseValue = masterItem.oldValue;
-                                } else if (masterItem.item.value) {
+                                } else {
                                     item.masterReleaseValue = masterItem.item.value;
                                 }
 
                             } else {//delete branch item
-                                item.masterReleaseValue = '';
+                                item.masterItemExists = false;
                             }
 
                             //delete master item. ignore

diff --git a/apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html b/apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
@@ -155,10 +155,10 @@
                                 <span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
                                 <span class="label label-danger" ng-if="config.isDeleted"
                                       data-tooltip="tooltip" data-placement="bottom" title="删除的配置">删</span>
-                                <span class="label label-info" ng-if="!config.isDeleted && config.masterReleaseValue"
+                                <span class="label label-info" ng-if="!config.isDeleted && config.masterItemExists"
                                       data-tooltip="tooltip" data-placement="bottom" title="修改主版本的配置">改</span>
                                 <span class="label label-success"
-                                      ng-if="!config.isDeleted && !config.masterReleaseValue"
+                                      ng-if="!config.isDeleted && !config.masterItemExists"
                                       data-tooltip="tooltip" data-placement="bottom" title="灰度版本特有的配置">新</span>
                             </td>
                             <td width="20%" class="cursor-pointer" title="点击查看"