From f8d15e7f9950ceeb6a9ea1ac21db9b080fc772e8 Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Mon, 16 Jun 2025 13:21:46 +0800 Subject: [PATCH] no message --- app/Http/Controllers/SakaiController.php | 12 ++++++++++++ app/Models/Book.php | 21 +++++++++++++++++---- app/Services/TG/Hook/Mod/Book.php | 23 ++++++++++++++++++++++- 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php index d4f227cb..21a74fb7 100755 --- a/app/Http/Controllers/SakaiController.php +++ b/app/Http/Controllers/SakaiController.php @@ -330,6 +330,18 @@ class SakaiController $s = "sort rank block"; $s = "unsort"; + $s = "case"; + + $s = "main"; + + $s = "openRe"; +// $s = "toWait 333333"; + $s = "no 2"; + + $s = "case a"; + +// $s = "openRe"; + // $s = ""; diff --git a/app/Models/Book.php b/app/Models/Book.php index f5310e6b..9a637229 100755 --- a/app/Models/Book.php +++ b/app/Models/Book.php @@ -99,10 +99,23 @@ class Book extends Model if (!isset($oParentRag->sort) && !isset($oParentRag->like)) { $sTodoShowRank = BookOption::_hit("todo_show_rank"); $aTodoShowRank = explode(",", $sTodoShowRank); - $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) { - $query->whereIn("rank", $aTodoShowRank) - ->orWhereNull("rank"); - }); + + if ($oParentRag->case == "A") { + + $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) { + $query->whereIn("rank", $aTodoShowRank) + ->orWhereNull("rank"); + }); + + } else if ($oParentRag->case == "B") { + + $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) { + $query->whereNotIn("rank", $aTodoShowRank) + ->orWhereNull("rank"); + }); + + } + } } diff --git a/app/Services/TG/Hook/Mod/Book.php b/app/Services/TG/Hook/Mod/Book.php index 482357f6..f983d418 100644 --- a/app/Services/TG/Hook/Mod/Book.php +++ b/app/Services/TG/Hook/Mod/Book.php @@ -670,6 +670,26 @@ class Book extends Base { // public function //// todo系列 end + //// case 系列 + // 待完善,case 1 case 2显示模式套装 + public function case($aParam) + { + $sCase = $aParam["aArg"][1] ?? "A"; + + $sCase = strtoupper($sCase); + + $oRag = $this->_getParentRag(); + + $oRag->case = $sCase; + + $oRag->save(); + + return $this->openRe(); + } + + + //// case 系列 end + //// open 系列 public function openRe() @@ -974,7 +994,8 @@ class Book extends Base { $oParentRag = $this->_getParentRag(); $aParentType = $this->_typeFormat($oParentRag->type); - +// tomd(3333); +// tomd($aParentType[0], 1); if ($aParentType[0] == "todo") { $mCustom = $mCustom ? $mCustom : "none"; if (empty($oBook->rank)) {