From 62c647c1f214ceb9f0de0bfde243654fd9bda860 Mon Sep 17 00:00:00 2001
From: zy7y <13271962515@163.com>
Date: Thu, 15 Sep 2022 17:29:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/controller/user.py                    |   8 +-
 backend/dbhelper/user.py                      |  11 +-
 backend/mini.db                               | Bin 4096 -> 45056 bytes
 backend/mini.db-shm                           | Bin 32768 -> 0 bytes
 backend/mini.db-wal                           | Bin 655112 -> 0 bytes
 backend/schemas/common.py                     |   2 +-
 .../src/components/layout/header-crumb.vue    |   1 -
 .../layout/layout-info/select-role.vue        |   2 +
 frontend/src/service/role.js                  |   9 +
 frontend/src/service/user.js                  |  40 ++-
 frontend/src/utils/directive.js               |   1 -
 frontend/src/views/login/conf.js              |  11 +
 frontend/src/views/login/login.vue            |  14 +-
 frontend/src/views/main/system/user/conf.js   |  38 ++-
 frontend/src/views/main/system/user/user.vue  | 290 +++++++++++++++---
 15 files changed, 356 insertions(+), 71 deletions(-)
 delete mode 100644 backend/mini.db-shm
 delete mode 100644 backend/mini.db-wal
 create mode 100644 frontend/src/service/role.js
 create mode 100644 frontend/src/views/login/conf.js

diff --git a/backend/controller/user.py b/backend/controller/user.py
index 4d51ed4..058ac64 100644
--- a/backend/controller/user.py
+++ b/backend/controller/user.py
@@ -48,10 +48,10 @@ async def user_arr(
 
 async def user_list(query: UserQuery) -> Response[ListAll[list[UserRead]]]:
     """post查询用户列表"""
-    limit = query.size
-    skip = (query.offset - 1) * limit
-    del query.offset, query.size
-    users, count = await get_users(skip, limit, query.dict())
+    size = query.limit
+    skip = (query.offset - 1) * size
+    del query.offset, query.limit
+    users, count = await get_users(skip, size, query.dict())
     return Response(data=ListAll(total=count, items=users))
 
 
diff --git a/backend/dbhelper/user.py b/backend/dbhelper/user.py
index 364861e..c0fc401 100644
--- a/backend/dbhelper/user.py
+++ b/backend/dbhelper/user.py
@@ -63,9 +63,8 @@ async def get_users(skip: int, limit: int, kwargs: dict = None):
         kwargs = {f"{k}__contains": v for k, v in kwargs.items()}
     else:
         kwargs = {}
-    result = (
-        UserModel.filter(status__not_in=[9, 5], **kwargs).all().order_by("-created")
-    )
+    result = UserModel.filter(**kwargs).all().order_by("-created")
+    print(await result.offset(skip).limit(limit))
     return await result.offset(skip).limit(limit), await result.count()
 
 
@@ -98,9 +97,11 @@ async def put_user(uid: int, data: UserPut):
     for role in roles:
         if await get_role({"id": role.rid, "status__not": 9}) is None:
             return role.rid
-
     # 更新用户
-    data.password = get_password_hash(data.password)
+    if data.password != "加密之后的密码":
+        data.password = get_password_hash(data.password)
+    else:
+        del data.password
     await UserModel.filter(id=uid).update(**data.dict())
 
     # todo 1. 先前有的角色，这次更新成没有 2. 先前没有的角色 这次更新成有， 3. 只更新了状态
diff --git a/backend/mini.db b/backend/mini.db
index e2a2455a104f1cf6a5d6b143f3ac8831aaaf3ab5..60e7509f1b4b6acdbc450fb461b41fcbd9f17b4b 100644
GIT binary patch
literal 45056
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

delta 36
qcmZp8z|^2HL7J73fq{W>Vxv7bBZHoQEiaJAAh20cp^1Ou1Q7t1p$Fpt

diff --git a/backend/mini.db-shm b/backend/mini.db-shm
deleted file mode 100644
index 763739dfc1d1b2f6a6db24e1f7df3c5605d9cfff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI)$4-?&0EXcgkR}%FC}71d_TGCJ#jdER*n97YT@ewx*u4VxuDlHscg8#L0`wnq
zNLaXWahSxslT2pLpE>h=c`jgzzLyh5yJTiS;fG``Nan}7pT$3FKY#u5t+}zOx~in1
zrn2l)MQMG}Kb}vn`ZL14zgmsdXWpbXNj90u%t~h1r}~hc`kj+nb5m<xvgW7u?Ne*$
z9sVEAv|d}zhHv3)%elXOZ|M;7|JQwR2(H1j^*-3doS{>UK1r-Y0R<FLKmi35P(T3%
z6i`3`1r$&~0R<FLKmi35P(T3%6i`3`1r$&~0R<FLKmi35P(T3%6i`3`1r$&~0R<FL
zKmi35P(T3%6i`3`1)>RLB=1b*ke9rA(1Ff$iPpnl1=?O9lR*q&IHMTDcqTEG8O&xL
z3t7T)R<VY4Y-CH@7c)_Tv<qa>jUM!(52f^{jG>I6oUu$`GSisJ9Oko#rL3TWO4hT9
zt!$&3n`v)mfCA|j$YwCZ7|CeHF_9@uXBKl=z+#rMlGUtb1DmNzcMb1XAc8<H+u6wt
zZbis8Qh~Sv`Rrg9x8s&DU4bY91$3uplw?B{h%L~OBKpQIVZH)U1Uk{1eo>MQRUo!N
zA;k<}H#O{GFZ<Zf0S<DA!yMr#$2iUjPI8LVoZ&3zIL`$xa*4}ap_Z%EagFQT;V$>6
z=ROTQppl0(@rcJf;VI8}&I?}B%qw0eZ@a(c9q$QmzdIC&E6|k^2F9&mx&jI)pnw7j
kD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0%;QX4Y8hI4gdfE

