From 4876b42b3e559170636fa61e3a7a26e6c5e3c7d6 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期日, 26 九月 2021 09:34:32 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 widgets/manageLayers_style/view.js |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index e37a476..a274ed6 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -243,7 +243,7 @@
 
   // add map style selection radio
 
-  if (!layer.hasOpacity && !layer.options.hasMapStyleOptions) {
+  if (!layer.hasOpacity && !layer.options.style_options) {
     return;
   }
 
@@ -271,15 +271,15 @@
       },
     });
   }
-  if (layer.options.hasMapStyleOptions) {
+  if (layer.options.style_options) {
     var view = $("#" + tNode.tId);
     var radio_html = '<div id="' + tNode.tId + '_style" style="color: white;">';
 
-    let item = layer.options.hasMapStyleOptions;
+    let item = layer.options.style_options;
 
     for (var i = 0, len = item.length; i < len; i++) {
 
-      radio_html += '<span class="button level1 switch center_docu" ></span><label><input type="radio" name="' + tNode.tId + '_style" value="'+item[i]+'" ' + (item[i] == layer.options.selectedMapStyleOptions ? "checked" : "") + '/>' + item[i].toUpperCase() + '</label></br>';
+      radio_html += '<span class="button level1 switch center_docu" ></span><label><input type="radio" name="' + tNode.tId + '_style" value="'+item[i]+'" ' + (i == 0 ? "checked" : "") + '/>' + item[i].toUpperCase() + '</label></br>';
 
     }
     radio_html += '</div>';
@@ -292,7 +292,16 @@
 
     $('input[type=radio][name=' + tNode.tId + '_style]').change(function () {
       var layer = layersObj[tNode.uuid];
+<<<<<<< HEAD
       layer.options.reloadLayers(this.value);
+=======
+      if (layer.options.type =='wms'){
+        layer.options.parameters.styles = layer.options.style_prefix+this.value;
+        layer.reload();
+      }
+      //TODO
+
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
     });
   }
 

--
Gitblit v1.9.1