feat: release 10.7.0

Author: modstart

app/Constant/AppConstant.php

@@ -6,6 +6,6 @@ class AppConstant
 {
     const APP = 'blog';
     const APP_NAME = 'ModStartBlog';
-    const VERSION = '10.6.0';
+    const VERSION = '10.7.0';
 }
 

module/Partner/Admin/Controller/PartnerController.php

@@ -12,6 +12,7 @@
 use ModStart\Grid\GridFilter;
 use ModStart\Support\Concern\HasFields;
 use ModStart\Widget\ButtonDialogRequest;
+use Module\Partner\Model\Partner;
 use Module\Partner\Type\PartnerPosition;
 use Module\Partner\Util\PartnerUtil;
 
@@ -22,7 +23,7 @@ class PartnerController extends Controller
     protected function crud(AdminCRUDBuilder $builder)
     {
         $builder
-            ->init('partner')
+            ->init(Partner::class)
             ->field(function ($builder) {
                 /** @var HasFields $builder */
                 $builder->id('id', 'ID');

module/Partner/Model/Partner.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Module\Partner\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Partner extends Model
+{
+    protected $table = 'partner';
+}

module/Site/Web/routes.php

@@ -1,7 +1,7 @@
 <?php
 /* @var \Illuminate\Routing\Router $router */
 $middlewares = [];
-if (class_exists(\Module\Member\Middleware\WebAuthMiddleware::class)) {
+if (file_exists(base_path('module/Member/Middleware/ApiAuthMiddleware.php'))) {
     $middlewares[] = \Module\Member\Middleware\WebAuthMiddleware::class;
 }
 $router->group([

module/Vendor/Docs/release.md

@@ -1,6 +1,7 @@
-## 4.9.0
+## 4.9.0 HTML 转 Markdown 支持，CaptchaProvider 优化
 
 - 新增：引入 turndown.js 用于将 HTML 转换为 Markdown
+- 新增：CaptchaProvider 支持空验证码选项参数
 
 ---
 

module/Vendor/Installer/install.php

@@ -197,6 +197,11 @@ function doStepEnv(){
                     <div class="content-item-foot">
                         <?php if (error_counter(0) > 0) { ?>
                             <div class="ub-alert danger ub-text-center">请解决以上 <?php echo error_counter(0); ?> 个问题再进行安装</div>
+                            <script>
+                                $(function(){
+                                    switch_step('env');
+                                });
+                            </script>
                         <?php } else if (!env_writable()) { ?>
                             <div class="ub-alert danger ub-text-center">/.env文件不可写，请手动配置安装</div>
                         <?php } else { ?>

module/Vendor/Provider/Captcha/CaptchaProvider.php

@@ -39,15 +39,21 @@ public static function all()
         return self::$instances;
     }
 
-    public static function nameTitleMap()
+    public static function nameTitleMap($empty = false)
     {
-        return array_build(self::all(), function ($k, $v) {
+        $map = array_build(self::all(), function ($k, $v) {
             /** @var AbstractCaptchaProvider $v */
             return [
                 $v->name(),
                 $v->title()
             ];
         });
+        if ($empty) {
+            $map = array_merge([
+                '' => L('Empty')
+            ], $map);
+        }
+        return $map;
     }
 
     public static function nameTitleMapWithNone()

module/Vendor/config.json

@@ -4,7 +4,7 @@
     "version": "4.9.0",
     "author": "官方",
     "description": "提供基础功能",
-    "modstartVersion": ">=4.1.1",
+    "modstartVersion": ">=4.1.3",
     "env": [
         "laravel5",
         "laravel9"
@@ -16,4 +16,4 @@
         "基础组件"
     ],
     "config": {}
-}
+}