From 64dcf37824ff354eb73e9890c45af3da8368c68f Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 25 Feb 2026 15:42:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=202.?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formTable/formItemGroup.vue    |   4 +-
 .../lowCode/assistant/associatedForms.vue     |  12 +-
 src/components/lowCode/newFormItem.vue        |   2 +-
 src/components/lowCode/tablePage.vue          | 122 ++++++++++++++++--
 src/views/formTable/pageInfo.vue              |   8 +-
 5 files changed, 127 insertions(+), 21 deletions(-)

diff --git a/src/components/formTable/formItemGroup.vue b/src/components/formTable/formItemGroup.vue
index 146ff1e..9d49ab3 100644
--- a/src/components/formTable/formItemGroup.vue
+++ b/src/components/formTable/formItemGroup.vue
@@ -245,7 +245,7 @@ function asfValueChanged(val: any) {
 		let masterFillRoleFieldsArray = fillFieldsMaster.split(";");
 		//console.log(masterFillRoleFieldsArray)
 		masterFillRoleFieldsArray.forEach((item: any) => {
-		let itemArray = item.split("_");
+		let itemArray = item.split(/(?<!table)_/);
 		itemArray.splice(0, 1);
 
 		itemArray = itemArray.map((item1: any) => item1.split(":").pop());
@@ -274,7 +274,7 @@ function asfValueChanged(val: any) {
 		getAsfTableFill(val.asfFormId, val.glbbddbd, val.currentVal, fillFieldsChild).then(
 		({ data }) => {
 			//console.log(data)
-			if (data && data.length > 0) {
+			if (data && data.length > 0 && data!="成功,没有相关数据") {
 			data.forEach((dataElement: any) => {
 				tables.forEach((tableItem: any) => {
 				if (dataElement.tableName == tableItem.name) {
diff --git a/src/components/lowCode/assistant/associatedForms.vue b/src/components/lowCode/assistant/associatedForms.vue
index c451c16..c4c3ec8 100644
--- a/src/components/lowCode/assistant/associatedForms.vue
+++ b/src/components/lowCode/assistant/associatedForms.vue
@@ -18,7 +18,7 @@
 <script lang='ts' setup>
 import request from '@/utils/axios/index'
 import { AnalysisCss,AnalysisInputCss } from '@/api/common/cssInfo'
-import { inject } from 'vue'
+import { inject, watch } from 'vue'
 import { FormList,FormItem } from "@/api/lowCode/form/type"
 import { 
     formatNumber, 
@@ -140,6 +140,11 @@ function asfValueChanged() {
     //emits("valueChanged", val)
 }
 
+watch(() => value1,(newVal:any) => {
+  asfValueChanged()
+  
+},{deep: true})
+
 function asfValueChangedTable() {
 
     let val = {
@@ -155,6 +160,11 @@ function asfValueChangedTable() {
     //emits("valueChangedTable", val)
 }
 
+watch(() => value2,(newVal:any) => {
+  asfValueChangedTable()
+  
+},{deep: true})
+
 function getAsfDataTitles() {
     let dataTitle = ''
     //console.log(props)
diff --git a/src/components/lowCode/newFormItem.vue b/src/components/lowCode/newFormItem.vue
index 70f4f80..6c26ad2 100644
--- a/src/components/lowCode/newFormItem.vue
+++ b/src/components/lowCode/newFormItem.vue
@@ -536,7 +536,7 @@ const judgeIsEdit = (key: string) => {
         />
         <!--视频-->
         <component
-            v-if="['videoUpAndPlay'].includes(data.type) && judgeIsShow(data.name)"
+            v-else-if="['videoUpAndPlay'].includes(data.type) && judgeIsShow(data.name)"
             :types="type"
             :is="currentComponent"
             :data="data"
diff --git a/src/components/lowCode/tablePage.vue b/src/components/lowCode/tablePage.vue
index 28eaadf..b73250b 100644
--- a/src/components/lowCode/tablePage.vue
+++ b/src/components/lowCode/tablePage.vue
@@ -32,8 +32,8 @@ const tableDataNew = computed(() => {
 	// console.log("如果编辑页禁用时-----2---->",formProps.value.model[props.data.name])
 	// console.log("如果编辑页禁用时-----3---->",formProps.value.model)
 	// console.log("如果编辑页禁用时-----4---->",formProps.value)
-	console.log(formProps.value.model)
-	console.log(props.data.name)
+	/* console.log(formProps.value.model)
+	console.log(props.data.name) */
     return formProps.value.model[props.data.name]
 })
 const type = computed(() => {
@@ -43,6 +43,26 @@ const type = computed(() => {
 const editDisabled = computed(() => {
     return formProps.value.type === 2 && props.data.config?.editDisabled
 })
+
+
+const preFillFlag = computed(() => {
+	if(props.data.control.preFill){
+		if(props.data.control.preFill.asf==""){
+		return 0
+		}else{
+		if(props.data.control.preFill.ids.length>0){
+			return 1
+		}else{
+			return 0
+		}
+		}
+	}else{
+		return 1
+	}
+
+	
+})
+
 const defaultOneFlag = ref(true)
 if(type.value==1 && props.data.control.defaultOne==2){
 	defaultOneFlag.value = false
@@ -104,9 +124,79 @@ function lookOrgAndManTreeFinish(){
 		},200)
 	}
 }
+
+/**
+ * 提取字符串中最后一个英文冒号后的内容，无冒号则返回原字符串
+ * @param {string} str - 输入的字符串
+ * @returns {string} 最后一个冒号后的内容或原字符串
+ */
+function getAfterLastColon(str:string) {
+    //console.log(str)
+    // 首先验证入参类型，确保是字符串（避免非字符串类型导致方法出错）
+    if (typeof str !== 'string') {
+        //console.warn('入参必须是字符串类型，当前已自动转为字符串');
+        str = String(str); // 非字符串类型自动转为字符串
+    }
+
+    // 查找最后一个英文冒号的索引位置
+    const lastColonIndex = str.lastIndexOf(':');
+
+    // 若未找到冒号（索引为 -1），或冒号在字符串最后一位（后面无内容），返回原字符串
+    if (lastColonIndex === -1 || lastColonIndex === str.length - 1) {
+        return str;
+    }
+
+    // 截取最后一个冒号后面的字符（索引+1 开始到字符串结尾）
+    return str.slice(lastColonIndex + 1);
+}
+
+
 onMounted(()=>{
 	lookOrgAndManTreeFinish()
-	autoAddColumnOne()
+
+	if(props.type==1){
+		if(preFillFlag.value==1){
+			setTimeout(() => {
+				if(preFillFlag.value==1&&props.data.control.preFill&&props.data.control.preFill.ids){
+					let i = 0;
+					props.data.control.preFill?.ids.forEach((element:any) => {
+						addColumn()
+						//console.log(element)
+						if(i==0){
+							setTimeout(()=>{
+								let asfName = getAfterLastColon(props.data.control.preFill.asf)
+								//console.log(asfName)
+								tableDataNew.value[i]
+								tableDataNew.value[i][asfName] = element
+								i++
+							},10)
+						}else{
+							setTimeout(()=>{
+								let asfName = getAfterLastColon(props.data.control.preFill.asf)
+								//console.log(asfName)
+								tableDataNew.value[i]
+								tableDataNew.value[i][asfName] = element
+								i++
+							},200)
+						}
+						
+						
+						
+						
+					});
+					
+				}
+			}, 700);
+			
+
+
+		}else{
+			autoAddColumnOne()
+		}
+	}
+
+	
+	
 	
 })
 
@@ -144,6 +234,12 @@ function autoAddColumnOne(){
 }
 
 
+
+/* 
+
+*/
+
+
 function waitProvideFormPropsModelDo(){
 	setTimeout(()=>{
 		if(tableDataNew){
@@ -153,7 +249,7 @@ function waitProvideFormPropsModelDo(){
 		}else{
 			waitProvideFormPropsModelDo
 		}
-	},200)
+	},400)
 	
 }
 
@@ -162,14 +258,14 @@ const addColumn = () => {
 	console.log("如果编辑页禁用时--------->",tableDataNew.value) */
     const temp: any = {}
     if (props.data.list) {
-		console.log(props.data.list)
+		//console.log(props.data.list)
 		props.data.list.forEach((item: any) => {
 			if (item.name) {
 				temp[item.name] = item.control.modelValue
 			}
 		})
 		//console.log(temp)
-		
+		//console.log(tableDataNew.value)
 		tableDataNew.value.push(jsonParseStringify(temp))
 		//console.log(tableDataNew.value)
 		addBtnFlag.value = false
@@ -177,11 +273,11 @@ const addColumn = () => {
 }
 
 const addColumn2 = () => {
-	/* console.error("addColumn")
-	console.log("如果编辑页禁用时--------->", tableDataNew.value) */
+	//console.error("addColumn2")
+	//console.log("如果编辑页禁用时--------->", tableDataNew.value)
     const temp: any = {}
     if (props.data.list) {
-		//console.log(props.data.list)
+		//console.error(props.data.list)
 		props.data.list.forEach((item: any) => {
 			if (item.name) {
 				temp[item.name] = item.control.modelValue
@@ -192,13 +288,13 @@ const addColumn2 = () => {
 		if (tableDataNew.value.length === 0) {
 		    // 仅当数组为空时，才添加新元素
 		    tableDataNew.value.push(jsonParseStringify(temp));
-		    //console.log("数组为空，已添加最新元素：", tableDataNew.value);
+		    //console.error("数组为空，已添加最新元素：", tableDataNew.value);
 		} else {
 		    // 数组已有元素，不执行添加操作，可添加日志提示
-		    //console.log("数组中已存在元素，不重复添加");
+		    //console.error("数组中已存在元素，不重复添加");
 		}
 		
-		console.log(tableDataNew.value)
+		//console.log(tableDataNew.value)
 		addBtnFlag.value = false
     }
 }
@@ -410,7 +506,7 @@ const emits = defineEmits<{
 
 
 function asfValueChanged(val:any){
-	console.log("tablePage-asfValueChanged",val)
+	//console.log("tablePage-asfValueChanged",val)
 	emits("asfValueChanged",val)
 }
 </script>
diff --git a/src/views/formTable/pageInfo.vue b/src/views/formTable/pageInfo.vue
index da5856b..d991723 100644
--- a/src/views/formTable/pageInfo.vue
+++ b/src/views/formTable/pageInfo.vue
@@ -252,10 +252,10 @@ const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
             item.type = 3;
             if (type == "checkbox") {
             item.isCheckbox = true;
-            item.answers = val.map(String);
+            item.answers = val?val.map(String):[];
             } else {
             item.isCheckbox = false;
-            item.oneanswer = val.toString();
+            item.oneanswer = val?val.toString():"";
             }
             if (notAsA_BasisForJudgment.indexOf(type) === -1) {
             isUpdateFlowChart = true;
@@ -268,14 +268,14 @@ const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
             factorid: key,
             type: 3,
             isCheckbox: true,
-            answers: val.map(String),
+            answers: val?val.map(String):[],
             });
         } else {
             flowFactor.push({
             factorid: key,
             type: 3,
             isCheckbox: false,
-            oneanswer: val.toString(),
+            oneanswer: val?val.toString():"",
             });
         }
         isUpdateFlowChart = true;