1.优化一言添加

@@ -46,8 +46,8 @@ class VideoTempController extends AdminController
             $grid->column('','组件信息')
             $grid->column('','组件信息')
                 ->display('展开')
                 ->display('展开')
                 ->expand(function (){
                 ->expand(function (){
-                    $th = ['id','模板id','名称','位置','字号','字体颜色','背景色','背景厚度','透明度','避免剪切','创建时间','修改时间'];
-                    return Table::make($th, $this->components->toArray())->withBorder();
+                    $th = ['id','模板id','名称','位置','字号','文字颜色','文字效果','fade时间','背景色','透明度','背景厚度'];
+                    return Table::make($th, $this->componentsTable->toArray())->withBorder();
                 });
                 });
             $grid->column('state')->switch();
             $grid->column('state')->switch();
             $grid->column('created_at');
             $grid->column('created_at');

@@ -51,12 +51,12 @@ class VerseTable extends LazyRenderable
 
 
             $grid->expandFilter();  // 默认展开搜索
             $grid->expandFilter();  // 默认展开搜索
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
-//                $filter->where('author_id',function ($query){
-//                    $author = Author::query()->where('name','like',"%{$this->input}%")->get()->pluck('id');
-//                    $poetry =Poetry::query()->whereIn('author_id',$author)->get()->pluck('id');
-//                    $query->whereIn('poetry_id',$poetry);
-//                })->width(3);
-                $filter->like('poetry.name')->width(6);
+                $filter->where('author_id',function ($query){
+                    $author = Author::query()->where('name','like',"%{$this->input}%")->get()->pluck('id');
+                    $poetry =Poetry::query()->whereIn('author_id',$author)->get()->pluck('id');
+                    $query->whereIn('poetry_id',$poetry);
+                })->width(3);
+                $filter->like('poetry.name')->width(4);
 //                $filter->like('stanza')->width(4);
 //                $filter->like('stanza')->width(4);
                 $filter->panel();
                 $filter->panel();