Skip to content

Commit f343c23

Browse files
modstartmodstart
committed
feat: list style optimized
1 parent 82bfa6f commit f343c23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+707
-294
lines changed

‎app/Constant/AppConstant.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ class AppConstant
66
{
77
const APP = 'blog';
88
const APP_NAME = 'ModStartBlog';
9-
const VERSION = '6.6.0';
9+
const VERSION = '6.7.0';
1010
}

‎config/database.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'mysql' => [
5656
'driver' => 'mysql',
5757
'host' => env('DB_HOST', 'localhost'),
58+
'port' => env('DB_PORT', 3306),
5859
'database' => env('DB_DATABASE', 'forge'),
5960
'username' => env('DB_USERNAME', 'forge'),
6061
'password' => env('DB_PASSWORD', ''),

‎module/Partner/Admin/Controller/PartnerController.php

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66

77
use Illuminate\Routing\Controller;
88
use ModStart\Admin\Concern\HasAdminQuickCRUD;
9+
use ModStart\Admin\Layout\AdminConfigBuilder;
910
use ModStart\Admin\Layout\AdminCRUDBuilder;
1011
use ModStart\Form\Form;
1112
use ModStart\Grid\GridFilter;
1213
use ModStart\Support\Concern\HasFields;
14+
use ModStart\Widget\ButtonDialogRequest;
1315
use Module\Partner\Type\PartnerPosition;
1416
use Module\Partner\Util\PartnerUtil;
1517

@@ -23,18 +25,22 @@ protected function crud(AdminCRUDBuilder $builder)
2325
->init('partner')
2426
->field(function ($builder) {
2527

26-
$builder->id('id','ID');
28+
$builder->id('id', 'ID');
2729
$builder->select('position', '位置')->optionType(PartnerPosition::class);
2830
$builder->text('title', '名称');
2931
$builder->image('logo', 'Logo');
3032
$builder->text('link', '链接');
33+
$builder->switch('enable', '启用')->gridEditable(true);
3134
$builder->display('created_at', L('Created At'))->listable(false);
3235
$builder->display('updated_at', L('Updated At'))->listable(false);
3336
})
3437
->gridFilter(function (GridFilter $filter) {
3538
$filter->eq('position', '位置')->select(PartnerPosition::class);
3639
$filter->like('title', L('Title'));
3740
})
41+
->gridOperateAppend(
42+
ButtonDialogRequest::make('primary', '<i class="iconfont icon-cog"></i> 功能设置', modstart_admin_url('partner/config'))->size('big')
43+
)
3844
->enablePagination(false)
3945
->defaultOrder(['sort', 'asc'])
4046
->canSort(true)
@@ -43,4 +49,14 @@ protected function crud(AdminCRUDBuilder $builder)
4349
PartnerUtil::clearCache();
4450
});
4551
}
52+
53+
public function config(AdminConfigBuilder $builder)
54+
{
55+
$builder->useDialog();
56+
$builder->pageTitle('友情链接设置');
57+
$builder->text('Partner_Title', '友情链接标题')->defaultValue('我们的合伙伙伴');
58+
$builder->switch('Partner_LinkDisable', '友情链接不跳转');
59+
$builder->formClass('wide');
60+
return $builder->perform();
61+
}
4662
}

‎module/Partner/Admin/routes.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
22

33

4-
$router->match(['get', 'post'], 'partner', '\Module\Partner\Admin\Controller\PartnerController@index');
5-
$router->match(['get', 'post'], 'partner/add', '\Module\Partner\Admin\Controller\PartnerController@add');
6-
$router->match(['get', 'post'], 'partner/edit', '\Module\Partner\Admin\Controller\PartnerController@edit');
7-
$router->match(['post'], 'partner/delete', '\Module\Partner\Admin\Controller\PartnerController@delete');
8-
$router->match(['get'], 'partner/show', '\Module\Partner\Admin\Controller\PartnerController@show');
9-
$router->match(['post'], 'partner/sort', '\Module\Partner\Admin\Controller\PartnerController@sort');
4+
$router->match(['get', 'post'], 'partner', 'PartnerController@index');
5+
$router->match(['get', 'post'], 'partner/add', 'PartnerController@add');
6+
$router->match(['get', 'post'], 'partner/edit', 'PartnerController@edit');
7+
$router->match(['post'], 'partner/delete', 'PartnerController@delete');
8+
$router->match(['get'], 'partner/show', 'PartnerController@show');
9+
$router->match(['post'], 'partner/sort', 'PartnerController@sort');
10+
$router->match(['get', 'post'], 'partner/config', 'PartnerController@config');

