From 2afff049f462c0c653bae09e7176dfff50abb8c0 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 11 Apr 2024 15:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 2421 ++++-------------
 .../DesignForm/public/form/formGroup.vue      |    6 +-
 src/types/components.d.ts                     |   25 +
 3 files changed, 530 insertions(+), 1922 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 952a5bcd1..90a17c59c 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -13,7 +13,7 @@
     import { PublicAtrr } from '@/api/DesignForm/types'
     
     import { chineseToPinyin,customerFormGroupList } from '@/api/DesignForm/requestapi'
-    
+    import request from '@/utils/request';
     
     //数学计算公式编辑器
     import MathFormula from '@/components/DesignForm/math/mathFormula.vue'
@@ -615,6 +615,14 @@
                     path: 'config.componentName',
                     vShow: ['component']
                 },
+				{
+					label: '隐藏条件',
+					value: config.associatedForms,
+					path: 'config.associatedForms',
+					type: 'associatedForms_hide',
+					vIf: state.isSearch,
+					vShow: ['associatedForms']
+				},
                 {
                     label: '轮播图设置',
                     value: config.carousel,
@@ -631,6 +639,78 @@
                     vIf: state.isSearch,
                     vShow: ['videoUpAndPlay']
                 },
+				{
+					label: '上传图片',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_url',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '尺寸',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_showMode',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '契合度',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_fit',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '圆角',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_radius',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '边框和阴影',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_boderAndShadow',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '图片链接',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_link',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '浮动',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_float',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '内外四边距',
+					value: config.lowcodeImage,
+					path: 'config.lowcodeImage',
+					type: 'lowcodeImage_marginAndPadding',
+					vIf: state.isSearch,
+					vShow: ['lowcodeImage']
+				},
+				{
+					label: '选项数据源',
+					value: config.transfer,
+					path: 'config.transfer',
+					type: 'transfer_options_datasource',
+					vIf: state.isSearch,
+					vShow: ['lowcodeTransfer']
+				},
                 /* {
                     label: '上传视频封面',
                     value: config.uploadvideo,
@@ -639,6 +719,14 @@
                     vIf: state.isSearch,
                     vShow: ['videoUpAndPlay']
                 }, */
+				{
+					label: '穿梭框名',
+					value: config.transfer,
+					path: 'config.transfer',
+					type: 'transfer_name',
+					vIf: state.isSearch,
+					vShow: ['lowcodeTransfer']
+				},
                 {
                     label: '视频宽度(像素)',
                     value: config.uploadvideo,
@@ -972,33 +1060,6 @@
             const newVal = obj.isNum ? formatNumber(val) : val // 类型为数字时转整数
             obj.path && getPropByPath(controlData.value, obj.path, newVal)
         }
