Commit 27489bc

committed

fix v3文本标签图例由显示图层名改为字段名称 review by xiongjj

1 parent e84d343 commit 27489bcCopy full SHA for 27489bc

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -908,6 +908,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa`
`908`	`908`	`_createLayerLegendList(layer, styleSetting) {`
`909`	`909`	`const layerId = layer.id;`
`910`	`910`	`const layerTitle = layer.title;`
	`911`	`+ const textFieldName = styleSetting.type === 'text' && styleSetting.textField && styleSetting.textField.value.replace(/^\{\|\}$/g, '');`
`911`	`912`	`const commonStyleOptions = {`
`912`	`913`	`themeField: layer.themeField \|\| styleSetting.field,`
`913`	`914`	`layerId,`
`@@ -971,7 +972,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa`
`971`	`972`	`...commonStyleOptions,`
`972`	`973`	`styleGroup: [`
`973`	`974`	`{`
`974`		`- fieldValue: layerTitle \|\| layerId,`
	`975`	`+ fieldValue: textFieldName\|\|layerTitle \|\| layerId,`
`975`	`976`	`style: {`
`976`	`977`	`...simpleResData,`
`977`	`978`	`shape`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1116,6 +1116,12 @@ describe('mapboxgl-webmap3.0', () => {`
`1116`	`1116`	`const webMapV3 = mapstudioWebmap._getWebMapInstance();`
`1117`	`1117`	`expect(map).not.toBeUndefined();`
`1118`	`1118`	`expect(webMapV3.getLegends().length).toBe(9);`
	`1119`	`+ const testLegend= webMapV3.getLegends().filter((item) => {`
	`1120`	`+ return item.layerId === "上海市可校外学习中心(1)";`
	`1121`	`+ })`
	`1122`	`+ expect(testLegend.length).toBe(2);`
	`1123`	`+ expect(testLegend[0].styleGroup[0].fieldValue).toBe("上海市可校外学习中心(1)");`
	`1124`	`+ expect(testLegend[1].styleGroup[0].fieldValue).toBe("学习中心(点)名称");`
`1119`	`1125`	`mbglmap.prototype.getL7Scene = undefined;`
`1120`	`1126`	`spyTest.calls.reset();`
`1121`	`1127`	`done();`

Comments

(0)