From 2368046a487cc769911d860afbde5b0473118a18 Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Tue, 12 Nov 2024 18:48:39 +0800
Subject: [PATCH] =?UTF-8?q?BUG=EF=BC=9A=E5=8E=9Fdi=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=9C=A8index.vue=E4=B8=AD=E5=B7=B2=E7=BB=8F=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=8E=B7=E4=BA=86=E5=88=B0=E6=AD=A3=E7=A1=AE=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/template/web_views_index.vue.vm           |  7 ++-----
 Web/src/stores/userInfo.ts                            | 11 ++++++-----
 Web/src/utils/dict-utils.ts                           |  8 ++++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
index c066dde0..1477a3dd 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
@@ -148,7 +148,7 @@
 				@:</template>
 						} else if(@column.EffectType == "Select") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
-					@:<el-tag :type="di('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{di('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
+					@:<el-tag :type="dc('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dc('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name||row.@column.LowerPropertyName)?.value}}</el-tag>
 				@:</template>
 						} else if(@column.EffectType == "EnumSelector") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
@@ -195,10 +195,7 @@ import { Local } from '/@@/utils/storage';
 @:import { codeToName, getConstType } from "/@@/utils/constHelper";
 }
 @if(@Model.TableField.Any(x=>x.EffectType == "Select") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
-@:import { getDictLabelByVal as di, getDictDataList as dl } from '/@@/utils/dict-utils';
-}
-@if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
-@:import { getDictLabelByVal as dv } from '/@@/utils/dict-utils';
+@:import { getDictLabelByCode as dc, getDictLabelByVal as dv, getDictDataList as dl } from '/@@/utils/dict-utils';
 }
 @if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){
 @:import { formatDate } from '/@@/utils/formatTime';
diff --git a/Web/src/stores/userInfo.ts b/Web/src/stores/userInfo.ts
index eba5e3c2..0ba0ed59 100644
--- a/Web/src/stores/userInfo.ts
+++ b/Web/src/stores/userInfo.ts
@@ -132,12 +132,13 @@ export const useUserInfo = defineStore('userInfo', {
 		},
 
 		// 根据字典类型和代码取字典项
-		getDictItemByCode(typePCode: string, val: string) {
-			if (val != undefined && val !== '') {
-				const _val = val.toString();
-				const ds = this.getDictDatasByCode(typePCode);
+		getDictItemByCode(typePCode: string, code: string) {
+			if (code != undefined && code !== '') {
+				const _code = code.toString();
+				console.log(ds);
 				for (const element of ds) {
-					if (element.code === _val) {
+					if (element.code === _code) {
+						console.log(element);
 						return element;
 					}
 				}
diff --git a/Web/src/utils/dict-utils.ts b/Web/src/utils/dict-utils.ts
index 9450542b..312d5a85 100644
--- a/Web/src/utils/dict-utils.ts
+++ b/Web/src/utils/dict-utils.ts
@@ -21,8 +21,12 @@ export function getDictValByLabel(dicName: string, dicItemCode: any): any {
 	return stores.getDictValByLabel(dicName, dicItemCode);
 }
 
-export function getDictLabelByVal(dicName: string, dicItemCode: any): any {
-	return stores.getDictLabelByVal(dicName, dicItemCode);
+export function getDictLabelByVal(dicName: string, dicItemValue: any): any {
+	return stores.getDictLabelByVal(dicName, dicItemValue);
+}
+
+export function getDictLabelByCode(dicName: string, dicItemCode: any): any {
+	return stores.getDictItemByCode(dicName, dicItemCode);
 }
 
 // select 控件使用，用于获取字典列表，示例如下：