🔨 添加描述字段.

orion-visor-ui/src/views/user/role/components/role-form-modal.vue

@@ -20,11 +20,22 @@
               :rules="formRules">
         <!-- 角色名称 -->
         <a-form-item field="name" label="角色名称">
-          <a-input v-model="formModel.name" placeholder="请输入角色名称" />
+          <a-input v-model="formModel.name"
+                   placeholder="请输入角色名称"
+                   allow-clear />
         </a-form-item>
         <!-- 角色编码 -->
-        <a-form-item field="code" label="角色编码" v-if="isAddHandle">
-          <a-input v-model="formModel.code" placeholder="请输入角色编码" />
+        <a-form-item field="code" label="角色编码">
+          <a-input v-model="formModel.code"
+                   :disabled="!isAddHandle"
+                   placeholder="请输入角色编码"
+                   allow-clear />
+        </a-form-item>
+        <!-- 角色描述 -->
+        <a-form-item field="description" label="角色描述">
+          <a-textarea v-model="formModel.description"
+                      placeholder="请输入角色描述"
+                      allow-clear />
         </a-form-item>
       </a-form>
     </a-spin>

orion-visor-ui/src/views/user/role/components/role-table.vue

@@ -25,6 +25,12 @@
                   :options="toOptions(roleStatusKey)"
                   allow-clear />
       </a-form-item>
+      <!-- 角色描述 -->
+      <a-form-item field="description" label="角色描述">
+        <a-input v-model="formModel.description"
+                 placeholder="请输入角色描述"
+                 allow-clear />
+      </a-form-item>
     </query-header>
   </a-card>
   <!-- 表格 -->
@@ -77,7 +83,7 @@
                   :unchecked-text="getDictValue(roleStatusKey, RoleStatus.DISABLED)"
                   :checked-value="RoleStatus.ENABLED"
                   :unchecked-value="RoleStatus.DISABLED"
-                  :before-change="(s: number) => updateStatus(record.id, s)" />
+                  :before-change="(s) => updateStatus(record.id, s as number)" />
         <!-- 无修改权限 -->
         <span v-else>
           <span class="circle" :style="{
@@ -156,6 +162,7 @@
     name: undefined,
     code: undefined,
     status: undefined,
+    description: undefined,
   });
 
   // 更新状态

orion-visor-ui/src/views/user/role/types/form.rules.ts

@@ -16,7 +16,13 @@ export const code = [{
   message: '角色编码长度不能大于32位'
 }] as FieldRule[];
 
+export const description = [{
+  maxLength: 255,
+  message: '角色描述长度不能大于255位'
+}] as FieldRule[];
+
 export default {
   name,
   code,
+  description,
 } as Record<string, FieldRule | FieldRule[]>;

orion-visor-ui/src/views/user/role/types/table.columns.ts

@@ -21,6 +21,13 @@ const columns = [
     dataIndex: 'code',
     slotName: 'code',
     minWidth: 118,
+  }, {
+    title: '角色描述',
+    dataIndex: 'description',
+    slotName: 'description',
+    minWidth: 128,
+    ellipsis: true,
+    tooltip: true,
   }, {
     title: '角色状态',
     dataIndex: 'status',

orion-visor-ui/src/views/user/user/components/user-form-modal.vue

@@ -20,25 +20,42 @@
               :rules="formRules">
         <!-- 用户名 -->
         <a-form-item field="username" label="用户名">
-          <a-input v-model="formModel.username" :disabled="!isAddHandle" placeholder="请输入用户名" />
+          <a-input v-model="formModel.username"
+                   :disabled="!isAddHandle"
+                   placeholder="请输入用户名"
+                   allow-clear />
         </a-form-item>
         <!-- 花名 -->
         <a-form-item field="nickname" label="花名">
-          <a-input v-model="formModel.nickname" placeholder="请输入花名" />
+          <a-input v-model="formModel.nickname"
+                   placeholder="请输入花名"
+                   allow-clear />
         </a-form-item>
         <!-- 密码 -->
         <a-form-item v-if="isAddHandle"
                      field="password"
                      label="密码">
-          <a-input-password v-model="formModel.password" placeholder="请输入密码" />
+          <a-input-password v-model="formModel.password"
+                            placeholder="请输入密码"
+                            allow-clear />
         </a-form-item>
         <!-- 手机号 -->
         <a-form-item field="mobile" label="手机号">
-          <a-input v-model="formModel.mobile" placeholder="请输入手机号" />
+          <a-input v-model="formModel.mobile"
+                   placeholder="请输入手机号"
+                   allow-clear />
         </a-form-item>
         <!-- 邮箱 -->
         <a-form-item field="email" label="邮箱">
-          <a-input v-model="formModel.email" placeholder="请输入邮箱" />
+          <a-input v-model="formModel.email"
+                   placeholder="请输入邮箱"
+                   allow-clear />
+        </a-form-item>
+        <!-- 用户描述 -->
+        <a-form-item field="description" label="用户描述">
+          <a-textarea v-model="formModel.description"
+                      placeholder="请输入用户描述"
+                      allow-clear />
         </a-form-item>
       </a-form>
     </a-spin>
@@ -75,6 +92,7 @@
       nickname: undefined,
       mobile: undefined,
       email: undefined,
+      description: undefined,
     };
   };
 

