Merge pull request #367 from lepdou/0801_0805

fix namespace name no error message

apollo-portal/src/main/resources/static/namespace.html

@@ -35,12 +35,17 @@
 
                     <div class="row text-right" style="padding-right: 20px;">
                         <div class="btn-group btn-group-sm" role="group" aria-label="...">
-                            <button type="button" class="btn btn-default" ng-class="{active:type=='link'}" ng-click="switchType('link')">关联已存在的Namespace</button>
-                            <button type="button" class="btn btn-default" ng-class="{active:type=='create'}" ng-click="switchType('create')">创建新的Namespace</button>
+                            <button type="button" class="btn btn-default" ng-class="{active:type=='link'}"
+                                    ng-click="switchType('link')">关联已存在的Namespace
+                            </button>
+                            <button type="button" class="btn btn-default" ng-class="{active:type=='create'}"
+                                    ng-click="switchType('create')">创建新的Namespace
+                            </button>
                         </div>
                     </div>
 
-                    <form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace" style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()">
+                    <form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace"
+                          style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()">
                         <div class="form-group">
                             <label class="col-sm-3 control-label">应用ID</label>
                             <div class="col-sm-6" valdr-form-group>
@@ -63,24 +68,22 @@
                                 <apollorequiredfiled></apollorequiredfiled>
                                 名称</label>
                             <div class="col-sm-4" valdr-form-group>
-                                <div class="input-group" ng-show="appNamespace.isPublic">
-                                    <span class="input-group-addon" ng-bind="appBaseInfo.namespacePrefix"></span>
-                                    <input type="text" name="namespaceName" class="form-control" ng-model="appNamespace.name"
-                                           ng-required="type == 'create'">
-                                </div>
-                                <div ng-show="!appNamespace.isPublic">
-                                    <input type="text" name="namespaceName" class="form-control" ng-model="appNamespace.name"
-                                           ng-required="type == 'create'">
+                                <div ng-class="{'input-group':appNamespace.isPublic}">
+                                    <span class="input-group-addon" ng-show="appNamespace.isPublic"
+                                          ng-bind="appBaseInfo.namespacePrefix"></span>
+                                    <input type="text" name="namespaceName" class="form-control"
+                                           ng-model="appNamespace.name">
                                 </div>
                             </div>
                             <div class="col-sm-2" ng-if="hasRootPermission">
-                                <select class="form-control" ng-model="appNamespace.format">
+                                <select class="form-control" name="format" ng-model="appNamespace.format">
                                     <option value="properties">properties</option>
                                     <option value="xml">xml</option>
                                 </select>
                             </div>
 
-                            <span ng-show="appNamespace.isPublic" ng-bind="concatNamespace()" style="line-height: 34px;"></span>
+                            <span ng-show="appNamespace.isPublic" ng-bind="concatNamespace()"
+                                  style="line-height: 34px;"></span>
                         </div>
                         <div class="form-group" ng-show="type == 'create' && hasRootPermission">
                             <label class="col-sm-3 control-label">
@@ -88,17 +91,20 @@
                                 类型</label>
                             <div class="col-sm-4" valdr-form-group>
                                 <label class="radio-inline">
-                                    <input type="radio" name="namespaceType" value="true" ng-value="true" ng-model="appNamespace.isPublic"> public
+                                    <input type="radio" name="namespaceType" value="true" ng-value="true"
+                                           ng-model="appNamespace.isPublic"> public
                                 </label>
                                 <label class="radio-inline">
-                                    <input type="radio" name="namespaceType" value="false" ng-value="false" ng-model="appNamespace.isPublic"> private
+                                    <input type="radio" name="namespaceType" value="false" ng-value="false"
+                                           ng-model="appNamespace.isPublic"> private
                                 </label>
                             </div>
                         </div>
                         <div class="form-group" ng-show="type == 'create'" valdr-form-group>
                             <label class="col-sm-3 control-label">备注</label>
                             <div class="col-sm-7" valdr-form-group>
-                                <textarea class="form-control" rows="3" name="comment" ng-model="appNamespace.comment"></textarea>
+                                <textarea class="form-control" rows="3" name="comment"
+                                          ng-model="appNamespace.comment"></textarea>
                             </div>
                         </div>
                         <div class="form-group" ng-show="type == 'link'">
@@ -114,7 +120,9 @@
 
                         <div class="form-group">
                             <div class="col-sm-offset-3 col-sm-10">
-                                <button type="submit" class="btn btn-primary" ng-disabled="namespaceForm.$invalid || submitBtnDisabled">提交</button>
+                                <button type="submit" class="btn btn-primary"
+                                        ng-disabled="namespaceForm.$invalid || submitBtnDisabled">提交
+                                </button>
                             </div>
                         </div>
                     </form>