From 5defbc5677b42ff2a5bddf478d15b4f3fc3c57c2 Mon Sep 17 00:00:00 2001
From: "Welliam.Cao" <303350019@qq.com>
Date: Wed, 21 Mar 2018 21:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E9=94=99=E8=AF=AF=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=BB=A7=E7=BB=AD=E6=8F=90=E4=BA=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpsManage/templates/assets/assets_config.html | 3 +++
 OpsManage/templates/database/db_config.html   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/OpsManage/templates/assets/assets_config.html b/OpsManage/templates/assets/assets_config.html
index f4fde2c6..24c7fba5 100755
--- a/OpsManage/templates/assets/assets_config.html
+++ b/OpsManage/templates/assets/assets_config.html
@@ -632,6 +632,7 @@ <h4 class="modal-title" id="myRaidModalLabel">
 			var value = form[i].value;
 			if ( value.length == 0){
 				window.wxc.xcConfirm("请注意必填项不能为空~", window.wxc.xcConfirm.typeEnum.error);
+				btnObj.removeAttr('disabled');
 				return false;
 			}
 			else{
@@ -676,6 +677,7 @@ <h4 class="modal-title" id="myRaidModalLabel">
 			post_data[name] = value;
 			if ( value.length == 0){
 				window.wxc.xcConfirm("请注意必填项不能为空~", window.wxc.xcConfirm.typeEnum.error);
+				btnObj.removeAttr('disabled');
 				return false;
 			}
 			else{
@@ -710,6 +712,7 @@ <h4 class="modal-title" id="myRaidModalLabel">
 			onOk:function(result){
 				if (result.length == 0){
 					/* 如果没有输入字符串则直接退出 */
+					btnObj.removeAttr('disabled');
 					return;
 				};
 				if (op=="service"){
diff --git a/OpsManage/templates/database/db_config.html b/OpsManage/templates/database/db_config.html
index 2ccdf2ec..9d574a7a 100644
--- a/OpsManage/templates/database/db_config.html
+++ b/OpsManage/templates/database/db_config.html
@@ -715,6 +715,7 @@ <h4 class="modal-title" id="myDatabaseEditModalLabel">
 			idx = $.inArray(name, required);						
 			if (idx >= 0 && value.length == 0){
 				window.wxc.xcConfirm("请注意必填项不能为空~", window.wxc.xcConfirm.typeEnum.error);
+				btnObj.removeAttr('disabled');
 				return false;
 			};	
 			if ( value.length != 0 && name.length != 0 ){
@@ -752,6 +753,7 @@ <h4 class="modal-title" id="myDatabaseEditModalLabel">
 			idx = $.inArray(name, required);						
 			if (idx >= 0 && value.length == 0){
 				window.wxc.xcConfirm("请注意必填项不能为空~", window.wxc.xcConfirm.typeEnum.error);
+				btnObj.removeAttr('disabled');
 				return false;
 			};	
 			if ( value.length != 0 && name.length != 0 ){
@@ -789,6 +791,7 @@ <h4 class="modal-title" id="myDatabaseEditModalLabel">
 			idx = $.inArray(name, required);						
 			if (idx >= 0 && value.length == 0){
 				window.wxc.xcConfirm("请注意必填项不能为空~", window.wxc.xcConfirm.typeEnum.error);
+				btnObj.removeAttr('disabled');
 				return false;
 			};	
 			if ( value.length != 0 && name.length != 0 ){
@@ -826,6 +829,7 @@ <h4 class="modal-title" id="myDatabaseEditModalLabel">
 			idx = $.inArray(name, required);						
 			if (idx >= 0 && value.length == 0){
 				window.wxc.xcConfirm("请注意必填项不能为空~", window.wxc.xcConfirm.typeEnum.error);
+				btnObj.removeAttr('disabled');
 				return false;
 			};	
 			if ( value.length != 0 && name.length != 0 ){