更新动态标绘产品包和demo；更新classic动态标绘demo

hhyu1 · hhyu1 · commit 1e4316242f6b · 2018-07-31T15:20:47.000+08:00
diff --git a/dist/leaflet/iclient9-plot-leaflet.min.js b/dist/leaflet/iclient9-plot-leaflet.min.js
diff --git a/examples/classic/plot_drawGraphics.html b/examples/classic/plot_drawGraphics.html
@@ -236,7 +236,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawGraphics"></h
         plottingLayer = new SuperMap.Layer.PlottingLayer("标绘图层", serverUrl);
 
         //空间分析服务地址：目前使用的是服务器默认空间分析地址，可更换成实际使用的空间分析服务地址
-        plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
         //态势标绘编辑
         plottingEdit = new SuperMap.Control.PlottingEdit();
diff --git a/examples/classic/plot_drawRoute.html b/examples/classic/plot_drawRoute.html
@@ -122,7 +122,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawRoute"></h5><
         plottingLayer = new SuperMap.Layer.PlottingLayer("标绘图层", serverUrl);
 
         //空间分析服务地址：目前使用的是服务器默认空间分析地址，可更换成实际使用的空间分析服务地址
-        plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
 
         plottingLayer.style = {
diff --git a/examples/classic/plot_dynamicPlot.html b/examples/classic/plot_dynamicPlot.html
@@ -163,6 +163,14 @@
                            style="width:70px;height: 25px ;margin:0 auto;"> </input> </li>
             </ul>
         </li>
+        <li>
+            <a class="glyphicon glyphicon-arrow-left notArrow" title="撤销"
+               onclick="undo()"></a>
+        </li>
+        <li>
+            <a class="glyphicon glyphicon-arrow-right notArrow" title="重做"
+               onclick="redo()"></a>
+        </li>
     </div>
 </div>
 <script type="text/javascript" include="bootstrap,responsive,sticklr" src="../js/include-web.js"></script>
@@ -208,7 +216,7 @@
         plottingLayer = new SuperMap.Layer.PlottingLayer("标绘图层", serverUrl);
 
         //空间分析服务地址：目前使用的是服务器默认空间分析地址，可更换成实际使用的空间分析服务地址
-        plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
         plottingLayer.style = {
             fillColor: "#66cccc",
@@ -314,7 +322,7 @@
             pointRadius: 6
         };
 
-        newPlottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //newPlottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
         var drawGraphicObject = new SuperMap.Control.DrawFeature(newPlottingLayer, SuperMap.Handler.GraphicObject);
         drawGraphicObjects.push(drawGraphicObject);
@@ -504,6 +512,13 @@
         }
     }
 
