Skip to content

Commit 6caa252

Browse files
committed
【fix】更新plot-lealfet示例
1 parent b7ffc1e commit 6caa252

36 files changed

+713
-772
lines changed

dist/leaflet/include-leaflet.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@
147147
inputCSS(disturl + '/leaflet/iclient-leaflet.min.css');
148148
}
149149
if (inArray(includes, 'iclient-plot-leaflet')) {
150-
inputCSS(libsurl + '/plotting/leaflet/11.3.0/iclient-plot-leaflet.css');
150+
inputCSS(libsurl + '/plotting/leaflet/12.0.0/iclient-plot-leaflet.css');
151151
if (supportES6()) {
152-
inputScript(libsurl + '/plotting/leaflet/11.3.0/iclient-plot-leaflet-es6.min.js');
152+
inputScript(libsurl + '/plotting/leaflet/12.0.0/iclient-plot-leaflet-es6.min.js');
153153
} else {
154-
inputScript(libsurl + '/plotting/leaflet/11.3.0/iclient-plot-leaflet.min.js');
154+
inputScript(libsurl + '/plotting/leaflet/12.0.0/iclient-plot-leaflet.min.js');
155155
}
156156
}
157157
if (inArray(includes, 'ant-design-vue')) {

examples/js/plottingPanel/PlotMapPanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.*/
1+
/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.*/
22
// import {ChildPlotLayer} from "../../../plugins/plotting/leaflet/mapping";
33

44
L.supermap.plotting.initPlotMapPanel = function(div, plotMapManager){

examples/js/plottingPanel/PlotPanel.js

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.*/
2+
/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.*/
33
L.supermap.plotting.initPlotPanel = function (div, serverUrl, drawControl) {
44
var plotPanel = document.getElementById(div);
55

@@ -32,14 +32,15 @@ L.supermap.plotting.initPlotPanel = function (div, serverUrl, drawControl) {
3232

3333
function beforeClickTreeNode(treeId, treeNode) {
3434
var tree = $.fn.zTree.getZTreeObj(treeId);
35-
if (treeNode.isParent) {
36-
tree.expandNode(treeNode);
37-
return false;
38-
} else {
35+
if (treeNode.drawData && treeNode.drawData.length > 0) {
3936
var iconNode = document.getElementById("icon");
4037
iconNode.innerHTML = "";
4138
createDrawNodes(treeNode, iconNode, drawControl, serverUrl);
4239
}
40+
if (treeNode.isParent) {
41+
tree.expandNode(treeNode);
42+
return false;
43+
}
4344
}
4445

4546
var setting = {
@@ -109,7 +110,7 @@ function createDrawNodes(treeNode, iconNode, drawControl, serverUrl) {
109110
drawControl.handler.libID = this.libID;
110111
drawControl.handler.code = this.symbolCode;
111112
drawControl.handler.serverUrl = this.serverUrl;
112-
113+
drawControl.handler.path="../img/plottingPanel/BasicCell/20.png";
113114
drawControl.handler.disable();
114115
drawControl.handler.enable();
115116
}
@@ -169,12 +170,15 @@ function addBasicCellTreeNodes(treeData) {
169170
var symbolCode = [24, 28, 29, 31, 34, 410, 32, 590, 360, 390, 400, 350, 26, 370, 380, 44, 3701, 3801, 4401, 48, 320
170171
, 1019, 1022, 1024, 321, 1023, 1025
171172
, 1013, 1014, 1016, 1017, 1026
172-
, 1001, 1003, 1004, 1028, 1029, 3000];
173+
, 1001, 1003, 1004, 1029, 20
174+
, 5001, 5003, 5005, 5007, 5008, 5009, 5012, 5013, 5014, 5015, 5016, 5017, 5022 ];
173175
var symbolName = [resources.text_foldLine, resources.text_parallelogram, resources.btn_circle, resources.text_elliptical, resources.text_textContent, resources.text_regularPolygon, resources.btn_polygon, resources.text_bezierCurves, resources.text_closeBezierCurves
174176
, resources.text_rallyGround, resources.text_braces, resources.text_trapezium, resources.text_input_value_drawRectangle, resources.text_bow, resources.text_sector, resources.text_arc, resources.text_bow, resources.text_sector, resources.text_arc, resources.text_parallel, resources.text_textNodeBox
175177
, resources.text_concentricCircle, resources.text_combinedCircle, resources.text_textbox, resources.text_mutilAngleTextbox, resources.text_freeLine, resources.text_nodeChain
176178
, resources.text_runway, resources.text_eight, resources.text_arrowLine, resources.text_textAlongLine, resources.text_linearText
177-
, resources.text_objectLines, resources.text_polygonArea, resources.text_sectorArea, resources.text_barbedWire, resources.text_straightLineArrow, resources.option_picture];
179+
, resources.text_objectLines, resources.text_polygonArea, resources.text_sectorArea, resources.text_straightLineArrow, resources.option_picture
180+
, resources.text_parallelHorizontalEarsArrow, resources.text_trapeziumHorizonalEarsArrow, resources.text_baseBezierarrow, resources.text_polylineTriangleArrow, resources.text_bezierSwallowTailedArrow, resources.text_basePolylineArrow, resources.text_baseBezierArrowNoScaleByMap, resources.text_polylineTriangleArrowNoScaleByMap, resources.text_bezierSwallowTailedArrowNoScaleByMap, resources.text_basePolylineArrowNoScaleByMap, resources.text_combinationArrow, resources.text_parallelBatLikeEarsArrow, resources.text_bidirectionalPathArrow
181+
];
178182
var cellId = cellRootNode.id + 1;
179183
for (var i = 0; i < symbolCode.length; i++) {
180184
var drawCellNode = {
@@ -234,10 +238,16 @@ function innerAnalysisSymbolTree(childSymbolInfos, treeData, parentNode, rootSym
234238
var drawNode = new Object();
235239
drawNode.id = treeNodeId++;
236240
drawNode.pId = parentNode.id;
237-
drawNode.icon = rootSymbolIconUrl + parentNode.fullName + childSymbolInfos[i].symbolCode + ".png";
238241
drawNode.symbolCode = childSymbolInfos[i].symbolCode;
242+
if (childSymbolInfos[i].strSymbolCode && childSymbolInfos[i].strSymbolCode !== "") {
243+
drawNode.symbolCode = childSymbolInfos[i].strSymbolCode;
244+
drawNode.icon = rootSymbolIconUrl + parentNode.fullName + childSymbolInfos[i].strSymbolCode + ".png";
245+
drawNode.symbolName = childSymbolInfos[i].symbolName + "_" + childSymbolInfos[i].strSymbolCode;
246+
}else{
247+
drawNode.icon = rootSymbolIconUrl + parentNode.fullName + childSymbolInfos[i].symbolCode + ".png";
248+
drawNode.symbolName = childSymbolInfos[i].symbolName + "_" + childSymbolInfos[i].symbolCode;
249+
}
239250
drawNode.libID = childSymbolInfos[i].libID;
240-
drawNode.symbolName = childSymbolInfos[i].symbolName + "_" + childSymbolInfos[i].symbolCode;
241251
drawData.push(drawNode);
242252
}
243253
}

examples/js/plottingPanel/PlottingPanel.Include.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.*/
1+
/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.*/
22
(function () {
33
var r = new RegExp("(^|(.*?\\/))(PlottingPanel.Include\.js)(\\?|$)"),
44
s = document.getElementsByTagName('script'), targetScript;

0 commit comments

Comments
 (0)