From eff4863cd22e59d976a819dd1217617f21bab38e Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 12 Jul 2024 16:59:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/components.d.ts | 179 --------------------------------------
 1 file changed, 179 deletions(-)
 delete mode 100644 src/types/components.d.ts

diff --git a/src/types/components.d.ts b/src/types/components.d.ts
deleted file mode 100644
index b01821d1f..000000000
--- a/src/types/components.d.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
-export {}
-
-declare module '@vue/runtime-core' {
-  export interface GlobalComponents {
-    AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default']
-    AddNode: typeof import('./../components/workflow/addNode.vue')['default']
-    App: typeof import('./../components/DesignForm/app/index.vue')['default']
-    AppMenuSvgPage: typeof import('./../components/IconSelect/appMenuSvgPage.vue')['default']
-    ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default']
-    BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default']
-    Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
-    CalendarPage: typeof import('./../components/DesignForm/app/calendarPage.vue')['default']
-    ChildTable: typeof import('./../components/DesignForm/public/form/childTable.vue')['default']
-    ConditionDrawer: typeof import('./../components/workflow/drwer/conditionDrawer.vue')['default']
-    CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
-    DesignLayoutButPage: typeof import('./../components/DesignForm/designLayout/designLayoutButPage.vue')['default']
-    DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default']
-    DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
-    DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
-    DragControlApp: typeof import('./../components/DesignForm/dragControlApp.vue')['default']
-    DragControlNew: typeof import('./../components/DesignForm/dragControlNew.vue')['default']
-    ElAffix: typeof import('element-plus/es')['ElAffix']
-    ElAside: typeof import('element-plus/es')['ElAside']
-    ElAvatar: typeof import('element-plus/es')['ElAvatar']
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
-    ElCalendar: typeof import('element-plus/es')['ElCalendar']
-    ElCard: typeof import('element-plus/es')['ElCard']
-    ElCarousel: typeof import('element-plus/es')['ElCarousel']
-    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
-    ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
-    ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
-    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-    ElForm: typeof import('element-plus/es')['ElForm']
-    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
-    ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElMain: typeof import('element-plus/es')['ElMain']
-    ElMenu: typeof import('element-plus/es')['ElMenu']
-    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElResult: typeof import('element-plus/es')['ElResult']
-    ElRow: typeof import('element-plus/es')['ElRow']
-    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
-    ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
-    EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default']
-    EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default']
-    ErrorDialog: typeof import('./../components/workflow/dialog/errorDialog.vue')['default']
-    FlexBox: typeof import('./../components/DesignForm/public/form/flexBox.vue')['default']
-    Flow: typeof import('./../components/DesignForm/public/form/components/flow.vue')['default']
-    Form: typeof import('./../components/DesignForm/public/form/form.vue')['default']
-    Form2: typeof import('./../components/DesignForm/public/form/form2.vue')['default']
-    FormControlAttr: typeof import('./../components/DesignForm/formControlAttr.vue')['default']
-    FormControlAttr_2024024: typeof import('./../components/DesignForm/formControlAttr_2024024.vue')['default']
-    FormControlAttres: typeof import('./../components/DesignForm/formControlAttres.vue')['default']
-    FormControlProperties: typeof import('./../components/DesignForm/formControlProperties.vue')['default']
-    FormControlPropertiNew: typeof import('./../components/DesignForm/formControlPropertiNew.vue')['default']
-    FormGroup: typeof import('./../components/DesignForm/public/form/formGroup.vue')['default']
-    FormGroup1: typeof import('./../components/DesignForm/public/form/formGroup1.vue')['default']
-    FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default']
-    FormPage: typeof import('./../components/DesignForm/app/formPage.vue')['default']
-    FormPageCont: typeof import('./../components/DesignForm/tableListPage/formPageCont.vue')['default']
-    FormPageContApp: typeof import('./../components/DesignForm/tableListPage/formPageContApp.vue')['default']
-    FormVersion: typeof import('./../components/DesignForm/formVersion.vue')['default']
-    FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default']
-    GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default']
-    Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
-    HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default']
-    HeadToolsApp: typeof import('./../components/DesignForm/public/headToolsApp.vue')['default']
-    HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
-    IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpClose: typeof import('~icons/ep/close')['default']
-    IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpEdit: typeof import('~icons/ep/edit')['default']
-    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-    IEpPlus: typeof import('~icons/ep/plus')['default']
-    IEpRefresh: typeof import('~icons/ep/refresh')['default']
-    IEpSearch: typeof import('~icons/ep/search')['default']
-    IEpSetting: typeof import('~icons/ep/setting')['default']
-    IEpView: typeof import('~icons/ep/view')['default']
-    LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
-    LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
-    List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
-    ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']
-    MathFormula: typeof import('./../components/DesignForm/math/mathFormula.vue')['default']
-    Matrix: typeof import('./../components/workflow/dialog/matrix.vue')['default']
-    MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default']
-    NodeWrap: typeof import('./../components/workflow/nodeWrap.vue')['default']
-    PageSize: typeof import('./../components/DesignForm/designLayout/pageSize.vue')['default']
-    PageSizeSmail: typeof import('./../components/DesignForm/designLayout/pageSizeSmail.vue')['default']
-    Pagination: typeof import('./../components/Pagination/index.vue')['default']
-    PositionDialog: typeof import('./../components/workflow/dialog/positionDialog.vue')['default']
-    PromoterDrawer: typeof import('./../components/workflow/drwer/promoterDrawer.vue')['default']
-    QuillEditor: typeof import('./../components/DesignForm/public/quillEditor.vue')['default']
-    RightPanel: typeof import('./../components/RightPanel/index.vue')['default']
-    RoleDialog: typeof import('./../components/workflow/dialog/roleDialog.vue')['default']
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    Screen: typeof import('./../components/DesignForm/public/form/components/screen.vue')['default']
-    Select: typeof import('./../components/DesignForm/public/form/select.vue')['default']
-    SelectBoxs: typeof import('./../components/workflow/selectBoxs.vue')['default']
-    SelectResult: typeof import('./../components/workflow/selectResult.vue')['default']
-    SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default']
-    SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default']
-    SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
-    SvgPage: typeof import('./../components/IconSelect/svgPage.vue')['default']
-    TableListPage: typeof import('./../components/DesignForm/tableListPage/index.vue')['default']
-    Template: typeof import('./../components/DesignForm/template.vue')['default']
-    TextPage: typeof import('./../components/DesignForm/designLayout/textPage.vue')['default']
-    TimeAxis: typeof import('./../components/DesignForm/app/timeAxis.vue')['default']
-    Tinymce: typeof import('./../components/DesignForm/public/form/tinymce.vue')['default']
-    Tinymce_1: typeof import('./../components/DesignForm/public/form/tinymce_1.vue')['default']
-    Tooltip: typeof import('./../components/DesignForm/tooltip.vue')['default']
-    UnitBackGround: typeof import('./../components/DesignForm/designLayout/unitBackGround.vue')['default']
-    User: typeof import('./../components/DesignForm/public/expand/user.vue')['default']
-    UserDialog: typeof import('./../components/DesignForm/public/expand/userDialog.vue')['default']
-    VueFile: typeof import('./../components/DesignForm/vueFile.vue')['default']
-    WangEditor: typeof import('./../components/WangEditor/index.vue')['default']
-    Yuanjao: typeof import('./../components/DesignForm/designLayout/yuanjao.vue')['default']
-  }
-  export interface ComponentCustomProperties {
-    vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll']
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
-}

From 7928f37f6cb48b0a004167982d0492c857149e5d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 16 Jul 2024 09:10:07 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95App?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/tableButton.ts             |  1 +
 src/components/DesignForm/app/index.vue       | 87 ++++++++++++++++++-
 .../DesignForm/tableListPage/index.vue        | 85 +++++++++++++++++-
 .../sysworkflow/lowcodepage/appFormList.vue   |  4 +-
 .../appPage/appPageForm/openAppFormPage.vue   | 10 ++-
 .../lowcodepage/runApp/runAppForm.vue         | 12 ++-
 6 files changed, 187 insertions(+), 12 deletions(-)

diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts
index c88af5050..7fb9524c8 100644
--- a/src/api/DesignForm/tableButton.ts
+++ b/src/api/DesignForm/tableButton.ts
@@ -1,4 +1,5 @@
 export interface tableButton {
+	control: any;
 	id?: string;
 	name?: string;
 	field?: string;
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index e4a9c8aee..e63305bc1 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -1,7 +1,7 @@
 <!--
 @ 作者: 秦东
 @ 时间: 2024-06-03 13:23:59
-@ 备注: App表单列表
+@ 备注: App表单列表1
 -->
 <script lang='ts' setup>
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
@@ -12,7 +12,7 @@ import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@
 import type { FormInstance, FormRules,ElNotification  } from 'element-plus'
 import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
 import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
-
+import request from '@/utils/request';
 import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
 
 
@@ -271,6 +271,7 @@ const handleSizeChange = (page: number) => {
 const handleCurrentChange = (page: number) => {
     getListData(page)
 }
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:15:16
@@ -302,7 +303,7 @@ const searchSend = reactive({
 	pagesize:state.pageSize,
 	searchData:json2string(props.searchData)
 })
-
+let asfDetails = []
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
@@ -338,7 +339,65 @@ const getPageData = () => {
 			gainFormPageListCont(searchSend)
 				.then((data)=>{
 					console.log("获取列表详细信息----------------->",data)
-					tableDataList.value = data.data.list
+
+					//liwenxuan 关联表单数据获取 start
+					let dataList = data
+					//console.log(dataList)
+					asfDetails = props.data.columns.filter((item: any) => {
+						return item.fieldClass=="associatedForms"
+					})
+					
+					
+					if(asfDetails.length>0){
+						//console.log(data.data.list)
+						//拼装参数,asf值对象数组
+						let asfQueryParams = []
+						for(let j = 0;j< asfDetails.length;j++){
+							let asfQueryParamsItem :any = {}
+							console.log(asfDetails[j])
+							asfQueryParamsItem.formId = asfDetails[j].control.formid
+							asfQueryParamsItem.field = asfDetails[j].field
+							
+							let asfToSelectIds = []
+							for(let i = 0;i<data.data.list.length;i++){
+								let asfMasterAndAsfId:any = {}
+								asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+								asfMasterAndAsfId.asfMasterId = data.data.list[i].id
+								
+								asfToSelectIds.push(asfMasterAndAsfId)
+							}
+							asfQueryParamsItem.asfToSelectIds = asfToSelectIds
+							asfQueryParams.push(asfQueryParamsItem)
+						}
+						console.log(asfQueryParams)
+						getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+							//console.log(data)
+							for(let i = 0;i<dataList.data.list.length; i++){
+								//console.log(dataList.data.list[i])
+								for(let j = 0;j<data.length;j++){
+									//console.log(data[j])
+									for(let n = 0;n<data[j].list.length;n++){
+										if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+											dataList.data.list[i][data[j].field] = data[j].list[n].label
+										}
+										//console.log(data[j].list[n])
+									}
+									
+									
+								}
+							}
+							tableDataList.value = dataList.data.list
+							
+						});
+					}else{
+						tableDataList.value = data.data.list
+						
+					}
+			
+
+
+					//tableDataList.value = data.data.list
+					//liwenxuan 关联表单数据获取 end
 					state.total = data.data.total
 					state.loading = false;
 				})
@@ -347,6 +406,15 @@ const getPageData = () => {
 				})
 	}	
 }
