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/locales/en-US/map.ts | 1 +
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 12 +++++++++++-
zy-asrs-flow/src/pages/map/drawer/shelf/3D.js | 0
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 30 ++++++++++++++++++++++++++++++
4 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index a457572..3d92217 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -21,6 +21,7 @@
'': '',
'': '',
'map.drawer.json': 'JSON',
+ 'map.drawer.shelf.view.title': 'Shelf Information',
'': '',
'': '',
'': '',
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/3D.js b/zy-asrs-flow/src/pages/map/drawer/shelf/3D.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/3D.js
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' }),
},
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
new file mode 100644
index 0000000..331d381
--- /dev/null
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -0,0 +1,30 @@
+import React, { useState, useRef, useEffect } from 'react';
+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';
+
+const useStyles = createStyles(({ token, css }) => {
+
+})
+
+const ShelfView = (props) => {
+ const intl = useIntl();
+ const { styles } = useStyles();
+
+ const refContainer = useRef();
+
+ useEffect(() => {
+
+ }, []);
+
+ return (
+ <>
+ <div style={{zIndex: 99}} ref={refContainer}></div>
+ <h1>{props.data.uuid}</h1>
+ </>
+ )
+}
+
+export default ShelfView;
\ No newline at end of file
--
Gitblit v1.9.1