Przeglądaj źródła

fixup! refactor: 修改字典值表字段名,消除名称歧义,方便统一管理

喵你个旺呀 1 rok temu
rodzic
commit
7fc76a6dd8

+ 2 - 7
Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictDataInput.cs

@@ -18,14 +18,9 @@ public class PageDictDataInput : BasePageInput
     public long DictTypeId { get; set; }
 
     /// <summary>
-    /// 
+    /// 字典文本
     /// </summary>
-    public string Value { get; set; }
-
-    /// <summary>
-    /// 编码
-    /// </summary>
-    public string Code { get; set; }
+    public string Label { get; set; }
 }
 
 public class AddDictDataInput : SysDictData

+ 1 - 2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -32,8 +32,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     {
         return await _sysDictDataRep.AsQueryable()
             .Where(u => u.DictTypeId == input.DictTypeId)
-            .WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Value.Contains(input.Code))
-            .WhereIF(!string.IsNullOrEmpty(input.Value?.Trim()), u => u.Label.Contains(input.Value))
+            .WhereIF(!string.IsNullOrEmpty(input.Label?.Trim()), u => u.Value.Contains(input.Label))
             .OrderBy(u => new { u.OrderNo, Code = u.Value })
             .ToPagedListAsync(input.Page, input.PageSize);
     }

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/index.vue.vm

@@ -172,7 +172,7 @@ handleQuery();
                 } else if (column.EffectType == "ConstSelector") {
                 @:<el-option v-for="(item, index) in state.stores.getConstDataByTypeCode('@column.DictTypeCode')" :key="index" :label="item.name" :value="item.code" />
                 } else {
-                @:<el-option :value="item.value" :label="`[${item.value}]${item.label}`" :disabled="item.status == 2" :key="index" v-for="(item,index) in state.stores.getDictDataByCode('@(column.DictTypeCode)')" />
+                @:<el-option :value="item.value" :label="`[${item.value}]${item.label}`" v-if="item.status == 1" :key="index" v-for="(item,index) in state.stores.getDictDataByCode('@(column.DictTypeCode)')" />
                 }
               @:</el-select>
             }else if(column.EffectType == "ApiTreeSelector"){