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

zhurc · zhurc · commit cf6a0940a6ad · 2017-06-05T18:02:23.000+08:00
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -9152,7 +9152,7 @@ ol.supermap.StyleUtils = {
                 shader = feature.getProperties().textStyle;
             }
             if (feature.getProperties().TEXT_STYLE_INFO) {
-                shader = feature.getProperties().TEXT_STYLE_INFO;
+                shader = JSON.parse(feature.getProperties().TEXT_STYLE_INFO).textStyle;
             }
             if (shader && shader !== "{}") {
                 var fontStr = "";
diff --git a/src/openlayers/core/StyleUtils.js b/src/openlayers/core/StyleUtils.js
@@ -32,7 +32,7 @@ ol.supermap.StyleUtils = {
                 shader = feature.getProperties().textStyle;
             }
             if (feature.getProperties().TEXT_STYLE_INFO) {
-                shader = feature.getProperties().TEXT_STYLE_INFO;
+                shader = JSON.parse(feature.getProperties().TEXT_STYLE_INFO).textStyle;
             }
             if (shader && shader !== "{}") {
                 var fontStr = "";

Original file line number	Diff line number	Diff line change
`@@ -9152,7 +9152,7 @@ ol.supermap.StyleUtils = {`
`9152`	`9152`	`shader = feature.getProperties().textStyle;`
`9153`	`9153`	`}`
`9154`	`9154`	`if (feature.getProperties().TEXT_STYLE_INFO) {`
`9155`		`- shader = feature.getProperties().TEXT_STYLE_INFO;`
	`9155`	`+ shader = JSON.parse(feature.getProperties().TEXT_STYLE_INFO).textStyle;`
`9156`	`9156`	`}`
`9157`	`9157`	`if (shader && shader !== "{}") {`
`9158`	`9158`	`var fontStr = "";`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ ol.supermap.StyleUtils = {`
`32`	`32`	`shader = feature.getProperties().textStyle;`
`33`	`33`	`}`
`34`	`34`	`if (feature.getProperties().TEXT_STYLE_INFO) {`
`35`		`- shader = feature.getProperties().TEXT_STYLE_INFO;`
	`35`	`+ shader = JSON.parse(feature.getProperties().TEXT_STYLE_INFO).textStyle;`
`36`	`36`	`}`
`37`	`37`	`if (shader && shader !== "{}") {`
`38`	`38`	`var fontStr = "";`