Skip to content

A
apollo
Switch branch/tag
Find file
Normal viewHistoryPermalink
config.html 27.4 KB
Newer Older
增加portal前端页面&创建app功能
a93c46da
 
lepdou committed
1 2 3 4 5 6 
<!DOCTYPE html>
<html data-ng-app="application">

<head>
    <meta charset="UTF-8">
    <title>apollo</title>
add namespace
f2c7de85
 
lepdou committed
7 8 9 10 
    <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
    <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
    <link rel="stylesheet" type="text/css" href="styles/common-style.css">
增加portal前端页面&创建app功能
a93c46da
 
lepdou committed
11 12 13 14 
</head>

<body>
navbar search app
0d55b812
 
lepdou committed
15 
<apollonav></apollonav>
portal v2
26cb8582
 
lepdou committed
16
diff show deleted item & clogging
7e7a7959
 
lepdou committed
17 18 19 20 21 22 
<div class="container-fluid apollo-container app" id="config-info">

    <!--具体配置信息-->
    <div class="row config-info-container">

        <!--tag导航-->
style change for responsiveness
9a6c7ae6
 
Jason Song committed
23 
        <div class="col-md-3 col-xs-3 col-sm-3" ng-controller="ConfigBaseInfoController">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
24 25 26 27 28 
            <div id="treeview"></div>
            <!--app info-->
            <section class="panel">
                <header class="panel-heading">
                    <img src="img/info.png" class="i-25-20"/> 应用信息
add miss envs
6698804e
 
lepdou committed
29 30 31 
                            <span class="tools pull-right">
                                <a href="javascript:;" class="icon-chevron-down"></a>
                            </span>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
32 33 34 
                </header>
                <div class="panel-body">
                    <table class="project-info">
用户打点& 多处优化
4818f2a8
 
lepdou committed
35 
                        <tbody class="text-left">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
36 
                        <tr>
app and namespace standard
7bdfe80e
 
Jason Song committed
37 
                            <th>AppId:</th>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
38 39 40 41 42 43 44 
                            <td ng-bind="appBaseInfo.appId"></td>
                        </tr>
                        <tr>
                            <th>应用名:</th>
                            <td ng-bind="appBaseInfo.name"></td>
                        </tr>
                        <tr>
app and namespace standard
7bdfe80e
 
Jason Song committed
45 46 47 48 49 
                            <th>部门:</th>
                            <td ng-bind="appBaseInfo.orgInfo"></td>
                        </tr>
                        <tr>
                            <th>负责人:</th>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
50 51 52 
                            <td ng-bind="appBaseInfo.ownerName"></td>
                        </tr>
                        <tr>
app and namespace standard
7bdfe80e
 
Jason Song committed
53 
                            <th>负责人Email:</th>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
54 55 56 57 58 
                            <td ng-bind="appBaseInfo.ownerEmail"></td>
                        </tr>
                        <tr ng-show="missEnvs.length > 0">
                            <th>缺失的环境:</th>
                            <td>
{{}} 改成ng-bind
1aa251f1
 
lepdou committed
59 60 
                                        <span ng-repeat="env in missEnvs" ng-bind="env">
                                        </span>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
61 62 63 64 
                            </td>
                        </tr>
                        </tbody>
                    </table>
portal v2
26cb8582
 
lepdou committed
65
diff show deleted item & clogging
7e7a7959
 
lepdou committed
66 67 
                </div>
            </section>
release history & 多处优化
7f6ed42b
 
lepdou committed
68 
            <a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
style change for responsiveness
9a6c7ae6
 
Jason Song committed
69 70 
                <div class="row icon-text icon-plus-orange">
                    <p class="btn-title ng-binding">补缺环境</p>
release history & 多处优化
7f6ed42b
 
lepdou committed
71 72 
                </div>
            </a>
config页面拆分controller
69c97acd
 
lepdou committed
73
style change for responsiveness
9a6c7ae6
 
Jason Song committed
74 
            <apolloentrance apollo-title="'添加集群'" apollo-img-src="'plus-orange'"
add cluster
6cd90c16
 
lepdou committed
75 76 
                            apollo-href="'cluster.html?#/appid=' + pageContext.appId"></apolloentrance>
style change for responsiveness
9a6c7ae6
 
Jason Song committed
77 
            <apolloentrance apollo-title="'添加Namespace'" apollo-img-src="'plus-orange'"
