fix 修复默认应用的问题

This commit is contained in:
2021-04-25 17:04:14 +08:00
parent 41dab4a662
commit 3ca99f3953
4 changed files with 6 additions and 6 deletions

View File

@@ -131,7 +131,7 @@ namespace Ewide.Core.Service
if (input.Active)
{
isExist = await _sysAppRep.DetachedEntities.AnyAsync(u => u.Active == input.Active);
isExist = await _sysAppRep.DetachedEntities.AnyAsync(u => u.Active == input.Active && !u.Id.Equals(input.Id));
if (isExist)
throw Oops.Oh(ErrorCode.D5001);
}
@@ -159,7 +159,7 @@ namespace Ewide.Core.Service
[HttpGet("/sysApp/list")]
public async Task<dynamic> GetAppList([FromQuery] AppInput input)
{
return await _sysAppRep.DetachedEntities.Where(u => u.Status == (int)CommonStatus.ENABLE).ToListAsync();
return await _sysAppRep.DetachedEntities.Where(u => u.Status == (int)CommonStatus.ENABLE).OrderBy(u => u.Sort).ToListAsync();
}
/// <summary>

View File

@@ -60,7 +60,7 @@ namespace Ewide.Core.Service
/// <summary>
/// 是否可见Y-是N-否)
/// </summary>
public string Visible { get; set; }
public bool Visible { get; set; }
/// <summary>
/// 内链地址

View File

@@ -24,7 +24,7 @@ export default {
data() {
return {
form: {
active: 'N',
active: false,
},
rules: {
name: [{ required: true, message: '请输入应用名称' }],

View File

@@ -26,8 +26,8 @@
<a-button @click="onOpen('add-form')" icon="plus">新增应用</a-button>
</Auth>
<span slot="active" slot-scope="text, record">
{{ bindCodeValue(text, 'yes_or_no') }}
<Auth auth="sysApp:setAsDefault" v-if="record.active == 'N'">
{{ text ? '是' : '否' }}
<Auth auth="sysApp:setAsDefault" v-if="!record.active">
<yo-table-actions>
<span></span>
<a-popconfirm