F 修复账户所属角色某些情况下未正确展示的问题

spug_web/src/pages/system/account/Table.js

@@ -22,7 +22,12 @@ class ComTable extends React.Component {
   }
 
   componentDidMount() {
-    store.fetchRecords()
+    if (rStore.records.length === 0) {
+      rStore.fetchRecords()
+        .then(() => store.fetchRecords())
+    } else {
+      store.fetchRecords()
+    }
   }
 
   columns = [{

spug_web/src/pages/system/account/index.js

@@ -10,15 +10,8 @@ import { SearchForm, AuthDiv, Breadcrumb } from 'components';
 import ComTable from './Table';
 import ComForm from './Form';
 import store from './store';
-import rStore from '../role/store';
 
 export default observer(function () {
-  useEffect(() => {
-    if (rStore.records.length === 0) {
-      rStore.fetchRecords()
-    }
-  }, [])
-
   return (
     <AuthDiv auth="system.account.view">
       <Breadcrumb>

spug_web/src/pages/system/account/store.js

@@ -9,7 +9,7 @@ import http from 'libs/http';
 class Store {
   @observable records = [];
   @observable record = {};
-  @observable isFetching = false;
+  @observable isFetching = true;
   @observable formVisible = false;
 
   @observable f_name;

spug_web/src/pages/system/role/store.js

@@ -43,7 +43,7 @@ class Store {
 
   fetchRecords = () => {
     this.isFetching = true;
-    http.get('/api/account/role/')
+    return http.get('/api/account/role/')
       .then(res => this.records = res)
       .finally(() => this.isFetching = false)
   };