release history & 多处优化
7f6ed42b
 
lepdou committed
78 
                            apollo-href="'namespace.html?#/appid=' + pageContext.appId"
add cluster
6cd90c16
 
lepdou committed
79 80 
                            ng-show="hasCreateNamespacePermission"></apolloentrance>
style change for responsiveness
9a6c7ae6
 
Jason Song committed
81 
            <apolloentrance apollo-title="'项目权限'" apollo-img-src="'user-manage'"
add cluster
6cd90c16
 
lepdou committed
82 83 
                            apollo-href="'/app/role.html?#/appid=' + pageContext.appId"
                            ng-show="hasAssignUserPermission"></apolloentrance>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
84 85 86 87 
            </section>


        </div>
portal can load data
4fd1f9a2
 
lepdou committed
88
diff show deleted item & clogging
7e7a7959
 
lepdou committed
89 
        <!--namespaces-->
style change for responsiveness
9a6c7ae6
 
Jason Song committed
90 
        <div class="col-md-9 col-xs-9 col-sm-9 config-item-container hide" ng-controller="ConfigNamespaceController">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
91 
            <div ng-repeat="namespace in namespaces">
namespace as file
5c6081a0
 
lepdou committed
92 93 94 95 
                <apollonspanel namespace="namespace" app-id="pageContext.appId"
                               env="pageContext.env" cluster="pageContext.clusterName"
                               pre-release-ns="prepareReleaseNamespace"
                               create-item="createItem" edit-item="editItem"
rollback
e56f0a7a
 
lepdou committed
96 
                               pre-delete-item="preDeleteItem" commit-change="commitChange"
rollback 优化
83ae4032
 
lepdou committed
97 
                               pre-rollback="preRollback"></apollonspanel>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
98 
            </div>
portal can edit config
7b596e07
 
lepdou committed
99
diff show deleted item & clogging
7e7a7959
 
lepdou committed
100 
            <!-- delete modal-->
权限管理 & bugfix
4db23ba8
 
lepdou committed
101 102 103 104 
            <apolloconfirmdialog apollo-dialog-id="'deleteConfirmDialog'" apollo-title="'删除配置'"
                                 apollo-detail="'确定要删除配置吗?'" apollo-confirm="deleteItem"></apolloconfirmdialog>

            <apolloconfirmdialog apollo-dialog-id="'releaseNoPermissionDialog'" apollo-title="'发布'"
多处细节优化
9f2ea7d6
 
lepdou committed
105 
                                 apollo-detail="'您没有发布权限哦~ 请找 ' + masterUsers + ' 分配权限'"
权限管理 & bugfix
4db23ba8
 
lepdou committed
106 
                                 apollo-show-cancel-btn="false"></apolloconfirmdialog>
优化多处细节&bugfix&表格模式可以删除key
b75a4359
 
lepdou committed
107
namespace 一次发布只能被一个人修改
10878415
 
lepdou committed
108 109 110 111 112 113 114 
            <apolloconfirmdialog apollo-dialog-id="'namespaceLockedDialog'" apollo-title="'编辑受限'"
                                 apollo-detail="'当前namespace正在被 ' + lockOwner + ' 编辑, 一次发布只能被一个人修改.'"
                                 apollo-show-cancel-btn="false"></apolloconfirmdialog>

            <apolloconfirmdialog apollo-dialog-id="'releaseDenyDialog'" apollo-title="'发布受限'"
                                 apollo-detail="'您不能发布哟~ 编辑和发布不能为同一个人'"
                                 apollo-show-cancel-btn="false"></apolloconfirmdialog>
rollback
e56f0a7a
 
lepdou committed
115
rollback 优化
83ae4032
 
lepdou committed
116 117 118 
            <apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'" apollo-title="'回滚'"
                                 apollo-detail="'确定要回滚吗?'"
                                 apollo-show-cancel-btn="true" apollo-confirm="rollback"></apolloconfirmdialog>
rollback
e56f0a7a
 
lepdou committed
119 120
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
121 122 123 
            <!--create release modal-->
            <form class="modal fade form-horizontal" name="releaseForm" valdr-type="Release" id="releaseModal"
                  tabindex="-1" role="dialog"
diff show deleted item & clogging
7e7a7959
 
