dialog form

update

src/Form.php

@@ -14,7 +14,7 @@ use Dcat\Admin\Form\Row;
 use Dcat\Admin\Form\Tab;
 use Dcat\Admin\Traits\HasBuilderEvents;
 use Dcat\Admin\Traits\HasFormResponse;
-use Dcat\Admin\Widgets\ModalForm;
+use Dcat\Admin\Widgets\DialogForm;
 use Illuminate\Contracts\Support\MessageProvider;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Database\Eloquent\Model;
@@ -288,7 +288,7 @@ class Form implements Renderable
         $this->isSoftDeletes = $repository ? $this->repository->isSoftDeletes() : false;
 
         $this->model(new Fluent());
-        $this->prepareModalForm();
+        $this->prepareDialogForm();
         $this->callResolving();
     }
 
@@ -1626,9 +1626,9 @@ class Form implements Renderable
     /**
      * @return $this
      */
-    protected function prepareModalForm()
+    protected function prepareDialogForm()
     {
-        ModalForm::prepare($this);
+        DialogForm::prepare($this);
 
         return $this;
     }
@@ -1641,24 +1641,24 @@ class Form implements Renderable
     public function inModal(\Closure $callback = null)
     {
         if (! $callback) {
-            return ModalForm::is();
+            return DialogForm::is();
         }
 
-        if (ModalForm::is()) {
+        if (DialogForm::is()) {
             $callback($this);
         }
     }
 
     /**
-     * Create a modal form.
+     * Create a dialog form.
      *
      * @param string|null $title
      *
-     * @return ModalForm
+     * @return DialogForm
      */
-    public static function modal(?string $title = null)
+    public static function dialog(?string $title = null)
     {
-        return new ModalForm($title);
+        return new DialogForm($title);
     }
 
     /**

src/Grid/Actions/QuickEdit.php

@@ -26,7 +26,7 @@ class QuickEdit extends RowAction
 
             $title = trans('admin.edit').' - '.$this->getKey();
 
-            Form::modal($title)
+            Form::dialog($title)
                 ->click(".{$this->getElementClass()}")
                 ->dimensions($width, $height)
                 ->forceRefresh()

src/Grid/Displayers/Actions.php

@@ -258,7 +258,7 @@ EOT;
 
             [$width, $height] = $this->grid->option('dialog_form_area');
 
-            Form::modal(trans('admin.edit'))
+            Form::dialog(trans('admin.edit'))
                 ->click(".{$this->grid->getRowName()}-edit")
                 ->dimensions($width, $height)
                 ->success('Dcat.reload()');

src/Grid/Tools/CreateButton.php

@@ -34,7 +34,7 @@ class CreateButton implements Renderable
 
         [$width, $height] = $this->grid->option('dialog_form_area');
 
-        Form::modal($new)
+        Form::dialog($new)
             ->click(".{$class}")
             ->success('Dcat.reload()')
             ->dimensions($width, $height);

src/Show/Tools.php

@@ -291,7 +291,7 @@ EOF;
             $id = 'show-edit-'.Str::random(8);
             [$width, $height] = $this->dialogFormDimensions;
 
-            Form::modal($edit)
+            Form::dialog($edit)
                 ->click(".$id")
                 ->dimensions($width, $height)
                 ->success('Dcat.reload()');

src/Traits/HasAssets.php

@@ -120,4 +120,14 @@ trait HasAssets
     {
         static::assets()->style($style);
     }
+
+    /**
+     * @param string $font
+     *
+     * @return void
+     */
+    public static function fonts(string $font)
+    {
+        static::assets()->fonts = $font;
+    }
 }

src/Tree.php

@@ -498,7 +498,7 @@ JS;
         if ($this->useQuickEdit) {
             [$width, $height] = $this->dialogFormDimensions;
 
-            Form::modal(trans('admin.edit'))
+            Form::dialog(trans('admin.edit'))
                 ->click('.tree-quick-edit')
                 ->success('Dcat.reload()')
                 ->dimensions($width, $height);
@@ -513,7 +513,7 @@ JS;
         if ($this->useQuickCreate) {
             [$width, $height] = $this->dialogFormDimensions;
 
-            Form::modal(trans('admin.new'))
+            Form::dialog(trans('admin.new'))
                 ->click('.tree-quick-create')
                 ->success('Dcat.reload()')
                 ->dimensions($width, $height);

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

@@ -8,14 +8,14 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Contracts\Support\Arrayable;
 
-class ModalForm
+class DialogForm
 {
-    const QUERY_NAME = '_form_win_';
+    const QUERY_NAME = '_dialog_form_';
 
     /**
      * @var string
      */
-    public static $contentView = 'admin::contents.modal-form';
+    public static $contentView = 'admin::layouts.form-content';
 
     /**
      * @var array
@@ -255,7 +255,7 @@ JS
     }
 
     /**
-     * Automatically render to the body element.
+     * 自动渲染
      *
      * @return void
      */
@@ -268,13 +268,18 @@ JS
         });
     }
 
+    /**
+     * 配置选项初始化
+     *
+     * @return void
+     */
     protected function setupOptions()
     {
         $this->options['lang'] = [
-            'submit'      => trans('admin.submit'),
-            'reset'       => trans('admin.reset'),
-            'save_failed' => trans('admin.save_failed'),
+            'submit' => trans('admin.submit'),
+            'reset'  => trans('admin.reset'),
         ];
+
         $this->options['query'] = static::QUERY_NAME;
     }
 
@@ -297,11 +302,11 @@ JS
             return;
         }
 
-        Admin::$baseCss = [];
-        Admin::$baseJs = [];
-        Admin::$fonts = '';
+        Admin::baseCss([]);
+        Admin::baseJs([]);
+        Admin::fonts('');
 
-        Admin::$disableSkinCss = true;
+        Admin::assets()->full();
 
         $form->wrap(function ($v) {
             return $v;