From 467981f9771939f766dfec95d88dfcc0b5d34dc2 Mon Sep 17 00:00:00 2001
From: MaskJson <1036934638@qq.com>
Date: Fri, 26 Jul 2019 18:15:59 +0800
Subject: [PATCH] =?UTF-8?q?api=E4=BB=A3=E7=90=86=E8=BD=AC=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 239 +++++++++++-------
 config-overrides.js                           |   2 +-
 src/view/main/Main.js                         |  14 +-
 src/view/main/components/AppNav/AppNav.js     |   2 -
 .../components/ContentRoutes/ContentRoutes.js |  34 +--
 .../ContentRoutes/RouterComponent.js          |  14 +
 6 files changed, 176 insertions(+), 129 deletions(-)
 create mode 100644 src/view/main/components/ContentRoutes/RouterComponent.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62c92a9..860a21f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="29bd2054-5488-4db5-acf2-485c8fa6ded8" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/config/mixin.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/view/home/home.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/view/main/components/ContentRoutes/RouterComponent.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/actions/layout.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/actions/layout.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/config/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/config/router.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/constants/layout.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/constants/layout.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/reducers/layout.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/reducers/layout.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config-overrides.js" beforeDir="false" afterPath="$PROJECT_DIR$/config-overrides.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/view/main/Main.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/view/main/Main.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js" afterDir="false" />
     </list>
@@ -80,20 +77,20 @@
     <session id="-1861621023">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="22" />
+          <entry key="project.closed" value="23" />
           <entry key="project.open.time.0" value="6" />
           <entry key="project.open.time.1" value="11" />
           <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.2" value="3" />
           <entry key="project.open.time.7" value="1" />
           <entry key="project.open.time.8" value="2" />
-          <entry key="project.opened" value="23" />
+          <entry key="project.opened" value="24" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="css" value="3" />
-          <entry key="js" value="65" />
+          <entry key="js" value="71" />
           <entry key="json" value="8" />
           <entry key="svg" value="2" />
         </counts>
@@ -102,14 +99,14 @@
         <counts>
           <entry key="CSS" value="3" />
           <entry key="JSON" value="8" />
-          <entry key="JavaScript" value="65" />
+          <entry key="JavaScript" value="71" />
           <entry key="SVG" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="css" value="135" />
-          <entry key="js" value="1819" />
+          <entry key="js" value="2984" />
           <entry key="json" value="6" />
           <entry key="txt" value="18" />
         </counts>
@@ -118,7 +115,7 @@
         <counts>
           <entry key="CSS" value="135" />
           <entry key="JSON" value="6" />
-          <entry key="JavaScript" value="1819" />
+          <entry key="JavaScript" value="2984" />
           <entry key="PLAIN_TEXT" value="18" />
         </counts>
       </usages-collector>
@@ -127,10 +124,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/view/RootRouter.js">
+        <entry file="file://$PROJECT_DIR$/src/view/main/Main.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="154">
-              <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+            <state relative-caret-position="66">
+              <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
               <folding>
                 <element signature="e#0#41#0" expanded="true" />
               </folding>
@@ -139,30 +136,33 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/view/main/Main.js">
+        <entry file="file://$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+            <state relative-caret-position="330">
+              <caret line="24" column="7" lean-forward="true" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+            <state relative-caret-position="330">
+              <caret line="30" column="70" selection-start-line="30" selection-start-column="70" selection-end-line="30" selection-end-column="70" />
+              <folding>
+                <element signature="e#0#41#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/view/main/components/ContentRoutes/RouterComponent.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="386">
-              <caret line="62" column="49" lean-forward="true" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
+            <state relative-caret-position="132">
+              <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
               <folding>
-                <element signature="e#0#41#0" expanded="true" />
+                <element signature="e#0#39#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -171,8 +171,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/reducers/layout.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="110">
-              <caret line="8" column="2" lean-forward="true" selection-start-line="8" selection-start-column="2" selection-end-line="8" selection-end-column="2" />
+            <state relative-caret-position="374">
+              <caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
               <folding>
                 <element signature="e#0#74#0" expanded="true" />
               </folding>
@@ -185,9 +185,6 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="374">
               <caret line="42" column="47" lean-forward="true" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