lepdou committed
124 125 126 127 128 129 130 131 132 133 
                  ng-submit="release()">
                <div class="modal-dialog" role="document" style="width: 960px">
                    <div class="modal-content">
                        <div class="modal-header panel-primary">
                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                                    aria-hidden="true">&times;</span></button>
                            <h4 class="modal-title">发布</h4>
                        </div>
                        <div class="modal-body">
                            <div class="form-group">
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
134 135 136 137 138 139 140 141 142 143 144 145 146 
                                <div class="col-sm-2 control-label" ng-if="!toReleaseNamespace.isPropertiesFormat">
                                    <div class="row">
                                        <div class="btn-group btn-group-xs" style="padding-right: 10px" role="group">
                                            <button type="button" class="btn btn-default" ng-class="{active:releaseChangeViewType=='change'}"
                                                    ng-click="switchReleaseChangeViewType('change')">查看变更
                                            </button>
                                            <button type="button" class="btn btn-default" ng-class="{active:releaseChangeViewType=='release'}"
                                                    ng-click="switchReleaseChangeViewType('release')">发布的值
                                            </button>
                                        </div>
                                    </div>
                                </div>
                                <label class="col-sm-2 control-label" ng-if="toReleaseNamespace.isPropertiesFormat">Changes</label>
用户打点& 多处优化
4818f2a8
 
lepdou committed
147 
                                <div class="col-sm-10" ng-if="toReleaseNamespace.itemModifiedCnt" valdr-form-group>
namespace as file
5c6081a0
 
lepdou committed
148 149 

                                    <!--properites format-->
diff show deleted item & clogging
7e7a7959
 
lepdou committed
150 
                                    <table class="table table-bordered table-striped text-center table-hover"
namespace as file
5c6081a0
 
lepdou committed
151 152 
                                           ng-show="toReleaseNamespace.itemModifiedCnt"
                                           ng-if="toReleaseNamespace.isPropertiesFormat">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 
                                        <thead>
                                        <tr>
                                            <th>
                                                Key
                                            </th>
                                            <th>
                                                Old Value
                                            </th>
                                            <th>
                                                New Value
                                            </th>
                                            <th>
                                                最后修改人
                                            </th>
                                            <th>
                                                最后修改时间
                                            </th>
                                        </tr>
                                        </thead>
                                        <tbody>

                                        <tr ng-repeat="config in toReleaseNamespace.items"
                                            ng-if="config.item.key && config.isModified">
                                            <td width="20%" title="{{config.item.key}}">
                                                        <span class="label label-danger"
判断是否添加重复key的时候,过滤掉已删除并且发布过的配置
7d90bee5
 
lepdou committed
178 
                                                              ng-show="config.isDeleted">deleted</span>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
179 180 181 182 183 184 185 186 187 188 189 
                                                <span ng-bind="config.item.key | limitTo: 250"></span>
                                                <span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
                                            </td>
                                            <td width="25%" title="{{config.oldValue}}">
                                                <span ng-bind="config.oldValue | limitTo: 250"></span>
                                                <span ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
                                            </td>
                                            <td width="25%" title="{{config.newValue}}">
                                                <span ng-bind="config.newValue | limitTo: 250"></span>
                                                <span ng-bind="config.newValue.length > 250 ? '...': ''"></span>
                                            </td>
同步配置优化
aad80f8a
 
lepdou committed
190 
                                            <td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
191 192 
                                            </td>
                                            <td width="15%"
同步配置优化
aad80f8a
 
lepdou committed
193 
                                                ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
194 195 196 197 
                                            </td>
                                        </tr>
                                        </tbody>
                                    </table>
namespace as file
5c6081a0
 
lepdou committed
198 199 200 

                                    <!--file format -->
                                    <div ng-repeat="item in toReleaseNamespace.items"
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
201 202 203 204 205 206 
                                         ng-if="!toReleaseNamespace.isPropertiesFormat" ng-show="releaseChangeViewType=='change'">
                                        <apollodiff old-str="item.oldValue" new-str="item.newValue"
                                                    apollo-id="'releaseStrDiff'"></apollodiff>
                                    </div>
                                    <div ng-repeat="item in toReleaseNamespace.items"
                                         ng-if="!toReleaseNamespace.isPropertiesFormat" ng-show="releaseChangeViewType=='release'">
namespace as file
5c6081a0
 