+    function undo(){
+        plotting.getTransManager().undo();
+    }
+
+    function redo(){
+        plotting.getTransManager().redo();
+    }
 
     document.onmouseup = function (evt) {
         var evt = evt || window.event;
diff --git a/examples/classic/plot_plotGOAnimation.html b/examples/classic/plot_plotGOAnimation.html
@@ -173,7 +173,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_plotGOAnimation">
         plottingLayer = new SuperMap.Layer.PlottingLayer("标绘图层", serverUrl);
 
         //空间分析服务地址：目前使用的是服务器默认空间分析地址，可更换成实际使用的空间分析服务地址
-        plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
         plottingLayer.style = {
             fillColor: "#66cccc",
diff --git a/examples/classic/plot_plotSymbol.html b/examples/classic/plot_plotSymbol.html
@@ -109,7 +109,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_plotSymbol"></h5>
 
         plottingLayer = new SuperMap.Layer.PlottingLayer("标绘图层", serverUrl);
         //空间分析服务地址：目前使用的是服务器默认空间分析地址，可更换成实际使用的空间分析服务地址
-        plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
         plottingLayer.style = {
             fillColor: "#66cccc",
diff --git a/examples/classic/plot_saveload.html b/examples/classic/plot_saveload.html
@@ -133,7 +133,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_saveload"></h5></
         });
         plottingLayer = new SuperMap.Layer.PlottingLayer("标绘图层", serverUrl);
         //空间分析服务地址：目前使用的是服务器默认空间分析地址，可更换成实际使用的空间分析服务地址
-        plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
+        //plottingLayer.spatialAnalystUrl = host + "/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
 
         plottingLayer.style = {
             fillColor: "#66cccc",
diff --git a/examples/classic/plot_symbolAvoid.html b/examples/classic/plot_symbolAvoid.html
@@ -170,6 +170,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolAvoid"></h5
             txt.innerHTML = resources.msg_enterAvoidEdit;
         }
         plottingEdit.removeAllAvoidRegion();
+        plottingEdit.avoidEdit(false);
     }
 
     document.onmouseup = function (evt) {
diff --git a/examples/classic/plot_symbolGeometricQuery.html b/examples/classic/plot_symbolGeometricQuery.html
@@ -158,7 +158,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolGeometricQu
     //设置选择区域标号的默认颜色
     function setDefualtStyle() {
         var defualtStyle = plotting.getDefaultStyle();
-        //defualtStyle.setDefaultFlag(true);
+        defualtStyle.defaultStyleFlag = true;
         defualtStyle.lineColor = "#00FF00";
     }
 
diff --git a/examples/js/plottingPanel/PlotPanel.js b/examples/js/plottingPanel/PlotPanel.js
@@ -203,7 +203,7 @@ function addRouteTreeNodes(treeData){
         var drawCellNode = {
             id: cellId++,
             pId: 0,
-            icon:"../img/BasicCell/RouteIcon/" + symbolCode[i] + ".png",
+            icon:"../img/plottingPanel/BasicCell/RouteIcon/" + symbolCode[i] + ".png",
             symbolCode: symbolCode[i],
             libID: 0,
             symbolName: symbolName[i]
diff --git a/examples/js/plottingPanel/StylePanel.js b/examples/js/plottingPanel/StylePanel.js
@@ -236,7 +236,7 @@ function collectionPropertyGridRows(features) {
     var lineStyleObj  = new Object();
     lineStyleObj.name = displayLineStyleName[3];
     if(selectfeature.style.dashArray === ""){
-        lineStyleObj.value = "solid";
+        lineStyleObj.value = "实线";
     }else lineStyleObj.value = lineStyleToString(selectfeature.style.lineSymbolID);
     lineStyleObj.group = group[2];
     lineStyleObj.editor = { "type": 'combobox', "options": { "valueField": 'value', "textField": 'text', "data": lineStyleRows }};
@@ -999,6 +999,9 @@ function addExtendProperty(rows,geometry) {
 //判断类型是否为新增对象
 function checkType(selectfeature){
     if(selectfeature.symbolType === SuperMap.Plot.SymbolType.GROUPOBJECT ||
+        selectfeature.symbolType === SuperMap.Plot.SymbolType.AIRROUTE ||
+        selectfeature.symbolType === SuperMap.Plot.SymbolType.NAVYROUTE ||
+        selectfeature.symbolType === SuperMap.Plot.SymbolType.MISSILEROUTE ||
         selectfeature.symbolType === SuperMap.Plot.SymbolType.ROUTENODE ||
         selectfeature.symbolType === SuperMap.Plot.SymbolType.NAVYDEPLOYMENT ||
         selectfeature.symbolType === SuperMap.Plot.SymbolType.AIRDEPLOYMENT ||
@@ -1411,12 +1414,11 @@ function getFillGradientModeRows() {
 function getLineStyleRows() {
     var rows = [];
     rows.push({"value": "0", "text": "实线"});//实线(solid)
-    rows.push({"value": "1", "text": "长虚线"});//由点构成的直线(dot)
-    rows.push({"value": "2", "text": "由点构成的直线"});//虚线(dash)
-    rows.push({"value": "3", "text": "由线划线段组成的直线"});//长虚线(longdash)
-    rows.push({"value": "4", "text": "由重复的线划点图案构成的直线"});//由线划线段组成的直线(dashdot)
-    //rows.push({"value": "5", "text": "无边线"});//由线划线段组成的直线(longdashdot)
-    //rows.push({"value": "20,10,5,5,5,10", "text": "doubledotdash"});//由重复的划线点图案构成的直线
+    rows.push({"value": "1", "text": "长虚线"});//长虚线(longdash) //虚线(dash)
+    rows.push({"value": "2", "text": "由点构成的直线"});//由点构成的直线(dot)
+    rows.push({"value": "3", "text": "由线划线段组成的直线"});//由线划线段组成的直线(dashdot)(longdashdot)
+    rows.push({"value": "4", "text": "由重复的线划点图案构成的直线"});//由重复的划线点图案构成的直线
+    //rows.push({"value": "5", "text": "无边线"});
     return rows;
 }
 
@@ -1433,8 +1435,6 @@ function lineStyleToString(lineStyle) {
         return "实线";
     else if(lineStyle)
         return "实线";
-    // else if(lineStyle == "20,10,5,5,5,10")
-    //     return "doubledotdash";
 }
 
 function getLineRelationTypeRows() {
diff --git a/examples/leaflet/plot_defaultStyle.html b/examples/leaflet/plot_defaultStyle.html
@@ -19,12 +19,11 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
             <div class='input-group' style="margin-bottom: 15px;">
                 <span class='input-group-addon'>线型：</span>
                 <select class='form-control' id='lineStyle' onchange="lineStyleChanges()">
-                    <option value='0,0'>solid</option>
-                    <option value='1,5'>dot</option>
-                    <option value='5,10'>dash</option>
-                    <option value='5,5,1,5'>dashdot</option>
-                    <option value='10,5'>longdash</option>
-                    <option value='15,10,5,10'>longdashdot</option>
+                    <option value='0'>实线</option>
+                    <option value='1'>长虚线</option>
+                    <option value='2'>由点构成的直线</option>
+                    <option value='3'>由线划线段组成的直线</option>
+                    <option value='4'>由重复的线划点图案构成的直线</option>
                 </select>
             </div>
             <div class='input-group' style="margin-bottom: 15px;">
@@ -87,7 +86,7 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
     }
     function initHtml() {
         document.getElementById("lineWidth").value = plotting.getDefaultStyle().lineWidth;
-        document.getElementById("lineStyle").value = '0,0';
+        document.getElementById("lineStyle").value = '0';
         document.getElementById("lineColor").value = plotting.getDefaultStyle().lineColor;
         document.getElementById("symbolWidth").value = plotting.getDefaultStyle().dotSymbolSize;
         document.getElementById("symbolHeight").value = plotting.getDefaultStyle().dotSymbolSize;
diff --git a/examples/leaflet/plot_drawGraphics.html b/examples/leaflet/plot_drawGraphics.html
@@ -17,7 +17,7 @@
 
         #map {
             position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -27,7 +27,7 @@
         #plottingPanel {
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
         }
diff --git a/examples/leaflet/plot_dynamicPlot.html b/examples/leaflet/plot_dynamicPlot.html
@@ -16,7 +16,7 @@
 
         #map {
 			position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -29,15 +29,15 @@
             z-index: 888;
             border-radius: 4px;
             padding-top: 2px;
-            left: 210px;
+            left: 265px;
             color: #000000;
             background-color: #fff;
         }
 
         #plottingPanel {
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
         }
@@ -342,27 +342,21 @@
         }
     }
 
-    //绘制避让区域
-    function drawAvoidRegion() {
-        if(editControl.getSelectedFeatures().length === 0){
+    function drawAvoidRegion(){
+        if (editControl._avoidEditing === false && editControl.getSelectedFeatures().length === 0) {
             return;
+        }else{
+            editControl.avoidEdit(true);
         }
-        editControl.avoidEdit(true);
     }
-
-    //绘制避让区域
-    function doneAvoidEdit() {
+    function doneAvoidEdit(){
         editControl.avoidEdit(false);
     }
-
-    //绘制避让区域
-    function deleteAvoidEdit() {
-        if(editControl.getSelectedFeatures().length === 0){
-            return;
-        } else {
-            if(editControl._avoidEditing === true){
-                editControl.avoidEdit(false);
-            }
+    function deleteAvoidEdit(){
+        if (editControl._avoidEditing === false && editControl.getSelectedFeatures().length === 0) {
+            return ;
+        }else if(editControl._avoidEditing === true){
+            editControl.avoidEdit(false);
             editControl.getSelectedFeatures()[0].removeAvoidRegions();
         }
     }
diff --git a/examples/leaflet/plot_filetransfer.html b/examples/leaflet/plot_filetransfer.html
@@ -9,24 +9,24 @@
 <div id="toolbar" class="panel panel-primary" style=" position: absolute;top: 15px;right: 10px;width: 320px;text-align: center;z-index: 9999;border-radius: 4px;">
     <div class='panel-heading'>
         <h5 class='panel-title text-center' style=" font-size: 16px;color: #ffffff;">态势图上传下载</h5></div>
-    <div class='panel-body content' style="border-bottom-left-radius: 4px;border-bottom-right-radius: 4px">
+    <div class='panel-body content' style="height:160px;border-bottom-left-radius: 4px;border-bottom-right-radius: 4px">
         <div class='input-group' style="margin-top: 15px;margin-left: 10px  margin-bottom: 10px;">
             <input type="file" style='width:200px;float: left;' id="smlFile" name="smlFile"> </input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="button"  value="上传" onclick="uploadSmlFile()"/>
+            <input type="button" class="btn btn-default" value="上传" onclick="uploadSmlFile()"/>
         </div>&nbsp;&nbsp;
         <div class='input-group' style="margin-left: 10px;  margin-bottom: 10px;">
             文件URL:
             <input  type="text" readonly style='width:140px;' id="downloadUrl" name="downloadUrl" value=""> </input>&nbsp;
-            <input type="button"  value="下载" onclick="downloadSmlFileOnServer()"/>
+            <input type="button"  class="btn btn-default"value="下载" onclick="downloadSmlFileOnServer()"/>
         </div>
         <div class='input-group' style="margin-left: 10px;margin-bottom: 15px  margin-bottom: 10px;">
             文件名称:
             <input  type="text" readonly style='width:140px;' id="smlFileName" name="smlFileName" value=""> </input>&nbsp;
-            <input type="button"  value="删除" onclick="deleteSmlFileOnServer()" />
+            <input type="button"  class="btn btn-default" value="删除" onclick="deleteSmlFileOnServer()" />
         </div>
     </div>
 </div>
-<div id="popupWin" class="panel panel-primary popupWindow" style=" position: absolute;right: 10px;top: 216px;width: 320px;background: #FFF;z-index: 9999;display: block;">
+<div id="popupWin" class="panel panel-primary popupWindow" style=" position: absolute;right: 10px;top: 230px;width: 320px;background: #FFF;z-index: 9999;display: block;">
     <div class="winTitle" style=" background: #1E90FF;">
         <span class="title_left">态势图文件列表</span>
     </div>
diff --git a/examples/leaflet/plot_modifySymbolStyle.html b/examples/leaflet/plot_modifySymbolStyle.html
@@ -17,7 +17,7 @@
 
         #map {
 			position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -27,7 +27,7 @@
         #plottingPanel {
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
         }
diff --git a/examples/leaflet/plot_plotGOAnimation.html b/examples/leaflet/plot_plotGOAnimation.html
@@ -7,7 +7,7 @@
     <style type="text/css">
         #map {
             position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -17,7 +17,7 @@
         #plottingPanel {
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
         }
@@ -28,7 +28,7 @@
             z-index: 999999;
             border-radius: 4px;
             padding-top: 2px;
-            left: 210px;
+            left: 265px;
             color: #000000;
             background-color: #fff;
         }
diff --git a/examples/leaflet/plot_plotSymbol.html b/examples/leaflet/plot_plotSymbol.html
@@ -7,7 +7,7 @@
     <style type="text/css">
         #map {
 			position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -17,7 +17,7 @@
         #plottingPanel {
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
         }
diff --git a/examples/leaflet/plot_saveload.html b/examples/leaflet/plot_saveload.html
@@ -7,7 +7,7 @@
     <style type="text/css">
         #map {
             position: absolute;
-            left: 200px;
+            left: 250px;
             right: 0px;
             width: 100%;
             height: 100%;
@@ -17,7 +17,7 @@
         #plottingPanel {
             float: left;
             background: #ffffff;
-            width: 200px;
+            width: 250px;
             height: 100%;
             border: 1px solid #3473b7;
         }
@@ -28,7 +28,7 @@
             z-index: 999999;
             border-radius: 4px;
             padding-top: 2px;
-            left: 210px;
+            left: 265px;
             color: #000000;
             background-color: #fff;
         }
diff --git a/examples/leaflet/plot_symbolAvoid.html b/examples/leaflet/plot_symbolAvoid.html
diff --git a/examples/leaflet/plot_symbolGeometricQuery.html b/examples/leaflet/plot_symbolGeometricQuery.html

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolAvoid"></h5`
`170`	`170`	`txt.innerHTML = resources.msg_enterAvoidEdit;`
`171`	`171`	`}`
`172`	`172`	`plottingEdit.removeAllAvoidRegion();`
	`173`	`+ plottingEdit.avoidEdit(false);`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`document.onmouseup = function (evt) {`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_symbolGeometricQu`
`158`	`158`	`//设置选择区域标号的默认颜色`
`159`	`159`	`function setDefualtStyle() {`
`160`	`160`	`var defualtStyle = plotting.getDefaultStyle();`
`161`		`- //defualtStyle.setDefaultFlag(true);`
	`161`	`+ defualtStyle.defaultStyleFlag = true;`
`162`	`162`	`defualtStyle.lineColor = "#00FF00";`
`163`	`163`	`}`
`164`	`164`