Skip to content

Commit 1a46807

Browse files
songyumengsongyumeng
committed
2 parents 7c85a2e + f2485e2 commit 1a46807

File tree

69 files changed

+776
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+776
-620
lines changed

‎build/webpack.config.base.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ module.exports = {
8989
'@tensorflow/tfjs': 'function(){try{return tf}catch(e){return {}}}()',
9090
'video.js': 'function(){try{return videojs}catch(e){return {}}}()',
9191
'flv.js': 'function(){try{return flvjs}catch(e){return {}}}()',
92-
'videojs-flvjs-es6': 'function(){try{return;}catch(e){return {}}}()'
92+
'videojs-flvjs-es6': 'function(){try{return;}catch(e){return {}}}()',
93+
'./UGCWasmAll': 'function(){try{return Module}catch(e){return {}}}()'
9394
},
9495

9596
module: {

‎dist/ol/include-ol.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
8484
}
8585
if (inArray(includes, 'ol3-echarts')) {
86-
inputScript(libsurl + '/openlayers/ol3-echarts/4.0.1/ol-echarts.js');
86+
inputScript(libsurl + '/openlayers/ol3-echarts/4.0.1-1/ol-echarts.js');
8787
}
8888
if (inArray(includes, 'ol3-echarts@1.3.6')) {
8989
inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');

‎dist/openlayers/include-openlayers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
8484
}
8585
if (inArray(includes, 'ol3-echarts')) {
86-
inputScript(includes + '/openlayers/ol3-echarts/4.0.1/ol-echarts.js');
86+
inputScript(includes + '/openlayers/ol3-echarts/4.0.1-1/ol-echarts.js');
8787
}
8888
if (inArray(includes, 'ol3-echarts@1.3.6')) {
8989
inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');

‎examples/data/plot-sign/signManager.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[
2+
"sign1_图片背景.html",
3+
"sign2_多行文字_无边框.html",
4+
"sign3_blue_单行文字.html",
5+
"sign4_Red_单行文字.html",
6+
"sign5_多行文字.html",
7+
"sign6_多行文字1.html",
8+
"sign7_图片背景1.html",
9+
"sign8_图片背景2.html",
10+
"sign9_图片背景3.html",
11+
"sign10_图片背景4.html",
12+
"sign11_图片背景5.html",
13+
"sign12_图片背景6.html"
14+
]

‎examples/js/plottingPanel/StylePanel.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,25 +176,28 @@ function updateSelectFeature(updated, selectfeatures) {
176176
if (parseInt(updated.value) === 999) {
177177
openDialog(selectfeatures[i]);
178178
} else {
179-
if (parseInt(updated.value) == 5) {
180-
selectfeatures[i].setDashLine([0.3, 0.05]);
181-
} else if (parseInt(updated.value) == 6) {
182-
selectfeatures[i].setDashLine([0.23, 0.06]);
183-
}
184-
else if (parseInt(updated.value) == 7) {
185-
selectfeatures[i].setDashLine([0.16, 0.05]);
186-
}
187-
else if (parseInt(updated.value) == 8) {
188-
selectfeatures[i].setDashLine([0.14, 0.032]);
189-
} else if (parseInt(updated.value) == 0) {
190-
selectfeatures[i].setDashLine([]);
191-
} else if (parseInt(updated.value) == 888) {
192-
selectfeatures[i].setDashLine([0]);
193-
}
194-
if (selectfeatures[i].style.lineSymbolID == 888) {
195-
selectfeatures[i].setDashLine([]);
196-
selectfeatures[i].setStyle({ lineSymbolID: 0 });
179+
if(selectfeatures[i].symbolType != 1){
180+
if (parseInt(updated.value) == 5) {
181+
selectfeatures[i].setDashLine([0.3, 0.05]);
182+
} else if (parseInt(updated.value) == 6) {
183+
selectfeatures[i].setDashLine([0.23, 0.06]);
184+
}
185+
else if (parseInt(updated.value) == 7) {
186+
selectfeatures[i].setDashLine([0.16, 0.05]);
187+
}
188+
else if (parseInt(updated.value) == 8) {
189+
selectfeatures[i].setDashLine([0.14, 0.032]);
190+
} else if (parseInt(updated.value) == 0) {
191+
selectfeatures[i].setDashLine([]);
192+
} else if (parseInt(updated.value) == 888) {
193+
selectfeatures[i].setDashLine([0]);
194+
}
195+
if (selectfeatures[i].style.lineSymbolID == 888) {
196+
selectfeatures[i].setDashLine([]);
197+
selectfeatures[i].setStyle({ lineSymbolID: 0 });
198+
}
197199
}
200+
198201
selectfeatures[i].setStyle({ lineSymbolID: updated.value });
199202
}
200203
// this.dashLines = [0.3,0.05];两段虚线

‎examples/leaflet/drawAndEditFeatures.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<!--********************************************************************
22
* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
33
*********************************************************************-->
4+
<!--********************************************************************
5+
* 该示例需要引入
6+
* leaflet-geoman (https://github.com/geoman-io/leaflet-geoman)
7+
*********************************************************************-->
48
<!DOCTYPE html>
59
<html>
610
<head>

‎examples/leaflet/img/plot_drawSpecialEffect.png

-11.5 KB
Loading

‎examples/leaflet/img/plot_signSymbol.png

1.63 KB
Loading

0 commit comments

Comments
 (0)