mirror of
https://github.com/nsnail/NetAdmin.git
synced 2025-05-13 00:09:31 +08:00
chore: 🔨 框架代码同步
[skip ci]
This commit is contained in:
parent
220b19d152
commit
d5a7f0fca2
@ -9,7 +9,7 @@ public enum JobStatues
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 空闲
|
/// 空闲
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[EnumDecoration(nameof(Indicates.Success), false)]
|
[EnumDecoration(nameof(Indicates.Success))]
|
||||||
[ResourceDescription<Ln>(nameof(Ln.空闲))]
|
[ResourceDescription<Ln>(nameof(Ln.空闲))]
|
||||||
Idle = 1
|
Idle = 1
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
|
<ProjectReference Include="../NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CronExpressionDescriptor" Version="2.40.0"/>
|
<PackageReference Include="CronExpressionDescriptor" Version="2.41.0"/>
|
||||||
<PackageReference Include="Cronos" Version="0.10.0"/>
|
<PackageReference Include="Cronos" Version="0.10.0"/>
|
||||||
<PackageReference Include="NetAdmin.CsvHelper" Version="1.0.0"/>
|
<PackageReference Include="NetAdmin.CsvHelper" Version="1.0.0"/>
|
||||||
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
|
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14"/>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<el-icon-loading />
|
<el-icon-loading />
|
||||||
</el-icon>
|
</el-icon>
|
||||||
</div>
|
</div>
|
||||||
<el-select v-bind="$attrs" :loading="loading" @visible-change="visibleChange">
|
<el-select v-bind="$attrs" :allow-create="allowCreate" :loading="loading" @visible-change="visibleChange">
|
||||||
<el-option v-for="item in options" :key="item[props.value]" :label="item[props.label]" :value="objValueType ? item : item[props.value]">
|
<el-option v-for="item in options" :key="item[props.value]" :label="item[props.label]" :value="objValueType ? item : item[props.value]">
|
||||||
<slot :data="item" name="option"></slot>
|
<slot :data="item" name="option"></slot>
|
||||||
</el-option>
|
</el-option>
|
||||||
@ -24,6 +24,7 @@ export default {
|
|||||||
},
|
},
|
||||||
dic: { type: String, default: '' },
|
dic: { type: String, default: '' },
|
||||||
objValueType: { type: Boolean, default: false },
|
objValueType: { type: Boolean, default: false },
|
||||||
|
allowCreate: { type: Boolean, default: false },
|
||||||
params: { type: Object, default: () => ({}) },
|
params: { type: Object, default: () => ({}) },
|
||||||
config: { type: Object },
|
config: { type: Object },
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user