-
-<<<<<<< HEAD
-=======
-import { uploadUrl } from '@/api/DesignForm'
-
-import request from '@/utils/request';
-
-import { UploadFile, UploadFiles } from 'element-plus/es/components/upload/src/upload';
-
-import type Node from 'element-plus/es/components/tree/src/model/node'
-
-const props = withDefaults(			//接收父级参数
-    defineProps<{
-      formData: any
-      formConfig: any
-      formOtherData: any
-	  customerformid: number | string,
-    }>(),
-    {
-      formConfig: () => {
-        return {}
-      },
-      formOtherData: () => {
-        // 其他不需要保存在formData里的数据
-        return {}
-      }
->>>>>>> liwenxuan_v4
     }
     /** 
     * 获取非负整数随机数 
@@ -1543,764 +1604,44 @@ const props = withDefaults(			//接收父级参数
         currentUploadImgid = clickedRow.imgId
     }
     
-    
-    
+    const showModeSelectOptions = [
+		{
+			value: '自定义像素值',
+			label: '自定义像素值',
+		},
+		{
+			value: '自定义占父容器比例',
+			label: '自定义占父容器比例',
+		},
+	]
+		
     const optionsCss = [
               { label: '无样式', value: '' },
               { label: '每行两列', value: 'form-row-2' },
               { label: '每行三列', value: 'form-row-3' },
               { label: '每行四列', value: 'form-row-4' }
     ]
-<<<<<<< HEAD
-=======
-})
-const attrList = computed(() => {
-    if (Object.keys(controlData.value).length) {
-		const {
-			control = {},
-			type,
-			name,
-			config = {},
-			item = {},
-			attr = {}
-		}: { control: any;type:any;name:any;item:any;attr:any; config: any } = controlData.value
-		let columnIndex = false // 是否显示序号列
-		if (type === 'table') {
-			// 表格时处理
-			const list = controlData.value && controlData.value.list
-			if (list && list.length > 0) {
-				columnIndex = list[0].type === 'index'
-			}
-		}
 		
-		const temp =reactive<PublicAtrr[]>([
-			{
-				label: '自定义Class',
-				value: config.className,
-				placeholder: '样式类名',
-				path: 'config.className'
-			},
-			{
-				label: '字段标识',
-				value: name,
-				type:
-					Object.keys(state.dataSourceList).length > 0 ? 'select' : 'text',
-				placeholder: '字段唯一标识，对应数据库',
-				dict: state.dataSourceList,
-				path: 'name',
-				vHide: [
-					'grid',
-					'tabs',
-					'card',
-					'title',
-					'gridChild',
-					'tableColumn',
-					'divider',
-					'txt',
-					'div',
-					'button'
-				],
-				eventName: 'filedNameKey'
-			},
-			{
-				label: '占位内容',
-				value: control.placeholder,
-				placeholder: 'placeholder',
-				path: 'control.placeholder',
-				vShow: [
-					'password',
-					'input',
-					'textarea',
-					'select',
-					'date',
-					'number',
-					'datePicker',
-					'tinymce',
-					'timePicker',
-					'treeSelect'
-				]
-			},
-			{
-				label: '按钮类型',
-				value: control.type,
-				path: 'control.type',
-				type: 'select',
-				dict: {
-					primary: 'primary',
-					success: 'success',
-					info: 'info',
-					warning: 'warning',
-					danger: 'danger'
-				},
-				vShow: ['button'],
-				clearable: true
-			},
-			{
-				label: '按钮名称',
-				value: control.label,
-				path: 'control.label',
-				vShow: ['button']
-			},
-			{
-				label: '按钮事件',
-				value: control.key,
-				path: 'control.key',
-				type: 'select',
-				dict: {
-					submit: '提交表单',
-					reset: '重置表单',
-					cancel: '取消返回',
-					none: '无动作(自定义)'
-				},
-				vShow: ['button']
-			},
-			{
-				label: '对齐方式',
-				value: config.textAlign,
-				path: 'config.textAlign',
-				type: 'select',
-				dict: {
-					left: 'left',
-					right: 'right',
-					center: 'center'
-				},
-				vShow: ['button', 'div']
-			},
-			{
-				label: 'label值',
-				value: item.label,
-				path: 'item.label',
-				vHide: [
-					'table',
-					'grid',
-					'tabs',
-					'title',
-					'gridChild',
-					'div',
-					'inputSlot',
-					'flex',
-					'button',
-					'txt'
-				],
-				eventName: 'labelNameVal'
-			},
-			{
-				label: '隐藏label',
-				value: item.showLabel,
-				path: 'item.showLabel',
-				type: 'switch',
-				vHide: [
-					'table',
-					'grid',
-					'tabs',
-					'title',
-					'gridChild',
-					'divider',
-					'card',
-					'div',
-					'inputSlot',
-					'flex',
-					'button',
-					'txt'
-				]
-			},
-			{
-				label: '帮助信息',
-				value: config.help,
-				path: 'config.help',
-				vHide: [
-					'table',
-					'grid',
-					'tabs',
-					'gridChild',
-					'divider',
-					'div',
-					'inputSlot',
-					'flex',
-					'button',
-					'txt'
-				]
-			},
-			{
-				label: '表单栅格',
-				value: config.span,
-				placeholder: '表单区域栅格宽，0为自动宽',
-				path: 'config.span',
-				vHide: ['gridChild'],
-				isNum: true
-			},
-			/*{
-			label: '行类样式',
-			value: config.inline,
-			type: 'switch',
-			path: 'config.inline',
-			vShow: ['div']
-			},*/
-			{
-				label: '文本值',
-				value: control.modelValue,
-				placeholder: '支持html',
-				path: 'control.modelValue',
-				vShow: ['txt'],
-				inputStyle: 'textarea'
-			},
-			{
-				label: '设为密码',
-				value: type,
-				type: 'select',
-				dict: { input: '文本', password: '密码' },
-				path: 'type',
-				vShow: ['input', 'password'],
-				vIf: state.isSearch // 搜索模式下隐藏 为true
-			},
-			{
-				label: '文本域高度',
-				value: control.rows,
-				placeholder: '输入框行数',
-				path: 'control.rows',
-				vShow: ['textarea'],
-				isNum: true
-			},
-			{
-				label: '前缀',
-				value: config.prepend,
-				placeholder: '文本前缀',
-				path: 'config.prepend',
-				vShow: ['input', 'password']
-			},
-			{
-				label: '后缀',
-				value: config.append,
-				placeholder: '文本后缀',
-				path: 'config.append',
-				vShow: ['input', 'password']
-			},
-			{
-				label: '状态打开时的值',
-				value: control.activeValue,
-				placeholder: '状态打开时的值',
-				path: 'control.activeValue',
-				vShow: ['switch'],
-				isNum: true
-			},
-			{
-				label: '状态关闭时的值',
-				value: control.inactiveValue,
-				placeholder: '状态关闭时的值',
-				path: 'control.inactiveValue',
-				vShow: ['switch'],
-				isNum: true
-			},
-			// {
-			//   label: '转换格式化值',
-			//   value: config.transform,
-			//   path: 'config.transform',
-			//   type: 'switch',
-			//   vShow: [
-			//     'checkbox',
-			//     'select',
-			//     'switch',
-			//     'cascader',
-			//     'slider',
-			//     'table',
-			//     'flex',
-			//     'treeSelect'
-			//   ]
-			// },
-			{
-				label: '增加按钮文案',
-				value: config.addBtnText,
-				path: 'config.addBtnText',
-				type: 'text',
-				vShow: ['flex', 'table']
-			},
-			{
-				label: '删除按钮文案',
-				value: config.delBtnText,
-				path: 'config.delBtnText',
-				type: 'text',
-				vShow: ['flex', 'table']
-			},
-			{
-				label: '是否多选',
-				value: control.multiple,
-				path: 'control.multiple',
-				type: 'switch',
-				vShow: ['select', 'treeSelect'],
-				eventName: 'selectMultiple'
-			},
-			{
-				label: '可清空',
-				value: control.clearable,
-				path: 'control.clearable',
-				type: 'switch',
-				vShow: ['select']
-			},
-			{
-				label: '是否禁用',
-				value: control.disabled,
-				path: 'control.disabled',
-				type: 'switch',
-				vShow: [
-					'input',
-					'password',
-					'textarea',
-					'radio',
-					'checkbox',
-					'select',
-					'date',
-					'switch',
-					'number',
-					'cascader',
-					'upload',
-					'rate',
-					'tinymce',
-					'treeSelect'
-				],
-				vIf: state.isSearch
-			},
-			{
-				label: '是否禁用编辑',
-				value: config.editDisabled,
-				path: 'config.editDisabled',
-				type: 'switch',
-				vShow: [
-					'input',
-					'password',
-					'textarea',
-					'radio',
-					'checkbox',
-					'select',
-					'date',
-					'switch',
-					'number',
-					'cascader',
-					'upload',
-					'treeSelect',
-					'table',
-					'flex'
-				],
-				vIf: state.isSearch
-			},
-			{
-				label: '添加页隐藏',
-				value: config.disabledAdd,
-				path: 'config.disabledAdd',
-				type: 'switch',
-				vIf: state.isSearch,
-				vHide: ['inputSlot']
-			},
-			{
-				label: '编辑页隐藏',
-				value: config.disabledEdit,
-				path: 'config.disabledEdit',
-				type: 'switch',
-				vIf: state.isSearch,
-				vHide: ['inputSlot']
-			},
-			{
-				label: '详情页隐藏',
-				value: config.disabledDetail,
-				path: 'config.disabledDetail',
-				type: 'switch',
-				vIf: state.isSearch,
-				vHide: ['inputSlot']
-			},
-			{
-				label: '设为Input输入框的前/后缀',
-				value: type === 'inputSlot',
-				path: '',
-				type: 'switch',
-				vShow: ['select', 'inputSlot'],
-				eventName: 'setInputSlot'
-			},
-			{
-				label: '标题',
-				value: control.modelValue,
-				path: 'control.modelValue',
-				vShow: ['title']
-			},
-			{
-				label: '占据的列数span',
-				value: attr.span,
-				path: 'attr.span',
-				vShow: ['gridChild'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: '左侧的间隔格数offset',
-				value: attr.offset,
-				path: 'attr.offset',
-				vShow: ['gridChild'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: '向右移动格数push',
-				value: attr.push,
-				path: 'attr.push',
-				vShow: ['gridChild'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: '向左移动格数pull',
-				value: attr.pull,
-				path: 'attr.pull',
-				vShow: ['gridChild'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: '序号列',
-				value: columnIndex,
-				type: 'switch',
-				vShow: ['table'],
-				eventName: 'tableColumn1'
-			},
-			/*{
-				label: '操作列',
-				value: columnOperate,
-				type: 'switch',
-				vShow: ['table'],
-				eventName: 'tableColumn2'
-			},*/
-			{
-				label: '组件名',
-				value: config.componentName,
-				placeholder: '全局注册的组件名称',
-				path: 'config.componentName',
-				vShow: ['component']
-			},
-			{
-				label: '隐藏条件',
-				value: config.associatedForms,
-				path: 'config.associatedForms',
-				type: 'associatedForms_hide',
-				vIf: state.isSearch,
-				vShow: ['associatedForms']
-			},
-			{
-				label: '上传图片',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_url',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '尺寸',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_showMode',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '契合度',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_fit',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '圆角',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_radius',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '边框和阴影',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_boderAndShadow',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '图片链接',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_link',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '浮动',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_float',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '内外四边距',
-				value: config.lowcodeImage,
-				path: 'config.lowcodeImage',
-				type: 'lowcodeImage_marginAndPadding',
-				vIf: state.isSearch,
-				vShow: ['lowcodeImage']
-			},
-			{
-				label: '轮播图设置',
-				value: config.carousel,
-				path: 'config.carousel',
-				type: 'carousel',
-				vIf: state.isSearch,
-				vShow: ['lowcodeCarsusel']
-			},
-			{
-				label: '穿梭框名',
-				value: config.transfer,
-				path: 'config.transfer',
-				type: 'transfer_name',
-				vIf: state.isSearch,
-				vShow: ['lowcodeTransfer']
-			},
-			{
-				label: '选项数据源',
-				value: config.transfer,
-				path: 'config.transfer',
-				type: 'transfer_options_datasource',
-				vIf: state.isSearch,
-				vShow: ['lowcodeTransfer']
-			},
-			
-			
-			{
-				label: '上传视频',
-				value: config.uploadvideo,
-				path: 'config.uploadvideo',
-				type: 'uploadvideo_url',
-				vIf: state.isSearch,
-				vShow: ['videoUpAndPlay']
-			},
-			/* {
-				label: '上传视频封面',
-				value: config.uploadvideo,
-				path: 'config.uploadvideo',
-				type: 'uploadvideo_poster',
-				vIf: state.isSearch,
-				vShow: ['videoUpAndPlay']
-			}, */
-			{
-				label: '视频宽度(像素)',
-				value: config.uploadvideo,
-				path: 'config.uploadvideo',
-				type: 'uploadvideo_width',
-				vIf: state.isSearch,
-				vShow: ['videoUpAndPlay']
-			},
-			{
-				label: '视频高度(像素)',
-				value: config.uploadvideo,
-				path: 'config.uploadvideo',
-				type: 'uploadvideo_height',
-				vIf: state.isSearch,
-				vShow: ['videoUpAndPlay']
-			},
-			{
-				label: '视频自动播放',
-				value: config.uploadvideo,
-				path: 'config.uploadvideo',
-				type: 'uploadvideo_autoPlay',
-				vIf: state.isSearch,
-				vShow: ['videoUpAndPlay']
-			},
-			{
-				label: '视频循环播放',
-				value: config.uploadvideo,
-				path: 'config.uploadvideo',
-				type: 'uploadvideo_loopPlay',
-				vIf: state.isSearch,
-				vShow: ['videoUpAndPlay']
-			},
-			
-			
-			{
-				label: '上传地址',
-				value: control.action,
-				placeholder: '图片/文件上传地址,可不填有默认值',
-				path: 'control.action',
-				vShow: ['upload']
-			},
-			{
-				label: '文件字段名',
-				value: control.name,
-				placeholder: '上传的文件字段名,默认file',
-				path: 'control.name',
-				vShow: ['upload']
-			},
-			{
-				label: '列表类型',
-				value: control.listType,
-				type: 'select',
-				dict: {
-					text: 'text',
-					picture: 'picture',
-					'picture-card': 'picture-card'
-				},
-				path: 'control.listType',
-				vShow: ['upload']
-			},
-			{
-				label: '提示文字',
-				value: config.tip,
-				placeholder: '提示说明文字',
-				path: 'config.tip',
-				vShow: ['upload']
-			},
-			{
-				label: '按钮文本',
-				value: config.btnText,
-				placeholder: '上传按钮文本',
-				path: 'config.btnText',
-				vShow: ['upload']
-			},
-			{
-				label: 'direction',
-				type: 'select',
-				dict: { horizontal: 'horizontal', vertical: 'vertical' },
-				placeholder: '分割线方向，默认horizontal',
-				value: control.direction,
-				path: 'control.direction',
-				vShow: ['divider']
-			},
-			{
-				label: 'border-style',
-				placeholder: '分隔符样式，默认solid',
-				value: control.borderStyle,
-				path: 'control.borderStyle',
-				vShow: ['divider']
-			},
-			{
-				label: 'content-position',
-				type: 'select',
-				dict: { left: 'left', right: 'right', center: 'center' },
-				value: control.contentPosition,
-				path: 'control.contentPosition',
-				vShow: ['divider']
-			},
-			{
-				label: '最小值',
-				value: control.min,
-				path: 'control.min',
-				vShow: ['slider'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: '最大值',
-				value: control.max,
-				path: 'control.max',
-				vShow: ['rate', 'slider'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: '步长',
-				value: control.step,
-				path: 'control.step',
-				vShow: ['slider'],
-				eventName: 'formatNumber',
-				isNum: true
-			},
-			{
-				label: 'type',
-				value: control.type,
-				path: 'control.type',
-				vShow: ['datePicker'],
-				type: 'select',
-				placeholder: '显示类型',
-				dict: {
-					year: 'year',
-					month: 'month',
-					date: 'date',
-					datetime: 'datetime',
-					week: 'week',
-					datetimerange: 'datetimerange',
-					daterange: 'daterange',
-					monthrange: 'monthrange'
-				}
-			},
-			{
-				label: 'format',
-				value: control.format,
-				path: 'control.format',
-				vShow: ['datePicker', 'timePicker'],
-				placeholder: '显示在输入框中的格式'
-			},
-			{
-				label: 'color-format',
-				value: control.colorFormat,
-				path: 'control.colorFormat',
-				type: 'select',
-				placeholder: '写入 v-model 的颜色的格式',
-				dict: { hsl: 'hsl', hsv: 'hsv', hex: 'hex', rgb: 'rgb' },
-				vShow: ['colorPicker']
-			},
-			{
-				label: '文本高度',
-				value: control.height,
-				path: 'control.height',
-				placeholder: '文本高度(预览查看效果)',
-				vShow: ['tinymce']
-			},
-			{
-				label: '文本宽度',
-				value: control.width,
-				path: 'control.width',
-				placeholder: '文本宽度(预览查看效果)',
-				vShow: ['tinymce']
-			},
-			{
-				label: '图片上传地址',
-				value: control.imgUrl,
-				path: 'control.imgUrl',
-				placeholder: '图片上传地址',
-				vShow: ['tinymce']
-			},
-			{
-				label: '附件上传地址',
-				value: control.blobUrl,
-				path: 'control.blobUrl',
-				placeholder: '附件上传地址',
-				vShow: ['tinymce']
-			},
-			{
-				label: '显示模式',
-				value: config.style,
-				path: 'config.style',
-				placeholder: '显示风格(预览查看效果)',
-				type: 'select',
-				dict: { default: 'default', simple: 'simple' },
-				vShow: ['tinymce']
-			}
-		])
-		// 过滤显示对应的值
-		return temp.filter((item: any) => {
-			let hasFilter = true
-			if (item.vShow) {
-				hasFilter = item.vShow.includes(type)
-			}
-			if (item.vHide) {
-				hasFilter = !item.vHide.includes(type)
-			}
-			if (item.vIf) {
-			// 不显示vif＝true的
-				hasFilter = false
-			}
-			return hasFilter
-		})
-    } else {
-      	return []
-    }
-})
->>>>>>> liwenxuan_v4
+	const floatSelectOptions = [
+		{
+			value: 'left',
+			label: '左',
+		},
+		{
+			value: 'right',
+			label: '右',
+		},
+	]
+const dataSource = ref<Tree[]>([]) 
+interface Tree {
+	id?: string
+	label: string
+	disabled?: boolean
+	children?: Tree[]
+	parentId?: string
+	[key: string]: any
+}
+
 
     
     const layouytStyle = reactive<any>(controlData.value.styles)
@@ -2426,7 +1767,146 @@ const loadNextPage = () => {
     loadingnomore.value = true
   }
 }
-    </script>
+const addRootNode = () => {
+	let onlyNumber = uuidv4().replaceAll('-','').toString();   
+	controlData.value.control.fixedOptions.push({
+		id: onlyNumber,
+        label: '新根节点',
+		disabled: false,
+		children: [],
+	}) 
+}
+const append = (data: Tree) => {
+	let onlyNumber = uuidv4().replaceAll('-','').toString();   
+	const newChild = { id: onlyNumber, label: '新节点', disabled:false,children: [] }
+	if (!data.children) {
+		data.children = []
+	}
+	data.children.push(newChild)
+	dataSource.value = [...dataSource.value]
+}
+const remove = (node: Node, data: Tree) => {
+	let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
+	if(really){
+		const parent = node.parent
+		const children: Tree[] = parent.data.children || parent.data
+		const index = children.findIndex((d) => d.id === data.id)
+		children.splice(index, 1)
+		dataSource.value = [...dataSource.value]
+	}
+	
+}
+const changeLabel = (node:Node,data:Tree) =>{
+	let favDrink = prompt("请输入:");
+	if(favDrink!=null && favDrink.length>0){
+		const parent = node.parent
+		const children: Tree[] = parent.data.children || parent.data
+		const index = children.findIndex((d) => d.id === data.id)
+		children[index].label = favDrink
+		dataSource.value = [...dataSource.value]
+	}
+	
+	
+}
+const setNodeEnable = (node:Node,data:Tree) =>{
+	const parent = node.parent
+	const children: Tree[] = parent.data.children || parent.data
+	const index = children.findIndex((d) => d.id === data.id)
+	children[index].disabled = !children[index].disabled
+	dataSource.value = [...dataSource.value]
+	
+}
+function lowcodeImageUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
+	const element = controlData.value.control
+	element.imgUrl=response.data.url
+	element.uploadFlag=true
+}
+const transferDataSourceOptions = [
+	{
+		value: '数据源',
+		label: '数据源',
+	},
+	{
+		value: '固定选项',
+		label: '固定选项',
+	},
+]
+const associatedFormsHideDialogFlag = ref(false)
+
+const defaultProps = {
+	children: 'children',
+	label: 'label',
+}
+function getAssociatedFormsCurrentFieldTree() {
+        return request({ 
+            url: '/javasys/lowCode/AssociatedForms/getFieldTree',
+            method: 'post',
+			data: {
+				cfid:'13'
+			},
+        });
+}
+function getAssociatedFormsOrgAndManTree() {
+        return request({
+            url: '/javasys/lowCode/transfer/getOrgAndManTree',
+            method: 'post',
+        });
+}
+const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+
+getAssociatedFormsCurrentFieldTree().then(({ data }) => {   
+        let resData = ref(data.children)
+		//let rootid_ = data.value.label
+		associatedFormsCurrentFormFieldTree.value = [{
+            id: 'rootid_'+data.label,
+        	label: '当前表单',
+            children: [...resData.value]
+        }]
+});
+const orgAndManTree = ref<Tree[]>()
+	getAssociatedFormsOrgAndManTree().then(({ data }) => {   
+        let resData = ref(data.children)
+		orgAndManTree.value = [{
+            id: data.id,
+        	//label: data.label,
+			label: '组织机构',
+            children: [...resData.value]
+        }]
+});
+const fieldTreeSearchFlag = ref(false)
+
+function handleFieldTreeExpand(){
+	
+	fieldTreeSearchFlag.value = true;
+}
+
+function handleFieldTreeCollapse(){
+	
+	fieldTreeSearchFlag.value = false;
+}
+function handleFieldTreeNodeclick(){
+	
+}
+function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
+	//console.log(MouseEvent)
+	console.log(object)
+	//console.log(Node)
+	//console.log(element)
+
+}
+import { ElTree } from 'element-plus'
+const fieldTreeFilterText = ref('')
+const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
+
+watch(fieldTreeFilterText, (val) => {
+	fieldTreeRef.value!.filter(val)
+})
+
+const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) => {
+	if (!value) return true
+	return associatedFormsCurrentFormFieldTree.label.includes(value)
+}
+</script>
     <template>
         <div  class="sidebar-tools">
             <el-tabs v-model="state.tabsName">
