names('article_categories');
-}
-
-if(! Route::has('dcat.admin.articles.index')){
- Route::resource('articles', Controllers\ArticleController::class);
-}
diff --git a/packages/article/src/Models/Article.php b/packages/article/src/Models/Article.php
deleted file mode 100644
index cccf062..0000000
--- a/packages/article/src/Models/Article.php
+++ /dev/null
@@ -1,75 +0,0 @@
-admin_user_id = Admin::user()->id;
- // 添加/修改分类时, 更新 category_path
- if ($model->isDirty('category_id')) {
- $model->category_path = ArticleCategory::where('id', $model->category_id)->value('path') . $model->category_id . '-';
- }
- });
- }
-
- public function category()
- {
- return $this->belongsTo(ArticleCategory::class, 'category_id');
- }
-
- public function adminUser()
- {
- return $this->belongsTo(Administrator::class, 'admin_user_id');
- }
-
- public function getAuthorNameAttribute()
- {
- return $this->attributes['author'] ?? ($this->attributes['admin_user_id'] ? (Administrator::find($this->attributes['admin_user_id'])?->name ?? '未知') : '未知');
- }
-
- //public function image(): Attribute
- //{
- // return Attribute::make(
- // get: fn ($v) => $v ?: 'https://via.placeholder.com/640x480.png',
- // set: fn ($v) => $v ?: 'https://via.placeholder.com/640x480.png',
- // );
- //}
-
- public function scopeSort($q)
- {
- return $q->orderBy('sort', 'desc')->latest('published_at')->latest('id');
- }
-
- public function scopePublish($q)
- {
- return $q->where('published_at', '<=', now());
- }
-}
diff --git a/packages/article/src/Models/ArticleCategory.php b/packages/article/src/Models/ArticleCategory.php
deleted file mode 100644
index 859d989..0000000
--- a/packages/article/src/Models/ArticleCategory.php
+++ /dev/null
@@ -1,70 +0,0 @@
-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 . '-';
- }
- });
- }
-
- public static function selectOptions($root = true)
- {
- $rootText = '顶级';
-
- $options = (new static())->withQuery(function ($q) {
- return $q->sort();
- })->buildSelectOptions();
-
- return collect($options)->when($root, fn ($c) => $c->prepend($rootText, 0))->all();
- }
-
- public function articles()
- {
- return $this->hasMany(Article::class, 'category_id');
- }
-
- public function parent()
- {
- return $this->belongsTo(static::class, 'parent_id');
- }
-
- public function children()
- {
- return $this->hasMany(static::class, 'parent_id')->sort();
- }
-
- public function scopeSort($q)
- {
- return $q->orderBy('sort', 'desc')->orderBy('id');
- }
-}
diff --git a/packages/article/src/Setting.php b/packages/article/src/Setting.php
deleted file mode 100644
index 1e96681..0000000
--- a/packages/article/src/Setting.php
+++ /dev/null
@@ -1,14 +0,0 @@
-text('key1')->required();
- $this->text('key2')->required();
- }
-}
diff --git a/packages/article/updates/AddMediaToArticleTable.php b/packages/article/updates/AddMediaToArticleTable.php
deleted file mode 100644
index be5203e..0000000
--- a/packages/article/updates/AddMediaToArticleTable.php
+++ /dev/null
@@ -1,35 +0,0 @@
-string('media_path')->nullable()->comment('资源地址');
- });
- }
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::table('articles', function (Blueprint $table) {
- //
- $table->dropColumn('media_path');
- });
- }
-};
diff --git a/packages/article/updates/AddnumToArticleTable.php b/packages/article/updates/AddnumToArticleTable.php
deleted file mode 100644
index 0239986..0000000
--- a/packages/article/updates/AddnumToArticleTable.php
+++ /dev/null
@@ -1,36 +0,0 @@
-unsignedBigInteger('like_nums')->default(0)->comment('点赞数');
- $table->unsignedBigInteger('read_nums')->default(0)->comment('阅读数');
- });
- }
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::table('articles', function (Blueprint $table) {
- //
- $table->dropColumn(['like_nums', 'read_nums']);
- });
- }
-};
diff --git a/packages/article/updates/ArticlePermissionSeeder.php b/packages/article/updates/ArticlePermissionSeeder.php
deleted file mode 100644
index 533ff10..0000000
--- a/packages/article/updates/ArticlePermissionSeeder.php
+++ /dev/null
@@ -1,70 +0,0 @@
- ['name' => '文章分类管理', 'curd' => true],
- 'articles' => ['name' => '文章管理', 'curd' => true],
- ];
- $this->createPermissionData($permissions);
- }
-
- /**
- * 插入权限
- *
- * @param array $permissions
- * @param string $key
- * @param integer $pId
- */
- public 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/article/updates/CreateArticleTable.php b/packages/article/updates/CreateArticleTable.php
deleted file mode 100644
index 4dff730..0000000
--- a/packages/article/updates/CreateArticleTable.php
+++ /dev/null
@@ -1,70 +0,0 @@
-id();
- $table->string('name')->comment('名称');
- $table->string('key')->unique()->nullable()->comment('key');
- $table->unsignedTinyInteger('is_recommend')->default(0)->comment('推荐状态');
- $table->unsignedTinyInteger('is_enable')->default(1)->comment('可用状态');
- $table->unsignedBigInteger('parent_id')->default(0)->comment('上级ID');
- $table->unsignedInteger('level')->default(1)->comment('层级');
- $table->string('path')->default('-')->comment('所有的父级ID');
- $table->unsignedInteger('sort')->default(0)->comment('排序 desc');
- $table->string('remarks')->nullable()->comment('备注');
-
- $table->text('ext')->nullable()->comment('扩展字段，可用于SEO配置等');
-
- $table->timestamps();
- });
- }
-
- if (!Schema::hasTable('articles')) {
- Schema::create('articles', function (Blueprint $table) {
- $table->id();
- $table->unsignedBigInteger('category_id')->nullable()->comment('分类ID');
- $table->string('category_path')->default('-')->comment('分类 path');
- $table->unsignedBigInteger('admin_user_id')->comment('创建人');
- $table->string('title')->comment('文章标题');
- $table->string('sub_title')->nullable()->comment('副标题');
- $table->string('author')->nullable()->comment('作者');
- $table->string('cover')->nullable()->comment('封面');
- $table->longText('content')->nullable()->comment('文章内容');
- $table->timestamp('published_at')->nullable()->comment('发布时间');
- $table->unsignedInteger('sort')->default(1)->comment('排序 desc');
- $table->string('remarks')->nullable()->comment('备注');
-
- $table->unsignedTinyInteger('is_recommend')->default(0)->comment('推荐状态');
- $table->unsignedTinyInteger('is_enable')->default(1)->comment('可用状态');
-
- $table->text('ext')->nullable()->comment('扩展字段，可用于SEO配置等');
-
- $table->timestamps();
- });
- }
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::dropIfExists('articles');
- Schema::dropIfExists('article_categories');
- }
-};
diff --git a/packages/article/version.php b/packages/article/version.php
deleted file mode 100644
index 34f933b..0000000
--- a/packages/article/version.php
+++ /dev/null
@@ -1,16 +0,0 @@
- [
- '初始化文章管理',
- 'CreateArticleTable.php',
- ],
- '1.0.1' => [
- '文章添加点赞，浏览字段',
- 'AddnumToArticleTable.php',
- ],
- '1.0.2' => [
- '文章添加媒体内容',
- 'AddMediaToArticleTable.php',
- ],
-];
From a32043e86a73fe5502160e03d96e8b4a3902073c Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 16 Sep 2022 17:15:02 +0800
Subject: [PATCH 14/16] update banner
---
packages/banner/src/Http/Admin/BannerAdController.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/packages/banner/src/Http/Admin/BannerAdController.php b/packages/banner/src/Http/Admin/BannerAdController.php
index 50993cd..e4c0b0a 100644
--- a/packages/banner/src/Http/Admin/BannerAdController.php
+++ b/packages/banner/src/Http/Admin/BannerAdController.php
@@ -18,7 +18,11 @@ class BannerAdController extends AdminController
public function list(Request $request)
{
- $query = BannerAd::filter($request->all());
+ $query = BannerAd::query();
+
+ if ($request->filled('q')) {
+ $query->where('name', 'like', '%'.$request->input('q').'%');
+ }
$query->select(['id', 'name as text', 'width', 'height']);
From 11bcca42133e072ced0a80f734d6446ee97bbab6 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Mon, 19 Sep 2022 15:47:08 +0800
Subject: [PATCH 15/16] tag
---
packages/banner/resources/lang/zh_CN/banner.php | 5 ++++-
packages/banner/src/Http/Admin/BannerController.php | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/packages/banner/resources/lang/zh_CN/banner.php b/packages/banner/resources/lang/zh_CN/banner.php
index 06f30b9..805dac7 100644
--- a/packages/banner/resources/lang/zh_CN/banner.php
+++ b/packages/banner/resources/lang/zh_CN/banner.php
@@ -12,7 +12,10 @@ return [
'sort'=>'排序',
'is_enable'=>'启用',
'remarks'=> '备注',
- 'ext'=>'扩展字段'
+ 'ext'=>'扩展字段',
+ 'ad' => [
+ 'name' => '广告位'
+ ],
],
'options' => [
],
diff --git a/packages/banner/src/Http/Admin/BannerController.php b/packages/banner/src/Http/Admin/BannerController.php
index 770992a..e7ec072 100644
--- a/packages/banner/src/Http/Admin/BannerController.php
+++ b/packages/banner/src/Http/Admin/BannerController.php
@@ -9,6 +9,7 @@ use Dcat\Admin\Widgets\Card;
use Peidikeji\Banner\Models\Banner;
use Dcat\Admin\Grid\Column as GridColumn;
use Dcat\Admin\Http\Controllers\AdminController;
+use Peidikeji\Banner\Models\BannerAd;
class BannerController extends AdminController
{
@@ -18,10 +19,11 @@ class BannerController extends AdminController
protected function grid()
{
- return Grid::make(new Banner(), function (Grid $grid) {
+ return Grid::make(Banner::with(['ad']), function (Grid $grid) {
$grid->model()->sort();
$grid->disableRowSelector();
+ $grid->column('ad.name');
$grid->column('path')->image('', 50);
$grid->column('name');
$grid->column('sort');
@@ -60,6 +62,7 @@ class BannerController extends AdminController
$grid->filter(function (Grid\Filter $filter) {
$filter->panel();
$filter->expand();
+ $filter->equal('ad_id')->select(BannerAd::pluck('name', 'id'))->width(3);
$filter->like('name')->width(3);
});
});
From 56ee1dcb4dc404baaa825587091b3ac867e34fe8 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 21 Sep 2022 13:30:58 +0800
Subject: [PATCH 16/16] update widget form add back button
---
src/Widgets/Form.php | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/Widgets/Form.php b/src/Widgets/Form.php
index 5af92c5..1979daa 100755
--- a/src/Widgets/Form.php
+++ b/src/Widgets/Form.php
@@ -140,7 +140,7 @@ class Form implements Renderable
*
* @var array
*/
- protected $buttons = ['reset' => true, 'submit' => true];
+ protected $buttons = ['reset' => true, 'submit' => true, 'back' => false];
/**
* @var bool
@@ -489,6 +489,13 @@ class Form implements Renderable
return $this;
}
+ public function backButton(bool $value = true)
+ {
+ $this->buttons['back'] = $value;
+
+ return $this;
+ }
+
/**
* Disable reset button.
*
@@ -500,6 +507,11 @@ class Form implements Renderable
return $this->resetButton(! $value);
}
+ public function disableBackButton(bool $value = true)
+ {
+ return $this->backButton(! $value);
+ }
+
/**
* Disable submit button.
*
@@ -623,7 +635,7 @@ class Form implements Renderable
return <<
- {$this->renderResetButton()}{$this->renderSubmitButton()}
+ {$this->renderBackButton()}{$this->renderResetButton()}{$this->renderSubmitButton()}
HTML;
}
@@ -644,6 +656,15 @@ HTML;
}
}
+ protected function renderBackButton()
+ {
+ if (! empty($this->buttons['back'])) {
+ $back = trans('admin.back');
+
+ return " {$back}";
+ }
+ }
+
/**
* 提交按钮文本.
*