-              <folding>
-                <element signature="e#22#487#0" />
-              </folding>
             </state>
           </provider>
         </entry>
@@ -225,14 +222,12 @@
         <option value="$PROJECT_DIR$/src/view/main/components/AppNav/index.js" />
         <option value="$PROJECT_DIR$/src/view/main/components/ContentRoutes.js" />
         <option value="$PROJECT_DIR$/src/view/main/components/AppHeader/index.js" />
-        <option value="$PROJECT_DIR$/src/index.js" />
         <option value="$PROJECT_DIR$/src/assets/css/index.less" />
         <option value="$PROJECT_DIR$/src/assets/css/adsf.css" />
         <option value="$PROJECT_DIR$/src/assets/css/index.css" />
         <option value="$PROJECT_DIR$/src/assets/css/common.css" />
         <option value="$PROJECT_DIR$/src/view/main/components/ContentRoutes/index.js" />
         <option value="$PROJECT_DIR$/src/components/Card.js" />
-        <option value="$PROJECT_DIR$/config-overrides.js" />
         <option value="$PROJECT_DIR$/src/view/error/404.js" />
         <option value="$PROJECT_DIR$/src/lib/tools.js" />
         <option value="$PROJECT_DIR$/src/store/index.js" />
@@ -242,7 +237,6 @@
         <option value="$PROJECT_DIR$/src/App.js" />
         <option value="$PROJECT_DIR$/src/view/main/components/AppHeader/AppHeader.js" />
         <option value="$PROJECT_DIR$/src/assets/css/layout.css" />
-        <option value="$PROJECT_DIR$/src/view/main/Main.js" />
         <option value="$PROJECT_DIR$/src/view/RootRouter.js" />
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/view/home/home1.js" />
@@ -251,10 +245,15 @@
         <option value="$PROJECT_DIR$/src/constants/layout.js" />
         <option value="$PROJECT_DIR$/src/config/mixin.js" />
         <option value="$PROJECT_DIR$/src/actions/layout.js" />
-        <option value="$PROJECT_DIR$/src/reducers/layout.js" />
         <option value="$PROJECT_DIR$/src/config/router.js" />
-        <option value="$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js" />
+        <option value="$PROJECT_DIR$/config-overrides.js" />
+        <option value="$PROJECT_DIR$/src/reducers/layout.js" />
         <option value="$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js" />
+        <option value="$PROJECT_DIR$/src/index.js" />
+        <option value="$PROJECT_DIR$/src/view/main/components/ContentRoutes/ClobalComponent.js" />
+        <option value="$PROJECT_DIR$/src/view/main/Main.js" />
+        <option value="$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js" />
+        <option value="$PROJECT_DIR$/src/view/main/components/ContentRoutes/RouterComponent.js" />
       </list>
     </option>
   </component>
@@ -281,8 +280,8 @@
     </packageJsonPaths>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="66" />
-    <option name="y" value="82" />
+    <option name="x" value="101" />
+    <option name="y" value="69" />
     <option name="width" value="1683" />
     <option name="height" value="755" />
   </component>
@@ -295,6 +294,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -337,17 +337,46 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="reducers" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="react-ant-admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="react-ant-admin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="store" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="react-ant-admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="react-ant-admin" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="view" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="react-ant-admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="react-ant-admin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="view" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="react-ant-admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="react-ant-admin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="view" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="components" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="react-ant-admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="react-ant-admin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="view" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="components" type="462c0819:PsiDirectoryNode" />
+              <item name="ContentRoutes" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -456,7 +485,8 @@
       <workItem from="1563606765701" duration="44000" />
       <workItem from="1563972804757" duration="4365000" />
       <workItem from="1563977349293" duration="133000" />
-      <workItem from="1561948242580" duration="13152000" />
+      <workItem from="1561948242580" duration="13184000" />
+      <workItem from="1564129393411" duration="6543000" />
     </task>
     <task id="LOCAL-00001" summary=".">
       <created>1561107809957</created>
@@ -493,11 +523,18 @@
       <option name="project" value="LOCAL" />
       <updated>1563977472560</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="api代理转发">
