From 3f5457bf0493a3226604be3b98cb879ad44a68a9 Mon Sep 17 00:00:00 2001
From: zsqtony <450952271@qq.com>
Date: Sun, 5 Oct 2025 10:39:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MyModal.tsx                |   6 +-
 src/pages/asset/grids/modals/GridShow.tsx | 148 +++++++++++-----------
 2 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/src/components/MyModal.tsx b/src/components/MyModal.tsx
index 4e47799..f13b3f7 100644
--- a/src/components/MyModal.tsx
+++ b/src/components/MyModal.tsx
@@ -9,10 +9,10 @@ export function MyModal(props?: any) {
   };
 
   useEffect(() => {
-    if (open && props?.onOpen) {
-      props.onOpen();
+    if (open) {
+      props?.onOpen(true);
     }
-  }, [open, props?.onOpen]);
+  }, [open]);
 
   useImperativeHandle(props.myRef, () => ({
     close,
diff --git a/src/pages/asset/grids/modals/GridShow.tsx b/src/pages/asset/grids/modals/GridShow.tsx
index 071f4d4..e772375 100644
--- a/src/pages/asset/grids/modals/GridShow.tsx
+++ b/src/pages/asset/grids/modals/GridShow.tsx
@@ -11,86 +11,90 @@ import { ProCard, ProDescriptions } from '@ant-design/pro-components';
 import { Space } from 'antd';
 import { useState } from 'react';
 
-export default function info(props: MyBetaModalFormProps) {
-  const [show, setShow] = useState<any>({});
-  const getShow = () => {
-    Apis.Grid.Grids.Show({
-      id: props?.item?.id,
-    })
-      .then((res) => {
-        setShow(res?.data);
-      })
-      .catch(() => false);
-  };
+export default function Info(props: MyBetaModalFormProps) {
+  const [getShow, setDataShow] = useState<any>({});
 
   // 只在弹窗打开时获取数据
-  const handleOpen = () => {
-    getShow();
-  };
 
   return (
     <MyModal
       title={props.title || '查看'}
       width="800px"
-      onOpen={handleOpen}
+      onOpen={(e: boolean) => {
+        if (e) {
+          return Apis.Grid.Grids.Show({
+            id: props?.item?.id,
+          })
+            .then((res) => {
+              console.log(res);
+              setDataShow(JSON.parse(JSON.stringify(res?.data)));
+              return false;
+            })
+            .catch(() => false);
+        }
+        console.log(e);
+      }}
       node={
-        <ProCard extra={props.extra}>
-          <ProDescriptions bordered>
-            <ProDescriptions.Item label="房屋全名" span={2}>
-              <Space>
-                <span>【{show?.id}】</span>
-                {show?.name}
-              </Space>
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="房号">
-              {show?.name}
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="楼层">
-              {show?.floor}
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="房屋用途">
-              <renderTextHelper.Tag
-                Enums={AssetHousesUsageEnum}
-                value={show?.usage}
-                key="usage"
-              />
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="产权性质">
-              <renderTextHelper.Tag
-                Enums={AssetHousesOwnershipTypeEnum}
-                value={show?.ownership_type}
-                key="ownership_type"
-              />
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="建筑面积">
-              {show?.built_area}m²
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="套内面积">
-              {show?.inside_area}m²
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="计费面积">
-              {show?.chargeable_area}m²
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="房屋状态">
-              <renderTextHelper.Tag
-                Enums={AssetHousesStatusEnum}
-                value={show?.status}
-                key="status"
-              />
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="户型">
-              {show?.room || ''}房{show?.hall || ''}厅{show?.bathroom || ''}卫
-              {show?.kitchen || ''}厨{show?.balcony || ''}阳台
-            </ProDescriptions.Item>
-            <ProDescriptions.Item label="朝向">
-              <renderTextHelper.Tag
-                Enums={AssetHousesOrientationEnum}
-                value={show?.orientation}
-                key="orientation"
-              />
-            </ProDescriptions.Item>
-          </ProDescriptions>
-        </ProCard>
+        <>
+          <ProCard extra={props.extra}>
+            <ProDescriptions bordered>
+              <ProDescriptions.Item label="房屋全名" span={2}>
+                <Space>
+                  <span>【{getShow?.id}】</span>
+                  {getShow?.name}
+                </Space>
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="房号">
+                {getShow?.name}
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="楼层">
+                {getShow?.floor}
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="房屋用途">
+                <renderTextHelper.Tag
+                  Enums={AssetHousesUsageEnum}
+                  value={getShow?.usage}
+                  key="usage"
+                />
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="产权性质">
+                <renderTextHelper.Tag
+                  Enums={AssetHousesOwnershipTypeEnum}
+                  value={getShow?.ownership_type}
+                  key="ownership_type"
+                />
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="建筑面积">
+                {getShow?.built_area}m²
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="套内面积">
+                {getShow?.inside_area}m²
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="计费面积">
+                {getShow?.chargeable_area}m²
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="房屋状态">
+                <renderTextHelper.Tag
+                  Enums={AssetHousesStatusEnum}
+                  value={getShow?.status}
+                  key="status"
+                />
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="户型">
+                {getShow?.room || ''}房{getShow?.hall || ''}厅
+                {getShow?.bathroom || ''}卫{getShow?.kitchen || ''}厨
+                {getShow?.balcony || ''}阳台
+              </ProDescriptions.Item>
+              <ProDescriptions.Item label="朝向">
+                <renderTextHelper.Tag
+                  Enums={AssetHousesOrientationEnum}
+                  value={getShow?.orientation}
+                  key="orientation"
+                />
+              </ProDescriptions.Item>
+            </ProDescriptions>
+          </ProCard>
+        </>
       }
     />
   );