@blocklet/pages-kit 0.5.45 → 0.5.48

package/lib/cjs/utils/common.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBrowserEnv = exports.COLOR_CONVERT_FUNCTION_NAME = void 0;
+exports.nextId = exports.isBrowserEnv = exports.COLOR_CONVERT_FUNCTION_NAME = void 0;
 exports.isMuiColorKey = isMuiColorKey;
+const nanoid_1 = require("nanoid");
 exports.COLOR_CONVERT_FUNCTION_NAME = 'colorConvert';
 const isBrowserEnv = () => {
     return typeof globalThis.window !== 'undefined' && typeof globalThis.document !== 'undefined';
@@ -17,3 +18,4 @@ function isMuiColorKey(value) {
     }
     return /^(primary|secondary|error|warning|info|success|grey|background|text|action)\.[a-z0-9]+$/.test(value);
 }
+exports.nextId = (0, nanoid_1.customAlphabet)('abcdefghijklmnopqrstuvwxyz0123456789', 16);

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

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageAllSections = exports.getPageTemplateModel = void 0;
+exports.unzipSection = exports.getPageAllSections = exports.getPageTemplateModel = void 0;
 const pages_kit_core_1 = require("@blocklet/pages-kit-core");
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const getPageTemplateModel = (page, isClone = true) => {
     const templateModel = new pages_kit_core_1.TemplateModel({
         childrenProperties: pages_kit_core_1.PAGES_KIT_CHILDREN_PROPERTIES,
@@ -13,12 +17,45 @@ const getPageTemplateModel = (page, isClone = true) => {
 };
 exports.getPageTemplateModel = getPageTemplateModel;
 const getPageAllSections = (page) => {
-    const templateModel = (0, exports.getPageTemplateModel)(page);
-    // @FIXME：这里没有去掉 layout block，现在是拉平处理
+    const clonePage = (0, cloneDeep_1.default)(page);
+    // 如果 page 不包含 page.sectionIds 并且 page.sections 为数组，那么需要转换为对应的格式
+    if (!clonePage.sectionIds && Array.isArray(clonePage.sections)) {
+        const sections = clonePage.sections.map(exports.unzipSection);
+        clonePage.sections = Object.fromEntries(sections.map((i) => [i.id, i]));
+        clonePage.sectionIds = sections.map((i) => i.id);
+    }
+    const templateModel = (0, exports.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) || []);
 };
 exports.getPageAllSections = getPageAllSections;
+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, (0, exports.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,
+    };
+};
+exports.unzipSection = unzipSection;