Merge pull request #442 from colinin/5.0.0

user management added the field isActive

apps/vue/src/api/identity/model/userModel.ts

@@ -57,6 +57,8 @@ export class User extends FullAuditedEntityDto implements IUser {
   lockoutEnd?: Date = undefined;
   /** 并发令牌 */
   concurrencyStamp = '';
+  /** 已激活的用户 */
+  isActive = true;
   /** 角色列表 */
   roleNames: string[] = [];
 }

apps/vue/src/views/identity/user/components/UserModal.vue

@@ -34,8 +34,11 @@
           <FormItem name="phoneNumber" :label="L('DisplayName:PhoneNumber')">
             <BInput v-model:value="userRef.phoneNumber" />
           </FormItem>
-          <FormItem :label="L('LockoutEnabled')">
-            <Checkbox v-model:checked="userRef.lockoutEnabled">{{ L('LockoutEnabled') }}</Checkbox>
+          <FormItem :label="L('DisplayName:IsActive')">
+            <Checkbox v-model:checked="userRef.isActive">{{ L('DisplayName:IsActive') }}</Checkbox>
+          </FormItem>
+          <FormItem :label="L('DisplayName:LockoutEnabled')">
+            <Checkbox v-model:checked="userRef.lockoutEnabled">{{ L('DisplayName:LockoutEnabled') }}</Checkbox>
           </FormItem>
         </TabPane>
         <TabPane key="role" :tab="L('Roles')">