Merge branch '2.0' into gitee2

src/Traits/ModelTree.php

@@ -338,16 +338,6 @@ trait ModelTree
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function delete()
-    {
-        $this->where($this->getParentColumn(), $this->getKey())->delete();
-
-        return parent::delete();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -380,5 +370,13 @@ trait ModelTree
 
             return $branch;
         });
+
+        static::deleting(function ($model) {
+            static::query()
+                ->where($model->getParentColumn(), $model->getKey())
+                ->get()
+                ->each
+                ->delete();
+        });
     }
 }

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()