Skip to content

Commit 4a0e2f3

Browse files
committed
新增:富文本支持文档一键导入,支持Word文档(docx)、Markdown文档(md)
1 parent c9d1753 commit 4a0e2f3

File tree

2 files changed

+54
-12
lines changed

2 files changed

+54
-12
lines changed

module/ContentBlock/Admin/Controller/ContentBlockController.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Routing\Controller;
88
use ModStart\Admin\Concern\HasAdminQuickCRUD;
99
use ModStart\Admin\Layout\AdminCRUDBuilder;
10+
use ModStart\Core\Util\ConvertUtil;
1011
use ModStart\Field\AbstractField;
1112
use ModStart\Field\AutoRenderedFieldValue;
1213
use ModStart\Grid\GridFilter;
@@ -27,7 +28,7 @@ protected function crud(AdminCRUDBuilder $builder)
2728

2829
$builder->id('id', 'ID');
2930
$builder->text('name', '标识')->required();
30-
$builder->text('remark', '备注')->required();
31+
$builder->switch('enable', '启用')->gridEditable(true)->defaultValue(true)->required();
3132
$builder->radio('type', '类型')
3233
->optionType(ContentBlockType::class)
3334
->defaultValue(ContentBlockType::BASIC)
@@ -52,16 +53,17 @@ protected function crud(AdminCRUDBuilder $builder)
5253

5354
$builder->display('_content', '内容')
5455
->hookRendering(function (AbstractField $field, $item, $index) {
56+
$item->images = ConvertUtil::toArray($item->images);
5557
return AutoRenderedFieldValue::makeView('module::ContentBlock.View.admin.content', [
5658
'item' => $item
5759
]);
5860
})
5961
->listable(true)->showable(false);
6062

63+
$builder->text('remark', '备注');
6164
$builder->number('sort', '排序')->defaultValue(999)->help('数字越小越靠前')->required();
6265
$builder->datetime('startTime', '开始时间')->help('留空表示不限制');
6366
$builder->datetime('endTime', '结束时间')->help('留空表示不限制');
64-
$builder->switch('enable', '启用')->defaultValue(true)->required();
6567

6668
$builder->display('created_at', L('Created At'))->listable(false);
6769
$builder->display('updated_at', L('Updated At'))->listable(false);
@@ -71,6 +73,8 @@ protected function crud(AdminCRUDBuilder $builder)
7173
$filter->eq('type', '类型')->select(ContentBlockType::class);
7274
$filter->eq('name', '标识');
7375
})
76+
->operateFixed('right')
77+
->canCopy(true)
7478
->title('内容区块');
7579
}
7680
}

module/ContentBlock/View/admin/content.blade.php

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,61 @@
11
<div class="tw-shadow tw-rounded tw-p-1" style="width:10rem;">
22
<table class="ub-table border mini">
33
<tbody>
4-
@if($item->type===\Module\ContentBlock\Type\ContentBlockType::IMAGE)
4+
@if($item->type===\Module\ContentBlock\Type\ContentBlockType::BASIC)
5+
@if(!empty($item->title))
6+
<tr>
7+
<td>标题</td>
8+
<td>{{$item->title}}</td>
9+
</tr>
10+
@endif
11+
@if(!empty($item->summary))
12+
<tr>
13+
<td>描述</td>
14+
<td>{{$item->summary}}</td>
15+
</tr>
16+
@endif
17+
@if(!empty($item->images))
18+
<tr>
19+
<td>图片</td>
20+
<td>
21+
@foreach($item->images as $image)
22+
<a href="javascript:;"
23+
data-image-preview="{{\ModStart\Core\Assets\AssetsUtil::fix($image)}}">
24+
<img style="max-width:2rem;max-height:2rem;"
25+
src="{{\ModStart\Core\Assets\AssetsUtil::fix($image)}}"/>
26+
</a>
27+
@endforeach
28+
</td>
29+
</tr>
30+
@endif
31+
@if(!empty($item->link))
32+
<tr>
33+
<td>链接</td>
34+
<td>{{$item->link}}</td>
35+
</tr>
36+
@endif
37+
@if(!empty($item->text1))
38+
<tr>
39+
<td>链接</td>
40+
<td>{{$item->text1}}</td>
41+
</tr>
42+
@endif
43+
@if(!empty($item->text2))
44+
<tr>
45+
<td>链接</td>
46+
<td>{{$item->text2}}</td>
47+
</tr>
48+
@endif
49+
@elseif($item->type===\Module\ContentBlock\Type\ContentBlockType::IMAGE)
550
<tr>
651
<td width="50">图片</td>
752
<td>
853
<a href="javascript:;" data-image-preview="{{\ModStart\Core\Assets\AssetsUtil::fix($item->image)}}">
9-
<img style="max-width:2rem;max-height:2rem;" src="{{\ModStart\Core\Assets\AssetsUtil::fix($item->image)}}" />
54+
<img style="max-width:2rem;max-height:2rem;"
55+
src="{{\ModStart\Core\Assets\AssetsUtil::fix($item->image)}}"/>
1056
</a>
1157
</td>
1258
</tr>
13-
<tr>
14-
<td>标题</td>
15-
<td>{{$item->title}}</td>
16-
</tr>
17-
<tr>
18-
<td>链接</td>
19-
<td>{{$item->link}}</td>
20-
</tr>
2159
@elseif($item->type===\Module\ContentBlock\Type\ContentBlockType::HTML)
2260
<tr>
2361
<td width="50">内容</td>

0 commit comments

Comments
 (0)