feat: support onResetMessage funtion

ant-design · Oct 25, 2023 · 62d4f85 · 62d4f85
1 parent fa40838
commit 62d4f85
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/src/ProChat/container/index.tsx b/src/ProChat/container/index.tsx
@@ -29,6 +29,7 @@ export const ProChat = memo<ProChatProps>(
     assistantMeta,
     showTitle,
     request,
+    onResetMessage,
     style,
     className,
     ...props
@@ -42,6 +43,7 @@ export const ProChat = memo<ProChatProps>(
         userMeta={userMeta}
         assistantMeta={assistantMeta}
         request={request}
+        onResetMessage={onResetMessage}
         {...props}
         devtoolOptions={__PRO_CHAT_STORE_DEVTOOLS__}
       >

diff --git a/src/ProChat/demos/meta.tsx b/src/ProChat/demos/meta.tsx
@@ -9,7 +9,10 @@ export default () => {
     <div style={{ background: theme.colorBgLayout }}>
       <ProChat
         showTitle
-        userMeta={{ avatar: '🧔', title: '罗辑' }}
+        userMeta={{
+          avatar: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
+          title: 'Ant Design',
+        }}
         assistantMeta={{ avatar: '🛸', title: '三体世界', backgroundColor: 'blue' }}
         initialChats={chats.chats}
       />

diff --git a/src/ProChat/mocks/threebody.ts b/src/ProChat/mocks/threebody.ts
@@ -8,7 +8,7 @@ export const chats = {
       updateAt: 1697862243540,
     },
     Sb5pAzLL: {
-      content: '闭嘴',
+      content: '保持静默，不要回答，不要回答。',
       createAt: 1697862247302,
       id: 'Sb5pAzLL',
       parentId: 'ZGxiX2p4',

diff --git a/src/ProChat/store/action.ts b/src/ProChat/store/action.ts
@@ -83,8 +83,11 @@ export const chatAction: StateCreator<ChatStore, [['zustand/devtools', never]],
   set,
   get,
 ) => ({
-  clearMessage: () => {
-    const { dispatchMessage } = get();
+  clearMessage: async () => {
+    const { dispatchMessage, onResetMessage } = get();
+
+    // 重置消息，清空聊天记录，等待 onResetMessage 完成后再清空
+    if (onResetMessage) await onResetMessage();
 
     dispatchMessage({ type: 'resetMessages' });
 

diff --git a/src/ProChat/store/initialState.ts b/src/ProChat/store/initialState.ts
@@ -23,6 +23,12 @@ export interface ChatPropsState {
    */
   helloMessage?: string;
   request?: string | ChatRequest;
+
+  /**
+   * 重置消息
+   * @returns
+   */
+  onResetMessage?: () => Promise<void>;
   // /**
   //  * 控制是否流式输出
   //  * @default true

diff --git a/src/components/Avatar/index.tsx b/src/components/Avatar/index.tsx
@@ -46,6 +46,7 @@ const Avatar = memo<AvatarProps>(
     const isImage = Boolean(
       avatar && ['/', 'http', 'data:'].some((index) => avatar.startsWith(index)),
     );
+    const isBase64 = Boolean(avatar?.startsWith('data'));
     const emoji = useMemo(() => avatar && !isImage && getEmoji(avatar), [avatar]);
 
     const { styles, cx } = useStyles({ background, isEmoji: Boolean(emoji), size });
@@ -60,7 +61,11 @@ const Avatar = memo<AvatarProps>(
     };
 
     return isImage ? (
-      <AntAvatar src={avatar} {...avatarProps} {...props} />
+      <AntAvatar
+        src={isBase64 ? avatar : <img src={avatar} alt="avatar" />}
+        {...avatarProps}
+        {...props}
+      />
     ) : (
       <AntAvatar {...avatarProps} {...props}>
         {emoji ? <Emoji emoji={emoji} size={size * 0.8} /> : text?.toUpperCase().slice(0, 2)}