feat: theme dark mode auto

Author: modstart

module/Banner/Admin/Controller/BannerController.php

@@ -11,6 +11,7 @@
 use ModStart\Grid\GridFilter;
 use ModStart\Support\Concern\HasFields;
 use Module\Banner\Type\BannerPosition;
+use Module\Banner\Type\BannerPositionRemark;
 use Module\Banner\Type\BannerType;
 use Module\Banner\Util\BannerUtil;
 
@@ -25,7 +26,7 @@ protected function crud(AdminCRUDBuilder $builder)
             ->field(function ($builder) {
 
                 $builder->id('id', 'ID');
-                $builder->select('position', '位置')->optionType(BannerPosition::class);
+                $builder->select('position', '位置')->optionType(BannerPositionRemark::class);
                 $builder->image('image', '图片');
                 $builder->radio('type', '样式类型')
                     ->optionType(BannerType::class)

module/Banner/Biz/AbstractBannerPositionBiz.php

@@ -9,4 +9,9 @@ abstract class AbstractBannerPositionBiz
     abstract public function name();
 
     abstract public function title();
+
+    public function remark()
+    {
+        return null;
+    }
 }

module/Banner/Biz/BannerPositionBiz.php

@@ -6,13 +6,14 @@
 
 use Module\Vendor\Provider\BizTrait;
 
+
 class BannerPositionBiz
 {
     use BizTrait;
 
-    public static function registerQuick($name, $title)
+    public static function registerQuick($name, $title, $remark = null)
     {
-        self::register(QuickBannerPositionBiz::make($name, $title));
+        self::register(QuickBannerPositionBiz::make($name, $title, $remark));
     }
 
 

module/Banner/Biz/QuickBannerPositionBiz.php

@@ -8,12 +8,14 @@ class QuickBannerPositionBiz extends AbstractBannerPositionBiz
 {
     protected $name;
     protected $title;
+    protected $remark;
 
-    public static function make($name, $title)
+    public static function make($name, $title, $remark = null)
     {
         $o = new static();
         $o->name = $name;
         $o->title = $title;
+        $o->remark = $remark;
         return $o;
     }
 
@@ -27,5 +29,9 @@ public function title()
         return $this->title;
     }
 
+    public function remark()
+    {
+        return $this->remark;
+    }
 
 }

module/Banner/Docs/release.md

@@ -2,6 +2,7 @@
 
 - 新增：模块快速调用方式
 - 新增：快速调用方式增加container参数
+- 新增：轮播使用者remark参数，显示轮播提示
 
 ---
 

module/Banner/Type/BannerPositionRemark.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace Module\Banner\Type;
+
+
+use Module\Banner\Biz\BannerPositionBiz;
+
+class BannerPositionRemark extends BannerPosition
+{
+    public static function getList()
+    {
+        $map = parent::getList();
+        foreach ($map as $k => $v) {
+            $biz = BannerPositionBiz::get($k);
+            if ($biz && $biz->remark()) {
+                $map[$k] = $v . '(' . $biz->remark() . ')';
+            }
+        }
+        return $map;
+    }
+}

module/Blog/Admin/Controller/ConfigController.php

@@ -6,6 +6,7 @@
 use Illuminate\Routing\Controller;
 use ModStart\Admin\Layout\AdminConfigBuilder;
 use ModStart\Support\Concern\HasFields;
+use Module\Blog\Type\BlogDarkModeType;
 use Module\Vendor\Provider\Captcha\CaptchaProvider;
 use Module\Vendor\Provider\SuperSearch\SuperSearchProvider;
 
@@ -27,8 +28,14 @@ public function index(AdminConfigBuilder $builder)
         $builder->switch('Blog_DarkModeEnable', '启用暗黑模式')
             ->when('=', true, function ($builder) {
 
-                $builder->time('Blog_DarkModeStart', '开始');
-                $builder->time('Blog_DarkModeEnd', '结束');
+                $builder->radio('Blog_DarkModeType', '暗黑模式')
+                    ->optionType(BlogDarkModeType::class)
+                    ->when('=', BlogDarkModeType::TIME, function ($builder) {
+                        
+                        $builder->time('Blog_DarkModeStart', '开始');
+                        $builder->time('Blog_DarkModeEnd', '结束');
+                    })
+                    ->defaultValue(BlogDarkModeType::AUTO);
             });
         $builder->formClass('wide');
         return $builder->perform();

module/Blog/Asset/style/prefers-color-scheme.css

@@ -1,3 +1,10 @@
+## 2.7.0
+
+- 新增：博客分享条增加模块ShareJS是否安装判断
+- 新增：暗黑模式跟随系统
+
+---
+
 ## 2.6.0 超级搜索，暗黑模式，主动推送，UI优化
 
 - 新增：博客新增暗黑模式

module/Blog/Docs/release.md

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace Module\Blog\Type;
+
+
+use ModStart\Core\Type\BaseType;
+
+class BlogDarkModeType implements BaseType
+{
+    const AUTO = 'auto';
+    const TIME = 'time';
+
+    public static function getList()
+    {
+        return [
+            self::AUTO => '跟随系统',
+            self::TIME => '按时间段'
+        ];
+    }
+
+}