lepdou committed
207 
                                        <textarea class="form-control" rows="20" style="border-radius: 0px"
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
208 209 
                                        ng-disabled="true" ng-show="item.newValue" ng-bind="item.newValue">
                                        </textarea>
namespace as file
5c6081a0
 
lepdou committed
210 211 
                                    </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
212 
                                </div>
用户打点& 多处优化
4818f2a8
 
lepdou committed
213 
                                <div class="col-sm-5" valdr-form-group>
release history & 多处优化
7f6ed42b
 
lepdou committed
214 
                                    <span ng-show="!toReleaseNamespace.itemModifiedCnt">
namespace as file
5c6081a0
 
lepdou committed
215 216 
                                        配置没有变化
                                    </span>
release history & 多处优化
7f6ed42b
 
lepdou committed
217 
                                </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
218 219 220 221 222 
                            </div>
                            <div class="form-group">
                                <label class="col-sm-2 control-label">
                                    <apollorequiredfiled></apollorequiredfiled>
                                    Release Name:</label>
用户打点& 多处优化
4818f2a8
 
lepdou committed
223 
                                <div class="col-sm-5" valdr-form-group>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
224 225 
                                    <input type="text" name="releaseName" class="form-control"
                                           placeholder="input release name"
diff show deleted item & clogging
7e7a7959
 
lepdou committed
226 227 228 229 230 
                                           ng-model="releaseTitle" ng-required="true">
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-2 control-label">Comment:</label>
用户打点& 多处优化
4818f2a8
 
lepdou committed
231 
                                <div class="col-sm-10" valdr-form-group>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
232 233 
                                            <textarea rows="4" name="comment" class="form-control"
                                                      style="margin-top: 15px;"
table view cru
6aaa2773
 
lepdou committed
234 235 
                                                      ng-model="releaseComment"
                                                      placeholder="Add an optional extended description..."></textarea>
config页面拆分controller
69c97acd
 
lepdou committed
236 237 
                                </div>
                            </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
238 239 240 241 242 


                        </div>
                        <div class="modal-footer">
                            <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
243 244 
                            <button type="submit" class="btn btn-primary"
                                    ng-disabled="releaseForm.$invalid || releaseBtnDisabled">发布
diff show deleted item & clogging
7e7a7959
 
lepdou committed
245 
                            </button>
config页面拆分controller
69c97acd
 
lepdou committed
246 
                        </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
247 248 249 250 251 
                    </div>
                </div>
            </form>

            <!--table mode item modal-->
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
252 253 
            <form class="modal fade form-horizontal" name="itemForm" valdr-type="Item" id="itemModal" role="dialog"
                  ng-submit="doItem()">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
254 255 256 
                <div class="modal-dialog" role="document">
                    <div class="modal-content">
                        <div class="modal-header panel-primary">
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
257 258 
                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"
                                    ng-click="cancelEdit()"><span
diff show deleted item & clogging
7e7a7959
 
lepdou committed
259 260 261 262 263 264 265 266 267 268 
                                    aria-hidden="true">&times;</span></button>
                            <h4 class="modal-title">
                                <span ng-show="tableViewOperType == 'create'"> 添加配置项</span>
                                <span ng-show="tableViewOperType == 'update'"> 修改配置项</span>
                            </h4>
                        </div>
                        <div class="modal-body">
                            <div class="form-group">
                                <label class="col-sm-2 control-label">
                                    <apollorequiredfiled
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
269 
                                            ng-show="tableViewOperType == 'create'"></apollorequiredfiled>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
270 271 
                                    Key
                                </label>
用户打点& 多处优化
4818f2a8
 
lepdou committed
272 273 
                                <div class="col-sm-10" valdr-form-group>
                                    <input type="text" name="key" class="form-control" ng-model="item.key"
diff show deleted item & clogging
7e7a7959
 
lepdou committed
274 
                                           ng-required="true" ng-disabled="tableViewOperType != 'create'">
config页面拆分controller
69c97acd
 
lepdou committed
275 
                                </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
276 277 278 
                            </div>
                            <div class="form-group">
                                <label class="col-sm-2 control-label">
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
279 
                                    <apollorequiredfiled></apollorequiredfiled>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
280 281 
                                    Value
                                </label>
用户打点& 多处优化
4818f2a8
 
lepdou committed
282 
                                <div class="col-sm-10" valdr-form-group>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
