@blocklet/pages-kit 0.4.111 → 0.4.113

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

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = CustomComponentRenderer;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
 const react_error_boundary_1 = require("react-error-boundary");
 const property_1 = require("../../utils/property");
 const BlockletReactComponentRenderer_1 = __importDefault(require("./BlockletReactComponentRenderer"));
@@ -44,11 +45,30 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
     }
     const component = (0, state_1.useComponent)({ ...props, dev });
     const ctx = (0, context_1.useCustomComponentRenderer)();
+    // 传递过来的参数，需要确保经过前端 parsePropertyValue 处理，并且补全不存在的参数
+    const parsedProps = (0, react_1.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] = (0, property_1.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 = ((0, jsx_runtime_1.jsx)(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: { ...component?.props, ...props.props } }));
+        const children = (0, jsx_runtime_1.jsx)(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: parsedProps });
         return ctx?.customRendererComponent ? ((0, jsx_runtime_1.jsx)(ctx.customRendererComponent, { Component: Component, children: children })) : (children);
     };
     if (component?.Component && renderType === 'view') {
@@ -69,7 +89,7 @@ function Renderer({ renderCount, Component, locale, props, }) {
         if (val?.type === property_1.RenderNestedComponent) {
             return [
                 key,
-                (0, jsx_runtime_1.jsx)(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties }),
+                (0, jsx_runtime_1.jsx)(ComponentRenderer, { locale: locale, renderCount: renderCount, componentId: val.componentId, properties: val.properties, props: val.props }),
             ];
         }
         return [key, val];

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

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