@@ -2551,9 +2031,215 @@ const loadNextPage = () => {
                                     <el-button  type="primary" append-to-body="true" modal="true" @click="dialogTableVisible = true"  >轮播图设置</el-button>
                                 </el-row>
                                 
-    
-    
-    
+								<el-row v-else-if="item.type === 'transfer_name'">
+									<el-input
+										v-model="controlData.config.transferName"
+										placeholder="请输入穿梭框名"
+										style="width:221px"
+									/>
+								</el-row>
+								<el-row v-else-if="item.type ==='transfer_options_datasource'">
+									<!-- <span style="display:inline-block;width:78px">选项数据源</span> -->
+									<el-select
+										v-model="controlData.config.transferDataSource"
+										placeholder="选项数据源"
+										style="width: 150px; height:20px">
+										<el-option
+										v-for="dataSourceOption1 in transferDataSourceOptions"
+										:key="dataSourceOption1.value"
+										:label="dataSourceOption1.label"
+										:value="dataSourceOption1.value"
+										/>
+										
+									</el-select>
+									<div v-if="controlData.config.transferDataSource==='固定选项'" style="width: auto;margin-top:33px;margin-left:-220px;padding-bottom: 6px;">
+										<el-button  type="primary" append-to-body="true" modal="true" @click="transferDialogTableVisible = true"  >编辑固定选项</el-button>
+									</div>
+									<div v-if="controlData.config.transferDataSource==='数据源'" style="width: auto;margin-top: 20px;">
+										<!-- <span style="display:inline-block;width:50px;margin-bottom: 25px;">接口url</span> -->
+										<el-input
+											v-model="controlData.config.apiUrl"
+											
+											style="width:278px;margin-left: -68px;margin-top: -5px;"
+											placeholder="数据源接口url">
+												<template #prepend>
+													<el-select
+														v-model="controlData.config.method"
+														style="width: 100px">
+														<el-option label="get" value="get" />
+														<el-option label="post" value="post" />
+													</el-select>
+												</template>
+											</el-input>
+									</div>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_radius'">
+									<el-switch v-model="controlData.control.radius" style="margin-right: 15px;"/>
+									<el-popover
+										placement="top-start"
+										:width="200"
+										trigger="hover"
+										content="数值越大圆角程度越高"
+									>
+									<template #reference>
+										<el-input-number v-if="controlData.control.radius" v-model="controlData.control.radiusNum" :step="1"/>
+									</template>
+									</el-popover>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_url'">
+									<el-upload 
+									:action="uploadUrl"  :before-remove="beforeRemove"
+									:on-success="lowcodeImageUploadSuccess" 
+									:on-error="videoUploadErr"
+									:limit="1"
+									accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign">
+										<el-button v-if="!controlData.control.uploadFlag" type="primary">点此上传</el-button>
+										<el-button v-if="controlData.control.uploadFlag" type="primary">已上传,点击修改</el-button>
+									</el-upload>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_showMode'">
+									<el-select
+										v-model="controlData.control.showMode"
+										placeholder="选项数据源"
+										style="width: 150px; height:20px">
+										<el-option
+										v-for="showModeSelected in showModeSelectOptions"
+										:key="showModeSelected.value"
+										:label="showModeSelected.label"
+										:value="showModeSelected.value"
+										/>
+										
+									</el-select>
+									<div v-if="controlData.control.showMode==='自定义像素值'" style="width: auto;margin-top:33px;margin-left:-187px;padding-bottom: 6px;">
+										<span style="margin-right: 10px;">宽度(像素) </span><el-input-number  v-model="controlData.control.pxWidth" style="margin-bottom: 10px;" /><br/>
+										<span style="margin-right: 10px;">高度(像素) </span><el-input-number v-model="controlData.control.pxHeight" />
+									</div>
+									<div v-if="controlData.control.showMode==='自定义占父容器比例'" style="width: auto;margin-top:33px;margin-left:-187px;padding-bottom: 6px;">
+										<span style="margin-right: 10px;">百分比宽 </span><el-input-number v-model="controlData.control.widthPercent" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;">百分比高 </span><el-input-number v-model="controlData.control.heightPercent" />
+									</div>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_fit'">
+									<el-radio-group v-model="controlData.control.fit">
+										<el-popover
+											placement="top-start"
+											title="fill"
+											:width="200"
+											trigger="hover"
+											content="默认值。调整替换后的内容大小，以填充元素的内容框。如有必要，将拉伸或挤压物体以适应该对象。"
+										>
+											<template #reference>
+												<el-radio :label="1" :value="1">fill</el-radio>
+											</template>
+										</el-popover>
+										
+										<el-popover
+											placement="top-start"
+											title="contain"
+											:width="200"
+											trigger="hover"
+											content="缩放替换后的内容以保持其纵横比，同时将其放入元素的内容框。"
+										>
+											<template #reference>
+												<el-radio :label="2" :value="2">contain</el-radio>
+											</template>
+										</el-popover>
+
+										<el-popover
+											placement="top-start"
+											title="cover"
+											:width="200"
+											trigger="hover"
+											content="调整替换内容的大小，以在填充元素的整个内容框时保持其长宽比。该对象将被裁剪以适应。"
+										>
+											<template #reference>
+												<el-radio :label="3" :value="3">cover</el-radio>
+											</template>
+										</el-popover>
+
+										<el-popover
+											placement="top-start"
+											title="none"
+											:width="200"
+											trigger="hover"
+											content="不对替换的内容调整大小。"
+										>
+											<template #reference>
+												<el-radio :label="4" :value="4">none</el-radio>
+											</template>
+										</el-popover>
+										
+										
+										<el-popover
+											placement="top-start"
+											title="scale-down"
+											:width="200"
+											trigger="hover"
+											content="调整内容大小就像没有指定内容或包含内容一样（将导致较小的具体对象尺寸）"
+										>
+											<template #reference>
+												<el-radio :label="5" :value="5">scale-down</el-radio>
+											</template>
+										</el-popover>
+										
+									</el-radio-group>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_boderAndShadow'">
+									<el-switch v-model="controlData.control.boderAndShadow" style="margin-right: 15px;"/>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_link'">
+									<el-input
+									v-model="controlData.control.link"
+									placeholder="请录入图片链接地址"
+									style="width:221px"
+									/>
+								</el-row>
+								<el-row v-else-if="item.type === 'lowcodeImage_marginAndPadding'">
+									<div style="width: auto;margin-top:33px;margin-left:-47px;padding-bottom: 6px;">
+										<span style="margin-right: 10px;"> 外边距(上)</span><el-input-number  v-model="controlData.control.mt" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 外边距(下)</span><el-input-number v-model="controlData.control.mb" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 外边距(左)</span><el-input-number  v-model="controlData.control.ml" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 外边距(右)</span><el-input-number v-model="controlData.control.mr" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 内边距(上)</span><el-input-number  v-model="controlData.control.pt" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 内边距(下)</span><el-input-number v-model="controlData.control.pb" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 内边距(左)</span><el-input-number  v-model="controlData.control.pl" style="margin-bottom: 10px;"/><br/>
+										<span style="margin-right: 10px;"> 内边距(右)</span><el-input-number v-model="controlData.control.pr" style="margin-bottom: 10px;"/><br/>
+									</div>
+								</el-row>
+
+								<el-row v-else-if="item.type === 'lowcodeImage_float'">
+									<el-switch v-model="controlData.control.floatFlag" style="margin-right: 15px;"/>
+									
+									<el-select
+										v-if="controlData.control.floatFlag"
+										v-model="controlData.control.floatValue"
+										
+										style="width: 150px; height:20px">
+										<el-option
+										v-for="showModeSelected1 in floatSelectOptions"
+										:key="showModeSelected1.value"
+										:label="showModeSelected1.label"
+										:value="showModeSelected1.value"
+										/>
+										
+									</el-select>
+									
+								</el-row>
+
+								<el-row v-else-if="item.type === 'associatedForms_hide'">
+									<el-button  type="primary" append-to-body="true" modal="true" @click="associatedFormsHideDialogFlag = true"  >设置隐藏条件</el-button>
+									
+								</el-row>
+
+
+
+
+
+
+
+
+
+
                                 <el-input
                                     v-else
                                     :type="item.inputStyle"
@@ -3219,1131 +2905,7 @@ const loadNextPage = () => {
         @close="closePreview"
         />
         
-        <!-- 轮播图设置弹窗 liwenxuan 20240122 end 1-->
-    </template>
-    <style   lang='scss' scoped>
-    .form_cont{
-        padding: 0 10px;
-    }
-	.avatar-uploader{
-		width: 100px;
-		height: 100px;
-		.avatar{
-			width: 100px;
-			height: 100px;
-		}
-		.avatar-uploader-icon{
-			width: 100px;
-			height: 100px;
-		}
-	}
-<<<<<<< HEAD
-    </style>
-    <style  >
-	
-    .sidebar-tools .el-tabs__content{
-        padding: 0;
-		
-    }
-    .el-collapse-item__header {
-        padding-left: 10px;
-        background-color: rgb(229, 229, 229);
-    }
-    .el-collapse-item__header{
-        padding-left: 10px;
-        background-color: rgb(229, 229, 229);
-    }
-    </style>
-    
-=======
-}
-
-//关闭大图展示
-const closePreview = () => {
-	showImagePreview.value = false
-}
-
-//开启大图展示
-const handlePreview = (index: number, row: any) => {
-    showImagePreview.value = true
-}
-
-const changeCurrentUploadImgid = (clickedRow:any) => {
-	currentUploadImgid = clickedRow.imgId
-}
-
-//liwenxuan 20240111 carousel  end  
-
-
-//liwenxuan 20240217 transfer start
-
-const showModeSelectOptions = [
-	{
-		value: '自定义像素值',
-		label: '自定义像素值',
-	},
-	{
-		value: '自定义占父容器比例',
-		label: '自定义占父容器比例',
-	},
-]
-
-const floatSelectOptions = [
-	{
-		value: 'left',
-		label: '左',
-	},
-	{
-		value: 'right',
-		label: '右',
-	},
-]
-
-
-
-//!!!!!!!!!!!!!!!树数据start
-
-
-const dataSource = ref<Tree[]>([]) 
-interface Tree {
-	id?: string
-	label: string
-	disabled?: boolean
-	children?: Tree[]
-	parentId?: string
-	[key: string]: any
-}
-
-const addRootNode = () => {
-	let onlyNumber = uuidv4().replaceAll('-','').toString();   
-	controlData.value.control.fixedOptions.push({
-		id: onlyNumber,
-        label: '新根节点',
-		disabled: false,
-		children: [],
-	}) 
-}
-
-const append = (data: Tree) => {
-	let onlyNumber = uuidv4().replaceAll('-','').toString();   
-	const newChild = { id: onlyNumber, label: '新节点', disabled:false,children: [] }
-	if (!data.children) {
-		data.children = []
-	}
-	data.children.push(newChild)
-	dataSource.value = [...dataSource.value]
-}
-
-const remove = (node: Node, data: Tree) => {
-	let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
-	if(really){
-		const parent = node.parent
-		const children: Tree[] = parent.data.children || parent.data
-		const index = children.findIndex((d) => d.id === data.id)
-		children.splice(index, 1)
-		dataSource.value = [...dataSource.value]
-	}
-	
-}
-
-
-
-const changeLabel = (node:Node,data:Tree) =>{
-	let favDrink = prompt("请输入:");
-	if(favDrink!=null && favDrink.length>0){
-		const parent = node.parent
-		const children: Tree[] = parent.data.children || parent.data
-		const index = children.findIndex((d) => d.id === data.id)
-		children[index].label = favDrink
-		dataSource.value = [...dataSource.value]
-	}
-	
-	
-}
-
-const setNodeEnable = (node:Node,data:Tree) =>{
-	const parent = node.parent
-	const children: Tree[] = parent.data.children || parent.data
-	const index = children.findIndex((d) => d.id === data.id)
-	children[index].disabled = !children[index].disabled
-	dataSource.value = [...dataSource.value]
-	
-}
-
-
-
-
-
-//!!!!!!!!!!!!!!!树数据end
-
-
-//liwenxuan 20240217 transfer end
-
-
-//liwenxuan20240313 lowcodeImage start
-
-//图片上传成功钩子
-function lowcodeImageUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
-	const element = controlData.value.control
-	element.imgUrl=response.data.url
-	element.uploadFlag=true
-}
-
-//
-const transferDataSourceOptions = [
-	{
-		value: '数据源',
-		label: '数据源',
-	},
-	{
-		value: '固定选项',
-		label: '固定选项',
-	},
-]
-
-//const radio = ref(controlData.value.control.fit)
-
-//liwenxuan20240313 lowcodeImage end
-
-
-//liwenxuan20240403 associatedForms start 
-
-const associatedFormsHideDialogFlag = ref(false)
-
-const defaultProps = {
-	children: 'children',
-	label: 'label',
-}
-
-function getAssociatedFormsCurrentFieldTree() {
-        return request({ 
-            url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-            method: 'post',
-			data: {
-				cfid:'13'
-			},
-        });
-}
-
-function getAssociatedFormsOrgAndManTree() {
-        return request({
-            url: '/javasys/lowCode/transfer/getOrgAndManTree',
-            method: 'post',
-        });
-}
-const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
-
-getAssociatedFormsCurrentFieldTree().then(({ data }) => {   
-        let resData = ref(data.children)
-		//let rootid_ = data.value.label
-		associatedFormsCurrentFormFieldTree.value = [{
-            id: 'rootid_'+data.label,
-        	label: '当前表单',
-            children: [...resData.value]
-        }]
-});
-
-const orgAndManTree = ref<Tree[]>()
-	getAssociatedFormsOrgAndManTree().then(({ data }) => {   
-        let resData = ref(data.children)
-		orgAndManTree.value = [{
-            id: data.id,
-        	//label: data.label,
-			label: '组织机构',
-            children: [...resData.value]
-        }]
-});
-
-const fieldTreeSearchFlag = ref(false)
-
-function handleFieldTreeExpand(){
-	
-	fieldTreeSearchFlag.value = true;
-}
-
-function handleFieldTreeCollapse(){
-	
-	fieldTreeSearchFlag.value = false;
-}
-function handleFieldTreeNodeclick(){
-	
-}
-function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-	//console.log(MouseEvent)
-	console.log(object)
-	//console.log(Node)
-	//console.log(element)
-
-}
-import { ElTree } from 'element-plus'
-const fieldTreeFilterText = ref('')
-const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
-
-watch(fieldTreeFilterText, (val) => {
-	fieldTreeRef.value!.filter(val)
-})
-
-const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) => {
-	if (!value) return true
-	return associatedFormsCurrentFormFieldTree.label.includes(value)
-}
-
-//liwenxuan20240403 associatedForms end
-
-</script>
-<template>
-	<div  class="sidebar-tools">
-		<el-tabs v-model="state.tabsName">
-			<el-tab-pane label="字段配置" name="first">
-				<el-form size="small" class="form">
-					<div class=""><h3>通用属性</h3></div>
-					<template v-for="(item, index) in attrList" :key="index">
-				
-						<el-form-item :label="item.label">
-							<el-select
-								v-if="item.type === 'select'"
-								:placeholder="item.placeholder"
-								v-model="item.value"
-								:filterable="item.path === 'name'"
-								:allow-create="item.path === 'name'"
-								:clearable="item.clearable"
-								@change="controlChange(item, $event)"
-							>
-								<el-option
-								v-for="(opt, key) in item.dict"
-								:key="key"
-								:value="item.path === 'name' ? opt.name : key"
-								:label="
-									item.path === 'name' ? `${opt.label}(${opt.name})` : opt
-								"
-								/>
-							</el-select>
-							<el-switch
-								v-else-if="item.type === 'switch'"
-								v-model="item.value"
-								@change="controlChange(item, $event)"
-							/>
-							
-							<el-row v-else-if="item.type === 'uploadvideo_url'">
-								<!-- {{ controlData.control }} -->
-								<el-upload  
-								
-								:action="uploadUrl"  :before-remove="beforeRemove"
-								:on-success="videoUploadOk" :show-file-list="true"
-								:on-error="videoUploadErr"
-								:limit="1"
-								:on-exceed="handleExceed"
-								accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb">
-									<el-button v-if="!controlData.control.videoMsg[videoIndex].videoReady" type="primary">点此上传</el-button>
-									<el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button>
-								</el-upload>
-								<!-- <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button> 
-								v-if="!controlData.control.videoMsg[videoIndex].videoReady"-->
-							</el-row>
-							<!-- <el-row v-else-if="item.type === 'uploadvideo_poster'">
-								<el-upload  
-								v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster===''"
-								:action="uploadUrl"  :before-remove="beforeRemove"
-								:on-success="videoUploadOk" :show-file-list="true"
-								:on-error="videoUploadErr"
-								
-								accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb">
-									
-									<el-tooltip
-										class="box-item"
-										content="不上传则视频封面默认为视频第一帧"
-										placement="top-end"
-									>
-										<el-button type="primary">点此上传</el-button>
-									</el-tooltip>
-								</el-upload>
-								<el-button v-if="!controlData.control[videoIndex].videoReady" type="warning">请先上传视频</el-button>
-								<el-button v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster!=''" type="primary">已上传,点击修改</el-button>
-							</el-row>  -->
-							<el-row v-else-if="item.type === 'uploadvideo_autoPlay'">
-								<el-switch v-model="controlData.control.videoMsg[videoIndex].videoAutoPlay" />
-							</el-row>
-							<el-row v-else-if="item.type === 'uploadvideo_loopPlay'">
-								<el-switch v-model="controlData.control.videoMsg[videoIndex].loop" />
-							</el-row>
-							<el-row v-else-if="item.type === 'uploadvideo_width'">
-								<el-input-number v-model="controlData.control.videoMsg[videoIndex].videoWidth" :step="50" :max="4096"/>
-							</el-row>
-							<el-row v-else-if="item.type === 'uploadvideo_height'">
-								<el-input-number v-model="controlData.control.videoMsg[videoIndex].videoHeight" :step="50" :max="2160"/>
-							</el-row>
-
-							<el-row v-else-if="item.type === 'carousel'">
-
-								<el-button  type="primary" append-to-body="true" modal="true" @click="dialogTableVisible = true"  >轮播图设置</el-button>
-							</el-row>
-
-							
-							<el-row v-else-if="item.type === 'transfer_name'">
-								<el-input
-								v-model="controlData.config.transferName"
-								placeholder="请输入穿梭框名"
-								style="width:221px"
-								/>
-							</el-row>
-							
-							<el-row v-else-if="item.type ==='transfer_options_datasource'">
-								<!-- <span style="display:inline-block;width:78px">选项数据源</span> -->
-								<el-select
-									v-model="controlData.config.transferDataSource"
-									placeholder="选项数据源"
-									style="width: 150px; height:20px">
-									<el-option
-									v-for="dataSourceOption1 in transferDataSourceOptions"
-									:key="dataSourceOption1.value"
-									:label="dataSourceOption1.label"
-									:value="dataSourceOption1.value"
-									/>
-									
-								</el-select>
-								<div v-if="controlData.config.transferDataSource==='固定选项'" style="width: auto;margin-top:33px;margin-left:-220px;padding-bottom: 6px;">
-									<el-button  type="primary" append-to-body="true" modal="true" @click="transferDialogTableVisible = true"  >编辑固定选项</el-button>
-								</div>
-								<div v-if="controlData.config.transferDataSource==='数据源'" style="width: auto;margin-top: 20px;">
-									<!-- <span style="display:inline-block;width:50px;margin-bottom: 25px;">接口url</span> -->
-									<el-input
-										v-model="controlData.config.apiUrl"
-										
-										style="width:278px;margin-left: -68px;margin-top: -5px;"
-										placeholder="数据源接口url">
-											<template #prepend>
-												<el-select
-													v-model="controlData.config.method"
-													style="width: 100px">
-													<el-option label="get" value="get" />
-													<el-option label="post" value="post" />
-												</el-select>
-											</template>
-										</el-input>
-								</div>
-							</el-row>
-							<!-- 图片 liwenxuan 20240312 -->
-							<el-row v-else-if="item.type === 'lowcodeImage_radius'">
-								<el-switch v-model="controlData.control.radius" style="margin-right: 15px;"/>
-								<el-popover
-									placement="top-start"
-									:width="200"
-									trigger="hover"
-									content="数值越大圆角程度越高"
-								>
-								<template #reference>
-									<el-input-number v-if="controlData.control.radius" v-model="controlData.control.radiusNum" :step="1"/>
-								</template>
-								</el-popover>
-							</el-row>
-
-							<el-row v-else-if="item.type === 'lowcodeImage_url'">
-								<el-upload 
-								:action="uploadUrl"  :before-remove="beforeRemove"
-								:on-success="lowcodeImageUploadSuccess" 
-								:on-error="videoUploadErr"
-								:limit="1"
-								accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign">
-									<el-button v-if="!controlData.control.uploadFlag" type="primary">点此上传</el-button>
-									<el-button v-if="controlData.control.uploadFlag" type="primary">已上传,点击修改</el-button>
-								</el-upload>
-							</el-row>
-
-							<el-row v-else-if="item.type === 'lowcodeImage_showMode'">
-								<el-select
-									v-model="controlData.control.showMode"
-									placeholder="选项数据源"
-									style="width: 150px; height:20px">
-									<el-option
-									v-for="showModeSelected in showModeSelectOptions"
-									:key="showModeSelected.value"
-									:label="showModeSelected.label"
-									:value="showModeSelected.value"
-									/>
-									
-								</el-select>
-								<div v-if="controlData.control.showMode==='自定义像素值'" style="width: auto;margin-top:33px;margin-left:-187px;padding-bottom: 6px;">
-									<span style="margin-right: 10px;">宽度(像素) </span><el-input-number  v-model="controlData.control.pxWidth" style="margin-bottom: 10px;" /><br/>
-									<span style="margin-right: 10px;">高度(像素) </span><el-input-number v-model="controlData.control.pxHeight" />
-								</div>
-								<div v-if="controlData.control.showMode==='自定义占父容器比例'" style="width: auto;margin-top:33px;margin-left:-187px;padding-bottom: 6px;">
-									<span style="margin-right: 10px;">百分比宽 </span><el-input-number v-model="controlData.control.widthPercent" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;">百分比高 </span><el-input-number v-model="controlData.control.heightPercent" />
-								</div>
-							</el-row>
-
-
-							<el-row v-else-if="item.type === 'lowcodeImage_fit'">
-								<el-radio-group v-model="controlData.control.fit">
-									<el-popover
-										placement="top-start"
-										title="fill"
-										:width="200"
-										trigger="hover"
-										content="默认值。调整替换后的内容大小，以填充元素的内容框。如有必要，将拉伸或挤压物体以适应该对象。"
-									>
-										<template #reference>
-											<el-radio :label="1" :value="1">fill</el-radio>
-										</template>
-									</el-popover>
-									
-									<el-popover
-										placement="top-start"
-										title="contain"
-										:width="200"
-										trigger="hover"
-										content="缩放替换后的内容以保持其纵横比，同时将其放入元素的内容框。"
-									>
-										<template #reference>
-											<el-radio :label="2" :value="2">contain</el-radio>
-										</template>
-									</el-popover>
-
-									<el-popover
-										placement="top-start"
-										title="cover"
-										:width="200"
-										trigger="hover"
-										content="调整替换内容的大小，以在填充元素的整个内容框时保持其长宽比。该对象将被裁剪以适应。"
-									>
-										<template #reference>
-											<el-radio :label="3" :value="3">cover</el-radio>
-										</template>
-									</el-popover>
-
-									<el-popover
-										placement="top-start"
-										title="none"
-										:width="200"
-										trigger="hover"
-										content="不对替换的内容调整大小。"
-									>
-										<template #reference>
-											<el-radio :label="4" :value="4">none</el-radio>
-										</template>
-									</el-popover>
-									
-									
-									<el-popover
-										placement="top-start"
-										title="scale-down"
-										:width="200"
-										trigger="hover"
-										content="调整内容大小就像没有指定内容或包含内容一样（将导致较小的具体对象尺寸）"
-									>
-										<template #reference>
-											<el-radio :label="5" :value="5">scale-down</el-radio>
-										</template>
-									</el-popover>
-									
-								</el-radio-group>
-							</el-row>
-
-							<el-row v-else-if="item.type === 'lowcodeImage_boderAndShadow'">
-								<el-switch v-model="controlData.control.boderAndShadow" style="margin-right: 15px;"/>
-							</el-row>
-							<el-row v-else-if="item.type === 'lowcodeImage_link'">
-								<el-input
-								v-model="controlData.control.link"
-								placeholder="请录入图片链接地址"
-								style="width:221px"
-								/>
-							</el-row>
-
-							<el-row v-else-if="item.type === 'lowcodeImage_marginAndPadding'">
-								<div style="width: auto;margin-top:33px;margin-left:-47px;padding-bottom: 6px;">
-									<span style="margin-right: 10px;"> 外边距(上)</span><el-input-number  v-model="controlData.control.mt" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 外边距(下)</span><el-input-number v-model="controlData.control.mb" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 外边距(左)</span><el-input-number  v-model="controlData.control.ml" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 外边距(右)</span><el-input-number v-model="controlData.control.mr" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 内边距(上)</span><el-input-number  v-model="controlData.control.pt" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 内边距(下)</span><el-input-number v-model="controlData.control.pb" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 内边距(左)</span><el-input-number  v-model="controlData.control.pl" style="margin-bottom: 10px;"/><br/>
-									<span style="margin-right: 10px;"> 内边距(右)</span><el-input-number v-model="controlData.control.pr" style="margin-bottom: 10px;"/><br/>
-								</div>
-							</el-row>
-
-							<el-row v-else-if="item.type === 'lowcodeImage_float'">
-								<el-switch v-model="controlData.control.floatFlag" style="margin-right: 15px;"/>
-								
-								<el-select
-									v-if="controlData.control.floatFlag"
-									v-model="controlData.control.floatValue"
-									
-									style="width: 150px; height:20px">
-									<el-option
-									v-for="showModeSelected1 in floatSelectOptions"
-									:key="showModeSelected1.value"
-									:label="showModeSelected1.label"
-									:value="showModeSelected1.value"
-									/>
-									
-								</el-select>
-								
-							</el-row>
-
-							<el-row v-else-if="item.type === 'associatedForms_hide'">
-								<el-button  type="primary" append-to-body="true" modal="true" @click="associatedFormsHideDialogFlag = true"  >设置隐藏条件</el-button>
-								
-							</el-row>
-							
-
-							<el-input
-								v-else
-								:type="item.inputStyle"
-								v-model="item.value"
-								:placeholder="item.placeholder"
-								@input="controlChange(item, $event)"
-							/>
-							
-						</el-form-item>
-
-						
-						
-					</template>
-					
-					<template v-if="controlData.config">
-						<el-form-item label="联动条件">
-							<el-switch v-model="controlData.config.linkKey" />
-						</el-form-item>
-						<template v-if="controlData.config.linkKey">
-							<el-form-item>
-								<el-input
-								v-model="controlData.config.linkValue"
-								type="textarea"
-								placeholder="表达式如: $.input>1 $表示为当前表单数据，input为字段标识"
-								/>
-							</el-form-item>
-							<el-form-item
-								v-if="
-								showHide(
-									[
-									'input',
-									'textarea',
-									'radio',
-									'checkbox',
-									'select',
-									'date',
-									'switch',
-									'number',
-									'cascader',
-									'slider',
-									'datePicker',
-									'timePicker',
-									'colorPicker',
-									'inputNumber',
-									'rate',
-									'treeSelect'
-									],
-									true
-								)
-								"
-								label="联动结果"
-							>
-								<el-radio-group
-									v-model="controlData.config.linkResult"
-									class="option-radio"
-								>
-									<el-radio label="hidden">隐藏(默认)</el-radio>
-									<el-radio label="disabled">禁用</el-radio>
-								</el-radio-group>
-							</el-form-item>
-						</template>
-					</template>
-					<template v-if="showHide(['tabs'], true)">
-						<div class="h3"><h3>标签配置项</h3></div>
-						<el-form-item
-							v-for="(item, index) in controlData.columns"
-							:key="index"
-						>
-							<el-col :span="12">
-								<el-input v-model="item.label" placeholder="标签配置项" />
-							</el-col>
-							<el-col :span="2" :offset="1">
-								<i
-									class="icon-del"
-									@click="delSelectOption(index as number, 'tabs')"
-								></i>
-							</el-col>
-						</el-form-item>
-						<el-form-item>
-							<el-button @click="addSelectOption('tabs')">增加标签</el-button>
-						</el-form-item>
-					</template>
-					<!--编号规则设置--->
-					<div
-						v-if="showHide(['serialNumber'],true)"
-					>
-						<div class="h3"><h3>编码规则配置</h3></div>
-						<el-form-item label="编码方式">
-							<el-switch v-model="controlData.config.automatic" inline-prompt active-text="自动编码" inactive-text="手动编码" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #E6A23C" />
-						</el-form-item>
-						<div v-if="controlData.config.automatic">
-							<el-form-item v-for="(item, index) in controlData.config.customRules" :key="index">
-								
-								<el-input v-model="item.rule" :placeholder="item.message?item.message:'请输入自定义字符'">
-									<template #prepend>
-										<el-select
-											v-model="item.type"
-											style="width: 100px"
-											@change="rulesSelectNumChange(item, $event)"
-										>
-											<el-option
-												v-for="list in state.numberRulesList"
-												:key="list.type"
-												:label="list.label"
-												:value="list.type"
-											/>
-										</el-select>
-									</template>
-									<template #append>
-										<i
-										class="icon-del"
-										@click="delNumRules(index as number)"
-										></i>
-									</template>
-								</el-input>
-
-
-							</el-form-item>
-							<el-form-item>
-								<el-button @click="addNumRules">添加规则</el-button>
-							</el-form-item>
-						</div>
-					</div>
-					<div
-						v-if="
-						showHide(
-							[
-							'radio',
-							'select',
-							'checkbox',
-							'cascader',
-							'inputSlot',
-							'treeSelect'
-							],
-							true
-						)
-						"
-					>
-						<div class="h3"><h3>选项配置</h3></div>
-						<el-form-item v-if="showHide(['select'], true)" label="添加全部项">
-							<el-input
-								v-model="controlData.config.addAll"
-								placeholder="请输入全部项文案"
-							/>
-						</el-form-item>
-						<el-form-item label="选项数据源">
-							<el-select
-								v-model="controlData.config.optionsType"
-								@change="controlData.config.optionsFun = ''"
-							>
-								<el-option :value="0" label="固定选项" />
-								<el-option :value="1" label="数据源" />
-								<el-option :value="2" label="接口字典" />
-							</el-select>
-						</el-form-item>
-						<template v-if="controlData.config.optionsType === 0">
-							<div v-if="controlData.type !== 'cascader'">
-								<el-form-item
-									v-for="(item, index) in controlData.options"
-									:key="index"
-								>
-									<el-col :span="10">
-										<el-input v-model="item.label" placeholder="选项标签" />
-									</el-col>
-									<el-col :span="10" :offset="1">
-										<el-input v-model="item.value" placeholder="选项值" />
-									</el-col>
-									<el-col :span="2" :offset="1">
-										<i
-											class="icon-del"
-											@click="delSelectOption(index as number)"
-										></i>
-									</el-col>
-								</el-form-item>
-							</div>
-							<el-form-item>
-								<el-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button>
-							</el-form-item>
-						</template>
-						<template v-else>
-							<el-form-item>
-								<el-input
-									v-model="controlData.config.apiUrl"
-									:placeholder="
-										getOptionPlaceholder(controlData.config.optionsType)
-									"
-								>
-									<template
-										v-if="controlData.config.optionsType === 1"
-										#prepend
-									>
-										<el-select
-											v-model="controlData.config.method"
-											style="width: 80px"
-										>
-											<el-option label="get" value="get" />
-											<el-option label="post" value="post" />
-										</el-select>
-									</template>
-								</el-input>
-							</el-form-item>
-							<template v-if="controlData.config.optionsType === 1">
-								<el-form-item label="指定label属性值">
-									<el-input
-										v-model="controlData.config.label"
-										placeholder="返回数据中没有label时可设置"
-									/>
-								</el-form-item>
-								<el-form-item label="指定value属性值">
-									<el-input
-										v-model="controlData.config.value"
-										placeholder="返回数据中没有value时可设置"
-									/>
-								</el-form-item>
-							</template>
-							<el-form-item v-if="controlData.config.optionsType === 1">
-								<el-button
-									@click="
-										optionsEvent(
-										'optionsParams',
-										'请求前处理事件，参数(data,route,form) data请求参数,route页面路由,form表单值'
-										)
-									"
-								>beforeRequest</el-button>
-								<el-button
-									@click="
-										optionsEvent(
-										'optionsResult',
-										'请求返回结束处理；，也可为字符串，如opt=formatTest'
-										)
-									"
-								>afterResponse</el-button>
-							</el-form-item>
-						</template>
-						<el-form-item label="尝试转换value值为">
-							<el-select
-								v-model="controlData.config.transformData"
-								placeholder="默认为number"
-							>
-								<el-option value="none">不转换</el-option>
-								<el-option value="number">number</el-option>
-								<el-option value="string">string</el-option>
-							</el-select>
-						</el-form-item>
-					</div>
-					<template
-						v-if="
-						!state.isSearch &&
-						showHide([
-							'txt',
-							'title',
-							'table',
-							'grid',
-							'tabs',
-							'card',
-							'switch',
-							'gridChild',
-							'tableColumn',
-							'divider',
-							'div',
-							'button'
-						])
-						"
-					>
-						<div class="h3"><h3>校验设置</h3></div>
-						<div v-if="showHide(['input', 'password', 'component'], true)">
-							<el-form-item
-								v-for="(item, index) in controlData.customRules"
-								:key="item.type"
-							>
-								<el-input v-model="item.message" placeholder="校验提示信息">
-									<template #prepend>
-										<el-select
-										v-model="item.type"
-										style="width: 80px"
-										@change="rulesSelectChange(item, $event)"
-										>
-										<el-option
-											v-for="list in state.customRulesList"
-											:key="list.type"
-											:label="list.label"
-											:value="list.type"
-										/>
-										</el-select>
-									</template>
-									<template #append>
-										<i
-										class="icon-del"
-										@click="delAddRules(index as number)"
-										></i>
-									</template>
-								</el-input>
-								<el-input
-									v-if="item.type === 'rules'"
-									v-model="item.rules"
-									placeholder="正则表达式"
-								/>
-								<el-input
-									v-if="item.type === 'methods'"
-									v-model="item.methods"
-									placeholder="方法名称，此方法仅适用于导出vue文件"
-								/>
-							</el-form-item>
-							<el-form-item>
-								<el-button @click="addRulesFast">快速添加</el-button>
-								<el-button @click="addRules(state.tooltip.rules)"
-								>编写校验规则
-									<el-tooltip
-										:content="state.tooltip.rules"
-										placement="top"
-										raw-content
-									>
-										<el-icon>
-											<QuestionFilled />
-										</el-icon>
-									</el-tooltip>
-								</el-button>
-							</el-form-item>
-						</div>
-						<el-form-item v-else>
-						<el-checkbox
-							:model-value="checkboxRequired"
-							@change="requiredChange"
-							>必填
-						</el-checkbox>
-						<el-input
-							v-if="controlData.item?.rules && controlData.item?.rules[0]"
-							v-model="controlData.item.rules[0].message"
-							placeholder="自定义必填错误提示"
-						/>
-						</el-form-item>
-					</template>
-					<div v-if="showHide(['grid', 'card', 'gridChild', 'divider', 'div'])">
-						<div class="h3"><h3>其他属性</h3></div>
-
-						<el-button
-						size="small"
-						@click="openAttrDialog('', state.tooltip.props)"
-						>编辑属性
-						<el-tooltip :content="state.tooltip.props" placement="top">
-							<el-icon>
-							<QuestionFilled />
-							</el-icon>
-						</el-tooltip>
-						</el-button>
-					</div>
-				</el-form>
-			</el-tab-pane>
-			<el-tab-pane label="表单配置" name="second">
-				<el-form size="small" class="form">
-					<el-form-item
-						v-for="(item, index) in formAttr.filter(item => !item.hide)"
-						:label="item.label"
-						:key="index"
-					>
-						<el-select
-							v-if="item.type === 'select'"
-							v-model="item.value"
-							:filterable="item.key === 'class'"
-							:allow-create="item.key === 'class'"
-							:placeholder="item.placeholder"
-							:clearable="item.clearable"
-							@change="formAttrChange(item)"
-						>
-							<el-option
-								
-								v-for="opt in item.options"
-								:key="opt.label || opt.name"
-								:label="opt.label || opt.name"
-								:value="formatNumber(opt.value ?? opt.id)"
-							/>
-						</el-select>
-						<el-switch
-							v-else-if="item.type === 'switch'"
-							v-model="item.value"
-							@input="formAttrChange(item)"
-						/>
-						<el-input
-							v-else
-							v-model="item.value"
-							:placeholder="item.placeholder"
-							:disabled="isNotWrite(item)"
-							@input="formAttrChange(item)"
-						/>
-					</el-form-item>
-					<el-form-item v-if="!state.isSearch">
-						<template #label
-						>
-							添加时获取请求
-							<el-tooltip
-								content="新增表单数据时，从接口获取新增初始数据"
-								placement="top"
-							>
-								<el-icon>
-									<QuestionFilled />
-								</el-icon>
-							</el-tooltip>
-						</template>
-						<el-switch
-							v-model="formConfig.addLoad"
-							@change="
-								formAttrChange({ key: 'addLoad', path: 'config' }, $event)
-							"
-						/>
-					</el-form-item>
-					<el-form-item>
-						<el-button @click="editFormStyle(state.tooltip.css)"
-						>
-							编辑表单样式
-							<el-tooltip :content="state.tooltip.css" placement="top">
-								<el-icon>
-									<QuestionFilled />
-								</el-icon>
-							</el-tooltip>
-						</el-button>
-						<el-button @click="editFormDict(state.tooltip.dict)"
-						>
-							设置数据字典
-							<el-tooltip :content="state.tooltip.dict" placement="top">
-								<el-icon>
-									<QuestionFilled />
-								</el-icon>
-							</el-tooltip>
-						</el-button>
-					</el-form-item>
-					<template v-if="!state.isSearch">
-						<div class="h3"><h3>接口数据事件</h3></div>
-						<el-form-item label="新增数据保存url">
-							<el-input
-								v-model="formConfig.addUrl"
-								placeholder="表单提交的url，非特殊不需要设置"
-							/>
-						</el-form-item>
-						<el-form-item label="修改数据保存url">
-							<el-input
-								v-model="formConfig.editUrl"
-								placeholder="修改提交的url，非特殊不需要设置"
-							/>
-						</el-form-item>
-						<el-form-item label="获取表单数据url">
-							<el-input
-								v-model="formConfig.requestUrl"
-								placeholder="获取表单数据url，非特殊不需要设置"
-							/>
-						</el-form-item>
-						<el-form-item class="event-btn">
-							<el-button
-								@click="
-								eventClick(
-									'beforeRequest',
-									'获取表单初始数据前事件，可修改请求参数'
-								)
-								"
-								>beforeRequest
-							</el-button>
-							<el-button
-								@click="
-								eventClick(
-									'afterResponse',
-									'获取表单初始数据后事件，可对请求返回数据进行处理；也可为字符串，如opt=formatTest'
-								)
-								"
-								>afterResponse
-							</el-button>
-							<el-button
-								@click="
-								eventClick(
-									'beforeSubmit',
-									'表单数据提交前事件，可对提交数据进行处理；也可为字符串，如opt=formatTest'
-								)
-								"
-								>beforeSubmit
-							</el-button>
-							<el-button
-								@click="eventClick('afterSubmit', '表单数据提交成功事件')"
-								>afterSubmit
-							</el-button>
-							<el-button
-								@click="
-								eventClick(
-									'change',
-									'表单组件值改变事件。当表单某值改变时，可修改其他组件的值；也可为字符串，如opt=formChange,字符串即为/utils/formChangeValue(name,model,key)中的key值'
-								)
-								"
-								>表单组件改变事件change
-							</el-button>
-						</el-form-item>
-					</template>
-				</el-form>
-			</el-tab-pane>
-		</el-tabs>
-	</div>
-	<!-- 轮播图设置弹窗 20240122 start -->
-	
-		<el-dialog v-model="dialogTableVisible" title="轮播图设置" top="20px" style="margin-top:70px">
-			<div v-if="controlData.type=='lowcodeCarsusel'" style="margin-bottom: 30px;">
-				<span style="margin-right: 10px;">轮播图宽度(像素):</span><el-input-number v-model="controlData.control.config.carsuselWidth" :step="64" :max="4096" :min="178"/>
-				<span style="margin-left:15px;margin-right: 10px;">轮播图高度(像素):</span><el-input-number v-model="controlData.control.config.carsuselHeight" :step="36" :max="4096" :min="100"/>
-				<span style="margin-left:15px;margin-right: 10px;">切图间隔(毫秒):</span><el-input-number v-model="controlData.control.config.interval" :step="200"/>
-			</div>
-		<el-table v-if="controlData.type=='lowcodeCarsusel'" :data="controlData.control.carsuselConfigArr" border style="width: 100%" row-key="imgId">
-			<el-table-column  label="设置图片" width="180" >
-				<template #default="propFlag">
-					<el-upload 
-					:action="uploadUrl"  :before-remove="beforeRemove"
-					:on-success="carouselImgUploadSuccess" 
-					:on-error="videoUploadErr"
-					:limit="1"
-					accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign">
-						<el-button v-if="!propFlag.row.uploadFlag" type="primary" @click="changeCurrentUploadImgid(propFlag.row)">点此上传</el-button>
-						<el-button v-if="propFlag.row.uploadFlag" type="primary" @click="changeCurrentUploadImgid(propFlag.row)">已上传,点击修改</el-button>
-					</el-upload>
-				</template>
-			</el-table-column>
-			<el-table-column prop="imgUrl" label="查看图片" width="180">
-				<template #default="imgScope">
-					<!-- {{ imgScope.row.imgUrl }} -->
-					
-					<el-image style="width: 100px; height: 100px;cursor:pointer;" :src="imgScope.row.imgUrl" fit="contain" alt="暂未上传" @click="handlePreview(imgScope.$index, imgScope.row)" >
-						<template #error>
-							<div class="image-slot">
-								<el-image style="width: 100px; height: 100px;" :src="errimg" fit="contain" ></el-image>
-							</div>
-						</template>
-					</el-image>
-				</template>
-			</el-table-column>
-			<el-table-column prop="link" label="链接地址">
-				<template #default="linkScope">
-					
-					<el-input v-model="linkScope.row.link"  placeholder="输入图片的链接地址" />
-				</template>
-			</el-table-column>
-			<el-table-column fixed="right" label="操作（增/删）" width="120" >
-				
-				<template #default="scope">
-					
-						<el-button v-if="controlData.control.carsuselConfigArr.length>1" type="danger" :icon="Delete" circle @click="deleteRow(scope.row)"/>
-					
-						<el-button v-if="controlData.control.carsuselConfigArr[controlData.control.carsuselConfigArr.length-1].imgId == scope.row.imgId" type="success" :icon="Plus" circle @click="createRow(scope.row)" />
-					
-				</template>
-			</el-table-column>
-		</el-table>
-	</el-dialog>
-	<!-- 图片预览  961.42-->
-	<el-image-viewer
-	v-if="showImagePreview"
-	:zoom-rate="1.2"
-	:url-list="carouselImgUrlList"
-	@close="closePreview"
-	/>
-	
-	<!-- 轮播图设置弹窗 liwenxuan 20240122 end -->
-		
-	<!-- 穿梭框设置弹窗 liwenxuan 20240217 start -->
+        <!-- 穿梭框设置弹窗 liwenxuan 20240217 start -->
 	<el-dialog v-model="transferDialogTableVisible" title="创建穿梭框选项树" top="150px" style="margin-top:70px;" width="50%" >
 		<div v-if="controlData.type=='lowcodeTransfer'">
 			<el-button type="success" plain style="margin-top: -35px;" @click="addRootNode()">新增根节点</el-button>