diff --git a/backend/mini.db-wal b/backend/mini.db-wal
deleted file mode 100644
index 0c693466bbc4330f2f41a9a0b50c29e214e52b92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 655112
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

diff --git a/backend/schemas/common.py b/backend/schemas/common.py
index e116b9d..57cd61e 100644
--- a/backend/schemas/common.py
+++ b/backend/schemas/common.py
@@ -42,7 +42,7 @@ class QueryData(BaseModel):
     """分页查询基础数据"""
 
     offset: int = 1
-    size: int = 10
+    limit: int = 10
 
 
 class ListAll(GenericModel, Generic[T]):
diff --git a/frontend/src/components/layout/header-crumb.vue b/frontend/src/components/layout/header-crumb.vue
index 8399216..7ac4d28 100644
--- a/frontend/src/components/layout/header-crumb.vue
+++ b/frontend/src/components/layout/header-crumb.vue
@@ -6,7 +6,6 @@ const route = useRoute()
 const cruPath = computed(() => {
   return route.path.substring(1, route.path.length).split('/')
 })
-console.log(route.path, route.fullPath)
 </script>
 
 <template>
diff --git a/frontend/src/components/layout/layout-info/select-role.vue b/frontend/src/components/layout/layout-info/select-role.vue
index e28055f..d8952ea 100644
--- a/frontend/src/components/layout/layout-info/select-role.vue
+++ b/frontend/src/components/layout/layout-info/select-role.vue
@@ -27,6 +27,8 @@ const handleOk = () => {
   setTimeout(() => {
     loading.value = false
     visible.value = false
+    // 页面刷新-》 白屏
+    location.reload()
   }, 1000)
 }
 
diff --git a/frontend/src/service/role.js b/frontend/src/service/role.js
new file mode 100644
index 0000000..5336e77
--- /dev/null
+++ b/frontend/src/service/role.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取角色列表, 需要考虑创建用户选择角色应该是所有未被删除的情况
+export function getRoles(parms) {
+  return request({
+    url: '/role',
+    parms
+  })
+}
diff --git a/frontend/src/service/user.js b/frontend/src/service/user.js
index ba1074e..ce7fc26 100644
--- a/frontend/src/service/user.js
+++ b/frontend/src/service/user.js
@@ -31,8 +31,44 @@ export function selectRole(rid) {
 }
 
 // 获取用户列表
