From 71d982035cfe0620deff1434688c60fba6c69c9a Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 26 Jun 2024 16:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E9=A1=B9v0.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/requestapi.ts              | 11 +++++++
 src/components/DesignForm/app/index.vue       |  2 +-
 .../DesignForm/public/form/formItem.vue       | 13 ++------
 .../DesignForm/tableListPage/index.vue        |  3 +-
 .../sysworkflow/lowcodepage/appFormList.vue   |  1 +
 .../appPage/appPageForm/openAppFormPage.vue   | 30 ++++++++++++++++++-
 .../appPage/appPageForm/pageForm.vue          |  4 +--
 .../lowcodepage/pageFlow/appTableFlow.vue     |  1 -
 .../lowcodepage/runApp/runAppForm.vue         | 24 ++++++++++++++-
 9 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index 510901f56..8d6043d15 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -544,3 +544,14 @@ export function afreshAppSubmit(data: any) {
 		data: data
 	});
 }
+
+//动态获取关联的系统字段数据作为单选下拉多选的选项
+export function getFieldRecord(param1: any) {
+	return request({
+		url: '/javasys/lowCode/AssociatedForms/getFieldRecord',
+		method: 'post',
+		data: {
+			optionsValue3Field:param1
+		},
+	});
+}
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 5a10c97cf..db0f59c70 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -322,7 +322,7 @@ onMounted(()=>{
 */
 const judjeRadio = (val: any, options: any[]) => {
 	// console.log("判断单选值",val, options)
-	if(options.length > 0){
+	if(options && options.length > 0){
 		options.forEach((item)=>{
 			if(item.value == val){
 				console.log("判断单选值",val, item.value,item.label)
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 593f0902c..90e39b4ce 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -286,18 +286,11 @@ const getAxiosOptions = debounce((data?: any) => {
 				在这里请求后台获取字段
 			*/
 			getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => {
-				//console.log(data)
-				//console.log(props.data.name)
+				
 				let fieldName = props.data.name
-				//console.log(options.value)
-				//options.value = data
-				/*
-					
-					
-				*/
+				
 				emits('optionsValue3Get1',data,fieldName)
-				//console.log(options.value)
-				//console.log()
+				
 			})
 			
 			
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 9238dc605..be9061914 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -236,6 +236,7 @@ const selectionChange = (row: any) => {
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
+	
     if (!state.columnsCheck?.length) {
       	return props.data.columns
     } else {
@@ -311,7 +312,7 @@ onMounted(()=>{
 */
 const judjeRadio = (val: any, options: any[]) => {
 	// console.log("判断单选值",val, options)
-	if(options.length > 0){
+	if(options && options.length > 0){
 		options.forEach((item)=>{
 			if(item.value == val){
 				console.log("判断单选值",val, item.value,item.label)
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index b7a402796..2463eb6aa 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -173,6 +173,7 @@ const lookFormList = (val:any) => {
 	versionTitle.value = val.name
 
 	let stateData = string2json(val.listjson)
+			console.log(val.listjson)
 			console.log("查看表单列表---->",stateData)
 			state.tableData = stateData.tableData
 			state.searchData = stateData.searchData
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index 53c5e7995..7edbc91fe 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -5,7 +5,7 @@
 -->
 <script lang='ts' setup>
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { gainAppPageInfo } from '@/api/DesignForm/requestapi'
+import { gainAppPageInfo,getFieldRecord } from '@/api/DesignForm/requestapi'
 import {  Edit,Picture as IconPicture  } from '@element-plus/icons-vue'
 import { appPageDataInit,appWorkFlow } from "@/api/date/type"
 
@@ -134,6 +134,7 @@ const handleAppPageClick = () =>{
 
 }
 
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-20 16:15:54
@@ -164,6 +165,32 @@ const gainAppFormPageInit = () =>{
 			versionTitle.value = data.data.appForm.name
 			if(data.data.pageList){
 				let stateData = string2json(data.data.appForm.listjson)
+				
+				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){
+							console.log(stateData.tableData.columns[i])
+							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
+							/*
+								在这里请求后台获取字段
+							*/
+							getFieldRecord(paramx).then(({ data }) => {
+								stateData.tableData.columns[i].options = data
+								if(stateData.searchData.length>0){
+									for(let j = 0;j<stateData.searchData.length;j++){
+										console.log(stateData.searchData[j])
+										if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
+											stateData.searchData[j].options = data
+										}
+									}
+								}
+							})
+						}
+					}
+				}
+				
+				
+
 				stateList.tableData = stateData.tableData
 				stateList.searchData = stateData.searchData
 				stateList.loading = stateData.loading
@@ -199,6 +226,7 @@ const gainAppFormPageInit = () =>{
 }
 
 function optionsValue3Get3(data: any,fieldName: string){
+	
 	for(let i = 0; i < stateForm.formData.list.length; i++){
 		if(stateForm.formData.list[i].name==fieldName){
 			stateForm.formData.list[i].options = []
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 3398298b8..62e0d016b 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -527,9 +527,9 @@ const formNameChanged = (param1: any)=>{
 //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
 
 function optionsValue3Get3(data: any,fieldName: string){
-	console.log(state.value.formData.list)
+	/* console.log(state.value.formData.list)
 	console.log(data)
-	console.log(fieldName)
+	console.log(fieldName) */
 	for(let i = 0; i < state.value.formData.list.length; i++){
 		
 		if(state.value.formData.list[i].name==fieldName){
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
index f1fd2d54a..94d2f6d49 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@@ -487,7 +487,6 @@ const initLoadData = () => {
 }
 
 function optionsValue3Get3(data: any,fieldName: string){
-	
 	for(let i = 0; i < stateForm.formData.list.length; i++){
 		if(stateForm.formData.list[i].name==fieldName){
 			stateForm.formData.list[i].options = []
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index a40bc1a33..0409a94c8 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -5,7 +5,7 @@
 -->
 <script lang='ts' setup>
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { judgeSubmitCancel,gainAppPageInfo } from '@/api/DesignForm/requestapi'
+import { judgeSubmitCancel,gainAppPageInfo,getFieldRecord  } from '@/api/DesignForm/requestapi'
 import {  Edit,Picture as IconPicture  } from '@element-plus/icons-vue'
 import { appPageDataInit,appWorkFlow } from "@/api/date/type"
 import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
@@ -120,6 +120,28 @@ const initLoadData = () => {
 			versionTitle.value = data.data.appForm.name
 			if(data.data.pageList){
 				let stateData = string2json(data.data.appForm.listjson)
+				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){
+							console.log(stateData.tableData.columns[i])
+							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
+							/*
+								在这里请求后台获取字段
+							*/
+							getFieldRecord(paramx).then(({ data }) => {
+								stateData.tableData.columns[i].options = data
+								if(stateData.searchData.length>0){
+									for(let j = 0;j<stateData.searchData.length;j++){
+										console.log(stateData.searchData[j])
+										if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
+											stateData.searchData[j].options = data
+										}
+									}
+								}
+							})
+						}
+					}
+				}
 				stateList.tableData = stateData.tableData
 				stateList.searchData = stateData.searchData
 				stateList.loading = stateData.loading