@blocklet/pages-kit 0.4.111 → 0.4.113

package/lib/esm/components/CustomComponentRenderer/index.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { RenderNestedComponent } from '../../utils/property';
+import { RenderNestedComponent, parsePropertyValue } from '../../utils/property';
 import BlockletReactComponentRenderer from './BlockletReactComponentRenderer';
 import { DevProvider, useDev } from './DevProvider';
 import { ComponentError } from './ErrorComponent';
@@ -24,11 +25,30 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
     }
     const component = useComponent({ ...props, dev });
     const ctx = useCustomComponentRenderer();
+    // 传递过来的参数，需要确保经过前端 parsePropertyValue 处理，并且补全不存在的参数
+    const parsedProps = useMemo(() => {
+        const result = {
+            ...component?.props,
+            ...props?.props,
+        };
+        Object.entries(component?.properties ?? {}).forEach(([id, value]) => {
+            const { data: property } = value;
+            const key = property.key ?? property.id ?? id;
+            const defaultLocale = dev?.defaultLocale ?? 'en';
+            const locale = props?.locale;
+            const defaultValue = property.locales?.[locale]?.defaultValue ?? property.locales?.[defaultLocale]?.defaultValue;
+            result[key] = parsePropertyValue(property, result[key] ?? defaultValue, {
+                locale: props?.locale,
+                defaultLocale,
+            });
+        });
+        return result;
+    }, [props?.props, component?.properties, component?.props]);
     if (component?.error) {
         throw component.error;
     }
     const renderComponentChildren = (Component) => {
-        const children = (_jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props, ...props.props } }));
+        const children = _jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: parsedProps });
         return ctx?.customRendererComponent ? (_jsx(ctx.customRendererComponent, { Component: Component, children: children })) : (children);
     };
     if (component?.Component && renderType === 'view') {
@@ -49,7 +69,7 @@ function Renderer({ renderCount, Component, locale, props, }) {
         if (val?.type === RenderNestedComponent) {
             return [
                 key,
-                _jsx(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties }),
+                _jsx(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties, props: val.props }),
             ];
         }
         return [key, val];

package/lib/esm/components/CustomComponentRenderer/state.js

@@ -274,6 +274,7 @@ export function useComponent({ instanceId, componentId, properties, locale, dev
                 .filter((i) => !!i)),
         },
         error: transpile?.error,
+        properties: componentProperties,
     };
 }
 const COMPONENT_LOADER_MAP = {};