更新 Grid From 定义方式，去除数组包裹

Author: SmallRuralDog

docs/README.md

@@ -1,9 +1,3 @@
-
-
-
-
-
-
 ![logo](README.assets/logo-1584436939847.png)
 
 Laravel-Vue-Admin 是一个开箱即用的Laravel后台扩展
@@ -27,43 +21,50 @@ php artisan admin:install
 启动服务后，在浏览器打开 `/admin` ,使用用户名 admin 和密码 admin登录.
 ## 开始使用
 下面是一个简单使用的代码示例
+
+
+
+创建资源控制器 继承`AdminController`，并实现`AdminResource`
+
 ```php
-namespace SmallRuralDog\Admin\Controllers;
-use SmallRuralDog\Admin\Components\Tag;
-use SmallRuralDog\Admin\Components\Transfer;
-use SmallRuralDog\Admin\Components\TransferData;
-use SmallRuralDog\Admin\Form;
-use SmallRuralDog\Admin\Grid;
-class RoleController extends AdminController
+use SmallRuralDog\Admin\Controllers\AdminController;
+use SmallRuralDog\Admin\Controllers\AdminResource;
+
+class GroupBuyController extends AdminController implements AdminResource
 {
-    protected function grid()
+
+    //表格定义
+    public function grid()
     {
-        $roleModel = config('admin.database.roles_model');
-        $grid = new Grid(new $roleModel());
-        $grid->columns([
-            $grid->column('id', 'ID')->width('80px')->sortable(),
-        ]);
+        $grid = new Grid(new GroupBuyGoods());
+        $grid->column('goodsSku.image', '产品')->align("center")->component(Image::make()->size(50, 50))->width(70);
+        $grid->column('goodsSku.name', ' ');
+        $grid->column('group_buy_number', '几人团')->width(90)->align('center');
+        $grid->column('group_buy_price', '拼团价格')->width(90)->align('center')->itemPrefix("￥");
+        $grid->column('start_time', '开始时间')->width(190);
+        $grid->column('end_time', '结束时间')->width(190);
         return $grid;
     }
-    public function form()
+
+    //表单定义
+    public function form($isEdit = false)
     {
-        $permissionModel = config('admin.database.permissions_model');
-        $roleModel = config('admin.database.roles_model');
-        $form = new Form(new $roleModel());
-        $form->items([
-            $form->item('slug', trans('admin::admin.slug'))->serveRules('required'),
-        ]);
+        $form = new Form(new GroupBuyGoods());
+        $form->item('name', '拼团标题');
+        $form->item('goods_sku_id', "产品")->required()->component(Select::make()->style(['width' => '500px'])->filterable()->remote(route("seckillGoods/searchGoodsSku")));
+        $form->item('group_buy_number', "几人团")->required()->component(InputNumber::make(2)->min(2));
+        $form->item('group_buy_price', "拼团价格")->required()->component(InputNumber::make()->precision(2)->controls(false));
+        $form->item('start_time', "开始时间")->required()->component(DateTimePicker::make());
+        $form->item('end_time', "结束时间")->required()->component(DateTimePicker::make());
         return $form;
     }
 }
 ```
-创建一个控制器继承 `AdminController`。
-
 注册路由
 ```php
- $router->resource('auth/roles', 'RoleController')->names('admin.auth.roles');
+ $router->resource('GroupBu', 'GroupBuyController');
 ```
-添加菜单，菜单的Uri和注册的路由`auth/roles`一样
+添加菜单，菜单的Uri和注册的路由`GroupBu`一样
 
 ## 版本升级
 

docs/grid.md

@@ -7,14 +7,20 @@
 ```php
 use SmallRuralDog\Admin\Grid;
 
-$userModel = config('admin.database.users_model');
-$grid = new Grid(new $userModel());
-$idColumn = $grid->column('id', "ID")->width("100")->sortable();
-$nameColumn = $grid->column('name', '用户昵称');
-$grid->columns([
-    $idColumn,
-    $nameColumn
-]);
+$grid = new Grid(new SeckillGoods());
+
+//设置字段
+$grid->column('order', '排序')->width(80);
+
+//toolbar设置
+$grid->toolbars(function (Grid\Toolbars $toolbars) {
+    $toolbars->createButton()->content("添加商品");
+});
+//action设置
+$grid->actions(function (Grid\Actions $actions) {
+    $actions->hideEditAction();
+});
+
 return $grid;
 ```
 
@@ -584,38 +590,6 @@ public function menuOrder(Request $request)
             'target' => 'required',//目标节点信息
             'type' => ['required', Rule::in(["before", "after", "inner"])],//放置类型  前 后  插入
         ]);
-
-        $self_id = $request->input('self.id');
-        $target_id = $request->input('target.id');
-        $type = $request->input('type');
-        $self_node = Menu::query()->findOrFail($self_id);
-        $target_node = Menu::query()->findOrFail($target_id);
-
-        switch ($type) {
-            case "before":
-                Menu::query()->where('parent_id', $target_node->parent_id)
-                    ->where('order', '>=', $target_node->order)
-                    ->increment('order');
-                $self_node->parent_id = $target_node->parent_id;
-                $self_node->order = $target_node->order;
-                $self_node->save();
-                break;
-            case "after":
-                Menu::query()->where('parent_id', $target_node->parent_id)
-                    ->where('order', '>', $target_node->order)
-                    ->increment('order');
-                $self_node->parent_id = $target_node->parent_id;
-                $self_node->order = $target_node->order + 1;
-                $self_node->save();
-                break;
-            case "inner":
-                $self_node->parent_id = $target_node->id;
-                $self_node->order = 1;
-                $self_node->save();
-                break;
-        }
-
-
     } catch (\Exception $exception) {
         return \Admin::responseError($exception->getMessage());
     }
@@ -697,7 +671,7 @@ $actions->deleteAction()->message("确定要删除吗，删除不可恢复？");
 
 #### 添加自定义操作
 
-创建自定义操作请查看 [如何创建自定义操作](https://smallruraldog.github.io/laravel-vue-admin/#/custom?id=%e8%a1%a8%e6%a0%bc%e6%93%8d%e4%bd%9c%e7%bb%84%e4%bb%b6)
+创建自定义操作请查看 [如何创建自定义操作](./custom?id=%e8%a1%a8%e6%a0%bc%e6%93%8d%e4%bd%9c%e7%bb%84%e4%bb%b6)
 
 ```php
 $actions->add(new MyAction())
@@ -710,6 +684,7 @@ $actions->add(new MyAction())
 ```php
 $grid->toolbars(function (Grid\Toolbars $toolbars) {
 	$toolbars->hideCreateButton();
+    $toolbars->createButton()->content("添加商品");//获取创建组件实例，修改属性
 });
 ```
 

package-lock.json

@@ -22,7 +22,6 @@
         "resolve-url-loader": "^2.3.1",
         "sass": "^1.20.1",
         "sass-loader": "7.*",
-        "view-design": "^4.1.3",
         "vue": "^2.6.11",
         "vue-bus": "^1.2.1",
         "vue-clipboard2": "^0.3.1",
@@ -35,7 +34,9 @@
     },
     "dependencies": {
         "awe-dnd": "^0.3.4",
+        "nprogress": "^0.2.0",
         "url-loader": "^3.0.0",
+        "vue-nprogress": "^0.1.5",
         "vuex": "^3.1.3"
     }
 }