Merge branch 'master' of https://github.com/SuperMap/iClient9

zhurc · zhurc · commit e0e598e7f554 · 2017-12-27T14:53:59.000+08:00
diff --git a/examples/classic/controler_featureSnap.html b/examples/classic/controler_featureSnap.html
@@ -22,7 +22,7 @@ <h5 class='panel-title text-center'>要素编辑</h5>
     <div class='panel-body' id='params'>
         <p></p>
         <div align='right' class='button-group'>
-            <input type='button' id='btn1' class='btn btn-primary' value='关闭捕捉' onclick="switch_snap()"/>
+            <input type='button' id='switchSnap' class='btn btn-primary' value='关闭捕捉' onclick="switch_snap()"/>
             <input type='button' id='btn2' class='btn btn-primary' value='加载数据' onclick="addData()"/>
             <input type='button' id='btn3' class='btn btn-primary' value='清除' onclick="clearFeatures()"/>
         </div>
@@ -37,42 +37,43 @@ <h5 class='panel-title text-center'>要素编辑</h5>
         switchSnap,
         snap01,
         url = host + "/iserver/services/map-world/rest/maps/World";
-        //新建矢量图层
-        vector = new SuperMap.Layer.Vector("vectorLayer");
-        //创建捕捉对象，第一个参数指的是需要进行捕捉的要素图层，后面两个参数分别是点要素和线要素的捕捉容限，第四个参数是附加参数
+    //新建矢量图层
+    vector = new SuperMap.Layer.Vector("vectorLayer");
+    //创建捕捉对象，第一个参数指的是需要进行捕捉的要素图层，后面两个参数分别是点要素和线要素的捕捉容限，第四个参数是附加参数
 
-        snap01 = new SuperMap.Snap([vector], 10, 10, {actived: true});
-        //矢量要素编辑控件
-        modifyFeature = new SuperMap.Control.ModifyFeature(vector);
-        modifyFeature.snap = snap01;
+    snap01 = new SuperMap.Snap([vector], 10, 10, {actived: true});
+    //矢量要素编辑控件
+    modifyFeature = new SuperMap.Control.ModifyFeature(vector);
+    modifyFeature.snap = snap01;
 
-        //定义layer图层，TiledDynamicRESTLayer：分块动态 REST 图层
-        layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", url, {
-            transparent: true,
-            cacheEnabled: true
-        }, {maxResolution: "auto"});
-        switchSnap = document.getElementById("switchSnap");
-        //为图层初始化完毕添加addLayer()事件
-        layer.events.on({"layerInitialized": addLayer});
-        map = new SuperMap.Map("map", {
-            controls: [
-                new SuperMap.Control.LayerSwitcher(),
-                new SuperMap.Control.ScaleLine(),
-                new SuperMap.Control.Zoom(),
-                new SuperMap.Control.Navigation({
-                    dragPanOptions: {
-                        enableKinetic: true
-                    }
-                }),
-                modifyFeature]
-        });
-        addData();
+    //定义layer图层，TiledDynamicRESTLayer：分块动态 REST 图层
+    layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", url, {
+        transparent: true,
+        cacheEnabled: true
+    }, {maxResolution: "auto"});
+    switchSnap = document.getElementById("switchSnap");
+    //为图层初始化完毕添加addLayer()事件
+    layer.events.on({"layerInitialized": addLayer});
+    map = new SuperMap.Map("map", {
+        controls: [
+            new SuperMap.Control.LayerSwitcher(),
+            new SuperMap.Control.ScaleLine(),
+            new SuperMap.Control.Zoom(),
+            new SuperMap.Control.Navigation({
+                dragPanOptions: {
+                    enableKinetic: true
+                }
+            }),
+            modifyFeature]
+    });
+    addData();
 
     function addLayer() {
         map.addLayers([layer, vector]);
         map.setCenter(new SuperMap.LonLat(0, 0), 1);
 
     }
+
     function edit_feature() {
         deactiveAll();
         modifyFeature.activate();
@@ -84,14 +85,17 @@ <h5 class='panel-title text-center'>要素编辑</h5>
         snapState = false;
         snap01.off();
     }
+
     function activate_snap_all() {
         snapState = true;
         snap01.on();
     }
+
     function switch_snap() {
         snapState ? switchSnap.value = "开启捕捉" : switchSnap.value = "关闭捕捉";
         snapState ? deactivate_snap_all() : activate_snap_all();
     }
+
     function deactiveAll() {
         modifyFeature.deactivate();
         deactivate_snap_all();
@@ -140,7 +144,7 @@ <h5 class='panel-title text-center'>要素编辑</h5>
 
             dataAdded = true;
         } else {
-            widgets.alert.showAlert("数据已加载。",true,220);
+            widgets.alert.showAlert("数据已加载。", true, 220);
         }
         edit_feature();
     }
diff --git a/examples/classic/popup_customPopup.html b/examples/classic/popup_customPopup.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>自定义信息框</title>
-    <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
+    <script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
     <script type="text/javascript" exclude="iclient-classic" src="../../dist/include-classic.js"></script>
     <style type="text/css">
         body {
@@ -56,7 +56,7 @@ <h5 class='panel-title text-center'>自定义信息框</h5></div>
 <div id="map"></div>
 <script>
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
-    var map, layerWorld, marker, markers;
+    var map, layerWorld, marker, markers, popup;
     var url = host + "/iserver/services/map-world/rest/maps/World";
 
     init();
@@ -90,6 +90,7 @@ <h5 class='panel-title text-center'>自定义信息框</h5></div>
 
     //定义mouseClickHandler函数，触发click事件会调用此函数
     function mouseClickHandler(event) {
+        widgets.alert.clearAlert();
         closeInfoWin();
         //初始化popup类
         popup = new SuperMap.Popup(
@@ -147,6 +148,11 @@ <h5 class='panel-title text-center'>自定义信息框</h5></div>
 
     //设置弹出框的背景颜色.
     function changecolor() {
+        widgets.alert.clearAlert();
+        if (!popup) {
+            widgets.alert.showAlert("请先点击事件点，创建popup。", false, 220);
+            return;
+        }
         var colorStr = document.getElementById('popupColor').value;
         if (colorStr) {
             popup.setBackgroundColor(colorStr);
@@ -155,6 +161,11 @@ <h5 class='panel-title text-center'>自定义信息框</h5></div>
 
     //设置弹出框的透明度.
     function changeopacity() {
+        widgets.alert.clearAlert();
+        if (!popup) {
+            widgets.alert.showAlert("请先点击事件点，创建popup。", false, 220);
+            return;
+        }
         var opacityStr = document.getElementById('popupOpacity').value;
         popup.setOpacity(opacityStr);
     }
diff --git a/examples/classic/theme_themeUnique.html b/examples/classic/theme_themeUnique.html
@@ -256,6 +256,12 @@ <h5 class='panel-title text-center'>等级符号专题图</h5>
         widgets.alert.showAlert(serviceFailedEventArgs.error.errorMsg,false);
     }
 
+    function removeTheme() {
+        if (map.layers.length > 1) {
+            map.removeLayer(themeLayer, true);
+        }
+    }
+
 </script>
 </body>
 </html>
