Skip to content

Commit f4c6ae8

Browse files
modstartmodstart
committed
feat: release 7.7.0
1 parent 9befa40 commit f4c6ae8

File tree

78 files changed

+1018
-619
lines changed

Some content is hidden

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

78 files changed

+1018
-619
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 = '7.6.0';
9+
const VERSION = '7.7.0';
1010
}

‎module/ModuleStore/Admin/Controller/ModuleStoreController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ public function config(AdminConfigBuilder $builder, $module)
362362
$basic = ModuleManager::getModuleBasic($module);
363363
$builder->useDialog();
364364
$builder->pageTitle(htmlspecialchars($basic['title']) . ' ' . L('Module Config'));
365+
$builder->layoutHtml('<div class="ub-alert ub-alert-danger"><i class="iconfont icon-warning"></i> 本页面包含的配置仅供开发使用，设置不当可能会导致系统功能异常</div>');
365366
$moduleInfo = ModuleManager::getInstalledModuleInfo($module);
366367
BizException::throwsIfEmpty('Module config error', $basic['config']);
367368
foreach ($basic['config'] as $key => $callers) {

‎module/Partner/Docs/release.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## 1.6.0
1+
## 1.6.0 图片懒加载，友情链接mini模式
22

33
- 新增：图片懒加载
4+
- 新增：友情链接新增mini模式
45

56
---
67

‎module/Partner/View/PartnerView.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,43 @@
55

66

77
use Illuminate\Support\Facades\View;
8+
use ModStart\ModStart;
89
use Module\Partner\Util\PartnerUtil;
910

1011
class PartnerView
1112
{
1213
public static function text($position, $param = [])
1314
{
1415
$records = PartnerUtil::listByPositionWithCache($position);
16+
$linkDisable = modstart_config('Partner_LinkDisable', false);
1517
return View::make('module::Partner.View.inc.text', array_merge($param, [
1618
'records' => $records,
1719
'position' => $position,
20+
'linkDisable' => $linkDisable,
1821
]))->render();
1922
}
2023

2124
public static function simple($position, $param = [])
2225
{
26+
ModStart::js('asset/common/lazyLoad.js');
27+
$linkDisable = modstart_config('Partner_LinkDisable', false);
2328
$records = PartnerUtil::listByPositionWithCache($position);
2429
return View::make('module::Partner.View.inc.simple', array_merge($param, [
2530
'records' => $records,
2631
'position' => $position,
32+
'linkDisable' => $linkDisable,
33+
]))->render();
34+
}
35+
36+
public static function mini($position, $param = [])
37+
{
38+
ModStart::js('asset/common/lazyLoad.js');
39+
$records = PartnerUtil::listByPositionWithCache($position);
40+
$linkDisable = modstart_config('Partner_LinkDisable', false);
41+
return View::make('module::Partner.View.inc.mini', array_merge($param, [
42+
'records' => $records,
43+
'linkDisable' => $linkDisable,
44+
'position' => $position,
2745
]))->render();
2846
}
2947

‎module/Partner/View/inc/mini.blade.php

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<div class="ub-panel">
2+
<div class="head">
3+
<div class="title">
4+
<i class="iconfont icon-users"></i>
5+
{!! modstart_config('Partner_Title','合作伙伴') !!}
6+
</div>
7+
</div>
8+
<div class="body">
9+
@foreach($records as $r)
10+
@if($linkDisable)
11+
<div class="hover:tw-shadow tw-rounded tw-px-1 tw-inline-block ub-text-default tw-h-10 tw-leading-10 tw-mr-2">
12+
@if(!empty($r['logo']))
13+
<img class="tw-h-10" src="{{$r['logo']}}" />
14+
@else
15+
{{$r['title']}}
16+
@endif
17+
</div>
18+
@else
19+
<a href="{{$r['link']}}" target="_blank" class="hover:tw-shadow tw-rounded tw-px-1 tw-inline-block ub-text-default tw-h-10 tw-leading-10 tw-mr-2">
20+
@if(!empty($r['logo']))
21+
<img class="tw-h-10" data-src="{{$r['logo']}}" />
22+
@else
23+
{{$r['title']}}
24+
@endif
25+
</a>
26+
@endif
27+
@endforeach
28+
</div>
29+
</div>

‎module/Partner/View/inc/simple.blade.php

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<?php
2-
$partners = \Module\Partner\Util\PartnerUtil::listByPositionWithCache($position);
3-
\ModStart\ModStart::js('asset/common/lazyLoad.js');
4-
?>
51
<div class="ub-panel">
62
<div class="head">
73
<div class="title">
@@ -11,31 +7,30 @@
117
</div>
128
<div class="body ub-list-items padding-bottom-remove">
139
<div class="row">
14-
<?php $linkDisable = modstart_config('Partner_LinkDisable',false); ?>
15-
@foreach($partners as $partner)
10+
@foreach($records as $r)
1611
<div class="col-md-2 col-4">
1712
<div class="item-n">
1813
@if($linkDisable)
19-
@if(!empty($partner['logo']))
14+
@if(!empty($r['logo']))
2015
<div class="image">
21-
<div class="cover contain ub-cover-3-1" data-src="{{$partner['logo']}}"></div>
16+
<div class="cover contain ub-cover-3-1" data-src="{{$r['logo']}}"></div>
2217
</div>
2318
@else
2419
<div class="text">
2520
<div class="cover ub-cover-3-1">
26-
<span class="content">{{$partner['title']}}</span>
21+
<span class="content">{{$r['title']}}</span>
2722
</div>
2823
</div>
2924
@endif
3025
@else
31-
@if(!empty($partner['logo']))
32-
<a class="image" href="{{$partner['link']}}" target="_blank">
33-
<div class="cover contain ub-cover-3-1" data-src="{{$partner['logo']}}"></div>
26+
@if(!empty($r['logo']))
27+
<a class="image" href="{{$r['link']}}" target="_blank">
28+
<div class="cover contain ub-cover-3-1" data-src="{{$r['logo']}}"></div>
3429
</a>
3530
@else
36-
<a class="text" href="{{$partner['link']}}" target="_blank">
31+
<a class="text" href="{{$r['link']}}" target="_blank">
3732
<div class="cover ub-cover-3-1">
38-
<span class="content">{{$partner['title']}}</span>
33+
<span class="content">{{$r['title']}}</span>
3934
</div>
4035
</a>
4136
@endif

‎module/Partner/View/inc/text.blade.php

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<?php
2-
$records = \Module\Partner\Util\PartnerUtil::listByPositionWithCache($position);
3-
\ModStart\ModStart::js('asset/common/lazyLoad.js');
4-
?>
51
<div class="ub-panel">
62
<div class="head">
73
<div class="title">
@@ -10,15 +6,13 @@
106
</div>
117
</div>
128
<div class="body">
13-
<?php $linkDisable = modstart_config('Partner_LinkDisable',false); ?>
14-
@foreach($records as $r)
15-
@if($linkDisable)
16-
<div class="ub-text-default">{{$r['title']}}</div>
17-
@else
18-
<a href="{{$r['link']}}" class="ub-text-default"
19-
target="_blank">{{$r['title']}}</a>
20-
@endif
21-
@endforeach
22-
</div>
9+
@foreach($records as $r)
10+
@if($linkDisable)
11+
<div class="ub-text-default">{{$r['title']}}</div>
12+
@else
13+
<a href="{{$r['link']}}" class="ub-text-default"
14+
target="_blank">{{$r['title']}}</a>
15+
@endif
16+
@endforeach
2317
</div>
2418
</div>

‎module/Vendor/resources/asset/src/components/all.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default (Vue) => {
6363
Vue.component("files-selector", FilesSelector)
6464
Vue.component("video-selector", VideoSelector)
6565
Vue.component("audio-selector", AudioSelector)
66-
Vue.component("json-editor", () => import("@ModStartAsset/svue/components/JsonEditor.vue"))
66+
Vue.component("code-editor", () => import("@ModStartAsset/svue/components/CodeEditor.vue"))
6767
Vue.component('rich-editor', () => import('./RichEditor'))
6868
Vue.component('name-value-list-editor', () => import('./NameValueListEditor'))
6969
Vue.component("smart-link", () => import('@ModStartAsset/svue/components/SmartLink'))

‎public/asset/common/admin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/common/base.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)