From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack

---
 zy-asrs-flow/src/pages/map/drawer/showJson.jsx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/drawer/showJson.jsx b/zy-asrs-flow/src/pages/map/drawer/showJson.jsx
index 50062f8..c103412 100644
--- a/zy-asrs-flow/src/pages/map/drawer/showJson.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/showJson.jsx
@@ -38,11 +38,11 @@
     const { styles } = useStyles();
     const { data } = props;
 
-    const formattedJSON = JSON.stringify(data, null, 2);
+    const formattedJSON = JSON.stringify(data, null, props.jsonType ?? 2);
 
     return (
         <>
-            <div className={styles.jsonBox} style={{height: props.height}}>
+            <div className={styles.jsonBox} style={{ height: props.height }}>
                 <textarea
                     readOnly
                     className={styles.jsonContent}

--
Gitblit v1.9.1