From c4b00b0268f35a7a9e016e818b0f6e27bc3876f0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 28 三月 2024 08:56:50 +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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 d3a33cf..8174366 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -4,7 +4,8 @@
import { createStyles } from 'antd-style';
import * as Utils from '../../utils'
import Http from '@/utils/http';
-import ShowJson from './showJson';
+import ShowJson from '../showJson';
+import ShelfView from './view'
const useStyles = createStyles(({ token, css }) => {
@@ -13,14 +14,17 @@
const ShelfDrawer = (props) => {
const intl = useIntl();
const { styles } = useStyles();
- const [activeTabKey, setActiveTabKey] = useState('json');
-
- const { curSprite } = props;
+ const [activeTabKey, setActiveTabKey] = useState('view');
const contentList = {
+ view: (
+ <ShelfView
+ data={props.curSprite.data}
+ />
+ ),
json: (
<ShowJson
- curSprite={props.curSprite}
+ data={props.curSprite.data}
/>
),
};
@@ -28,10 +32,15 @@
return (
<>
<Card
+ className='drawer-card'
hoverable
bordered={false}
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' }),
@@ -49,7 +58,7 @@
}
}}
style={{
- height: '100%',
+ height: '100%'
}}
>
{contentList[activeTabKey]}
--
Gitblit v1.9.1