+//liwenxuan 关联表单数据获取 start
+function getAsfDataTitlesByIds(asfQueryParams: any[]) {
+	return request({ 
+		url: '/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds',
+		method: 'post',
+		data: asfQueryParams,
+	});
+}
+//liwenxuan 关联表单数据获取 end
 onMounted(()=>{
 	getPageData()
 })
@@ -839,6 +907,17 @@ const tabsView = (val:any,types:number) => {
 							<template v-if="item.fieldClass=='baidumap'" #default="scope">
 								{{scope.row[scope.column.property]}}
 							</template>
+							<template v-if="item.fieldClass=='associatedForms'" #default="scope">
+								<el-button
+									key="primary"
+									type="primary"
+									link
+									@click="console.log(item);console.log(scope)"
+									>
+									
+									{{scope.row[scope.column.property]}}
+								</el-button>
+							</template>
 						</el-table-column>
 					</template>
 				</el-table>
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 40e276aa7..933f1b518 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -12,7 +12,7 @@ import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@
 import type { FormInstance, FormRules,ElNotification  } from 'element-plus'
 import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
 import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
-
+import request from '@/utils/request';
 import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
 
 
@@ -280,6 +280,7 @@ watch(()=>props.lookPageIsShow,(val:boolean)=>{
 		
 	}
 })
