From 46fa96694f3683cb20150a02c45d53bec35353c1 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 12 Jun 2025 11:08:09 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=A8=A1=E6=9D=BF=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useEmail.js | 2 +- src/views/orders/components/NewEmailButton.jsx | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js index af6aabe..3d626d5 100644 --- a/src/hooks/useEmail.js +++ b/src/hooks/useEmail.js @@ -80,7 +80,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => { useEffect(() => { console.log(coliSN, '====colisn======') const getOrderDetail = async () => { - if (isEmpty(coliSN)) { + if (isEmpty(Number(coliSN))) { return false } try { diff --git a/src/views/orders/components/NewEmailButton.jsx b/src/views/orders/components/NewEmailButton.jsx index 579bca6..526c4bb 100644 --- a/src/views/orders/components/NewEmailButton.jsx +++ b/src/views/orders/components/NewEmailButton.jsx @@ -1,15 +1,20 @@ import { createContext, useEffect, useMemo, useState } from 'react' -import { Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd' +import { App, Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd' import useConversationStore from '@/stores/ConversationStore' import { emailTemplates, openPopup, useEmailTemplate } from '@/hooks/useEmail'; import { POPUP_FEATURES } from '@/config'; +import { isEmpty } from '@/utils/commons'; const NewEmailButton = ({ ...props }) => { + const { notification } = App.useApp(); const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore((state) => [state.mailboxActiveNode, state.setMailboxActiveNode]) const COLI_SN = useMemo(() => mailboxActiveNode?.COLI_SN || 0, [mailboxActiveNode.COLI_SN]) const handleTemplateDropdown = ({ key, domEvent }) => { - console.log(key) + if (isEmpty(COLI_SN)) { + notification.warning({ message: '请选择到订单目录', placement: 'top' }) + return false + } openPopup(`/email/new/0/${COLI_SN}/${key}`, `new-0-${COLI_SN}-${key}`, POPUP_FEATURES) };