Merge branch 'qin_v2'

src/components/DesignForm/public/form/formGroup.vue

@@ -420,7 +420,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				v-if="linksIf(element)"
 			>
 		
-			
+			{{element.type}}
 			
 				<!--选项卡组件-->
 				<template v-if="element.type === 'tabs'">

src/components/DesignForm/public/form/formItem.vue

@@ -1048,7 +1048,8 @@ const pickUserVal = (val:any) => {
 					v-bind="control"
 					:config="config"
 					:disabled="judgeIsDisabled(data.name)"
-					v-model="value"
+				
+					v-model:model-value="value"
 					v-if="[1, 2, 3].includes(type as number)"
 				/>
 				<img

src/components/DesignForm/public/form/select.vue

@@ -10,6 +10,7 @@ import {
     constSetFormOptions,
     objectToArray
 } from '@/api/DesignForm/utils'
+import { string2json } from '@/utils/DesignForm/form'
 import { FormList } from '@/api/DesignForm/types'
 const props = withDefaults(
     defineProps<{
@@ -65,9 +66,38 @@ watch(
 )
 const value = computed({
     get() {
+		// console.log("判断多少选下拉--->",props.data,props.modelValue,typeof(formProps.value.model[props.data.name]))
 		if (props.type === 'slot') {
+			// console.log("判断多少选下拉-1->",typeof(formProps.value.model[props.data.name]))
+			// let jeguo = formProps.value.model[props.data.name]
+			// if(typeof(jeguo) === 'number'){
+			// 	return jeguo.toString()
+			// }else if(typeof(jeguo) === 'object'){
+			// 	let strVal = []
+			// 	jeguo.forEach((item) => {
+			// 		strVal.push(item.toString())
+			// 	})
+			// 	return strVal
+			// }
 			return formProps.value.model[props.data.name]
 		} else {
+			if(props.modelValue && props.modelValue != null && props.modelValue != "") {
+				let selVal = JSON.parse(props.modelValue)
+				if(Array.isArray(selVal)){
+					let selValStr = []
+					selVal.forEach(item => {
+						selValStr.push(item.toString())
+					})
+					return selValStr
+				}else{
+					return selVal.toString()
+				}
+				
+			}
+			
+			// if(typeof(selVal) === 'object'){
+			// 	return selVal.toString()
+			// }
 			return props.modelValue
 		}
     },
@@ -123,7 +153,7 @@ const remoteMethod = (name: string) => {
 			v-for="item in optionsList"
 			:key="item.value"
 			:label="item.label"
-			:value="transformOption(item.value, data.config?.transformData)"
+			:value="item.value"
 		/>
 	</el-select>
 </template>

src/widget/baidumap/index.vue

@@ -230,10 +230,10 @@ watch(()=>address.value,(val:string)=>{
 	}
 })
 onMounted(()=>{
-	console.log("加载地址--1-->",value.value,formProps,props.data)
+	// console.log("加载地址--1-->",value.value,formProps,props.data)
-	console.log("加载地址--2-->",formProps.value.model)
+	// console.log("加载地址--2-->",formProps.value.model)
-	console.log("加载地址--3-->",props.data.name)
+	// console.log("加载地址--3-->",props.data.name)
-	console.log("加载地址--4-->",formProps.value.model[props.data.name])
+	// console.log("加载地址--4-->",formProps.value.model[props.data.name])
 	if(value.value != null && value.value !=  "") {
 		let adresAry = value.value.split('|*@*|')
 		if(adresAry.length >0){

src/widget/carousel/index.vue

@@ -13,7 +13,6 @@
     >
         <input  v-model="value" type="hidden" >
     </el-form-item>
-
     <LowcodeCarousel :data="props.data"></LowcodeCarousel>
 </template>
 <script lang='ts' setup>
@@ -53,8 +52,16 @@ const value = computed({
 		if (props.tProp) {
 			// 表格和弹性布局
 			return props.modelValue
-		} else {
+		} else if(formProps.value.model[props.data.name]) {
 			return formProps.value.model[props.data.name]
+		}else{
+			let imgAry = []
+			if(props.data && props.data.control && props.data.control.carsuselConfigArr && Array.isArray(props.data.control.carsuselConfigArr)){
+				props.data.control.carsuselConfigArr.forEach((item) => {
+					imgAry.push(item.imgUrl)
+				})
+			}
+			return imgAry
 		}
     },
     set(newVal: any) {
@@ -178,4 +185,4 @@ const formatCustomRules = () => {
         font-size: 30px;
     }
 }
-</style>
+</style>

src/widget/writingboard/index.vue

@@ -14,7 +14,7 @@
         <input  v-model="value" type="hidden" >
     </el-form-item>
 
-    <PaintBoard @updataconbt="qianming" />
+    <PaintBoard :img-src="value" @updataconbt="qianming" />
 </template>
 <script lang='ts' setup>
 import PaintBoard   from './paintBoard.vue';

src/widget/writingboard/paintBoard.vue

@@ -16,6 +16,14 @@
 import vueOnlineSignature from '@/widget/writingboard/vueSignature.vue';
 import { ref, reactive } from 'vue'
 
+const props = withDefaults(
+    defineProps<{
+		imgSrc?: string // 子表时的form-item的prop值，用于子表校验用
+    }>(),
+    {}
+)
+
+
 const pantareaisShow = ref<boolean>(true)
 
 const params = reactive<any>({
@@ -45,7 +53,7 @@ const params = reactive<any>({
 const emits = defineEmits(["updataconbt"]);
    
 let vueSignatureRef = ref<any>(null)
-const imagesSRC = ref<string>('')
+const imagesSRC = ref<string>(props.imgSrc)
 const confirm = () => {
    
    vueSignatureRef.value.confirm()
@@ -67,7 +75,15 @@ const reset = () => {
    }
    
 }
-
+watch(()=>props.imgSrc,(val:string)=>{
+	if(val != null && val != ""){
+		imagesSRC.value = props.imgSrc
+		pantareaisShow.value = false
+	}
+	
+},{
+	deep: true
+})
 
 
 </script>