Fix Spider call MainForm field issue.

qwqcode · Jul 28, 2019 · bd1778b · bd1778b
1 parent f14bd95
commit bd1778b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Nacollector/Browser/JsActions/TaskControllerAction.cs b/Nacollector/Browser/JsActions/TaskControllerAction.cs
@@ -41,13 +41,13 @@ public void CreateTask(string taskId, string className, string classLabel, strin
                 ParmsJsonStr = parmsJsonStr
             };
 
-            MainForm.taskRunner.NewTaskThread(settings);
+            _form.taskRunner.NewTaskThread(settings);
         }
 
         // 终止任务
         public bool AbortTask(string taskId)
         {
-            MainForm.taskRunner.AbortTask(taskId);
+            _form.taskRunner.AbortTask(taskId);
 
             return true;
         }

diff --git a/Nacollector/Browser/JsActions/UpdateAction.cs b/Nacollector/Browser/JsActions/UpdateAction.cs
@@ -103,7 +103,7 @@ public void StartUpdateWork(string updateModulesJsonStr)
 
                         // 刷新 SpiderList
                         if (moduleName == "NacollectorSpiders")
-                            MainForm.taskRunner.RefreshFrontendSpiderList();
+                            _form.taskRunner.RefreshFrontendSpiderList();
                     }
                     else
                     {

diff --git a/Nacollector/MainForm.cs b/Nacollector/MainForm.cs
@@ -11,11 +11,11 @@ namespace Nacollector
 {
     public partial class MainForm : FormBase
     {
-        public static MainForm _mainForm;
-        public static SplashScreen _splashScreen;
-        public static CrBrowser crBrowser;
-        public static CookieGetterBrowser cookieGetterBrowser;
-        public static TaskRunner taskRunner;
+        public MainForm _mainForm;
+        public SplashScreen _splashScreen;
+        public CrBrowser crBrowser;
+        public CookieGetterBrowser cookieGetterBrowser;
+        public TaskRunner taskRunner;
 
         public MainForm()
         {

diff --git a/Nacollector/TaskManager/TaskRunner.cs b/Nacollector/TaskManager/TaskRunner.cs
@@ -35,7 +35,7 @@ public void RefreshFrontendSpiderList()
             _form.BeginInvoke((MethodInvoker)delegate
             {
                 var spiderDomain = GetLoadSpiderDomain();
-                MainForm.crBrowser.RunJS(spiderDomain.GetFormGenJsCode());
+                _form.crBrowser.RunJS(spiderDomain.GetFormGenJsCode());
                 UnloadSpiderDomain();
             });
         }