-export function getUsers() {
+export function getUsers(params) {
   return request({
-    url: '/user'
+    url: '/user',
+    params
+  })
+}
+
+// 条件查询用户列表
+export function queryUser(data) {
+  return request({
+    url: '/user/query',
+    method: 'post',
+    data
+  })
+}
+
+//  删除用户
+export function delUser(id) {
+  return request({
+    url: `/user/${id}`,
+    method: 'delete'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/user',
+    method: 'post',
+    data
+  })
+}
+
+// 更新用户
+export function putUser(id, data) {
+  return request({
+    url: `/user/${id}`,
+    method: 'put',
+    data
   })
 }
diff --git a/frontend/src/utils/directive.js b/frontend/src/utils/directive.js
index 9a422be..fe809a6 100644
--- a/frontend/src/utils/directive.js
+++ b/frontend/src/utils/directive.js
@@ -4,7 +4,6 @@ export default (app) => {
   // 按钮权限
   app.directive('per', {
     mounted(el, binding) {
-      console.log(el, binding.value)
       if (
         // 是否存在
         userStore().userInfo.permissions.indexOf(binding.value) === -1
diff --git a/frontend/src/views/login/conf.js b/frontend/src/views/login/conf.js
new file mode 100644
index 0000000..18a57d5
--- /dev/null
+++ b/frontend/src/views/login/conf.js
@@ -0,0 +1,11 @@
+// 登录表单验证配置
+export const loginRules = {
+  username: [
+    { required: true, message: '请输入用户名', trigger: 'blur' },
+    { min: 5, max: 20, message: '5~20', trigger: 'blur' }
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    { min: 6, max: 12, message: '6~12', trigger: 'blur' }
+  ]
+}
diff --git a/frontend/src/views/login/login.vue b/frontend/src/views/login/login.vue
index ed14e67..8c0acaf 100644
--- a/frontend/src/views/login/login.vue
+++ b/frontend/src/views/login/login.vue
@@ -3,19 +3,9 @@ import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
 import { ref, reactive, computed } from 'vue'
 
 import { userStore } from '@/stores/user'
+import { loginRules } from './conf'
 
 const store = userStore()
-// 表单配置
-const rules = {
-  username: [
-    { required: true, message: '请输入用户名', trigger: 'blur' },
-    { min: 5, max: 20, message: '5~20', trigger: 'blur' }
-  ],
-  password: [
-    { required: true, message: '请输入密码', trigger: 'blur' },
-    { min: 6, max: 12, message: '6~12', trigger: 'blur' }
-  ]
-}
 
 // 响应式数据
 const formRef = ref()
@@ -40,7 +30,7 @@ const submitForm = (formEl) => {
     <div class="continer">
       <h1>Mini RBAC</h1>
 
-      <a-form ref="formRef" :model="formData" :rules="rules">
+      <a-form ref="formRef" :model="formData" :rules="loginRules">
         <a-form-item has-feedback name="username">
           <a-input v-model:value.trim="formData.username" placeholder="Username">
             <template #prefix>
diff --git a/frontend/src/views/main/system/user/conf.js b/frontend/src/views/main/system/user/conf.js
index 8022854..29c10d9 100644
--- a/frontend/src/views/main/system/user/conf.js
+++ b/frontend/src/views/main/system/user/conf.js
@@ -1,11 +1,9 @@
 // 表格数据列 表头配置
 export const columns = [
   {
-    title: '序号',
-    dataIndex: 'index',
-    key: 'index',
-    align: 'center',
-    customRender: ({ index }) => `${index + 1}`
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id'
   },
   {
     title: '用户名',
@@ -37,3 +35,33 @@ export const columns = [
     key: 'action'
   }
 ]
+
+// 新增用户的校验配置
+export const addUserRules = {
+  username: [
+    { required: true, message: '请输入用户名', trigger: 'blur' },
+    { min: 5, max: 20, message: '5~20', trigger: 'blur' }
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    { min: 6, max: 12, message: '6~12', trigger: 'blur' }
+  ],
+  nickname: [
+    { required: true, message: '请输入昵称', trigger: 'blur' },
+    { min: 5, max: 20, message: '5~20', trigger: 'blur' }
+  ],
+  roles: [{ required: true, message: '请配置角色', trigger: 'blur' }]
+}
+
+// 编辑用户的校验配置
+export const putUserRules = {
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    { min: 6, max: 12, message: '6~12', trigger: 'blur' }
+  ],
+  nickname: [
+    { required: true, message: '请输入昵称', trigger: 'blur' },
+    { min: 5, max: 20, message: '5~20', trigger: 'blur' }
+  ],
+  roles: [{ required: true, message: '请配置角色', trigger: 'blur' }]
+}
diff --git a/frontend/src/views/main/system/user/user.vue b/frontend/src/views/main/system/user/user.vue
index 893b0da..0552828 100644
--- a/frontend/src/views/main/system/user/user.vue
+++ b/frontend/src/views/main/system/user/user.vue
@@ -1,64 +1,210 @@
 <script setup>
-import { getUsers } from '@/service/user'
-import { columns } from './conf'
-import { formatTime } from '@/utils/format'
-
 import { ref, reactive, onMounted } from 'vue'
 
-import { PlusOutlined, SearchOutlined } from '@ant-design/icons-vue'
+import { PlusOutlined } from '@ant-design/icons-vue'
+
+import { getUsers, queryUser, delUser, addUser, getUserInfo, putUser } from '@/service/user'
+import { getRoles } from '@/service/role'
+import { columns, addUserRules, putUserRules } from './conf'
+import { formatTime } from '@/utils/format'
+import { message } from 'ant-design-vue'
+import { userStore } from '@/stores/user'
+import router from '@/router'
+
+/**查询表单响应式数据 */
+const queryFormRef = ref()
+
+const queryForm = reactive({
+  username: '',
+  nickname: ''
+})
+
+// 是否查询
+const isQuery = ref(false)
 
 // 列表数据
 const dataSource = ref([])
 
-// 页面展示数据条数变化回调
-const pageSizeChange = (current, size) => {
-  console.log(current, size, '展示数量变化')
-}
-
-// 页码变化回调
-const pageChange = (page, pageSize) => {
-  console.log(page, pageSize, '页码变化')
-}
-
-//分页
+//分页响应式配置
 const pagination = reactive({
   current: 1, //当前页
-  pageSize: 10, // 每页数量
-  showSizeChanger: true,
-  total: 200,
-  pageSizeOptions: ['10', '50', '100'],
-  showTotal: (total) => `共${total}条数据`,
-  onShowSizeChange: pageSizeChange,
-  onChange: pageChange
+  pageSize: 5, // 每页数量
+  // showSizeChanger: true,
+  total: 0,
+  pageSizeOptions: ['5', '10', '50'],
+  showTotal: (total) => `共 ${total} 条数据`,
+  onChange: (page, pageSize) => {
+    pagination.current = page
+    pagination.pageSize = pageSize
+    getPageData()
+  }
 })
 
 onMounted(() => {
   getPageData()
 })
 
+// 获取页面数据
 const getPageData = () => {
-  getUsers().then((res) => {
-    dataSource.value = res.data.items
-    pagination.total = res.data.total
+  let offset = pagination.current
+  let limit = pagination.pageSize
+  if (!isQuery.value) {
+    getUsers({ offset, limit }).then((res) => {
+      dataSource.value = res.data.items
+      pagination.total = res.data.total
+    })
+  } else {
+    queryUser({ offset, limit, username: queryForm.username, nickname: queryForm.nickname }).then(
+      (res) => {
+        dataSource.value = res.data.items
+        pagination.total = res.data.total
+      }
+    )
+  }
+}
+
+// 点击查询事件
+const clickQuery = () => {
+  isQuery.value = true
+  getPageData()
+}
+
+// 重置搜索框
+const resetQueryForm = () => {
+  queryFormRef.value.resetFields()
+  isQuery.value = false
+  getPageData()
+}
+
+// 删除
+const delClick = (record) => {
+  delUser(record.id)
+  getPageData()
+}
+
+/**新增用户 */
+const addVisible = ref(false)
+const formRef = ref(null)
+const newUserForm = reactive({
+  username: '',
+  nickname: '',
+  password: '',
+  roles: []
+})
+// 选择角色
+const roleOptions = ref([])
+
+const addClick = () => {
+  addVisible.value = !addVisible.value
+  // 请求角色信息
+  getRoles({ limit: 100 }).then((res) => {
+    roleOptions.value = res.data.items.map((e) => ({ label: e.name, value: e.id }))
   })
 }
+
+// 新增modal 确定的回调
+const onOk = () => {
+  formRef.value.validateFields().then(() => {
+    // 表单验证通过
+    const { username, nickname, password, roles } = newUserForm
+    let rids = roles.map((e, i) => ({ rid: e, status: i === 0 ? 5 : 1 }))
+    addUser({ username, nickname, password, rids }).then((res) => {
+      if (res.msg === '请求成功') {
+        message.success('新增成功')
+        // 1. 关闭 modal
+        addVisible.value = !addVisible.value
+        // 2. 重置响应式数据
+        formRef.value.resetFields()
+        // 3. 刷新页面数据
+        getPageData()
+      }
+    })
+  })
+}
+
+// 新增modal 取消回调
+const onCancel = () => {
+  // 2. 重置响应式数据
+  formRef.value.resetFields()
+}
+
+/**更新用户 */
+
+const putClick = (record) => {
+  // 打开编辑的modal
+  putVisible.value = !putVisible.value
+  // 请求所有角色信息
+  getRoles({ limit: 100 }).then((res) => {
+    roleOptions.value = res.data.items.map((e) => ({ label: e.name, value: e.id }))
+  })
+  putId.value = record.id
+  // 加载当前用户id 具备的用户角色
+  getUserInfo(record.id).then((res) => {
+    // 角色信息
+    putUserForm.roles = res.data.roles.map((e) => e.id)
+    // 昵称信息
+    putUserForm.nickname = res.data.nickname
+    putUserForm.password = '加密之后的密码'
+  })
+}
+
+const putVisible = ref(false)
+
+const putUserFormRef = ref()
+const putUserForm = reactive({
+  nickname: '',
+  password: '',
+  roles: []
+})
+const putId = ref()
+
+//modal 事件
+const onOkPut = () => {
+  //校验数据
+  putUserFormRef.value.validateFields().then(() => {
+    //验证通过
+    const { nickname, password, roles } = putUserForm
+    let rids = roles.map((e, i) => ({ rid: e, status: i === 0 ? 5 : 1 }))
+    putUser(putId.value, { nickname, password, rids }).then((res) => {
+      if (res.msg === '请求成功') {
+        message.success('修改成功')
+        // 1. 关闭 modal
+        putVisible.value = !putVisible.value
+        // 2. 重置响应式数据
+        putUserFormRef.value.resetFields()
+        if (putId.value === userStore().userInfo.id) {
+          // 改了自己
+          message.warning('修改了自己，请重新登录')
+          userStore().$reset()
+          router.push('/login')
+        } else {
+          // 3. 刷新页面数据
+          getPageData()
+        }
+      }
+    })
+  })
+}
+
+const onCancelPut = () => {
+  putUserFormRef.value.resetFields()
+}
 </script>
 
 <template>
   <div class="user">
     <!-- 查询 -->
     <div class="search">
-      <a-form layout="inline">
-        <a-form-item label="用户名">
-          <a-input placeholder="用户名"> </a-input>
+      <a-form ref="queryFormRef" layout="inline" :model="queryForm">
+        <a-form-item label="用户名" name="username">
+          <a-input placeholder="用户名" v-model:value="queryForm.username"> </a-input>
         </a-form-item>
-        <a-form-item label="昵称">
-          <a-input placeholder="昵称"> </a-input>
+        <a-form-item label="昵称" name="nickname">
+          <a-input placeholder="昵称" v-model:value="queryForm.nickname"> </a-input>
         </a-form-item>
-        <a-form-item>
-          <a-button type="primary" v-per="'user:query'">
-            <template #icon> <SearchOutlined /> </template>查询</a-button
-          >
+        <a-form-item v-per="'user:query'">
+          <a-button type="primary" @click="clickQuery">查询</a-button>
+          <a-button style="margin-left: 10px" @click="resetQueryForm">重置</a-button>
         </a-form-item>
       </a-form>
     </div>
@@ -67,18 +213,23 @@ const getPageData = () => {
     <div class="data">
       <a-card title="用户列表"
         ><template #extra>
-          <a-button type="primary" v-per="'user:create'">
+          <a-button type="primary" v-per="'user:create'" @click="addClick">
             <template #icon><plus-outlined /></template>
             新增</a-button
           >
         </template>
 
         <!-- 数据 -->
-        <a-table :columns="columns" :data-source="dataSource" :pagination="pagination">
+        <a-table
+          :columns="columns"
+          :scroll="{ y: 'calc(100vh - 460px)' }"
+          :data-source="dataSource"
+          :pagination="pagination"
+        >
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'status'">
               <a-tag :color="record.status !== 9 ? 'green' : 'red'">
-                {{ record.status !== 9 ? '正常' : '已删除' }}
+                {{ record.status !== 9 ? '正常' : '删除' }}
               </a-tag>
             </template>
             <template v-else-if="column.key === 'created'">
@@ -89,10 +240,10 @@ const getPageData = () => {
             </template>
             <template v-else-if="column.key === 'action'">
               <span>
-                <a v-pre="'user:update'">修改</a>
+                <a v-per="'user:update'" @click="putClick(record)">编辑</a>
                 <a-divider type="vertical" />
                 <template v-if="record.status !== 9">
-                  <a v-per="'user:delete'">删除</a>
+                  <a v-per="'user:delete'" @click="delClick(record)">删除</a>
                 </template>
               </span>
             </template>
@@ -100,6 +251,65 @@ const getPageData = () => {
         </a-table>
       </a-card>
     </div>
+
+    <!-- 新增 用户-->
+    <a-modal
+      v-model:visible="addVisible"
+      title="新建用户"
+      ok-text="创建"
+      cancel-text="取消"
+      @ok="onOk"
+      @cancel="onCancel"
+    >
+      <a-form ref="formRef" :model="newUserForm" :rules="addUserRules">
+        <a-form-item name="username" label="账号">
+          <a-input v-model:value="newUserForm.username" placeholder="用于登录" />
+        </a-form-item>
+        <a-form-item name="nickname" label="昵称">
+          <a-input v-model:value="newUserForm.nickname" />
+        </a-form-item>
+        <a-form-item name="password" label="密码">
+          <a-input-password v-model:value="newUserForm.password" autocomplete="on" />
+        </a-form-item>
+        <a-form-item name="roles" label="角色">
+          <a-select
+            v-model:value="newUserForm.roles"
+            mode="multiple"
+            style="width: 100%"
+            placeholder="默认激活第一个角色"
+            :options="roleOptions"
+          ></a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
+
+    <!-- 修改用户 -->
+    <a-modal
+      v-model:visible="putVisible"
+      title="编辑用户"
+      ok-text="确认"
+      cancel-text="取消"
+      @ok="onOkPut"
+      @cancel="onCancelPut"
+    >
+      <a-form ref="putUserFormRef" :model="putUserForm" :rules="putUserRules">
+        <a-form-item name="nickname" label="昵称">
+          <a-input v-model:value="putUserForm.nickname" />
+        </a-form-item>
+        <a-form-item name="password" label="密码">
+          <a-input-password v-model:value="putUserForm.password" autocomplete="on" />
+        </a-form-item>
+        <a-form-item name="roles" label="角色">
+          <a-select
+            v-model:value="putUserForm.roles"
+            mode="multiple"
+            style="width: 100%"
+            placeholder="默认激活第一个角色"
+            :options="roleOptions"
+          ></a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </div>
 </template>