Merge pull request #1431 from alibaba/fix-switch

Fix switch
alibaba · Nov 2, 2023 · 7333691 · 7333691 · vercel · Nov 2, 2023
2 parents bd78178 + 4933b25
commit 7333691
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/form-render/src/render-core/FieldItem/main.tsx b/packages/form-render/src/render-core/FieldItem/main.tsx
@@ -11,7 +11,9 @@ import getRuleList from '../../models/validates';
 const UpperContext: any = createContext(() => {});
 const valuePropNameMap = {
   checkbox: 'checked',
-  switch: 'checked'
+  switch: 'checked',
+  Checkbox: 'checked',
+  Switch: 'checked'
 };
 
 import {
@@ -124,7 +126,7 @@ export default (props: any) => {
   }
 
   // Render field components
-  let label = getLabel(schema, displayType, widgets);
+  let label = getLabel(schema, displayType, widgets, fieldProps.addons);
   let noStyle = getValueFromKey('noStyle');
 
   const span = getColSpan(formCtx, upperCtx, schema);

diff --git a/packages/form-render/src/render-core/FieldItem/module.tsx b/packages/form-render/src/render-core/FieldItem/module.tsx
@@ -97,13 +97,13 @@ export const getPath = (path: any) => {
   return path;
 };
 
-export const getLabel = (schema: any, displayType: string, widgets: any) => {
+export const getLabel = (schema: any, displayType: string, widgets: any, addons: any) => {
   const { title, description, descWidget, labelWidget } = schema;
 
   const LabelNode = widgets[labelWidget];
 
   if (LabelNode) {
-    return <LabelNode schema={schema} />
+    return <LabelNode schema={schema} addons={addons} />
   }
 
   if ((!description && !descWidget)) {
@@ -113,7 +113,7 @@ export const getLabel = (schema: any, displayType: string, widgets: any) => {
   const RenderDesc = () => {
     const Widget = widgets[descWidget];
     if (Widget) {
-      return <Widget schema={schema} />;
+      return <Widget schema={schema} addons={addons} />;
     }
 
     if (description) {