From 8174ec895d53bd8435f9f33f7a25b6c4002ee1af Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Fri, 11 Oct 2024 13:41:00 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20(admin)=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9F=A5=E7=9C=8Bcookie=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/cookieManager/CookieAddModal.tsx | 4 +- .../cookieManager/CookieEditModal.tsx | 55 +++++++++++-------- .../features/cookieManager/CookieManager.tsx | 18 ++++-- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/admin-frontend/src/features/cookieManager/CookieAddModal.tsx b/admin-frontend/src/features/cookieManager/CookieAddModal.tsx index 0d6f9b9..1460d31 100644 --- a/admin-frontend/src/features/cookieManager/CookieAddModal.tsx +++ b/admin-frontend/src/features/cookieManager/CookieAddModal.tsx @@ -2,13 +2,13 @@ import React, { useState } from 'react'; import { Form, Input, Modal } from '@arco-design/web-react'; import { useNewCookieMutation } from './cookieConfigSlice'; -interface CookieModalProps { +interface CookieAddModalProps { visible: boolean; setVisible: (arg0: boolean) => void; siteName: string; } -function CookieAddModal({ visible, setVisible, siteName }: CookieModalProps) { +function CookieAddModal({ visible, setVisible, siteName }: CookieAddModalProps) { const FormItem = Form.Item; const [content, setContent] = useState(''); const [confirmLoading, setConfirmLoading] = useState(false); diff --git a/admin-frontend/src/features/cookieManager/CookieEditModal.tsx b/admin-frontend/src/features/cookieManager/CookieEditModal.tsx index 955569f..f3e659a 100644 --- a/admin-frontend/src/features/cookieManager/CookieEditModal.tsx +++ b/admin-frontend/src/features/cookieManager/CookieEditModal.tsx @@ -1,28 +1,17 @@ import React, { useState } from 'react'; import { Form, Input, Modal } from '@arco-design/web-react'; import { useNewCookieMutation } from './cookieConfigSlice'; +import { Cookie } from '../../utils/type'; -interface CookieModalProps { +interface CookieEditModalProps { visible: boolean; setVisible: (arg0: boolean) => void; - siteName: string; + cookie: Cookie | null } -function CookieEditModal({ visible, setVisible, siteName }: CookieModalProps) { +function CookieEditModal({ visible, setVisible, cookie }: CookieEditModalProps) { const FormItem = Form.Item; - const [content, setContent] = useState(''); const [confirmLoading, setConfirmLoading] = useState(false); - const [newCoookie] = useNewCookieMutation(); - - const onSubmit = () => { - const postPromise: ReturnType = newCoookie({ siteName, content }); - setConfirmLoading(true); - postPromise.then(() => { - setConfirmLoading(false); - setVisible(false); - setContent(''); - }); - }; return ( setVisible(false)} confirmLoading={confirmLoading} - onOk={onSubmit} - style={{ maxWidth: '90vw' }} + // onOk={onSubmit} + style={{ maxWidth: '90vw', minWidth: '50vw' }} > - + {cookie + && (
- - + + - + + + + + + + + + + + + + + + + + + + )}
); } diff --git a/admin-frontend/src/features/cookieManager/CookieManager.tsx b/admin-frontend/src/features/cookieManager/CookieManager.tsx index 8686b6e..19fa397 100644 --- a/admin-frontend/src/features/cookieManager/CookieManager.tsx +++ b/admin-frontend/src/features/cookieManager/CookieManager.tsx @@ -12,6 +12,7 @@ import { selectPlatformConf, selectSiteConf } from '../globalConf/globalConfSlic import { Cookie, PlatformConfig } from '../../utils/type'; import CookieTargetModal from '../cookieTargetManager/CookieTargetModal'; import CookieAddModal from './CookieAddModal'; +import CookieEditModal from './CookieEditModal'; export default function CookieManager() { const { siteName } = useParams(); @@ -21,9 +22,9 @@ export default function CookieManager() { const cookiesList = cookieDict ? Object.values(cookieDict) : []; // 添加cookie - const [showModal, setShowModal] = React.useState(false); + const [showAddModal, setShowAddModal] = React.useState(false); const handleAddCookie = () => () => { - setShowModal(true); + setShowAddModal(true); }; // 删除cookie @@ -34,6 +35,14 @@ export default function CookieManager() { }); }; + // 编辑cookie + const [showEditModal, setShowEditModal] = React.useState(false); + const [editCookie, setEditCookie] = React.useState(null); + const handleEditCookie = (cookie: Cookie) => () => { + setEditCookie(cookie); + setShowEditModal(true); + }; + let data = [ { id: 3, @@ -50,7 +59,6 @@ export default function CookieManager() { if (siteName) { data = cookiesList.filter((tSite) => tSite.site_name === siteName); } - console.log(Object.values(platformConf)); const platformThatSiteSupport: Record = Object.values(platformConf).reduce((p, c) => { p[c.siteName] = c.platformName; return p; @@ -93,6 +101,7 @@ export default function CookieManager() { + ), @@ -116,7 +125,8 @@ export default function CookieManager() { - + + ); }