From 7946ec9c2c1395eefea4602bd0d329647048326a Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 2 Aug 2024 13:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=A7=E4=BB=B6=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/formGroup.vue      |   2 +-
 .../DesignForm/public/form/formItem.vue       | 184 +++++++++++++++++-
 .../appPage/appPageForm/pageList.vue          |   2 +-
 3 files changed, 185 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 3eeeb8e..81a04bf 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -420,7 +420,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				v-if="linksIf(element)"
 			>
 		
-			<!-- {{element}} -->
+		
 			
 				<!--选项卡组件-->
 				<template v-if="element.type === 'tabs'">
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 96686cc..0cf072a 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -600,6 +600,173 @@ const judgeIsDisabled = (key:string)  => {
 		return false;
 	}
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:02:49
+@ 功能: 将时间戳转换成字符串
+*/
+const timeToString = (timeVal:any,types:int) => {
+	let timeStr = ""
+	if(Array.isArray(timeVal)){
+		if(timeVal.length >= 2){
+			let startTime = timeToAry(timeVal[0])
+			let endTime = timeToAry(timeVal[1])
+			switch(types){
+			case "year":	//年
+				timeStr = `${startTime.year} 至 ${endTime.year}`;
+				break;
+			case "month":	//月
+				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+				break;
+			case "datetime": //日期+时间
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case  "week":	//周
+				let startWeek = getYearWeek(startTime)
+				let endWeek = getYearWeek(endTime)
+				timeStr = `${startWeek} 至 ${endWeek}`;
+				break;
+			case "timeCalss": //时间
+				timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case "datetimerange":
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+				break;
+			case "daterange":
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+				break;
+			case "monthrange":
+				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+				break;
+			default:
+				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+				break;
+			}
+		}else if(timeVal.length == 1){
+			let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal[0])
+			switch(types){
+				case "year":	//年
+					timeStr = `${year}`;
+					break;
+				case "month":	//月
+					timeStr = `${year}-${month}`;
+					break;
+				case "datetime": //日期+时间
+					timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+					break;
+				case  "week":	//周
+					timeStr = getYearWeek(timeVal)
+					break;
+				case "timeCalss": //时间
+					timeStr = `${hours}:${minutes}:${seconds}`;
+					break;
+				default:
+					timeStr = `${year}-${month}-${day}`
+					break;
+			}
+		}else{
+			timeStr = "未知时间"
+		}
+	}else{
+		let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal)
+		switch(types){
+			case "year":	//年
+				timeStr = `${year}`;
+				break;
+			case "month":	//月
+				timeStr = `${year}-${month}`;
+				break;
+			case "datetime": //日期+时间
+				timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				break;
+			case  "week":	//周
+				timeStr = getYearWeek(timeVal)
+				break;
+			case "timeCalss": //时间
+				timeStr = `${hours}:${minutes}:${seconds}`;
+				break;
+			default:
+				timeStr = `${year}-${month}-${day}`
+				break;
+		}
+	}
+	
+	return timeStr
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:22:14
+@ 功能: 时间戳转换对象
+*/
+const timeToAry = (timestamp:number) => {
+	const date = new Date(timestamp);
+	const year = date.getFullYear();
+	const month = ('0' + (date.getMonth() + 1)).slice(-2);
+	const day = ('0' + date.getDate()).slice(-2);
+	const hours = ('0' + date.getHours()).slice(-2);
+	const minutes = ('0' + date.getMinutes()).slice(-2);
+	const seconds = ('0' + date.getSeconds()).slice(-2);
+	return {
+		year:year,
+		month:month,
+		day:day,
+		hours:hours,
+		minutes:minutes,
+		seconds
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:21:05
+@ 功能: 计算当前时间戳是今年第几周
+*/
+const getYearWeek = (timestamp:number) => {
+    const date = new Date(timestamp);
+  	const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
+  	const pastDaysOfYear = (date - firstDayOfYear) / 86400000;
+  	const weekNumber = Math.ceil((pastDaysOfYear + firstDayOfYear.getDay() + 1) / 7);
+  return weekNumber;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:42:22
+@ 功能: 判断单选值
+*/
+const judgeRadio = (val:any,list:any) => {
+	let valStr = ""
+	if(Array.isArray(list)){
+		if(list.length > 0){
+			list.forEach((item) => {
+				if(item.value == val){
+					valStr = item.label
+				} 
+			})
+		}
+	}
+	return valStr
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-02 13:42:22
+@ 功能: 判断多选值
+*/
+const judgeCheckbox = (val:any,list:any) => {
+	let valAry = []
+	if(Array.isArray(val)){
+		if(val.length > 0){
+			if(Array.isArray(list)){
+				val.forEach((item) => {
+					list.forEach((ltem) => {
+						if(item == ltem.value){
+							valAry.push(ltem.label)
+						}
+					})
+				})
+			}
+		}
+	}
+	return valAry
+}
 </script>
 <template>
 	
@@ -621,7 +788,22 @@ const judgeIsDisabled = (key:string)  => {
 			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
 			{{editDisabled}}
 		</template>
-		<div class="form-value" v-if="type === 4" v-html="value"></div>
+		<div class="form-value" v-if="type === 4">
+			<div class="form-value" v-if="data.type === 'datePicker'" v-html="timeToString(value,data.control.type)">
+
+			</div>
+			<div class="form-value" v-else-if="data.type == 'timePicker'" v-html="timeToString(value,'timeCalss')">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'radio'" v-html="judgeRadio(value,data.options)">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'checkbox'" v-html="judgeCheckbox(value,data.options)">
+				
+			</div>
+			<div class="form-value" v-else  v-html="value">
+			</div>
+		</div>
 		<template v-else>
 			<el-input
 				v-bind="control"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 19d3878..a267ae0 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -990,7 +990,7 @@ const showCollapse = () => {
 							</template>
 						</el-table-column>
 						<el-table-column fixed="right" label="查询" width="55" align="center">
-							<template #default="scope">{{scope.row.isSearch}}
+							<template #default="scope">
 								<el-switch
 									v-model="scope.row.isSearch"
 									:active-action-icon="View"