moshaorui 3 months ago
parent
commit
890b8a97a1

+ 6 - 0
app/Distributor/Controllers/VisualEditorController.php

@@ -31,6 +31,12 @@ class VisualEditorController extends Controller
         $html = $this->getURlHTML($url,$uri);
         //菜单
         $siteMenu = SiteMenu::showAllSelectOptions();
+        foreach ($siteMenu as $key => $value) {
+            if ($value['url'] == '/' && $mid == 0) {
+                $mid =$value['id'];
+                break;
+            }
+        }
         //
         $publish = admin_trans_label('publish');
         $visualEdit = admin_trans_label('visual_edit');

+ 4 - 5
app/Distributor/Repositories/DistAppearanceTemplate.php

@@ -55,7 +55,6 @@ class DistAppearanceTemplate extends EloquentRepository
 
     public static function previewSave($data)
     {
-        //echo $data;exit;
         $distInfo = DistAdminDistributor::getInfo();
         $distId = $distInfo->id;
         $appearanceId = $distInfo->appearance_id;
@@ -68,7 +67,6 @@ class DistAppearanceTemplate extends EloquentRepository
                 //替换模板内容
                 $oldContent = self::contentChange($template->content,$template->template_code);//旧模板内容
                 $newContent = self::contentReplace($oldContent,$elements);
-
                 //更新模板内容
                 $template->content = $newContent;
                 $template->updated_at = Carbon::now();
@@ -99,6 +97,7 @@ class DistAppearanceTemplate extends EloquentRepository
                 },
                 $content
             );
+
             //替换img等标签的情况
             $content = preg_replace_callback(
                 '/<([a-zA-Z0-9]+)[^>]*mtb_id="' . preg_quote($mtbId, '/') . '"[^>]*>/s',
@@ -108,7 +107,6 @@ class DistAppearanceTemplate extends EloquentRepository
                 },
                 $content
             );
-
         }
 
         return $content;
@@ -133,7 +131,7 @@ class DistAppearanceTemplate extends EloquentRepository
             $outHtml = preg_replace($pattern, $replacement, $outHtml, 1);
 
             //去掉mtb_id属性
-            $outHtml = preg_replace('/mtb_id="[^"]*"/', '', $outHtml);
+            $outHtml = preg_replace('/\s*mtb_id="[^"]*"/', '', $outHtml);
             $result[] = [
                 'mtb_id' => $match[3],  // mtb_id 的值
                 'outHtml' => $outHtml, // 匹配到的完整 HTML 元素
@@ -146,7 +144,7 @@ class DistAppearanceTemplate extends EloquentRepository
         foreach ($matches as $match) {
             //去掉mtb_id属性
             $outHtml = $match[0];
-            $outHtml = preg_replace('/mtb_id="[^"]*"/', '', $outHtml);
+            $outHtml = preg_replace('/\s*mtb_id="[^"]*"/', '', $outHtml);
             $result[] = [
                 'mtb_id' => $match[2],  // mtb_id 的值,这里改为 $match[2]
                 'outHtml' => $outHtml,  // 匹配到的完整 HTML 元素
@@ -154,6 +152,7 @@ class DistAppearanceTemplate extends EloquentRepository
         }
 
 
+
         $result = array_reduce($result, function ($carry, $item) {
             // 获取 mtb_id 的前缀
             $prefix = explode('_', $item['mtb_id'])[0];

+ 1 - 1
public/vendor/grapes/grapes.init.js

@@ -224,7 +224,7 @@ editor.on('component:selected', (comp) => {
     const selectedComponent = editor.getSelected();
     //const defaultToolbar = selectedComponent.get('toolbar');
     //最外层不显示按钮
-    if (selectedComponent.get('attributes').mtb_edit == 'true' || selectedComponent.get('attributes').mtb_edit_this == 'true') {
+    if (selectedComponent.get('attributes').mtb_edit == 'true' || selectedComponent.get('attributes').mtb_edit == '1' || selectedComponent.get('attributes').mtb_edit == '2') {
         selectedComponent.set({
             toolbar: [
             ]