github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Md分页未设置参数的bug

Browse Source
This commit is contained in:
zhuangqian 2016-11-16 17:15:29 +08:00
parent ddc2dc537c
commit 3271a3de81
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/smallchill/core/base/controller/BladeController.java
View File

@ -69,11 +69,16 @@ public class BladeController implements ConstCurd, ConstCache, ConstCacheKey {
return new WafRequestWrapper(this.request);
}
public boolean isAjax(){
public boolean isAjax() {
String header = getRequest().getHeader("X-Requested-With");
boolean isAjax = "XMLHttpRequest".equalsIgnoreCase(header);
return isAjax;
}
public boolean isPost() {
String method = getRequest().getMethod();
return StrKit.equalsIgnoreCase("POST", method);
}
public String getParameter(String name) {
return getRequest().getParameter(name);
@ -368,7 +373,7 @@ public class BladeController implements ConstCurd, ConstCache, ConstCacheKey {
url = Const.LOGIN_REALPATH;// session过期抛出的异常
msg = ConstShiro.NO_USER;
}
if (isAjax()) {
if (isAjax() || isPost()) {
result.addFail(msg);
resultModel = result;
} else {

2
src/main/java/com/smallchill/core/beetl/tag/FootTag.java
View File

@ -28,7 +28,7 @@ public class FootTag extends Tag {
sb.append("<div class=\"footer\">");
sb.append(" <div class=\"footer-inner\">");
sb.append(" <div class=\"footer-content\" style=\"height:30px;\">");
sb.append(" <div class=\"footer-content\" style=\"height:30px;background-color:white;\">");
sb.append(" <span class=\"bigger-110\">技术支持 :</span>");
sb.append(" <span class=\"bigger-110\" id=\"support_tonbusoft\">" + company + "</span>");
sb.append(" <span class=\"bigger-110\" style=\"padding-left:15px;\">");

1
src/main/java/com/smallchill/core/plugins/dao/MdManager.java
View File

@ -250,6 +250,7 @@ public class MdManager {
PageQuery query = new PageQuery();
query.setPageNumber(pageNum);
query.setPageSize(pageSize);
query.setParas(paras);
if(StrKit.notBlank(orderBy)){
query.setOrderBy(orderBy);
}

18
src/main/webapp/static/map/MapTool.js
View File

@ -7,8 +7,8 @@ function initMap() {
function setCenterZoom(markerArr) {
map = new BMap.Map('map');
window.map = map; //将map变量存储在全局
var p0 = markerArr[0].point.split("|")[0];//获得第一个点的经纬度
var p1 = markerArr[0].point.split("|")[1];
var p0 = markerArr[0].point.split(",")[0];//获得第一个点的经纬度
var p1 = markerArr[0].point.split(",")[1];
var poi = new BMap.Point(p0, p1);//设置地图中心点
map.centerAndZoom(poi, 17);//设置地图的缩放层级
map.enableScrollWheelZoom();
@ -28,13 +28,13 @@ function addMarker(markerArr) {
for (var i = 0; i < markerArr.length; i++) {
var json = markerArr[i];
var p0 = json.point.split("|")[0];
var p1 = json.point.split("|")[1];
var p0 = json.point.split(",")[0];
var p1 = json.point.split(",")[1];
var point = new BMap.Point(p0, p1);
var iconImg = createIcon(json.icon);
var marker = new BMap.Marker(point, { icon: iconImg });
//var label = new BMap.Label(json.content.split("|")[0], { offset: new BMap.Size(15, -20) });
//var label = new BMap.Label(json.content.split(",")[0], { offset: new BMap.Size(15, -20) });
//var result = BMapLib.GeoUtils.isPointInRect(marker.point, map.getBounds());
//if (result == true) {
@ -83,7 +83,7 @@ function createIcon1(json) {
var arrow = this._arrow = document.createElement("div");
arrow.style.background = "url(plugins/map/label.png) no-repeat";
arrow.style.background = "url(../../static/map/label.png) no-repeat";
arrow.style.position = "absolute";
arrow.style.width = "11px";
arrow.style.height = "9px";
@ -133,7 +133,7 @@ function createIcon1(json) {
}
function ComplexCustomOverlay(json) {
this._point = new BMap.Point(json.point.split("|")[0], json.point.split("|")[1]);
this._point = new BMap.Point(json.point.split(",")[0], json.point.split(",")[1]);
this._IconStatus = json.IconStatus;
this._json = json;
this._IconInfo = json.IconInfo;
@ -145,8 +145,8 @@ function AddPolyline(markerArr, strokeColor) {
var polylinePointsArray = [];
for (var i = 0; i < markerArr.length; i++) {
var P = markerArr[i].point;
var p0 = P.split("|")[0];
var p1 = P.split("|")[1];
var p0 = P.split(",")[0];
var p1 = P.split(",")[1];
polylinePointsArray[i] = new BMap.Point(p0, p1);
}
polyline = new BMap.Polyline(polylinePointsArray, { strokeColor: strokeColor, strokeWeight: 3, strokeOpacity: 0.5 });

2
src/main/webapp/static/map/map.html
View File

@ -33,7 +33,7 @@
</body>
<script type="text/javascript">
var map;
var markerArr = [{ "IconStatus": "2", "IconName": "常信大厦投资广场", "IconInfo": "延陵西路57、59、61号", "point": "119.966885|31.781534" }, { "IconStatus": "3", "IconName": "泰富世纪大厦", "IconInfo": "天宁区常州市延陵西路15号", "point": "119.967738|31.781346" }, { "IconStatus": "1", "IconName": "可的国泰店", "IconInfo": "国泰名筑和平苑旁", "point": "119.968995|31.780034"}];
var markerArr = [{ "IconStatus": "2", "IconName": "常信大厦投资广场", "IconInfo": "延陵西路57、59、61号", "point": "119.966885,31.781534" }, { "IconStatus": "3", "IconName": "泰富世纪大厦", "IconInfo": "天宁区常州市延陵西路15号", "point": "119.967738,31.781346" }, { "IconStatus": "1", "IconName": "可的国泰店", "IconInfo": "国泰名筑和平苑旁", "point": "119.968995,31.780034"}];
$(function () {
setCenterZoom(markerArr); //设置地图中心点