更新动态标绘属性面板；增加铁丝网icon;更新动态标绘demo页面panel支持收起

Author: hhyu1

dist/leaflet/include-leaflet.js

@@ -80,7 +80,7 @@
             inputScript("https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.12.13/xlsx.core.min.js");
         }
         if (!inArray(excludes, 'iclient9-leaflet')) {
-            if (supportES6() && !inArray(includes, 'iclient9-plot-leaflet')) {
+            if (supportES6()) {
                 inputScript("../../dist/leaflet/iclient9-leaflet-es6.min.js");
             } else {
                 inputScript("../../dist/leaflet/iclient9-leaflet.min.js");
@@ -90,8 +90,12 @@
             inputCSS("../../dist/leaflet/iclient9-leaflet.min.css");
         }
         if (inArray(includes, 'iclient9-plot-leaflet')) {
-            inputCSS("http://iclient.supermap.io/web/libs/plotting/leaflet/9.1.0/iclient9-plot-leaflet.css");
-            inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/9.1.0/iclient9-plot-leaflet.min.js");
+            inputCSS("http://iclient.supermap.io/web/libs/plotting/leaflet/9.1.1/iclient9-plot-leaflet.css");
+            if (supportES6()) {
+                inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/9.1.1/iclient9-plot-leaflet-es6.min.js");
+            } else {
+                inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/9.1.1/iclient9-plot-leaflet.min.js");
+            }
         }
         if (inArray(includes, 'leaflet.heat')) {
             inputScript("https://cdnjs.cloudflare.com/ajax/libs/leaflet.heat/0.2.0/leaflet-heat.js");

examples/classic/plot_dynamicPlot.html

@@ -170,6 +170,26 @@
             <a class="glyphicon glyphicon-arrow-right notArrow" data-i18n="[title]resources.btn_redo"
                onclick="redo()"></a>
         </li>
+        <li>
+            <a  class="glyphicon glyphicon-th-large notArrow" data-i18n="[title]resources.text_symbolEqualSize" ></a>
+            <ul>
+                <li><input type="button" data-i18n="[value]resources.btn_symbolEqualWidth" onclick="setSymbolEqualWidth()"
+                           style="width:70px;height: 25px ;margin:0 auto;"> </input> </li>
+                <li><input type="button" data-i18n="[value]resources.btn_symbolEqualHeight" onclick="setSymbolEqualHeight()"
+                           style="width: 70px;height: 25px ;margin:0 auto;"> </input></li>
+                <li><input type="button" data-i18n="[value]resources.btn_symbolEqualWidthHeight" onclick="setSymbolEqualWidthHeight()"
+                           style="width:70px;height: 25px ;margin:0 auto;"> </input> </li>
+            </ul>
+        </li>
+        <li>
+            <a  class="glyphicon glyphicon-th" data-i18n="[title]resources.text_symbolDistribution" ></a>
+            <ul>
+                <li><input type="button"  data-i18n="[value]resources.btn_symbolLevelDistribution" onclick="setSymbolLevelDistribution()"
+                           style="width:70px;height: 25px ;margin:0 auto;"> </input> </li>
+                <li><input type="button" data-i18n="[value]resources.btn_symbolVerticalDistribution" onclick="setSymbolVerticalDistribution()"
+                           style="width: 70px;height: 25px ;margin:0 auto;"> </input></li>
+            </ul>
+        </li>
     </div>
 </div>
 <script type="text/javascript" include="bootstrap,responsive,sticklr" src="../js/include-web.js"></script>
@@ -513,6 +533,30 @@
     function redo(){
         plotting.getTransManager().redo();
     }
+    //等大
+    //等宽
+    function setSymbolEqualWidth(){
+        plottingEdit.equalLarge(SuperMap.Plot.EqualLargeType.WIDTH);
+    }
+    //等高
+    function setSymbolEqualHeight(){
+        plottingEdit.equalLarge(SuperMap.Plot.EqualLargeType.HEIGHT);
+    }
+    //等宽高
+    function setSymbolEqualWidthHeight(){
+        plottingEdit.equalLarge(SuperMap.Plot.EqualLargeType.SAME);
+    }
+
+    //均匀分布
+    //横向均匀分布
+    function setSymbolLevelDistribution(){
+        plottingEdit.uniformDistribution(SuperMap.Plot.UniformDistributionType.LEVEL);
+    }
+
+    //纵向均匀分布
+    function setSymbolVerticalDistribution(){
+        plottingEdit.uniformDistribution(SuperMap.Plot.UniformDistributionType.VERTICAL);
+    }
 
     document.onmouseup = function (evt) {
         var evt = evt || window.event;

examples/img/plottingPanel/BasicCell/1028.png

@@ -167,12 +167,12 @@ function addBasicCellTreeNodes(treeData){
     var symbolCode = [24, 28, 29, 31, 34, 410, 32, 590, 360, 390, 400, 350, 26, 370, 380, 44, 48, 320
         , 1019, 1022,1024,321,1023,1025
         ,1013, 1014, 1016, 1017,1026
-        ,1001, 1003, 1004];
+        ,1001, 1003, 1004,1028];
     var symbolName = ["折线", "平行四边形", "圆", "椭圆", "注记", "正多边形", "多边形", "贝赛尔曲线", "闭合贝赛尔曲线"
         , "集结地", "大括号", "梯形", "矩形", "弓形", "扇形", "弧线", "平行线", "注记指示框"
         , "同心圆", "组合圆","标注框","多角标注框","自由线",  "节点链"
         , "跑道形", "八字形", "箭头线", "沿线注记","线型标注"
-        , "对象间连线", "多边形区域","扇形区域"];
+        , "对象间连线", "多边形区域","扇形区域","铁丝网"];
     var cellId = cellRootNode.id + 1;
     for(var i = 0; i < symbolCode.length; i++){
         var drawCellNode = {

examples/js/plottingPanel/PlotPanel.js

@@ -42,6 +42,7 @@
         }
         if (inArray(includes, 'StylePanel')) {
             inputScript("../js/plottingPanel/customEditor/ColorpickerEditor.js");
+            inputScript("../js/plottingPanel/PublicStyleFunction.js");
             inputScript("../js/plottingPanel/StylePanel.js");
         }
         if (inArray(includes, 'SMLInfosPanel')) {