+      <created>1564063083598</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1564063083598</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="121320000" />
+    <option name="totallyTimeSpent" value="127895000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -509,12 +546,12 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49608764" visible="true" weight="0.1743941" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4945227" visible="true" weight="0.1743941" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="npm" order="2" sideWeight="0.5039124" side_tool="true" visible="true" weight="0.1743941" />
+      <window_info id="npm" order="2" sideWeight="0.5054773" side_tool="true" weight="0.1743941" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -546,7 +583,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="api代理转发" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/node_modules/antd/lib/form/index.d.ts" />
     <entry file="file://$PROJECT_DIR$/node_modules/antd/lib/form/Form.js" />
     <entry file="file://$PROJECT_DIR$/src/view/main/Text.js" />
     <entry file="file://$PROJECT_DIR$/src/view/main/Second.js" />
@@ -648,38 +684,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="21" selection-start-line="2" selection-start-column="21" selection-end-line="2" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/store/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="18" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/serviceWorker.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="19" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/view/home/index.js" />
-    <entry file="file://$PROJECT_DIR$/config-overrides.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/view/home/home1.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
@@ -718,13 +726,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/view/main/Main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="509">
@@ -746,50 +747,98 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/store/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-74">
+          <caret line="2" column="18" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config-overrides.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/view/RootRouter.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
-          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+          <caret line="13" column="3" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
           <folding>
             <element signature="e#0#41#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="42" column="47" lean-forward="true" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/App.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" column="19" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/reducers/layout.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="8" column="2" lean-forward="true" selection-start-line="8" selection-start-column="2" selection-end-line="8" selection-end-column="2" />
+        <state relative-caret-position="374">
+          <caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
           <folding>
             <element signature="e#0#74#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/config/router.js">
+    <entry file="file://$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="42" column="47" lean-forward="true" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
+        <state relative-caret-position="330">
+          <caret line="24" column="7" lean-forward="true" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/view/main/Main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
           <folding>
-            <element signature="e#22#487#0" />
+            <element signature="e#0#41#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/view/main/components/ContentRoutes/ContentRoutes.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="386">
-          <caret line="62" column="49" lean-forward="true" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
+        <state relative-caret-position="330">
+          <caret line="30" column="70" selection-start-line="30" selection-start-column="70" selection-end-line="30" selection-end-column="70" />
           <folding>
             <element signature="e#0#41#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/view/main/components/AppNav/AppNav.js">
+    <entry file="file://$PROJECT_DIR$/src/view/main/components/ContentRoutes/RouterComponent.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        <state relative-caret-position="132">
+          <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/config-overrides.js b/config-overrides.js
index 5058ba7..9a6706f 100644
--- a/config-overrides.js
+++ b/config-overrides.js
@@ -21,7 +21,7 @@ module.exports = function override(config, env) {
     '_v': resolve('src/view'),
     '_lib': resolve('src/lib'),
     '_config': resolve('src/config')
-  }
+  };
   // config = rewireLess.withLoaderOptions({
   //   modifyVars: { "@primary-color": "#78a5f1" },
   //   javascriptEnabled: true,
diff --git a/src/view/main/Main.js b/src/view/main/Main.js
index 145fc27..3997362 100644
--- a/src/view/main/Main.js
+++ b/src/view/main/Main.js
@@ -4,11 +4,10 @@ import { connect } from 'react-redux';
 import AppNav from './components/AppNav';
 import AppHeader from './components/AppHeader';
 import ContentRoutes from './components/ContentRoutes';