283 284 
                                            <textarea type="text" name="value" class="form-control" rows="6"
                                                      ng-model="item.value">
table view cru
6aaa2773
 
lepdou committed
285 
                                                </textarea>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
286 287 288 289 
                                </div>
                            </div>
                            <div class="form-group">
                                <label class="col-sm-2 control-label">Comment</label>
用户打点& 多处优化
4818f2a8
 
lepdou committed
290 
                                <div class="col-sm-10" valdr-form-group>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
291 292 
                                            <textarea class="form-control" name="comment" ng-model="item.comment"
                                                      rows="2">
table view cru
6aaa2773
 
lepdou committed
293 
                                            </textarea>
config页面拆分controller
69c97acd
 
lepdou committed
294 
                                </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
295 
                            </div>
Merge branch 'bugfix_0811' into 'release'
e0080b69
 
vss宋顺 committed
296 
                            <div class="form-group" ng-show="tableViewOperType == 'create'">
diff show deleted item & clogging
7e7a7959
 
lepdou committed
297 298 299 300 301 302 303 304 305 306 307 
                                <label class="col-sm-2 control-label">
                                    <apollorequiredfiled></apollorequiredfiled>
                                    选择集群</label>
                                <div class="col-sm-10">
                                    <apolloclusterselector apollo-app-id="pageContext.appId"
                                                           apollo-default-all-checked="false"
                                                           apollo-default-checked-env="pageContext.env"
                                                           apollo-default-checked-cluster="pageContext.clusterName"
                                                           apollo-select="collectSelectedClusters">

                                    </apolloclusterselector>
config页面拆分controller
69c97acd
 
lepdou committed
308 
                                </div>
add miss envs
6698804e
 
lepdou committed
309 310 
                            </div>
                        </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
311 312 
                        <div class="modal-footer">
                            </button>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
313 314 
                            <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="cancelEdit()">
                                关闭
diff show deleted item & clogging
7e7a7959
 
lepdou committed
315 316 
                            </button>
                            <button type="submit" class="btn btn-primary"
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
317 318 
                                    ng-disabled="itemForm.$invalid || (addItemBtnDisabled && tableViewOperType == 'create')">
                                提交
diff show deleted item & clogging
7e7a7959
 
lepdou committed
319 320 321 
                            </button>
                        </div>
                    </div>
add miss envs
6698804e
 
lepdou committed
322 
                </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
323 
            </form>
rollback
e56f0a7a
 
lepdou committed
324 325 326 

            <!--rollback-->
            <form class="modal fade form-horizontal" id="rollbackModal" tabindex="-1" role="dialog"
rollback 优化
83ae4032
 
lepdou committed
327 
                  ng-submit="showRollbackAlertDialog()">
rollback
e56f0a7a
 
lepdou committed
328 329 330 331 332 
                <div class="modal-dialog" role="document" style="width: 960px">
                    <div class="modal-content">
                        <div class="modal-header panel-primary">
                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                                    aria-hidden="true">&times;</span></button>
rollback 优化
83ae4032
 
lepdou committed
333 
                            <div class="modal-title text-center">
rollback
e56f0a7a
 
lepdou committed
334 335 336 337 
                                <span style="font-size: 18px;" ng-bind="firstRelease.name"></span>
                                <span style="font-size: 18px;"> &nbsp;回滚到&nbsp;</span>
                                <span style="font-size: 18px;" ng-bind="secondRelease.name"></span>
                            </div>
rollback 优化
83ae4032
 
lepdou committed
338 339 340 341 342 343 344 
                        </div>
                        <div class="modal-body">
                            <div class="alert alert-warning" role="alert">
                                此操作将会回滚到上一个发布版本，且当前版本作废，但不影响正在修改的配置。可在发布历史页面查看当前生效的版本
                                <a target="_blank"
                                   href="/config/history.html?#/appid={{toRollbackNamespace.baseInfo.appId}}&env={{pageContext.env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">点击查看</a>
                            </div>
rollback
e56f0a7a
 
lepdou committed
345 346 

                            <div class="form-group" style="margin-top: 15px;">
rollback 优化
83ae4032
 
lepdou committed
347 348 349 350 351 
                                <!--properties format-->
                                <div class="col-sm-12"
                                     ng-if="releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
                                    <table class="table table-bordered table-striped text-center table-hover"
                                           ng-if="toRollbackNamespace.isPropertiesFormat">
