diff --git a/src/components/chat-container/chat-container.tsx b/src/components/chat-container/chat-container.tsx
index b70b58e23c2d977b1891f32ca599b5bc81126df7..91b88292134ff50c7a13bbb1504dc5bb6bd3d1fa 100644
--- a/src/components/chat-container/chat-container.tsx
+++ b/src/components/chat-container/chat-container.tsx
@@ -580,8 +580,9 @@ export class ChatContainer extends Component<
                     />
                   </div>
                   <ChatToolbar
-                    data={this.props.aiTopic.activedTopic.value}
                     type='footer'
+                    mode={this.props.mode}
+                    data={this.props.aiTopic.activedTopic.value}
                     className={`${this.ns.e('toolbar')} ${this.ns.is(
                       'has-materials',
                       this.props.aiChat.materials.value.length > 0,
@@ -607,6 +608,7 @@ export class ChatContainer extends Component<
                 </div>
                 <ChatToolbar
                   type='footer'
+                  mode={this.props.mode}
                   data={this.props.aiTopic.activedTopic.value}
                   className={`${this.ns.e('toolbar')} ${this.ns.is(
                     'has-materials',
diff --git a/src/components/chat-toolbar/chat-toolbar.tsx b/src/components/chat-toolbar/chat-toolbar.tsx
index 7b85d50e8b87afec69a2820239e477e90b458f65..92773ac846b62f72633c154cff0940e0a2848f8c 100644
--- a/src/components/chat-toolbar/chat-toolbar.tsx
+++ b/src/components/chat-toolbar/chat-toolbar.tsx
@@ -57,12 +57,20 @@ export interface ChatToolbarProps {
    * @memberof ChatToolbarProps
    */
   className?: string;
+
+  /**
+   * AI模式
+   *
+   * @type {('DEFAULT' | 'TOPIC')}
+   * @memberof ChatToolbarProps
+   */
+  mode: 'DEFAULT' | 'TOPIC';
 }
 
 const ns = new Namespace('chat-toolbar');
 
 export const ChatToolbar = (props: ChatToolbarProps) => {
-  const { controller, items = [], data, type, className } = props;
+  const { controller, items = [], data, type, className, mode } = props;
   const containerContext = useContext(ContainerContext);
 
   let toolbarItems: IChatToolbarItem[] = [];
@@ -95,7 +103,7 @@ export const ChatToolbar = (props: ChatToolbarProps) => {
         {
           label: '新建对话',
           title: '新建对话',
-          hidden: props.controller.opts.mode !== 'TOPIC',
+          hidden: mode !== 'TOPIC',
           icon: () => {
             return <NewDialogueSvg />;
           },
@@ -209,9 +217,9 @@ export const ChatToolbar = (props: ChatToolbarProps) => {
       // 计算真实文本
       tempData.msg.realcontent = data.realcontent;
     } else {
+      if (!tempData.data) tempData.data = {};
       Object.assign(tempData.data, { messages: controller.messages.value });
     }
-
     if (item.onClick && typeof item.onClick === 'function') {
       item.onClick(e, item, controller.context, controller.params, tempData);
     } else {