From 685ed72d49323a9ac6c1816a7a78b29e8aeca5d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 三月 2024 10:25:41 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/locales/en-US/map.ts                 |    7 +++++++
 zy-asrs-flow/src/pages/map/components/settings.jsx    |    9 ++++++++-
 zy-asrs-flow/src/pages/map/components/subSettings.jsx |   33 ++++++++++++++++++++++++++++-----
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index dfb20d9..6f6d0c3 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -24,5 +24,12 @@
     '': '',
     '': '',
     '': '',
+    'map.settings.sub.copy.rule': 'Copy Rule',
+    '': '',
+    '': '',
+    '': '',
+    '': '',
+    '': '',
+    '': '',
     '': '',
 }
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index 4209529..07515b8 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -333,10 +333,17 @@
                                                 </Button>
                                                 <SubSpriteSettings
                                                     open={childrenDrawer}
+                                                    refCurr={props.refCurr}
+                                                    values={{
+                                                        copyDire: form.getFieldValue('copyDire'),
+                                                        data: form.getFieldsValue()
+                                                    }}
+                                                    submit={() => {
+                                                        console.log(3)
+                                                    }}
                                                     onClose={() => {
                                                         setChildrenDrawer(false)
                                                     }}
-                                                    refCurr={props.refCurr}
                                                 />
                                             </Form.Item>
                                         </Space.Compact>
diff --git a/zy-asrs-flow/src/pages/map/components/subSettings.jsx b/zy-asrs-flow/src/pages/map/components/subSettings.jsx
index a970b5f..a4c1d1b 100644
--- a/zy-asrs-flow/src/pages/map/components/subSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/subSettings.jsx
@@ -16,12 +16,20 @@
     const { styles } = useStyles();
     const [form] = Form.useForm();
 
+    useEffect(() => {
+        console.log(props.values);
+    }, []);
+
     const handleCancel = () => {
         props.onClose();
     }
 
-    const handleFinish = () => {
+    const handleOk = () => {
+        form.submit();
+    }
 
+    const handleFinish = (values) => {
+        props.submit({ ...values })
     }
 
     const formValuesChange = () => {
@@ -31,13 +39,23 @@
     return (
         <>
             <Drawer
-                title="Two-level Drawer"
+                title={intl.formatMessage({ id: 'map.settings.sub.copy.rule', defaultMessage: '澶嶅埗瑙勫垯' })}
                 width={320}
                 closable={false}
                 open={props.open}
                 getContainer={props.refCurr}
                 rootStyle={{ position: "absolute" }}
                 onClose={handleCancel}
+                extra={
+                    <Space>
+                        <Button onClick={handleCancel}>
+                            <FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' />
+                        </Button>
+                        <Button onClick={handleOk} type="primary">
+                            <FormattedMessage id='common.submit' defaultMessage='纭畾' />
+                        </Button>
+                    </Space>
+                }
             >
                 <Form
                     form={form}
@@ -49,16 +67,21 @@
                     style={{
                         maxWidth: 300,
                     }}
-                    size='default'    // small | default | large
-                    variant='filled'    // outlined | borderless | filled
-                    labelWrap   // label 鎹㈣
+                    size='default'
+                    variant='filled'
+                    labelWrap
                     disabled={false}
                     layout='horizontal'
                 >
                     <Row gutter={[24, 16]}>
+
+
                         <Col span={24}>
 
                         </Col>
+
+
+
                     </Row>
                 </Form>
             </Drawer>

--
Gitblit v1.9.1