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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 d81d971..8174366 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -1,9 +1,11 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Drawer, Space, Button } from 'antd';
+import { Card, Form, Button } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../../utils'
import Http from '@/utils/http';
+import ShowJson from '../showJson';
+import ShelfView from './view'
const useStyles = createStyles(({ token, css }) => {
@@ -12,17 +14,55 @@
const ShelfDrawer = (props) => {
const intl = useIntl();
const { styles } = useStyles();
+ const [activeTabKey, setActiveTabKey] = useState('view');
- const handleCancel = () => {
- props.onCancel();
+ const contentList = {
+ view: (
+ <ShelfView
+ data={props.curSprite.data}
+ />
+ ),
+ json: (
+ <ShowJson
+ data={props.curSprite.data}
+ />
+ ),
};
-
- const handleOk = () => {
- }
return (
<>
- <h1>Shelf</h1>
+ <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' }),
+ },
+ ]}
+ activeTabKey={activeTabKey}
+ onTabChange={(key) => {
+ setActiveTabKey(key)
+ }}
+ tabProps={{
+ centered: true,
+ size: 'large',
+ type: "card",
+ style: {
+ }
+ }}
+ style={{
+ height: '100%'
+ }}
+ >
+ {contentList[activeTabKey]}
+ </Card>
</>
)
}
--
Gitblit v1.9.1