Skip to content

Commit 94a885f

Browse files
modstartmodstart
committed
feat: ueditor upgrade
1 parent 3fe84f2 commit 94a885f

122 files changed

Lines changed: 1286 additions & 727 deletions

File tree

Some content is hidden

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

‎module/AdminManager/Core/ModuleServiceProvider.php‎

Lines changed: 80 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -11,86 +11,88 @@ class ModuleServiceProvider extends ServiceProvider
1111

1212
public function boot(Dispatcher $events)
1313
{
14-
AdminMenu::register([
15-
[
16-
'title' => L('Admin Manage'),
17-
'icon' => 'user-o',
18-
'sort' => 500,
19-
'children' => [
20-
[
21-
'title' => L('Admin Role'),
22-
'url' => '\ModStart\Admin\Controller\AdminRoleController@index',
23-
],
24-
[
25-
'title' => L('Admin Role Manage'),
26-
'rule' => 'AdminRoleManage',
27-
'hide' => true,
28-
],
29-
[
30-
'title' => L('Admin User'),
31-
'url' => '\ModStart\Admin\Controller\AdminUserController@index',
32-
],
33-
[
34-
'title' => L('Admin User Manage'),
35-
'rule' => 'AdminUserManage',
36-
'hide' => true,
37-
],
38-
[
39-
'title' => L('Admin Log'),
40-
'url' => '\ModStart\Admin\Controller\AdminLogController@index',
41-
],
42-
[
43-
'title' => L('Admin Log Manage'),
44-
'rule' => 'AdminLogManage',
45-
'hide' => true,
46-
],
47-
[
48-
'title' => L('Change password'),
49-
'url' => '\ModStart\Admin\Controller\ProfileController@changePassword',
50-
'hide' => true,
51-
],
52-
]
53-
],
54-
[
55-
'title' => L('System Manage'),
56-
'icon' => 'code-alt',
57-
'sort' => 700,
58-
'children' => [
59-
[
60-
'title' => L('System Manage'),
61-
'rule' => 'SystemManage',
62-
'url' => '\ModStart\Admin\Controller\SystemController@index',
63-
'hide' => true,
64-
],
65-
[
66-
'title' => L('Data File Manager View'),
67-
'rule' => 'DataFileManagerView',
68-
'url' => '\ModStart\Admin\Controller\DataController@index',
69-
'hide' => true,
70-
],
71-
[
72-
'title' => L('Data File Manager Upload'),
73-
'rule' => 'DataFileManagerUpload',
74-
'hide' => true,
75-
],
76-
[
77-
'title' => L('Data File Manager Delete'),
78-
'rule' => 'DataFileManagerDelete',
79-
'hide' => true,
80-
],
81-
[
82-
'title' => L('Data File Manager Add/Edit'),
83-
'rule' => 'DataFileManagerAdd/Edit',
84-
'hide' => true,
85-
],
86-
[
87-
'title' => '系统升级',
88-
'rule' => 'SystemUpgrade',
89-
'hide' => true,
14+
AdminMenu::register(function () {
15+
return [
16+
[
17+
'title' => L('Admin Manage'),
18+
'icon' => 'user-o',
19+
'sort' => 500,
20+
'children' => [
21+
[
22+
'title' => L('Admin Role'),
23+
'url' => '\ModStart\Admin\Controller\AdminRoleController@index',
24+
],
25+
[
26+
'title' => L('Admin Role Manage'),
27+
'rule' => 'AdminRoleManage',
28+
'hide' => true,
29+
],
30+
[
31+
'title' => L('Admin User'),
32+
'url' => '\ModStart\Admin\Controller\AdminUserController@index',
33+
],
34+
[
35+
'title' => L('Admin User Manage'),
36+
'rule' => 'AdminUserManage',
37+
'hide' => true,
38+
],
39+
[
40+
'title' => L('Admin Log'),
41+
'url' => '\ModStart\Admin\Controller\AdminLogController@index',
42+
],
43+
[
44+
'title' => L('Admin Log Manage'),
45+
'rule' => 'AdminLogManage',
46+
'hide' => true,
47+
],
48+
[
49+
'title' => L('Change password'),
50+
'url' => '\ModStart\Admin\Controller\ProfileController@changePassword',
51+
'hide' => true,
52+
],
53+
]
54+
],
55+
[
56+
'title' => L('System Manage'),
57+
'icon' => 'code-alt',
58+
'sort' => 700,
59+
'children' => [
60+
[
61+
'title' => L('System Manage'),
62+
'rule' => 'SystemManage',
63+
'url' => '\ModStart\Admin\Controller\SystemController@index',
64+
'hide' => true,
65+
],
66+
[
67+
'title' => L('Data File Manager View'),
68+
'rule' => 'DataFileManagerView',
69+
'url' => '\ModStart\Admin\Controller\DataController@index',
70+
'hide' => true,
71+
],
72+
[
73+
'title' => L('Data File Manager Upload'),
74+
'rule' => 'DataFileManagerUpload',
75+
'hide' => true,
76+
],
77+
[
78+
'title' => L('Data File Manager Delete'),
79+
'rule' => 'DataFileManagerDelete',
80+
'hide' => true,
81+
],
82+
[
83+
'title' => L('Data File Manager Add/Edit'),
84+
'rule' => 'DataFileManagerAdd/Edit',
85+
'hide' => true,
86+
],
87+
[
88+
'title' => '系统升级',
89+
'rule' => 'SystemUpgrade',
90+
'hide' => true,
91+
]
9092
]
9193
]
92-
]
93-
]);
94+
];
95+
});
9496
}
9597

9698

‎module/Banner/Core/ModuleServiceProvider.php‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@ public function boot(Dispatcher $events)
1616
ModuleClassLoader::addClass('MBanner', __DIR__ . '/../Helpers/MBanner.php');
1717
}
1818

19-
AdminMenu::register([
20-
[
21-
'title' => '物料管理',
22-
'icon' => 'description',
23-
'sort' => 200,
24-
'children' => [
25-
[
26-
'title' => '轮播图片',
27-
'url' => '\Module\Banner\Admin\Controller\BannerController@index',
28-
],
19+
AdminMenu::register(function () {
20+
return [
21+
[
22+
'title' => '物料管理',
23+
'icon' => 'description',
24+
'sort' => 200,
25+
'children' => [
26+
[
27+
'title' => '轮播图片',
28+
'url' => '\Module\Banner\Admin\Controller\BannerController@index',
29+
],
30+
]
2931
]
30-
]
31-
]);
32+
];
33+
});
3234
}
3335

3436

‎module/Banner/Docs/release.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 1.7.0
22

33
- 新增：模块快速调用方式
4+
- 新增：快速调用方式增加container参数
45

56
---
67

‎module/Banner/View/BannerView.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public static function basic($position,
1212
$size = '1400x400',
1313
$ratio = '5-2',
1414
$mobileRatio = '3-2',
15-
$round = false)
15+
$round = false,
16+
$container = false)
1617
{
1718
if (null === $size) {
1819
$size = '1400x400';
@@ -32,6 +33,7 @@ public static function basic($position,
3233
'bannerRatio' => $ratio,
3334
'mobileBannerRatio' => $mobileRatio,
3435
'round' => $round,
36+
'container' => $container,
3537
])->render();
3638
}
3739
}

