diff --git a/packages/amis-editor/src/renderer/OptionControl.tsx b/packages/amis-editor/src/renderer/OptionControl.tsx
index bc9fe29523c..8ec34cce3d0 100644
--- a/packages/amis-editor/src/renderer/OptionControl.tsx
+++ b/packages/amis-editor/src/renderer/OptionControl.tsx
@@ -712,16 +712,21 @@ export default class OptionControl extends React.Component<
             clearable={false}
             onChange={(value: string) => this.handleEditLabel(index, value)}
           /> */}
-          {amisRender({
-            type: i18nEnabled ? 'input-text-i18n' : 'input-text',
-            className: 'ae-OptionControlItem-input',
-            value: label,
-            placeholder: '请输入文本/值',
-            clearable: false,
-            onChange: (value: string) => {
-              this.handleEditLabel(index, value);
+          {amisRender(
+            {
+              type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+              className: 'ae-OptionControlItem-input',
+              value: label,
+              placeholder: '请输入文本/值',
+              clearable: false,
+              onChange: (value: string) => {
+                this.handleEditLabel(index, value);
+              }
+            },
+            {
+              theme: this.props.theme
             }
-          })}
+          )}
           {render(
             'dropdown',
             {
diff --git a/packages/amis-editor/src/renderer/TimelineItemControl.tsx b/packages/amis-editor/src/renderer/TimelineItemControl.tsx
index b5a8a700d44..6a4c511a253 100644
--- a/packages/amis-editor/src/renderer/TimelineItemControl.tsx
+++ b/packages/amis-editor/src/renderer/TimelineItemControl.tsx
@@ -400,6 +400,7 @@ export default class TimelineItemControl extends React.Component<
   }
 
   renderOption(props: TimelineItem & {index: number}) {
+    const {theme} = this.props;
     const {time, title, index} = props;
     const delDisabled = !(this.state.items.length > 2);
     const i18nEnabled = getI18nEnabled();
@@ -418,15 +419,18 @@ export default class TimelineItemControl extends React.Component<
               this.handleEditLabel(index, value, 'time')
             }
           /> */}
-          {amisRender({
-            type: i18nEnabled ? 'input-text-i18n' : 'input-text',
-            className: 'ae-TimelineItemControlItem-input',
-            value: time,
-            placeholder: '请输入显示时间',
-            clearable: false,
-            onChange: (value: string) =>
-              this.handleEditLabel(index, value, 'time')
-          })}
+          {amisRender(
+            {
+              type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+              className: 'ae-TimelineItemControlItem-input',
+              value: time,
+              placeholder: '请输入显示时间',
+              clearable: false,
+              onChange: (value: string) =>
+                this.handleEditLabel(index, value, 'time')
+            },
+            {theme}
+          )}
           {/* {amisRender(
             {
               type: "input-date",
@@ -494,6 +498,7 @@ export default class TimelineItemControl extends React.Component<
               ]
             },
             {
+              theme,
               popOverContainer: null // amis 渲染挂载节点会使用 this.target
             }
           )}
@@ -508,15 +513,18 @@ export default class TimelineItemControl extends React.Component<
               this.handleEditLabel(index, value, 'title')
             }
           /> */}
-          {amisRender({
-            type: i18nEnabled ? 'input-text-i18n' : 'input-text',
-            className: 'ae-TimelineItemControlItem-input-title',
-            value: title,
-            clearable: false,
-            placeholder: '请输入标题',
-            onChange: (value: string) =>
-              this.handleEditLabel(index, value, 'title')
-          })}
+          {amisRender(
+            {
+              type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+              className: 'ae-TimelineItemControlItem-input-title',
+              value: title,
+              clearable: false,
+              placeholder: '请输入标题',
+              onChange: (value: string) =>
+                this.handleEditLabel(index, value, 'title')
+            },
+            {theme}
+          )}
         </div>
       </li>
     );
@@ -544,7 +552,7 @@ export default class TimelineItemControl extends React.Component<
 
   render() {
     const {source, items} = this.state;
-    const {render, className} = this.props;
+    const {render, className, theme} = this.props;
     return (
       <div className={cx('ae-TimelineItemControl', className)}>
         {this.renderHeader()}
@@ -562,12 +570,20 @@ export default class TimelineItemControl extends React.Component<
             )}
 
             <div className="ae-TimelineItemControl-footer">
-              {amisRender(this.buildAddSchema(), {
-                onSubmit: this.handleAdd
-              })}
-              {amisRender(this.buildBatchAddSchema(), {
-                onSubmit: this.handleBatchAdd
-              })}
+              {amisRender(
+                this.buildAddSchema(),
+                {
+                  onSubmit: this.handleAdd
+                },
+                {theme}
+              )}
+              {amisRender(
+                this.buildBatchAddSchema(),
+                {
+                  onSubmit: this.handleBatchAdd
+                },
+                {theme}
+              )}
             </div>
           </div>
         ) : null}
diff --git a/packages/amis-editor/src/renderer/TransferTableControl.tsx b/packages/amis-editor/src/renderer/TransferTableControl.tsx
index 638445f4372..458d3f628a0 100644
--- a/packages/amis-editor/src/renderer/TransferTableControl.tsx
+++ b/packages/amis-editor/src/renderer/TransferTableControl.tsx
@@ -482,10 +482,11 @@ export default class TransferTableOption extends React.Component<
   }
 
   render() {
+    const {theme} = this.props;
     return (
       <div className="ae-OptionControl-footer">
-        {amisRender(this.addColumns())}
-        {amisRender(this.addRows())}
+        {amisRender(this.addColumns(), {theme})}
+        {amisRender(this.addRows(), {theme})}
       </div>
     );
   }
diff --git a/packages/amis-editor/src/renderer/event-control/index.tsx b/packages/amis-editor/src/renderer/event-control/index.tsx
index e3ef81c4bcd..215f4f84fe3 100644
--- a/packages/amis-editor/src/renderer/event-control/index.tsx
+++ b/packages/amis-editor/src/renderer/event-control/index.tsx
@@ -1270,7 +1270,8 @@ export class EventControl extends React.Component<
               },
               {
                 data: eventDialogData
-              }
+              },
+              {theme: this.props.theme}
             )
           : null}
         <ActionDialog