From fd6fe93c35e17d79b8639af51d955b5c7cbc0022 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 6 Aug 2024 09:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=91=E6=9C=9F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/formGroup.vue      |  32 +++---
 .../DesignForm/public/form/formItem.vue       |  99 ++++++++++++++++-
 src/widget/baidumap/index.vue                 |   7 +-
 src/widget/baidumap/indexLook.vue             | 102 ++++++++++++++++++
 src/widget/index.ts                           |   2 +
 src/widget/org/index.vue                      |  13 ++-
 src/widget/systemunit/deptOrgPage.vue         |   1 +
 src/widget/systemunit/ownerPage.vue           |   1 +
 8 files changed, 235 insertions(+), 22 deletions(-)
 create mode 100644 src/widget/baidumap/indexLook.vue

diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 81a04bf..3d970a4 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -420,7 +420,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				v-if="linksIf(element)"
 			>
 		
-		
+			
 			
 				<!--选项卡组件-->
 				<template v-if="element.type === 'tabs'">
@@ -566,30 +566,30 @@ function optionsValue3Get1(data: any,fieldName: string){
 					</div>
 				</template>
 				<!--创建人-->
-				<FounderForm v-else-if="element.type === 'founder'" :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
+				<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" />
+				<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" />
+				<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"  />
+				<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'" :data="element" />
-				<AssociatedForms  v-else-if="element.type === 'associatedForms'" :data="element" :form-props="formProps" :tablekey="props.tableinfo" />
-				<LowcodeImage  v-else-if="element.type === 'lowcodeImage'" :data="element" :tablekey="props.tableinfo" :form-table-set-up="props.alldata" >
+				<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" />
+				<LowcodeImage  v-else-if="element.type === 'lowcodeImage' " :data="element" :tablekey="props.tableinfo" :form-table-set-up="props.alldata" >
 					
 				</LowcodeImage>
-				<LowcodeTransfer  v-else-if="element.type === 'lowcodeTransfer'" :data="element" />
-				<VideoUpAndPlay  v-else-if="element.type === 'videoUpAndPlay'" :data="element" />
+				<LowcodeTransfer  v-else-if="element.type === 'lowcodeTransfer' && type != 4" :data="element" />
+				<VideoUpAndPlay  v-else-if="element.type === 'videoUpAndPlay' " :data="element" />
 				<LowcodeCarsusel  v-else-if="element.type === 'lowcodeCarsusel'" :data="element" />
-				<SignatureMap  v-else-if="element.type === 'signaturemap'" :data="element" />
+				<SignatureMap  v-else-if="element.type === 'signaturemap' && type != 4" :data="element" />
 
 				<OrgCentent v-else-if="element.type === 'orgCentent'" :data="element" />
-				<BaiduMap v-else-if="element.type === 'baidumap'" :data="element" />
-				<OrgCitys v-else-if="element.type === 'organization'" :data="element" />
-				<UrlLink v-else-if="element.type === 'urllink'" :data="element" />
-				<SerialNumber  v-else-if="element.type === 'serialNumber'" :data="element" :tablekey="props.tableinfo.name" :numrun="props.numrun" />
+				<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" />
 				<!--其他组件-->
 				<FormItem v-else :data="element" @optionsValue3Get1="optionsValue3Get1" :purview="props.purview" :node-key="props.nodeKey"/>
 
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 0cf072a..45b5848 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -33,6 +33,8 @@ import formatResult from '@/utils/DesignForm/formatResult'
 import { debounce } from '@/utils/DesignForm/index'
 import { useRoute } from 'vue-router'
 
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+
 import TextImg from "@/assets/image/tinymce.png"
 
 import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
@@ -767,6 +769,59 @@ const judgeCheckbox = (val:any,list:any) => {
 	}
 	return valAry
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-05 10:00:31
+@ 功能: 下拉菜单处理
+*/
+const selectValue = (val:any,list:any) => {
+	// console.log("下拉菜单处理",val,list)
+	let valAry = []
+	if(val && val != "" && val != null ){
+		let pickSelect = JSON.parse(val)
+		// console.log("下拉菜单处理-----3------->",pickSelect)
+	
+
+		if(Array.isArray(pickSelect)){
+			if(pickSelect.length > 0){
+				
+				if(Array.isArray(list)){
+					pickSelect.forEach((item) => {
+						
+						list.forEach((ltem) => {
+							if(item*1 == ltem.value*1){
+								valAry.push(ltem.label)
+							}
+						})
+					})
+				}
+			}
+		}else{
+			if(Array.isArray(list)){
+				list.forEach((ltem) => {
+					if(val == ltem.value){
+						valAry.push(ltem.label)
+					}
+				})
+			}
+		}
+	}else{
+		// console.log("下拉菜单处理-4->",val)
+	}
+	
+	// console.log("下拉菜单处理-2->",valAry)
+	return valAry
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-06 08:34:05
+@ 功能: 选择用户
+*/
+const pickUserVal = (val:any) => {
+	let valAry = string2json(val)
+	// console.log("选择用户-2->",valAry)
+	return valAry
+}
 </script>
 <template>
 	
@@ -788,7 +843,8 @@ const judgeCheckbox = (val:any,list:any) => {
 			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
 			{{editDisabled}}
 		</template>
-		<div class="form-value" v-if="type === 4">
+		<template class="form-value" v-if="type === 4">
+	
 			<div class="form-value" v-if="data.type === 'datePicker'" v-html="timeToString(value,data.control.type)">
 
 			</div>
@@ -800,10 +856,47 @@ const judgeCheckbox = (val:any,list:any) => {
 			</div>
 			<div class="form-value" v-else-if="data.type == 'checkbox'" v-html="judgeCheckbox(value,data.options)">
 				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'colorPicker'" >
+				<div :style="'width:20px; height:20px; background-color:'+value+';'"></div>
+			</div>
+			<div class="form-value" v-else-if="data.type == 'slider'" style="width:200px;" >
+				<el-slider v-model="value" disabled />
+			</div>
+			<div class="form-value" v-else-if="data.type == 'rate'" >
+				<el-rate  v-model="value" disabled  />
+			</div>
+			<div class="form-value" v-else-if="data.type == 'switch'" >
+				<el-switch
+					v-model="value"
+					:active-value="data.control.activeValue"
+					:inactive-value="data.control.inactiveValue"
+					disabled 
+				/>
+			</div>
+			<div class="form-value" v-else-if="data.type == 'select'" v-html="selectValue(value,data.options)">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'upload'" v-html="value">
+				
+			</div>
+			<div class="form-value" v-else-if="data.type == 'tinymce'"  v-html="value">
+			
+			</div>
+			<template class="form-value" v-else-if="data.type == 'signaturemap'" >
+				<el-image style="width: 100%; height: 100%" :src="value"  />
+			</template>
+			<div class="form-value" v-else-if="data.type == 'lowcodeTransfer'"  v-html="value">
+			</div>
+			<div class="form-value" v-else-if="data.type == 'baidumap'" style="width: 100%;" >
+				<BaiduMapLook :address="value" />
+			</div>
+			<div class="form-value" v-else-if="data.type == 'expand-user'" v-html="pickUserVal(value)">
+				
 			</div>
 			<div class="form-value" v-else  v-html="value">
 			</div>
-		</div>
+		</template>
 		<template v-else>
 			<el-input
 				v-bind="control"
@@ -849,7 +942,7 @@ const judgeCheckbox = (val:any,list:any) => {
 				:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
 				:style="getFormItemInputStyle(configStyle,2)"
         		:input-style="getFormItemInputStyle(configStyle,3)"
-				v-if="data.type === 'textarea'"
+				v-if="['textarea', 'description'].includes(data.type)"
 			/>
 			<el-radio-group
 				v-bind="control"
diff --git a/src/widget/baidumap/index.vue b/src/widget/baidumap/index.vue
index 8ed1b1a..e074237 100644
--- a/src/widget/baidumap/index.vue
+++ b/src/widget/baidumap/index.vue
@@ -230,7 +230,10 @@ watch(()=>address.value,(val:string)=>{
 	}
 })
 onMounted(()=>{
-	// console.log("加载地址--1-->",value.value,props.data)
+	console.log("加载地址--1-->",value.value,formProps,props.data)
+	console.log("加载地址--2-->",formProps.value.model)
+	console.log("加载地址--3-->",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){
@@ -241,7 +244,7 @@ onMounted(()=>{
 		}
 		// console.log("加载地址--2-->",value.value,adresAry,address.value,lngLat.value)
 		if(lngLat.value != null && lngLat.value != ""){
-			let lnogLate = lnglat.value.split(",");
+			let lnogLate = lngLat.value.split(",");
 			if(lnogLate.length >= 2){
 				longitude.value = lnogLate[0]
 				latitude.value = lnogLate[lnogLate.length - 1]
diff --git a/src/widget/baidumap/indexLook.vue b/src/widget/baidumap/indexLook.vue
new file mode 100644
index 0000000..21d55e8
--- /dev/null
+++ b/src/widget/baidumap/indexLook.vue
@@ -0,0 +1,102 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-08-05 16:11:35
+@ 备注: 
+-->
+<template>
+	<div>
+		<el-input v-model="address" disabled />
+		<div :id="mapId" ref="myBaiduMapView" class="smallMapView"></div>
+	</div>
+</template>
+<script lang='ts' setup>
+const props = withDefaults(
+    defineProps<{
+		address: any
+    }>(),
+    {}
+)
+let mapId = "baiduMapView"+ Math.ceil(Math.random());
+const mapObject = ref<any>()
+const mapShow = ref(false)
+const address = ref<string>();				//行政组织树数据
+const lngLat = ref<string>();				//行政组织树数据
+const longitude= ref<number>(117.14272945140574)
+const latitude= ref<number>(35.91808471435389)
+const loadJScript = () => {
+	const script = document.createElement('script');
+	script.type = 'text/javascript';
+	script.src = 'https://api.map.baidu.com/getscript?v=3.0&ak=ljiKlTAsS7SNVqDM16IUwRVFFhrvbxiF';
+	script.onload = () => {
+		mapInit(mapObject)
+	}
+	document.body.appendChild(script);
+}
+// 初始化地图
+const mapInit = (maps:any) => {
+	const map = new window.BMap.Map(mapId); // 创建Map实例
+	var opts = {type: BMAP_NAVIGATION_CONTROL_LARGE}    
+	map.addControl(new BMap.NavigationControl(opts));	//添加控件
+	map.addControl(new BMap.ScaleControl());
+	map.addControl(new BMap.MapTypeControl());
+	map.enableScrollWheelZoom(); // 启用滚轮放大缩小
+	const point = new BMap.Point(longitude.value,latitude.value); // 创建点坐标
+ 	map.centerAndZoom(point, 16);
+  	var marker = new BMap.Marker(point);
+  	map.addOverlay(marker);
+}
+//监听地图地址变话
+watch(()=>props.address,(val:any)=>{
+	console.log("监听地图地址变话",val);
+	if(val != null && val !=  "") {
+		let adresAry = val.split('|*@*|')
+		if(adresAry.length >0){
+			address.value = adresAry[0]
+			if(adresAry.length >=1){
+				lngLat.value = adresAry[adresAry.length-1]
+			} 
+		}
+		// console.log("加载地址--2-->",value.value,adresAry,address.value,lngLat.value)
+		if(lngLat.value != null && lngLat.value != ""){
+			let lnogLate = lngLat.value.split(",");
+			if(lnogLate.length >= 2){
+				longitude.value = lnogLate[0]
+				latitude.value = lnogLate[lnogLate.length - 1]
+			}
+		}
+		// console.log("加载地址--31-->",val,adresAry,address.value,lngLat.value,longitude.value,latitude.value)
+		mapInit(mapObject)
+	}
+},{deep:true})
+onMounted(()=>{
+	if(props.address != null && props.address !=  "") {
+		let adresAry = props.address.split('|*@*|')
+		if(adresAry.length >0){
+			address.value = adresAry[0]
+			if(adresAry.length >=1){
+				lngLat.value = adresAry[adresAry.length-1]
+			} 
+		}
+		// console.log("加载地址--2-->",value.value,adresAry,address.value,lngLat.value)
+		if(lngLat.value != null && lngLat.value != ""){
+			let lnogLate = lngLat.value.split(",");
+			if(lnogLate.length >= 2){
+				longitude.value = lnogLate[0]
+				latitude.value = lnogLate[lnogLate.length - 1]
+			}
+		}
+		// console.log("加载地址--31-->",val,adresAry,address.value,lngLat.value,longitude.value,latitude.value)
+		mapInit(mapObject)
+	}
+	nextTick(()=>{
+		loadJScript()
+	})
+})
+</script>
+
+<style  lang='scss' scoped>
+.smallMapView{
+	width:100%;
+	height:400px;
+}
+</style>
diff --git a/src/widget/index.ts b/src/widget/index.ts
index 5c11544..50ddbe2 100644
--- a/src/widget/index.ts
+++ b/src/widget/index.ts
@@ -5,6 +5,7 @@ import serialNumber from './number/index.vue'
 import urlLink from './urllink/index.vue'
 import orgCitys from './orgcitys/index.vue'
 import baiduMap from './baidumap/index.vue'
+import baiduMapLook from './baidumap/indexLook.vue'
 import orgCentent from './org/index.vue'
 
 import digitPage from './digitpage/index.vue'
@@ -31,6 +32,7 @@ export default (app: any)	=> {
 	app.component('UrlLink', urlLink)
 	app.component('OrgCitys', orgCitys)
 	app.component('BaiduMap', baiduMap)
+	app.component('BaiduMapLook', baiduMapLook)
 	app.component('OrgCentent', orgCentent)
 
 	app.component('DigitPage', digitPage)
diff --git a/src/widget/org/index.vue b/src/widget/org/index.vue
index dfba62f..7e4835e 100644
--- a/src/widget/org/index.vue
+++ b/src/widget/org/index.vue
@@ -186,7 +186,18 @@ onMounted(() => {
 			{{ getLabel(data.item) }}
 			<Tooltips :content="config.help" />
 		</template>
-		<div  v-if="type === 4"  class="form-value" v-html="value"></div>
+		<template  v-if="type === 4"  >
+			<el-tree-select
+				v-model="value"
+				v-loading="orgTreeLoading" 
+				node-key="id"
+				:props="orgTreeProps" 
+				:data="orgTreeList"
+				check-strictly
+				disabled
+				:render-after-expand="false"
+			/>
+		</template>
 		<template v-else>
 			<el-tree-select
 				v-model="value"
diff --git a/src/widget/systemunit/deptOrgPage.vue b/src/widget/systemunit/deptOrgPage.vue
index 7f1f1c9..a578772 100644
--- a/src/widget/systemunit/deptOrgPage.vue
+++ b/src/widget/systemunit/deptOrgPage.vue
@@ -227,6 +227,7 @@ onMounted(()=>{
 				node-key="id"
 				clearable
 				check-strictly
+				:disabled="type == 4"
 				style="width: 240px"
 			/>
 		</div>
diff --git a/src/widget/systemunit/ownerPage.vue b/src/widget/systemunit/ownerPage.vue
index 0e0474b..ca60a1e 100644
--- a/src/widget/systemunit/ownerPage.vue
+++ b/src/widget/systemunit/ownerPage.vue
@@ -228,6 +228,7 @@ const orgTreeProps ={
 				:filterable="true"
 				node-key="id"
 				clearable
+				:disabled="type == 4"
 				style="width: 240px"
 			/>
 		</div>