+let asfDetails = []
 
 /**
 @ 作者: 秦东
@@ -297,8 +298,63 @@ const getPageData = () => {
 	console.log("获取列表详细信息",sendData)
 	gainFormPageListCont(sendData)
 		.then((data)=>{
-			console.log("获取列表详细信息----------------->",data)
-			tableDataList.value = data.data.list
+			
+			//console.log("获取列表详细信息----------------->",data)
+			//liwenxuan 关联表单数据获取 start
+			
+			let dataList = data
+			//console.log(dataList)
+			asfDetails = props.data.columns.filter((item: any) => {
+				return item.fieldClass=="associatedForms"
+			})
+			
+			
+			if(asfDetails.length>0){
+				//console.log(data.data.list)
+				//拼装参数,asf值对象数组
+				let asfQueryParams = []
+				for(let j = 0;j< asfDetails.length;j++){
+					let asfQueryParamsItem :any = {}
+					//console.log(asfDetails[j])
+					asfQueryParamsItem.formId = asfDetails[j].control.formid
+					asfQueryParamsItem.field = asfDetails[j].field
+					
+					let asfToSelectIds = []
+					for(let i = 0;i<data.data.list.length;i++){
+						let asfMasterAndAsfId:any = {}
+						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+						asfMasterAndAsfId.asfMasterId = data.data.list[i].id
+						
+						asfToSelectIds.push(asfMasterAndAsfId)
+					}
+					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
+					asfQueryParams.push(asfQueryParamsItem)
+				}
+				//console.log(asfQueryParams)
+				getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+					//console.log(data)
+					for(let i = 0;i<dataList.data.list.length; i++){
+						//console.log(dataList.data.list[i])
+						for(let j = 0;j<data.length;j++){
+							//console.log(data[j])
+							for(let n = 0;n<data[j].list.length;n++){
+								if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+									dataList.data.list[i][data[j].field] = data[j].list[n].label
+								}
+								//console.log(data[j].list[n])
+							}
+							
+							
+						}
+					}
+					tableDataList.value = dataList.data.list
+					
+				});
+			}else{
+				tableDataList.value = data.data.list
+				
+			}
+			//liwenxuan 关联表单数据获取 end
 			state.total = data.data.total
 			state.loading = false;
 		})
@@ -309,6 +365,16 @@ const getPageData = () => {
 onMounted(()=>{
 	getPageData()
 })
+//liwenxuan 关联表单数据获取 start
+function getAsfDataTitlesByIds(asfQueryParams: any[]) {
+	return request({ 
+		url: '/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds',
+		method: 'post',
+		data: asfQueryParams,
+	});
+}
+//liwenxuan 关联表单数据获取 end
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-02 13:59:21
@@ -554,7 +620,7 @@ const editFormSendFlow = (val:any) => {
 								content="折叠查询表单"
 								placement="bottom"
 							>
-								<el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" />
+								<!-- <el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" /> -->
 							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.list.status"
@@ -748,6 +814,17 @@ const editFormSendFlow = (val:any) => {
 							<template v-if="item.fieldClass=='baidumap'" #default="scope">
 								{{scope.row[scope.column.property]}}
 							</template>
+							<template v-if="item.fieldClass=='associatedForms'" #default="scope">
+								<el-button
+									key="primary"
+									type="primary"
+									link
+									@click="console.log(item);console.log(scope)"
+									>
+									
+									{{scope.row[scope.column.property]}}
+								</el-button>
+							</template>
 						</el-table-column>
 					</template>
 				</el-table>
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 2e8e221e8..f19117003 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -165,7 +165,7 @@ const closeAppPage = () =>{
 */
 const lookFormList = (val:any) => {
 	emits('getRongQiAttr')
-	console.log("查看表单列表", val)
+	console.log("查看表单列表aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", val)
 	lookPageIsShow.value = true
 	state.formId = val.idStr
 
@@ -175,7 +175,7 @@ const lookFormList = (val:any) => {
 	let stateData = string2json(val.listjson)
 			console.log(val.listjson)
 			console.log("查看表单列表---->",stateData)
-
+			//let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
 			if(stateData.tableData.columns.length>0){
 				for(let i = 0;i<stateData.tableData.columns.length;i++){
 					if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index f7e564cbb..d72451d47 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -165,10 +165,18 @@ const gainAppFormPageInit = () =>{
 			versionTitle.value = data.data.appForm.name
 			if(data.data.pageList){
 				let stateData = string2json(data.data.appForm.listjson)
-
+				let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
 				
 				if(stateData.tableData.columns.length>0){
 					for(let i = 0;i<stateData.tableData.columns.length;i++){
+						for(let u = 0;u<holeControlAndConfigStateData.list.length;u++){
+							if(stateData.tableData.columns[i].id==holeControlAndConfigStateData.list[u].name){
+								stateData.tableData.columns[i].control = holeControlAndConfigStateData.list[u].control
+								stateData.tableData.columns[i].config = holeControlAndConfigStateData.list[u].config
+							}
+							
+						}
+						
 						if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
 							//console.log(stateData.tableData.columns[i])
 							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index 749a1ac41..65594108c 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -149,7 +149,7 @@ const initLoadData = () => {
 		appFormTitle.value = props.pickAppMenu.label
 		gainAppPageInfo({id:props.pickAppMenu.id})
 		.then((data)=>{
-			console.log("获取初始化表单数据",data)
+			console.log("获取初始化表单数据bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",data)
 			appInitData.value = data.data
 			console.log("获取初始化表单数据---!",appInitData.value)
 			mastesformjson.value = data.data.appForm.mastesformjson
@@ -171,8 +171,18 @@ const initLoadData = () => {
 			versionTitle.value = data.data.appForm.name
 			if(data.data.pageList){
 				let stateData = string2json(data.data.appForm.listjson)
+				let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
 				if(stateData.tableData.columns.length>0){
 					for(let i = 0;i<stateData.tableData.columns.length;i++){
+						for(let u = 0;u<holeControlAndConfigStateData.list.length;u++){
+							if(stateData.tableData.columns[i].id==holeControlAndConfigStateData.list[u].name){
+								stateData.tableData.columns[i].control = holeControlAndConfigStateData.list[u].control
+								stateData.tableData.columns[i].config = holeControlAndConfigStateData.list[u].config
+							}
+							
+						}
+
+
 						if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
 							console.log(stateData.tableData.columns[i])
 							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field

From f33da9ef0ee3489f9d4cb8cb9c04434797914f9f Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 16 Jul 2024 09:42:44 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=85=A8=E9=83=A8=E6=B2=A1=E5=80=BC=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue       | 46 +++++++++++--------
 .../DesignForm/tableListPage/index.vue        | 43 ++++++++++-------
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index e63305bc1..826ec1910 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -354,7 +354,7 @@ const getPageData = () => {
 						let asfQueryParams = []
 						for(let j = 0;j< asfDetails.length;j++){
 							let asfQueryParamsItem :any = {}
-							console.log(asfDetails[j])
+							//console.log(asfDetails[j])
 							asfQueryParamsItem.formId = asfDetails[j].control.formid
 							asfQueryParamsItem.field = asfDetails[j].field
 							
@@ -369,26 +369,36 @@ const getPageData = () => {
 							asfQueryParamsItem.asfToSelectIds = asfToSelectIds
 							asfQueryParams.push(asfQueryParamsItem)
 						}
-						console.log(asfQueryParams)
-						getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
-							//console.log(data)
-							for(let i = 0;i<dataList.data.list.length; i++){
-								//console.log(dataList.data.list[i])
-								for(let j = 0;j<data.length;j++){
-									//console.log(data[j])
-									for(let n = 0;n<data[j].list.length;n++){
-										if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-											dataList.data.list[i][data[j].field] = data[j].list[n].label
+						let queryCount = 0
+						for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
+							if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
+								queryCount++
+							}
+						}
+						//console.log(asfQueryParams)
+						if(queryCount>0){
+							getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+								//console.log(data)
+								for(let i = 0;i<dataList.data.list.length; i++){
+									//console.log(dataList.data.list[i])
+									for(let j = 0;j<data.length;j++){
+										//console.log(data[j])
+										for(let n = 0;n<data[j].list.length;n++){
+											if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+												dataList.data.list[i][data[j].field] = data[j].list[n].label
+											}
+											//console.log(data[j].list[n])
 										}
-										//console.log(data[j].list[n])
+										
+										
 									}
-									
-									
 								}
-							}
-							tableDataList.value = dataList.data.list
-							
-						});
+								tableDataList.value = dataList.data.list
+								
+							});
+						}else{
+							tableDataList.value = data.data.list
+						}
 					}else{
 						tableDataList.value = data.data.list
 						
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 933f1b518..d0ae9aa66 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -330,26 +330,37 @@ const getPageData = () => {
 					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
 					asfQueryParams.push(asfQueryParamsItem)
 				}
+				let queryCount = 0
+				for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
+					if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
+						queryCount++
+					}
+				}
 				//console.log(asfQueryParams)
-				getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
-					//console.log(data)
-					for(let i = 0;i<dataList.data.list.length; i++){
-						//console.log(dataList.data.list[i])
-						for(let j = 0;j<data.length;j++){
-							//console.log(data[j])
-							for(let n = 0;n<data[j].list.length;n++){
-								if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-									dataList.data.list[i][data[j].field] = data[j].list[n].label
+				if(queryCount>0){
+					getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+						//console.log(data)
+						for(let i = 0;i<dataList.data.list.length; i++){
+							//console.log(dataList.data.list[i])
+							for(let j = 0;j<data.length;j++){
+								//console.log(data[j])
+								for(let n = 0;n<data[j].list.length;n++){
+									if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+										dataList.data.list[i][data[j].field] = data[j].list[n].label
+									}
+									//console.log(data[j].list[n])
 								}
-								//console.log(data[j].list[n])
+								
+								
 							}
-							
-							
 						}
-					}
-					tableDataList.value = dataList.data.list
-					
-				});
+						tableDataList.value = dataList.data.list
+						
+					});
+				}else{
+					tableDataList.value = data.data.list
+				}
+				
 			}else{
 				tableDataList.value = data.data.list
 				

From 60833abbdc817a576110b94cf434b02adc3d3422 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 16 Jul 2024 15:26:09 +0800
Subject: [PATCH 4/6] 55

---
 src/types/components.d.ts | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 24ad2b435..07f9ea9fc 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -29,7 +29,6 @@ declare module '@vue/runtime-core' {
     DragControlApp: typeof import('./../components/DesignForm/dragControlApp.vue')['default']
     DragControlNew: typeof import('./../components/DesignForm/dragControlNew.vue')['default']
     ElAffix: typeof import('element-plus/es')['ElAffix']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -39,7 +38,6 @@ declare module '@vue/runtime-core' {
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -64,7 +62,6 @@ declare module '@vue/runtime-core' {
     ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -72,7 +69,6 @@ declare module '@vue/runtime-core' {
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
@@ -80,7 +76,6 @@ declare module '@vue/runtime-core' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSpace: typeof import('element-plus/es')['ElSpace']
     ElStep: typeof import('element-plus/es')['ElStep']
@@ -97,7 +92,6 @@ declare module '@vue/runtime-core' {
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTransfer: typeof import('element-plus/es')['ElTransfer']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -128,26 +122,12 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
-    IEpCollection: typeof import('~icons/ep/collection')['default']
-    IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpDownload: typeof import('~icons/ep/download')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-    IEpMinus: typeof import('~icons/ep/minus')['default']
-    IEpOperation: typeof import('~icons/ep/operation')['default']
-    IEpPicture: typeof import('~icons/ep/picture')['default']
-    IEpPlus: typeof import('~icons/ep/plus')['default']
-    IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
-    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
-    IEpTop: typeof import('~icons/ep/top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
-    IEpUser: typeof import('~icons/ep/user')['default']
-    IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']

From 8a4800e48db42523aa02e0c2f82fccd7341cb97e Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 18 Jul 2024 08:19:29 +0800
Subject: [PATCH 5/6] 55

---
 src/api/calendar/request.ts                   |  13 ++
 .../app/calendar/calendar1/calendarItem.vue   |  51 ++++---
 .../app/calendar/calendar1/calendarPage.vue   |  10 +-
 .../app/calendar/calendar1/dayPage.vue        |  17 ++-
 .../app/calendar/calendar1/monthPage.vue      |  71 ++++++++-
 .../app/calendar/calendar1/weekPage.vue       |  71 ++++++++-
 src/components/DesignForm/app/cardPage.vue    |  63 ++++++++
 src/components/DesignForm/app/gannttPage.vue  |  33 +++++
 src/components/DesignForm/app/index.vue       |  44 +++++-
 src/components/DesignForm/app/mapPage.vue     |  33 +++++
 src/components/DesignForm/app/timeAxis.vue    |  94 +++++++-----
 .../DesignForm/tableListPage/index.vue        | 123 ++++++++++++++--
 src/types/components.d.ts                     |   3 +
 .../appPage/appPageForm/openAppFormPage.vue   |  73 +++++++++-
 .../appPage/appPageForm/pageList.vue          | 135 +++++++++++++++++-
 .../sysworkflow/lowcodepage/pageList.vue      | 117 ++++++++++++++-
 .../lowcodepage/runApp/runAppForm.vue         |  21 ++-
 17 files changed, 868 insertions(+), 104 deletions(-)
 create mode 100644 src/api/calendar/request.ts
 create mode 100644 src/components/DesignForm/app/cardPage.vue
 create mode 100644 src/components/DesignForm/app/gannttPage.vue
 create mode 100644 src/components/DesignForm/app/mapPage.vue

diff --git a/src/api/calendar/request.ts b/src/api/calendar/request.ts
new file mode 100644
index 000000000..74d2ecafd
--- /dev/null
+++ b/src/api/calendar/request.ts
@@ -0,0 +1,13 @@
+import request from '@/utils/request';
+
+
+/**
+ * 获取离职率http://localhost:9999/dev-api/api/upordown
+ */
+ export function gainCalendarList(data?: any) {
+	return request({
+	  url: "/systemapi/customer_form/gainCalendarList",
+	  method: 'post',
+	  data: data
+	});
+}
diff --git a/src/components/DesignForm/app/calendar/calendar1/calendarItem.vue b/src/components/DesignForm/app/calendar/calendar1/calendarItem.vue
index 545a67743..ee9db95e0 100644
--- a/src/components/DesignForm/app/calendar/calendar1/calendarItem.vue
+++ b/src/components/DesignForm/app/calendar/calendar1/calendarItem.vue
@@ -2,6 +2,7 @@
 import { PropType } from 'vue';
 import DateClass from '@/api/calendar/DateClass';
 import { dateBase } from '@/api/calendar/Calendar';
+import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
 const props = defineProps({
     col: {
         type: Object as PropType<dateBase>,
@@ -13,9 +14,14 @@ const props = defineProps({
         type: String,
         default: '',
     },
+	drawerWith:{
+		type:Number,
+		default:0
+	}
 });
 
 const isCurrentMonth = (time: string) => {
+	// console.log("分割时间",time)
     const months = time.split('-')[1];
     return DateClass.getCurrent()[1] === Number(months);
 }
@@ -32,6 +38,20 @@ const changeTargetDate = (time: dateBase) => {
 const searchtData = (val:any,time?:any) => {
 	return time
 }
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:24:06
+@ 功能: 查看详细内容
+*/
+const tablePageClass = ref(1)
+const lookPageInfoIsShow = ref(false)
+const pageInfoCont = ref<any>()
+const lookPageInfo = (val:any) => {
+	tablePageClass.value = 4;
+	pageInfoCont.value = val
+	lookPageInfoIsShow.value = true;	
+}
 </script>
 <template>
     <div
@@ -47,39 +67,18 @@ const searchtData = (val:any,time?:any) => {
         ]"
         @click="changeTargetDate(col)"
     >
+	
 		<div class="dayStyle">
 			<span >{{ col.title }}</span>
 			<div  v-if="col.isHolidays">休</div>
 			<span >{{ col.lunarsChina }}</span>
 		</div>
-		<div class="dayList">
-			<div class="dayLogCont">Squeezed by parent element</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
-			</div>
-			<div class="dayLogCont">
-				{{ searchtData(1,col)}}
+		<div  v-if="col.list&&col.list.length" class="dayList">
+			<div v-for="lt in col.list" :key="lt.id" class="dayLogCont" @click="lookPageInfo(lt)">
+				{{ lt.serialNumber1718584909710 }}
 			</div>
 		</div>
-        
+        <FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="props.drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
     </div>
 </template>
 
diff --git a/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue b/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue
index ca6230990..3ddd619c5 100644
--- a/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue
+++ b/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue
@@ -26,6 +26,10 @@ const props = defineProps({
 		default(){
 			return {}
 		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
 	}
 });
 const  taday = ref<any>([]);
@@ -187,9 +191,9 @@ defineExpose({
 			</div>
 		</div>
 		<div class="weekNumber">
-			<MonthPage ref="monthPageRef" v-if="curtteDayType==1" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" />
-			<WeekPage ref="weekPageRef" v-if="curtteDayType==2" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" />
-			<DayPage ref="dayPageRef" v-if="curtteDayType==3" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" />
+			<MonthPage ref="monthPageRef" v-if="curtteDayType==1" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" />
+			<WeekPage ref="weekPageRef" v-if="curtteDayType==2" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" />
+			<DayPage ref="dayPageRef" v-if="curtteDayType==3" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" />
 		</div>
 	</div>
 </template>
diff --git a/src/components/DesignForm/app/calendar/calendar1/dayPage.vue b/src/components/DesignForm/app/calendar/calendar1/dayPage.vue
index a78938cd0..30737a12b 100644
--- a/src/components/DesignForm/app/calendar/calendar1/dayPage.vue
+++ b/src/components/DesignForm/app/calendar/calendar1/dayPage.vue
@@ -8,6 +8,8 @@ import Calendar from '@/api/calendar/Calendar';
 import DateClass from '@/api/calendar/DateClass';
 import { dateBase } from '@/api/calendar/Calendar';
 import { clockFactory } from '@/api/calendar/utils';
+import { gainCalendarList } from '@/api/calendar/request';
+
 const props = defineProps({
 	bodyHight:Number,
 	taDay:{
@@ -21,6 +23,10 @@ const props = defineProps({
 		default(){
 			return {}
 		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
 	}
 });
 
@@ -62,7 +68,7 @@ const changeDate = (time: dateBase) => {
     selectedTime.value = time.date;
     emit('getDate', time);
 }
-
+const loadDay = ref(false)
 
 /**
 @ 作者: 秦东
@@ -85,6 +91,12 @@ const searchatDayList = (val:any) => {
 		timeAry:[dayInfo.value]
 	}
 	console.log("获取每天数据条件",sendInfo)
+	gainCalendarList(sendInfo)
+		.then(({data})=>{
+			console.log("获取数据",data)
+			dayInfo.value = data
+		})
+		.finally(()=>{ loadDay.value = false })
 }
 defineExpose({
 	searchatDayList
@@ -97,7 +109,7 @@ defineExpose({
                 {{ curttWeek }}
             </li>
         </ul>
-		<div class="t-calendar-day">
+		<div class="t-calendar-day"  v-loading="loadDay">
 			<template v-if="dayInfo">
 				<div
                     class="t-calendar-row"
@@ -105,6 +117,7 @@ defineExpose({
 				<CalendarItem
                     :col="dayInfo"
                     :time="selectedTime"
+					:drawer-with="props.drawerWith"
                     @changeTargetDate="changeDate"
                 ></CalendarItem>
 				</div>
diff --git a/src/components/DesignForm/app/calendar/calendar1/monthPage.vue b/src/components/DesignForm/app/calendar/calendar1/monthPage.vue
index 15ba9e647..ae3a3cd7d 100644
--- a/src/components/DesignForm/app/calendar/calendar1/monthPage.vue
+++ b/src/components/DesignForm/app/calendar/calendar1/monthPage.vue
@@ -8,9 +8,11 @@ import Calendar from '@/api/calendar/Calendar';
 import DateClass from '@/api/calendar/DateClass';
 import { dateBase } from '@/api/calendar/Calendar';
 import { clockFactory } from '@/api/calendar/utils';
+import { gainCalendarList } from '@/api/calendar/request';
 
 import CalendarItem from './calendarItem.vue';
 
+
 const props = defineProps({
 	bodyHight:Number,
 	taDay:{
@@ -18,15 +20,35 @@ const props = defineProps({
 		default() {
 			return [2024,7,13];
 		},
+	},
+	searchSend:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
 	}
 });
-
+const TBody = ref<any[]>([])
+const loadMonth = ref(false)
 onMounted(()=>{
+	TBody.value = Calendar.table(props.taDay)
+	searchatMonthList(props.searchSend)
 	nextTick(()=>{
 		selectedTime.value = props.taDay[0] + "-" + clockFactory(props.taDay[1]) + "-" + clockFactory(props.taDay[2])
 	})
 })
 
+watch(()=>props.taDay,(val:any)=>{
+	TBody.value = Calendar.table(props.taDay)
+	searchatMonthList(props.searchSend)
+},{
+	deep: true,
+})
+
 
 const selectedTime = ref(props.taDay[0] + "-" + clockFactory(props.taDay[1]) + "-" + clockFactory(props.taDay[2]))
 const emit = defineEmits(['getDate']);
@@ -41,9 +63,45 @@ const drawingBoardHeight = computed(()=>{
 //周期
 const THeader = Calendar.title();
 //日期
-const TBody = computed(() =>
-    Calendar.table(props.taDay)
-);
+// const TBody = computed(() =>
+//     Calendar.table(props.taDay)
+// );
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-16 11:53:35
+@ 功能: 获取数据
+*/
+const searchatMonthList = (val:any) => {
+	loadMonth.value = true
+	val.viewClass = {
+		class:"date",
+        sortWord:"",
+        sort:1,
+        startTime:"",
+        endTime:"",
+        dayType:"",
+        mapWord:""
+	}
+	console.log("获取每天数据",val)
+	let sendInfo = {
+		search:val,
+		timeMonthAry:TBody.value,
+		types:1
+	}
+	console.log("获取每天数据条件",sendInfo)
+	gainCalendarList(sendInfo)
+		.then(({data})=>{
+			console.log("获取月份数据",data)
+			TBody.value = data
+		})
+		.finally(()=>{ loadMonth.value = false })
+}
+
+defineExpose({
+	gainCalendarList
+})
+
+
 </script>
 <template>
 	<div class="monthCalendarBox" :style="'height:calc(100vh - '+ drawingBoardHeight +'px)'">
@@ -52,7 +110,7 @@ const TBody = computed(() =>
                 {{ item }}
             </li>
         </ul>
-		<div class="t-calendar-day">
+		<div v-loading="loadMonth" class="t-calendar-day">
 			<template v-if="TBody.length">
 				<div
                     class="t-calendar-row"
@@ -67,6 +125,7 @@ const TBody = computed(() =>
 						<CalendarItem
                             :col="col"
                             :time="selectedTime"
+							:drawer-with="props.drawerWith"
                             @changeTargetDate="changeDate"
                         ></CalendarItem>
 					</div>
@@ -75,8 +134,8 @@ const TBody = computed(() =>
             <template v-else>
                 <div class="no-date">抱歉,暂无数据</div>
             </template>
-			 
 		</div>
+		
 	</div>
 </template>
 <style  lang='scss' scoped>
diff --git a/src/components/DesignForm/app/calendar/calendar1/weekPage.vue b/src/components/DesignForm/app/calendar/calendar1/weekPage.vue
index 1ab3b7b71..8a07f0e7b 100644
--- a/src/components/DesignForm/app/calendar/calendar1/weekPage.vue
+++ b/src/components/DesignForm/app/calendar/calendar1/weekPage.vue
@@ -8,6 +8,7 @@ import Calendar from '@/api/calendar/Calendar';
 import DateClass from '@/api/calendar/DateClass';
 import { dateBase } from '@/api/calendar/Calendar';
 import { clockFactory } from '@/api/calendar/utils';
+import { gainCalendarList } from '@/api/calendar/request';
 
 const props = defineProps({
 	bodyHight:Number,
@@ -16,6 +17,16 @@ const props = defineProps({
 		default() {
 			return [2024,7,13];
 		},
+	},
+	searchSend:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
 	}
 });
 
@@ -25,14 +36,17 @@ const drawingBoardHeight = computed(()=>{
 })
 //周期
 const THeader = Calendar.title();
-const WeekBody = computed(()=>{
-	Calendar.gainDayOfWeek(props.taDay.start[0],props.taDay.start[1],props.taDay.start[2]);
-	console.log("画板高度--->",props.taDay.start[0]);
-	return Calendar.gainDayOfWeek(props.taDay.start[0],props.taDay.start[1],props.taDay.start[2]);
+// const WeekBody = computed(()=>{
+// 	Calendar.gainDayOfWeek(props.taDay.start[0],props.taDay.start[1],props.taDay.start[2]);
+// 	console.log("画板高度--->",props.taDay.start[0]);
+// 	return Calendar.gainDayOfWeek(props.taDay.start[0],props.taDay.start[1],props.taDay.start[2]);
 
-});
+// });
+const WeekBody = ref<any>([])
 
 onMounted(()=>{
+	WeekBody.value = Calendar.gainDayOfWeek(props.taDay.start[0],props.taDay.start[1],props.taDay.start[2]);
+	searchatWeekList(props.searchSend)
 	nextTick(()=>{
 		let ddTime = DateClass.getCurrent()
 		selectedTime.value = ddTime[0] + "-" + clockFactory(ddTime[1]) + "-" + clockFactory(ddTime[2])
@@ -44,6 +58,50 @@ const changeDate = (time: dateBase) => {
     selectedTime.value = time.date;
     emit('getDate', time);
 }
+
+const loadWeek = ref(false)
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-16 11:53:35
+@ 功能: 获取数据
+*/
+const searchatWeekList = (val:any) => {
+	loadWeek.value = true
+	val.viewClass = {
+		class:"date",
+        sortWord:"",
+        sort:1,
+        startTime:"",
+        endTime:"",
+        dayType:"",
+        mapWord:""
+	}
+	console.log("获取每天数据",val)
+	let sendInfo = {
+		search:val,
+		timeAry:WeekBody.value
+	}
+	console.log("获取每天数据条件",sendInfo)
+	gainCalendarList(sendInfo)
+		.then(({data})=>{
+			console.log("获取数据",data)
+			WeekBody.value = data
+		})
+		.finally(()=>{ loadWeek.value = false })
+}
+
+watch(()=>props.taDay,(val:any)=>{
+	WeekBody.value = Calendar.gainDayOfWeek(props.taDay.start[0],props.taDay.start[1],props.taDay.start[2]);
+	console.log("监听变化",WeekBody.value)
+	searchatWeekList(props.searchSend)
+},{
+	deep: true,
+})
+
+defineExpose({
+	searchatWeekList
+})
 </script>
 <template>
 	<div class="monthCalendarBox" :style="'height:calc(100vh - '+ drawingBoardHeight +'px)'">
@@ -52,7 +110,7 @@ const changeDate = (time: dateBase) => {
                 {{ item }}
             </li>
         </ul>
-		<div class="t-calendar-day">
+		<div class="t-calendar-day" v-loading="loadWeek">
 			<template v-if="WeekBody.length">
 				<div
                     class="t-calendar-row"
@@ -62,6 +120,7 @@ const changeDate = (time: dateBase) => {
 					<CalendarItem
 						:col="item"
 						:time="selectedTime"
+						:drawer-with="props.drawerWith"
 						@changeTargetDate="changeDate"
 					></CalendarItem>
 				</div>
diff --git a/src/components/DesignForm/app/cardPage.vue b/src/components/DesignForm/app/cardPage.vue
new file mode 100644
index 000000000..32a2b3db4
--- /dev/null
+++ b/src/components/DesignForm/app/cardPage.vue
@@ -0,0 +1,63 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-07-17 15:35:39
+@ 备注: 卡片视图
+-->
+<script lang='ts' setup>
+const props = defineProps({
+	searchSend:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
+	}
+});
+
+const lineRanks = ref(1)
+
+onMounted(()=>{
+	lineRanks.value = Math.round(24/props.viewSetup.form.ranks)
+})
+
+</script>
+<template>
+	<div>
+	{{lineRanks}}--
+
+		<el-row :gutter="20">
+			<el-col :span="lineRanks">
+				<el-card >
+					<table>
+						<tr>
+							<td rowspan="2">1</td>
+							<td>2</td>
+						</tr>
+						<tr>
+							<td>4</td>
+						</tr>
+					</table>
+				</el-card>
+			</el-col>
+			<el-col :span="lineRanks">1</el-col>
+			<el-col :span="lineRanks">2</el-col>
+			<el-col :span="lineRanks">3</el-col>
+			<el-col :span="lineRanks">4</el-col>
+			<el-col :span="lineRanks">5</el-col>
+			<el-col :span="lineRanks">6</el-col>
+		</el-row>
+	</div>
+	
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/app/gannttPage.vue b/src/components/DesignForm/app/gannttPage.vue
new file mode 100644
index 000000000..2de70a140
--- /dev/null
+++ b/src/components/DesignForm/app/gannttPage.vue
@@ -0,0 +1,33 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-07-17 15:35:39
+@ 备注: 卡片视图
+-->
+<script lang='ts' setup>
+const props = defineProps({
+	searchSend:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
+	}
+});
+</script>
+<template>
+	<div>
+		{{viewSetup}}
+	</div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 8bb4a1051..2c09558d9 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -22,6 +22,9 @@ import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
 import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
 import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue'
 import TimeAxisPage from '@/components/DesignForm/app/timeAxis.vue'
+import CardPage from '@/components/DesignForm/app/cardPage.vue'
+import GanttPageIng from '@/components/DesignForm/app/gannttPage.vue'
+import MapPage from '@/components/DesignForm/app/mapPage.vue'
 import CalendarPage from '@/components/DesignForm/app/calendar/calendar1/calendarPage.vue'
 
 
@@ -302,7 +305,8 @@ const searchSend = reactive({
 	formId:props.formId,
 	page:state.currentPage,
 	pagesize:state.pageSize,
-	searchData:json2string(props.searchData)
+	searchData:json2string(props.searchData),
+	viewClass:{}
 })
 let asfDetails = []
 /**
@@ -433,6 +437,9 @@ function getAsfDataTitlesByIds(asfQueryParams: any[]) {
 //liwenxuan 关联表单数据获取 end
 onMounted(()=>{
 	getPageData()
+	nextTick(()=>{
+		drawerWith.value = container.value?.clientWidth
+	})
 })
 /**
 @ 作者: 秦东
@@ -501,8 +508,7 @@ const lookPageInfo = (val:any) => {
 	tablePageClass.value = 4;
 	pageInfoCont.value = val
 	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-	
+	lookPageInfoIsShow.value = true;	
 }
 /**
 @ 作者: 秦东
@@ -592,12 +598,14 @@ const tabsView = (val:any,types:number) => {
 			props.viewPage.time.isClick = false
 			props.viewPage.gantt.isClick = false
 			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
 			break;
 		case 3:
 			props.viewPage.list.isClick = false
 			props.viewPage.date.isClick = false
 			props.viewPage.gantt.isClick = false
 			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
 			getPageData()
 			break;
 		case 4:
@@ -605,15 +613,25 @@ const tabsView = (val:any,types:number) => {
 			props.viewPage.date.isClick = false
 			props.viewPage.time.isClick = false
 			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
 			break;
 		case 5:
+			props.viewPage.card.isClick = false
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			break;
+		case 6:
 			props.viewPage.list.isClick = false
 			props.viewPage.date.isClick = false
 			props.viewPage.time.isClick = false
 			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
 			break;
 		default:
 			props.viewPage.date.isClick = false
+			props.viewPage.card.isClick = false
 			props.viewPage.time.isClick = false
 			props.viewPage.gantt.isClick = false
 			props.viewPage.map.isClick = false
@@ -739,6 +757,15 @@ const tabsView = (val:any,types:number) => {
 							>
 								<el-button size="small" class="fa fa-table"  :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" />
 							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.card.status"
+								class="box-item"
+								effect="dark"
+								content="卡片视图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-id-card-o"  :color="viewPage.card.isClick?'#a0cfff':''" @click="tabsView(viewPage.card,6)" />
+							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.date.status"
 								class="box-item"
@@ -952,16 +979,19 @@ const tabsView = (val:any,types:number) => {
 				</div>
 			</el-col>
 			<el-col  v-if="viewType==2" :span="24">
-				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265"  />
+				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith"  />
 			</el-col>
 			<el-col  v-if="viewType==3" :span="24">
-				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" />
+				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" />
 			</el-col>
 			<el-col  v-if="viewType==4" :span="24">
-				甘特图
+				<GanttPageIng ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.gantt" />
 			</el-col>
 			<el-col  v-if="viewType==5" :span="24">
-				地图
+				<MapPage ref="mapPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.map" />
+			</el-col>
+			<el-col  v-if="viewType==6" :span="24">
+				<CardPage ref="cardPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.card" />
 			</el-col>
 			<el-col :span="24" style="display:none">
 				<el-button-group>
diff --git a/src/components/DesignForm/app/mapPage.vue b/src/components/DesignForm/app/mapPage.vue
new file mode 100644
index 000000000..a1ce215b4
--- /dev/null
+++ b/src/components/DesignForm/app/mapPage.vue
@@ -0,0 +1,33 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-07-17 15:37:59
+@ 备注: 地图视图
+-->
+<script lang='ts' setup>
+const props = defineProps({
+	searchSend:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
+	}
+});
+</script>
+<template>
+	<div>
+		{{viewSetup}}
+	</div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/app/timeAxis.vue b/src/components/DesignForm/app/timeAxis.vue
index 3960e09c8..3e2ff7be5 100644
--- a/src/components/DesignForm/app/timeAxis.vue
+++ b/src/components/DesignForm/app/timeAxis.vue
@@ -5,6 +5,7 @@
 -->
 <script lang='ts' setup>
 import { multiViewPage } from '@/api/DesignForm/requestapi'
+import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
 import {
     json2string
 } from '@/utils/DesignForm/form'
@@ -32,6 +33,10 @@ const props = defineProps({
 		default(){
 			return {}
 		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
 	}
 });
 const svg = `
@@ -149,6 +154,20 @@ const showWork = computed(() => {
 	}
 	return ary
 })
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:24:06
+@ 功能: 查看详细内容
+*/
+const tablePageClass = ref(1)
+const lookPageInfoIsShow = ref(false)
+const pageInfoCont = ref<any>()
+const lookPageInfo = (val:any) => {
+	tablePageClass.value = 4;
+	pageInfoCont.value = val
+	lookPageInfoIsShow.value = true;	
+}
 </script>
 <template>
 	<ul v-infinite-scroll="loadTimeLog" class="infinite-list" :infinite-scroll-disabled="timeDisabled">
@@ -159,45 +178,45 @@ const showWork = computed(() => {
 			
 				<el-timeline-item center  v-for="(item,sunIndex) in timeInfoList" :key="index" :hollow="item.class_type$unit==1" :type="item.class_type$unit==1?'primary':''" :icon="item.class_type$unit==1?'':'MoreFilled'" :size="item.class_type$unit==1?'large':''">
 					<div class="timeLeft" v-if="item.class_type$unit==1">
-					<table>
-						<tr>
-							<td rowspan="2">
-								<el-text class="leftDay">{{item.day}}</el-text>
-							</td>
-							<td >
-								<el-text>{{item.weekDay}}</el-text>
-							</td>
-						</tr>
-						<tr>
-							<td >
-								<el-text>{{item.dateTime}}</el-text>
-							</td>
-						</tr>
-					</table>
-				</div>
-				<div class="leftCont" v-if="item.class_type$unit==1">
-					
-				</div>
-				<el-card  v-if="item.class_type$unit!=1">
+						<table>
+							<tr>
+								<td rowspan="2">
+									<el-text class="leftDay">{{item.day}}</el-text>
+								</td>
+								<td >
+									<el-text>{{item.weekDay}}</el-text>
+								</td>
+							</tr>
+							<tr>
+								<td >
+									<el-text>{{item.dateTime}}</el-text>
+								</td>
+							</tr>
+						</table>
+					</div>
+					<div class="leftCont" v-if="item.class_type$unit==1">
+						
+					</div>
+					<el-card  v-if="item.class_type$unit!=1" @click="lookPageInfo(item)">
 
-					<el-descriptions
-						class="margin-top"
-						title=""
-						:column="3"
-						border
-					>
-						<el-descriptions-item v-for="itemField in showWork"  :label="itemField.label" >
-							
-							{{judgeGainVal(itemField.field,item)}}
-						</el-descriptions-item>
-					</el-descriptions>
+						<el-descriptions
+							class="margin-top"
+							title=""
+							:column="3"
+							border
+						>
+							<el-descriptions-item v-for="itemField in showWork"  :label="itemField.label" >
+								
+								{{judgeGainVal(itemField.field,item)}}
+							</el-descriptions-item>
+						</el-descriptions>
 
-					<!-- <div v-for="itemField in props.columnsFilter" >
-						<div v-if="itemField.fieldClass!='-'&&itemField.fieldClass!='__control'">
-							{{itemField.label}}:{{judgeGainVal(itemField.field,item)}}
-						</div>
-					</div> -->
-				</el-card>
+						<!-- <div v-for="itemField in props.columnsFilter" >
+							<div v-if="itemField.fieldClass!='-'&&itemField.fieldClass!='__control'">
+								{{itemField.label}}:{{judgeGainVal(itemField.field,item)}}
+							</div>
+						</div> -->
+					</el-card>
 				</el-timeline-item>
 		
 
@@ -239,6 +258,7 @@ const showWork = computed(() => {
     		element-loading-svg-view-box="-10, -10, 50, 50"
 		></p>
     	<p class="jichuClass sizeMove" v-if="noMore">数据已全部展示！</p>
+		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="props.drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
 	</ul>
 </template>
 <style  lang='scss' scoped>
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index d0ae9aa66..5172d780f 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -19,6 +19,11 @@ import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
 //引入组件
 import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
 import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
+import TimeAxisPage from '@/components/DesignForm/app/timeAxis.vue'
+import CardPage from '@/components/DesignForm/app/cardPage.vue'
+import GanttPage from '@/components/DesignForm/app/gannttPage.vue'
+import MapPage from '@/components/DesignForm/app/mapPage.vue'
+import CalendarPage from '@/components/DesignForm/app/calendar/calendar1/calendarPage.vue'
 
 const props = withDefaults(
     defineProps<{
@@ -104,6 +109,9 @@ const state = reactive({
     columnsCheck: designStore.getColumnsCheck(route.path),
     currentNodeKey: ''
 })
+
+const viewType = ref(1)
+const viewLayout = ref<any>()
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-28 16:03:12
@@ -280,6 +288,17 @@ watch(()=>props.lookPageIsShow,(val:boolean)=>{
 		
 	}
 })
+
+const timeAxisRef = ref(null)
+const calendarPageRef = ref(null)
+const searchSend = reactive({
+	formId:props.formId,
+	page:state.currentPage,
+	pagesize:state.pageSize,
+	searchData:json2string(props.searchData),
+	viewClass:{}
+})
+
 let asfDetails = []
 
 /**
@@ -375,6 +394,9 @@ const getPageData = () => {
 }
 onMounted(()=>{
 	getPageData()
+	nextTick(()=>{
+		drawerWith.value = container.value?.clientWidth
+	})
 })
 //liwenxuan 关联表单数据获取 start
 function getAsfDataTitlesByIds(asfQueryParams: any[]) {
@@ -525,10 +547,67 @@ const editFormSendFlow = (val:any) => {
 	drawerWith.value = container.value?.clientWidth
 	lookPageInfoIsShow.value = true;
 }
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-08 09:39:52
+@ 功能: 切换视图展示方式
+*/
+const tabsView = (val:any,types:number) => {
+	viewType.value = types
+	val.isClick = true
+	viewLayout.value = val
+	console.log("切换视图展示方式",val)
+	switch(types){
+		case 2:
+			props.viewPage.list.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
+			break;
+		case 3:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
+			getPageData()
+			break;
+		case 4:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
+			break;
+		case 5:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.card.isClick = false
+			break;
+		case 6:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			break;
+		default:
+			props.viewPage.date.isClick = false
+			props.viewPage.card.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			break;
+	}
+}
 </script>
 <template>
 	<div ref="container" v-loading="state.loading" class="table-list-comm">
-		
+	
 		<el-row class="rowBox">
 			<el-col :span="24">
 				<el-form  v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
@@ -625,13 +704,13 @@ const editFormSendFlow = (val:any) => {
 					<div>
 						<el-button-group class="ml-4">
 							<el-tooltip
-								v-if="config.searchFormIsShow"
+								v-if="viewPage.list.status"
 								class="box-item"
 								effect="dark"
 								content="折叠查询表单"
 								placement="bottom"
 							>
-								<!-- <el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" /> -->
+								<el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" />
 							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.list.status"
@@ -640,7 +719,16 @@ const editFormSendFlow = (val:any) => {
 								content="列表视图"
 								placement="top"
 							>
-								<el-button size="small" class="fa fa-table"  :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list)" />
+								<el-button size="small" class="fa fa-table"  :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.card.status"
+								class="box-item"
+								effect="dark"
+								content="卡片视图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-id-card-o"  :color="viewPage.card.isClick?'#a0cfff':''" @click="tabsView(viewPage.card,6)" />
 							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.date.status"
@@ -649,7 +737,7 @@ const editFormSendFlow = (val:any) => {
 								content="日历视图"
 								placement="top"
 							>
-								<el-button size="small" class="fa fa-calendar" />
+								<el-button size="small" class="fa fa-calendar"  :color="viewPage.date.isClick?'#a0cfff':''" @click="tabsView(viewPage.date,2)" />
 							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.time.status"
@@ -658,7 +746,7 @@ const editFormSendFlow = (val:any) => {
 								content="时间轴"
 								placement="top"
 							>
-								<el-button size="small" class="fa fa-clock-o" />
+								<el-button size="small" class="fa fa-clock-o"  :color="viewPage.time.isClick?'#a0cfff':''" @click="tabsView(viewPage.time,3)" />
 							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.gantt.status"
@@ -667,7 +755,7 @@ const editFormSendFlow = (val:any) => {
 								content="甘特图"
 								placement="top"
 							>
-								<el-button size="small" class="fa fa-bar-chart" />
+								<el-button size="small" class="fa fa-bar-chart"  :color="viewPage.gantt.isClick?'#a0cfff':''" @click="tabsView(viewPage.gantt,4)" />
 							</el-tooltip>
 							<el-tooltip
 								v-if="viewPage.map.status"
@@ -676,14 +764,14 @@ const editFormSendFlow = (val:any) => {
 								content="地图视图"
 								placement="top"
 							>
-								<el-button size="small" class="fa fa-map-signs" />
+								<el-button size="small" class="fa fa-map-signs"  :color="viewPage.map.isClick?'#a0cfff':''" @click="tabsView(viewPage.map,5)" />
 							</el-tooltip>
 							
 						</el-button-group>
 					</div>
 				</div>
 			</el-col>
-			<el-col :span="24">
+			<el-col v-if="viewType==1" :span="24">
 				<el-table
 					v-bind="data.tableProps"
 					ref="table"
@@ -840,7 +928,7 @@ const editFormSendFlow = (val:any) => {
 					</template>
 				</el-table>
 			</el-col>
-			<el-col v-if="state.total > 0" :span="24">
+			<el-col v-if="viewType==1&&state.total > 0" :span="24">
 				<div class="pageBox">
 					<el-pagination
 						v-model:currentPage="state.currentPage"
@@ -853,6 +941,21 @@ const editFormSendFlow = (val:any) => {
 					/>
 				</div>
 			</el-col>
+			<el-col  v-if="viewType==2" :span="24">
+				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith"  />
+			</el-col>
+			<el-col  v-if="viewType==3" :span="24">
+				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" />
+			</el-col>
+			<el-col  v-if="viewType==4" :span="24">
+				<GanttPage ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage" />
+			</el-col>
+			<el-col  v-if="viewType==5" :span="24">
+				<MapPage ref="mapPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage" />
+			</el-col>
+			<el-col  v-if="viewType==6" :span="24">
+				<CardPage ref="cardPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage" />
+			</el-col>
 			<el-col :span="24"  style="display:none">
 			
 				{{ tableDataList}}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 07f9ea9fc..b8dbee5e1 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -18,6 +18,7 @@ declare module '@vue/runtime-core' {
     Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
     CalendarItem: typeof import('./../components/DesignForm/app/calendar/calendar1/calendarItem.vue')['default']
     CalendarPage: typeof import('./../components/DesignForm/app/calendarPage.vue')['default']
+    CardPage: typeof import('./../components/DesignForm/app/cardPage.vue')['default']
     ChildTable: typeof import('./../components/DesignForm/public/form/childTable.vue')['default']
     ConditionDrawer: typeof import('./../components/workflow/drwer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
@@ -115,6 +116,7 @@ declare module '@vue/runtime-core' {
     FormPageContApp: typeof import('./../components/DesignForm/tableListPage/formPageContApp.vue')['default']
     FormVersion: typeof import('./../components/DesignForm/formVersion.vue')['default']
     FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default']
+    GannttPage: typeof import('./../components/DesignForm/app/gannttPage.vue')['default']
     GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default']
     Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
     HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default']
@@ -132,6 +134,7 @@ declare module '@vue/runtime-core' {
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
     ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']
+    MapPage: typeof import('./../components/DesignForm/app/mapPage.vue')['default']
     MathFormula: typeof import('./../components/DesignForm/math/mathFormula.vue')['default']
     Matrix: typeof import('./../components/workflow/dialog/matrix.vue')['default']
     MonthPage: typeof import('./../components/DesignForm/app/calendar/calendar1/monthPage.vue')['default']
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index d72451d47..09e2263c2 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -91,7 +91,73 @@ const stateList = reactive({
 		lookApiUrl:""
 	},
     dict: {},
-    refreshTable: true
+    refreshTable: true,
+	view:{
+		list:{
+			status:true,
+			isClick:false,
+			form:{
+				sortWord:"",
+				sortClass:1
+			}
+		},
+		date:{
+			status:false,
+			isClick:false,
+			form:{
+				startTime:"",
+				endTime:"",
+				dayType:1
+			}
+		}
+		,
+		time:{
+			status:false,
+			isClick:false,
+			form:{
+				sortWord:"",
+				sort:1
+			}
+		}
+		,
+		gantt:{
+			status:false,
+			isClick:false,
+			form:{
+				startTime:"",
+				endTime:"",
+				dayType:2,
+				sortWord:"",
+				sort:1
+			}
+		}
+		,
+		map:{
+			status:false,
+			isClick:false,
+			form:{
+				mapWord:"",
+				sortWord:"",
+				sort:1
+			}
+		},
+		card:{
+			status:false,
+			isClick:false,
+			form:{
+				sort:1,
+				sortWord:"",
+				imgWork:"",
+				imgWidth:50,
+				imgHeight:50,
+				imgBorderRadius:5,
+				imgPadding:2,
+				titleWork:"",
+				describe:"",
+				ranks:3
+			}
+		}
+	}
 })
 
 const versionTitle = ref<string>("")	//表单名称
@@ -214,7 +280,10 @@ const gainAppFormPageInit = () =>{
 				stateList.formApi = stateData.formApi
 				stateList.dict = stateData.dict
 				stateList.refreshTable = stateData.refreshTable
-				stateList.view = stateData.view
+				if(stateData.view){
+					stateList.view = stateData.view
+				}
+				
 			}
 			if(data.data.page){
 				console.log("data.data.mastesform", data.data)
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 7ca71059d..2b41f933f 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -182,6 +182,22 @@ const state = reactive({
 				sortWord:"",
 				sort:1
 			}
+		},
+		card:{
+			status:false,
+			isClick:false,
+			form:{
+				sort:1,
+				sortWord:"",
+				imgWork:"",
+				imgWidth:50,
+				imgHeight:50,
+				imgBorderRadius:5,
+				imgPadding:2,
+				titleWork:"",
+				describe:"",
+				ranks:3
+			}
 		}
 	}
 		
@@ -276,6 +292,8 @@ const allKeyWords = ref<any[]>([])
 const timeKeyWords = ref<any[]>([])
 const mapKeyWords = ref<any[]>([])
 const isMapTrue = ref(true)
+const cardKeyWords = ref<any[]>([])
+const isCardTrue = ref(true)
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-06 10:44:54
@@ -289,6 +307,9 @@ const gainFormTableKeyWord = (val:string) => {
 			timeKeyWords.value = data.data.timeKeyWords
 			mapKeyWords.value = data.data.mapKeyWords
 			isMapTrue.value = !data.data.isMap
+
+			cardKeyWords.value = data.data.cardKeyWords
+			isCardTrue.value = !data.data.isCard
 		})
 }
 /**
@@ -348,7 +369,10 @@ const getListInfo = () => {
 				state.formApi = stateData.formApi
 				state.dict = stateData.dict
 				state.refreshTable = stateData.refreshTable
-				state.view = stateData.view
+				if(stateData.view){
+					state.view = stateData.view
+				}
+				
 			}
 			
 
@@ -752,7 +776,7 @@ const tabsView = (val:any) => {
 				</div>
 				<div>
 					
-					
+				
 					
 					<el-button-group class="ml-4">
 						<el-tooltip
@@ -773,6 +797,16 @@ const tabsView = (val:any) => {
 						>
 							<el-button size="small" class="fa fa-table"  :color="state.view.list.isClick?'#a0cfff':''" @click="tabsView(state.view.list)" />
 						</el-tooltip>
+						<el-tooltip
+							v-if="state.view.card.status"
+							class="box-item"
+							effect="dark"
+							content="卡片视图"
+							placement="top"
+						>
+							<el-button size="small" class="fa fa-id-card-o" />
+						</el-tooltip>
+						
 						<el-tooltip
 							v-if="state.view.date.status"
 							class="box-item"
@@ -966,6 +1000,103 @@ const tabsView = (val:any) => {
 									</el-form-item>
 
 
+								</el-form>
+							</div>
+						</el-collapse-item>
+					
+						<el-collapse-item title="Consistency" name="card" :class="state.view.card.status?'isTrueItem':''"  :disabled="!state.view.card.status">
+							<template #title>
+								<div class="collapse-title">
+									<div>
+										<i class="fa fa-id-card-o"></i>
+										<el-text>卡片视图</el-text>
+									</div>
+									<el-switch class="openOfClose" v-model="state.view.card.status" :disabled="isCardTrue" @click.stop="showCollapse" />
+								</div>
+							</template>
+							<div>
+								<el-form
+									label-position="top"
+									label-width="auto"
+									:model="state.view.card.form"
+									style="max-width: 600px"
+								>
+									<el-form-item label="图片字段">
+										<el-select v-model="state.view.card.form.imgWork" placeholder="请选择图片字段">
+											<el-option v-for="item in cardKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+									<el-form-item label="图片宽度与高度">
+										<el-input
+											v-model="state.view.card.form.imgWidth"
+											placeholder="请输入图片宽度"
+										>
+											<template #prepend>宽度</template>
+											<template #suffix>PX</template>
+										</el-input>
+										<el-input
+											v-model="state.view.card.form.imgHeight"
+											placeholder="请输入图片高度"
+											style="margin-top:10px;"
+										>
+											<template #prepend>高度</template>
+											<template #suffix>PX</template>
+										</el-input>
+									</el-form-item>
+									<el-form-item label="图片圆角">
+										<el-input
+											v-model="state.view.card.form.imgBorderRadius"
+											placeholder="请输入图片圆角"
+											style="margin-top:10px;"
+										>
+											<template #prepend>圆角</template>
+											<template #suffix>PX</template>
+										</el-input>
+									</el-form-item>
+
+									<el-form-item label="图片边框缩进">
+										<el-input
+											v-model="state.view.card.form.imgPadding"
+											placeholder="请输入图片边框缩进"
+											style="margin-top:10px;"
+										>
+											<template #prepend>缩进</template>
+											<template #suffix>PX</template>
+										</el-input>
+									</el-form-item>
+									<el-form-item label="卡片标题">
+										<el-select v-model="state.view.card.form.titleWork" placeholder="请选择时间轴段">
+											<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+									<el-form-item label="卡片标题描述">
+										<el-select v-model="state.view.card.form.describe" placeholder="请选择时间轴段">
+											<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+									<el-form-item label="每行几列">
+										<el-input
+											v-model="state.view.card.form.ranks"
+											placeholder="请输入每行几列"
+											style="margin-top:10px;"
+										>
+											<template #suffix>列</template>
+										</el-input>
+									</el-form-item>
+									<el-form-item label="排序字段">
+										<el-select v-model="state.view.card.form.sortWord" placeholder="请选择时间轴段">
+											<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+
+									<el-form-item label="排序方式">
+										<el-radio-group v-model="state.view.card.form.sort">
+											<el-radio :label="1">降序</el-radio>
+											<el-radio :label="2">升序</el-radio>
+										</el-radio-group>
+									</el-form-item>
+
+
 								</el-form>
 							</div>
 						</el-collapse-item>
diff --git a/src/views/sysworkflow/lowcodepage/pageList.vue b/src/views/sysworkflow/lowcodepage/pageList.vue
index 4f38687a4..c37238c1c 100644
--- a/src/views/sysworkflow/lowcodepage/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/pageList.vue
@@ -111,6 +111,22 @@ const state = reactive({
 				sort:1
 			}
 		},
+		card:{
+			status:false,
+			isClick:false,
+			form:{
+				sort:1,
+				sortWord:"",
+				imgWork:"",
+				imgWidth:50,
+				imgHeight:50,
+				imgBorderRadius:5,
+				imgPadding:2,
+				titleWork:"",
+				describe:"",
+				ranks:3
+			}
+		},
 		date:{
 			status:false,
 			isClick:false,
@@ -243,7 +259,7 @@ onMounted(()=>{
 	nextTick(() => {
       	columnDrop()
 		getListInfo();
-		gainFormTableKeyWord(props.appPageKey.toString())
+		gainFormTableKeyWord(props.formKey)
     })
 })
 
@@ -257,6 +273,7 @@ const isMapTrue = ref(true)
 @ 功能: 获取数据表字段数据
 */
 const gainFormTableKeyWord = (val:string) => {
+	console.log("获取数据表字段数据-----------》",val)
 	gainListTableField({id:val.toString()})
 		.then((data) =>{
 			console.log("获取数据表字段数据",data)
@@ -732,7 +749,7 @@ const getListInfo = () => {
 	gainFormListCont({id:props.formKey.toString()})
 		.then((data)=>{
 			console.log("获取列表内容",data)
-			if(data.data.listjson != null && data.data.listjson != ""){
+			if(data.data.listjson != null && data.data.listjson != "" && data.data.listjson != "null"){
 				let stateData = string2json(data.data.listjson)
 				console.log("获取列表内容---->",stateData)
 				state.tableData = stateData.tableData
@@ -1056,6 +1073,102 @@ const getListInfo = () => {
 										</el-form>
 									</div>
 								</el-collapse-item>
+								<el-collapse-item title="Consistency" name="card" :class="state.view.card.status?'isTrueItem':''"  :disabled="!state.view.card.status">
+							<template #title>
+								<div class="collapse-title">
+									<div>
+										<i class="fa fa-id-card-o"></i>
+										<el-text>卡片视图</el-text>
+									</div>
+									<el-switch class="openOfClose" v-model="state.view.card.status" :disabled="isCardTrue" @click.stop="showCollapse" />
+								</div>
+							</template>
+							<div>
+								<el-form
+									label-position="top"
+									label-width="auto"
+									:model="state.view.card.form"
+									style="max-width: 600px"
+								>
+									<el-form-item label="图片字段">
+										<el-select v-model="state.view.card.form.imgWork" placeholder="请选择图片字段">
+											<el-option v-for="item in cardKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+									<el-form-item label="图片宽度与高度">
+										<el-input
+											v-model="state.view.card.form.imgWidth"
+											placeholder="请输入图片宽度"
+										>
+											<template #prepend>宽度</template>
+											<template #suffix>PX</template>
+										</el-input>
+										<el-input
+											v-model="state.view.card.form.imgHeight"
+											placeholder="请输入图片高度"
+											style="margin-top:10px;"
+										>
+											<template #prepend>高度</template>
+											<template #suffix>PX</template>
+										</el-input>
+									</el-form-item>
+									<el-form-item label="图片圆角">
+										<el-input
+											v-model="state.view.card.form.imgBorderRadius"
+											placeholder="请输入图片圆角"
+											style="margin-top:10px;"
+										>
+											<template #prepend>圆角</template>
+											<template #suffix>PX</template>
+										</el-input>
+									</el-form-item>
+
+									<el-form-item label="图片边框缩进">
+										<el-input
+											v-model="state.view.card.form.imgPadding"
+											placeholder="请输入图片边框缩进"
+											style="margin-top:10px;"
+										>
+											<template #prepend>缩进</template>
+											<template #suffix>PX</template>
+										</el-input>
+									</el-form-item>
+									<el-form-item label="卡片标题">
+										<el-select v-model="state.view.card.form.titleWork" placeholder="请选择时间轴段">
+											<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+									<el-form-item label="卡片标题描述">
+										<el-select v-model="state.view.card.form.describe" placeholder="请选择时间轴段">
+											<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+									<el-form-item label="每行几列">
+										<el-input
+											v-model="state.view.card.form.ranks"
+											placeholder="请输入每行几列"
+											style="margin-top:10px;"
+										>
+											<template #suffix>列</template>
+										</el-input>
+									</el-form-item>
+									<el-form-item label="排序字段">
+										<el-select v-model="state.view.card.form.sortWord" placeholder="请选择时间轴段">
+											<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
+										</el-select>
+									</el-form-item>
+
+									<el-form-item label="排序方式">
+										<el-radio-group v-model="state.view.card.form.sort">
+											<el-radio :label="1">降序</el-radio>
+											<el-radio :label="2">升序</el-radio>
+										</el-radio-group>
+									</el-form-item>
+
+
+								</el-form>
+							</div>
+						</el-collapse-item>
 								<el-collapse-item title="Consistency" name="date" :class="state.view.date.status?'isTrueItem':''"  :disabled="!state.view.date.status">
 									<template #title>
 										<div class="collapse-title">
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index 65594108c..1c31d91d9 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -119,6 +119,22 @@ const stateList = reactive({
 				sortWord:"",
 				sort:1
 			}
+		},
+		card:{
+			status:false,
+			isClick:false,
+			form:{
+				sort:1,
+				sortWord:"",
+				imgWork:"",
+				imgWidth:50,
+				imgHeight:50,
+				imgBorderRadius:5,
+				imgPadding:2,
+				titleWork:"",
+				describe:"",
+				ranks:3
+			}
 		}
 	}
 		
@@ -217,7 +233,10 @@ const initLoadData = () => {
 				stateList.formApi = stateData.formApi
 				stateList.dict = stateData.dict
 				stateList.refreshTable = stateData.refreshTable
-				stateList.view = stateData.view
+				if(stateData.view){
+					stateList.view = stateData.view
+				}
+				
 			}
 			if(data.data.page){
 				console.log("data.data.mastesform", data.data)

From 611cbaf4c10b23f7428836b95335ce953270485e Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 18 Jul 2024 15:20:06 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=A1=E7=89=87=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/cardPage.vue    | 195 ++++++++++++++++--
 .../DesignForm/public/form/formGroup.vue      |   2 +-
 src/types/components.d.ts                     |   3 +
 3 files changed, 180 insertions(+), 20 deletions(-)

diff --git a/src/components/DesignForm/app/cardPage.vue b/src/components/DesignForm/app/cardPage.vue
index 32a2b3db4..fdbba7178 100644
--- a/src/components/DesignForm/app/cardPage.vue
+++ b/src/components/DesignForm/app/cardPage.vue
@@ -4,6 +4,7 @@
 @ 备注: 卡片视图
 -->
 <script lang='ts' setup>
+import type { ComponentSize } from 'element-plus'
 const props = defineProps({
 	searchSend:{
 		type:Object,
@@ -22,42 +23,198 @@ const props = defineProps({
 		default:0
 	}
 });
-
+const size = ref<ComponentSize>('default')
 const lineRanks = ref(1)
+const imgBox = computed(() => {
+	let cssStyle:any = {}
+	if(props.viewSetup.form.imgWidth != 0){
+		cssStyle['width'] = props.viewSetup.form.imgWidth + "px";
+	}else{
+		cssStyle['width'] = "50px";
+	}
+	if(props.viewSetup.form.imgHeight != 0){
+		cssStyle['height'] = props.viewSetup.form.imgHeight + "px";
+	}else{
+		cssStyle['height'] = "50px";
+	}
+	
+	return  cssStyle
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-18 14:26:46
+@ 功能: 图像设定Css
+*/
+const imgStyle = computed(() => {
+	let cssStyle:any = {}
+	cssStyle['border'] = "1px solid #ccc";
+	cssStyle['border-radius'] = props.viewSetup.form.imgBorderRadius + "px";
+	cssStyle['padding'] = props.viewSetup.form.imgPadding + "px";
+	if(props.viewSetup.form.imgWidth != 0){
+		cssStyle['width'] = props.viewSetup.form.imgWidth + "px";
+	}else{
+		cssStyle['width'] = "50px";
+	}
+	if(props.viewSetup.form.imgHeight != 0){
+		cssStyle['height'] = props.viewSetup.form.imgHeight + "px";
+	}else{
+		cssStyle['height'] = "50px";
+	}
+	console.log("自定义样式",cssStyle)
+	return  cssStyle
+})
 
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-18 14:26:57
+@ 功能: 内容设定css
+*/
+const cardInfoBox = computed(() => {
+	let cssStyle:any = {}
+	
+	cssStyle['width'] = (Math.round(24/props.viewSetup.form.ranks) - props.viewSetup.form.imgWidth) + "px";
+	return  cssStyle
+})
 onMounted(()=>{
 	lineRanks.value = Math.round(24/props.viewSetup.form.ranks)
 })
+// const url = ref()
+// const srcList = ref([])
+const handleSizeChange = (val: number) => {
+  console.log(`${val} items per page`)
+}
+const handleCurrentChange = (val: number) => {
+  console.log(`current page: ${val}`)
+}
 
+const url =
+  'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg'
+const srcList = (url:string) =>{
+	return [url]
+	return [
+		'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
+		'https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg',
+		'https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg',
+		'https://fuss10.elemecdn.com/9/bb/e27858e973f5d7d3904835f46abbdjpeg.jpeg',
+		'https://fuss10.elemecdn.com/d/e6/c4d93a3805b3ce3f323f7974e6f78jpeg.jpeg',
+		'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
+		'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg',
+	]
+} 
 </script>
 <template>
 	<div>
-	{{lineRanks}}--
 
 		<el-row :gutter="20">
-			<el-col :span="lineRanks">
+			
+			<el-col :span="lineRanks"  class="cardBox">
+				
 				<el-card >
-					<table>
-						<tr>
-							<td rowspan="2">1</td>
-							<td>2</td>
-						</tr>
-						<tr>
-							<td>4</td>
-						</tr>
-					</table>
+					<div class="cardContBox">
+						<el-image
+							:style="imgStyle"
+							:src="url"
+							:zoom-rate="1.2"
+							:max-scale="7"
+							:min-scale="0.2"
+							:preview-src-list="srcList(url)"
+							:initial-index="4"
+							fit="cover"
+						/>
+						<div class="cardInfo" :style="'width: calc(100% - '+props.viewSetup.form.imgWidth+'px); height:'+props.viewSetup.form.imgHeight+'px; overflow: hidden;' ">
+							<div class="title">标题标题标题标题标题标题标题标题标题标题标题标题标题标题</div>
+							<div class="content">内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容</div>
+						</div>
+					</div>
 				</el-card>
+			
 			</el-col>
-			<el-col :span="lineRanks">1</el-col>
-			<el-col :span="lineRanks">2</el-col>
-			<el-col :span="lineRanks">3</el-col>
-			<el-col :span="lineRanks">4</el-col>
-			<el-col :span="lineRanks">5</el-col>
-			<el-col :span="lineRanks">6</el-col>
+			<el-col :span="lineRanks"  class="cardBox">
+				
+				<el-card >
+					<div class="cardContBox">
+						<el-image
+							:style="imgStyle"
+							:src="url"
+							:zoom-rate="1.2"
+							:max-scale="7"
+							:min-scale="0.2"
+							:preview-src-list="srcList(url)"
+							:initial-index="4"
+							fit="cover"
+						/>
+						<div class="cardInfo" :style="'width: calc(100% - '+props.viewSetup.form.imgWidth+'px); height:'+props.viewSetup.form.imgHeight+'px; overflow: hidden;' ">
+							<div class="title">标题标题标题标题标题标题标题标题标题标题标题标题标题标题</div>
+							<div class="content">内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容</div>
+						</div>
+					</div>
+				</el-card>
+			
+			</el-col>
+			
+			
 		</el-row>
+		<div class="pageBox">
+			<el-pagination
+				v-model:current-page="props.searchSend.page"
+				v-model:page-size="props.searchSend.pagesize"
+				:page-sizes="[100, 200, 300, 400]"
+				:size="size"
+				:background="true"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="400"
+				@size-change="handleSizeChange"
+				@current-change="handleCurrentChange"
+				class="page"
+			/>
+		</div>
+
 	</div>
 	
 </template>
 <style  lang='scss' scoped>
-
+.demo-image__error .image-slot {
+  font-size: 30px;
+}
+.demo-image__error .image-slot .el-icon {
+  font-size: 30px;
+}
+.demo-image__error .el-image {
+  width: 100%;
+  height: 200px;
+}
+.cardBox{
+	padding: 10px 0 5px 0;
+	:deep .el-card__body{
+		padding:10px;
+	}
+	.title{
+		font-size:14px;
+		font-weight:bold;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	.content{
+		color: #909399;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.cardContBox{
+		display: flex;
+		width: 100%;
+		justify-content: flex-start;
+	}
+	.cardInfo{
+		padding-left: 5px;
+	}
+	
+}
+.pageBox{
+	display:flex;
+	justify-content: center;
+	width: 100%;
+	text-align: center;
+	margin-top: 10px;
+}
 </style>
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 982290b29..acdc3350c 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -374,7 +374,7 @@ onMounted(()=>{
 })
 
 const getFormItemLableStyle = (ele: any) => {
-    if(ele?.labelStyle){
+    if(ele?.labelStyle){ 
     //   console.log("返回栅格宽度3",AnalysisCss(ele?.labelStyle))
       return AnalysisCss(ele?.labelStyle)
     }
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index b8dbee5e1..a8a381a44 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -124,9 +124,12 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']