Skip to content

Commit

Permalink
# 修复
Browse files Browse the repository at this point in the history
1.vue授权页面发布样式加载失败
2.前端多环境
  • Loading branch information
WangJunZzz committed May 1, 2021
1 parent 9940c86 commit f513d02
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public override void OnPreApplicationInitialization(ApplicationInitializationCon
{
Authorization = new[] { new CustomHangfireAuthorizeFilter() }
});
context.ServiceProvider.CreateRecurringJob();
//context.ServiceProvider.CreateRecurringJob();
}

public override void ConfigureServices(ServiceConfigurationContext context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public class CustomeRequestDto
/// <summary>
/// 当前页面
/// </summary>
public int pageIndex { get; set; } = 1;
public int PageIndex { get; set; } = 1;

/// <summary>
/// 每页多少条
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,5 @@ public static class CompanyNameProjectNamePermissions

//Add your own permission names. Example:
//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";
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public async Task<PagedResultDto<IdentityRoleDto>> ListAsync(GetRoleListInput in
var request = new GetIdentityRolesInput();
request.Filter = input.filter?.Trim();
request.MaxResultCount = input.PageSize;
request.SkipCount = (input.pageIndex - 1) * input.PageSize;
request.SkipCount = (input.PageIndex - 1) * input.PageSize;
return await _identityRoleAppService.GetListAsync(request);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public async Task<PagedResultDto<IdentityUserDto>> ListAsync(GetUserListInput in
var request = new GetIdentityUsersInput();
request.Filter = input.filter?.Trim();
request.MaxResultCount = input.PageSize;
request.SkipCount = (input.pageIndex - 1) * input.PageSize;
request.SkipCount = (input.PageIndex - 1) * input.PageSize;
request.Sorting= " LastModificationTime desc";
return await _identityUserAppService.GetListAsync(request);
}
Expand Down
2 changes: 1 addition & 1 deletion content/vue/.env.development
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ VITE_GLOB_UPLOAD_URL=/upload

# Interface prefix
VITE_GLOB_API_URL_PREFIX=

VITE_BUILD_COMPRESS = 'none'
VITE_API_URL=http://localhost:50010
2 changes: 1 addition & 1 deletion content/vue/.env.production
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ VITE_GLOB_UPLOAD_URL=/upload

# Interface prefix
VITE_GLOB_API_URL_PREFIX=

VITE_BUILD_COMPRESS = 'none'
# Whether to enable image compression
VITE_USE_IMAGEMIN= true

Expand Down
2 changes: 1 addition & 1 deletion content/vue/src/views/admin/roles/EditAbpRole.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
role.roleInfo = new IdentityRoleUpdateDto();
role.roleInfo.name = request.name;
role.roleInfo.isDefault = request.isDefault == 1 ? true : false;
role.roleInfo.isPublic = currentRoleInfo.isDefault;
role.roleInfo.isPublic = currentRoleInfo.isPublic;
role.roleInfo.concurrencyStamp = currentRoleInfo.concurrencyStamp;
await updateRoleAsync({ request: role, changeOkLoading, validate, closeModal });
ctx.emit('reload');
Expand Down
14 changes: 7 additions & 7 deletions content/vue/src/views/admin/roles/PermissionAbpRole.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
:title="t('routes.admin.roleManagement_permission')"
width="15%"
>
<a-tree
<BasicTree
:treeData="allPermissionsRef"
checkable
:tree-data="allPermissionsRef"
v-model:checkedKeys="currentRolePermissionsRef"
>
<template #title0010><span style="color: #1890ff"></span></template>
</a-tree>
/>
<div
:style="{
position: 'absolute',
Expand Down Expand Up @@ -40,6 +38,7 @@
import { getRolePermissionAsync, updateRolePermissionAsync, excludePermission } from './AbpRole';
import { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
import { useI18n } from '/@/hooks/web/useI18n';
import { BasicTree } from '/@/components/Tree/index';
import {
UpdateRolePermissionsDto,
UpdatePermissionDto,
Expand All @@ -48,7 +47,7 @@
export default defineComponent({
name: 'PermissionAbpRole',
components: { BasicDrawer },
components: { BasicDrawer, BasicTree },
setup() {
let roleName: string = '';
const { t } = useI18n();
Expand All @@ -66,6 +65,7 @@
*/
const getRolePermissions = async (roleName: string) => {
setDrawerProps({ loading: true });
debugger;
currentRolePermissionsRef.value.splice(0, currentRolePermissionsRef.value.length);
allPermissionsRef.splice(0, allPermissionsRef.length);
const permissions = await getRolePermissionAsync(roleName);
Expand Down Expand Up @@ -98,7 +98,7 @@
let permisstions: UpdatePermissionDto[] = [];
request.providerName = 'R';
request.providerKey = roleName;
debugger;
currentRolePermissionsRef.value.forEach((item) => {
if (item.indexOf('.') > 0) {
let permisstion = new UpdatePermissionDto();
Expand Down

0 comments on commit f513d02

Please sign in to comment.