@@ -4434,14 +2996,23 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 	</el-dialog>
 
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
-
-
-	
-</template>
-<style  lang='scss' scoped>
-
-
-//!!!!!!!!!!!!!!!!!穿梭框编辑树样式start
+    </template>
+<style   lang='scss' scoped>
+    .form_cont{
+        padding: 0 10px;
+    }
+	.avatar-uploader{
+		width: 100px;
+		height: 100px;
+		.avatar{
+			width: 100px;
+			height: 100px;
+		}
+		.avatar-uploader-icon{
+			width: 100px;
+			height: 100px;
+		}
+	}
 .custom-tree-node {
 	flex: 1;
 	display: flex;
@@ -4453,8 +3024,6 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 .custom-tree-node:hover{
 	background-color:antiquewhite;
 }
-//!!!!!!!!!!!!!!!!!穿梭框编辑树样式end
-
 
 .associatedFormsHideDialogMain7{
 	display: flex;
@@ -4465,4 +3034,18 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 	--el-main-padding: 5px
 }
 </style>
->>>>>>> liwenxuan_v4
+<style  >
+	
+    .sidebar-tools .el-tabs__content{
+        padding: 0;
+		
+    }
+    .el-collapse-item__header {
+        padding-left: 10px;
+        background-color: rgb(229, 229, 229);
+    }
+    .el-collapse-item__header{
+        padding-left: 10px;
+        background-color: rgb(229, 229, 229);
+    }
+</style>
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 2b2063a01..04f37fd10 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -458,15 +458,15 @@ const getFormItemLableStyle = (ele: any) => {
 					</div>
 					
 				</template>
-<<<<<<< HEAD
+
 
 
 				<DigitPage v-else-if="element.type === 'digitpage'" :data="element" />
 
 
-=======
+
 				<AssociatedForms  v-else-if="element.type === 'associatedForms'" :data="element" />
->>>>>>> liwenxuan_v4
+
 				<LowcodeImage  v-else-if="element.type === 'lowcodeImage'" :data="element" />
 				<LowcodeTransfer  v-else-if="element.type === 'lowcodeTransfer'" :data="element" />
 
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 7630d66c7..e39ad0445 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -22,6 +22,7 @@ declare module '@vue/runtime-core' {
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
     ElAffix: typeof import('element-plus/es')['ElAffix']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -55,6 +57,7 @@ declare module '@vue/runtime-core' {
     ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -62,6 +65,7 @@ declare module '@vue/runtime-core' {
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
@@ -69,7 +73,9 @@ declare module '@vue/runtime-core' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -84,6 +90,7 @@ declare module '@vue/runtime-core' {
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTransfer: typeof import('element-plus/es')['ElTransfer']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -108,8 +115,26 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpCollection: typeof import('~icons/ep/collection')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpDownload: typeof import('~icons/ep/download')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPicture: typeof import('~icons/ep/picture')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
+    IEpPosition: typeof import('~icons/ep/position')['default']
+    IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
+    IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
+    IEpTop: typeof import('~icons/ep/top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
+    IEpUser: typeof import('~icons/ep/user')['default']
+    IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']