Merge branch 'qin_v4'

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

@@ -73,11 +73,13 @@ const delColumn = (index: number) => {
 				:width="item.item.span"
 			>
 				<template #default="scope">
+				{{scope.row}}
 					<span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
 					<div v-if="type === 4 || editDisabled">
 						{{ getText(scope.row[item.name]) }}
 					</div>
 					<div v-else>
+				
 						<form-item
 						v-model="scope.row[item.name]"
 						:tProp="`${data.name}.${scope.$index}.${item.name}`"

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

@@ -565,15 +565,15 @@ function optionsValue3Get1(data: any,fieldName: string){
 						</el-button>
 					</div>
 				</template>
-				<!--创建人-->
+				<!-- 创建人
 				<FounderForm v-else-if="element.type === 'founder' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
-				<!--创建时间-->
+				创建时间
 				<FounderTime  v-else-if="element.type === 'founderTime' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
-				<!--修改时间-->
+				修改时间
 				<EditTime v-else-if="element.type === 'editTime' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
-				<!--拥有者-->
+				拥有者
 				<OwnerPage v-else-if="element.type === 'owner' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun"  />
-				<!--所属部门-->
+				所属部门
 				<DeptOrgPage v-else-if="element.type === 'deptOrg' " :data="element"  :form-props="formProps" :tablekey="props.tableinfo" />
 				<DigitPage v-else-if="element.type === 'digitpage' && type != 4" :data="element" />
 				<AssociatedForms  v-else-if="element.type === 'associatedForms' && type != 4" :data="element" :form-props="formProps" :tablekey="props.tableinfo" />
@@ -589,10 +589,10 @@ function optionsValue3Get1(data: any,fieldName: string){
 				<BaiduMap v-else-if="element.type === 'baidumap' && type != 4" :data="element" />
 				<OrgCitys v-else-if="element.type === 'organization' " :data="element" />
 				<UrlLink v-else-if="element.type === 'urllink' && type != 4" :data="element" />
-				<SerialNumber  v-else-if="element.type === 'serialNumber' && type != 4" :data="element" :tablekey="props.tableinfo.name" :numrun="props.numrun" />
+				<SerialNumber  v-else-if="element.type === 'serialNumber' && type != 4" :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" /> -->
 				<!--其他组件-->
-				<FormItem v-else :data="element" @optionsValue3Get1="optionsValue3Get1" :purview="props.purview" :node-key="props.nodeKey"/>
-
+				<FormItem v-else :data="element" @optionsValue3Get1="optionsValue3Get1" :purview="props.purview" :node-key="props.nodeKey" :tablekey="props.tableinfo" :numrun="props.numrun" />
+				
 				
 				<!--组件设计外功能框架-->
 				<template v-if="type === 5">

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

@@ -48,6 +48,9 @@ const props = withDefaults(
 		tProp?: string // 子表时的form-item的prop值，用于子表校验用
 		nodeKey?:string
 		purview?:any[]
+		optionsValue3Get1?:any
+		tablekey?:any
+		numrun?:any
     }>(),
     {}
 )
@@ -536,7 +539,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
 @ 功能: 判断此组件是否可见
 */
 const judgeIsShow = (key:string) => {
-	// console.log("判断此组件是否可见---->",props.nodeKey,props.purview)
+	console.log("判断此组件是否可见---->",key)
 	if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") {
 		if(props.purview.length < 1){
 			return true;
@@ -839,10 +842,11 @@ 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" />
 	<el-form-item
 		v-bind="data.item"
-		v-if="judgeIsShow(data.name)"
+		v-if="judgeIsShow(data.name) && data.type != 'baidumap' && data.type != 'digitpage'"
 		:disabled="judgeIsDisabled(data.name)"
 		:prop="tProp || data.name"
 		:class="config.className"
@@ -1062,7 +1066,31 @@ const pickUserVal = (val:any) => {
 				v-model="value"
 			/>
 			
+			<!--创建人-->
+				<FounderForm v-else-if="data.type === 'founder' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+				<!--创建时间-->
+				<FounderTime  v-else-if="data.type === 'founderTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+				<!--修改时间-->
+				<EditTime v-else-if="data.type === 'editTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+				<!--拥有者-->
+				<OwnerPage v-else-if="data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
+				<!--所属部门-->
+				<DeptOrgPage v-else-if="data.type === 'deptOrg' " :data="data"  :form-props="formProps" :tablekey="props.tablekey" />
+				
+				<AssociatedForms  v-else-if="data.type === 'associatedForms' && type != 4" :data="data" :form-props="formProps" :tablekey="props.tablekey" />
+				<LowcodeImage  v-else-if="data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" >
+					
+				</LowcodeImage>
+				<LowcodeTransfer  v-else-if="data.type === 'lowcodeTransfer' && type != 4" :data="data" />
+				<VideoUpAndPlay  v-else-if="data.type === 'videoUpAndPlay' " :data="data" />
+				<LowcodeCarsusel  v-else-if="data.type === 'lowcodeCarsusel'" :data="data" />
+				<SignatureMap  v-else-if="data.type === 'signaturemap' && type != 4" :data="data" />
 
+				<OrgCentent v-else-if="data.type === 'orgCentent'" :data="data" />
+				
+				<OrgCitys v-else-if="data.type === 'organization' " :data="data" />
+				<UrlLink v-else-if="data.type === 'urllink' && type != 4" :data="data" />
+				<SerialNumber  v-else-if="data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
 			
 			<template v-if="data.type === 'tinymce'">
 				<!--  设计模式时拖动会出现异常，设计模式暂用图片代替-->

src/widget/baidumap/index.vue

@@ -11,7 +11,8 @@
 			:class="config.className"
 			:rules="itemRules"
 			:label="getLabel(data.item as FormItem)"
-		>	
+		>
+
 			<template v-if="config.help" #label >
 				{{ getLabel(data.item) }}
 				<Tooltips :content="config.help" />