添加tip提示

EhsanTang · Dec 17, 2016 · 4d806dc · 4d806dc
1 parent eeede15
commit 4d806dc
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 8 deletions.
diff --git a/api/CrapApi.V7.4-2016-12-17.sql b/api/CrapApi.V7.4-2016-12-17.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `apidev`.`module` 
+ADD COLUMN `templateId` VARCHAR(50) NULL COMMENT '接口模板ID' AFTER `projectId`,
+ADD INDEX `index_templateId` (`templateId` ASC);
+
+ALTER TABLE `apidev`.`interface` 
+ADD COLUMN `isTemplate` BIT NOT NULL DEFAULT 0 COMMENT '是否是模板' AFTER `monitorEmails`;
diff --git a/api/src/main/java/cn/crap/utils/HttpPostGet.java b/api/src/main/java/cn/crap/utils/HttpPostGet.java
@@ -235,6 +235,8 @@ private static String gethPath(String path, Map<String, String> params) {
 				String key = (String) iterator.next();
 				path += key + "=" + params.get(key) + "&";
 			}
+			if(path.endsWith("&"))
+				path = path.substring(path.length()-1, path.length());
 		}
 		return path;
 	}

diff --git a/api/src/main/webapp/resources/css/base.css b/api/src/main/webapp/resources/css/base.css
@@ -11,6 +11,19 @@ body,h1,h2,h3,h4,h5,h6,hr,blockquote,dl,dt,dd,form,fieldset,legend,button,input,
 	 word-wrap:break-word;
 	 white-space: normal!important;
 }
+.tip-div{
+	text-align: center;
+    overflow: hidden;
+    padding: 5px 20px;
+    line-height: 22px;
+    border-radius: 5px;
+    background: rgba(0,0,0,0.6);
+    color: #fff;
+    position: fixed;
+    top:50%;
+    left:50%;
+    display:none;
+}
 .l-s-n{list-style:none;}
 .o2{opacity:0.2}.o3{opacity:0.3}.o5{opacity:0.5}.o8{opacity:0.8}
 .no-b-s{-webkit-box-shadow: none; box-shadow: none; border: 1px solid #DDD;}

diff --git a/api/src/main/webapp/resources/html/backHtml/index.html b/api/src/main/webapp/resources/html/backHtml/index.html
@@ -248,6 +248,7 @@
 		<i class="iconfont i-close CFFF fb f20" onclick="closeMyDialog('myDialog')">&#xe615;</i>
 		<i class="iconfont i-full CFFF fb f20" onclick="fullMyDialog('myDialog')">&#xe62e;</i>
 </div>   
+<div class="tip-div" id="tip-div"></div>
 
 <div id="float" class="folat">
 		<div class="sk-wave">

diff --git a/api/src/main/webapp/resources/html/frontHtml/index.html b/api/src/main/webapp/resources/html/frontHtml/index.html
@@ -47,7 +47,6 @@
 			</div>
 		</div>
 	</div>
-
 	<!-- footer -->
 	<div ng-include="'resources/html/subTpl/footer.tpl.html'"></div>
 	<!-- End:footer -->

diff --git a/api/src/main/webapp/resources/html/frontHtml/projectIndex.html b/api/src/main/webapp/resources/html/frontHtml/projectIndex.html
@@ -81,7 +81,6 @@
 			<!-- End:main view -->
 		</div>
 	</div>
-
 	<!-- footer -->
 	<div ng-include="'resources/html/subTpl/footer.tpl.html'"></div>
 	<!-- End:footer -->

diff --git a/api/src/main/webapp/resources/html/subTpl/footer.tpl.html b/api/src/main/webapp/resources/html/subTpl/footer.tpl.html
@@ -43,6 +43,7 @@
 		<div id="lookUpContent" class="look-up-content f12 tc">加载中....</div>
 		<i class="iconfont i-close" onclick="iClose('lookUp')">&#xe615;</i>
 	</div>
+	<div class="tip-div" id="tip-div"></div>
 	<div id="fade"></div>
 	<div id="passwordDiv" class="look-up shadow">
 		<div id="lookUpContent" class="look-up-content f12 tc p30 BGFFF">

diff --git a/api/src/main/webapp/resources/js/app.js b/api/src/main/webapp/resources/js/app.js
@@ -139,7 +139,7 @@ app.run(function($rootScope, $state, $stateParams, $http, $timeout,httpService)
 		if(callBack){
 			callBack();
 		}
-		iLoading = "PROPUPFLOAT";
+		iLoading = "TIPFLOAT";
 		if(myLoading){
 			iLoading = myLoading;
 		}
@@ -187,7 +187,7 @@ app.run(function($rootScope, $state, $stateParams, $http, $timeout,httpService)
 	 * 发送请求工具方法
 	 */
 	$rootScope.sendRequest = function(url,myLoading){
-		var iLoading = "PROPUPFLOAT";
+		var iLoading = "FLOATTIP";
 		if(myLoading){
 			iLoading = myLoading;
 		}

diff --git a/api/src/main/webapp/resources/js/core.js b/api/src/main/webapp/resources/js/core.js
@@ -225,21 +225,31 @@ function closeTip(data,iLoading,tipTime){
 	if(tipTime==-1){//不关闭
 		tipMessage = '';
 	}
+	if(data.indexOf('[OK]')>=0){
+		if( data.replace('[OK]','')!='' )
+			tipMessage = data.replace('[OK]','') + tipMessage;
+		else
+			tipMessage = "操作成功！<br>" + tipMessage;
+	}
+	if(data.indexOf('[ERROR]')>=0){
+		tipMessage = data.replace('[ERROR]', '') + "<br>" + tipMessage;
+	}
+
 	if(iLoading.toUpperCase().indexOf('PROPUP') >= 0){
 		//返回结果有提示
-		if (data.indexOf('[ERROR]') < 0 && data.indexOf('[OK]')>=0 && data.replace('[OK]','')!=''){
-			$("#lookUpContent").html(succ1 + data.replace('[OK]','') + "<br>" + tipMessage +succ2);
+		if (data.indexOf('[OK]')>=0){
+			$("#lookUpContent").html(succ1 + tipMessage +succ2);
 		}
 		//返回结果没有提示
 		else if(data.indexOf('[ERROR]') < 0){
-			$("#lookUpContent").html(succ1+"操作成功！<br>"+tipMessage+succ2);
+			$("#lookUpContent").html(succ1+tipMessage+succ2);
 		}
 		else{
 			if(tipTime !=-1){
 				tipTime = 5;
 				tipMessage = tipTime+ "秒后自动关闭";
 			}
-			$("#lookUpContent").html(err1+data.replace('[ERROR]', '') + "<br>" +  tipMessage +err2);
+			$("#lookUpContent").html(err1+tipMessage +err2);
 		}
 		showMessage('lookUp','false',false,tipTime);
 	}
@@ -249,6 +259,9 @@ function closeTip(data,iLoading,tipTime){
 			showMessage("float",'false',false,0);
 		}
 	}
+	if(iLoading.toUpperCase().indexOf('TIP') >= 0){
+		showMessage("tip-div",tipMessage,false,tipTime);
+	}
 }
 /** *********************页面提示信息显示方法************************* */
 /**