‎module/Blog/Core/ModuleServiceProvider.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use ModStart\Layout\Row;
1111
use ModStart\Module\ModuleClassLoader;
1212
use Module\Banner\Biz\BannerPositionBiz;
13-
use Module\Banner\Biz\QuickBannerPositionBiz;
1413
use Module\Blog\Util\BlogCategoryUtil;
14+
use Module\Partner\Biz\PartnerPositionBiz;
1515
use Module\Reward\Biz\RewardBiz;
1616
use Module\Vendor\Admin\Widget\AdminWidgetDashboard;
1717
use Module\Vendor\Admin\Widget\AdminWidgetLink;
@@ -98,9 +98,8 @@ public function boot(Dispatcher $events)
9898
HomePageProvider::register(BlogHomePageProvider::class);
9999
SearchBoxProvider::register(BlogSearchBoxProvider::class);
100100
ModuleClassLoader::addClass('MBlog', __DIR__ . '/MBlog.php');
101-
if (class_exists(QuickBannerPositionBiz::class)) {
102-
BannerPositionBiz::register(QuickBannerPositionBiz::make('blogHome', '博客系统首页'));
103-
}
101+
BannerPositionBiz::registerQuick('Blog', '博客系统');
102+
PartnerPositionBiz::registerQuick('Blog', '博客系统');
104103
SiteUrlBiz::register(BlogSiteUrlBiz::class);
105104
SuperSearchBiz::register(BlogSuperSearchBiz::class);
106105
if (modstart_module_enabled('Reward')) {

‎module/Blog/Docs/release.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## 2.6.0
22

3+
- 新增：博客支持超级搜索ElasticSearch（需要安装SuperSearchES）
34
- 新增：博客主动URL推送功能
45
- 修复：博客列表移动端标题显示异常问题
56
- 修复：博客评论审核状态文案错误修复

‎module/Blog/View/pc/blog/about.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
关于我
1717
</div>
1818
<div class="tw-mt-4">
19-
<div class="ub-html">
19+
<div class="ub-html lg">
2020
{!! modstart_config('Blog_AboutContent') !!}
2121
</div>
2222
</div>

‎module/Blog/View/pc/blog/inc/partners.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</div>
66
<div class="tw-mt-4">
77
<div class="row">
8-
@foreach(MPartner::all('home') as $p)
8+
@foreach(MPartner::all('Blog') as $p)
99
<div class="col-6">
1010
<a href="{{$p['link']}}" target="_blank"
1111
class="hover:tw-shadow tw-text-center tw-text-gray-600 tw-block tw-bg-gray-100 tw-rounded tw-leading-10 tw-mb-3 tw-px-2 tw-truncate">

‎module/Blog/View/pc/blog/index.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div class="col-md-8 margin-top">
1414

1515
<div class="tw-bg-white tw-rounded tw-overflow-hidden">
16-
{!! \Module\Banner\View\BannerView::basic('blogHome') !!}
16+
{!! \Module\Banner\View\BannerView::basic('Blog') !!}
1717
</div>
1818

1919
<div class="tw-p-6 tw-rounded tw-bg-white margin-top">

‎module/Blog/View/pc/blog/message.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</div>
5252
</div>
5353
<div class="tw-mt-4 tw-pl-14">
54-
<div class="ub-html">
54+
<div class="ub-html lg">
5555
{!! $record['content'] !!}
5656
</div>
5757
</div>
@@ -61,7 +61,7 @@
6161
<div>
6262
博主回复
6363
</div>
64-
<div class="ub-html">
64+
<div class="ub-html lg">
6565
{!! $record['reply'] !!}
6666
</div>
6767
</div>

0 commit comments

Comments
 (0)