Browse Source

# 修复

1.vue授权页面发布样式加载失败
2.前端多环境
old-3.0 4.2.2.0
王军 5 years ago
parent
commit
f513d02486
  1. 2
      content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyNameProjectNameHttpApiHostModule.cs
  2. 2
      content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Pages/Dtos/CustomeRequestDto.cs
  3. 14
      content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Permissions/CompanyNameProjectNamePermissions.cs
  4. 2
      content/aspnetcore/src/CompanyName.ProjectName.Application/Roles/RoleAppService.cs
  5. 2
      content/aspnetcore/src/CompanyName.ProjectName.Application/Users/UserAppService.cs
  6. 2
      content/vue/.env.development
  7. 2
      content/vue/.env.production
  8. 2
      content/vue/src/views/admin/roles/EditAbpRole.vue
  9. 14
      content/vue/src/views/admin/roles/PermissionAbpRole.vue

2
content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyNameProjectNameHttpApiHostModule.cs

@ -70,7 +70,7 @@ namespace CompanyNameProjectName
{ {
Authorization = new[] { new CustomHangfireAuthorizeFilter() } Authorization = new[] { new CustomHangfireAuthorizeFilter() }
}); });
context.ServiceProvider.CreateRecurringJob(); //context.ServiceProvider.CreateRecurringJob();
} }
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)

2
content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Pages/Dtos/CustomeRequestDto.cs

@ -5,7 +5,7 @@
/// <summary> /// <summary>
/// 当前页面 /// 当前页面
/// </summary> /// </summary>
public int pageIndex { get; set; } = 1; public int PageIndex { get; set; } = 1;
/// <summary> /// <summary>
/// 每页多少条 /// 每页多少条

14
content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Permissions/CompanyNameProjectNamePermissions.cs

@ -6,19 +6,5 @@
//Add your own permission names. Example: //Add your own permission names. Example:
//public const string MyPermission1 = GroupName + ".MyPermission1"; //public const string MyPermission1 = GroupName + ".MyPermission1";
public const string DicGroupName = "Dic";
/// <summary>
/// 字典权限
/// </summary>
public static class Dic
{
public const string Default = GroupName + ".Dic";
public const string Query = Default + ".Query";
public const string Create = Default + ".Create";
public const string Update = Default + ".Update";
public const string Delete = Default + ".Delete";
}
} }
} }

2
content/aspnetcore/src/CompanyName.ProjectName.Application/Roles/RoleAppService.cs

@ -42,7 +42,7 @@ namespace CompanyNameProjectName.Roles
var request = new GetIdentityRolesInput(); var request = new GetIdentityRolesInput();
request.Filter = input.filter?.Trim(); request.Filter = input.filter?.Trim();
request.MaxResultCount = input.PageSize; request.MaxResultCount = input.PageSize;
request.SkipCount = (input.pageIndex - 1) * input.PageSize; request.SkipCount = (input.PageIndex - 1) * input.PageSize;
return await _identityRoleAppService.GetListAsync(request); return await _identityRoleAppService.GetListAsync(request);
} }

2
content/aspnetcore/src/CompanyName.ProjectName.Application/Users/UserAppService.cs

@ -30,7 +30,7 @@ namespace CompanyNameProjectName.Users
var request = new GetIdentityUsersInput(); var request = new GetIdentityUsersInput();
request.Filter = input.filter?.Trim(); request.Filter = input.filter?.Trim();
request.MaxResultCount = input.PageSize; request.MaxResultCount = input.PageSize;
request.SkipCount = (input.pageIndex - 1) * input.PageSize; request.SkipCount = (input.PageIndex - 1) * input.PageSize;
request.Sorting= " LastModificationTime desc"; request.Sorting= " LastModificationTime desc";
return await _identityUserAppService.GetListAsync(request); return await _identityUserAppService.GetListAsync(request);
} }

2
content/vue/.env.development

@ -22,5 +22,5 @@ VITE_GLOB_UPLOAD_URL=/upload
# Interface prefix # Interface prefix
VITE_GLOB_API_URL_PREFIX= VITE_GLOB_API_URL_PREFIX=
VITE_BUILD_COMPRESS = 'none'
VITE_API_URL=http://localhost:50010 VITE_API_URL=http://localhost:50010

