fix: 修复模板

WangJunZzz · Jan 6, 2025 · 2cf33d4 · 2cf33d4
1 parent 6d234f1
commit 2cf33d4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/templates/abp-vnext-pro-nuget-all/vben28/package.json b/templates/abp-vnext-pro-nuget-all/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/templates/abp-vnext-pro-nuget-all/vben28/src/router/constant.ts b/templates/abp-vnext-pro-nuget-all/vben28/src/router/constant.ts
@@ -4,6 +4,8 @@ export const PARENT_LAYOUT_NAME = 'ParentLayout';
 
 export const PAGE_NOT_FOUND_NAME = 'PageNotFound';
 
+export const PAGE_NOT_FOUND_NAME_PATH = 'PageNotFoundPath';
+
 export const EXCEPTION_COMPONENT = () => import('/@/views/sys/exception/Exception.vue');
 
 /**

diff --git a/templates/abp-vnext-pro-nuget-all/vben28/src/router/routes/modules/tenant.ts b/templates/abp-vnext-pro-nuget-all/vben28/src/router/routes/modules/tenant.ts
@@ -13,8 +13,8 @@ const tenant: AppRouteModule = {
   },
   children: [
     {
-      path: 'Tenant',
-      name: 'Tenant',
+      path: 'Page',
+      name: 'TenantPage',
       component: () => import('/@/views/tenants/Tenant.vue'),
       meta: {
         title: t('routes.tenant.tenantList'),

diff --git a/templates/abp-vnext-pro-nuget-all/vben28/src/store/modules/user.ts b/templates/abp-vnext-pro-nuget-all/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/templates/abp-vnext-pro-nuget-all/vben28/src/views/admin/users/AbpUser.ts b/templates/abp-vnext-pro-nuget-all/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/templates/abp-vnext-pro-nuget-all/vben28/src/views/admin/users/EditAbpUser.vue b/templates/abp-vnext-pro-nuget-all/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({
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ export const PARENT_LAYOUT_NAME = 'ParentLayout'; @@
     export const PAGE_NOT_FOUND_NAME = 'PageNotFound';
+    export const PAGE_NOT_FOUND_NAME_PATH = 'PageNotFoundPath';
     export const EXCEPTION_COMPONENT = () => import('/@/views/sys/exception/Exception.vue');
     /**
@@ Expand Down @@