-
-Dcat Admin是一个基于laravel-admin二次开发而成的后台系统构建工具，只需很少的代码即可快速构建出一个功能完善的高颜值后台系统。内置丰富的后台常用组件，开箱即用，让开发者告别冗杂的HTML代码，对后端开发者非常友好。
-
-### Financial Contributors
-
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/dcat-admin/contribute)]
-
-#### Individuals
-
-
-
-#### Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/dcat-admin/contribute)]
-
-
-
-
-
-
-
-
-
-
-
-
-### License
-------------
-`dcat-admin` is licensed under [The MIT License (MIT)](LICENSE).
diff --git a/packages/goods/composer.json b/packages/goods/composer.json
index ed52568..3253755 100644
--- a/packages/goods/composer.json
+++ b/packages/goods/composer.json
@@ -1,5 +1,5 @@
{
- "name": "peidikeji/goods",
+ "name": "peidikeji/dcat-admin-extension-goods",
"alias": "goods",
"description": "基础商品管理",
"type": "library",
diff --git a/packages/goods/resources/lang/en/goods-category.php b/packages/goods/resources/lang/en/goods-category.php
new file mode 100644
index 0000000..b625128
--- /dev/null
+++ b/packages/goods/resources/lang/en/goods-category.php
@@ -0,0 +1,4 @@
+ [
+ 'GoodsCategory' => '商品分类',
+ 'goods' => '商品管理',
+ 'category' => '分类管理',
+ 'root' => '无',
+ ],
+ 'fields' => [
+ 'name' => '分类名称',
+ 'image' => '图片',
+ 'description' => '描述',
+ 'sort' => '排序(正序)',
+ 'parent_id' => '上级',
+ 'is_enable' => '开启',
+ 'parent' => [
+ 'name' => '上级'
+ ]
+ ]
+];
diff --git a/packages/goods/src/GoodsServiceProvider.php b/packages/goods/src/GoodsServiceProvider.php
index 1902d7c..8e6b5a1 100644
--- a/packages/goods/src/GoodsServiceProvider.php
+++ b/packages/goods/src/GoodsServiceProvider.php
@@ -7,21 +7,8 @@ use Dcat\Admin\Admin;
class GoodsServiceProvider extends ServiceProvider
{
- public function register()
- {
- //
- }
-
- public function init()
- {
- parent::init();
-
- //
-
- }
-
- // public function settingForm()
- // {
- // return new Setting($this);
- // }
+ protected $menu = [
+ ['title' => '商品管理', 'uri' => '', 'icon' => ''],
+ ['title' => '商品分类', 'uri' => 'goods/category', 'icon' => '', 'parent' => '商品管理'],
+ ];
}
diff --git a/packages/goods/src/Http/Controllers/Admin/GoodsCategoryController.php b/packages/goods/src/Http/Controllers/Admin/GoodsCategoryController.php
new file mode 100644
index 0000000..6223aef
--- /dev/null
+++ b/packages/goods/src/Http/Controllers/Admin/GoodsCategoryController.php
@@ -0,0 +1,63 @@
+disableRowSelector();
+
+ $grid->column('name')->tree(true, false);
+ $grid->column('image')->image('', 100);
+ $grid->column('sort')->editable(['mask' => '{alias:\'numeric\',min:0,max:999}']);
+ $grid->column('is_enable')->switch();
+
+ return $grid;
+ }
+
+ protected function form()
+ {
+ $form = Form::make(GoodsCategory::with(['parent']));
+
+ $form->select('parent_id')->help('不选默认为顶级')->options(GoodsCategory::selectOptions())->default(0);
+
+ $form->text('name')->required();
+ $form->image('image')
+ ->uniqueName()
+ ->move('article-category')
+ ->autoUpload();
+ $form->number('sort')
+ ->min(0)
+ ->default(1)
+ ->help('数值越小, 越靠前');
+ $form->switch('is_enable')->default(1);
+ $form->text('description');
+
+ return $form;
+ }
+
+ protected function detail($id)
+ {
+ $info = GoodsCategory::with(['parent'])->findOrFail($id);
+ $show = Show::make($info);
+
+ $show->field('name');
+ $show->field('parent.name');
+ $show->field('image')->image('', 100);
+ $show->field('description');
+ $show->field('sort');
+
+ return $show;
+ }
+}
diff --git a/packages/goods/src/Http/routes.php b/packages/goods/src/Http/routes.php
index 7c4d255..6e9220b 100644
--- a/packages/goods/src/Http/routes.php
+++ b/packages/goods/src/Http/routes.php
@@ -1,3 +1,7 @@
parent_id) {
+ // 将层级设为 1
+ $category->level = 1;
+ // 将 path 设为 -
+ $category->path = '-';
+ } else {
+ // 将层级设为父类目的层级 + 1
+ $category->level = $category->parent->level + 1;
+ // 将 path 值设为父类目的 path 追加父类目 ID 以及最后跟上一个 - 分隔符
+ $category->path = $category->parent->path.$category->parent_id.'-';
+ }
+ });
+
+ static::deleting(function ($category) {
+ // 所有下级分类
+ $ids = GoodsCategory::where('path', 'like', '%-'.$category->id.'-%')->pluck('id');
+ // 检查下级分类是否包含商品
+ if (Goods::whereIn('category_id', array_merge($ids, [$category->id]))->exists()) {
+ // todo 阻止删除该分类
+ }
+ // 删除所有下级分类
+ GoodsCategory::where('path', 'like', '%-'.$category->id.'-%')->delete();
+ });
+ }
+
+ public function parent()
+ {
+ return $this->belongsTo(self::class, 'parent_id');
+ }
+
+ public function children()
+ {
+ return $this->hasMany(self::class, 'parent_id');
+ }
+
+ public function goods()
+ {
+ return $this->hasMany(Goods::class, 'category_id');
+ }
+
+ public function scopeOrder($q)
+ {
+ return $q->orderBy('sort');
+ }
+}
diff --git a/packages/goods/updates/CreateGoodsTable.php b/packages/goods/updates/CreateGoodsTable.php
index 0c83f4d..020696a 100644
--- a/packages/goods/updates/CreateGoodsTable.php
+++ b/packages/goods/updates/CreateGoodsTable.php
@@ -13,6 +13,7 @@ class CreateGoodsTable extends Migration
*/
public function up()
{
+ $this->down();
Schema::create('goods_category', function (Blueprint $table) {
$table->id();
$table->string('name')->comment('分类名称');
@@ -21,6 +22,7 @@ class CreateGoodsTable extends Migration
$table->unsignedBigInteger('parent_id')->default(0)->comment('父级ID');
$table->unsignedInteger('level')->default(1)->comment('层级');
$table->unsignedInteger('sort')->default(1)->comment('排序 asc');
+ $table->unsignedTinyInteger('is_enable')->default(1)->comment('状态');
$table->string('path')->default('-')->comment('所有的父级ID');
$table->comment('商品分类');
@@ -37,13 +39,11 @@ class CreateGoodsTable extends Migration
$table->text('content')->nullable()->comment('详细');
$table->unsignedInteger('on_sale')->default(0)->comment('是否上架');
$table->unsignedInteger('stock')->default(0)->comment('库存');
- $table->json('weight')->nullable()->comment('重量 {weight: 0, unit: "g"}');
- $table->unsignedInteger('sold_count')->default(0)->comment('实际销量');
+ $table->unsignedInteger('sold_count')->default(0)->comment('销量');
$table->decimal('price', 12, 2)->comment('售价');
$table->json('attr')->nullable()->comment('属性');
$table->json('spec')->nullable()->comment('规格');
$table->json('part')->nullable()->comment('配件');
- $table->string('category_path');
$table->timestamps();
$table->softDeletes();
diff --git a/packages/goods/version.php b/packages/goods/version.php
index 1a623b7..bfc02ed 100644
--- a/packages/goods/version.php
+++ b/packages/goods/version.php
@@ -1,7 +1,7 @@
- [
- 'Initialize extension.',
- ],
-];
+ [
+ 'CreateGoodsTable.php',
+ ],
+];
diff --git a/packages/keywords/updates/KeywordsTableSeeder.php b/packages/keywords/updates/KeywordsTableSeeder.php
new file mode 100644
index 0000000..2a786ce
--- /dev/null
+++ b/packages/keywords/updates/KeywordsTableSeeder.php
@@ -0,0 +1,56 @@
+ ['name' => '字典管理', 'curd' => true]
+ ];
+ // Permission::where('slug', 'like', 'dcat.admin.keywords%')->delete();
+ $this->createPermissionData($permissions);
+ }
+
+ protected function createPermissionData(array $permissions, string $key = '', int $pId = 0)
+ {
+ $curdArr = [
+ 'index' => '列表',
+ 'create' => '新增',
+ 'edit' => '修改',
+ 'destroy' => '删除',
+ 'show' => '详情',
+ ];
+ foreach ($permissions as $slug => $permission) {
+ //是否已存在该权限
+ $slugKey = 'dcat.admin.' . ($key ? $key . '.' . $slug : $slug);
+
+ $pper = Permission::updateOrCreate(['slug' => $slugKey], ['name' => is_string($permission) ? $permission : $permission['name'], 'parent_id' => $pId]);
+
+ if (!is_string($permission)) {
+ if (!isset($permission['children'])) {
+ $permission['children'] = [];
+ }
+ //判断是否默认插入curd权限
+ if (isset($permission['curd']) && $permission['curd']) {
+ if (is_array($permission['curd'])) {
+ $permission['curd'] = array_reverse($permission['curd']);
+ foreach ($permission['curd'] as $value) {
+ $permission['children'] = array_merge([$value => $curdArr[$value]], $permission['children']);
+ }
+ } else {
+ $permission['children'] = array_merge($curdArr, $permission['children']);
+ }
+ }
+
+ if (count($permission['children']) > 0) {
+ $_key = $permission['curd'] !== false ? ($key ? $key . '.' . $slug : $slug) : $key;
+ $this->createPermissionData($permission['children'], $_key ?? $slug, $pper->id);
+ }
+ }
+ }
+ }
+}
diff --git a/packages/keywords/version.php b/packages/keywords/version.php
index b50c47c..8a8e79a 100644
--- a/packages/keywords/version.php
+++ b/packages/keywords/version.php
@@ -2,6 +2,7 @@
return [
'1.0.0' => [
- 'CreateKeywordsTable.php'
+ 'CreateKeywordsTable.php',
+ 'KeywordsTableSeeder.php'
],
];
diff --git a/src/Form/Field.php b/src/Form/Field.php
index c6f9a42..9574cef 100755
--- a/src/Form/Field.php
+++ b/src/Form/Field.php
@@ -134,7 +134,7 @@ class Field implements Renderable
*
* @var array
*/
- protected $attributes = [];
+ protected $attributes = ['autocomplete' => 'off'];
/**
* Parent form.
diff --git a/src/Show/Tools.php b/src/Show/Tools.php
index bcddd89..ebd99c1 100755
--- a/src/Show/Tools.php
+++ b/src/Show/Tools.php
@@ -251,7 +251,7 @@ class Tools implements Renderable
return <<
-
+
{$list}
- 
