Skip to content

apollo
apollo

superrain51 / apollo
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
apollo
apollo

体验新版 GitCode，发现更多精彩内容 >>

提交 9f15c41d 编写于 作者: J Jason Song 提交者： GitHub
浏览文件
操作

Merge pull request #327 from lepdou/history 

刷新页面维持nav选择 & 发布历史兼容文本类型的NS
上级 299049ab 71b725af
隐藏空白更改
内联 并排
Showing with 53 addition and 21 deletion
apollo-portal/src/main/resources/static/config/history.html
浏览文件 @ 9f15c41d
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<table class="table table-hover table-bordered table-striped"> <table class="table table-hover table-bordered table-striped" ng-show="!isTextFile">
<tr ng-repeat="item in release.items"> <tr ng-repeat="item in release.items">
<td width="30%" ng-bind="item.key"> <td width="30%" ng-bind="item.key">
...@@ -62,14 +62,20 @@ ...@@ -62,14 +62,20 @@
</td> </td>
</tr> </tr>
</table> </table>
<textarea class="form-control no-radius" rows="15" ng-show="isTextFile" ng-bind="release.items[0].value" disabled>
</textarea>
</div> </div>
</div> </div>
<div class="text-center"> <div class="text-center load-more">
<button type="button" class="btn btn-default" ng-show="!hasLoadAll" <button type="button" class="btn btn-default" ng-show="!hasLoadAll"
ng-click="loadMore()">加载更多 ng-click="loadMore()">加载更多
<span class="glyphicon glyphicon-menu-down"></span> <span class="glyphicon glyphicon-menu-down"></span>
</button> </button>
</div> </div>
<div class="text-center" ng-show="!releases.length">
<h4>还没发布过哟~</h4>
</div>
</div> </div>
</section> </section>
......
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigBaseInfoController.js
浏览文件 @ 9f15c41d
...@@ -5,10 +5,14 @@ application_module.controller("ConfigBaseInfoController", ...@@ -5,10 +5,14 @@ application_module.controller("ConfigBaseInfoController",
AppUtil) { AppUtil) {
var appId = AppUtil.parseParams($location.$$url).appid; var appId = AppUtil.parseParams($location.$$url).appid;
//load session storage to recovery scene
var scene = JSON.parse(sessionStorage.getItem(appId));
var pageContext = { var pageContext = {
appId: appId, appId: appId,
env: '', env: scene ? scene.env : '',
clusterName: 'default' clusterName: scene ? scene.cluster : 'default'
}; };
$rootScope.pageContext = pageContext; $rootScope.pageContext = pageContext;
...@@ -19,12 +23,14 @@ application_module.controller("ConfigBaseInfoController", ...@@ -19,12 +23,14 @@ application_module.controller("ConfigBaseInfoController",
var navTree = []; var navTree = [];
var nodes = AppUtil.collectData(result); var nodes = AppUtil.collectData(result);
if (!nodes || nodes.length == 0){ if (!nodes || nodes.length == 0) {
toastr.error("加载导航信息出错"); toastr.error("加载环境信息出错");
return; return;
} }
//默认显示第一个环境的default集群的 //default first env if session storage is empty
pageContext.env = nodes[0].env; if (!pageContext.env) {
pageContext.env = nodes[0].env;
}
$rootScope.refreshNamespaces(); $rootScope.refreshNamespaces();
nodes.forEach(function (env, envIdx) { nodes.forEach(function (env, envIdx) {
...@@ -32,33 +38,31 @@ application_module.controller("ConfigBaseInfoController", ...@@ -32,33 +38,31 @@ application_module.controller("ConfigBaseInfoController",
return; return;
} }
var node = {}; var node = {};
//first nav
node.text = env.env; node.text = env.env;
// node.icon = 'glyphicon glyphicon-console';
var clusterNodes = []; var clusterNodes = [];
//如果env下面只有一个default集群则不显示集群列表 //如果env下面只有一个default集群则不显示集群列表
if (env.clusters && env.clusters.length == 1 && env.clusters[0].name if (env.clusters && env.clusters.length == 1 && env.clusters[0].name
== 'default') { == 'default') {
if (envIdx == 0){ if (envIdx == 0) {
node.state = {}; node.state = {};
node.state.selected = true; node.state.selected = true;
} }
node.selectable = true; node.selectable = true;
} else { } else {
node.selectable = false; node.selectable = false;
//second nav //cluster list
env.clusters.forEach(function (cluster, clusterIdx) { env.clusters.forEach(function (cluster, clusterIdx) {
var clusterNode = {}, var clusterNode = {},
parentNode = []; parentNode = [];
if (envIdx == 0 && clusterIdx == 0){ //default selection from session storage or first env & first cluster
if (pageContext.env == env.env && pageContext.clusterName == cluster.name) {
clusterNode.state = {}; clusterNode.state = {};
clusterNode.state.selected = true; clusterNode.state.selected = true;
} }
clusterNode.text = cluster.name; clusterNode.text = cluster.name;
// clusterNode.icon = 'glyphicon glyphicon-object-align-vertical';
parentNode.push(node.text); parentNode.push(node.text);
clusterNode.tags = ['集群']; clusterNode.tags = ['集群'];
clusterNode.parentNode = parentNode; clusterNode.parentNode = parentNode;
...@@ -83,10 +87,19 @@ application_module.controller("ConfigBaseInfoController", ...@@ -83,10 +87,19 @@ application_module.controller("ConfigBaseInfoController",
$rootScope.pageContext.clusterName = $rootScope.pageContext.clusterName =
'default'; 'default';
} else {//second cluster node } else {//second cluster node
$rootScope.pageContext.env = data.parentNode[0]; $rootScope.pageContext.env =
data.parentNode[0];
$rootScope.pageContext.clusterName = $rootScope.pageContext.clusterName =
data.text; data.text;
} }
//storage scene
sessionStorage.setItem(
$rootScope.pageContext.appId,
JSON.stringify({
env: $rootScope.pageContext.env,
cluster: $rootScope.pageContext.clusterName
}));
$rootScope.refreshNamespaces(); $rootScope.refreshNamespaces();
} }
}); });
...@@ -135,15 +148,15 @@ application_module.controller("ConfigBaseInfoController", ...@@ -135,15 +148,15 @@ application_module.controller("ConfigBaseInfoController",
PermissionService.has_create_namespace_permission(appId).then(function (result) { PermissionService.has_create_namespace_permission(appId).then(function (result) {
$scope.hasCreateNamespacePermission = result.hasPermission; $scope.hasCreateNamespacePermission = result.hasPermission;
}, function (result) { }, function (result) {
}); });
PermissionService.has_create_cluster_permission(appId).then(function (result) { PermissionService.has_create_cluster_permission(appId).then(function (result) {
$scope.hasCreateClusterPermission = result.hasPermission; $scope.hasCreateClusterPermission = result.hasPermission;
}, function (result) { }, function (result) {
}); });
PermissionService.has_assign_user_permission(appId).then(function (result) { PermissionService.has_assign_user_permission(appId).then(function (result) {
$scope.hasAssignUserPermission = result.hasPermission; $scope.hasAssignUserPermission = result.hasPermission;
}, function (result) { }, function (result) {
......
apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js
浏览文件 @ 9f15c41d
...@@ -14,7 +14,6 @@ release_history_module.controller("ReleaseHistoryController", ...@@ -14,7 +14,6 @@ release_history_module.controller("ReleaseHistoryController",
$scope.page = 0; $scope.page = 0;
$scope.releases = []; $scope.releases = [];
$scope.hasLoadAll = false; $scope.hasLoadAll = false;
$scope.findReleases = findReleases; $scope.findReleases = findReleases;
$scope.loadMore = loadMore; $scope.loadMore = loadMore;
...@@ -32,7 +31,13 @@ release_history_module.controller("ReleaseHistoryController", ...@@ -32,7 +31,13 @@ release_history_module.controller("ReleaseHistoryController",
$scope.hasLoadAll = true; $scope.hasLoadAll = true;
return; return;
} }
var hasParseNamepaceType = false;
result.forEach(function (release) { result.forEach(function (release) {
if (!hasParseNamepaceType){
$scope.isTextFile = /\.(json|yaml|yml|xml)$/gi.test(release.baseInfo.namespaceName);
hasParseNamepaceType = true;
}
$scope.releases.push(release); $scope.releases.push(release);
}) })
}, function (result) { }, function (result) {
......
apollo-portal/src/main/resources/static/styles/common-style.css
浏览文件 @ 9f15c41d
...@@ -395,6 +395,14 @@ table th { ...@@ -395,6 +395,14 @@ table th {
padding-left: 20px; padding-left: 20px;
} }
.release-history .panel-body .load-more{
margin-top: 20px;
}
.release-history .media-body textarea{
margin-top: 10px;
}
.release-history .icon{ .release-history .icon{
font-size: 13px; font-size: 13px;
} }
......
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
浏览文件 @ 9f15c41d
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</header> </header>
<!--text view--> <!--text view-->
<!--只读模式下的文本内容,不替换换行符--> <!--只读模式下的文本内容,不替换换行符-->
<textarea class="form-control" rows="{{namespace.itemCnt}}" style="border-radius: 0px" <textarea class="form-control no-radius" rows="{{namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-show="namespace.viewType == 'text' && !namespace.isTextEditing"
ng-disabled="!namespace.isTextEditing" ng-model="namespace.text" ng-disabled="!namespace.isTextEditing" ng-model="namespace.text"
ng-bind="namespace.text"> ng-bind="namespace.text">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或