From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 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 e296144..89b43b6 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -3,57 +3,56 @@
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../../utils'
-import Http from '@/utils/http';
-import JSON from './json';
-
-const useStyles = createStyles(({ token, css }) => {
-
-})
+import ShowJson from '../showJson';
+import ShelfView from './view'
const ShelfDrawer = (props) => {
const intl = useIntl();
- const { styles } = useStyles();
- const [activeTabKey, setActiveTabKey] = useState('json');
+ const { curSprite, curFloor } = props;
- const [jsonForm] = Form.useForm();
+ const [activeTabKey, setActiveTabKey] = useState('view');
+ const [curLocNo, setCurLocNo] = React.useState(''); // just used to modify the drawer title
+
+ props.setDrawerWidth(window.innerWidth * 0.35);
+
+ useEffect(() => {
+ if (!curSprite) {
+ return
+ }
+ props.setDrawerTitle(intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }) + ': ' + curLocNo);
+ }, [curLocNo]);
const contentList = {
+ view: (
+ <ShelfView
+ curLocNo={curLocNo}
+ setCurLocNo={setCurLocNo}
+ data={curSprite.data}
+ curFloor={curFloor}
+ />
+ ),
json: (
- <JSON
- refCurr={props.refCurr}
- curSprite={props.curSprite}
- setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
- onSubmit={props.onSubmit}
- jsonForm={jsonForm}
+ <ShowJson
+ data={curSprite.data}
/>
),
};
- const handleCancel = () => {
- props.onCancel();
- };
-
- const handleOk = () => {
- }
-
return (
<>
<Card
+ className='drawer-card'
hoverable
bordered={false}
type='inner'
tabList={[
{
- key: 'json',
- tab: intl.formatMessage({ id: 'map.drawer.json', defaultMessage: 'JSON' }),
- // icon: <BorderOuterOutlined />
-
+ key: 'view',
+ tab: intl.formatMessage({ id: 'map.drawer.shelf.view.title', defaultMessage: '搴撲綅淇℃伅' }),
},
{
- key: 'config',
- tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟' }),
- // icon: <BranchesOutlined />
+ key: 'json',
+ tab: intl.formatMessage({ id: 'map.drawer.json', defaultMessage: 'JSON' }),
},
]}
activeTabKey={activeTabKey}
@@ -67,6 +66,9 @@
style: {
}
}}
+ style={{
+ height: '100%'
+ }}
>
{contentList[activeTabKey]}
</Card>
--
Gitblit v1.9.1