Merge branch 'lwx_v12' of http://172.20.2.87:3000/herenshan112/hxgksystemapp into lwx_v12

# Conflicts:
#	src/types/components.d.ts

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
+		},
+	});
+}

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)

src/components/DesignForm/formControlAttr.vue

@@ -4002,7 +4002,7 @@ const disabledIstrue = (val:string) => {
 
             
             
-            <template v-if="controlData.type=='radio'||controlData.type=='select'">
+            <template v-if="(controlData.type=='radio'||controlData.type=='select')&&controlData.config.optionsType==0">
                 
                 <el-table  
                 :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 

src/components/DesignForm/formControlPropertiNew.vue

@@ -4032,7 +4032,7 @@ const disabledIstrue = (val:string) => {
 
             
             
-            <template v-if="controlData.type=='radio'||controlData.type=='select'">
+            <template v-if="(controlData.type=='radio'||controlData.type=='select')&&controlData.config.optionsType==0">
                 
                 <el-table  
                 :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 

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()
+				
 			})
 			
 			

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)

src/views/sysworkflow/lowcodepage/appFormList.vue

@@ -5,7 +5,7 @@
 -->
 <script lang='ts' setup>
 import { customerFormCont } from "@/api/DesignForm/type";
-import { getCustomerFormList,editProductionFormStatus,appJwtPower } from '@/api/DesignForm/requestapi'
+import { getCustomerFormList,editProductionFormStatus,appJwtPower,getFieldRecord } from '@/api/DesignForm/requestapi'
 import {Delete,Edit,View,MoreFilled} from '@element-plus/icons-vue'
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
 import { useUserStore } from "@/store/modules/user";
@@ -173,7 +173,31 @@ const lookFormList = (val:any) => {
 	versionTitle.value = val.name
 
 	let stateData = string2json(val.listjson)
+			console.log(val.listjson)
 			console.log("查看表单列表---->",stateData)
+
+			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
+									}
+								}
+							}
+						})
+					}
+				}
+			}
 			state.tableData = stateData.tableData
 			state.searchData = stateData.searchData
 			state.loading = stateData.loading

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 = []

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){

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 = []

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