Przeglądaj źródła

调整方法名称

jqh 5 lat temu
rodzic
commit
91e399c9d1

+ 1 - 1
resources/views/grid/table.blade.php

@@ -32,7 +32,7 @@
     <div class="card-body panel-collapse collapse in table-responsive" {!! $grid->option('show_bordered') ? 'style="padding:3px 10px 10px"' : '' !!}>
         <table class=" table table-hover responsive {{ $grid->option('show_bordered') ? 'table-bordered' : $grid->option('table_header_style') }} " id="{{$tableId}}">
             <thead>
-            @if ($headers = $grid->getMutipleHeaders())
+            @if ($headers = $grid->getMultipleHeaders())
                 <tr>
                     @foreach($headers as $header)
                         {!! $header->render() !!}

+ 39 - 2
src/Controllers/AdminController.php

@@ -3,12 +3,11 @@
 namespace Dcat\Admin\Controllers;
 
 use Dcat\Admin\Layout\Content;
+use Dcat\Admin\SimpleGrid;
 use Illuminate\Routing\Controller;
 
 class AdminController extends Controller
 {
-    use HasResourceActions;
-
     /**
      * Title for current resource.
      *
@@ -47,6 +46,10 @@ class AdminController extends Controller
      */
     public function index(Content $content)
     {
+        if (request(SimpleGrid::QUERY_NAME)) {
+            return $content->body($this->simpleGrid());
+        }
+
         return $content
             ->title($this->title())
             ->description($this->description['index'] ?? trans('admin.list'))
@@ -99,4 +102,38 @@ class AdminController extends Controller
             ->description($this->description['create'] ?? trans('admin.create'))
             ->body($this->form());
     }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param int $id
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function update($id)
+    {
+        return $this->form()->update($id);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @return mixed
+     */
+    public function store()
+    {
+        return $this->form()->store();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param int $id
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        return $this->form()->destroy($id);
+    }
 }

+ 1 - 1
src/Form.php

@@ -623,7 +623,7 @@ class Form implements Renderable
 
         if ($response = $this->handleUploadFile($data)) {
             if (($value = $response->getData()) && ! empty($value->id)) {
-                $this->step()->stash(
+                $this->multipleSteps()->stash(
                     [$data['upload_column'] => $value->id],
                     true
                 );

+ 1 - 1
src/Form/Builder.php

@@ -239,7 +239,7 @@ class Builder
      *
      * @return StepBuilder
      */
-    public function step(?\Closure $callback = null)
+    public function multipleSteps(?\Closure $callback = null)
     {
         if (! $this->stepBuilder) {
             $this->view = 'admin::form.steps';

+ 5 - 5
src/Form/Concerns/HasSteps.php

@@ -16,9 +16,9 @@ trait HasSteps
      *
      * @return StepBuilder
      */
-    public function step(\Closure $builder = null)
+    public function multipleSteps(\Closure $builder = null)
     {
-        return $this->builder->step($builder);
+        return $this->builder->multipleSteps($builder);
     }
 
     /**
@@ -88,7 +88,7 @@ trait HasSteps
         }
 
         // Stash input data.
-        $this->step()->stash($data);
+        $this->multipleSteps()->stash($data);
 
         return $this->ajaxResponse('Success');
     }
@@ -120,7 +120,7 @@ trait HasSteps
             return;
         }
 
-        $this->step()->stashIndexByField($input['_column']);
-        $this->step()->forgetStash($input['_column']);
+        $this->multipleSteps()->stashIndexByField($input['_column']);
+        $this->multipleSteps()->forgetStash($input['_column']);
     }
 }

+ 8 - 8
src/Grid/Concerns/HasMultipleHeader.php

@@ -12,7 +12,7 @@ trait HasMultipleHeader
      *
      * @var Header[]
      */
-    protected $mutipleHeaders = [];
+    protected $multipleHeaders = [];
 
     /**
      * Merge cells.
@@ -30,15 +30,15 @@ trait HasMultipleHeader
 
         $this->withBorder();
 
-        return $this->mutipleHeaders[$label] = new Header($this, $label, $columnNames);
+        return $this->multipleHeaders[$label] = new Header($this, $label, $columnNames);
     }
 
     /**
      * @return Header[]
      */
-    public function getMutipleHeaders()
+    public function getMultipleHeaders()
     {
-        return $this->mutipleHeaders;
+        return $this->multipleHeaders;
     }
 
     /**
@@ -46,14 +46,14 @@ trait HasMultipleHeader
      */
     protected function sortHeaders()
     {
-        if (! $this->mutipleHeaders) {
+        if (! $this->multipleHeaders) {
             return;
         }
 
-        $originalHeaders = $this->mutipleHeaders;
+        $originalHeaders = $this->multipleHeaders;
         $originalColumns = $this->columns;
 
-        $headersColumns = $this->mutipleHeaders = $this->columns = [];
+        $headersColumns = $this->multipleHeaders = $this->columns = [];
 
         foreach ($originalHeaders as $header) {
             $headersColumns = array_merge(
@@ -90,7 +90,7 @@ trait HasMultipleHeader
         );
 
         $this->columns = collect($this->columns);
-        $this->mutipleHeaders = array_merge(
+        $this->multipleHeaders = array_merge(
             $beforeHeaders,
             array_values($originalHeaders),
             $afterHeaders