Browse Source

IFrameGrid

jqh 5 years ago
parent
commit
adcefec2c3

+ 1 - 1
resources/views/filter/selectresource.blade.php

@@ -29,7 +29,7 @@ Dcat.ready(function () {
         source: '{!! $source !!}',
         maxItem: {!! (int)$maxItem !!},
         area: {!! $area !!},
-        queryName: '{{ Dcat\Admin\SimpleGrid::QUERY_NAME }}',
+        queryName: '{{ Dcat\Admin\IFrameGrid::QUERY_NAME }}',
         items: {!! $value !!},
         placeholder: '{{$placeholder ?: $label}}',
         showCloseButton: false,

+ 3 - 3
src/Controllers/AdminController.php

@@ -3,7 +3,7 @@
 namespace Dcat\Admin\Controllers;
 
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\SimpleGrid;
+use Dcat\Admin\IFrameGrid;
 use Illuminate\Routing\Controller;
 
 class AdminController extends Controller
@@ -56,8 +56,8 @@ class AdminController extends Controller
      */
     public function index(Content $content)
     {
-        if (request(SimpleGrid::QUERY_NAME)) {
-            return $content->body($this->simpleGrid());
+        if (request(IFrameGrid::QUERY_NAME)) {
+            return $content->body($this->iFrameGrid());
         }
 
         return $content

+ 5 - 5
src/Controllers/PermissionController.php

@@ -9,7 +9,7 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Models\Repositories\Permission;
 use Dcat\Admin\Show;
-use Dcat\Admin\SimpleGrid;
+use Dcat\Admin\IFrameGrid;
 use Dcat\Admin\Tree;
 use Illuminate\Support\Str;
 
@@ -34,8 +34,8 @@ class PermissionController extends AdminController
      */
     public function index(Content $content)
     {
-        if (request(SimpleGrid::QUERY_NAME)) {
-            return $content->body($this->simpleGrid());
+        if (request(IFrameGrid::QUERY_NAME)) {
+            return $content->body($this->iFrameGrid());
         }
 
         return $content
@@ -44,9 +44,9 @@ class PermissionController extends AdminController
             ->body($this->treeView());
     }
 
-    protected function simpleGrid()
+    protected function iFrameGrid()
     {
-        $grid = new SimpleGrid(new Permission());
+        $grid = new IFrameGrid(new Permission());
 
         $grid->id->sortable();
         $grid->slug;

+ 3 - 3
src/Controllers/RoleController.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Models\Repositories\Role;
 use Dcat\Admin\Models\Role as RoleModel;
 use Dcat\Admin\Show;
-use Dcat\Admin\SimpleGrid;
+use Dcat\Admin\IFrameGrid;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Tree;
 
@@ -31,8 +31,8 @@ class RoleController extends AdminController
      */
     protected function grid()
     {
-        if ($mini = request(SimpleGrid::QUERY_NAME)) {
-            $grid = new SimpleGrid(new Role());
+        if ($mini = request(IFrameGrid::QUERY_NAME)) {
+            $grid = new IFrameGrid(new Role());
         } else {
             $grid = new Grid(new Role());
         }

+ 4 - 4
src/Controllers/UserController.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Models\Administrator as AdministratorModel;
 use Dcat\Admin\Models\Repositories\Administrator;
 use Dcat\Admin\Show;
-use Dcat\Admin\SimpleGrid;
+use Dcat\Admin\IFrameGrid;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Tree;
 
@@ -74,11 +74,11 @@ class UserController extends AdminController
     }
 
     /**
-     * @return SimpleGrid
+     * @return IFrameGrid
      */
-    protected function simpleGrid()
+    protected function iFrameGrid()
     {
-        $grid = new SimpleGrid(new Administrator());
+        $grid = new IFrameGrid(new Administrator());
 
         $grid->quickSearch(['id', 'name', 'username']);
 

+ 2 - 2
src/Form/Builder.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Contracts\UploadField;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form\Field\Hidden;
 use Dcat\Admin\Form\Step\Builder as StepBuilder;
-use Dcat\Admin\SimpleGrid;
+use Dcat\Admin\IFrameGrid;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\DialogForm;
 use Illuminate\Contracts\Support\Renderable;
@@ -690,7 +690,7 @@ class Builder
 
         if (
             Str::contains($previous, url($this->getResource()))
-            && ! Helper::urlHasQuery($previous, [SimpleGrid::QUERY_NAME, DialogForm::QUERY_NAME])
+            && ! Helper::urlHasQuery($previous, [IFrameGrid::QUERY_NAME, DialogForm::QUERY_NAME])
         ) {
             $this->addHiddenField(
                 (new Hidden(static::PREVIOUS_URL_KEY))->value($previous)

+ 2 - 2
src/Form/Field/SelectResource.php

@@ -4,7 +4,7 @@ namespace Dcat\Admin\Form\Field;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form\Field;
-use Dcat\Admin\SimpleGrid;
+use Dcat\Admin\IFrameGrid;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -170,7 +170,7 @@ class SelectResource extends Field
         $disabled = empty($this->attributes['disabled']) ? '' : 'disabled';
         $containerId = $this->id.$this->getFormElementId();
         $maxItem = (int) $this->maxItem;
-        $queryName = SimpleGrid::QUERY_NAME;
+        $queryName = IFrameGrid::QUERY_NAME;
 
         $this->script = <<<JS
 Dcat.ResourceSelector({

+ 1 - 1
src/SimpleGrid.php → src/IFrameGrid.php

@@ -4,7 +4,7 @@ namespace Dcat\Admin;
 
 use Dcat\Admin\Layout\Content;
 
-class SimpleGrid extends Grid
+class IFrameGrid extends Grid
 {
     const QUERY_NAME = '_resource_';