From 3f4f889d4d140a89b48ba5b33c1a3f0a9e345b54 Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Sat, 12 Oct 2024 08:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/expand/user.vue         |  2 +-
 .../DesignForm/public/form/childTable.vue     | 89 +++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/public/expand/user.vue b/src/components/DesignForm/public/expand/user.vue
index 0dbadee..aac5395 100644
--- a/src/components/DesignForm/public/expand/user.vue
+++ b/src/components/DesignForm/public/expand/user.vue
@@ -69,7 +69,7 @@ onMounted(() => {
 </script>
 <template>
 	<el-input
-		placeholder="请选择用户或输入用户名称"
+		placeholder="请选择用户"
 		v-bind="$props"
 		v-model="value"
 		@click="openDialog"
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 9302203..2519b6e 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -179,6 +179,86 @@ const timeToString = (timeVal:any,types:int) => {
 		}
 	}
 	
+	return timeStr
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-10-11 14:49:23
+@ 功能: 计算有options属性的结果
+*/
+const optToString = (timeVal:any,item:any) => {
+	let timeStr = ""
+	if(item.options && Array.isArray(item.options)){
+		if(Array.isArray(timeVal)){
+			let strArt = new Array
+			switch(item.type){
+			case "radio": 
+				timeVal.forEach((tim:any)=>{
+					item.options.forEach((it:any)=>{
+						if(it.value == tim){
+							strArt.push(it.label)
+						}
+					})
+				})
+				break;
+			case "checkbox": 
+				timeVal.forEach((tim:any)=>{
+					item.options.forEach((it:any)=>{
+						if(it.value == tim){
+							strArt.push(it.label)
+						}
+					})
+				})
+				break;
+			case "select": 
+				timeVal.forEach((tim:any)=>{
+					item.options.forEach((it:any)=>{
+						if(it.value == tim){
+							strArt.push(it.label)
+						}
+					})
+				})
+				break;
+			default:
+				break;
+			}
+			if(strArt.length > 0){
+				timeStr = strArt.toString()
+			}
+		}else{
+			let strArt = new Array
+			switch(item.type){
+			case "radio": 
+				item.options.forEach((it:any)=>{
+					if(it.value == timeVal){
+						strArt.push(it.label)
+					}
+				})
+				break;
+			case "checkbox": 
+				item.options.forEach((it:any)=>{
+					if(it.value == timeVal){
+						strArt.push(it.label)
+					}
+				})
+				break;
+			case "select": 
+				item.options.forEach((it:any)=>{
+					if(it.value == timeVal){
+						strArt.push(it.label)
+					}
+				})
+				break;
+			default:
+				break;
+			}
+			if(strArt.length > 0){
+				timeStr = strArt.toString()
+			}
+		}
+	}
+	
+	
 	return timeStr
 }
 </script>
@@ -212,6 +292,15 @@ const timeToString = (timeVal:any,types:int) => {
 						<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)">
 						</div>
 						<div v-else-if="item.type=='timePicker'" v-html="timeToString(scope.row[item.name],item.type)">
+						</div>
+						<div v-else-if="item.type=='radio'"  v-html="optToString(scope.row[item.name],item)">
+							
+						</div>
+						<div v-else-if="item.type=='checkbox'"   v-html="optToString(scope.row[item.name],item)">
+							
+						</div>
+						<div v-else-if="item.type=='select'"   v-html="optToString(scope.row[item.name],item)">
+							
 						</div>
 						<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div>
 					</div>