From be6360e39dd7e04c6f9d30b58baf83b9d0f126be Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 27 三月 2024 14:49:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
index 894333f..8174366 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -5,6 +5,7 @@
import * as Utils from '../../utils'
import Http from '@/utils/http';
import ShowJson from '../showJson';
+import ShelfView from './view'
const useStyles = createStyles(({ token, css }) => {
@@ -13,9 +14,14 @@
const ShelfDrawer = (props) => {
const intl = useIntl();
const { styles } = useStyles();
- const [activeTabKey, setActiveTabKey] = useState('json');
+ const [activeTabKey, setActiveTabKey] = useState('view');
const contentList = {
+ view: (
+ <ShelfView
+ data={props.curSprite.data}
+ />
+ ),
json: (
<ShowJson
data={props.curSprite.data}
@@ -32,6 +38,10 @@
type='inner'
tabList={[
{
+ key: 'view',
+ tab: intl.formatMessage({ id: 'map.drawer.shelf.view.title', defaultMessage: '搴撲綅淇℃伅' }),
+ },
+ {
key: 'json',
tab: intl.formatMessage({ id: 'map.drawer.json', defaultMessage: 'JSON' }),
},
--
Gitblit v1.9.1