fix: 转发邮件: 发件人

src/views/Conversations/Online/Input/EmailEditorPopup.jsx

@@ -99,34 +99,40 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
   const [emailOrder, setEmailOrder] = useState('');
   const [emailMat, setEmailMat] = useState('');
 
+  const stateReset = () => {
+    setStickToProps({})
+    setStickToCid('')
+    setEmailOrder('')
+    setEmailOPI('')
+    setNewFromEmail('')
+    setNewToEmail('')
+  }
+
   // 存储: 会话ID,
   // 这个窗口没有模态, 即使不是focus, 还是需要保持会话ID
   // 否则, 会话列表切换之后, 会话ID更新, 导致消息关联错误
   const [stickToCid, setStickToCid] = useState(conversationid);
   useEffect(() => {
-    // console.log('emailEditorPopup effect', open, '\nto', toEmail)
-    setStickToProps({ fromEmail, fromUser, fromOrder, toEmail, conversationid, quoteid, action });
+    if (isEmpty(quoteid)) {
+      // console.log('emailEditorPopup effect', open, '\nto', toEmail)
+      setStickToProps({ fromEmail, fromUser, fromOrder, toEmail, conversationid, quoteid, action });
 
-    setStickToCid(conversationid)
-    setEmailOrder(fromOrder)
-    setEmailOPI(fromUser)
-    setNewFromEmail(fromEmail)
-    setNewToEmail(toEmail)
+      setStickToCid(conversationid)
+      setEmailOrder(fromOrder)
+      setEmailOPI(fromUser)
+      setNewFromEmail(fromEmail)
+      setNewToEmail(toEmail)
 
-    const _findMat = emailListAddrMapped?.[fromEmail]?.mat_sn
-    setEmailMat(_findMat)
+      const _findMat = emailListAddrMapped?.[fromEmail]?.mat_sn
+      setEmailMat(_findMat)
 
-    if (open !== true) {
-      form.resetFields()
+      if (open !== true) {
+        form.resetFields()
+      }
     }
 
     return () => {
-      setStickToProps({})
-      setStickToCid('')
-      setEmailOrder('')
-      setEmailOPI('')
-      setNewFromEmail('')
-      setNewToEmail('')
+      stateReset()
     }
   }, [open])
 
@@ -148,7 +154,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
     }
 
     return () => {}
-  }, [mailData])
+  }, [mailData, open])
 
   const handleSwitchEmail = (labelValue) => {
     const { value } = labelValue
@@ -206,7 +212,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
       // bcc: quote.bcc || '',
       subject: `Re: ${info.MAI_Subject || ''}`,
     };
-    const forwardValues = { subject: `Fw: ${info.MAI_Subject || ''}` };
+    const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` };
     if (action === 'reply') {
       form.setFieldsValue(_formValues);
       setInitialForm(_formValues);