feat: style upgrade

Author: modstart

module/Banner/Render/BannerRender.php

@@ -11,9 +11,21 @@ class BannerRender
     public static function position($position,
                                     $size = '1400x400',
                                     $ratio = '5-2',
-                                    $mobileRatio = '1-1',
+                                    $mobileRatio = '3-2',
                                     $round = false)
     {
+        if (null === $size) {
+            $size = '1400x400';
+        }
+        if (null === $ratio) {
+            $ratio = '5-2';
+        }
+        if (null === $mobileRatio) {
+            $mobileRatio = '1-1';
+        }
+        if (null === $round) {
+            $round = false;
+        }
         return View::make('module::Banner.View.pc.public.banner', [
             'position' => $position,
             'bannerSize' => $size,

module/Blog/Docs/release.md

@@ -1,6 +1,7 @@
-## 2.2.0
+## 2.2.0 博客操作类和文档，新增关键词和描述
 
 - 新增：博客分类增加关键词和描述字段
+- 新增：博客操作类和文档
 
 ---
 

module/Nav/Admin/Controller/NavController.php

@@ -54,6 +54,7 @@ protected function crud(AdminCRUDBuilder $builder)
                         }
                     });
                 $builder->text('name', '名称');
+                $builder->icon('icon', '图标')->help('部分主题支持图标显示');
                 $builder->link('link', '链接');
                 $builder->switch('enable', '启用')->optionsYesNo()->gridEditable(true)->defaultValue(true);
                 $builder->radio('openType', '打开方式')->optionType(NavOpenType::class)->defaultValue(NavOpenType::CURRENT_WINDOW);

module/Nav/Docs/release.md

@@ -1,6 +1,7 @@
 ## 1.6.0
 
 - 新增：新增导航默认为启用
+- 新增：导航图标字段
 - 优化：导航编辑采用大窗口
 
 ---

module/Nav/Docs/release/1.0.0.md

@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class NavNavIcon extends Migration
+{
+    
+    public function up()
+    {
+        Schema::table('nav', function (Blueprint $table) {
+            $table->string('icon', 50)->nullable()->comment('图标');
+        });
+    }
+
+    
+    public function down()
+    {
+    }
+}

module/Nav/Docs/release/1.1.0.md

@@ -30,6 +30,7 @@ public static function listByPosition($position = 'header')
             'name' => 'name',
             'openType' => 'openType',
             'link' => 'link',
+            'icon' => 'icon',
         ], 'id', 'pid', 'sort', ['enable' => true]);
         return array_filter($nodes, function ($item) use ($position) {
             return $item['position'] == $position;

module/Nav/Docs/release/1.2.0.md

@@ -1,14 +1,20 @@
 @foreach(\Module\Nav\Util\NavUtil::listByPositionWithCache($position) as $nav)
     @if(empty($nav['_child']))
-        <a class="{{modstart_baseurl_active($nav['link'])}}" href="{{$nav['link']}}" {{\Module\Nav\Type\NavOpenType::getBlankAttributeFromValue($nav)}}>{{$nav['name']}}</a>
+        <a class="{{modstart_baseurl_active($nav['link'])}}" href="{{$nav['link']}}" {{\Module\Nav\Type\NavOpenType::getBlankAttributeFromValue($nav)}}>
+            {{$nav['icon']?'<i class="icon '.htmlspecialchars($nav['icon']).'"></i> ':''}}{{$nav['name']}}
+        </a>
     @else
         <div class="nav-item">
             <div class="sub-title">
-                <a class="{{modstart_baseurl_active($nav['link'])}}" href="{{$nav['link']}}" {{\Module\Nav\Type\NavOpenType::getBlankAttributeFromValue($nav)}}>{{$nav['name']}}</a>
+                <a class="{{modstart_baseurl_active($nav['link'])}}" href="{{$nav['link']}}" {{\Module\Nav\Type\NavOpenType::getBlankAttributeFromValue($nav)}}>
+                    {{$nav['icon']?'<i class="icon '.htmlspecialchars($nav['icon']).'"></i> ':''}}{{$nav['name']}}
+                </a>
             </div>
             <div class="sub-nav">
                 @foreach($nav['_child'] as $child)
-                    <a class="sub-nav-item {{modstart_baseurl_active($child['link'])}}" href="{{$child['link']}}" {{\Module\Nav\Type\NavOpenType::getBlankAttributeFromValue($child)}}>{{$child['name']}}</a>
+                    <a class="sub-nav-item {{modstart_baseurl_active($child['link'])}}" href="{{$child['link']}}" {{\Module\Nav\Type\NavOpenType::getBlankAttributeFromValue($child)}}>
+                        {{$child['icon']?'<i class="icon '.htmlspecialchars($child['icon']).'"></i> ':''}}{{$child['name']}}
+                    </a>
                 @endforeach
             </div>
         </div>