rollback
e56f0a7a
 
lepdou committed
352 353 
                                        <thead>
                                        <tr>
rollback 优化
83ae4032
 
lepdou committed
354 355 356 
                                            <th>
                                                Type
                                            </th>
rollback
e56f0a7a
 
lepdou committed
357 358 359 360 361 362 363 364 365 366 367 368 369 
                                            <th>
                                                Key
                                            </th>
                                            <th>
                                                回滚前
                                            </th>
                                            <th>
                                                回滚后
                                            </th>
                                        </tr>
                                        </thead>
                                        <tbody>
rollback 优化
83ae4032
 
lepdou committed
370 371 
                                        <tr ng-repeat="change in releaseCompareResult">
                                            <td width="10%">
update
c18edfac
 
lepdou committed
372 373 374 
                                                <span ng-show="change.type == 'ADDED'">新增</span>
                                                <span ng-show="change.type == 'MODIFIED'">更新</span>
                                                <span ng-show="change.type == 'DELETED'">删除</span>
rollback 优化
83ae4032
 
lepdou committed
375 376 
                                            </td>
                                            <td width="20%" ng-bind="change.entity.firstEntity.key">
rollback
e56f0a7a
 
lepdou committed
377 378 

                                            </td>
rollback 优化
83ae4032
 
lepdou committed
379 
                                            <td width="35%" ng-bind="change.entity.firstEntity.value">
rollback
e56f0a7a
 
lepdou committed
380 
                                            </td>
rollback 优化
83ae4032
 
lepdou committed
381 
                                            <td width="35%" ng-bind="change.entity.secondEntity.value">
rollback
e56f0a7a
 
lepdou committed
382 383 384 385 386 
                                            </td>
                                        </tr>
                                        </tbody>
                                    </table>
                                </div>
rollback 优化
83ae4032
 
lepdou committed
387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 

                                <!--file format -->
                                <div class="col-sm-12"
                                     ng-if="releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
                                    <div ng-repeat="change in releaseCompareResult"
                                         ng-if="!toRollbackNamespace.isPropertiesFormat">
                                        <h5>回滚前</h5>
                                        <textarea class="form-control no-radius" rows="20"
                                                  ng-disabled="true" ng-bind="change.entity.firstEntity.value">
                                            </textarea>
                                        <hr>
                                        <h5>回滚后</h5>
                                        <textarea class="form-control no-radius" rows="20"
                                                  ng-disabled="true" ng-bind="change.entity.secondEntity.value">
                                            </textarea>
                                    </div>

                                </div>
                                <div class="col-sm-12 text-center" ng-if="releaseCompareResult.length == 0">
                                    <h4>
rollback
e56f0a7a
 
lepdou committed
407 
                                        配置没有变化
rollback 优化
83ae4032
 
lepdou committed
408 
                                    </h4>
rollback
e56f0a7a
 
lepdou committed
409 410 411 412 413 414 415 416 
                                </div>
                            </div>


                        </div>
                        <div class="modal-footer">
                            <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
                            <button type="submit" class="btn btn-danger" ng-if="releaseCompareResult.length > 0"
rollback 优化
83ae4032
 
lepdou committed
417 
                                    ng-disabled="rollbackBtnDisabled">回滚
rollback
e56f0a7a
 
lepdou committed
418 419 420 421 422 423 
                            </button>
                        </div>
                    </div>
                </div>
            </form>
add miss envs
6698804e
 
lepdou committed
424 
        </div>
diff show deleted item & clogging
7e7a7959
 
lepdou committed
425 
    </div>
sync items
e8150525
 
lepdou committed
426
table view cru
6aaa2773
 
lepdou committed
427
portal can load data
4fd1f9a2
 
lepdou committed
428 429 
</div>
文本view
7fc51e61
 
lepdou committed
430
add namespace
f2c7de85
 
lepdou committed
431 
<div ng-include="'views/common/footer.html'"></div>
增加portal前端页面&创建app功能
a93c46da
 
lepdou committed
432
文本view
7fc51e61
 
lepdou committed
433
portal v2
26cb8582
 
lepdou committed
434 
<!-- jquery.js -->
replace jquery.js to jquery.min.js
4562308d
 
lepdou committed
435 
<script src="vendor/jquery.min.js" type="text/javascript"></script>
portal v2
26cb8582
 
lepdou committed
436 437 

