阶段更新

2021-10-11 13:09:29 +08:00
parent d89bc90cef
commit 11b9e2ae76
31 changed files with 1095 additions and 659 deletions
--- a/app/Admin/Controllers/Advert/IndexController.php
+++ b/app/Admin/Controllers/Advert/IndexController.php
@@ -45,35 +45,39 @@ class IndexController extends AdminController
     * Make a form builder.
     * @return Form
     */
-    protected function form()
+    protected function form(): Form
    {
        $form = new Form(new Advert);

        $form->text('title', '广告名称')->required();
        $form->select('category_id', '所属分类')
-            ->options(Category::selectOptions(function ($model) {
-                return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
-            }, '选择分类'))
-            ->rules('required|min:1', [
-                'required' => '必须选择所属分类',
-                'min'      => '必须选择所属分类',
-            ]);
+             ->options(function () {
+                 return Category::query()
+                                ->where('status', 1)
+                                ->where('type', Category::TYPE_ADVERT)
+                                ->pluck('title', 'id');
+             })
+             ->rules('required|min:1', [
+                 'required' => '必须选择所属分类',
+                 'min'      => '必须选择所属分类',
+             ]);
+
        $form->image('cover', '封面图片')
-            ->rules(function ($form) {
-                if ($form->model()->cover != []) {
-                    return 'nullable|image';
-                } else {
-                    return 'required';
-                }
-            })
-            ->move('images/' . date('Y/m/d'))
-            ->removable()
-            ->uniqueName();
+             ->rules(function ($form) {
+                 if ($form->model()->cover != []) {
+                     return 'nullable|image';
+                 } else {
+                     return 'required';
+                 }
+             })
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
        $form->text('url', '链接地址');
        $form->number('sort', '排序')
-            ->default(1)
-            ->required()
-            ->help('数字越大越靠前');
+             ->default(1)
+             ->required()
+             ->help('数字越大越靠前');

        return $form;
    }
--- a/app/Admin/Controllers/Article/IndexController.php
+++ b/app/Admin/Controllers/Article/IndexController.php
@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\Article;
 use App\Admin\Selectable\CategorySelectAble;
 use App\Models\Article;
 use App\Models\Category;
+use App\Models\CategoryOld;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -24,6 +25,7 @@ class IndexController extends AdminController
                $filter->equal('category_id', '所属分类')->select(Category::selectOptions(function ($model) {
                    return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
                }, '所有分类'));
+
            });

            $filter->disableIdFilter();
@@ -32,6 +34,7 @@ class IndexController extends AdminController
        $grid->column('id', '#ID#');
        $grid->column('cover', '封面图片')->image('', 100);
        $grid->column('category.title', '所属分类');
