Skip to content

A
apollo
Commit e19b7f95 by lepdou
Options

close/open namespace content

parent d3e0fdb7
Showing with 45 additions and 9 deletions
apollo-portal/src/main/resources/static/config.html
......@@ -81,7 +81,7 @@
<td ng-bind="appBaseInfo.ownerName"></td>
</tr>
<tr>
<th>Email:</th>
<th>邮箱:</th>
<td>
<small ng-bind="appBaseInfo.ownerEmail"></small>
</td>
......
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
......@@ -88,7 +88,8 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false;
namespace.displayControl = {
currentOperateBranch: 'master',
showSearchInput: false
showSearchInput: false,
show: true
};
namespace.viewItems = namespace.items;
namespace.isPropertiesFormat = namespace.format == 'properties';
......@@ -99,6 +100,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
namespace.allInstancesPage = 0;
namespace.commitChangeBtnDisabled = false;
generateNamespaceId(namespace);
initNamespaceBranch(namespace);
initNamespaceViewName(namespace);
initNamespaceLock(namespace);
......@@ -131,7 +133,11 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
namespace.branch.latestReleaseInstancesPage = 0;
namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.branch.hasLoadInstances = false;
namespace.branch.displayControl = {
show: true
};
generateNamespaceId(namespace.branch);
initBranchItems(namespace.branch);
initRules(namespace.branch);
loadInstanceInfo(namespace.branch);
......@@ -201,6 +207,10 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
}
}
function generateNamespaceId(namespace) {
namespace.id = Math.random().toString(36).substr(2);
}
function initPermission(namespace) {
PermissionService.has_modify_namespace_permission(
......@@ -338,7 +348,10 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
function switchBranch(branchName) {
if (branchName != 'master') {
scope.namespace.branch.displayControl.show = true;
initRules(scope.namespace.branch);
} else {
scope.namespace.displayControl.show = true;
}
scope.namespace.displayControl.currentOperateBranch = branchName;
......
apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
<section class="branch-panel-body" ng-if="namespace.hasBranch && namespace.displayControl.currentOperateBranch != 'master'">
<section class="branch-panel-body"
ng-if="namespace.hasBranch && namespace.displayControl.currentOperateBranch != 'master'">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip"
data-placement="bottom"
title="{{namespace.comment}}"></b>
<span class="cursor-pointer"
data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false"
ng-click="namespace.branch.displayControl.show = !namespace.branch.displayControl.show">
<span class="glyphicon glyphicon-triangle-bottom small"
ng-show="namespace.branch.displayControl.show"></span>
<span class="glyphicon glyphicon-triangle-top small"
ng-show="!namespace.branch.displayControl.show"></span>
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="点击展开/收缩Namespace"></b>
</span>
<span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span>
<span class="label label-warning no-radius namespace-label"
ng-show="namespace.branch.itemModifiedCnt > 0">有修改
......@@ -44,6 +52,7 @@
</header>
<div id="BODY{{namespace.branch.id}}" class="collapse in">
<!--second header-->
<header class="panel-heading second-panel-heading">
<div class="row">
......@@ -82,7 +91,7 @@
</div>
</div>
</header>
<!--namespace body-->
<section>
<!--items-->
<div class="namespace-view-table" ng-show="namespace.branch.viewType == 'table'">
......@@ -518,9 +527,11 @@
ng-click="loadCommitHistory(namespace.branch)">加载更多
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center" ng-show="!namespace.branch.commits || !namespace.branch.commits.length">
<div class="empty-container text-center"
ng-show="!namespace.branch.commits || !namespace.branch.commits.length">
无更改历史
</div>
</div>
</section>
</div>
</section>
apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
......@@ -7,8 +7,17 @@
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<span class="cursor-pointer"
data-toggle="collapse" data-target="#BODY{{namespace.id}}" aria-expanded="false"
ng-click="namespace.displayControl.show = !namespace.displayControl.show">
<span class="glyphicon glyphicon-triangle-bottom small"
ng-show="namespace.displayControl.show"></span>
<span class="glyphicon glyphicon-triangle-top small"
ng-show="!namespace.displayControl.show"></span>
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
data-tooltip="tooltip" data-placement="bottom" title="点击展开/收缩Namespace"></b>
</span>
<span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
......@@ -81,6 +90,7 @@
</div>
</header>
<div id="BODY{{namespace.id}}" class="collapse in">
<!--second header-->
<header class="panel-heading second-panel-heading">
<div class="row">
......@@ -174,6 +184,7 @@
</div>
</header>
<!--namespace body-->
<section>
<!--table view-->
<div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
......@@ -916,5 +927,6 @@
</div>
</div>
</section>
</div>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment