fix: 修复编辑用户和前端路由报错

WangJunZzz · Dec 6, 2024 · 95b6056 · 95b6056
1 parent 6bbbe24
commit 95b6056
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/...dules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/UserAppService.cs b/...dules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/UserAppService.cs
@@ -109,7 +109,6 @@ public virtual async Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto inp
         [Authorize(IdentityPermissions.Users.Update)]
         public virtual async Task<IdentityUserDto> UpdateAsync(UpdateUserInput input)
         {
-            input.UserInfo.IsActive = true;
             return await _identityUserAppService.UpdateAsync(input.UserId, input.UserInfo);
         }
 

diff --git a/vben28/package.json b/vben28/package.json
@@ -70,7 +70,7 @@
     "vue": "3.2.33",
     "vue-i18n": "^9.1.9",
     "vue-json-pretty": "^2.0.6",
-    "vue-router": "^4.0.14",
+    "vue-router": "4.0.14",
     "vue-types": "^4.1.1",
     "xlsx": "^0.18.5",
     "oidc-client": "^1.11.5",

diff --git a/vben28/src/router/routes/basic.ts b/vben28/src/router/routes/basic.ts
@@ -5,7 +5,6 @@ import {
   LAYOUT,
   EXCEPTION_COMPONENT,
   PAGE_NOT_FOUND_NAME,
-  PAGE_NOT_FOUND_NAME_PATH,
 } from '/@/router/constant';
 
 // 404 on a page
@@ -21,7 +20,7 @@ export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
   children: [
     {
       path: '/:path(.*)*',
-      name: PAGE_NOT_FOUND_NAME_PATH,
+      name: PAGE_NOT_FOUND_NAME,
       component: EXCEPTION_COMPONENT,
       meta: {
         title: 'ErrorPage',

diff --git a/vben28/src/store/modules/user.ts b/vben28/src/store/modules/user.ts
@@ -224,7 +224,6 @@ export const useUserStore = defineStore({
      */
     async logout(goLogin = false) {
       try {
-        debugger;
         if (this.userInfo?.isSts) {
           await useOidcLogout();
         } else {

diff --git a/vben28/src/views/admin/users/AbpUser.ts b/vben28/src/views/admin/users/AbpUser.ts
@@ -136,6 +136,13 @@ export const createFormSchema: FormSchema[] = [
 ];
 
 export const editFormSchema: FormSchema[] = [
+  {
+    field: 'isActive',
+    component: 'Input',
+    label: t('routes.admin.userManagement_name'),
+    labelWidth: 130,
+    show: false,
+  },
   {
     field: 'userName',
     component: 'Input',

diff --git a/vben28/src/views/admin/users/EditAbpUser.vue b/vben28/src/views/admin/users/EditAbpUser.vue
@@ -83,7 +83,8 @@ export default defineComponent({
         name: data.record.name,
         userName: data.record.userName,
         email: data.record.email,
-        phoneNumber: data.record.phoneNumber
+        phoneNumber: data.record.phoneNumber,
+        isActive: data.record.isActive,
       });
     });
 
@@ -127,7 +128,7 @@ export default defineComponent({
         userInfo.concurrencyStamp = currentUserInfo.concurrencyStamp;
         userInfo.roleNames = defaultRolesRef.value;
         userInfo.password = request.password;
-
+        userInfo.isActive = request.isActive;
         updateUserInput.userId = currentUserInfo.id;
         updateUserInput.userInfo = userInfo;
         await updateUserAsync({