‎module/Partner/Docs/release.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 1.5.0
2+
3+
- 新增：友情链接标题可设置，样式显示优化
4+
- 新增：友情链接新增启用/禁用状态
5+
6+
---
7+
18
## 1.4.0 快速位置注册
29

310
- 新增：快速位置注册

‎module/Partner/Docs/release/1.0.0.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎module/Partner/Docs/release/1.1.0.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎module/Partner/Migrate/2023_02_17_000000_partner_enable.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use ModStart\Core\Dao\ModelUtil;
6+
7+
class PartnerEnable extends Migration
8+
{
9+
10+
public function up()
11+
{
12+
Schema::table('partner', function (Blueprint $table) {
13+
$table->tinyInteger('enable')->nullable()->comment('');
14+
});
15+
ModelUtil::updateAll('partner', ['enable' => true]);
16+
}
17+
18+
19+
public function down()
20+
{
21+
22+
}
23+
}

‎module/Partner/Util/PartnerUtil.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ class PartnerUtil
1313

1414
public static function listByPosition($position = 'home')
1515
{
16-
return ModelUtil::model('partner')->where(['position' => $position])->orderBy('sort', 'asc')->get()->toArray();
16+
return ModelUtil::model('partner')
17+
->where([
18+
'position' => $position,
19+
'enable' => true,
20+
])
21+
->orderBy('sort', 'asc')->get()->toArray();
1722
}
1823

1924

@@ -30,4 +35,4 @@ public static function clearCache()
3035
Cache::forget(self::CACHE_KEY_PREFIX . $k);
3136
}
3237
}
33-
}
38+
}

‎module/Partner/View/pc/public/partner.blade.php

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
11
<?php $partners = \Module\Partner\Util\PartnerUtil::listByPositionWithCache($position); ?>
2-
{!! ModStart::style('.pb-partner-item{filter:grayscale(100%);opacity:0.5;}.pb-partner-item:hover{filter:grayscale(0%);opacity:1;}') !!}
3-
<div class="ub-panel ub-list">
2+
<div class="ub-panel margin-bottom ub-list">
43
<div class="head">
54
<div class="title">
65
合作伙伴
76
</div>
87
</div>
98
<div class="body">
109
<div class="row">
10+
<?php $linkDisable = modstart_config('Partner_LinkDisable',false); ?>
1111
@foreach($partners as $partner)
12-
<div class="col-md-2 col-6">
12+
<div class="col-md-2 col-4">
1313
<div class="item-n pb-partner-item">
14-
@if(!empty($partner['logo']))
15-
<a class="image" href="{{$partner['link']}}" target="_blank">
16-
<div class="cover contain ub-cover-3-1" style="background-image: url({{\ModStart\Core\Assets\AssetsUtil::fix($partner['logo'])}});"></div>
17-
</a>
14+
@if($linkDisable)
15+
@if(!empty($partner['logo']))
16+
<div class="image">
17+
<div class="cover contain ub-cover-3-1" style="background-image: url({{\ModStart\Core\Assets\AssetsUtil::fix($partner['logo'])}});"></div>
18+
</div>
19+
@else
20+
<div class="text">
21+
<div class="cover ub-cover-3-1">
22+
<span class="content">{{$partner['title']}}</span>
23+
</div>
24+
</div>
25+
@endif
1826
@else
19-
<a class="text" href="{{$partner['link']}}" target="_blank">
20-
<span class="cover ub-cover-3-1">
21-
<span class="content">{{$partner['title']}}</span>
22-
</span>
23-
</a>
27+
@if(!empty($partner['logo']))
28+
<a class="image" href="{{$partner['link']}}" target="_blank">
29+
<div class="cover contain ub-cover-3-1" style="background-image: url({{\ModStart\Core\Assets\AssetsUtil::fix($partner['logo'])}});"></div>
30+
</a>
31+
@else
32+
<a class="text" href="{{$partner['link']}}" target="_blank">
33+
<div class="cover ub-cover-3-1">
34+
<span class="content">{{$partner['title']}}</span>
35+
</div>
36+
</a>
37+
@endif
2438
@endif
2539
</div>
2640
</div>

0 commit comments

Comments
 (0)