2
content/vue/.env.production

@ -24,7 +24,7 @@ VITE_GLOB_UPLOAD_URL=/upload
# Interface prefix # Interface prefix
VITE_GLOB_API_URL_PREFIX= VITE_GLOB_API_URL_PREFIX=
VITE_BUILD_COMPRESS = 'none'
# Whether to enable image compression # Whether to enable image compression
VITE_USE_IMAGEMIN= true VITE_USE_IMAGEMIN= true

2
content/vue/src/views/admin/roles/EditAbpRole.vue

@ -54,7 +54,7 @@
role.roleInfo = new IdentityRoleUpdateDto(); role.roleInfo = new IdentityRoleUpdateDto();
role.roleInfo.name = request.name; role.roleInfo.name = request.name;
role.roleInfo.isDefault = request.isDefault == 1 ? true : false; role.roleInfo.isDefault = request.isDefault == 1 ? true : false;
role.roleInfo.isPublic = currentRoleInfo.isDefault; role.roleInfo.isPublic = currentRoleInfo.isPublic;
role.roleInfo.concurrencyStamp = currentRoleInfo.concurrencyStamp; role.roleInfo.concurrencyStamp = currentRoleInfo.concurrencyStamp;
await updateRoleAsync({ request: role, changeOkLoading, validate, closeModal }); await updateRoleAsync({ request: role, changeOkLoading, validate, closeModal });
ctx.emit('reload'); ctx.emit('reload');

14
content/vue/src/views/admin/roles/PermissionAbpRole.vue

@ -4,13 +4,11 @@
:title="t('routes.admin.roleManagement_permission')" :title="t('routes.admin.roleManagement_permission')"
width="15%" width="15%"
> >
<a-tree <BasicTree
:treeData="allPermissionsRef"
checkable checkable
:tree-data="allPermissionsRef"
v-model:checkedKeys="currentRolePermissionsRef" v-model:checkedKeys="currentRolePermissionsRef"
> />
<template #title0010><span style="color: #1890ff"></span></template>
</a-tree>
<div <div
:style="{ :style="{
position: 'absolute', position: 'absolute',
@ -40,6 +38,7 @@
import { getRolePermissionAsync, updateRolePermissionAsync, excludePermission } from './AbpRole'; import { getRolePermissionAsync, updateRolePermissionAsync, excludePermission } from './AbpRole';
import { TreeDataItem } from 'ant-design-vue/es/tree/Tree'; import { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { BasicTree } from '/@/components/Tree/index';
import { import {
UpdateRolePermissionsDto, UpdateRolePermissionsDto,
UpdatePermissionDto, UpdatePermissionDto,
@ -48,7 +47,7 @@
export default defineComponent({ export default defineComponent({
name: 'PermissionAbpRole', name: 'PermissionAbpRole',
components: { BasicDrawer }, components: { BasicDrawer, BasicTree },
setup() { setup() {
let roleName: string = ''; let roleName: string = '';
const { t } = useI18n(); const { t } = useI18n();
@ -66,6 +65,7 @@
*/ */
const getRolePermissions = async (roleName: string) => { const getRolePermissions = async (roleName: string) => {
setDrawerProps({ loading: true }); setDrawerProps({ loading: true });
debugger;
currentRolePermissionsRef.value.splice(0, currentRolePermissionsRef.value.length); currentRolePermissionsRef.value.splice(0, currentRolePermissionsRef.value.length);
allPermissionsRef.splice(0, allPermissionsRef.length); allPermissionsRef.splice(0, allPermissionsRef.length);
const permissions = await getRolePermissionAsync(roleName); const permissions = await getRolePermissionAsync(roleName);
@ -98,7 +98,7 @@
let permisstions: UpdatePermissionDto[] = []; let permisstions: UpdatePermissionDto[] = [];
request.providerName = 'R'; request.providerName = 'R';
request.providerKey = roleName; request.providerKey = roleName;
debugger;
currentRolePermissionsRef.value.forEach((item) => { currentRolePermissionsRef.value.forEach((item) => {
if (item.indexOf('.') > 0) { if (item.indexOf('.') > 0) {
let permisstion = new UpdatePermissionDto(); let permisstion = new UpdatePermissionDto();

Loading…
Cancel
Save