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

Author: xilanhuaweidapao

dist/openlayers/iclient9-openlayers-es6.js

@@ -191,7 +191,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawGraphics"></h
         </div>
     </div>
 </div>
-<div id="menu">
+<div id="menu" style="width: 250px;">
     <div class="easyui-panel" style="position:absolute;top:0px;bottom:0px;left:0px;right:0px;padding:5px; width: 100%;">
         <div class="easyui-tabs" style="width: 100%;height: 100%">
             <div id="stylePanel" data-i18n="[title]resources.text_attributePanel"></div>

dist/openlayers/iclient9-openlayers.css

@@ -12,34 +12,36 @@
             overflow: hidden;
             background: #fff;
             width: 100%;
-            height: 100%
+            height: 100%;
+            position: absolute;
+            top: 0;
         }
 
         #map {
             position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
-            width: 100%;
             height: 100%;
             border: 1px solid #3473b7;
         }
 
         #menuPlotting {
             position: absolute;
             top: 20%;
-            z-index: 999999;
+            z-index: 99999999999;
             border-radius: 4px;
             padding-top: 2px;
+            left: 265px;
+            color: #000000;
+            background-color: #fff;
         }
 
         #menu {
-            position: absolute;
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
-            z-index: 100;
         }
     </style>
 </head>

dist/openlayers/iclient9-openlayers.js

@@ -43,7 +43,7 @@
             position: absolute;
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
             z-index: 100;
@@ -86,10 +86,10 @@ <h5 class='panel-title text-center' data-i18n="resources.title_filetransfer"></h
     </div>
 </div>
 <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="iclient8c-plot,PlottingPanel"
-        src="../../dist/classic/include-classic.js"></script>
+<script type="text/javascript" include="bootstrap,fileupLoad" src="../js/include-web.js"></script>
+<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;
     var host = window.isLocal ? window.server : "http://iclsvr.supermap.io";

dist/openlayers/iclient9-openlayers.min.css

@@ -15,25 +15,25 @@
             overflow: hidden;
             background: #fff;
             width: 100%;
-            height: 100%
+            height: 100%;
+            position: absolute;
+            top: 0;
         }
 
         #map {
             position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
-            width: 100%;
             height: 100%;
             border: 1px solid #3473b7;
         }
 
         #menu {
-            position: absolute;
+            float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
-            z-index: 100;
         }
     </style>
 </head>

dist/openlayers/iclient9-openlayers.min.js

@@ -18,7 +18,7 @@
 
         #map {
             position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -42,7 +42,7 @@
         #menu {
             position: absolute;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
             z-index: 100;