diff --git a/src/assets/paintboard.png b/src/assets/paintboard.png
index 252b4631e..f2c79e0bb 100644
Binary files a/src/assets/paintboard.png and b/src/assets/paintboard.png differ
diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 7d739262f..5513bbdbd 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -12,757 +12,792 @@ const selectOption: any = [
 	  label: '标签3',
 	  value: 'value3'
 	}*/
-  ]
-  const config: { optionsType: number } = {
+]
+const config: { optionsType: number } = {
 	optionsType: 0 // 0固定 1数据源 2 接口字典
-  }
-  export default [
+}
+export default [
 	{
-	  title: '基础字段',
-	  children: [
-		{
-			type: 'input',
-			label: '单行文本',
-			icon: 'input',
-			iconFont: 'fa-text-width',
-			control: {
-				// 组件所有属性
-				modelValue: ''
-			},
-			config: {}, // 其他配置信息
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'digitpage',
-			label: '数值',
-			icon: 'money',
-			iconFont: 'fa-money',
-			control: {
-			  // 组件所有属性
-				modelValue: '',
-				mathFormula:{
-					formulaHtml:'',
-					mathsString:'',
-					mathsFormula:'',
-					takingMethod:1,
-					digit:2
-				}
-			},
-			config: {}, // 其他配置信息
-			selectvalue: "default",
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		  },
-		{
-			type: 'textarea',
-			label: '多行文本',
-			icon: 'textarea',
-			iconFont: 'fa-text-height',
-			control: {
-				modelValue: ''
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'radio',
-			label: '单选框组',
-			icon: 'radio',
-			iconFont: 'fa-dot-circle-o',
-			control: {
-				modelValue: '',
-				glxxsz:[],
-			},
-			options: selectOption, // 下拉选项数据集合
-			config: config,
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'checkbox',
-			label: '多选框组',
-			icon: 'checkbox',
-			iconFont: 'fa-check-square-o',
-			control: {
-				modelValue: [],
-				glxxszForCheckBox:[],
-			},
-			options: selectOption,
-			config: config,
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'select',
-			label: '下拉选择框',
-			icon: 'select',
-			iconFont: 'fa-toggle-down',
-			control: {
-				modelValue: '',
-				appendToBody: true,
-				glxxsz:[],
-			},
-			options: selectOption,
-			config: config,
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'datePicker',
-			label: '日期选择器',
-			icon: 'todo',
-			iconFont: 'fa-calendar',
-			control: {
-				modelValue: '',
-				type: 'date'
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'timePicker',
-			label: '时间选择器',
-			icon: 'time',
-			iconFont: 'fa-clock-o',
-			control: {
-				modelValue: ''
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'switch',
-			label: '开关',
-			icon: 'switch',
-			iconFont: 'fa-toggle-on',
-			control: {
-				modelValue: false
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'inputNumber',
-			label: '计数器',
-			icon: 'number',
-			iconFont: 'fa-sort-numeric-asc',
-			control: {
-				modelValue: 0
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'cascader',
-			label: '级联选择器',
-			icon: 'cascader',
-			iconFont: 'fa-sitemap',
-			control: {
-				modelValue: []
-			},
-			options: [],
-			config: config,
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'rate',
-			label: '评分',
-			icon: 'rate',
-			iconFont: 'fa-star-o',
-			control: {
-				modelValue: 0
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'slider',
-			label: '滑块',
-			icon: 'slider',
-			iconFont: 'fa-sliders',
-			control: {
-				modelValue: 0
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'treeSelect',
-			label: '树形控件',
-			icon: 'tree2',
-			iconFont: '',
-			control: {
-				modelValue: '',
-				data: [],
-				renderAfterExpand: false
-			},
-			config: {
-				optionsType: 0
-			},
-		  	styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'txt',
-			label: '文字',
-			icon: 'text',
-			iconFont: 'fa-file-word-o',
-			control: {
-				modelValue: ''
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'title',
-			label: '标题',
-			icon: 'title',
-			iconFont: 'fa-header',
-			control: {
-				modelValue: '标题'
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'button',
-			label: '按钮',
-			icon: 'button',
-			iconFont: 'fa-square-o',
-			control: {
-				label: '保存'
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'serialNumber',
-			label: '编码',
-			icon: 'number',
-			iconFont: 'fa-list-ol',
-			control: {
-			},
-			config: {
-				automatic:false
-			},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'urllink',
-			label: '链接',
-			icon: 'link',
-			iconFont: 'fa-link',
-			control: {
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'organization',
-			label: '联系地址',
-			icon: 'marker',
-			iconFont: 'fa-map-marker',
-			control: {
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'baidumap',
-			label: '地图',
-			icon: 'map',
-			iconFont: 'fa-map-o',
-			control: {
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-
-		  	type: 'colorPicker',
-			label: '取色器',
-			icon: 'color',
-			iconFont: '',
-			control: {
-				modelValue: ''
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'orgCentent',
-			label: '行政组织',
-			icon: 'sliders',
-			iconFont: 'fa-sliders',
-			control: {
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'signaturemap',
-			label: '签名板',
-			icon: 'faedit',
-			iconFont: 'fa-edit',
-			control: {
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		}
-	  ]
+		title: '基础字段',
+		children: [
+			{
+				type: 'title',
+				label: '标题',
+				icon: 'title',
+				iconFont: 'fa-header',
+				control: {
+					modelValue: '标题'
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'digitpage',
+				label: '数值',
+				icon: 'money',
+				iconFont: 'fa-money',
+				control: {
+					// 组件所有属性
+					modelValue: '',
+					mathFormula: {
+						formulaHtml: '',
+						mathsString: '',
+						mathsFormula: '',
+						takingMethod: 1,
+						digit: 2
+					}
+				},
+				config: {}, // 其他配置信息
+				selectvalue: "default",
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'input',
+				label: '单行文本',
+				icon: 'input',
+				iconFont: 'fa-text-width',
+				control: {
+					// 组件所有属性
+					modelValue: ''
+				},
+				config: {}, // 其他配置信息
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+
+			{
+				type: 'textarea',
+				label: '多行文本',
+				icon: 'textarea',
+				iconFont: 'fa-text-height',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'radio',
+				label: '单选框组',
+				icon: 'radio',
+				iconFont: 'fa-dot-circle-o',
+				control: {
+					modelValue: '',
+					glxxsz: [],
+					optionsValue3Formid:'',
+					optionsValue3Field:'',
+				},
+				options: selectOption, // 下拉选项数据集合
+				config: config,
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'checkbox',
+				label: '多选框组',
+				icon: 'checkbox',
+				iconFont: 'fa-check-square-o',
+				control: {
+					modelValue: [],
+					glxxszForCheckBox: [],
+					optionsValue3Formid:'',
+					optionsValue3Field:'',
+				},
+				options: selectOption,
+				config: config,
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'select',
+				label: '下拉选择框',
+				icon: 'select',
+				iconFont: 'fa-toggle-down',
+				control: {
+					modelValue: '',
+					appendToBody: true,
+					glxxsz: [],
+					optionsValue3Formid:'',
+					optionsValue3Field:'',
+				},
+				options: selectOption,
+				config: config,
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'cascader',
+				label: '级联选择器',
+				icon: 'cascader',
+				iconFont: 'fa-sitemap',
+				control: {
+					modelValue: []
+				},
+				options: [],
+				config: config,
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'datePicker',
+				label: '日期选择器',
+				icon: 'todo',
+				iconFont: 'fa-calendar',
+				control: {
+					modelValue: '',
+					type: 'date'
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'timePicker',
+				label: '时间选择器',
+				icon: 'time',
+				iconFont: 'fa-clock-o',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'txt',
+				label: '文字描述',
+				icon: 'text',
+				iconFont: 'fa-file-word-o',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'organization',
+				label: '联系地址',
+				icon: 'marker',
+				iconFont: 'fa-map-marker',
+				control: {
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'switch',
+				label: '开关',
+				icon: 'switch',
+				iconFont: 'fa-toggle-on',
+				control: {
+					modelValue: "",
+					glxxszSwitch: [
+						{
+							conditionField: '',
+							openValue: "",
+							showFields: []
+						},
+						{
+							conditionField: '',
+							offValue: "",
+							showFields: []
+						},
+					]
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'button',
+				label: '按钮',
+				icon: 'button',
+				iconFont: 'fa-square-o',
+				control: {
+					label: '保存'
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'inputNumber',
+				label: '计数器',
+				icon: 'number',
+				iconFont: 'fa-sort-numeric-asc',
+				control: {
+					modelValue: 0
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		]
 	},
 	{
-	  title: '高级字段',
-	  children: [
-		{
-			type: 'table',
-			label: '子表',
-			icon: 'table',
-			iconFont: 'fa-table',
-			list: [],
-			tableData: [], // 子表表格列表数据集合
-			control: {
-			  border: true
-			},
-			config: {
-			  addBtnText: '添加一行'
-			},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'component',
-			label: '自定义组件',
-			icon: 'component',
-			iconFont: 'fa-cubes',
-			control: {
-				modelValue: ''
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		  /*template: '', // 组件模板名称
-				  component: '' // 根据template注入的组件*/
-		},
-		{
-
-			type: 'upload',
-			label: '图片/文件',
-			icon: 'image',
-			iconFont: 'fa-file-image-o',
-			control: {
-				modelValue: '' // 也可以是[{name:'',url:''}]形式
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-
-		},
-		{
-			type: 'tinymce',
-			label: '富文本',
-			icon: 'tinymce',
-			iconFont: '',
-			control: {
-				modelValue: ''
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'videoUpAndPlay',
-			label: '视频',
-			icon: '',
-			iconFont: 'fa-play-circle',
-			control: {
-				modelValue: '',
-				videoMsg:[{
-					CreatedAt: '',
-					UpdatedAt: '',
-					fileSize: "0n",
-					id: "0n",
-					key: '',
-					name: '',
-					physicspath: '',
-					size: '',
-					tag: '',
-					type: 0,
-					url: '',
-					videoReady: false,
-					videoHeight:400,
-					videoWidth:700,
-					videoAutoPlay: false,
-					attrId: '',
-					poster:'',
-					loop: false
-				}]
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'lowcodeCarsusel',
-			label: '轮播图',
-			icon: '',
-			iconFont: 'fa-window-restore',
-			control: {
-				modelValue: '',
-				carsuselConfigArr:[{
-							uploadFlag:false,
-							imgId:'',
-							imgSort:1,
-							imgUrl: '',
-							link: ''
-				}],
+		title: '布局字段',
+		children: [
+			{
+				type: 'grid',
+				label: '格栅布局',
+				icon: 'grid',
+				iconFont: 'fa-th-large',
+				columns: [
+					// 格栅列数据
+					{
+						attr: { span: 12 },
+						list: []
+					},
+					{
+						attr: { span: 12 },
+						list: []
+					}
+				],
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'card',
+				label: '卡片布局',
+				icon: 'card',
+				iconFont: 'fa-credit-card',
+				list: [],
+				control: {},
+				config: {},
+				item: {}, // label标题相关
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'flex',
+				label: '弹性布局',
+				icon: 'flex',
+				iconFont: 'fa-file-text-o',
+				list: [],
+				tableData: [], // 值集合
+				control: {},
 				config: {
-					carsuselWidth:448,
-					carsuselHeight:252,
-					interval:2000,
+					addBtnText: '添加一行'
+				},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
 				}
 			},
-
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'lowcodeTransfer',
-			label: '穿梭框',
-			icon: '',
-			iconFont: 'fa-arrows-h',
-			control: {
-				modelValue: '',
-				fixedOptions: [{
-					id: 'thefirstrootnode',
-					label: '根节点1',
-					disabled: false,
-					children: []
-				},
-				{
-					id: 'thesecondrootnode',
-					label: '根节点2',
-					disabled: false,
-					children: []
-				}]
-			},
-			config: {
-				transferName:'穿梭框',
-				transferDataSource:'固定选项',
-				apiUrl:'/javasys/lowCode/transfer/getOrgAndManTree',
-				method:'post',
-			}
-		},
-		{
-			type: 'lowcodeImage',
-			label: '图片',
-			icon: '',
-			iconFont: 'fa-photo',
-			control: {
-				modelValue: '',
-				uploadFlag:false,
-				imgId:'',
-				imgUrl: '',
-				link: '',
-				fit:1,
-				radius:false,
-				radiusNum:5,
-				boderAndShadow:false,
-				showMode:'自定义像素值',
-				pxWidth:448,
-				pxHeight:252,
-				widthPercent:90,
-				heightPercent:90,
-				mt:0,
-				mb:0,
-				ml:0,
-				mr:0,
-				pt:0,
-				pb:0,
-				pl:0,
-				pr:0,
-				floatFlag:false,
-				floatValue:'left',
-			},
-			config: {}
-		},
-		{
-			type: 'associatedForms',
-			label: '关联表单',
-			icon: '',
-			iconFont: 'fa-wpforms',
-			control: {
-				modelValue: '',
-				hideConditionHtml:'',
-				hideConditionHtmlCopy:'',
-				formid: '',
-				dataRangeConditionHtml:'',
-				dataRangeConditionHtmlCopy:'',
-				saveFlag: false,
-				fillRoles: [
+			{
+				type: 'div',
+				label: '容器',
+				icon: 'div',
+				iconFont: '',
+				control: {},
+				config: {},
+				list: [],
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'tabs',
+				label: '标签页',
+				icon: 'tabs',
+				iconFont: 'fa-folder-o',
+				columns: [
 					{
-						leftValue:'',
-						rightValue:'',
-						id:'',
+						label: 'Tab1',
+						list: []
 					}
 				],
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+
+			{
+				type: 'divider',
+				label: '分割线',
+				icon: 'divider',
+				iconFont: '',
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
 			},
-			config: {}
-		}
-		
-	]
+
+		]
 	},
+
 	{
-	  title: '布局字段',
-	  children: [
-		{
-		  type: 'grid',
-		  label: '格栅布局',
-		  icon: 'grid',
-		  iconFont: 'fa-th-large',
-		  columns: [
-			// 格栅列数据
-				{
-				attr: { span: 12 },
-				list: []
-				},
-				{
-				attr: { span: 12 },
-				list: []
-				}
-			],
-			control: {},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'tabs',
-			label: '标签页',
-			icon: 'tabs',
-			iconFont: 'fa-folder-o',
-			columns: [
-				{
-				label: 'Tab1',
-				list: []
-				}
-			],
-			control: {},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'card',
-			label: '卡片布局',
-			icon: 'card',
-			iconFont: 'fa-credit-card',
-			list: [],
-			control: {},
-			config: {},
-			item: {}, // label标题相关
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'flex',
-			label: '弹性布局',
-			icon: 'flex',
-			iconFont: 'fa-file-text-o',
-			list: [],
-			tableData: [], // 值集合
-			control: {},
-			config: {
-				addBtnText: '添加一行'
-			},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'divider',
-			label: '分割线',
-			icon: 'divider',
-			iconFont: '',
-			control: {},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'div',
-			label: '容器',
-			icon: 'div',
-			iconFont: '',
-			control: {},
-			config: {},
-			list: [],
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		}
-	  ]
+		title: '高级控件',
+		children: [
+			{
+				type: 'lowcodeImage',
+				label: '图片',
+				icon: '',
+				iconFont: 'fa-photo',
+				control: {
+					modelValue: '',
+					uploadFlag: false,
+					imgId: '',
+					imgUrl: '',
+					link: '',
+					fit: 1,
+					radius: false,
+					radiusNum: 5,
+					boderAndShadow: false,
+					showMode: '自定义像素值',
+					pxWidth: 448,
+					pxHeight: 252,
+					widthPercent: 90,
+					heightPercent: 90,
+					mt: 0,
+					mb: 0,
+					ml: 0,
+					mr: 0,
+					pt: 0,
+					pb: 0,
+					pl: 0,
+					pr: 0,
+					floatFlag: false,
+					floatValue: 'left',
+				},
+				config: {}
+			},
+			{
+				type: 'videoUpAndPlay',
+				label: '视频',
+				icon: '',
+				iconFont: 'fa-play-circle',
+				control: {
+					modelValue: '',
+					videoMsg: [{
+						CreatedAt: '',
+						UpdatedAt: '',
+						fileSize: "0n",
+						id: "0n",
+						key: '',
+						name: '',
+						physicspath: '',
+						size: '',
+						tag: '',
+						type: 0,
+						url: '',
+						videoReady: false,
+						videoHeight: 400,
+						videoWidth: 700,
+						videoAutoPlay: false,
+						attrId: '',
+						poster: '',
+						loop: false
+					}]
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+
+				type: 'upload',
+				label: '文件',
+				icon: 'image',
+				iconFont: 'fa-file-image-o',
+				control: {
+					modelValue: '' // 也可以是[{name:'',url:''}]形式
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+
+			},
+			{
+				type: 'urllink',
+				label: '链接',
+				icon: 'link',
+				iconFont: 'fa-link',
+				control: {
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'table',
+				label: '子表',
+				icon: 'table',
+				iconFont: 'fa-table',
+				list: [],
+				tableData: [], // 子表表格列表数据集合
+				control: {
+					border: true
+				},
+				config: {
+					addBtnText: '添加一行'
+				},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'baidumap',
+				label: '地图',
+				icon: 'map',
+				iconFont: 'fa-map-o',
+				control: {
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'slider',
+				label: '滑块',
+				icon: 'slider',
+				iconFont: 'fa-sliders',
+				control: {
+					modelValue: 0
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'rate',
+				label: '评分',
+				icon: 'rate',
+				iconFont: 'fa-star-o',
+				control: {
+					modelValue: 0
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'tinymce',
+				label: '富文本',
+				icon: 'tinymce',//
+				iconFont: 'fa-list-alt',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'lowcodeCarsusel',
+				label: '轮播图',
+				icon: '',
+				iconFont: 'fa-window-restore',
+				control: {
+					modelValue: '',
+					carsuselConfigArr: [{
+						uploadFlag: false,
+						imgId: '',
+						imgSort: 1,
+						imgUrl: '',
+						link: ''
+					}],
+					config: {
+						carsuselWidth: 448,
+						carsuselHeight: 252,
+						interval: 2000,
+					}
+				},
+
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+
+			{
+				type: 'signaturemap',
+				label: '签名板',
+				icon: 'faedit',
+				iconFont: 'fa-edit',
+				control: {
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'lowcodeTransfer',
+				label: '穿梭框',
+				icon: '',
+				iconFont: 'fa-arrows-h',
+				control: {
+					modelValue: '',
+					fixedOptions: [{
+						id: 'thefirstrootnode',
+						label: '根节点1',
+						disabled: false,
+						children: []
+					},
+					{
+						id: 'thesecondrootnode',
+						label: '根节点2',
+						disabled: false,
+						children: []
+					}]
+				},
+				config: {
+					transferName: '穿梭框',
+					transferDataSource: '固定选项',
+					apiUrl: '/javasys/lowCode/transfer/getOrgAndManTree',
+					method: 'post',
+				}
+			},
+			{
+
+				type: 'colorPicker',
+				label: '取色器',
+				icon: 'color',
+				iconFont: '',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'treeSelect',
+				label: '树形控件',
+				icon: 'tree2',
+				iconFont: '',
+				control: {
+					modelValue: '',
+					data: [],
+					renderAfterExpand: false
+				},
+				config: {
+					optionsType: 0
+				},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'associatedForms',
+				label: '关联表单',
+				icon: '',
+				iconFont: 'fa-wpforms',
+				control: {
+					modelValue: '',
+					hideConditionHtml: '',
+					hideConditionHtmlCopy: '',
+					formid: '',
+					dataRangeConditionHtml: '',
+					dataRangeConditionHtmlCopy: '',
+					saveFlag: false,
+					asfasfLabel:'',
+					fillRoles: [
+						{
+							leftValue: '',
+							rightValue: '',
+							id: '',
+						}
+					],
+				},
+				config: {}
+			},
+			{
+				type: 'component',
+				label: '自定义组件',
+				icon: 'component',
+				iconFont: 'fa-cubes',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+				/*template: '', // 组件模板名称
+						component: '' // 根据template注入的组件*/
+			},
+
+
+
+
+
+
+
+
+		]
 	},
+
 	{
-	  title: '扩展组件',
-	  children: [
-		{
-			type: 'expand-user',
-			label: '选择用户',
-			icon: 'user',
-			iconFont: 'fa-user-o',
-			control: {
-				// 组件所有属性
-				modelValue: ''
-			},
-			config: {}, // 其他配置信息
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-		},
-		{
-			type: 'orgCentent',
-			label: '行政组织',
-			icon: 'sliders',
-			iconFont: 'fa-sliders',
-			control: {
-			},
-			config: {},
-			styles:{
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
+		title: '系统控件',//扩展组件
+		children: [
+			{
+				type: 'serialNumber',
+				label: '编码',
+				icon: 'number',
+				iconFont: 'fa-list-ol',
+				control: {
+				},
+				config: {
+					automatic: false
+				},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'expand-user',
+				label: '选择用户',
+				icon: 'user',
+				iconFont: 'fa-user-o',
+				control: {
+					// 组件所有属性
+					modelValue: ''
+				},
+				config: {}, // 其他配置信息
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'orgCentent',
+				label: '选择组织',
+				icon: 'sliders',
+				iconFont: 'fa-sliders',
+				control: {
+				},
+				config: {},
+				styles: {
+					divStyle: {},
+					labelStyle: {},
+					inputStyle: {}
+				}
 			}
-		}
-	  ]
+		]
+	},
+	{
+		title: '扩展组件',//
+		chileren: []
 	}
-  ]
-  
\ No newline at end of file
+]
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index d7e815205..d9518656c 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -619,19 +619,19 @@
                     path: 'config.componentName',
                     vShow: ['component']
                 },
-				{
-					label: '隐藏条件',
+                {
+					label: '关联表单',
 					value: config.associatedForms,
 					path: 'config.associatedForms',
-					type: 'associatedForms_hide',
+					type: 'associatedForms_form',
 					vIf: state.isSearch,
 					vShow: ['associatedForms']
 				},
-                {
-					label: '关联表单',
+				{
+					label: '隐藏条件',
 					value: config.associatedForms,
 					path: 'config.associatedForms',
-					type: 'associatedForms_form',
+					type: 'associatedForms_hide',
 					vIf: state.isSearch,
 					vShow: ['associatedForms']
 				},
@@ -1609,7 +1609,8 @@
     let currentUploadImgid = "";
     
     //刚拖拽视频组件时,初始化imgid监听designForm.activeKey,变化时,如果controlData.value.type=='lowcodeCarsusel',就遍历轮播图数组把imgid=''的都生成uuid
-    watch(()=>store.activeKey, () => {
+    watch(()=>store.activeKey, (newVal) => {
+        //啊啊啊啊
         if(controlData.value.type==='lowcodeCarsusel'){
             const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
             carsuselConfigData.forEach(element => {
@@ -1623,6 +1624,35 @@
         }else if(controlData.value.type==='associatedForms'){
             controlData.value.control.fillRoles[0].id = uuidv4().replaceAll('-','').toString();
         }
+        //实现关联表单设置可选字段中没有当前字段效果    start
+        //console.log(controlData.value.name)
+        resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself));
+        //console.log(resDataForGlxxszExceptself1)
+        
+        for(let i = 0;i<resDataForGlxxszExceptself1.length;i++){
+            let strArr:[string] = resDataForGlxxszExceptself1[i].id.split(":")
+            //console.log(strArr)
+            let str = strArr[strArr.length-1]
+            //console.log(str)
+            if(str==newVal){
+                resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移，数组长度减1
+                i--; // 如果不减，将漏掉一个元素
+            }
+        }
+        //console.log(resDataForGlxxszExceptself1)
+        if(getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
+            associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
+                id: 'rootid_'+getAssociatedFormsCurrentFieldTreeData.label,
+                //label: '当前表单',
+                label: '当前表单-'+getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
+                children: resDataForGlxxszExceptself1,
+                treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs,//
+            }]
+        }
+        
+        
+        //associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value.children = [...resDataForGlxxszExceptself1]
+        //实现关联表单设置可选字段中没有当前字段效果    end
     })
     //轮播图图片上传成功钩子
     function carouselImgUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
@@ -1876,9 +1906,22 @@ function getAsfasfFieldTree() {
     });
 }
 
+function getAsfasfFieldTreeOptionsValue3() {
+    return request({ 
+        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
+        method: 'post',
+        data: {
+            //cfid:'13'
+            cfid:controlData.value.control.optionsValue3Formid
+        },
+    });
+}
 
+//
 const asfasfFieldTree = ref<Tree[]>()
 
+const asfasfFieldTreeOptionsValue3 = ref<Tree[]>()
+
 function formidChanged(){
     
     if(controlData.value.control.formid===''){
@@ -1898,14 +1941,85 @@ function formidChanged(){
                     treeAttrs: data.treeAttrs,
                 }]
             }
+            controlData.value.control.asfasfLabel = data.label
+        });
+    }
+    
+}
+
+function formidChangedOptionsValue3(){
+    if(controlData.value.control.optionsValue3Formid===''){
+
+    }else{
+        getAsfasfFieldTreeOptionsValue3().then(({ data }) => {
+            
+            if(data.id==="cfid为空"){
+                //alert("cfid为空")
+            }else{
+
+                if(data.treeAttrs.onlyToShowTableId==""){//当前选中的是主表
+                    let resData = ref(data.children)
+                    //let rootid_ = data.value.label
+                    asfasfFieldTreeOptionsValue3.value = [{
+                        id: 'rootid_'+data.label,
+                        label: '关联的表单-'+data.label,
+                        children: [...resData.value],
+                        treeAttrs: data.treeAttrs,
+                    }]
+                }else{//当前选中的是子表
+                    let resData = ref(data.children)
+                    resData.value = resData.value.filter((item: { children: null }) => item.children != null)
+                    let arr = JSON.parse(JSON.stringify(resData.value));
+                    arr = arr.filter( (item: { label: any }) => item.label == data.treeAttrs.onlyToShowTableId )
+                
+                    arr = arr[0].children
+                    //console.log(arr)
+                    asfasfFieldTreeOptionsValue3.value = [{
+                        id: 'rootid_'+data.label,
+                        label: '关联的表单-'+data.label,
+                        children: [...arr],
+                        treeAttrs: data.treeAttrs,
+                    }]
+                    
+                    
+                }
+                let optionsValue3Formid = controlData.value.control.optionsValue3Formid
+                let str_optionsValue3Formid = optionsValue3Formid.split(":")[0]
+                let optionsValue3Field = controlData.value.control.optionsValue3Field
+                let str_optionsValue3Field = optionsValue3Field.split(":")[1]
+                //alert(str_optionsValue3Field)
+                if(typeof(str_optionsValue3Field)!='undefined'){
+                    if(str_optionsValue3Formid!=str_optionsValue3Field){
+                        controlData.value.control.optionsValue3Field = ""
+                    }else{
+                        if(optionsValue3Formid.includes(":zibiaoid-")){
+                            let zibiaoid = optionsValue3Formid.split(":zibiaoid-")[1]
+                            if(!optionsValue3Field.includes(zibiaoid)){
+                                controlData.value.control.optionsValue3Field = ""
+                            }
+                        }
+                    }
+
+                    
+                }
+                
+                
+            }
+            
         });
     }
 }
 
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
 const associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>()
+let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>()
+let resDataForGlxxszExceptself: any[] = []
+let resDataForGlxxszExceptself1: any[] = []
+let getAssociatedFormsCurrentFieldTreeData:any
 getAssociatedFormsCurrentFieldTree().then(({ data }) => {
-    
+    //console.log(data)
+    getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
+    //console.log(getAssociatedFormsCurrentFieldTreeData)
     if(data.id==="cfid为空"){
         //alert("cfid为空")
     }else{
@@ -1921,6 +2035,11 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
 
         let resDataForGlxxsz = ref(data.children.slice(8))
         
+        resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
+        
+        //console.log(resDataForGlxxszExceptself)
+        
+        
         
         associatedFormsCurrentFormFieldTreeForGlxxsz.value = [{
             id: 'rootid_'+data.label,
@@ -1929,6 +2048,15 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
             children: [...resDataForGlxxsz.value],
             treeAttrs: data.treeAttrs,
         }]
+        associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
+            id: 'rootid_'+data.label,
+            //label: '当前表单',
+            label: '当前表单-'+data.treeAttrs.show,
+            children: [...resDataForGlxxsz.value],
+            treeAttrs: data.treeAttrs,//getAssociatedFormsCurrentFieldTreeData
+        }]
+
+        
     }
 });
 
@@ -2191,6 +2319,11 @@ watch(()=>store.activeKey, () => {
         setTimeout(() => {
             formidChanged()
         }, 800);
+    }else if(controlData.value.type==='radio'||controlData.value.type==='select'||controlData.value.type==='checkbox'){
+        
+        setTimeout(() => {
+            formidChangedOptionsValue3()
+        }, 800);
     }
 })
 
@@ -2213,6 +2346,14 @@ function delRole(id:String){
             }
         }
 }
+const associatedFormsChooseDialogFlag = ref(false)
+function chooseAssociatedForm(){
+    associatedFormsChooseDialogFlag.value = true
+}
+function handleDetermineAssociatedFormsChooseDialog(){
+    associatedFormsChooseDialogFlag.value = false
+}
+
 
 
 //liwenxuan20240403 associatedForms end 
@@ -2222,6 +2363,14 @@ function delRole(id:String){
 
 const glxxszDialogFlag = ref(false)
 const glxxszDialogFlagCheckBox = ref(false)
+const glxxszDialogFlagSwitch = ref(false)
+function handelGlxxszDialogSwitch(){
+    if(controlData.value.control.activeValue==undefined||controlData.value.control.inactiveValue==undefined){
+        alert("请先设置开关状态打开/关闭时的值")
+    }else{
+        glxxszDialogFlagSwitch.value = true
+    }
+}
 function handelGlxxszDialog(){
     if(controlData.value.options.length===0){
         alert("无可配置选项，请先添加。")
@@ -2237,9 +2386,27 @@ function handelGlxxszDialogCheckbox(){
 function handleDetermineGlxxszDialog(){
     glxxszDialogFlag.value = false
 }
+function handleDetermineGlxxszDialogSwitch(){
+    glxxszDialogFlagSwitch.value = false
+}
 function handleDetermineGlxxszDialogCheckBox(){
     glxxszDialogFlagCheckBox.value = false
 }
+//同步开关的设置值和开关关联选项设置的值
+watch(()=>controlData.value.control,(newVal) => {
+    if(typeof(newVal)!="undefined"){
+        if(typeof(newVal.glxxszSwitch)!="undefined"){
+            if(typeof(controlData.value.control.activeValue)!="undefined"){
+                controlData.value.control.glxxszSwitch[0].openValue = controlData.value.control.activeValue
+                controlData.value.control.glxxszSwitch[0].conditionField = controlData.value.name
+            }
+            if(typeof(controlData.value.control.inactiveValue)!="undefined"){
+                controlData.value.control.glxxszSwitch[1].offValue = controlData.value.control.inactiveValue
+                controlData.value.control.glxxszSwitch[1].conditionField = controlData.value.name
+            }
+        }
+    }
+},{ deep: true })
 
 
 
@@ -2295,8 +2462,17 @@ function createRowForGlxxsz(){
 function deleteRowForGlxxsz(row: { id: any }){
     controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id!=row.id)
 }
+/*  */
+
+const optionsValue3SettingDialogOpenFlag = ref(false)
+function optionsValue3Setting(){
+    optionsValue3SettingDialogOpenFlag.value = true
+}
+function handleDetermineoptionsValue3(){
+    optionsValue3SettingDialogOpenFlag.value = false
+}
+
 
-//修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改
 
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
 
@@ -2765,18 +2941,8 @@ const loadNextPage = () => {
 
 
                                 <el-row v-else-if="item.type === 'associatedForms_form'">
-                                    <div  style="margin-top: 25px;margin-left: -60px;">
-                                        <el-tree-select
-                                            v-model="controlData.control.formid"
-                                            style="width: 260px;"
-                                            :data="customerFormTree[0].children"
-                                            check-strictly
-                                            :render-after-expand="false"
-                                            filterable
-                                            @change="formidChanged"
-                                        />
-                                    </div>
-                                    <!-- <div v-html="controlData.control.formid"></div> -->
+                                    <el-button type="primary" link style="display:block;cursor: pointer;" @click="chooseAssociatedForm">{{ controlData.control.asfasfLabel==''?'选择关联表单':controlData.control.asfasfLabel }}</el-button>
+                                    
 								</el-row> 
 
                                 <el-row v-else-if="item.type === 'associatedForms_dataRange'">
@@ -2920,6 +3086,9 @@ const loadNextPage = () => {
                                 </el-form-item>
                             </div>
                         </div>
+                        <div v-if="showHide(['switch'],true)">
+                            <el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
+                        </div>
                         <div v-if="showHide(['radio','select',],true)">
                             <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
                         </div>
@@ -2955,6 +3124,7 @@ const loadNextPage = () => {
                                     @change="controlData.config.optionsFun = ''"
                                 >
                                     <el-option :value="0" label="固定选项" />
+                                    <el-option :value="3" label="系统表单字段"/>
                                     <el-option :value="1" label="数据源" />
                                     <el-option :value="2" label="接口字典" />
                                 </el-select>
@@ -2984,6 +3154,10 @@ const loadNextPage = () => {
                                     <el-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button>
                                 </el-form-item>
                             </template>
+                            <template v-if="controlData.config.optionsType === 3">
+                                <el-button type="primary" style="margin-bottom:10px;margin-left:11px" plain @click="optionsValue3Setting">选择系统表单字段</el-button>
+                                <!--  <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button> -->
+                            </template>
                             <template v-else>
                                 <el-form-item class="form_cont">
                                     <el-input
@@ -3500,6 +3674,32 @@ const loadNextPage = () => {
 
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
 
+
+
+    <el-dialog  v-model="associatedFormsChooseDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择关联表单" :show-close="false" style="margin-top:70px;" width="50%" >
+        <template v-if="controlData.type=='associatedForms'">
+            <div style="display:flex;margin-bottom: 2px;margin-top:28px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择表单</span>
+                <el-tree-select
+                    v-model="controlData.control.formid"
+                    style="width: 390px;"
+                    :data="customerFormTree[0].children"
+                    check-strictly
+                    :render-after-expand="false"
+                    filterable
+                    @change="formidChanged"
+                />
+            </div>
+            
+        </template>
+        <template #footer>
+        <div class="dialog-footer">
+            <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">
+            确定
+            </el-button>
+        </div>
+        </template> 
+    </el-dialog>
+
     
 
 	<el-dialog v-model="associatedFormsHideDialogFlag" title="隐藏条件" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
@@ -3749,8 +3949,8 @@ const loadNextPage = () => {
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
 
 
-<!-- 关联选项设置弹窗 liwenxuan 20240426 start -->
-        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+<!-- 关联选项设置弹窗 liwenxuan 20240426 start -->  <!-- :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name" -->
+        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false"    :title="`关联选项设置--`+controlData.name"  :show-close="false" style="margin-top:70px;" width="50%" >
 
             
             
@@ -3770,7 +3970,7 @@ const loadNextPage = () => {
                     <el-table-column fixed="right" label="显示以下组件" >
                             <template #default="fieldScope">
                                 
-                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
                             </template>
                     </el-table-column>
                 </el-table>
@@ -3785,7 +3985,7 @@ const loadNextPage = () => {
         </template>
         </el-dialog>
 
-        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
 
             
             
@@ -3803,7 +4003,7 @@ const loadNextPage = () => {
 
                     <el-table-column fixed="right" label="显示以下组件" >
                         <template #default="fieldScope">
-                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
                         </template>
                     </el-table-column>
 
@@ -3831,7 +4031,68 @@ const loadNextPage = () => {
             </template>
             </el-dialog>
 
+
+
+
+
+            <el-dialog  v-model="glxxszDialogFlagSwitch" class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
+
+                        
+                        
+                <template v-if="controlData.type=='switch'">
+                    <div style="display:flex;margin-bottom: 20px;margin-top:20px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关打开时显示</span>
+                        <el-tree-select v-model="controlData.control.glxxszSwitch[0].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
+                    </div>
+                    <div style="display:flex"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关关闭时显示</span>
+                        <el-tree-select v-model="controlData.control.glxxszSwitch[1].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
+                    </div>
+                    
+                </template>
+                <template #footer>
+                <div class="dialog-footer">
+                    
+                    <el-button type="primary" @click="handleDetermineGlxxszDialogSwitch">
+                    确定
+                    </el-button>
+                </div>
+                </template> 
+            </el-dialog>
+
+
         <!-- 关联选项设置弹窗 liwenxuan 20240426 end -->
+
+        <!-- 单选下拉多选选项来源value3--系统表单字段 start-->
+
+        <el-dialog  v-model="optionsValue3SettingDialogOpenFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择表单字段" :show-close="false" style="margin-top:70px;" width="50%" >
+            <template v-if="controlData.type=='radio'||controlData.type=='select'||controlData.type=='checkbox'">
+                <div style="display:flex;margin-bottom: 20px;margin-top:20px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择表单</span>
+                    <el-tree-select
+                        v-model="controlData.control.optionsValue3Formid"
+                        style="width: 390px;"
+                        :data="customerFormTree[0].children"
+                        check-strictly
+                        :render-after-expand="false"
+                        filterable
+                        @change="formidChangedOptionsValue3"
+                    />
+                </div>
+                <div style="display:flex" v-if="typeof(controlData.control.optionsValue3Formid)!='undefined' && typeof(asfasfFieldTreeOptionsValue3)!='undefined' && controlData.control.optionsValue3Formid!=''"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择字段</span>
+                    <!--
+                        
+                        
+                    -->
+                    <el-tree-select v-model="controlData.control.optionsValue3Field" style="width: 390px;" :data="asfasfFieldTreeOptionsValue3[0].children"    />
+                </div>
+            </template>
+            <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="handleDetermineoptionsValue3">
+                确定
+                </el-button>
+            </div>
+            </template> 
+        </el-dialog>
+    <!-- 单选下拉多选选项来源value3--系统表单字段 end-->
     </template>
 
 <style   lang='scss' scoped>   
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 8774d306e..b4de962df 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -164,7 +164,9 @@ const forEachGetFormModel = (list: FormList[], obj: any) => {
 			})
 		} else if (['card', 'div'].includes(item.type)) {
 			forEachGetFormModel(item.list, obj)
-		} else {
+		} /* else if(['switch'].includes(item.type)){
+			console.log(item)
+		} */else {
 			const excludeType = ['title', 'divider', 'txt', 'button']
 			if (excludeType.indexOf(item.type) === -1) {
 				obj[item.name] = jsonParseStringify(item.control.modelValue)
@@ -219,6 +221,9 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		/* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
 		console.log(modelKeyArr) */
 
+		//console.log("当前表单的值-------------------")
+		//console.log(model.value)
+
 		
 
 		//当前处于显示状态的默认隐藏的字段
@@ -295,7 +300,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 					console.log(conditionFieldValue) */
 					for(let n = 0; n< modelKeyArr.length;n++){
 						if(modelKeyArr[n]==conditionField){
-							let count_1 = 0;
+							//let count_1 = 0;
 							let trueValue = model.value[modelKeyArr[n]]
 							if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
 								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
@@ -304,7 +309,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 								console.log(toshow) */
 								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
 								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
-								for(let a = 0;a<hideFieldConditionArr.length;a++){
+								/* for(let a = 0;a<hideFieldConditionArr.length;a++){
 									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
 										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
 											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
@@ -315,7 +320,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 											}
 										}
 									}
-								}
+								} */
 								if(flag==false){
 									x++
 									hideFieldsFromCheckbox.push(toshow)
@@ -332,7 +337,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 					//console.log(conditionFieldValue)
 					for(let n = 0; n< modelKeyArr.length;n++){
 						if(modelKeyArr[n]==conditionField){
-							let count_1 = 0;
+							//let count_1 = 0;
 							let trueValue = model.value[modelKeyArr[n]]
 							//console.log(modelKeyArr[n])
 							//console.log(trueValue)
@@ -371,6 +376,9 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 			model.value[hideFieldArr[i]] = ""
 		}else if( model.value[hideFieldArr[i]] instanceof Array){
 			model.value[hideFieldArr[i]] = []
+		}else if(typeof model.value[hideFieldArr[i]] == "boolean"){
+			
+			model.value[hideFieldArr[i]] = false
 		}
 	}
 	//默认隐藏的字段中目前被显示出来的
@@ -473,6 +481,39 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		}
 	// })
 	
+	showOrHide()
+
+	if (typeof props.changeKeyVal === 'function') {
+		props.changeKeyVal(key, value,type,attribute)
+	}
+    if (key) {
+		if (!tProp) {
+			// 表格和弹性布局不是这里更新，只触change
+			model.value[key] = value
+		}
+		// 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
+		if (props.formData.events?.change) {
+			model.value = props.formData.events.change(key, model.value)
+		}
+		const onFormChange = props.formData.events?.change
+		if (onFormChange) {
+			if (typeof onFormChange === 'function') {
+				model.value = onFormChange(key, model.value)
+			} else {
+				model.value = formChangeValue(key, model.value, onFormChange)
+			}
+		}
+		// 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
+		emits('change', { key, value, model: model.value, data, tProp })
+    }
+
+		
+	/* 
+		
+	*/
+})
+
+function showOrHide (){
 	//liwenxuan 关联选项设置效果实现 start
 	 /* console.log("监听表单-1-constControlChange-->",props.formData)
 	 console.log("监听表单-2-constControlChange-->",key)
@@ -492,13 +533,14 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	
 
 
-	//得到所有配置对象，包括radio,checkbox,select
+	//得到所有配置对象，包括radio,checkbox,select,switch
 	const radioSelectShowConfigArr = []
 	const checkboxShowConfigArr = []
+	const switchShowConfigArr = []
 	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
 	const radioSelectArr2:any[] = []
 	for(let i = 0;i<props.formData.list.length;i++){
-		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"||props.formData.list[i].type=="checkbox"){
+		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"||props.formData.list[i].type=="checkbox"||props.formData.list[i].type=="switch"){
 			props.formData.config.hideField = [];
 		}
 		//console.log(props.formData.list[i].type)
@@ -508,15 +550,18 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		}else if(props.formData.list[i].type=="checkbox"){
 			
 			checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox)
+		}else if(props.formData.list[i].type=="switch"){
+			switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch)
 		}
 	}
 	//数组深拷贝
 	const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
 	const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
+	const switchShowConfigArr2 = JSON.parse(JSON.stringify(switchShowConfigArr));
 	/* console.log(radioSelectShowConfigArr2)
 	console.log(checkboxShowConfigArr2) */
-
-
+	//console.log("fodijafkjlsdhoidnfoidshojhfeknsidjfoiewhofnosdifhjeonoidufeinkdsaofhe")
+	//console.log(switchShowConfigArr2)
 
 	if(radioSelectShowConfigArr2.length>0){
 		for(let i = 0;i<radioSelectShowConfigArr2.length;i++){
@@ -564,8 +609,29 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 	} 
-
-
+	
+	//将出现在开关配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+	if(switchShowConfigArr2.length>0){
+		for(let i = 0;i<switchShowConfigArr2.length;i++){
+			if(switchShowConfigArr2[i].length>0){
+				for(let j = 0; j<switchShowConfigArr2[i].length;j++){
+					if(switchShowConfigArr2[i][j].showFields.length>0){
+						for(let n = 0; n<switchShowConfigArr2[i][j].showFields.length;n++){
+							//console.log("99999999999999999999------"+switchShowConfigArr2[i][j].showFields[n])
+							let fieldKeyArr = switchShowConfigArr2[i][j].showFields[n].split(":")
+							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+							//console.log(fieldKeyStr)
+							radioSelectArr2.push({
+								toShowFieldKey:fieldKeyStr,
+							})
+						}
+					}
+				}
+			}
+		}
+	}
+	//console.log("radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2=======")
+	//console.log(radioSelectArr2)
 	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
 	const radioSelectArr3:any[] = []
 	
@@ -645,9 +711,35 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 	}
+	
+	//将开关配置也放入radioSelectArr3
+	if(switchShowConfigArr2.length>0){
+		for(let i = 0;i<switchShowConfigArr2.length;i++){
+			if(switchShowConfigArr2[i].length>0){
+				for(let j = 0;j<switchShowConfigArr2[i].length;j++){
+					//数组深拷贝
+					const jArr = JSON.parse(JSON.stringify(switchShowConfigArr2[i][j]));
+					//console.log("111111111111111111111-----------"+JSON.stringify(switchShowConfigArr2[i][j]))
+					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
+						const optionValueJArr = typeof(jArr.openValue)=="undefined"?jArr.offValue:jArr.openValue
+						let arr1 = []
+						for(let n = 0;n<jArr.showFields.length;n++){
+							let fieldKeyArr = jArr.showFields[n].split(":")
+							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+							//console.log(fieldKeyStr)
+							arr1.push(fieldKeyStr)
+						}
+						radioSelectArr3.push({
+								conditionFieldKey:jArr.conditionField,
+								conditionFieldValue:optionValueJArr,
+								toShowFieldKey:arr1,
+						})
+					}
+				}
+			}
+		}
+	}
 	//console.log(radioSelectArr3)
-
-
 	//暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
 	let hideFieldArr: any[] = [];
 	
@@ -679,36 +771,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	
 	 //props.formData.config?.hideField?.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
 	//console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
+}
 
-	if (typeof props.changeKeyVal === 'function') {
-		props.changeKeyVal(key, value,type,attribute)
-	}
-    if (key) {
-		if (!tProp) {
-			// 表格和弹性布局不是这里更新，只触change
-			model.value[key] = value
-		}
-		// 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
-		if (props.formData.events?.change) {
-			model.value = props.formData.events.change(key, model.value)
-		}
-		const onFormChange = props.formData.events?.change
-		if (onFormChange) {
-			if (typeof onFormChange === 'function') {
-				model.value = onFormChange(key, model.value)
-			} else {
-				model.value = formChangeValue(key, model.value, onFormChange)
-			}
-		}
-		// 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
-		emits('change', { key, value, model: model.value, data, tProp })
-    }
-
-		
-	/* 
-		
-	*/
-})
 const dictForm = computed(() => {
     const storage = window.localStorage.getItem('akFormDict')
     let storageDict = {}
@@ -1162,6 +1226,7 @@ onMounted(() => {
     nextTick(() => {
       	appendRemoveStyle(true)
     })
+	showOrHide()
 })
 onUnmounted(() => {
     if (eventName) {
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 1fbf60d9c..094f12854 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -118,8 +118,16 @@ declare module '@vue/runtime-core' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+<<<<<<< HEAD
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+=======
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
+>>>>>>> lwx_v9
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
index 7cd1fad3c..3595a9d64 100644
--- a/src/views/sysworkflow/lowcodepage/pageDesignes.vue
+++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
@@ -569,9 +569,16 @@ onMounted(() => {
 	getInitData()
 })
 //监听版本变化
+<<<<<<< HEAD
 watch(() =>versionId.value ,(val:string)=>{
 	emits('update:formVersion', val)
 })	
+=======
+// watch(() =>versionId.value ,(val:string)=>{
+// 	emits('update:formVersion', val)
+
+// })	
+>>>>>>> lwx_v9
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-09 14:29:06
diff --git a/src/widget/writingboard/vueSignature.vue b/src/widget/writingboard/vueSignature.vue
index 2f5752984..ccb580246 100644
--- a/src/widget/writingboard/vueSignature.vue
+++ b/src/widget/writingboard/vueSignature.vue
@@ -102,20 +102,24 @@
   const getSizeRatio = () => {
     return !props.fullScreen && props.backIsCenter
   }
-  const setCanvasImageBack = (status: any) => {
-    const canvas = canvasRef.value as HTMLCanvasElement
-    let pat = canvasTxt.value?.createPattern(canvasBackDom.value, (props.isRepeat || "no-repeat"));
-    canvasTxt.value?.rect(0,0,canvas.width ,canvas.height)
-    canvasTxt!.value!.fillStyle = (pat as any); 
-    canvasTxt.value?.fill();
-    if (status) {
-        autoDraw(null, null)
+  const setCanvasImageBack = (status: any,canvas:any) => {
+    //const canvas = canvasRef.value as HTMLCanvasElement
+    //console.log(canvas)
+    if(typeof(canvas)!="undefined"&&typeof(canvas.width)!="undefined"){
+      let pat = canvasTxt.value?.createPattern(canvasBackDom.value, (props.isRepeat || "no-repeat"));
+      canvasTxt.value?.rect(0,0,canvas.width ,canvas.height)
+      canvasTxt!.value!.fillStyle = (pat as any); 
+      canvasTxt.value?.fill();
+      if (status) {
+          autoDraw(null, null)
+      }
     }
+    
   }
-  const setCanvasBack = (status: any) => {
-     const canvas = canvasRef.value as HTMLCanvasElement
+  const setCanvasBack = (status: any,canvas:any) => {
+     //const canvas = canvasRef.value as HTMLCanvasElement
      if (props.canvasBack && canvasBackDom.value && isImgaes(props.canvasBack)) {
-      setCanvasImageBack(status)
+      setCanvasImageBack(status,canvas)//liwenxuan
       } else {
         canvas.style.background = canvasBackground.value
       }
@@ -145,12 +149,19 @@
       canvasTxt.value?.scale(1 * sratio.value, 1 * sratio.value)
       sratio.value = realw / (domPatams.width ? domPatams.width : props.fullScreen ? screenPatams.width : props.width)
       canvasTxt.value?.scale(1 / sratio.value, 1 / sratio.value)
+      
       if (props.canvasBack) {
         let IntervaId = setInterval(() => {
-          if ((canvasBackDom.value && isLoad.value) || !isImgaes(props.canvasBack)) {
-            setCanvasBack(status)
-            clearInterval(IntervaId)
+          //console.log("111111111111111111111111111111111111111111111111111111")
+          //console.log(canvas)
+          if(typeof(canvas)!="undefined"){
+            //console.log(canvas)
+            if ((canvasBackDom.value && isLoad.value) || !isImgaes(props.canvasBack)) {
+              setCanvasBack(status,canvas)//liwenxuan
+              clearInterval(IntervaId)
+            }
           }
+          
         }, 100)
       } else {
         if (status) {