@blocklet/pages-kit 0.5.29 → 0.5.31

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

@@ -1,4 +1,5 @@
 import { cloneDeep } from 'lodash';
+import { getPageAllSections } from './page-model';
 export function setPageDataSource(page, state, locale, pageData) {
     try {
         if (!page.locales) {
@@ -8,17 +9,21 @@ export 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 = 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 = cloneDeep(section.locales || {});
-                section.locales[locale] = cloneDeep(section.locales[locale] || {});
+                // 确保 dataSource 存在
+                page.dataSource[section.id] = cloneDeep(page.dataSource[section.id] || {});
+                page.dataSource[section.id][locale] = cloneDeep(page.dataSource[section.id][locale] || {});
                 if (section.component === 'custom-component') {
                     // 处理自定义组件
                     const componentId = section.config?.componentId;
@@ -30,16 +35,14 @@ export function setPageDataSource(page, state, locale, pageData) {
                     if (!componentDef) {
                         return;
                     }
-                    // 确保 properties 存在
-                    section.locales[locale].properties = cloneDeep(section.locales[locale].properties || {});
+                    page.dataSource[section.id][locale].properties = 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,
                             };
                         }
@@ -47,8 +50,8 @@ export function setPageDataSource(page, state, locale, pageData) {
                 }
                 else {
                     // 普通组件直接设置 properties
-                    section.locales[locale] = {
-                        ...cloneDeep(section.locales[locale]),
+                    page.dataSource[section.id][locale] = {
+                        ...cloneDeep(page.dataSource[section.id][locale] || {}),
                         ...(sectionData || {}),
                     };
                 }

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

@@ -0,0 +1,19 @@
+import { TemplateModel, PAGES_KIT_CHILDREN_PROPERTIES } from '@blocklet/pages-kit-core';
+export const getPageTemplateModel = (page, isClone = true) => {
+    const templateModel = new TemplateModel({
+        childrenProperties: PAGES_KIT_CHILDREN_PROPERTIES,
+    });
+    templateModel.parse(page, {
+        isClone,
+    });
+    return templateModel;
+};
+export const getPageAllSections = (page) => {
+    const templateModel = getPageTemplateModel(page);
+    // @FIXME：这里没有去掉 layout block，现在是拉平处理
+    return (templateModel
+        .getRoot()
+        ?.all()
+        ?.filter((item) => item.model.id !== page.id)
+        ?.map((item) => item.model) || []);
+};

package/lib/esm/utils/property.js

@@ -40,6 +40,7 @@ export function mergeComponent({ componentId, getComponent, locale, defaultLocal
             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/types/builtin/event-bus.d.ts

@@ -13,6 +13,5 @@ export declare const useEventBus: <T>(eventName?: string, eventCallBack?: EventC
         <Key extends string>(type: Key, handler: import("mitt").Handler<any>): void;
         (type: "*", handler: import("mitt").WildcardHandler<Record<string, any>>): void;
     };
-    all: import("mitt").EventHandlerMap<Record<string, any>>;
 };
 export default useEventBus;