公告和消息增加作者

app/AdminAgent/Controllers/MessageController.php

@@ -24,7 +24,10 @@ class MessageController extends AdminController
 			$grid->model()->where('agent_id', Admin::user()->id);
 
             $grid->column('id')->sortable();
-            $grid->column('user_id');
+            $grid->column('author');
+            $grid->column('user_id')
+				->if(fn() => $this->user_id == 0)
+				->display('所有人');
             $grid->column('title');
 //            $grid->column('is_read')->if(fn($v) => $this->user_id != 0)->bool()->else()->display('所有人接收');
             $grid->column('created_at');
@@ -55,6 +58,7 @@ class MessageController extends AdminController
 			}
 
 			$show->field('id');
+			$show->field('author');
             $show->field('user_id');
             $show->field('title');
             $show->field('content')->unescape();
@@ -83,6 +87,7 @@ class MessageController extends AdminController
 			}
 
 			$form->display('id');
+			$form->text('author')->default(Admin::user()->name);
 			$form->selectTable('user_id')
 				->from(new SelectUser())
 				->model(User::class, 'id', 'nickname')
@@ -115,6 +120,12 @@ class MessageController extends AdminController
 			$form->agent_id = Admin::user()->id;
 			$form->user_id = $form->user_id ?? 0;
 
+			foreach ($form->input() as $k => $v) {
+				if (is_null($v)) {
+					$form->$k = '';
+				}
+			}
+
 			//不允许编辑的字段
 			$form->ignore(['id', 'status', 'created_at', 'updated_at', 'deleted_at']);
 		})->deleting(function (Form $form) {

app/AdminAgent/Controllers/NoticeController.php

@@ -23,6 +23,7 @@ class NoticeController extends AdminController
 				->orderBy('sort')->orderBy('id', 'DESC');
 
             $grid->column('id')->sortable();
+            $grid->column('author');
             $grid->column('title');
             $grid->column('sort')->editable()->width(120);
             $grid->column('created_at');
@@ -53,6 +54,7 @@ class NoticeController extends AdminController
 			}
 
 			$show->field('id');
+            $show->field('author');
             $show->field('title');
             $show->field('content')->unescape();
 			$show->field('sort');
@@ -75,7 +77,8 @@ class NoticeController extends AdminController
 			}
 
 			$form->display('id');
-            $form->text('title');
+            $form->text('author')->default(Admin::user()->name);
+            $form->text('title')->required();
             $form->editor('content');
 			$form->text('sort')->default(255);
         })->saving(function (Form $form) {
@@ -89,6 +92,12 @@ class NoticeController extends AdminController
 			$form->agent_id = Admin::user()->id;
 			$form->sort = $form->sort ?? 255;
 
+			foreach ($form->input() as $k => $v) {
+				if (is_null($v)) {
+					$form->$k = '';
+				}
+			}
+
 			//不允许编辑的字段
 			$form->ignore(['id', 'created_at', 'updated_at']);
 		})->deleting(function (Form $form) {

resources/lang/zh_CN/message.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 return [
     'labels' => [
         'Message' => '系统消息',
@@ -10,6 +10,7 @@ return [
         'title' => '消息标题',
         'content' => '消息内容',
         'is_read' => '是否已读',
+        'author' => '作者',
     ],
     'options' => [
     ],

resources/lang/zh_CN/notice.php

@@ -8,6 +8,7 @@ return [
         'agent_id' => '发布者ID',
         'title' => '公告标题',
         'sort' => '排序',
+        'author' => '作者',
         'content' => '公告内容',
     ],
     'options' => [