工具表单设置显示数据逻辑调整

src/Widgets/Form.php

@@ -819,10 +819,6 @@ HTML;
 
     protected function prepareForm()
     {
-        if (method_exists($this, 'form')) {
-            $this->form();
-        }
-
         if (! $this->data && method_exists($this, 'default')) {
             $data = $this->default();
 
@@ -830,6 +826,10 @@ HTML;
                 $this->fill($data);
             }
         }
+
+        if (method_exists($this, 'form')) {
+            $this->form();
+        }
     }
 
     protected function prepareHandler()