@blocklet/pages-kit 0.5.30 → 0.5.32

package/lib/cjs/utils/data-source.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPageDataSource = setPageDataSource;
 const lodash_1 = require("lodash");
+const page_model_1 = require("./page-model");
 function setPageDataSource(page, state, locale, pageData) {
     try {
         if (!page.locales) {
@@ -11,17 +12,21 @@ function setPageDataSource(page, state, locale, pageData) {
         page.locales[locale].title = page.locales[locale].title || pageData.title;
         page.locales[locale].image = page.locales[locale].image || pageData.image;
         page.locales[locale].description = page.locales[locale].description || pageData.description;
+        if (!page.dataSource) {
+            page.dataSource = {};
+        }
+        const allSections = (0, page_model_1.getPageAllSections)(page);
         // 遍历 pageData 的每个 key
         Object.entries(pageData.sectionsData).forEach(([sectionKey, sectionData]) => {
             try {
                 // 通过 id 或 name 找到对应的 section
-                const section = Object.values(page.sections).find((section) => section.id === sectionKey || section.name === sectionKey);
+                const section = allSections.find((section) => section.id === sectionKey || section.name === sectionKey);
                 if (!section) {
                     return;
                 }
-                // 确保 section.locales 存在
-                section.locales = (0, lodash_1.cloneDeep)(section.locales || {});
-                section.locales[locale] = (0, lodash_1.cloneDeep)(section.locales[locale] || {});
+                // 确保 dataSource 存在
+                page.dataSource[section.id] = (0, lodash_1.cloneDeep)(page.dataSource[section.id] || {});
+                page.dataSource[section.id][locale] = (0, lodash_1.cloneDeep)(page.dataSource[section.id][locale] || {});
                 if (section.component === 'custom-component') {
                     // 处理自定义组件
                     const componentId = section.config?.componentId;
@@ -33,16 +38,14 @@ function setPageDataSource(page, state, locale, pageData) {
                     if (!componentDef) {
                         return;
                     }
-                    // 确保 properties 存在
-                    section.locales[locale].properties = (0, lodash_1.cloneDeep)(section.locales[locale].properties || {});
+                    page.dataSource[section.id][locale].properties = (0, lodash_1.cloneDeep)(page.dataSource[section.id][locale].properties || {});
                     // 遍历 sectionData，设置属性值
                     Object.entries(sectionData || {}).forEach(([propKey, propValue]) => {
                         // 尝试通过 key 或 id 找到属性定义
                         const property = componentDef?.properties?.[propKey] ||
                             Object.values(componentDef?.properties || {}).find((prop) => prop.data?.key === propKey);
-                        if (property) {
-                            // 设置属性值
-                            section.locales[locale].properties[property.data?.id] = {
+                        if (property && page.dataSource?.[section.id]?.[locale]?.properties) {
+                            page.dataSource[section.id][locale].properties[property.data?.id] = {
                                 value: propValue,
                             };
                         }
@@ -50,8 +53,8 @@ function setPageDataSource(page, state, locale, pageData) {
                 }
                 else {
                     // 普通组件直接设置 properties
-                    section.locales[locale] = {
-                        ...(0, lodash_1.cloneDeep)(section.locales[locale]),
+                    page.dataSource[section.id][locale] = {
+                        ...(0, lodash_1.cloneDeep)(page.dataSource[section.id][locale] || {}),
                         ...(sectionData || {}),
                     };
                 }

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPageAllSections = exports.getPageTemplateModel = void 0;
+const pages_kit_core_1 = require("@blocklet/pages-kit-core");
+const getPageTemplateModel = (page, isClone = true) => {
+    const templateModel = new pages_kit_core_1.TemplateModel({
+        childrenProperties: pages_kit_core_1.PAGES_KIT_CHILDREN_PROPERTIES,
+    });
+    templateModel.parse(page, {
+        isClone,
+    });
+    return templateModel;
+};
+exports.getPageTemplateModel = getPageTemplateModel;
+const getPageAllSections = (page) => {
+    const templateModel = (0, exports.getPageTemplateModel)(page);
+    // @FIXME：这里没有去掉 layout block，现在是拉平处理
+    return (templateModel
+        .getRoot()
+        ?.all()
+        ?.filter((item) => item.model.id !== page.id)
+        ?.map((item) => item.model) || []);
+};
+exports.getPageAllSections = getPageAllSections;

package/lib/cjs/utils/property.js

@@ -76,6 +76,7 @@ function mergeComponent({ componentId, getComponent, locale, defaultLocale, prop
             const nextParameters = component.renderer.properties;
             assignNullableFields(props, Object.fromEntries(Object.entries(next?.properties ?? {}).map(([id, { data }]) => {
                 const locales = nextParameters?.[id]?.locales;
+                // @FIXME: locales 需要从 dataSource 中获取，这是个内嵌组件，目前还没被额外处理，跟随父级组件的 locales，感觉需要废弃内嵌组件
                 return [
                     data.key,
                     parsePropertyValue(data, locales?.[locale]?.value ??

package/lib/esm/builtin/event-bus.js

@@ -29,7 +29,6 @@ export const useEventBus = (eventName, eventCallBack, deps = []) => {
         // 提供更多控制功能
         off: eventBus.off,
         on: eventBus.on,
-        all: eventBus.all,
     };
 };
 export default useEventBus;