<!--lodash.js-->
add namespace
f2c7de85
 
lepdou committed
438 
<script src="vendor/lodash.min.js" type="text/javascript"></script>
portal v2
26cb8582
 
lepdou committed
439
首页环境切换 & app主页显示app基本信息 & 样式优化
0f8aa333
 
lepdou committed
440 
<!--nicescroll-->
add namespace
f2c7de85
 
lepdou committed
441 
<script src="vendor/jquery.nicescroll.min.js"></script>
首页环境切换 & app主页显示app基本信息 & 样式优化
0f8aa333
 
lepdou committed
442
增长loading bar和toast组件
c7a6f769
 
lepdou committed
443 
<!--angular-->
add namespace
f2c7de85
 
lepdou committed
444 445 446 447 448 
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-ui-router.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
增长loading bar和toast组件
c7a6f769
 
lepdou committed
449 450 

<!-- bootstrap.js -->
add namespace
f2c7de85
 
lepdou committed
451 452 
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/bootstrap/js/bootstrap-treeview.min.js" type="text/javascript"></script>
增长loading bar和toast组件
c7a6f769
 
lepdou committed
453
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
454 455 
<script src="vendor/diff.min.js" type="text/javascript"></script>
优化多处细节&bugfix&表格模式可以删除key
b75a4359
 
lepdou committed
456
用户打点& 多处优化
4818f2a8
 
lepdou committed
457 458 459 460 
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
增长loading bar和toast组件
c7a6f769
 
lepdou committed
461 
<!--biz script-->
add namespace
f2c7de85
 
lepdou committed
462 
<script type="application/javascript" src="scripts/app.js"></script>
portal v2
26cb8582
 
lepdou committed
463 464 

<!--service-->
add namespace
f2c7de85
 
lepdou committed
465 
<script type="application/javascript" src="scripts/services/AppService.js"></script>
navbar search app
0d55b812
 
lepdou committed
466 
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
接入sso
fdfd4fff
 
lepdou committed
467 
<script type="application/javascript" src="scripts/services/UserService.js"></script>
add namespace
f2c7de85
 
lepdou committed
468 
<script type="application/javascript" src="scripts/services/ConfigService.js"></script>
release history & 多处优化
7f6ed42b
 
lepdou committed
469 
<script type="application/javascript" src="scripts/services/ReleaseService.js"></script>
权限管理 & bugfix
4db23ba8
 
lepdou committed
470 
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
commit history & bugfix empty value
60a5a27f
 
lepdou committed
471 
<script type="application/javascript" src="scripts/services/CommitService.js"></script>
namespace 一次发布只能被一个人修改
10878415
 
lepdou committed
472 
<script type="application/javascript" src="scripts/services/NamespaceLockService.js"></script>
细节优化
4c015ec4
 
lepdou committed
473 474
add namespace
f2c7de85
 
lepdou committed
475 
<script type="application/javascript" src="scripts/AppUtils.js"></script>
portal v2
26cb8582
 
lepdou committed
476
navbar search app
0d55b812
 
lepdou committed
477 
<!--directive-->
namespace as file
5c6081a0
 
lepdou committed
478 479 
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/directive/namespace-panel-directive.js"></script>
add delete cluster and namespace rest api
6c7e3c4c
 
lepdou committed
480 
<script type="application/javascript" src="scripts/directive/diff-directive.js"></script>
navbar search app
0d55b812
 
lepdou committed
481
portal v2
26cb8582
 
lepdou committed
482 
<!--controller-->
fix when namespace.lock.switch off
75199e3b
 
lepdou committed
483 484 
<script type="application/javascript" src="scripts/controller/config/ConfigNamespaceController.js"></script>
<script type="application/javascript" src="scripts/controller/config/ConfigBaseInfoController.js"></script>
增加portal前端页面&创建app功能
a93c46da
 
lepdou committed
485
add namespace
f2c7de85
 
lepdou committed
486 
<script type="application/javascript" src="scripts/PageCommon.js"></script>
首页环境切换 & app主页显示app基本信息 & 样式优化
0f8aa333
 
lepdou committed
487
用户打点& 多处优化
4818f2a8
 
lepdou committed
488 
<script src="scripts/valdr.js" type="text/javascript"></script>
增加portal前端页面&创建app功能
a93c46da
 
lepdou committed
489 490 
</body>
</html>