新增：富文本支持文档一键导入，支持Word文档（docx）、Markdown文档（md）

Author: modstart

module/ContentBlock/Admin/Controller/ContentBlockController.php

@@ -10,10 +10,12 @@
 use ModStart\Core\Util\ConvertUtil;
 use ModStart\Field\AbstractField;
 use ModStart\Field\AutoRenderedFieldValue;
+use ModStart\Form\Form;
 use ModStart\Grid\GridFilter;
 use ModStart\Support\Concern\HasFields;
 use Module\ContentBlock\Model\ContentBlock;
 use Module\ContentBlock\Type\ContentBlockType;
+use Module\ContentBlock\Util\ContentBlockUtil;
 
 class ContentBlockController extends Controller
 {
@@ -70,6 +72,9 @@ protected function crud(AdminCRUDBuilder $builder)
                 $filter->eq('type', '类型')->select(ContentBlockType::class);
                 $filter->eq('name', '标识');
             })
+            ->hookChanged(function (Form $form) {
+                ContentBlockUtil::clearCache();
+            })
             ->operateFixed('right')
             ->canCopy(true)
             ->title('内容区块');

module/ContentBlock/Docs/release.md

@@ -1,6 +1,7 @@
 ## 1.2.0
 
 - 新增：内容块支持通用类型
+- 优化：内容块修改时自动清理缓存
 
 ---
 

module/ContentBlock/Util/ContentBlockUtil.php

@@ -13,6 +13,16 @@ class ContentBlockUtil
 {
     const CACHE_KEY_PREFIX = 'ContentBlock:';
 
+    public static function clearCache()
+    {
+        $records = ContentBlock::all(['id', 'name']);
+        foreach ($records as $record) {
+            CacheUtil::forget(self::CACHE_KEY_PREFIX . 'Id:' . $record->id);
+            CacheUtil::forget(self::CACHE_KEY_PREFIX . 'Name:' . $record->name);
+            CacheUtil::forget(self::CACHE_KEY_PREFIX . 'Name:' . $record->name . ':All');
+        }
+    }
+
     private static function getBy($where)
     {
         $m = ContentBlock::where($where)
@@ -30,12 +40,12 @@ private static function getBy($where)
             return null;
         }
         $m = $m->toArray();
-        ModelUtil::decodeRecordJson($m, ['images']);
+        ModelUtil::decodeRecordJson($m, ['basicImages', 'basicTexts']);
         if ($m['image']) {
             $m['image'] = AssetsUtil::fixFull($m['image']);
         }
-        if ($m['images']) {
-            $m['images'] = AssetsUtil::fixFull($m['images'], false);
+        if ($m['basicImages']) {
+            $m['basicImages'] = AssetsUtil::fixFull($m['basicImages'], false);
         }
         return $m;
     }
@@ -57,8 +67,9 @@ private static function allBy($where, $limit)
         }
         $ms = $query->get()->toArray();
         AssetsUtil::recordsFixFullOrDefault($ms, ['image']);
+        ModelUtil::decodeRecordsJson($ms, ['basicImages', 'basicTexts']);
         foreach ($ms as $mIndex => $m) {
-            $ms[$mIndex]['images'] = AssetsUtil::fixFull($m['images'], false);
+            $ms[$mIndex]['basicImages'] = AssetsUtil::fixFull($m['basicImages'], false);
         }
         return $ms;
     }
@@ -107,10 +118,14 @@ public static function getByIdCached($id)
 
     public static function allCached($name, $limit = 0)
     {
-        return CacheUtil::remember(self::CACHE_KEY_PREFIX . "Name:" . $name . ':' . $limit,
+        $records = CacheUtil::remember(self::CACHE_KEY_PREFIX . "Name:" . $name . ':All',
             3600,
-            function () use ($name, $limit) {
-                return self::all($name, $limit);
+            function () use ($name) {
+                return self::all($name);
             });
+        if ($limit > 0) {
+            $records = array_slice($records, 0, $limit);
+        }
+        return $records;
     }
 }