Merge pull request #11501 from CheshireJCat/feat-carousel-option-supp…

…ort-itemScheama feat: 轮播图option 支持 itemSchema
baidu · Jan 13, 2025 · f927bae · f927bae
2 parents 4828cec + 224fb5b
commit f927bae
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/packages/amis/src/renderers/Carousel.tsx b/packages/amis/src/renderers/Carousel.tsx
@@ -686,20 +686,24 @@ export class Carousel extends React.Component<CarouselProps, CarouselState> {
                           : {})
                       }
                     : {};
-                const itemRender = (option: any) =>
-                  render(
+                const itemRender = (option: any) => {
+                  const {itemSchema: optionItemSchema, ...restOption} = option;
+                  return render(
                     `${current}/body`,
-                    itemSchema ? itemSchema : (defaultSchema as any),
+                    optionItemSchema || itemSchema
+                      ? optionItemSchema || itemSchema
+                      : (defaultSchema as any),
                     {
                       thumbMode: this.props.thumbMode,
                       data: createObject(
                         data,
                         isObject(option)
-                          ? option
+                          ? restOption
                           : {item: option, [name!]: option}
                       )
                     }
                   );
+                };
 
                 return (
                   <div