Skip to content

Commit d8bcdfd

Browse files
zhurczhurc
committed
iportal webmap图层支持专题图
1 parent 012dd60 commit d8bcdfd

File tree

15 files changed

+58477
-50554
lines changed

15 files changed

+58477
-50554
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 3536 additions & 3386 deletions
Large diffs are not rendered by default.

‎dist/iclient9-leaflet.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-openlayers.js‎

Lines changed: 53927 additions & 47037 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/include-leaflet.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
6262
}
6363
if (!inArray(excludes, 'iclient9-leaflet')) {
64-
inputScript("../../dist/iclient9-leaflet.js");
64+
inputScript("../../dist/iclient9-leaflet.min.js");
6565
}
6666
if (inArray(includes, 'iclient9-leaflet-css')) {
6767
inputCSS("../../dist/iclient9-leaflet.min.css");

‎src/common/commontypes/geometry/GeoText.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ export default class GeoText extends Geometry {
256256
if (style.fontSize) {
257257
fontSize = parseFloat(style.fontSize);
258258
} else {
259-
return null;
259+
fontSize = parseFloat("12px");
260260
}
261261

262262
//标签宽高

‎src/common/style/ThemeStyle.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import SuperMap from '../SuperMap';
2+
23
/**
34
* @class SuperMap.ThemeStyle
45
* @classdesc 客户端专题图风格类
@@ -120,7 +121,7 @@ export default class ThemeStyle {
120121
* @member SuperMap.ThemeStyle.prototype.labelRect -boolean
121122
* @description 是否显示文本标签矩形背景。
122123
*/
123-
labelRect= false;
124+
labelRect = false;
124125
/**
125126
* @member SuperMap.ThemeStyle.prototype.fontColor -{string}
126127
* @description 附加文本字体颜色。

‎src/leaflet/mapping/WebMap.js‎

Lines changed: 180 additions & 56 deletions
Large diffs are not rendered by default.

‎src/leaflet/overlay/GraphThemeLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export var GraphThemeLayer = ThemeLayer.extend({
5151
newArgs.push(name);
5252
newArgs.push(options);
5353
ThemeLayer.prototype.initialize.apply(this, newArgs);
54-
this.map = options.map || null;
54+
this.map = options && options.map || null;
5555
this.chartsType = chartsType;
5656
this.chartsSetting = options.chartsSetting || {};
5757
this.themeFields = options.themeFields || null;

‎src/leaflet/overlay/LabelThemeLayer.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ export var LabelThemeLayer = GeoFeatureThemeLayer.extend({
405405
if (styleTmp.labelXOffset || styleTmp.labelYOffset) {
406406
var xOffset = isNaN(styleTmp.labelXOffset) ? 0 : styleTmp.labelXOffset;
407407
var yOffset = isNaN(styleTmp.labelYOffset) ? 0 : styleTmp.labelYOffset;
408-
loc.add(xOffset, -yOffset);
409-
return L.point(loc.x, loc.y);
408+
var point = loc.add(L.point(xOffset, -yOffset));
409+
return L.point(point.x, point.y);
410410
} else {
411411
return L.point(loc.x, loc.y);
412412
}
@@ -627,7 +627,6 @@ export var LabelThemeLayer = GeoFeatureThemeLayer.extend({
627627
}
628628
}
629629
}
630-
this.setCanvasStyle("reset");
631630
var labelInfo = {};//标签信息
632631
if (labelWidth) {
633632
labelInfo.w = labelWidth;//标签的宽

0 commit comments

Comments
 (0)