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

xilanhuaweidapao · xilanhuaweidapao · commit a79f83c2d642 · 2018-12-20T22:07:53.000+08:00
diff --git a/dist/classic/include-classic.js b/dist/classic/include-classic.js
@@ -50,6 +50,9 @@
         var includes = (targetScript.getAttribute('include') || "").split(",");
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
         if (!inArray(excludes, 'iclient8c')) {
+            if (!inArray(includes, 'iclient8c-plot')) {
+                window.excludePlot = true;
+            }
             inputScript("http://iclient.supermap.io/libs/iclient8c/libs/SuperMap.Include.js");
         }
         if (inArray(includes, 'mapv')) {
diff --git a/examples/classic/plot_addfile.html b/examples/classic/plot_addfile.html
@@ -54,7 +54,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_addfile"></h5></d
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap,fileupLoad,widgets.alert" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, local, layer, vectorLayer, control, queryBounds, markerLayer, drawFeature;
     var plottingLayer, plottingEdit, sitManager, ListFile, plotting;
diff --git a/examples/classic/plot_defaultStyle.html b/examples/classic/plot_defaultStyle.html
@@ -86,7 +86,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_defaultStyle"></h
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap,responsive,colorpicker" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, baseLayer, plottingLayer, drawFeature, plotting, plottingEdit;
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
diff --git a/examples/classic/plot_drawGeoGraphicObject.html b/examples/classic/plot_drawGeoGraphicObject.html
@@ -45,7 +45,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawGeoGraphicObj
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, layer, plottingEdit, lineLayer, plottingLayer,
         drawFeature;
diff --git a/examples/classic/plot_drawGraphics.html b/examples/classic/plot_drawGraphics.html
@@ -200,7 +200,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawGraphics"></h
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap,responsive,sticklr" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="DefaultStyleConfiguration,PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,DefaultStyleConfiguration,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, plottingLayer, layer, menu1, menu2, menu3;
diff --git a/examples/classic/plot_drawRoute.html b/examples/classic/plot_drawRoute.html
@@ -73,7 +73,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawRoute"></h5><
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap,responsive,sticklr" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="bevInclude,PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,bevInclude,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, plottingLayer, layer, menu1, menu2, menu3;
diff --git a/examples/classic/plot_dynamicPlot.html b/examples/classic/plot_dynamicPlot.html
@@ -193,7 +193,7 @@
     </div>
 </div>
 <script type="text/javascript" include="bootstrap,responsive,sticklr" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="bevInclude,PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,bevInclude,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, plottingLayer, layer;
diff --git a/examples/classic/plot_editPlottingLayer.html b/examples/classic/plot_editPlottingLayer.html
@@ -70,7 +70,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_editPlottingLayer
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, baseLayer, plottingLayer, plottingEdit, drawFeature;
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
diff --git a/examples/classic/plot_filetransfer.html b/examples/classic/plot_filetransfer.html
@@ -88,7 +88,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_filetransfer"></h
 <div id="filetree" data-i18n="[title]resources.text_fileList"></div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap, fileupLoad" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, layer, drawFeature, treePanel, plottingLayer, plottingEdit, sitManager, plotting;
diff --git a/examples/classic/plot_loadSymbolLib.html b/examples/classic/plot_loadSymbolLib.html
@@ -6,7 +6,7 @@
 <head>
     <meta charset="utf-8">
     <title data-i18n="resources.title_loadSymbolLib"></title>
-    <script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+    <script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
     <style type="text/css">
         body {
             margin: 0;
diff --git a/examples/classic/plot_modifySymbolStyle.html b/examples/classic/plot_modifySymbolStyle.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <title data-i18n="resources.title_modifySymbolStyle"></title>
     <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-    <script type="text/javascript" exclude="iclient-classic" include="PlottingPanel"
+    <script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,PlottingPanel"
             src="../../dist/classic/include-classic.js"></script>
     <style type="text/css">
         body {
diff --git a/examples/classic/plot_operatePlottingLayer.html b/examples/classic/plot_operatePlottingLayer.html
@@ -6,7 +6,7 @@
 <head>
     <meta charset="utf-8">
     <title data-i18n="resources.title_operatePlottingLayer"></title>
-    <script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+    <script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
     <style type="text/css">
         body {
             margin: 0;
diff --git a/examples/classic/plot_plotGOAnimation.html b/examples/classic/plot_plotGOAnimation.html
@@ -128,7 +128,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_plotGOAnimation">
     </div>
 </div>
 <script type="text/javascript" include="bootstrap,responsive,sticklr,widgets.alert" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="bevInclude,PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,bevInclude,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, plottingLayer, layer;
diff --git a/examples/classic/plot_plotSymbol.html b/examples/classic/plot_plotSymbol.html
@@ -83,7 +83,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_plotSymbol"></h5>
 <div id="plotPanel" data-i18n="[title]resources.text_drawPanel"></div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var plottingLayer, plottingEdit, layer, drawGraphicObject, map, plotPanel;
diff --git a/examples/classic/plot_plotSymbolPerformance.html b/examples/classic/plot_plotSymbolPerformance.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <title data-i18n="resources.title_plotSymbolPerformance"></title>
     <script type="text/javascript" exclude="iclient-classic"
-            include="bevInclude,PlottingPanel" src="../../dist/classic/include-classic.js"></script>
+            include="iclient8c-plot,bevInclude,PlottingPanel" src="../../dist/classic/include-classic.js"></script>
     <script type="text/javascript" include="bootstrap,responsive,sticklr" src="../js/include-web.js"></script>
     <style type="text/css">
         body {
diff --git a/examples/classic/plot_querySymbolLib.html b/examples/classic/plot_querySymbolLib.html
@@ -80,7 +80,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_querySymbolLib"><
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var plottingLayer, plottingEdit, layer, drawGraphicObject, map, plotting, symbolLibManager;
     var loadSymbolComplete = false;
diff --git a/examples/classic/plot_saveload.html b/examples/classic/plot_saveload.html
@@ -95,7 +95,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_saveload"></h5></
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" include="PlottingPanel"
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot,PlottingPanel"
         src="../../dist/classic/include-classic.js"></script>
 <script>
     var map, plottingLayer, layer, plotting, plotPanel, stylePanel, plottingEdit, drawGraphicObjects = [];
diff --git a/examples/classic/plot_symbolAvoid.html b/examples/classic/plot_symbolAvoid.html
@@ -48,7 +48,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolAvoid"></h5
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var plottingLayer, plottingEdit, layer;
     var drawGraphicObject, map, plotting, symbolLibManager;
diff --git a/examples/classic/plot_symbolEditor.html b/examples/classic/plot_symbolEditor.html
@@ -45,7 +45,7 @@ <h5 class='panel-title text-center' data-i18n="resources.text_editor"></h5></div
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var plottingLayer, plottingEdit, layer;
     var drawGraphicObject, map, plotting, editor;
diff --git a/examples/classic/plot_symbolExtendProperty.html b/examples/classic/plot_symbolExtendProperty.html
@@ -85,7 +85,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolExtendPrope
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var plottingLayer, plottingEdit, layer, map;
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
diff --git a/examples/classic/plot_symbolGeometricQuery.html b/examples/classic/plot_symbolGeometricQuery.html
@@ -46,7 +46,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolGeometricQu
 </div>
 <div id="map"></div>
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
 <script>
     var plottingLayer, plottingEdit, layer, symbolLibManager;
     var drawGraphicObject;