orion-visor-ui/src/views/user/user/components/user-table.vue

@@ -15,11 +15,15 @@
       </a-form-item>
       <!-- 用户名 -->
       <a-form-item field="username" label="用户名">
-        <a-input v-model="formModel.username" placeholder="请输入用户名" allow-clear />
+        <a-input v-model="formModel.username"
+                 placeholder="请输入用户名"
+                 allow-clear />
       </a-form-item>
       <!-- 花名 -->
       <a-form-item field="nickname" label="花名">
-        <a-input v-model="formModel.nickname" placeholder="请输入花名" allow-clear />
+        <a-input v-model="formModel.nickname"
+                 placeholder="请输入花名"
+                 allow-clear />
       </a-form-item>
       <!-- 用户状态 -->
       <a-form-item field="status" label="用户状态">
@@ -30,11 +34,21 @@
       </a-form-item>
       <!-- 手机号 -->
       <a-form-item field="mobile" label="手机号">
-        <a-input v-model="formModel.mobile" placeholder="请输入手机号" allow-clear />
+        <a-input v-model="formModel.mobile"
+                 placeholder="请输入手机号"
+                 allow-clear />
       </a-form-item>
       <!-- 邮箱 -->
       <a-form-item field="email" label="邮箱">
-        <a-input v-model="formModel.email" placeholder="请输入邮箱" allow-clear />
+        <a-input v-model="formModel.email"
+                 placeholder="请输入邮箱"
+                 allow-clear />
+      </a-form-item>
+      <!-- 用户描述 -->
+      <a-form-item field="description" label="用户描述">
+        <a-input v-model="formModel.description"
+                 placeholder="请输入用户描述"
+                 allow-clear />
       </a-form-item>
     </query-header>
   </a-card>
@@ -107,7 +121,7 @@
                   :unchecked-text="getDictValue(userStatusKey, UserStatus.DISABLED)"
                   :checked-value="UserStatus.ENABLED"
                   :unchecked-value="UserStatus.DISABLED"
-                  :before-change="(s: number) => updateStatus(record.id, s)" />
+                  :before-change="(s) => updateStatus(record.id, s as number)" />
         <!-- 无修改权限 -->
         <span v-else>
           <span class="circle" :style="{
@@ -208,7 +222,7 @@
     mobile: undefined,
     email: undefined,
     status: undefined,
-    lastLoginTime: undefined,
+    description: undefined,
   });
 
   // 删除当前行

orion-visor-ui/src/views/user/user/types/form.rules.ts

@@ -38,10 +38,16 @@ export const email = [{
   message: '邮箱长度不能大于64位'
 }] as FieldRule[];
 
+export const description = [{
+  maxLength: 255,
+  message: '用户描述长度不能大于255位'
+}] as FieldRule[];
+
 export default {
   username,
   password,
   nickname,
   mobile,
   email,
+  description,
 } as Record<string, FieldRule | FieldRule[]>;

orion-visor-ui/src/views/user/user/types/table.columns.ts

@@ -37,6 +37,13 @@ const columns = [
     minWidth: 88,
     ellipsis: true,
     tooltip: true,
+  }, {
+    title: '用户描述',
+    dataIndex: 'description',
+    slotName: 'description',
+    minWidth: 128,
+    ellipsis: true,
+    tooltip: true,
   }, {
     title: '用户状态',
     dataIndex: 'status',