update

resources/assets/dcat-admin/main.js

@@ -988,7 +988,7 @@ window.require = window.define = window.exports = window.module = undefined;
      * @param opt
      * @constructor
      */
-    LA.DialogForm = function (opt) {
+    LA.ModalForm = function (opt) {
         var number = 1,
             defUrl = opt.defaultUrl,
             btn = opt.buttonSelector,

resources/assets/dcat-admin/dialog-form.js → resources/assets/dcat-admin/modal-form.js

@@ -4,7 +4,7 @@
      * @param opt
      * @constructor
      */
-    LA.DialogForm = function (opt) {
+    LA.ModalForm = function (opt) {
         var number = 1,
             defUrl = opt.defaultUrl,
             btn = opt.buttonSelector,

src/Form.php

@@ -10,7 +10,7 @@ use Dcat\Admin\Form\Row;
 use Dcat\Admin\Form\Tab;
 use Dcat\Admin\Contracts\Repository;
 use Dcat\Admin\Traits\HasBuilderEvents;
-use Dcat\Admin\Widgets\DialogForm;
+use Dcat\Admin\Widgets\ModalForm;
 use Illuminate\Contracts\Support\MessageProvider;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Arr;
@@ -276,7 +276,7 @@ class Form implements Renderable
 
         $this->setModel(new Fluent());
 
-        $this->prepareDialogForm();
+        $this->prepareModalForm();
 
         $this->callResolving();
     }
@@ -1580,9 +1580,9 @@ class Form implements Renderable
     /**
      * @return $this
      */
-    protected function prepareDialogForm()
+    protected function prepareModalForm()
     {
-        DialogForm::prepare($this);
+        ModalForm::prepare($this);
 
         return $this;
     }
@@ -1590,20 +1590,20 @@ class Form implements Renderable
     /**
      * @return bool
      */
-    public static function inDialog()
+    public static function inModal()
     {
-        return DialogForm::is();
+        return ModalForm::is();
     }
 
     /**
-     * Create a dialog form.
+     * Create a modal form.
      *
      * @param string|null $title
-     * @return DialogForm
+     * @return ModalForm
      */
-    public static function popup(?string $title = null)
+    public static function modal(?string $title = null)
     {
-        return new DialogForm($title);
+        return new ModalForm($title);
     }
 
     /**

src/Form/Field.php

@@ -900,13 +900,13 @@ class Field implements Renderable
     }
 
     /**
-     * Remove the field in dialog.
+     * Remove the field in modal.
      *
      * @return $this
      */
-    public function hideInDialog()
+    public function hideInModal()
     {
-        if (Form::inDialog()) {
+        if (Form::inModal()) {
             $this->setDisplay(false);
         }
 

src/Grid.php

@@ -500,7 +500,7 @@ HTML
      * @param string $height
      * @return $this
      */
-    public function setDialogFormDimensions(string $width, string $height)
+    public function setModalFormDimensions(string $width, string $height)
     {
         $this->options['dialog_form_area'] = [$width, $height];
 

src/Grid/Actions/QuickEdit.php

@@ -24,7 +24,7 @@ class QuickEdit extends RowAction
 
             list($width, $height) = $this->parent->option('dialog_form_area');
 
-            Form::popup(trans('admin.edit'))
+            Form::modal(trans('admin.edit'))
                 ->click(".{$this->getElementClass()}")
                 ->dimensions($width, $height)
                 ->success('LA.reload()')

src/Grid/Displayers/Actions.php

@@ -218,7 +218,7 @@ EOT;
 
             list($width, $height) = $this->grid->option('dialog_form_area');
 
-            Form::popup(trans('admin.edit'))
+            Form::modal(trans('admin.edit'))
                 ->click(".{$this->grid->getGridRowName()}-edit")
                 ->dimensions($width, $height)
                 ->success('LA.reload()')

src/Grid/Tools/CreateButton.php

@@ -28,7 +28,7 @@ class CreateButton
 
         list($width, $height) = $this->grid->option('dialog_form_area');
 
-        Form::popup($new)
+        Form::modal($new)
             ->click(".{$this->grid->getGridRowName()}-create")
             ->success('LA.reload()')
             ->dimensions($width, $height)

src/Show/Tools.php

@@ -274,7 +274,7 @@ EOF;
             $id = 'show-edit-'.Str::random(8);
             list($width, $height) = $this->dialogFormDimensions;
 
-            Form::popup($edit)
+            Form::modal($edit)
                 ->click(".$id")
                 ->dimensions($width, $height)
                 ->success('LA.reload()')

src/Tree.php

@@ -475,7 +475,7 @@ JS;
         if ($this->useQuickEdit) {
             list($width, $height) = $this->dialogFormDimensions;
 
-            Form::popup(trans('admin.edit'))
+            Form::modal(trans('admin.edit'))
                 ->click('.tree-quick-edit')
                 ->success('LA.reload()')
                 ->dimensions($width, $height)
@@ -491,7 +491,7 @@ JS;
         if ($this->useQuickCreate) {
             list($width, $height) = $this->dialogFormDimensions;
 
-            Form::popup(trans('admin.new'))
+            Form::modal(trans('admin.new'))
                 ->click('.tree-quick-create')
                 ->success('LA.reload()')
                 ->dimensions($width, $height)

src/Widgets/DialogForm.php → src/Widgets/ModalForm.php

@@ -7,16 +7,15 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Facades\URL;
 
-class DialogForm
+class ModalForm
 {
     const QUERY_NAME = '_form_win_';
 
     /**
      * @var string
      */
-    public static $contentView = 'admin::contents.dialog-form';
+    public static $contentView = 'admin::contents.modal-form';
 
     /**
      * @var array
@@ -239,7 +238,7 @@ class DialogForm
         {$this->handlers['saved']}
     };
     
-    LA.DialogForm(opts);
+    LA.ModalForm(opts);
 })();
 JS
         );
@@ -267,8 +266,6 @@ JS
     }
 
     /**
-     * 对弹窗要渲染的表单对象进行前置处理
-     *
      * @param Form $form
      */
     public static function prepare(Form $form)