From b8fbb0e8eb3ffd450518d170c020dce58327f436 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Fri, 21 Oct 2022 17:08:52 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/pages/system/account/Form.js  | 15 +++++----------
 spug_web/src/pages/system/account/Table.js |  5 +++++
 spug_web/src/pages/system/account/index.js |  9 ++++++++-
 spug_web/src/pages/system/role/store.js    |  8 ++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/spug_web/src/pages/system/account/Form.js b/spug_web/src/pages/system/account/Form.js
index e0f1de5..09e09d8 100644
--- a/spug_web/src/pages/system/account/Form.js
+++ b/spug_web/src/pages/system/account/Form.js
@@ -3,24 +3,19 @@
  * Copyright (c) <spug.dev@gmail.com>
  * Released under the AGPL-3.0 License.
  */
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
+import { Link } from 'react-router-dom';
 import { observer } from 'mobx-react';
 import { Modal, Form, Select, Input, message } from 'antd';
 import http from 'libs/http';
 import store from './store';
-import roleStore from '../role/store';
-import { Link } from "react-router-dom";
+import rStore from '../role/store';
+
 
 export default observer(function () {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
 
-  useEffect(() => {
-    if (roleStore.records.length === 0) {
-      roleStore.fetchRecords()
-    }
-  }, [])
-
   function handleSubmit() {
     setLoading(true);
     const formData = form.getFieldsValue();
@@ -55,7 +50,7 @@ export default observer(function () {
         <Form.Item hidden={store.record.is_supper} label="角色" style={{marginBottom: 0}}>
           <Form.Item name="role_ids" style={{display: 'inline-block', width: '80%'}} extra="权限最大化原则，组合多个角色权限。">
             <Select mode="multiple" placeholder="请选择">
-              {roleStore.records.map(item => (
+              {rStore.records.map(item => (
                 <Select.Option value={item.id} key={item.id}>{item.name}</Select.Option>
               ))}
             </Select>
diff --git a/spug_web/src/pages/system/account/Table.js b/spug_web/src/pages/system/account/Table.js
index 05ec58d..a7c7306 100644
--- a/spug_web/src/pages/system/account/Table.js
+++ b/spug_web/src/pages/system/account/Table.js
@@ -10,6 +10,7 @@ import { Form, Radio, Modal, Button, Badge, message, Input } from 'antd';
 import { TableCard, Action } from 'components';
 import http from 'libs/http';
 import store from './store';
+import rStore from '../role/store';
 
 @observer
 class ComTable extends React.Component {
@@ -30,6 +31,10 @@ class ComTable extends React.Component {
   }, {
     title: '姓名',
     dataIndex: 'nickname',
+  }, {
+    title: '角色',
+    dataIndex: 'role_ids',
+    render: v => v.map(x => rStore.idMap[x]?.name).join(',')
   }, {
     title: '状态',
     render: text => text['is_active'] ? <Badge status="success" text="正常"/> : <Badge status="default" text="禁用"/>
diff --git a/spug_web/src/pages/system/account/index.js b/spug_web/src/pages/system/account/index.js
index d0a1ab5..695cd57 100644
--- a/spug_web/src/pages/system/account/index.js
+++ b/spug_web/src/pages/system/account/index.js
@@ -3,15 +3,22 @@
  * Copyright (c) <spug.dev@gmail.com>
  * Released under the AGPL-3.0 License.
  */
-import React from 'react';
+import React, { useEffect } from 'react';
 import { observer } from 'mobx-react';
 import { Input } from 'antd';
 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>
diff --git a/spug_web/src/pages/system/role/store.js b/spug_web/src/pages/system/role/store.js
index ce841bc..0f72eed 100644
--- a/spug_web/src/pages/system/role/store.js
+++ b/spug_web/src/pages/system/role/store.js
@@ -33,6 +33,14 @@ class Store {
     this.initPermissions()
   }
 
+  @computed get idMap() {
+    const tmp = {}
+    for (let item of this.records) {
+      tmp[item.id] = item
+    }
+    return tmp
+  }
+
   fetchRecords = () => {
     this.isFetching = true;
     http.get('/api/account/role/')