diff --git a/README.md b/README.md index 55ceb68..467c62b 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Dcat-admin 商品管理 ```php $permissions = [ 'goods' => ['name' => '商品管理', 'curd' => true], + 'goods_sku' => ['name' => '货品管理', 'curd' => true], 'goods_category' => ['name' => '商品分类', 'curd' => true], 'goods_brand' => ['name' => '商品品牌', 'curd' => true], 'goods_type' => ['name' => '商品类别', 'curd' => true], diff --git a/lang/zh_CN/goods-type.php b/lang/zh_CN/goods-type.php index 2653bf8..20f09a4 100644 --- a/lang/zh_CN/goods-type.php +++ b/lang/zh_CN/goods-type.php @@ -5,6 +5,7 @@ return [ 'GoodsType' => '商品类别', 'goods' => '商品管理', 'type' => '商品类别', + 'goods-type' => '商品类别', ], 'fields' => [ 'name' => '名称', diff --git a/src/Form/Attr.php b/src/Form/Attr.php index 3c7fe1d..ad33d15 100644 --- a/src/Form/Attr.php +++ b/src/Form/Attr.php @@ -39,8 +39,8 @@ class Attr extends Field return $this; } - // protected function prepareInputValue($value) - // { - // return $value; - // } + protected function prepareInputValue($value) + { + return json_decode($value, true); + } } diff --git a/src/Http/Admin/GoodsTypeController.php b/src/Http/Admin/GoodsTypeController.php index 4012b7e..bddd4ed 100644 --- a/src/Http/Admin/GoodsTypeController.php +++ b/src/Http/Admin/GoodsTypeController.php @@ -49,31 +49,25 @@ class GoodsTypeController extends AdminController protected function form() { return Form::make(new GoodsType(), function (Form $form) { - $form->block(12, function (Form\BlockForm $form) { - $form->title('基本设置'); - $form->text('name')->required(); - $form->showFooter(); - $form->backButton(); - $form->disableResetButton(); - }); + $form->title('基本设置'); + $form->text('name')->required(); - $form->block(12, function (Form\BlockForm $form) { - $form->title('属性'); + $form->fieldset('属性', function (Form $form) { $form->attr('attr')->header(['分组', '名称'])->keys(['name']); - }); - - $form->block(12, function (Form\BlockForm $form) { - $form->title('规格'); + })->collapsed(); + $form->fieldset('规格', function (Form $form) { $form->attr('spec')->header(['名称', '可选值'])->keys(['name']); - }); - $form->block(12, function (Form\BlockForm $form) { - $form->title('配件'); + })->collapsed(); + $form->fieldset('配件', function (Form $form) { $form->attr('part')->header(['名称', '可选值'])->keys(['name']); - }); + })->collapsed(); $form->disableCreatingCheck(); $form->disableViewCheck(); $form->disableEditingCheck(); + $form->disableListButton(); + $form->disableViewButton(); + $form->disableDeleteButton(); $form->deleting(function (Form $form) { $data = $form->model()->toArray(); diff --git a/views/form/attr.blade.php b/views/form/attr.blade.php index cef8df4..d156ddf 100644 --- a/views/form/attr.blade.php +++ b/views/form/attr.blade.php @@ -63,6 +63,7 @@ }