Browse Source

浏览器帮助类支持多个不同窗口浏览器

Jimmy 2 years ago
parent
commit
af76228ab8

+ 3 - 1
fis/Helpers/AvaloniaCefBrowserHelper.cs

@@ -69,6 +69,8 @@ namespace fis.Win.Dev.Helpers
             }
         }
 
-        public static AvaloniaCefBrowser SecondWindowBrowser{ get; set; }
+        public static AvaloniaCefBrowser MeasureWindowBrowser{ get; set; }
+
+        public static AvaloniaCefBrowser ReportWindowBrowser { get; set; }
     }
 }

+ 1 - 1
fis/Managers/Ultra3DManager.cs

@@ -96,7 +96,7 @@ namespace fis.Win.Dev.Managers
         private void MDFileReady(string key)
         {
             var callString = PlatFormHelper.GetMethodStr("externalNotification", TargetMethodName.MdlFileLoaded, new List<string>() { key});
-            AvaloniaCefBrowserHelper.SecondWindowBrowser?.ExecuteJavaScript(callString, null, 0);
+            AvaloniaCefBrowserHelper.MeasureWindowBrowser?.ExecuteJavaScript(callString, null, 0);
         }
 
 

+ 8 - 1
fis/SlaveWindow.axaml.cs

@@ -274,7 +274,14 @@ namespace fis
                 Icon = new WindowIcon(resourceStream);
             }
 
-            AvaloniaCefBrowserHelper.SecondWindowBrowser = _browser;
+            if (_windowType == WindowType.Measure)
+            {
+                AvaloniaCefBrowserHelper.MeasureWindowBrowser = _browser;
+            }
+            if (_windowType == WindowType.ReportEdit)
+            {
+                AvaloniaCefBrowserHelper.ReportWindowBrowser = _browser;
+            }
 
         }
     }