|
1 | 1 |
|
2 |
| -/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.*/ |
| 2 | +/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.*/ |
3 | 3 | L.supermap.plotting.initPlotPanel = function (div, serverUrl, drawControl) {
|
4 | 4 | var plotPanel = document.getElementById(div);
|
5 | 5 |
|
@@ -32,14 +32,15 @@ L.supermap.plotting.initPlotPanel = function (div, serverUrl, drawControl) {
|
32 | 32 |
|
33 | 33 | function beforeClickTreeNode(treeId, treeNode) {
|
34 | 34 | 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) { |
39 | 36 | var iconNode = document.getElementById("icon");
|
40 | 37 | iconNode.innerHTML = "";
|
41 | 38 | createDrawNodes(treeNode, iconNode, drawControl, serverUrl);
|
42 | 39 | }
|
| 40 | + if (treeNode.isParent) { |
| 41 | + tree.expandNode(treeNode); |
| 42 | + return false; |
| 43 | + } |
43 | 44 | }
|
44 | 45 |
|
45 | 46 | var setting = {
|
@@ -109,7 +110,7 @@ function createDrawNodes(treeNode, iconNode, drawControl, serverUrl) {
|
109 | 110 | drawControl.handler.libID = this.libID;
|
110 | 111 | drawControl.handler.code = this.symbolCode;
|
111 | 112 | drawControl.handler.serverUrl = this.serverUrl;
|
112 |
| - |
| 113 | + drawControl.handler.path="../img/plottingPanel/BasicCell/20.png"; |
113 | 114 | drawControl.handler.disable();
|
114 | 115 | drawControl.handler.enable();
|
115 | 116 | }
|
@@ -169,12 +170,15 @@ function addBasicCellTreeNodes(treeData) {
|
169 | 170 | var symbolCode = [24, 28, 29, 31, 34, 410, 32, 590, 360, 390, 400, 350, 26, 370, 380, 44, 3701, 3801, 4401, 48, 320
|
170 | 171 | , 1019, 1022, 1024, 321, 1023, 1025
|
171 | 172 | , 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 ]; |
173 | 175 | 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
|
174 | 176 | , 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
|
175 | 177 | , resources.text_concentricCircle, resources.text_combinedCircle, resources.text_textbox, resources.text_mutilAngleTextbox, resources.text_freeLine, resources.text_nodeChain
|
176 | 178 | , 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 | + ]; |
178 | 182 | var cellId = cellRootNode.id + 1;
|
179 | 183 | for (var i = 0; i < symbolCode.length; i++) {
|
180 | 184 | var drawCellNode = {
|
@@ -234,10 +238,16 @@ function innerAnalysisSymbolTree(childSymbolInfos, treeData, parentNode, rootSym
|
234 | 238 | var drawNode = new Object();
|
235 | 239 | drawNode.id = treeNodeId++;
|
236 | 240 | drawNode.pId = parentNode.id;
|
237 |
| - drawNode.icon = rootSymbolIconUrl + parentNode.fullName + childSymbolInfos[i].symbolCode + ".png"; |
238 | 241 | 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 | + } |
239 | 250 | drawNode.libID = childSymbolInfos[i].libID;
|
240 |
| - drawNode.symbolName = childSymbolInfos[i].symbolName + "_" + childSymbolInfos[i].symbolCode; |
241 | 251 | drawData.push(drawNode);
|
242 | 252 | }
|
243 | 253 | }
|
|
0 commit comments