@blocklet/pages-kit 0.5.47 → 0.5.48

package/lib/esm/utils/common.js

@@ -1,3 +1,4 @@
+import { customAlphabet } from 'nanoid';
 export const COLOR_CONVERT_FUNCTION_NAME = 'colorConvert';
 export const isBrowserEnv = () => {
     return typeof globalThis.window !== 'undefined' && typeof globalThis.document !== 'undefined';
@@ -12,3 +13,4 @@ export function isMuiColorKey(value) {
     }
     return /^(primary|secondary|error|warning|info|success|grey|background|text|action)\.[a-z0-9]+$/.test(value);
 }
+export const nextId = customAlphabet('abcdefghijklmnopqrstuvwxyz0123456789', 16);

package/lib/esm/utils/page-model.js

@@ -1,4 +1,5 @@
 import { TemplateModel, PAGES_KIT_CHILDREN_PROPERTIES } from '@blocklet/pages-kit-core';
+import cloneDeep from 'lodash/cloneDeep';
 export const getPageTemplateModel = (page, isClone = true) => {
     const templateModel = new TemplateModel({
         childrenProperties: PAGES_KIT_CHILDREN_PROPERTIES,
@@ -9,11 +10,43 @@ export const getPageTemplateModel = (page, isClone = true) => {
     return templateModel;
 };
 export const getPageAllSections = (page) => {
-    const templateModel = getPageTemplateModel(page);
-    // @FIXME：这里没有去掉 layout block，现在是拉平处理
+    const clonePage = cloneDeep(page);
+    // 如果 page 不包含 page.sectionIds 并且 page.sections 为数组，那么需要转换为对应的格式
+    if (!clonePage.sectionIds && Array.isArray(clonePage.sections)) {
+        const sections = clonePage.sections.map(unzipSection);
+        clonePage.sections = Object.fromEntries(sections.map((i) => [i.id, i]));
+        clonePage.sectionIds = sections.map((i) => i.id);
+    }
+    const templateModel = getPageTemplateModel(clonePage);
+    // @FIXME：现在是拉平处理
     return (templateModel
         .getRoot()
         ?.all()
-        ?.filter((item) => item.model.id !== page.id)
+        ?.filter((item) => item.model.id !== page.id && item.model.component !== 'layout-block')
         ?.map((item) => item.model) || []);
 };
+export const unzipSection = (section) => {
+    // 如果 section 已经有 sectionIds 和 sections，那么直接返回
+    if (section.sectionIds && section.sections) {
+        return section;
+    }
+    const sectionId = section.id;
+    const hasChildSections = section.sections && Object.keys(section.sections).length > 0;
+    const extraProps = {};
+    if (hasChildSections) {
+        // Recursively process child sections
+        extraProps.sections = Object.fromEntries(section.sections?.map?.((s) => [s.id, unzipSection(s)]) ?? []) || {};
+        extraProps.sectionIds = section.sections?.map?.((s) => s.id) ?? [];
+    }
+    return {
+        id: sectionId,
+        component: section.component,
+        config: section.config,
+        name: section.name,
+        isTemplateSection: section.isTemplateSection ?? false,
+        templateDescription: section.templateDescription,
+        llmConfig: section.llmConfig,
+        visibility: section.visibility,
+        ...extraProps,
+    };
+};