升级UEditorPlus和WebUploader

Author: modstart

module/Banner/Admin/Controller/BannerController.php

@@ -11,7 +11,6 @@
 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;
 
@@ -26,7 +25,9 @@ protected function crud(AdminCRUDBuilder $builder)
             ->field(function ($builder) {
                 /** @var HasFields $builder */
                 $builder->id('id', 'ID');
-                $builder->select('position', '位置')->optionType(BannerPositionRemark::class);
+                $position = $builder->select('position', '位置')
+                    ->optionType(BannerPosition::class)
+                    ->whenHelps(BannerPosition::whenHelps());
                 $builder->image('image', '图片');
                 $builder->radio('type', '样式类型')
                     ->optionType(BannerType::class)

module/Banner/Docs/module/content.md

@@ -17,4 +17,15 @@ public static function getList()
             BannerPositionBiz::allMap()
         );
     }
+
+    public static function whenHelps()
+    {
+        $whenHelps = [];
+        foreach (BannerPositionBiz::listAll() as $bizer) {
+            if ($bizer->remark()) {
+                $whenHelps[$bizer->name()] = $bizer->remark();
+            }
+        }
+        return $whenHelps;
+    }
 }

module/Banner/Docs/release.md

@@ -11,9 +11,9 @@
     "require": [
         "Vendor:>=3.0.0"
     ],
-    "modstartVersion": ">=3.9.0",
+    "modstartVersion": ">=4.0.0",
     "title": "通用轮播",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "author": "官方",
     "description": "提供多位置轮播图片基础管理功能",
     "config": {

module/Banner/Type/BannerPosition.php

@@ -15,12 +15,12 @@
             <div class="col-md-8">
                 <div class="ub-content-box margin-bottom">
                     <div class="tw-p-3">
-                        <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['month'=>null])}}"
+                        <a href="?{!! \ModStart\Core\Input\Request::mergeQueries(['month'=>null]) !!}"
                            class="btn btn-round {{!$month?'btn-primary':''}}">
                             {{$year}}年全部({{$yearCount}})
                         </a>
                         @foreach($monthCounts as $mc)
-                            <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['month'=>$mc['month']])}}"
+                            <a href="?{!! \ModStart\Core\Input\Request::mergeQueries(['month'=>$mc['month']]) !!}"
                                class="btn btn-round {{$month==$mc['month']?'btn-primary':''}}">
                                 {{$mc['month']}}月({{$mc['total']}})
                             </a>

module/Banner/config.json

@@ -26,7 +26,7 @@
                             共找到
                             <span class="ub-text-primary ub-text-bold">{{$total}}</span>
                             条记录
-                            <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['keywords'=>null])}}" class="ub-text-muted">
+                            <a href="?{!! \ModStart\Core\Input\Request::mergeQueries(['keywords'=>null]) !!}" class="ub-text-muted">
                                 <i class="iconfont icon-close"></i>
                             </a>
                         </div>
@@ -36,12 +36,12 @@
                     <div class="tw-px-3 tw-pt-3">
                         @foreach($categoryChain as $catIndex=>$catItem)
                             <div class="margin-bottom">
-                                <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['categoryId'=>$catItem['pid']?$catItem['pid']:null,'page'=>null])}}"
+                                <a href="?{!! \ModStart\Core\Input\Request::mergeQueries(['categoryId'=>$catItem['pid']?$catItem['pid']:null,'page'=>null]) !!}"
                                    class="btn btn-round @if($catItem['id']<=0) btn-primary @endif">
                                     全部
                                 </a>
                                 @foreach($catItem['_items'] as $item)
-                                    <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['categoryId'=>$item['id']?$item['id']:null,'page'=>null])}}"
+                                    <a href="?{!! \ModStart\Core\Input\Request::mergeQueries(['categoryId'=>$item['id']?$item['id']:null,'page'=>null]) !!}"
                                        class="btn btn-round @if($catItem['id']==$item['id']) btn-primary @endif"
                                     >
                                         {{$item['title']}}

module/Blog/View/pc/blog/archive.blade.php

@@ -26,7 +26,7 @@
                             共找到
                             <span class="ub-text-primary ub-text-bold">{{$total}}</span>
                             条记录
-                            <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['keywords'=>null,'page'=>null])}}" class="ub-text-muted">
+                            <a href="?{!! \ModStart\Core\Input\Request::mergeQueries(['keywords'=>null,'page'=>null]) !!}" class="ub-text-muted">
                                 <i class="iconfont icon-close"></i>
                             </a>
                         </div>

module/Blog/View/pc/blog/list.blade.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Module\Vendor\Api\Controller;
+
+use Illuminate\Routing\Controller;
+use ModStart\Core\Input\InputPackage;
+use ModStart\Core\Input\Response;
+use Module\Vendor\Event\EntryBizEvent;
+
+class EntryController extends Controller
+{
+    public function biz()
+    {
+        $input = InputPackage::buildFromInput();
+        $name = $input->getTrimString('name');
+        $param = $input->getArray('param');
+        EntryBizEvent::fire($name, $param);
+        return Response::generateSuccess();
+    }
+}

module/Blog/View/pc/blog/listCover.blade.php

@@ -9,5 +9,6 @@
 ], function () use ($router) {
 
     $router->match(['post'], 'captcha/image', 'CaptchaController@image');
+    $router->match(['post'], 'entry/biz', 'EntryController@biz');
 
 });