From 954e5291a3b8bf94ca26da21021012cf39fe8b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Mon, 5 Jul 2021 14:43:08 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=B1=E8=89=B2=E5=9C=B0=E5=9B=BE,?=
 =?UTF-8?q?=20=E4=BB=8E=E5=86=85=E9=A1=B5=E6=89=93=E5=BC=80=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-react/src/assets/style/dark/lib/form.less |  2 +-
 .../pages/business/house/code/form/part.jsx   | 30 +++++++++++++++++--
 .../house/info/form/base/building.jsx         |  5 +++-
 .../src/views/main/_layout/sider/menu.jsx     | 23 ++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/web-react/src/assets/style/dark/lib/form.less b/web-react/src/assets/style/dark/lib/form.less
index 9a5fc4e..94afe69 100644
--- a/web-react/src/assets/style/dark/lib/form.less
+++ b/web-react/src/assets/style/dark/lib/form.less
@@ -32,7 +32,7 @@
     background-color: @component-background;
 
     @box-shadow-focused: 0 0 0 2px fade(@primary-color, 50%);
-    @control-background: darken(@white, 95%) !important;
+    @control-background: darken(@white, 80%) !important;
     &::before,
     &::after {
       content: none;
diff --git a/web-react/src/pages/business/house/code/form/part.jsx b/web-react/src/pages/business/house/code/form/part.jsx
index e7ddb17..c6c1795 100644
--- a/web-react/src/pages/business/house/code/form/part.jsx
+++ b/web-react/src/pages/business/house/code/form/part.jsx
@@ -20,6 +20,9 @@ import getDictData from 'util/dic'
 import { api } from 'common/api'
 import { CITY } from 'util/global'
 import auth from 'components/authorized/handler'
+import store from 'store'
+
+const { getState } = store
 
 const initialValues = {
     type: 1,
@@ -47,6 +50,10 @@ export default class form extends Component {
         showIndustry: false,
     }
 
+    theme = getState('layout').theme
+
+    nav = getState('nav').nav
+
     // 表单实例
     form = React.createRef()
 
@@ -69,6 +76,8 @@ export default class form extends Component {
         this.fillData({
             record: this.props.record,
         })
+
+        console.log(this.nav)
     }
 
     componentWillUnmount() {
@@ -188,6 +197,7 @@ export default class form extends Component {
                         mask,
                         zoom: 12,
                         center: result.geocodes[0].location,
+                        mapStyle: `amap://styles/${this.theme}`,
                     })
 
                     this.map.on('click', e => {
@@ -540,7 +550,15 @@ export default class form extends Component {
                                             <Auth auth="houseProjectInfo:page">
                                                 <Col>
                                                     <Button.Group>
-                                                        <Button>项目管理</Button>
+                                                        <Button
+                                                            onClick={() =>
+                                                                window.openContentWindowByMenuName(
+                                                                    'bs_house_project_manage'
+                                                                )
+                                                            }
+                                                        >
+                                                            项目管理
+                                                        </Button>
                                                         <Tooltip
                                                             placement="top"
                                                             title="重新加载项目列表"
@@ -651,7 +669,15 @@ export default class form extends Component {
                                     <Auth auth="houseZone:page">
                                         <Col>
                                             <Button.Group>
-                                                <Button>片区管理</Button>
+                                                <Button
+                                                    onClick={() =>
+                                                        window.openContentWindowByMenuName(
+                                                            'bs_house_zone_manage'
+                                                        )
+                                                    }
+                                                >
+                                                    片区管理
+                                                </Button>
                                                 <Tooltip placement="top" title="重新加载片区列表">
                                                     <Button
                                                         icon={<AntIcon type="reload" />}
diff --git a/web-react/src/pages/business/house/info/form/base/building.jsx b/web-react/src/pages/business/house/info/form/base/building.jsx
index ac90a87..4a638ef 100644
--- a/web-react/src/pages/business/house/info/form/base/building.jsx
+++ b/web-react/src/pages/business/house/info/form/base/building.jsx
@@ -19,7 +19,7 @@ import moment from 'moment'
 import { CITY } from 'util/global'
 import store from 'store'
 
-const { dispatch } = store
+const { getState, dispatch } = store
 
 const layout = {
     labelCol: { flex: '150px' },
@@ -45,6 +45,8 @@ export default class building extends Component {
 
         showMap: false,
         showKeepWarmMaterialText: false,
+
+        theme: getState('layout').theme,
     }
 
     form = React.createRef()
@@ -233,6 +235,7 @@ export default class building extends Component {
                         mask,
                         zoom: 12,
                         center: result.geocodes[0].location,
+                        mapStyle: `amap://styles/${this.state.theme}`,
                     })
 
                     this.map.on('click', e => {
diff --git a/web-react/src/views/main/_layout/sider/menu.jsx b/web-react/src/views/main/_layout/sider/menu.jsx
index cbd3a5e..fb3bcf2 100644
--- a/web-react/src/views/main/_layout/sider/menu.jsx
+++ b/web-react/src/views/main/_layout/sider/menu.jsx
@@ -18,6 +18,10 @@ export default class index extends Component {
         })
     }
 
+    componentDidMount() {
+        window.openContentWindowByMenuName = this.onOpenContentWindowByMenuName
+    }
+
     componentWillUnmount() {
         this.unsubscribe()
     }
@@ -49,6 +53,25 @@ export default class index extends Component {
         )
     }
 
+    onOpenContentWindowByMenuName = name => {
+        for (const item of this.state.nav) {
+            for (const menu of item.menu) {
+                if (menu.name === name) {
+                    this.onOpenContentWindow(menu)
+                    return
+                }
+                if (menu.children) {
+                    for (const child of menu.children) {
+                        if (child.name === name) {
+                            this.onOpenContentWindow(child)
+                            return
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     onOpenContentWindow = menu => {
         const { id, meta, component, link, redirect, openType } = menu