修改面板引用；Demo错误

Author: anyanru

examples/js/include-web.js

@@ -131,7 +131,7 @@
             inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/jquery.colorpicker.js");
         }
         if (inArray(includes, 'fileupLoad')) {
-            //inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/jquery.js");
+            inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/jquery.js");
             inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/fileupLoad.js");
         }
         if (inArray(includes, 'sticklr')) {
@@ -141,30 +141,27 @@
         if (inArray(includes, 'responsive')) {
             inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/css/bootstrap-responsive.min.css");
         }
-        if (inArray(includes, 'easyui')) {
-            inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/jquery.easyui.min.js");
-            inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/css/easyui.css");
-        }
-        if (inArray(includes, 'jquery-colorpicker')) {
-            // inputScript("http://iclient.supermap.io/libs/colorpicker/js/colorpicker.js");
-            // inputCSS("http://iclient.supermap.io/libs/colorpicker/css/colorpicker.css");
-            inputScript("../../../iclient9-web/libs/colorpicker/js/colorpicker.js");
-            inputCSS("../../../iclient9-web/libs/colorpicker/css/colorpicker.css");
-        }
         if (inArray(includes, 'lazyload')) {
             inputScript("https://cdn.bootcss.com/jquery_lazyload/1.9.7/jquery.lazyload.min.js");
         }
         if (inArray(includes, 'i18n')) {
             inputScript("https://cdn.bootcss.com/i18next/10.0.7/i18next.min.js");
             inputScript("https://cdn.bootcss.com/jquery-i18next/1.2.1/jquery-i18next.min.js");
         }
-        if (inArray(includes, 'ionRangeSlider')) {
+if (inArray(includes, 'ionRangeSlider')) {
             inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.css");
             inputCSS("https://cdn.bootcss.com/normalize/8.0.0/normalize.css");
             inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.skinHTML5.css");
             inputScript("https://cdn.bootcss.com/ion-rangeslider/2.2.0/js/ion.rangeSlider.min.js");
         }
-    }
+if (inArray(includes, 'plottingPanel')) {
+            inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/jquery.ztree.core.js");
+            inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/css/zTreeStyle.css");
+            inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/jquery.easyui.min.js");
+            inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/css/easyui.css");
+            inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/colorpicker/js/colorpicker.js");
+            inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/colorpicker/css/colorpicker.css");
+        }    }
 
     function datGuiI18N() {
         document.writeln("<script>function registerEventListener(evt,fn){" +

examples/js/plottingPanel/PlottingPanel.Include.js

@@ -1,5 +1,5 @@
 (function () {
-    var r = new RegExp("(^|(.*?\\/))(include-leaflet\.js)(\\?|$)"),
+    var r = new RegExp("(^|(.*?\\/))(PlottingPanel.Include\.js)(\\?|$)"),
         s = document.getElementsByTagName('script'), targetScript;
     for (var i = 0; i < s.length; i++) {
         var src = s[i].getAttribute('src');
@@ -36,46 +36,17 @@
         var includes = (targetScript.getAttribute('include') || "").split(",");
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
 
-        if (!inArray(excludes, 'PlotPanel')) {
+        if (inArray(includes, 'PlotPanel')) {
             inputScript("../js/plottingPanel/PlotPanel.js");
         }
         if (inArray(includes, 'StylePanel')) {
             inputScript("../js/plottingPanel/customEditor/ColorpickerEditor.js");
             inputScript("../js/plottingPanel/StylePanel.js");
         }
-        if (!inArray(excludes, 'SMLInfosPanel')) {
+        if (inArray(includes, 'SMLInfosPanel')) {
             inputScript("../js/plottingPanel/SMLInfosPanel.js");
         }
     }
 
     load();
 })();
-
-
-(function() {
-    var r = new RegExp("(^|(.*?\\/))(PlottingPanel.Include\.js)(\\?|$)"),
-    s = document.getElementsByTagName('script'),
-    src, m, baseurl = "";
-    for(var i=0, len=s.length; i<len; i++) {
-        src = s[i].getAttribute('src');
-        if(src) {
-            var m = src.match(r);
-            if(m) {
-                baseurl = m[1];
-                break;
-            }
-        }
-    }
-    function inputScript(inc){
-        var script = '<' + 'script type="text/javascript" src="' + inc + '"' + '><' + '/script>';
-        document.writeln(script);
-    }
-    //加载类库资源文件
-    function loadSMLibs() {
-        inputScript(baseurl+'customEditor/ColorpickerEditor.js');
-        inputScript(baseurl+'PlotPanel.js');
-        inputScript(baseurl+'StylePanel.js');
-        inputScript(baseurl+'SMLInfosPanel.js');
-    }
-    loadSMLibs();
-})();

examples/leaflet/plot_dynamicPlot.html

@@ -26,7 +26,7 @@
         #plottingMenu {
             position: absolute;
             top: 20%;
-            z-index: 999999;
+            z-index: 110;
             border-radius: 4px;
             padding-top: 2px;
             left: 210px;
@@ -170,7 +170,7 @@
 <div id="contentMe" style="width:100px;background-color:#f4f4f4;box-shadow:3px 3px 3px rgba(0,0,0,0.5);position:absolute;z-index:1000; top:20px;left:100px;display:none;text-align:center;">
     <a href="javascript:void(0)" id="paste" style="border-bottom:1px solid #ccc;display:block;line-height:20px;color:#000; font-size:16px;">粘贴此处</a></a>
 </div>
-<script type="text/javascript" include="bootstrap,responsive,sticklr,jquery-colorpicker,zTree,easyui" src="../js/include-web.js"></script>
+<script type="text/javascript" include="bootstrap,responsive,sticklr,plottingPanel" src="../js/include-web.js"></script>
 <script type="text/javascript"  include="leaflet,iclient9-leaflet,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
 <script type="text/javascript" include="PlotPanel,StylePanel" src="../js/plottingPanel/PlottingPanel.Include.js"></script>
 

examples/leaflet/plot_plotGOAnimation.html

@@ -120,8 +120,9 @@ <h5 class="panel-title text-center" style=" font-size: 16px;color: #ffffff;">态
     editControl.addTo(map);
     L.supermap.plotting.initPlotPanel("plotPanel", serverUrl, drawControl);
     L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
-
-    goAnimationManager = L.supermap.plotting.getControl(map, serverUrl).getGOAnimationManager();
+	var plotting = L.supermap.plotting.getControl(map, serverUrl);
+    var goAnimationManager = plotting.getGOAnimationManager();
+	
     window.setInterval("execute()",100);
 
     //播放动画