Merge branch 'master' of https://github.com/z-song/laravel-admin

Author: z-song

resources/views/form.blade.php

@@ -8,7 +8,7 @@
     </div>
     <!-- /.box-header -->
     <!-- form start -->
-    {!! $form->open(['class' => "form-horizontal"]) !!}
+    {!! $form->open() !!}
 
     <div class="box-body">
 

resources/views/form/keyvalue.blade.php

@@ -22,7 +22,7 @@
                     <td>
                         <div class="form-group {{ $errors->has($keysErrorKey) ? 'has-error' : '' }}">
                             <div class="col-sm-12">
-                                <input name="{{ $column }}[keys][]" value="{{ old("{$column}.keys.{$k}", $k) }}" class="form-control" required/>
+                                <input name="{{ $name }}[keys][]" value="{{ old("{$column}.keys.{$k}", $k) }}" class="form-control" required/>
 
                                 @if($errors->has($keysErrorKey))
                                     @foreach($errors->get($keysErrorKey) as $message)
@@ -35,7 +35,7 @@
                     <td>
                         <div class="form-group {{ $errors->has($valsErrorKey) ? 'has-error' : '' }}">
                             <div class="col-sm-12">
-                                <input name="{{ $column }}[values][]" value="{{ old("{$column}.values.{$k}", $v) }}" class="form-control" />
+                                <input name="{{ $name }}[values][]" value="{{ old("{$column}.values.{$k}", $v) }}" class="form-control" />
                                 @if($errors->has($valsErrorKey))
                                     @foreach($errors->get($valsErrorKey) as $message)
                                         <label class="control-label" for="inputError"><i class="fa fa-times-circle-o"></i> {{$message}}</label><br/>
@@ -75,14 +75,14 @@
         <td>
             <div class="form-group  ">
                 <div class="col-sm-12">
-                    <input name="{{ $column }}[keys][]" class="form-control" required/>
+                    <input name="{{ $name }}[keys][]" class="form-control" required/>
                 </div>
             </div>
         </td>
         <td>
             <div class="form-group  ">
                 <div class="col-sm-12">
-                    <input name="{{ $column }}[values][]" class="form-control" />
+                    <input name="{{ $name }}[values][]" class="form-control" />
                 </div>
             </div>
         </td>
@@ -95,4 +95,4 @@
             </div>
         </td>
     </tr>
-</template>
+</template>

src/Console/stubs/routes.stub

@@ -8,6 +8,7 @@ Route::group([
     'prefix'        => config('admin.route.prefix'),
     'namespace'     => config('admin.route.namespace'),
     'middleware'    => config('admin.route.middleware'),
+    'as'            => config('admin.route.prefix') . '.',
 ], function (Router $router) {
 
     $router->get('/', 'HomeController@index')->name('admin.home');

src/Form.php

@@ -1218,6 +1218,19 @@ public function setTitle($title = ''): self
         return $this;
     }
 
+    /**
+     * Set a submit confirm.
+     *
+     * @param string $message
+     * @return $this
+     */
+    public function confirm(string $message)
+    {
+        $this->builder()->confirm($message);
+
+        return $this;
+    }
+
     /**
      * Add a row in form.
      *

src/Form/Builder.php

@@ -97,6 +97,11 @@ class Builder
      */
     protected $title;
 
+    /**
+     * @var string
+     */
+    protected $formClass;
+
     /**
      * Builder constructor.
      *
@@ -118,6 +123,8 @@ public function init()
     {
         $this->tools = new Tools($this);
         $this->footer = new Footer($this);
+
+        $this->formClass = 'model-form-' . uniqid();
     }
 
     /**
@@ -487,10 +494,9 @@ public function open($options = []): string
 
         $attributes['action'] = $this->getAction();
         $attributes['method'] = Arr::get($options, 'method', 'post');
+        $attributes['class'] = implode(' ', ['form-horizontal', $this->formClass]);
         $attributes['accept-charset'] = 'UTF-8';
 
-        $attributes['class'] = Arr::get($options, 'class');
-
         if ($this->hasFile()) {
             $attributes['enctype'] = 'multipart/form-data';
         }
@@ -516,6 +522,38 @@ public function close(): string
         return '</form>';
     }
 
+    /**
+     * @param string $message
+     */
+    public function confirm(string $message)
+    {
+        $trans = [
+            'confirm' => trans('admin.confirm'),
+            'cancel'  => trans('admin.cancel'),
+        ];
+
+        $script = <<<SCRIPT
+$('form.{$this->formClass} button[type=submit]').click(function (e) {
+    e.preventDefault();
+    var form = $(this).parents('form');
+    swal({
+        title: "$message",
+        type: "warning",
+        showCancelButton: true,
+        confirmButtonColor: "#DD6B55",
+        confirmButtonText: "{$trans['confirm']}",
+        cancelButtonText: "{$trans['cancel']}",
+    }).then(function (result) {
+        if (result.value) {
+          form.submit();
+        }
+    });
+});
+SCRIPT;
+
+        Admin::script($script);
+    }
+
     /**
      * Remove reserved fields like `id` `created_at` `updated_at` in form fields.
      *