Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

tangqinGiser · tangqinGiser · commit ff00f13441f9 · 2018-09-20T14:13:11.000+08:00
diff --git a/examples/classic/plot_querySymbolLib.html b/examples/classic/plot_querySymbolLib.html
@@ -206,10 +206,11 @@ <h5 class='panel-title text-center' data-i18n="resources.title_querySymbolLib"><
         var container = document.getElementById("queryResult");
         var table = document.createElement("table");
         drawNodeClick = function () {
-            drawGraphicObject.activate();
+            drawGraphicObject.deactivate();
             drawGraphicObject.handler.libID = this.libID;
             drawGraphicObject.handler.symbolCode = this.symbolCode;
             drawGraphicObject.handler.serverUrl = this.serverUrl;
+            drawGraphicObject.activate();
         };
         var i = 0;
         var rowLength = (queryResult.length % 3 === 0) ? queryResult.length / 3 : queryResult.length / 3 + 1;
diff --git a/examples/leaflet/img/plot_symbolGeometricQuery.png b/examples/leaflet/img/plot_symbolGeometricQuery.png
diff --git a/examples/leaflet/plot_dynamicPlot.html b/examples/leaflet/plot_dynamicPlot.html
@@ -1,4 +1,6 @@
-<!--********************************************************************* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.*********************************************************************-->
+<!--********************************************************************
+* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
+*********************************************************************-->
 <!DOCTYPE html>
 <html>
 <head>
@@ -197,6 +199,7 @@
 
     map.on('contextmenu', function (event) {
         if(editControl.getSelectedFeatures().length == 0){
+            drawControl.handler.disable();
             return;
         }
         var contentMe = document.getElementById("contentMe");
diff --git a/examples/leaflet/plot_querySymbolLib.html b/examples/leaflet/plot_querySymbolLib.html
@@ -103,11 +103,11 @@ <h5 class='panel-title text-center' data-i18n="resources.title_querySymbolLib"><
         var container = document.getElementById("queryResult");
         var table = document.createElement("table");
         var  drawNodeClick = function () {
-            drawControl.handler.enable();
+            drawControl.handler.disable();
             drawControl.handler.libID = this.libID;
             drawControl.handler.code = this.symbolCode;
             drawControl.handler.serverUrl = this.serverUrl;
-
+            drawControl.handler.enable();
         };
         var i = 0;
         var rowLength = (queryResult.length % 3 === 0) ? queryResult.length / 3 : queryResult.length / 3 + 1;
