From 8b51bfc6ad2e70f36d5f08147c6053b3e24710a5 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 10 Sep 2024 07:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 14 ++++++---
 .../DesignForm/public/form/childTable.vue     | 11 ++++---
 .../DesignForm/public/form/form.vue           |  2 +-
 .../DesignForm/public/form/formGroup.vue      |  1 +
 .../DesignForm/public/form/formItem.vue       | 29 +++++++++++++++++--
 .../DesignForm/tableListPage/index.vue        |  3 ++
 .../appPage/appPageForm/pageForm.vue          |  3 +-
 .../lowcodepage/pageFlow/tableFlow.vue        |  2 +-
 src/widget/digitpage/index.vue                | 13 ++++-----
 9 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index a1b2559..0e00de5 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1631,7 +1631,7 @@ const formListmap = ref<any>()
 const subUnit = ref<any>()
     //默认值处理
 const digitPageSub = (val:any,envt:any) => {
-        // console.log("默认值处理--->",val.value,envt,props.formData)
+        console.log("默认值处理--->",val,envt,props.formData)
     
         // console.log("默认值处理-1-->",props.formList)
         // console.log("默认值处理-2-->",props.formConfig)
@@ -1639,13 +1639,19 @@ const digitPageSub = (val:any,envt:any) => {
         // console.log("默认值处理--4->",props.customerformid)
         // console.log("默认值处理--5->",controlData.value)
         // console.log("默认值处理-6-->",val)
+		// console.log("默认值处理-7-->",mathBoxShow)
+		// console.log("默认值处理-8-->",attrList.value)
         subUnit.value = val
         controlData.value.selectvalue = envt
         formListmap.value = props.formList
         if(envt == "simple"){
             unitInfo.value = attrList.value
             mathBoxShow.value = true
-        }
+			val.control.modelValue = ""
+        }else{
+			unitInfo.value = ""
+            mathBoxShow.value = false
+		}
     }
 const openMathDialog = (val:any) => {
         subUnit.value = val
@@ -3016,7 +3022,7 @@ const radioChangeSet = (val:any) => {
                                         <el-col :span="12">
                                             <el-input-number
                                                 v-if="item.selectvalue == 'default'"
-                                                v-model="item.value"
+                                                v-model="item.control.modelValue"
                                                 class="mx-4"
                                             />
                                         </el-col>
@@ -3735,7 +3741,7 @@ const radioChangeSet = (val:any) => {
                 <el-tab-pane label="表单配置" name="second">
                     <el-form size="small" class="form">
                         <el-divider content-position="left">基础配置</el-divider>
-								<el-form-item  class="form_cont">
+								<el-form-item v-if="formConfig.classify != 4"  class="form_cont">
 									<template #label>
 										归属分组
 									</template>
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 6dfd320..9936b26 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -46,7 +46,10 @@ const addColumn = () => {
 		tableDataNew.value.push(jsonParseStringify(temp))
     }
 }
-const getText = (text: any) => {
+const getText = (text: any,val:any,name:any) => {
+	console.log("text===>",text)
+	console.log("name===>",name)
+	console.log("val===>",val)
     if (typeof text === 'string') {
       	return text
     } else {
@@ -58,7 +61,7 @@ const delColumn = (index: number) => {
 }
 </script>
 <template>
-	<!-- {{formProps}} -->
+	{{formProps}}
 	<div class="form-table form-table-add">
 		<el-table
 			v-bind="data.control"
@@ -73,10 +76,10 @@ const delColumn = (index: number) => {
 				:width="item.item.span"
 			>
 				<template #default="scope">
-				
+				{{type}}
 					<span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
 					<div v-if="type === 4 || editDisabled">
-						{{ getText(scope.row[item.name]) }}
+						{{ getText(scope.row[item.name],scope.row,item.name) }}
 					</div>
 					<div v-else>
 				
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 769caed..88c3d18 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -467,7 +467,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 				"mathsFornula":props.formData.config,
 				"keyVal":fieldVal
 			}
-			console.log("sendInfoe-2->",props.formData,props.formData)
+			// console.log("sendInfoe-2->",props.formData,props.formData)
 			currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations",sendInfo)
 				.then((data:any)=>{
 					// console.log("结果-->",data)
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 3a94d41..612a600 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -465,6 +465,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				</template>
 				<!--表格组件-->
 				<template v-else-if="element.type === 'table'">
+					
 					<div class="form-table" v-if="type === 5">
 						<!-- <form-group :data="element.list" data-type="not-nested" /> -->
 						<form-group :data="element.list" data-type="not-table" />
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 6570702..ba5874a 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -104,7 +104,18 @@ const value = computed({
 			// 表格和弹性布局
 			return props.modelValue
 		} else {
-			return formProps.value.model[props.data.name]
+			if(props.data.type == "checkbox"){
+				if (formProps.value.model[props.data.name] == null || formProps.value.model[props.data.name] == ""){
+					// formProps.value.model[props.data.name] = []
+					// return formProps.value.model[props.data.name]
+					return []
+				}else{
+					return formProps.value.model[props.data.name]
+				}
+			}else{
+				return formProps.value.model[props.data.name]
+			}
+			
 		}
     },
     set(newVal: any) {
@@ -846,7 +857,7 @@ const pickUserVal = (val:any) => {
 </script>
 <template>
 	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
-	<DigitPage v-else-if="judgeIsShow(data.name) &&data.type === 'digitpage' && type != 4" :data="data" />
+	<DigitPage v-else-if="judgeIsShow(data.name) &&data.type === 'digitpage' && type != 4" :data="data" :model-value="data.control.modelValue" />
 	<OrgCentent v-else-if="judgeIsShow(data.name) &&data.type === 'orgCentent'" :data="data" />
 	<LowcodeImage  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" ></LowcodeImage>
 	<!--拥有者-->
@@ -873,6 +884,20 @@ const pickUserVal = (val:any) => {
 				
 				<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
 				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
+
+	<el-form-item
+		v-bind="data.item"
+		v-if="judgeIsShow(data.name) && type === 4 &&  data.type == 'digitpage'"
+		:disabled="judgeIsDisabled(data.name)"
+		:prop="tProp || data.name"
+		:class="config.className"
+		:rules="itemRules as any"
+		:label="getLabel(data.item as FormItem)"
+	>
+			<div class="form-value"  v-html="value">
+			</div>
+	</el-form-item>
+
 	<el-form-item
 		v-bind="data.item"
 		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index e51414b..6c5cc9f 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -1121,6 +1121,9 @@ const transformOption = (val: string | number, type?: string) => {
 							<template #default="scope">
 								{{writeListTitle(scope.row,viewPage.list)}}
 							</template>
+						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass==''" :prop="item.field" :label="item.label" min-width="320">
+							
 						</el-table-column>
 						<el-table-column v-else  :prop="item.field" :label="item.label" config=""  min-width="220">
 							<template v-if="item.help" #header="scope">
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 22689cc..9b82202 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -260,7 +260,7 @@ const gainTableForm = () => {
 			.then((res:any) => {
 				if(res.code == 0){
 					const result = res.data
-					// console.log("初始设计搜索时--1--->",result)
+					console.log("初始设计搜索时--1--->",result)
 					formFieldAry.value = result.formField
 					// 初始设计搜索时res.data=''
 					if (result.mastesform) {
@@ -274,6 +274,7 @@ const gainTableForm = () => {
 						// console.log("初始设计搜索时--->",kjdkjksd)
 					}
 					state.value.formData.config.groupKey = result.groupKey
+					state.value.formData.config.classify = result.classify
 					// console.log("初始设计搜索时--end->",state.value.formData)
 					state.value.formDict = string2json(result.dict)
 					// 恢复表单名称
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index 7c3cf11..9814f53 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -426,7 +426,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 
 </script>
 <template>
-	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >--->{{drawbox}}
+	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
 		<div v-if="isFlowTable" class="common-layout">
 			<el-container>
 				<el-main v-loading="formLoading" element-loading-text="Loading...">
diff --git a/src/widget/digitpage/index.vue b/src/widget/digitpage/index.vue
index 0512909..c98616a 100644
--- a/src/widget/digitpage/index.vue
+++ b/src/widget/digitpage/index.vue
@@ -3,7 +3,7 @@
 @ 时间: 2023-12-09 09:13:24
 @ 备注: 数值控件
 -->
-<template>
+<template> 
 	<el-form-item
 		v-bind="data.item"
 		:prop="tProp || data.name"
@@ -63,14 +63,11 @@ const changeEvent = inject(constControlChange, '') as any
 
 const value = computed({
     get() {
-		if (props.tProp) {
-			// 表格和弹性布局
-			let zhiVal = props.modelValue
-			if(zhiVal != null && zhiVal != "") {
-				zhiVal=zhiVal*1
-			}
+		let zhiVal = props.modelValue
+		if(zhiVal != null && zhiVal != "") {
+			zhiVal=zhiVal*1
 			return zhiVal
-		} else {
+		}else{
 			let zhiVal = formProps.value.model[props.data.name]
 			if(zhiVal != null && zhiVal != "") {
 				zhiVal=zhiVal*1