BrowserRouter

uas-office-web/wxuasapproval/debug.log

@@ -1,20 +1,19 @@
-[1016/170622.022:ERROR:process_info.cc(380)] UncheckedAllocate
-[1017/195912.277:ERROR:process_info.cc(380)] UncheckedAllocate
-[1017/195916.002:ERROR:process_info.cc(380)] UncheckedAllocate
-[1017/200038.779:ERROR:process_info.cc(380)] UncheckedAllocate
-[1017/200048.904:ERROR:process_info.cc(380)] UncheckedAllocate
-[1017/200052.395:ERROR:process_info.cc(380)] UncheckedAllocate
-[1017/200055.662:ERROR:process_info.cc(380)] UncheckedAllocate
-[1030/163712.412:ERROR:process_info.cc(380)] UncheckedAllocate
-[1030/163925.474:ERROR:process_info.cc(380)] UncheckedAllocate
-[1030/170104.142:ERROR:process_info.cc(380)] UncheckedAllocate
-[1030/170654.239:ERROR:process_info.cc(380)] UncheckedAllocate
-[1031/144955.675:ERROR:process_info.cc(380)] UncheckedAllocate
-[1031/195710.213:ERROR:process_info.cc(380)] UncheckedAllocate
-[1101/144144.021:ERROR:process_info.cc(380)] UncheckedAllocate
-[1101/144223.211:ERROR:process_info.cc(380)] UncheckedAllocate
-[1101/144717.152:ERROR:process_info.cc(380)] UncheckedAllocate
-[1105/192745.585:ERROR:process_info.cc(380)] UncheckedAllocate
-[1105/195751.578:ERROR:process_info.cc(380)] UncheckedAllocate
-[1105/201854.004:ERROR:process_info.cc(380)] UncheckedAllocate
-[1201/085736.790:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1016/170622.022:ERROR:process_info.cc(380)] UncheckedAllocate
+[1017/195912.277:ERROR:process_info.cc(380)] UncheckedAllocate
+[1017/195916.002:ERROR:process_info.cc(380)] UncheckedAllocate
+[1017/200038.779:ERROR:process_info.cc(380)] UncheckedAllocate
+[1017/200048.904:ERROR:process_info.cc(380)] UncheckedAllocate
+[1017/200052.395:ERROR:process_info.cc(380)] UncheckedAllocate
+[1017/200055.662:ERROR:process_info.cc(380)] UncheckedAllocate
+[1030/163712.412:ERROR:process_info.cc(380)] UncheckedAllocate
+[1030/163925.474:ERROR:process_info.cc(380)] UncheckedAllocate
+[1030/170104.142:ERROR:process_info.cc(380)] UncheckedAllocate
+[1030/170654.239:ERROR:process_info.cc(380)] UncheckedAllocate
+[1031/144955.675:ERROR:process_info.cc(380)] UncheckedAllocate
+[1031/195710.213:ERROR:process_info.cc(380)] UncheckedAllocate
+[1101/144144.021:ERROR:process_info.cc(380)] UncheckedAllocate
+[1101/144223.211:ERROR:process_info.cc(380)] UncheckedAllocate
+[1101/144717.152:ERROR:process_info.cc(380)] UncheckedAllocate
+[1105/192745.585:ERROR:process_info.cc(380)] UncheckedAllocate
+[1105/195751.578:ERROR:process_info.cc(380)] UncheckedAllocate
+[1105/201854.004:ERROR:process_info.cc(380)] UncheckedAllocate

uas-office-web/wxuasapproval/src/configs/router.config.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import {
-  HashRouter as Router,
+  BrowserRouter as Router,
   Route,
   Redirect,
   Switch,

uas-office-web/wxuasapproval/src/pages/approval/ApprovalHome.jsx

@@ -87,11 +87,11 @@ class ApprovalHome extends Component {
       })()
     }
     switch (selectedTab) {
-      // case 0: {
-      //   this.initNew(newState)
-      //   this.initReceive(receiveState)
-      //   break
-      // }
+      case 0: {
+        this.initNew(newState)
+        this.initReceive(receiveState)
+        break
+      }
       case 1: {
         this.initReceive(receiveState)
         break
@@ -206,10 +206,10 @@ class ApprovalHome extends Component {
           unselectedTintColor="#949494"
           tintColor="#33A3F4"
           barTintColor="white"
-          prerenderingSiblingsNumber={1}
+          prerenderingSiblingsNumber={2}
           hidden={this.state.tabHidden}
         >
-          {/*{this.getNewTab()}*/}
+          {this.getNewTab()}
           {this.getReceiveTab()}
           {this.getSendTab()}
         </TabBar>
@@ -765,9 +765,9 @@ class ApprovalHome extends Component {
   }
 
   cacheScrollState () {
-    // saveNewState({
-    //   scrollTop: ReactDOM.findDOMNode(this.newList).parentNode.scrollTop,
-    // })()
+    saveNewState({
+      scrollTop: ReactDOM.findDOMNode(this.newList).parentNode.scrollTop,
+    })()
     saveReceiveState({
       scrollTop: ReactDOM.findDOMNode(this.todoTab).parentNode.scrollTop,
       scrollTop2: ReactDOM.findDOMNode(this.doneTab).parentNode.scrollTop,

uas-office-web/wxuasapproval/src/pages/approval/UasApproval.jsx

@@ -1,39 +1,39 @@
-/**
- * Created by RaoMeng on 2020/2/20
- * Desc: U审批过渡页
- */
-
-import React, { Component } from 'react'
-import { clearHomeState } from '../../redux/actions/homeState'
-
-export default class UasApproval extends Component {
-
-  constructor () {
-    super()
-
-    this.state = {}
-  }
-
-  componentDidMount () {
-    document.title = 'U审批'
-    let master = this.props.match.params.master
-    let pageType = this.props.match.params.type
-
-    clearHomeState()()
-
-    this.props.history.replace(
-      '/approvalHome/' + master + (pageType ? ('/' + pageType) : ''))
-  }
-
-  componentWillUnmount () {
-
-  }
-
-  render () {
-    return (
-      <div>
-
-      </div>
-    )
-  }
-}
+/**
+ * Created by RaoMeng on 2020/2/20
+ * Desc: U审批过渡页
+ */
+
+import React, { Component } from 'react'
+import { clearHomeState } from '../../redux/actions/homeState'
+
+export default class UasApproval extends Component {
+
+  constructor () {
+    super()
+
+    this.state = {}
+  }
+
+  componentDidMount () {
+    document.title = 'U审批'
+    let master = this.props.match.params.master
+    let pageType = this.props.match.params.type
+
+    clearHomeState()()
+
+    this.props.history.replace(
+      '/approvalHome/' + master + (pageType ? ('/' + pageType) : ''))
+  }
+
+  componentWillUnmount () {
+
+  }
+
+  render () {
+    return (
+      <div>
+
+      </div>
+    )
+  }
+}

uas-office-web/wxuasapproval/src/redux/reducers/redHomeState.js

@@ -38,7 +38,7 @@ const initSendState = {
 }
 
 const initListState = {
-  selectedTab: 1,
+  selectedTab: 0,
   newState: initNewState,
   receiveState: initReceiveState,
   sendState: initSendState,