|
@@ -134,6 +134,13 @@ public static class MapControlEx
|
|
|
{
|
|
|
if (e.SelectedObject == null) return;
|
|
|
SuperToolTip superToolTip = new SuperToolTip();
|
|
|
+ if (innerData.posMenu.Visible||innerData.mapMenu.Visible||innerData.rectMenu.Visible)
|
|
|
+ {
|
|
|
+ e.SuperTip = null;
|
|
|
+ e.ToolTip = null;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if (e.SelectedObject.ToString() == ItemsEditorPanelAction.AddRectangle.ToString())
|
|
|
{
|
|
|
e.ToolTip = "绘制矩形";
|
|
@@ -332,7 +339,7 @@ public static class MapControlEx
|
|
|
|
|
|
//定位点专用PosLayer
|
|
|
var layerPos = new VectorItemsLayer() { Name = "PosLayer" };
|
|
|
- layerPos.ToolTipPattern = "Test";//随便给一个,不然不会显示定位点的tooltip
|
|
|
+ layerPos.ToolTipPattern = " ";//随便给一个,不然不会显示定位点的tooltip
|
|
|
layerPos.AllowEditItems = true;
|
|
|
layerPos.EnableHighlighting = false;
|
|
|
layerPos.EnableSelection = false;
|
|
@@ -430,7 +437,7 @@ public static class MapControlEx
|
|
|
innerData.barM.Items.Add(btnNew);
|
|
|
innerData.posMenu.LinksPersistInfo.Add(new LinkPersistInfo(btnNew));
|
|
|
innerData.barM.EndInit();
|
|
|
-
|
|
|
+
|
|
|
innerData.posMenu.BeforePopup += (sender, e) =>
|
|
|
{
|
|
|
if (btnNew.Tag != null && btnNew.Tag is Func<bool> showCondition)
|
|
@@ -843,7 +850,7 @@ public static class MapControlEx
|
|
|
/// <param name="url">such as http://192.168.100.63:58089</param>
|
|
|
/// <param name="layerName"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static MapControl UseWMTS(this MapControl ctrl, string url,string layerName)
|
|
|
+ public static MapControl UseWMTS(this MapControl ctrl, string url, string layerName)
|
|
|
{
|
|
|
var provider = new HttpMapDataProvider();
|
|
|
var tileSource = provider.TileSource as HttpTileSource;
|
|
@@ -861,7 +868,7 @@ public static class MapControlEx
|
|
|
/// <param name="url"></param>
|
|
|
/// <param name="layerName"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static MapControl UseWMS(this MapControl ctrl,string url, string layerName)
|
|
|
+ public static MapControl UseWMS(this MapControl ctrl, string url, string layerName)
|
|
|
{
|
|
|
if (ctrl is null)
|
|
|
{
|