From 38c8f31fd61fcb8b8726aceee2fe4ba5b8f6648a Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Tue, 14 Jan 2025 16:23:58 +0800
Subject: [PATCH] feat: the blocks categories and groups merged by default

---
 designer-demo/registry.js       | 15 ++++++++++++++-
 packages/plugins/block/index.js |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/designer-demo/registry.js b/designer-demo/registry.js
index 45d09f1543..20f4bc029c 100644
--- a/designer-demo/registry.js
+++ b/designer-demo/registry.js
@@ -98,7 +98,20 @@ export default {
     Fullscreen,
     Lang
   ],
-  plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, State, Schema, Help, Robot],
+  plugins: [
+    Materials,
+    Tree,
+    Page,
+    [Block, { options: { ...Block.options, mergeCategoriesAndGroups: true } }],
+    Datasource,
+    Bridge,
+    I18n,
+    Script,
+    State,
+    Schema,
+    Help,
+    Robot
+  ],
   dsls: [{ id: 'engine.dsls.dslvue' }],
   settings: [Props, Styles, Events],
   canvas: Canvas
diff --git a/packages/plugins/block/index.js b/packages/plugins/block/index.js
index 66e6967a00..abea298132 100644
--- a/packages/plugins/block/index.js
+++ b/packages/plugins/block/index.js
@@ -21,7 +21,7 @@ export default {
   entry,
   metas: [BlockService],
   options: {
-    mergeCategoriesAndGroups: false
+    mergeCategoriesAndGroups: true
   },
   components: {
     SaveNewBlock