From 511e1302de06d2d8dbd512296bd3e0b3ff97c380 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Mon, 9 Jan 2017 11:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B1=87=E6=80=BB=E5=BA=93?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=E5=8F=96=E6=B6=88=E5=86=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E4=B8=8A=E6=AC=A1=E7=BC=96=E8=BE=91=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/configs/html/kubeClusterSetting.html | 18 ++++++------
 plugins/configs/ts/kubeClusterSetting.ts     | 30 ++++++++++++++++++--
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/plugins/configs/html/kubeClusterSetting.html b/plugins/configs/html/kubeClusterSetting.html
index 4e8d0bc..0a51a04 100644
--- a/plugins/configs/html/kubeClusterSetting.html
+++ b/plugins/configs/html/kubeClusterSetting.html
@@ -29,17 +29,17 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">名称</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control " type="text" ng-model="tableForm.name" name="orcName" ng-minlength="2" ng-maxlength="20" required="required"/>
+                            <input class="system-info-danger-input form-control " type="text" ng-model="tableForm.name" name="orcName" ng-minlength="2" ng-maxlength="20" required="required" ng-focus="tableForm.name=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcName.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcName.$error.required">名称不能为空</span> 
-                                <span role="alert" ng-show="!validForm.orcName.$error.required && validForm.orcName.$invalid">请输入输入2-20个字符的数据名称</span>                 
+                                <span role="alert" ng-show="!validForm.orcName.$error.required && validForm.orcName.$invalid">请输入2-20个字符的数据名称</span>                 
                             </div>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-sm-2 control-label">IP</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.ip" name="orcIP" ng-pattern="/((?:(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d))))/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.ip" name="orcIP" ng-pattern="/((?:(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d))))/" required="required" ng-focus="tableForm.ip=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcIP.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcIP.$error.required">IP不能为空</span>
                                 <span role="alert" ng-show="validForm.orcIP.$error.pattern">请输入正确的IP地址</span>
@@ -49,7 +49,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">端口号</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.port" name="orcPort" ng-pattern="/^([1-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.port" name="orcPort" ng-pattern="/^([1-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/" required="required" ng-focus="tableForm.port=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcPort.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcPort.$error.required">端口号不能为空</span>
                                 <span role="alert" ng-show="validForm.orcPort.$error.pattern">端口号必须为1~65535的数字</span>
@@ -59,7 +59,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">用戶名</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.user" name="orcUser" ng-pattern="/^\w{2,15}$/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.user" name="orcUser" ng-pattern="/^\w{2,15}$/" required="required" ng-focus="tableForm.user=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcUser.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcUser.$error.required">用户名不能为空</span>
                                 <span role="alert" ng-show="validForm.orcUser.$error.pattern">用户名必须为2-15个字母、数字或下划线</span>
@@ -69,7 +69,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">密码</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.password" name="orcPassword" ng-pattern="/^\w{2,15}$/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.password" name="orcPassword" ng-pattern="/^\w{2,15}$/" required="required" ng-focus="tableForm.password=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcPassword.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcPassword.$error.required">密码不能为空</span>
                                 <span role="alert" ng-show="validForm.orcPassword.$error.pattern">密码必须为2-15个字母、数字或下划线</span>
@@ -79,7 +79,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">服务名</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.databaseName" name="orcService" ng-pattern="/^[a-zA-Z]{1,10}$/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.databaseName" name="orcService" ng-pattern="/^[a-zA-Z]{1,10}$/" required="required" ng-focus="tableForm.databaseName=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcService.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcService.$error.required">服务名不能为空</span>
                                 <span role="alert" ng-show="validForm.orcService.$error.pattern">服务名必须为1-10个字母</span>
@@ -89,7 +89,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">表空间名</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.tableName" name="orcTable" ng-pattern="/^\w{1,15}$/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.tableName" name="orcTable" ng-pattern="/^\w{1,15}$/" required="required" ng-focus="tableForm.tableName=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcTable.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcTable.$error.required">表空间名不能为空</span>
                                 <span role="alert" ng-show="validForm.orcTable.$error.pattern">表空间名必须为1-15个字母、数字或下划线</span>
@@ -99,7 +99,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">表后缀名</label>
                         <div class="col-sm-10 sj_form_input">
-                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.suffix" name="orcSuffix" ng-pattern="/^\w{1,10}$/" required="required"/>
+                            <input class="system-info-danger-input form-control" type="text" ng-model="tableForm.suffix" name="orcSuffix" ng-pattern="/^\w{1,10}$/" required="required" ng-focus="tableForm.suffix=''"/>
                             <div class="system-info-danger-red-char form-error" ng-show="validForm.orcSuffix.$invalid && submitted">
                                 <span role="alert" ng-show="validForm.orcSuffix.$error.required">表后缀名不能为空</span>
                                 <span role="alert" ng-show="validForm.orcSuffix.$error.pattern">表后缀名必须为1-10个字母、数字或下划线</span>
diff --git a/plugins/configs/ts/kubeClusterSetting.ts b/plugins/configs/ts/kubeClusterSetting.ts
index ed485a0..b61ed80 100644
--- a/plugins/configs/ts/kubeClusterSetting.ts
+++ b/plugins/configs/ts/kubeClusterSetting.ts
@@ -73,7 +73,15 @@ module Configs{
             $scope.edit = false;
             $scope.tableForm = {};  
             $scope.tableForm["id"]=0; 
-            $scope.tableForm["type"]=0;         
+            $scope.tableForm["type"]=0;
+            $scope.tableForm["name"]='请输入2-20个字符的数据名称';
+            $scope.tableForm["ip"]='例如：0.0.0.0'; 
+            $scope.tableForm["port"]='1~65535';
+            $scope.tableForm["user"]='2-15个字母、数字或下划线';
+            $scope.tableForm["password"]='2-15个字母、数字或下划线'; 
+            $scope.tableForm["databaseName"]='1-10个字母';
+            $scope.tableForm["tableName"]='1-15个字母、数字或下划线';
+            $scope.tableForm["suffix"]='1-10个字母、数字或下划线';
         }
 
         $scope.cancel  = () => {
@@ -83,7 +91,25 @@ module Configs{
             $scope.submitted = false;
         }
 
-        $scope.onSubmit = (oracle) => {                                     
+        $scope.onSubmit = (oracle) => {
+            if($scope.tableForm["name"]=='请输入2-20个字符的数据名称')
+                $scope.tableForm["name"]='';
+            if($scope.tableForm["ip"]=='例如：0.0.0.0')
+                $scope.tableForm["ip"]='';
+            if($scope.tableForm["port"]=='1~65535')
+                $scope.tableForm["port"]='';
+            if($scope.tableForm["user"]=='2-15个字母、数字或下划线')
+                $scope.tableForm["user"]='';
+            if($scope.tableForm["password"]=='2-15个字母、数字或下划线')
+                $scope.tableForm["password"]='';
+            if($scope.tableForm["databaseName"]=='1-10个字母')
+                $scope.tableForm["databaseName"]='';
+            if($scope.tableForm["tableName"]=='1-15个字母、数字或下划线')
+                $scope.tableForm["tableName"]='';
+            if($scope.tableForm["suffix"]=='1-10个字母、数字或下划线')
+                $scope.tableForm["suffix"]='';
+
+
             if($scope.validForm.$valid && $scope.validForm.$dirty){
                 $scope.edit = false;
                 $scope.add = false;