release

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

@@ -72,15 +72,17 @@
 ```php
 class XxxBannerPositionBiz extends \Module\Banner\Biz\AbstractBannerPositionBiz
 {
-    public function name()
-    {
+    public function name() {
         return 'Xxx';
     }
 
-    public function title()
-    {
+    public function title() {
         return '特定位置';
     }
+    
+    public function remark() {
+        return '特定位置的轮播';
+    }
 }
 ```
 

module/Banner/Docs/release.md

@@ -1,3 +1,9 @@
+## 1.9.0 位置备注提示选择优化，支持自定义位置备注
+
+- 新增：位置备注提示选择优化，支持自定义位置备注
+
+---
+
 ## 1.8.0 轮播图获取支持仅图片过滤方法，视频 Banner 概率不播放问题
 
 - 新增：轮播图获取支持仅图片过滤方法

module/Banner/Type/BannerPosition.php

@@ -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/config.json

@@ -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/Cms/Core/ModuleServiceProvider.php

@@ -5,12 +5,15 @@
 use Illuminate\Events\Dispatcher;
 use Illuminate\Support\ServiceProvider;
 use ModStart\Admin\Config\AdminMenu;
-use ModStart\Admin\Widget\DashboardItemA;
+use ModStart\Admin\Widget\DashboardItem;
 use ModStart\Core\Dao\ModelUtil;
 use ModStart\Core\Util\TreeUtil;
 use ModStart\Layout\Row;
 use ModStart\Module\ModuleClassLoader;
 use Module\Banner\Biz\BannerPositionBiz;
+use Module\Cms\Model\CmsCat;
+use Module\Cms\Model\CmsContent;
+use Module\Cms\Model\CmsModel;
 use Module\Cms\Provider\CmsHomePageProvider;
 use Module\Cms\Provider\Theme\CmsThemeProvider;
 use Module\Cms\Provider\Theme\DefaultThemeProvider;
@@ -130,21 +133,34 @@ public function boot(Dispatcher $events)
 
         AdminWidgetDashboard::registerIcon(function (Row $row) {
             $models = CmsModelUtil::all();
+            $contents = [];
             foreach ($models as $model) {
-                $row->column(3, DashboardItemA::makeIconNumberTitle(
-                    'iconfont icon-details', ModelUtil::count('cms_content', ['modelId' => $model['id']]), $model['title'],
-                    modstart_admin_url('cms/content/' . $model['id'])
-                ));
+                $contents[] = [
+                    'title' => $model['title'],
+                    'value' => ModelUtil::count(CmsContent::class, ['modelId' => $model['id']]),
+                    'url' => modstart_admin_url('cms/content/' . $model['id'])
+                ];
             }
-            $row->column(3, DashboardItemA::makeIconNumberTitle(
-                'iconfont icon-list-alt', ModelUtil::count('cms_cat'), '栏目数',
-                modstart_admin_url('cms/cat')
+            $row->flexColumn(DashboardItem::makeTitleDataList(
+                'iconfont icon-description',
+                'CMS内容',
+                $contents
             ));
-            $row->column(3, DashboardItemA::makeIconNumberTitle(
-                'iconfont icon-credit',
-                ModelUtil::count('cms_model'),
-                '模型数',
-                modstart_admin_url('cms/model')
+            $row->flexColumn(DashboardItem::makeTitleDataList(
+                'iconfont icon-description',
+                'CMS管理',
+                [
+                    [
+                        'title' => '栏目数',
+                        'value' => ModelUtil::count(CmsCat::class),
+                        'url' => modstart_admin_url('cms/cat')
+                    ],
+                    [
+                        'title' => '模型数',
+                        'value' => ModelUtil::count(CmsModel::class),
+                        'url' => modstart_admin_url('cms/model')
+                    ],
+                ]
             ));
         });
 

module/Cms/Docs/release.md

@@ -1,6 +1,7 @@
 ## 3.8.0
 
 - 新增：CMS表单提交支持验证码配置，拦截恶意信息提交
+- 新增：后台首页报表统计功能升级
 - 修复：审核状态编辑异常问题修复
 
 ---

module/Cms/Model/CmsModel.php

@@ -0,0 +1,12 @@
+<?php
+
+
+namespace Module\Cms\Model;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class CmsModel extends Model
+{
+    protected $table = 'cms_model';
+}

module/Vendor/Util/UniappUtil.php

@@ -64,6 +64,8 @@ public static function build($dir)
             '"/static/' => 'window.__msCDN+"vendor/' . $module . '/static/',
             // "url('/static/image/dialog-bg.png')"
             '"url(\'/static/' => '"url(\'"+window.__msCDN+"vendor/' . $module . '/static/',
+            // Path:"static/
+            'Path:"static/' => 'Path:window.__msCDN+"vendor/' . $module . '/static/',
         ];
         $files = glob('dist/build/h5/static/js/*.js');
         foreach ($files as $file) {