+        $grid->column('category_old.title', '所属老分类');
        $grid->column('title', '文章标题');
        $states = [
            'on'  => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
@@ -50,10 +53,11 @@ class IndexController extends AdminController

        $form->text('title', '文章标题')->rules('min:2');
        $form->text('remark', '子标题');
-        $form->select('category_id', '上级分类')
+        $form->select('category_id', '所属分类')
             ->options(Category::selectOptions(function ($model) {
                 return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
             }, '一级分类'));
+
        $form->textarea('description', '内容简介');
        $form->image('cover', '封面')
             ->move('images/' . date('Y/m/d'))
--- a/app/Admin/Controllers/Article/OldController.php
+++ b/app/Admin/Controllers/Article/OldController.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Admin\Controllers\Article;
+
+use App\Admin\Selectable\CategorySelectAble;
+use App\Models\ArticleOld;
+use App\Models\Category;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+
+class OldController extends AdminController
+{
+
+    protected $title = '内容管理';
+
+    public function grid()
+    {
+        $grid = new Grid(new ArticleOld);
+        $grid->model()->orderBy('id', 'desc');
+        $grid->filter(function ($filter) {
+            $filter->column(1 / 2, function ($filter) {
+                $filter->like('title', '文章标题');
+                $filter->equal('category_id', '所属分类')->select(Category::selectOptions(function ($model) {
+                    return $model->where('status', 1)
+                                 ->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
+                }, '所有分类'));
+            });
+
+            $filter->disableIdFilter();
+        });
+
+        $grid->column('id', '#ID#');
+        $grid->column('cover', '封面图片')->image('', 100);
+        $grid->column('category.title', '所属分类');
+        $grid->column('title', '文章标题');
+        $states = [
+            'on'  => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
+            'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'],
+        ];
+        $grid->column('status', '状态')->switch($states);
+        $grid->column('sort', '序号');
+        $grid->column('测试')->display(function () {
+            $cids = $this->categories()->pluck('id')->toArray();
+            if (empty($this->category_id) && !empty($cids)) {
+                $this->category_id = $cids[0];
+                $this->save();
+            }
+        });
+        $grid->column('created_at', '创建时间');
+
+        return $grid;
+    }
+
+    public function form()
+    {
+        $form = new Form(new ArticleOld);
+
+        $form->text('title', '文章标题')->rules('min:2');
+        $form->text('remark', '子标题');
+        $form->select('category_id', '上级分类')
+             ->options(Category::selectOptions(function ($model) {
+                 return $model->where('status', 1)->whereIn('type', [Category::TYPE_ArticleOld, Category::TYPE_SHOW]);
+             }, '一级分类'));
+        $form->textarea('description', '内容简介');
+        $form->image('cover', '封面')
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
+        $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
+        $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
+        $states = [
+            'on'  => ['value' => 1, 'text' => '打开', 'color' => 'success'],
+            'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
+        ];
+        $form->datetime('created_at', '发布时间');
+        $form->switch('status', '状态')->states($states)->default(1);
+
+        return $form;
+    }
+
+}
--- a/app/Admin/Controllers/Category/IndexController.php
+++ b/app/Admin/Controllers/Category/IndexController.php
@@ -39,7 +39,7 @@ class IndexController extends AdminController
                     ->when('show', function (WidgetsForm $form) {
                         $form->select('article_id', '关联文章')
                              ->options(function ($option, $info) {
-                                  return Article::whereHas('categories', function ($q) {
+                                  return Article::whereHas('category', function ($q) {
                                      $q->where('type', 'show');
                                  })->pluck('title', 'id');
                              })->help('当分类类型是文章详情的时候需要选择关联文章');
@@ -109,7 +109,7 @@ class IndexController extends AdminController
             ->when('show', function (Form $form) {
                 $form->select('article_id', '关联文章')
                      ->options(function ($option, $info) {
-                          return Article::whereHas('categories', function ($q) {
+                          return Article::whereHas('category', function ($q) {
                              $q->where('type', 'show');
                          })->pluck('title', 'id');
                      })->help('当分类类型是文章详情的时候需要选择关联文章');
--- a/app/Admin/Controllers/Category/OldController.php
+++ b/app/Admin/Controllers/Category/OldController.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace App\Admin\Controllers\Category;
+
+use App\Models\Article;
+use App\Models\CategoryOld;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Layout\Column;
+use Encore\Admin\Layout\Row;
+use Encore\Admin\Tree;
+use Encore\Admin\Widgets\Box;
+use Encore\Admin\Widgets\Form as WidgetsForm;
+
+class OldController extends AdminController
+{
+
+    protected $title = '分类管理';
+
+    /**
+     * Index interface.
+     * @return \Closure
+     */
+    public function grid()
+    {
+        return function (Row $row) {
+            $row->column(6, $this->treeView());
+
+            $row->column(6, function (Column $column) {
+                $form = new WidgetsForm();
+
+                $form->select('parent_id', '上级分类')->options(CategoryOld::selectOptions(function ($model) {
+                    return $model->where('status', 1);
+                }, '一级分类'));
+                $form->text('title', '分类名称')->rules('required');
+                $form->text('alias', '别名');
+                $form->select('type', '分类类型')
+                     ->options(CategoryOld::TYPES)
+                     ->when('show', function (WidgetsForm $form) {
+                         $form->select('article_id', '关联文章')
+                              ->options(function ($option, $info) {
+                                  return Article::whereHas('categories', function ($q) {
+                                      $q->where('type', 'show');
+                                  })->pluck('title', 'id');
+                              })->help('当分类类型是文章详情的时候需要选择关联文章');
+                     })
+                     ->required();
+                $form->textarea('description', '分类简介')
+                     ->rules('nullable');
+                $form->image('logo', 'Logo')
+                     ->move('logos/' . date('Y/m/d'))
+                     ->removable()
+                     ->uniqueName();
+                $form->image('cover', '封面')
+                     ->move('images/' . date('Y/m/d'))
+                     ->removable()
+                     ->uniqueName();
+                $form->text('template', '模板');
+                $form->number('order', '排序')->default(0);
+                $form->switch('top_show', '顶部导航显示')->states()->default(0);
+                $form->switch('status', '显示')->states()->default(1);
+                $form->action(admin_url('categories'));
+
+                $column->append((new Box('新增分类', $form))->style('success'));
+            });
+        };
+    }
+
+    /**
+     * @return Tree
+     */
+    protected function treeView()
+    {
+        return CategoryOld::tree(function (Tree $tree) {
+            $tree->disableCreate();
+
+            $tree->branch(function ($branch) {
+                if ($branch['status'] == 1) {
+                    $payload = "<i class='fa fa-eye text-primary'></i> ";
+                } else {
+                    $payload = "<i class='fa fa-eye text-gray'></i> ";
+                }
+                $payload .= " [ID:{$branch['id']}] - ";
+                $payload .= " <strong>{$branch['title']}</strong> ";
+                $payload .= " <strong>{$branch['alias']}</strong> ";
+                $payload .= " <small>{$branch['type']}</small> ";
+                $payload .= " <small style='color:#999'>{$branch['template']}</small>";
+
+                return $payload;
+            });
+        });
+    }
+
+    /**
+     * Make a form builder.
+     * @return Form
+     */
+    protected function form(): Form
+    {
+        $form = new Form(new CategoryOld);
+
+        $form->select('parent_id', '上级分类')->options(CategoryOld::selectOptions(function ($model) {
+            return $model->where('status', 1);
+        }, '一级分类'));
+        $form->text('title', '分类名称')->rules('required');
+        $form->text('alias', '别名');
+        $form->select('type', '分类类型')
+             ->options(CategoryOld::TYPES)
+             ->when('show', function (Form $form) {
+                 $form->select('article_id', '关联文章')
+                      ->options(function ($option, $info) {
+                          return Article::whereHas('categories', function ($q) {
+                              $q->where('type', 'show');
+                          })->pluck('title', 'id');
+                      })->help('当分类类型是文章详情的时候需要选择关联文章');
+             })
+             ->required()
+             ->rules('required');
+        $form->textarea('description', '分类简介')->rows(4)->rules('nullable');
+        $form->image('logo', 'Logo')
+             ->move('logos/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
+        $form->image('cover', '封面')
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
+        $form->text('template', '模板');
+        $form->number('order', '排序')->default(0)->help('正序优先');
+        $form->switch('top_show', '顶部导航显示')->states()->default(0);
+        $form->switch('status', '显示')->states()->default(1);
+        $form->saving(function (Form $form) {
+
+            if (request()->has('title')) {
+                //                if (request()->type == CategoryOld::TYPE_SHOW && empty(request()->article_id)) {
+                //                    $error = new MessageBag([
+                //                        'title'   => '错误',
+                //                        'message' => '文章类型是文章详情的时候需要选择关联文章',
+                //                    ]);
+                //
+                //                    return back()->withInput()->with(compact('error'));
+                //                }
+            }
+
+        });
+
+        return $form;
+    }
+
+    public function destroy($id)
+    {
+        return $this->form()->destroy($id);
+    }
+
+}
--- a/app/Admin/Controllers/Video/IndexController.php
+++ b/app/Admin/Controllers/Video/IndexController.php
@@ -50,9 +50,12 @@ class IndexController extends AdminController
        $form->text('title', '视频名称')->required();

        $form->select('category_id', '所属分类')
-             ->options(Category::selectOptions(function ($model) {
-                 return $model->where('status', 1);
-             }, '选择分类'))
+             ->options(function () {
+                 return Category::query()
+                                ->where('status', 1)
+                                ->where('type', Category::TYPE_VIDEO)
+                                ->pluck('title', 'id');
+             })
             ->rules('required|min:1', [
                 'required' => '必须选择所属分类',
                 'min'      => '必须选择所属分类',