From 2471eb52995988f6587a0e2f08c55c6edfeb7b53 Mon Sep 17 00:00:00 2001
From: tikkhun <tikkhun@163.com>
Date: Tue, 20 Jan 2026 18:00:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=AB=99=E7=82=B9=E7=BC=96=E8=BE=91):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E8=A1=A8=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

确保编辑表单中的区域数据格式一致，将areas字段转换为code数组
在多个组件中添加数据格式转换逻辑
添加调试信息输出以方便问题排查
---
 src/pages/Site/List/index.tsx        | 10 ++++++++--
 src/pages/Site/Shop/EditSiteForm.tsx |  1 +
 src/pages/Site/Shop/Layout.tsx       | 14 ++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/pages/Site/List/index.tsx b/src/pages/Site/List/index.tsx
index ebab711..1b0e767 100644
--- a/src/pages/Site/List/index.tsx
+++ b/src/pages/Site/List/index.tsx
@@ -58,7 +58,7 @@ export interface SiteItem {
 const SiteList: React.FC = () => {
   const actionRef = useRef<ActionType>();
   const [open, setOpen] = useState(false);
-  const [editing, setEditing] = useState<SiteItem | null>(null);
+  const [editing, setEditing] = useState<SiteItem & { areas: string[] } | null>(null);
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
   const [batchEditOpen, setBatchEditOpen] = useState(false);
   const [batchEditForm] = Form.useForm();
@@ -292,7 +292,13 @@ const SiteList: React.FC = () => {
           <Button
             size="small"
             onClick={() => {
-              setEditing(row);
+              function normalEditing(row:SiteItem){
+                return {
+                  ...row,
+                  areas: row.areas?.map(area=>area.code) || [],
+                }
+              }
+              setEditing(normalEditing(row));
               setOpen(true);
             }}
           >
diff --git a/src/pages/Site/Shop/EditSiteForm.tsx b/src/pages/Site/Shop/EditSiteForm.tsx
index 3db0a35..199fa26 100644
--- a/src/pages/Site/Shop/EditSiteForm.tsx
+++ b/src/pages/Site/Shop/EditSiteForm.tsx
@@ -78,6 +78,7 @@ const EditSiteForm: React.FC<EditSiteFormProps> = ({
       }}
       layout="vertical"
     >
+      {JSON.stringify(initialValues)}
       <ProFormText
         name="name"
         label="名称"
diff --git a/src/pages/Site/Shop/Layout.tsx b/src/pages/Site/Shop/Layout.tsx
index ed7540b..af3f651 100644
--- a/src/pages/Site/Shop/Layout.tsx
+++ b/src/pages/Site/Shop/Layout.tsx
@@ -15,11 +15,11 @@ const ShopLayout: React.FC = () => {
   const location = useLocation();
 
   const [editModalOpen, setEditModalOpen] = useState(false);
-  const [editingSite, setEditingSite] = useState<SiteItem | null>(null);
+  const [editingSite, setEditingSite] = useState<SiteItem & { areas: string[] } | null>(null);
 
   const fetchSites = async () => {
     try {
-      setLoading(true);
+      setEditingSiteLoading(true);
       const { data = [] } = await sitecontrollerAll();
       setSites(data);
 
@@ -103,6 +103,7 @@ const ShopLayout: React.FC = () => {
                   display: 'flex',
                   alignItems: 'center',
                   flexWrap: 'wrap',
+                  gap: '4px'
                 }}
               >
                 <Select
@@ -119,13 +120,18 @@ const ShopLayout: React.FC = () => {
                 />
                 <Button
                   icon={<EditOutlined />}
-                  style={{ marginLeft: 8 }}
                   onClick={() => {
                     const currentSite = sites.find(
                       (site) => site.id === Number(siteId),
                     );
                     if (currentSite) {
-                      setEditingSite(currentSite);
+                      function normalizeEditing (site: SiteItem){
+                        return {
+                          ...site,
+                          areas: site.areas?.map(area=>area.code) || [],
+                        }
+                      }
+                      setEditingSite(normalizeEditing(currentSite));
                       setEditModalOpen(true);
                     } else {
                       message.warning('请先选择一个店铺');