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)"
>
-
+
@@ -566,30 +566,30 @@ function optionsValue3Get1(data: any,fieldName: string){
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
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
+}
@@ -788,7 +843,8 @@ const judgeCheckbox = (val:any,list:any) => {
{{ getLabel(data.item) }}
{{editDisabled}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{
: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)"
/>
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 @@
+
+
+
+
+
+
+
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) }}
-
+
+
+
{
node-key="id"
clearable
check-strictly
+ :disabled="type == 4"
style="width: 240px"
/>
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"
/>