From e6a8848bf52ff0f10bca420e7027db961dd77871 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Sun, 5 Sep 2021 10:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E8=80=85=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E5=88=87=E6=8D=A2switch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/ArticleController.php | 9 +++++++--
 app/AdminAgent/Controllers/NoticeController.php  | 7 ++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/AdminAgent/Controllers/ArticleController.php b/app/AdminAgent/Controllers/ArticleController.php
index 2e9478d..024bc32 100644
--- a/app/AdminAgent/Controllers/ArticleController.php
+++ b/app/AdminAgent/Controllers/ArticleController.php
@@ -29,7 +29,7 @@ class ArticleController extends AdminController
             $grid->column('title');
             $grid->column('image')->image('', 60, 60);
             $grid->column('sort')->editable()->width(120)->help('数字超小越靠前');
-            $grid->column('type')->using(['普通列表', '大图显示']);
+            $grid->column('type')->switch()->help('开启将以大图方式显示，关闭以普通列表显示');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
 
@@ -102,7 +102,12 @@ class ArticleController extends AdminController
 			//特殊字段处理
 			$form->hidden(['agent_id']);
 			$form->agent_id = Admin::user()->id;
-			$form->sort = $form->sort ?? 255;
+			if (array_key_exists('sort', $form->input())) {
+				$form->sort = $form->sort ?? 255;
+			}
+			if (array_key_exists('author', $form->input())) {
+				$form->author = $form->author ?? '';
+			}
 
 			//不允许编辑的字段
 			$form->ignore(['id', 'created_at', 'updated_at']);
diff --git a/app/AdminAgent/Controllers/NoticeController.php b/app/AdminAgent/Controllers/NoticeController.php
index ca7c1ce..080f5c7 100644
--- a/app/AdminAgent/Controllers/NoticeController.php
+++ b/app/AdminAgent/Controllers/NoticeController.php
@@ -91,11 +91,8 @@ class NoticeController extends AdminController
 			$form->hidden(['agent_id']);
 			$form->agent_id = Admin::user()->id;
 			$form->sort = $form->sort ?? 255;
-
-			foreach ($form->input() as $k => $v) {
-				if (is_null($v)) {
-					$form->$k = '';
-				}
+			if (array_key_exists('author', $form->input())) {
+				$form->author = $form->author ?? '';
 			}
 
 			//不允许编辑的字段