Merge branch 'dev1.0'

IceEmblem · Oct 16, 2020 · 8bf2b70 · 8bf2b70
2 parents 995c267 + 5e60794
commit 8bf2b70
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/IEManageSystem.Web/ClientApp/react-native.config.js b/src/IEManageSystem.Web/ClientApp/react-native.config.js
@@ -1,3 +1,4 @@
+const createModulesFile = require('./createModulesFile').createModulesFile;
 createModulesFile(
     "./src/RNApp",
     ["RNStart"],

diff --git a/...IEManageSystem.Web/ClientApp/src/Templates/WebIETemplateComponents/IEButton/Component.jsx b/...IEManageSystem.Web/ClientApp/src/Templates/WebIETemplateComponents/IEButton/Component.jsx
@@ -22,7 +22,7 @@ class Component extends IComponent {
             size={setting.size}
             onClick={()=>{
                 if(!this.onClick()){
-                    this.props.history.push(setting.url);
+                    document.location.href = setting.url;
                 }
             }}
         >

diff --git a/src/IEManageSystem.Web/wwwroot/Pages/Home.Page.json b/src/IEManageSystem.Web/wwwroot/Pages/Home.Page.json
@@ -1 +1 @@
-{"Name":"Home","DisplayName":"\u9996\u9875","Description":"\u8FD9\u662F\u4E00\u4E2A\u9996\u9875","Field1Name":null,"Field2Name":null,"Field3Name":null,"Field4Name":null,"Field5Name":null,"Creator":null,"LastUpdater":{"EditorId":1,"Name":"\u8D85\u7EA7\u7BA1\u7406\u5458","HeadSculpture":null,"Time":"2020-10-12T10:37:44.418473+08:00"},"Discriminator":"StaticPage"}
+{"Name":"Home","DisplayName":"\u9996\u9875","Description":"\u8FD9\u662F\u4E00\u4E2A\u9996\u9875","Field1Name":null,"Field2Name":null,"Field3Name":null,"Field4Name":null,"Field5Name":null,"Creator":null,"LastUpdater":{"EditorId":1,"Name":"\u8D85\u7EA7\u7BA1\u7406\u5458","HeadSculpture":null,"Time":"2020-10-16T09:49:09.2052555+08:00"},"Discriminator":"StaticPage"}
diff --git a/src/IEManageSystem.Web/wwwroot/Pages/Home.json b/src/IEManageSystem.Web/wwwroot/Pages/Home.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Name":"Home","DisplayName":"\u9996\u9875","Description":"\u8FD9\u662F\u4E00\u4E2A\u9996\u9875","Field1Name":null,"Field2Name":null,"Field3Name":null,"Field4Name":null,"Field5Name":null,"Creator":null,"LastUpdater":{"EditorId":1,"Name":"\u8D85\u7EA7\u7BA1\u7406\u5458","HeadSculpture":null,"Time":"2020-10-12T10:37:44.418473+08:00"},"Discriminator":"StaticPage"}
		{"Name":"Home","DisplayName":"\u9996\u9875","Description":"\u8FD9\u662F\u4E00\u4E2A\u9996\u9875","Field1Name":null,"Field2Name":null,"Field3Name":null,"Field4Name":null,"Field5Name":null,"Creator":null,"LastUpdater":{"EditorId":1,"Name":"\u8D85\u7EA7\u7BA1\u7406\u5458","HeadSculpture":null,"Time":"2020-10-16T09:49:09.2052555+08:00"},"Discriminator":"StaticPage"}