gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、修复用户所属机构列表（权限控制） 2、调整默认字典值显示 3、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-12-24 01:28:32 +08:00
parent ec1baf2ecd
commit 050322e910
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -46,7 +46,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1146" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1147" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

5
Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs
View File

@ -63,6 +63,9 @@ public class SysOrgService : IDynamicApiController, ITransient
}
else
{
// 当前用户所属机构Id（权限控制）
input.Id = input.Id == 0 ? _userManager.OrgId : input.Id;
orgTree = await iSugarQueryable.ToTreeAsync(u => u.Children, u => u.Pid, input.Id, userOrgIdList.Select(d => (object)d).ToArray());
// 递归禁用没权限的机构（防止用户修改或创建无权的机构和用户）
HandlerOrgTree(orgTree, userOrgIdList);
@ -72,7 +75,7 @@ public class SysOrgService : IDynamicApiController, ITransient
if (sysOrg == null) return orgTree;
sysOrg.Children = orgTree;
orgTree = new List<SysOrg> { sysOrg };
orgTree = [sysOrg];
return orgTree;
}

4
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2024.12.20",
"lastBuildTime": "2024.12.24",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -74,7 +74,7 @@
"vue-router": "^4.5.0",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.40",
"vxe-pc-ui": "^4.3.42",
"vxe-table": "^4.8.10",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",

5
Web/src/views/system/dict/index.vue
View File

@ -101,6 +101,9 @@
<template #row_value="{ row }">
<el-tag :type="row.tagType" :style="row.styleSetting" :class="row.classSetting">{{ row.value }}</el-tag>
</template>
<template #row_name="{ row }">
{{ row.name == null ? row.value : row.name }}
</template>
<template #row_extData="{ row }">
<el-tag type="warning" v-if="row.extData == null || row.extData == ''">空</el-tag>
<el-tag type="success" v-else>有值</el-tag>
@ -290,7 +293,7 @@ const optionsDictData = useVxeTable<SysDictData>(
{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
{ field: 'value', title: '字典值', minWidth: 90, showOverflow: 'tooltip', slots: { default: 'row_value' } },
{ field: 'code', title: '编码', minWidth: 120, showOverflow: 'tooltip' },
{ field: 'name', title: '名称', minWidth: 120, showOverflow: 'tooltip' },
{ field: 'name', title: '名称', minWidth: 120, showOverflow: 'tooltip', slots: { default: 'row_name' } },
{ field: 'extData', title: '拓展数据', showOverflow: 'tooltip', slots: { default: 'row_extData' } },
{ field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' },
{ field: 'status', title: '状态', width: 80, showOverflow: 'tooltip', slots: { default: 'row_status' } },

2
Web/src/views/system/tenant/component/editTenant.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="sys-tenant-container">
<el-dialog v-model="state.isShowDialog" draggable overflow destroy-on-close width="700px">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>