Merge branch 'master' of https://git.oschina.net/isupermap/iClient9

zhurc · zhurc · commit 26c88b8659d1 · 2017-06-14T16:41:57.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -14572,7 +14572,11 @@ var FeatureService = ServiceBase.extend({
 
     _createServerFeature: function (geoFeature) {
         var geoJSONFeature, feature = {}, fieldNames = [], fieldValues = [];
-        geoJSONFeature = geoFeature.toGeoJSON();
+        if(geoFeature instanceof  L.Path){
+            geoJSONFeature = geoFeature.toGeoJSON();
+        }else{
+            geoJSONFeature = geoFeature;
+        }
         for (var key in geoJSONFeature.properties) {
             fieldNames.push(key);
             fieldValues.push(geoJSONFeature.properties[key]);
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/examples/css/editor.css b/examples/css/editor.css
@@ -12,17 +12,23 @@ html, body, .wrapper {
 }
 
 .edit-container {
+    min-height:52px;
     background-color: #f9f9f9;
-    position: relative;
+    position: absolute;
+    top:0;
+    bottom:0;
+    left:0;
+    right:0;
     margin-top: 52px;
 }
 
 .edit-container section.content {
+    min-height:100%;
     width: 100%;
     padding: 0;
     position: absolute;
     top: 0;
-    bottom: -2px;
+    bottom: 0;
 }
 
 .content .pane {
diff --git a/examples/leaflet/02_editFeatures.html b/examples/leaflet/02_editFeatures.html
@@ -68,6 +68,8 @@
     function commit() {
         var me = this;
         if (featureGroup.hasLayer(marker)) {
+            marker= marker.toGeoJSON();
+            marker.properties={POP:1,CAPITAL:'test'};
             var addFeatureParams = new SuperMap.EditFeaturesParameters({
                 dataSourceName: "World",
                 dataSetName: "Capitals",
diff --git a/src/leaflet/services/FeatureService.js b/src/leaflet/services/FeatureService.js
@@ -198,7 +198,11 @@ var FeatureService = ServiceBase.extend({
 
     _createServerFeature: function (geoFeature) {
         var geoJSONFeature, feature = {}, fieldNames = [], fieldValues = [];
-        geoJSONFeature = geoFeature.toGeoJSON();
+        if(geoFeature instanceof  L.Path){
+            geoJSONFeature = geoFeature.toGeoJSON();
+        }else{
+            geoJSONFeature = geoFeature;
+        }
         for (var key in geoJSONFeature.properties) {
             fieldNames.push(key);
             fieldValues.push(geoJSONFeature.properties[key]);
diff --git a/web/header.html b/web/header.html
@@ -16,7 +16,7 @@
 
     <ul class="nav navbar-nav">
         <li class="overview-menu" id="headerIndex">
-            <a href="./index.html" class="center">
+            <a href="./" class="center">
                 首页
             </a>
         </li>
