Răsfoiți Sursa

feat: 模板更新

igb 4 luni în urmă
părinte
comite
1bbe7bcf73

+ 1 - 1
app/Admin/Controllers/DistMessageController.php

@@ -121,7 +121,7 @@ JS
 
         return Form::make(new DistMessage(), function (Form $form) {
             $form->display('id')->rules('required');;
-            $form->text('title')->rules('required');;
+            $form->text('title',admin_trans_field('message_title'))->rules('required');;
             $form->textarea('content')->rules('required');;
 //            $form->text('sender_id')->rules('required');
 

+ 11 - 32
app/Distributor/Controllers/DistMessageController.php

@@ -34,55 +34,34 @@ class DistMessageController extends AdminController
     protected function grid()
     {
 
-        //插入JS
-        Admin::script(
-            <<<JS
-   $(document).ready(function() {
-                    $('.grid-row-clickable').on('click', function() {
-                        var id = $(this).data('id');
-                        if (id) {
-                            window.location.href = '/dist/messages/' + id;
-                        }
-                    });
-                });
-JS
-        );
-
         return Grid::make(new DistCustomMessage(), function (Grid $grid)  {
 
-            $grid->setActionClass(Grid\Displayers\Actions::class);
-            // 添加“查看”按钮
-            $grid->actions(function (Grid\Displayers\Actions $actions) {
-                $actions->append('<a href="/dist/messages/'.  $actions->row->id.'" class="btn btn-sm btn-primary">View Detail</a>');
-            });
-            // 设置数据源
-            //$grid->model()->setData($messagesArray);
+//            $grid->setActionClass(Grid\Displayers\Actions::class);
+//            // 添加“查看”按钮
+//            $grid->actions(function (Grid\Displayers\Actions $actions) {
+//                $actions->append('<a href="/dist/messages/' . $actions->row->id . '" class="btn btn-sm btn-primary">View Detail</a>');
+//            });
 
-            //$grid->column('id');//->sortable();
             $grid->column('created_at','time');
-//            $grid->column('title','message_title');
 
             $grid->column('title','message_title')->display(function ($title) {
                 $isRead = $this->is_read;
                 $style = $isRead == 0 ? 'font-weight: bold;' : '';
-                $label = $isRead == 0 ? '(未读)' : '';
+                $label = $isRead == 0 ? ' (Unread) ' : '';
                 return "<span style='{$style}'>{$title} {$label}</span>";
             });
             $grid->column('content');
-            //$grid->column('sender_id');
             $grid->column('is_read');
 
+            $grid->column('custom_column', admin_trans_field('action'))->display(function () {
+                return view('admin.grid.actions-view', ['id' => $this->id,'text'=>admin_trans('admin.view')]);
+            });
+
             $grid->disableCreateButton();
             $grid->disableDeleteButton();
             $grid->disableEditButton();
-            // 添加查看按钮
-
-            // 添加点击事件,点击一行进入详情页
+            $grid->disableActions();
 
-
-//            $grid->filter(function (Grid\Filter $filter) {
-//                $filter->equal('id');
-//            });
         });
     }
 

+ 1 - 1
config/admin.php

@@ -34,7 +34,7 @@ return [
     | '<img src="http://logo-url" alt="Admin logo">'.
     |
     */
-    'logo-mini' => '<img src="/vendor/dcat-admin/images/logo.png">',
+    'logo-mini' => '<img src="/static/images/logo.svg" alt="Admin logo" style="height:auto;width:300px">',
 
     /*
     |--------------------------------------------------------------------------

+ 2 - 3
config/distributor.php

@@ -22,7 +22,7 @@ return [
     | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
     |
     */
-    'logo' => 'Dist Manager',
+    'logo' => '<img src="/static/images/logo.svg" alt="Admin logo" style="height:auto;width:300px">',
 
     /*
     |--------------------------------------------------------------------------
@@ -34,8 +34,7 @@ return [
     | '<img src="http://logo-url" alt="Admin logo">'.
     |
     */
-    'logo-mini' => '<img src="/vendor/dcat-admin/images/logo.png">',
-
+    'logo-mini' =>  '<img src="/static/images/logo.svg" alt="Admin logo" style="height:auto;width:300px">',
     /*
     |--------------------------------------------------------------------------
     | dcat-admin favicon

+ 1 - 0
lang/en/global.php

@@ -92,6 +92,7 @@ return [
         'template_file'         => 'Template File',
         'target_type'           => 'Type',
         'target_ids'            => 'Target Ids',
+        'message_title'         => 'Message Title',
     ],
     'labels' => [
         'list'                  => 'List',

+ 1 - 0
lang/zh_CN/global.php

@@ -95,6 +95,7 @@ return [
         'country_lang'          => '国家语言',
         'target_type'           => '类型',
         'target_ids'            => '接收用户',
+        'message_title'         => '消息标题',
     ],
     'labels' => [
         'list'         => '列表',

+ 5 - 0
resources/views/admin/grid/actions-view.blade.php

@@ -0,0 +1,5 @@
+<div class="btn-group">
+    <a href="/dist/messages/{{$id}}" class="btn btn-primary btn-sm">
+        <i class="fa fa-eye"></i> {{$text}}
+    </a>
+</div>