+import {setOpenKeys} from "../../actions/layout";
 
 class Main extends Component {
 
-
-
   render () {
     const routes = this.props.routes || [];
     return (
@@ -17,7 +16,7 @@ class Main extends Component {
         <AppNav/>
         <Layout className="relative">
           <AppHeader />
-          <ContentRoutes />
+          <ContentRoutes routes={this.props.routes} setOpenKyes={this.props.setOpenKeys}/>
         </Layout>
       </Layout>
     );
@@ -25,9 +24,14 @@ class Main extends Component {
 }
 
 function mapStateToProps(state) {
+  return state.layout;
+}
+function mapDispatchToProps(dispatch) {
   return {
-    routes: state.layout.routes
+    setOpenKeys(keys) {
+      dispatch(setOpenKeys(keys));
+    }
   }
 }
 
-export default connect(mapStateToProps)(Main);
+export default connect(mapStateToProps, mapDispatchToProps)(Main);
diff --git a/src/view/main/components/AppNav/AppNav.js b/src/view/main/components/AppNav/AppNav.js
index 5196e2f..8a2ba1c 100644
--- a/src/view/main/components/AppNav/AppNav.js
+++ b/src/view/main/components/AppNav/AppNav.js
@@ -62,14 +62,12 @@ class AppNav extends Component {
 
   // 菜单状态
   openHandler = (openList) => {
-    console.log(openList)
     this.setState({
       openList: openList
     });
     sessionStorage.setItem('navOpenList', JSON.stringify(openList));
   };
   selectHandler = (config) => {
-    console.log(config.selectedKeys)
     this.setState({
       selectList: config.selectedKeys
     });
diff --git a/src/view/main/components/ContentRoutes/ContentRoutes.js b/src/view/main/components/ContentRoutes/ContentRoutes.js
index 5190037..1c119cb 100644
--- a/src/view/main/components/ContentRoutes/ContentRoutes.js
+++ b/src/view/main/components/ContentRoutes/ContentRoutes.js
@@ -1,13 +1,12 @@
 import React, { Component } from 'react';
 import { Switch, Route, withRouter } from 'react-router-dom';
-import { connect } from 'react-redux';
 import { Layout } from 'antd';
-import { setOpenKeys } from "../../../../actions/layout";
+import GlobalComponent from './RouterComponent';
 
 const { Content } = Layout;
 
 class ContentRoutes extends Component {
-  getComponent = (importComponent) => {
+  getComponent = (importComponent, openKeys) => {
     class AsyncComponent extends Component {
       constructor(props) {
         super(props);
@@ -29,7 +28,7 @@ class ContentRoutes extends Component {
       }
       render() {
         const C = this.state.component;
-        return C ? <C {...this.props} /> : null;
+        return C ? <GlobalComponent setOpenKeys={this.prop.setOpenKeys} openKeys={openKeys}><C {...this.props} /></GlobalComponent> : null;
       }
     }
     return AsyncComponent;
@@ -47,10 +46,6 @@ class ContentRoutes extends Component {
     )
   }
 
-  shouldComponentUpdate(nextState, nextProps) {
-    return false;
-  }
-
   getRouter = (routes, result, flag) => {
     routes.forEach(item => {
       const children = Array.isArray(item.children)?item.children:[];
@@ -60,12 +55,12 @@ class ContentRoutes extends Component {
         result.push(
           <Route path={item.path}
              render={(props) => {
-               this.props.setOpenKeys(item.keys);
                document.title = item.title;
-               const Comp = this.getComponent(() => import('_v/' + item.component));
-               return <Comp {...props} />
+               const Comp = this.getComponent(() => import('_v/' + item.component), item.keys);
+               return <Comp {...props}/>
              }}
-             key={item.path} />
+             key={item.path}
+          />
         )
       }
     });
@@ -73,17 +68,4 @@ class ContentRoutes extends Component {
   }
 }
 
-function mapStateToProps (state) {
-  return {
-    routes: state.layout.routes || []
-  };
-}
-function mapDispatchToProps(dispatch) {
-  return {
-    setOpenKeys(openKeys) {
-      dispatch(setOpenKeys(openKeys));
-    }
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(withRouter(ContentRoutes));
+export default withRouter(ContentRoutes);
diff --git a/src/view/main/components/ContentRoutes/RouterComponent.js b/src/view/main/components/ContentRoutes/RouterComponent.js
new file mode 100644
index 0000000..4909c28
--- /dev/null
+++ b/src/view/main/components/ContentRoutes/RouterComponent.js
@@ -0,0 +1,14 @@
+import React, {Component} from "react";
+import { withRouter } from 'react-router-dom';
+
+class RouterComponent extends Component {
+  render() {
+    const path = this.props.match.path;
+    console.log(this.props.setOpenKeys)
+    return <>
+      {this.props.children}
+    </>
+  }
+}
+
+export default withRouter(RouterComponent);