Skip to content

A
apollo
Commit b3e5798b authored by Jason Song's avatar Jason Song Committed by GitHub
Browse files
Options

Merge pull request #1723 from lepdou/namespace_view 

hidden namespace's body when namespace's size bigger than 2
parents f1ead47e 725dd069
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 50 deletions
apollo-portal/src/main/resources/static/config.html
View file @ b3e5798b
......@@ -214,6 +214,7 @@
pre-delete-item="preDeleteItem"
show-text="showText"
show-no-modify-permission-dialog="showNoModifyPermissionDialog"
show-body="namespaces.length == 1"
pre-create-branch="preCreateBranch"
pre-delete-branch="preDeleteBranch">
</apollonspanel>
......
apollo-portal/src/main/resources/static/login.html
View file @ b3e5798b
......@@ -7,7 +7,6 @@
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="vendor/font-awesome.min.css">
<style type="text/css">
@import url(https://fonts.googleapis.com/css?family=Roboto:400,300,100,700,500);
body {
padding-top: 90px;
......
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
View file @ b3e5798b
......@@ -129,6 +129,7 @@ function controller($rootScope, $scope, toastr, AppUtil, EventManager, ConfigSer
$scope.namespaces.forEach(function (namespace, index) {
if (namespace.baseInfo.namespaceName == result.baseInfo.namespaceName) {
$scope.namespaces[index] = result;
$scope.namespaces[index].showNamespaceBody = true;
}
});
......
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
View file @ b3e5798b
......@@ -21,7 +21,8 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
showNoModifyPermissionDialog: '=',
preCreateBranch: '=',
preDeleteBranch: '=',
showMergeAndPublishGrayTips: '='
showMergeAndPublishGrayTips: '=',
showBody: "=?"
},
link: function (scope) {
......@@ -89,8 +90,9 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
namespace.displayControl = {
currentOperateBranch: 'master',
showSearchInput: false,
show: true
show: scope.showBody
};
scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody;
namespace.viewItems = namespace.items;
namespace.isPropertiesFormat = namespace.format == 'properties';
namespace.isTextEditing = false;
......@@ -380,10 +382,8 @@ 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.showNamespaceBody = true;
}
scope.namespace.displayControl.currentOperateBranch = branchName;
......
apollo-portal/src/main/resources/static/styles/common-style.css
View file @ b3e5798b
......@@ -407,9 +407,7 @@ table th {
}
.namespace-panel .namespace-attribute-public {
background: #31708f;
width: 40px;
cursor: pointer;
margin-right:5px;
}
.namespace-panel .second-panel-heading .nav-tabs {
......
apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
View file @ b3e5798b
......@@ -8,21 +8,15 @@
<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">有修改
<b class="namespace-name" ng-bind="namespace.viewName"></b>
<span class="label label-warning no-radius namespace-label"
ng-show="namespace.branch.itemModifiedCnt > 0">有修改
<span class="badge label badge-white namespace-label"
ng-bind="namespace.branch.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.branch.lockOwner">当前修改者:
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.branch.lockOwner">当前修改者:
<span ng-bind="namespace.branch.lockOwner"></span>
</span>
</div>
......@@ -52,7 +46,7 @@
</header>
<div id="BODY{{namespace.branch.id}}" class="collapse in">
<div id="BODY{{namespace.branch.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isConfigHidden">
<span style="color: red">您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。</span>
......@@ -262,11 +256,11 @@
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom" title="新增的配置">新</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom" title="修改的配置">改</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.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom" title="修改的配置">改</span>
<span class="label label-danger" ng-if="config.isDeleted"
data-tooltip="tooltip" data-placement="bottom" title="删除的配置">删</span>
</td>
<td width="35%" class="cursor-pointer" title="点击查看" ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
......
apollo-portal/src/main/resources/static/views/component/namespace-panel-header.html
View file @ b3e5798b
<header class="row namespace-attribute-panel">
<div class="text-center namespace-attribute-public">
<span data-tooltip="tooltip" data-placement="bottom"
title="私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到"
ng-show="!namespace.isPublic">私有</span>
<div class="row">
<div class="col-md-6" style="padding-bottom:5px;">
<span class="text-center namespace-attribute-public label label-primary no-radius">
<span data-tooltip="tooltip" data-placement="bottom"
title="私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到"
ng-show="!namespace.isPublic">私有</span>
<span data-tooltip="tooltip" data-placement="top"
title="namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到"
ng-show="namespace.isPublic && namespace.parentAppId == namespace.baseInfo.appId">公共</span>
<span data-tooltip="tooltip" data-placement="top"
title="namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到"
ng-show="namespace.isPublic && namespace.parentAppId == namespace.baseInfo.appId">公共</span>
<span data-tooltip="tooltip" data-placement="top"
title="namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到"
ng-show="namespace.isPublic && namespace.isLinkedNamespace"
ng-click="goToParentAppConfigPage(namespace)">关联</span>
<span data-tooltip="tooltip" data-placement="top"
title="namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到"
ng-show="namespace.isPublic && namespace.isLinkedNamespace"
ng-click="goToParentAppConfigPage(namespace)">关联</span>
</span>
<span class="text-center namespace-attribute-public label label-info no-radius">
<span ng-bind="namespace.format" style="width:30px;"></span>
</span>
</div>
<div class="col-md-6 text-right" style="padding-right:23px;">
<span data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false">
<span
class="label no-radius cursor-pointer"
data-toggle="collapse" data-target="#BODY{{namespace.id}}" aria-expanded="false"
ng-click="showNamespaceBody = !showNamespaceBody">
<a ><small>[展开/收缩]</small></a>
</span>
</span>
</div>
</div>
</header>
......
apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
View file @ b3e5798b
......@@ -7,18 +7,7 @@
<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"></b>
</span>
<span class="label label-info no-radius namespace-label" ng-bind="namespace.format"></span>
<b class="namespace-name" ng-bind="namespace.viewName"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
有修改
......@@ -94,7 +83,7 @@
<div id="BODY{{namespace.id}}" class="collapse in">
<div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isConfigHidden">
<span style="color: red">您不是该项目的管理员，也没有该Namespace的编辑或发布权限，无法查看配置信息。</span>
......
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