Merge branch 'qin_v5'

src/api/DesignForm/type.ts

@@ -220,3 +220,11 @@ export interface optionsInfo {
 	label: string;
 	value: string;
 }
+
+
+//定义树形结构体
+export interface treeStruct {
+	value: string
+	label?: string
+	children?: treeStruct[]
+}

src/components/DesignForm/aceDrawer.vue

@@ -6,9 +6,11 @@
 <script lang='ts' setup>
 import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
 import { aceEdit } from '@/api/DesignForm/utils'  
+import { treeStruct } from '@/api/DesignForm/type' 
 
 const props = withDefaults(
     defineProps<{
+		data?:object
 		modelValue: boolean
 		// eslint-disable-next-line vue/require-default-prop
 		title?: string
@@ -17,6 +19,7 @@ const props = withDefaults(
 		id?: string
 		// eslint-disable-next-line vue/require-default-prop
 		codeType?: string
+		data?: object
     }>(),
     {
 		id: 'editJson',
@@ -24,13 +27,36 @@ const props = withDefaults(
 		direction: 'ltr'
     }
 )
+
+
+
 const emits = defineEmits<{
     (e: 'beforeClose'): void
     (e: 'confirm', content: string): void
+	(e: 'confirmTree', content: string): void
     (e: 'update:modelValue', val: boolean): void
 }>()
 const editor = ref<any>({})
 const visible = ref(false)
+
+const treeSelectAry = reactive<treeStruct[]>([])			//树形数据
+const editTitleFormRef = ref(ElForm);	//编辑表单
+const editTitleInfoRef = ref(ElForm);
+let jibuqi = 0				//计步器计算最大值
+const isTopHeader = ref(false) //是否为添加顶级树脂
+const guodu =  ref<treeStruct>({})		//数据中转使用
+const addIsShow = ref(false)			//添加数据	
+const treeSelectTitle = reactive<treeStruct>({
+	value: "1",
+	label: ""
+})	//编辑表格结构及数据
+const butLoad = ref(false)			//按钮状态
+/**
+ * 表单验证规则
+ */
+const editTitleRules = reactive({
+	label: [{ required: true, message: "请输入名称", trigger: "blur" }],	
+});
 watch(
     () => props.modelValue,
     (val: boolean) => {
@@ -52,6 +78,7 @@ const dialogConfirm = () => {
 const drawerBeforeClose = () => {
     emits('update:modelValue', false)
     emits('beforeClose')
+	treeSelectAry=[]
 }
 onMounted(() => {})
 onUnmounted(() => {
@@ -60,6 +87,173 @@ onUnmounted(() => {
 		editor.value.container.remove()
     }
 })
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:03:26
+@ 功能: 打开添加弹窗
+*/
+const pickAdd = (val:treeStruct) => {
+	guodu.value = val
+	isTopHeader.value = false
+	addIsShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:06:41
+@ 功能: 关闭弹窗
+*/
+const pickAddClose = () => {
+	guodu.value  = {}
+	treeSelectTitle.label = ""
+	addIsShow.value = false
+	butLoad.value = false
+	editTitleFormRef.value.resetFields();
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:09:53
+@ 功能: 添加顶级分类
+*/
+const addTopClass = () => {
+	isTopHeader.value = true
+	addIsShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:10:27
+@ 功能: 确定添加分类
+*/
+const pickIsTrue = () => {
+	butLoad.value = true
+	editTitleFormRef.value.validate((isValid: boolean) => {
+		if(isValid){
+			jibuqi++
+			if(isTopHeader.value){
+				treeSelectAry.push({
+					value: jibuqi,
+					label: treeSelectTitle.label,
+					children: []
+				})
+			}else{
+				if(guodu.value.children){
+					guodu.value.children.push({
+						value: jibuqi,
+						label: treeSelectTitle.label,
+						children: []
+					})
+				}else{
+					guodu.value.children=[
+						{
+							value: jibuqi,
+							label: treeSelectTitle.label,
+							children: []
+						}
+					]
+				}
+			}
+			
+			pickAddClose()
+		}else{
+			butLoad.value = false
+		}
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 08:38:35
+@ 功能: 回填主表值
+*/
+const dialogConfirmTree = () => {
+
+	// let drawer = ({
+	// 	visible: false,
+	// 	type: '',
+	// 	title: '',
+	// 	codeType: '',
+	// 	direction: undefined, //弹出方向rtl / ltr
+	// 	callback: ''
+	// })
+	// let opt = new Array
+	// treeSelectAry.forEach((item:treeStruct) => {
+	// 	opt.push({
+	// 		value: item.value,
+	// 		label: item.label,
+	// 		children: item.children
+	// 	})
+	// })
+	
+	// emits('confirm', treeSelectAry)
+	emits('confirmTree', treeSelectAry)
+	drawerBeforeClose()
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 13:51:31
+@ 功能: 删除指定节点数据
+*/
+const pickDel = (val:treeStruct) => {
+	console.log("要删除得节点-->",val.value)
+	delDiGui(treeSelectAry,val)
+		console.log("删除指定节点数据---结果-->",treeSelectAry)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 14:13:23
+@ 功能: 执行递归删除
+*/
+const delDiGui = (tree: treeStruct[],val:treeStruct) => {
+	for (let i = 0; i < tree.length; i++) {
+        const node = tree[i];
+        if (node.value == val.value) {
+            tree.splice(i, 1);
+            return;
+        }
+        if (Array.isArray(node.children) && node.children.length) {
+            return delDiGui(node.children, val);
+        }
+    }
+}
+const edisIsShow = ref(false)
+const butLoadEdit = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:29:17
+@ 功能: 编辑级联舒体
+*/
+const pickEdis = (val:treeStruct) => {
+	guodu.value  = val
+	treeSelectTitle.label = val.label
+	edisIsShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:33:51
+@ 功能: 关闭编辑窗体
+*/
+const pickEditClose = () => {
+	guodu.value  = {}
+	treeSelectTitle.label = ""
+	edisIsShow.value = false
+	butLoadEdit.value = false
+	editTitleInfoRef.value.resetFields();
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:36:30
+@ 功能: 确定修改
+*/
+const pickEditIsTrue = () => {
+	butLoadEdit.value = true
+	editTitleInfoRef.value.validate((isValid: boolean) => {
+		if(isValid){
+			guodu.value.label   = treeSelectTitle.label
+			pickEditClose()
+		}else{
+			butLoad.value = false
+		}
+	})
+}
 </script>
 <template>
 	<el-drawer
@@ -74,12 +268,77 @@ onUnmounted(() => {
 		<template #header>
 			<div v-html="title"></div>
 		</template>
-		<div v-if="visible" :id="id"></div>
+		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">
+			<el-table
+				:data="treeSelectAry"
+				row-key="value"
+				default-expand-all
+			>
+				<el-table-column prop="label" label="名称" />
+				<el-table-column  label="操作" width="200" align="center">
+					<template #header>
+						<el-button type="success" @click="addTopClass">添加顶级分类</el-button>
+					</template>
+					<template #default="scope">
+						<el-button-group>
+							<el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
+							<el-button text type="warning" @click="pickEdis(scope.row)">修改</el-button>
+							<el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
+						</el-button-group>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		<div  v-else :id="id"></div>
 		<div class="dialog-footer">
-			<el-button type="primary" size="small" @click="dialogConfirm">
+			<el-button v-if="['cascader', 'treeSelect'].includes(props.data.type)" type="primary" size="small" @click="dialogConfirmTree">
 				确定
 			</el-button>
+			<el-button v-else  type="primary" size="small" @click="dialogConfirm">
+				确定
+			</el-button>
+		</div>
+
+		<el-dialog
+			v-model="addIsShow"
+			title="编辑"
+			width="500"
+			:before-close="pickAddClose"
+		>
+			<el-form ref="editTitleFormRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
+				<el-form-item label="名称：" prop="label">
+					<el-input v-model="treeSelectTitle.label" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="pickAddClose">取消</el-button>
+					<el-button v-loading="butLoad" type="primary" @click="pickIsTrue">确定</el-button>
 				</div>
+			</template>
+		</el-dialog>
+
+
+
+		<el-dialog
+			v-model="edisIsShow"
+			title="编辑"
+			width="500"
+			:before-close="pickEditClose"
+		>
+			<el-form ref="editTitleInfoRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
+				<el-form-item label="名称：" prop="label">
+					<el-input v-model="treeSelectTitle.label" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="pickEditClose">取消</el-button>
+					<el-button v-loading="butLoadEdit" type="primary" @click="pickEditIsTrue">确定</el-button>
+				</div>
+			</template>
+		</el-dialog>
+
 	</el-drawer>
 </template>
 <style  lang='scss' scoped>

src/components/DesignForm/aceDrawerPage.vue

@@ -0,0 +1,92 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-07-19 08:39:34
+@ 备注: 抽屉
+-->
+<script lang='ts' setup>
+import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { aceEdit } from '@/api/DesignForm/utils'
+
+const props = withDefaults(
+    defineProps<{
+		data?:object
+		modelValue: boolean
+		// eslint-disable-next-line vue/require-default-prop
+		title?: string
+		direction?: 'rtl' | 'ltr'
+		content: string
+		id?: string
+		// eslint-disable-next-line vue/require-default-prop
+		codeType?: string
+    }>(),
+    {
+		id: 'editJson',
+		content: '',
+		direction: 'ltr'
+    }
+)
+ const emits = defineEmits<{
+    (e: 'beforeClose'): void
+    (e: 'confirm', content: string): void
+    (e: 'update:modelValue', val: boolean): void
+}>()
+const editor = ref<any>({})
+ const visible = ref(false)
+watch(
+    () => props.modelValue,
+    (val: boolean) => {
+		visible.value = val
+		if (val) {
+			initEditor()
+		}
+    }
+)
+const initEditor = () => {
+    nextTick(() => {
+      	editor.value = aceEdit(props.content, props.id, props.codeType)
+    })
+}
+const dialogConfirm = () => {
+    const editVal = editor.value.getValue()
+    emits('confirm', editVal)
+}
+const drawerBeforeClose = () => {
+    emits('update:modelValue', false)
+    emits('beforeClose')
+}
+onMounted(() => {})
+onUnmounted(() => {
+    if (Object.keys(editor.value).length !== 0) {
+		editor.value.destroy()
+		editor.value.container.remove()
+    }
+})
+</script>
+<template>
+	<el-drawer
+		v-model="visible"
+		size="60%"
+		:title="title"
+		:direction="direction as any"
+		class="ace-dialog"
+		:append-to-body="true"
+		:before-close="drawerBeforeClose"
+	>
+		<template #header>
+			<div v-html="title"></div>
+		</template>
+		<div>{{props.data}}</div>
+		<div v-if="visible" :id="id"></div>
+		<div class="dialog-footer">
+			<el-button type="primary" size="small" @click="dialogConfirm">
+				确定
+			</el-button>
+		</div>
+	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+#editJson, #editJsonCopy {
+    width: 100%;
+    height: calc(100vh - 90px);
+}
+</style>

src/components/DesignForm/aceDrawerTree.vue

@@ -0,0 +1,254 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-07-19 08:39:34
+@ 备注: 抽屉
+-->
+<script lang='ts' setup>
+import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { aceEdit } from '@/api/DesignForm/utils'
+
+const props = withDefaults(
+    defineProps<{
+		modelValue: boolean
+		// eslint-disable-next-line vue/require-default-prop
+		title?: string
+		direction?: 'rtl' | 'ltr'
+		content: string
+		id?: string
+		// eslint-disable-next-line vue/require-default-prop
+		codeType?: string
+		data?: object
+    }>(),
+    {
+		id: 'editJson',
+		content: '',
+		direction: 'ltr'
+    }
+)
+
+interface treeStruct {
+	value: string
+	label?: string
+	children?: treeStruct[]
+}
+
+const emits = defineEmits<{
+    (e: 'beforeClose'): void
+    (e: 'confirm', content: string): void
+    (e: 'update:modelValue', val: boolean): void
+}>()
+const editor = ref<any>({})
+const visible = ref(false)
+
+const treeSelectAry = reactive<treeStruct[]>([])
+const editTitleFormRef = ref(ElForm);	//编辑表单
+watch(
+    () => props.modelValue,
+    (val: boolean) => {
+		visible.value = val
+		if (val) {
+			initEditor()
+		}
+    }
+)
+const initEditor = () => {
+    nextTick(() => {
+      	editor.value = aceEdit(props.content, props.id, props.codeType)
+    })
+}
+const dialogConfirm = () => {
+    const editVal = editor.value.getValue()
+    emits('confirm', editVal)
+}
+const drawerBeforeClose = () => {
+    emits('update:modelValue', false)
+    emits('beforeClose')
+}
+onMounted(() => {})
+onUnmounted(() => {
+    if (Object.keys(editor.value).length !== 0) {
+		editor.value.destroy()
+		editor.value.container.remove()
+    }
+})
+let jibuqi = 0
+const isTopHeader = ref(false)
+const guodu =  ref<treeStruct>({})
+const addIsShow = ref(false)
+const pickAdd = (val:treeStruct) => {
+	guodu.value = val
+	isTopHeader.value = false
+	addIsShow.value = true
+}
+const pickAddClose = () => {
+	guodu.value  = {}
+	treeSelectTitle.label = ""
+	addIsShow.value = false
+	butLoad.value = false
+	editTitleFormRef.value.resetFields();
+}
+//添加顶级分类
+const addTopClass = () => {
+	isTopHeader.value = true
+	addIsShow.value = true
+}
+//确认添加
+const treeSelectTitle = reactive<treeStruct>({
+	value: "1",
+	label: ""
+})
+const butLoad = ref(false)
+const pickIsTrue = () => {
+	butLoad.value = true
+	editTitleFormRef.value.validate((isValid: boolean) => {
+		if(isValid){
+			jibuqi++
+			if(isTopHeader.value){
+				treeSelectAry.push({
+					value: jibuqi,
+					label: treeSelectTitle.label,
+					children: []
+				})
+			}else{
+				if(guodu.value.children){
+					guodu.value.children.push({
+						value: jibuqi,
+						label: treeSelectTitle.label,
+						children: []
+					})
+				}else{
+					guodu.value.children=[
+						{
+							value: jibuqi,
+							label: treeSelectTitle.label,
+							children: []
+						}
+					]
+				}
+			}
+			
+			pickAddClose()
+		}else{
+			butLoad.value = false
+		}
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 08:38:35
+@ 功能: 设定值
+*/
+const dialogConfirmTree = () => {
+	emits('confirm', treeSelectAry)
+	drawerBeforeClose()
+}
+/**
+ * 表单验证规则
+ */
+const editTitleRules = reactive({
+	label: [{ required: true, message: "请输入名称", trigger: "blur" }],	
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 13:51:31
+@ 功能: 删除指定节点数据
+*/
+const pickDel = (val:treeStruct) => {
+	console.log("要删除得节点-->",val.value)
+	delDiGui(treeSelectAry,val)
+		console.log("删除指定节点数据---结果-->",treeSelectAry)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 14:13:23
+@ 功能: 执行递归删除
+*/
+const delDiGui = (tree: treeStruct[],val:treeStruct) => {
+	for (let i = 0; i < tree.length; i++) {
+        const node = tree[i];
+        if (node.value == val.value) {
+            tree.splice(i, 1);
+            return;
+        }
+        if (Array.isArray(node.children) && node.children.length) {
+            return delDiGui(node.children, val);
+        }
+    }
+}
+</script>
+<template>
+	<el-drawer
+		v-model="visible"
+		size="60%"
+		:title="title"
+		:direction="direction as any"
+		class="ace-dialog"
+		:append-to-body="true"
+		:before-close="drawerBeforeClose"
+	>
+		<template #header>
+			<div v-html="title"></div>
+		</template>
+		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">{{props.data}}
+		
+			<el-table
+				:data="treeSelectAry"
+				row-key="value"
+				default-expand-all
+			>
+				<el-table-column prop="label" label="名称" />
+				<el-table-column  label="操作" width="200" align="center">
+					<template #header>
+						<el-button type="success" @click="addTopClass">添加顶级分类</el-button>
+					</template>
+					<template #default="scope">
+						<el-button-group>
+							<el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
+							<el-button text type="warning" @click="pick(scope.row)">修改</el-button>
+							<el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
+						</el-button-group>
+					</template>
+				</el-table-column>
+			</el-table>
+		
+		</div>
+		<div v-else :id="id"></div>
+		<div class="dialog-footer">
+			<el-button v-if="['cascader', 'treeSelect'].includes(props.data.type)" type="primary" size="small" @click="dialogConfirmTree">
+				确定
+			</el-button>
+			<el-button v-else type="primary" size="small" @click="dialogConfirm">
+				确定
+			</el-button>
+		</div>
+		<el-dialog
+			v-model="addIsShow"
+			title="编辑"
+			width="500"
+			:before-close="pickAddClose"
+		>
+			<el-form ref="editTitleFormRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
+				<el-form-item label="名称：" prop="label">
+					<el-input v-model="treeSelectTitle.label" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="pickAddClose">取消</el-button>
+					<el-button v-loading="butLoad" type="primary" @click="pickIsTrue">确定</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</el-drawer>
+
+	
+
+
+
+</template>
+<style  lang='scss' scoped>
+#editJson, #editJsonCopy {
+    width: 100%;
+    height: calc(100vh - 90px);
+}
+</style>

src/components/DesignForm/formControlPropertiNew.vue

@@ -1840,7 +1840,7 @@ const currentAsfChangeCount = ref(0)
             }
         }
         // console.log(resDataForGlxxszExceptself1)
-        if(getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
+        if(getAssociatedFormsCurrentFieldTreeData && getAssociatedFormsCurrentFieldTreeData.treeAttrs && getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
             associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
                 id: 'rootid_'+getAssociatedFormsCurrentFieldTreeData.label,
                 //label: '当前表单',

src/components/DesignForm/public/expand/cascader.vue

@@ -0,0 +1,47 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:46:55
+@ 备注: 级联器
+-->
+<script lang='ts' setup>
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+		action?: string
+		name?: string
+		fileList?: Object
+		control?: Object
+		config?: Object
+		data?: Object
+		options?: Object
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		console.log("图片上传处理-112->",props.modelValue)
+		return props.modelValue
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+		return newVal
+	},
+});
+const handleChange = () => {
+
+}
+</script>
+<template>
+	<el-cascader
+      v-model="value"
+      :options="props.options"
+      @change="handleChange"
+    />
+</template>
+<style  lang='scss' scoped>
+
+</style>

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

@@ -36,6 +36,7 @@ import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
 import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
 import OrgCitys from '@/components/DesignForm/public/expand/orgCitys.vue'
 import DatePickerPage from '@/components/DesignForm/public/expand/datePicker.vue'
+import CascaderPage from '@/components/DesignForm/public/expand/cascader.vue'
 
 
 
@@ -202,6 +203,9 @@ const currentComponent = computed(() => {
 		// props.data.control.appendToBody =true   
 		return markRaw(DatePickerPage)
 	}
+	if(props.data.type === 'cascader'){
+		return markRaw(CascaderPage)
+	}
 	if (props.data.type === 'switch') {
 		if(typeof props.data.control.activeValue === "number"){
 			props.data.control.activeValue=props.data.control.activeValue.toString()
@@ -1135,10 +1139,22 @@ const uploadPic = (val:any) => {
 			/>
 
 			<component
-				v-if="['cascader', 'treeSelect'].includes(data.type)"
+				v-if="['cascader'].includes(data.type)"
 				:is="currentComponent"
 				v-bind="control"
+				:data="data"
+				:control="control"
+				:config="config"
+				:disabled="judgeIsDisabled(data.name)"
+				:options="options"
+				v-model="value"
+				
+			/>
 			
+			<component
+				v-if="['treeSelect'].includes(data.type)"
+				:is="currentComponent"
+				v-bind="control"
 				:disabled="judgeIsDisabled(data.name)"
 				:options="options"
 				v-model="value"

src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue

@@ -10,13 +10,14 @@ import { json2string,objToStringify,string2json,stringToObj } from '@/utils/Desi
 import { customerFormVersionCont } from '@/api/DesignForm/type'
 import { FormData,formStruct,DrawerStruct, VideoMsg } from '@/api/DesignForm/types'
 import { saveProductionForm,getOneProductionForm,haveCustomerFormVersion,editCustomerFormInfo,saveAsNewVersion,enableVersion,judgeSubmitCancel,createAppForm,editAppPageInfo,saveOtherVersion,previewAppFormVersion } from '@/api/DesignForm/requestapi'
-
+import { treeStruct } from '@/api/DesignForm/type' 
 
 //引入页面
 import DragControlApp from '@/components/DesignForm/dragControlApp.vue';
 import HeadToolsApp from '@/components/DesignForm/public/headToolsApp.vue';
 import FormDesign from '@/components/DesignForm/public/form/form.vue'
 import PreviewPage from '@/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue'
+import AceDrawerPage from '@/components/DesignForm/aceDrawerPage.vue'
 
 const props = defineProps({
 	appCont:{
@@ -104,7 +105,15 @@ const route: any = useRoute().query || {}
 const versionCont = ref<customerFormVersionCont[]>([])			//版本内容列表
 const tableKey = ref("")
 const versionId = ref<string>("")		//版本号
-const store = useDesignFormStore()
+// const store = useDesignFormStore()
+const store = useDesignFormStore() as any
+
+const controlData = computed(() => {
+        // console.log("注册自定义事件----------------->",props.formInfo)
+        // console.log("注册自定义事件--------1--------->",store.controlAttr)
+		// console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+        return store.controlAttr
+})
 const drawer = reactive<DrawerStruct>({
     visible: false,
     type: '',
@@ -544,15 +553,21 @@ function optionsValue3Get3(data: any,fieldName: string){
 	}
 }
 
-// 弹窗确认
+// 弹窗确认3174.15    2924.57     3326.15   3119.33
 const dialogConfirm = (editVal: string) => {
     // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+	console.log("生成脚本预览和导入",editVal)
+	console.log("生成脚本预览和导入----->",drawer.type,"==========",drawer.callback,"==========",drawer)
+	console.log("生成脚本预览和导入===========>",state.value.formData)
+	
     try {
       	if (typeof drawer.callback === 'function') {
+			console.log("1======2========>",drawer.codeType,stringToObj(editVal))
 			// callback
 			const newObj =
 			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
 			drawer.callback(newObj)
+			console.log("1==============>",)
       	} else {
 			switch (drawer.type) {
 				case 'css':
@@ -561,6 +576,7 @@ const dialogConfirm = (editVal: string) => {
 						state.value.formData.config = {}
 					}
 					state.value.formData.config.style = editVal
+					console.log("2==============>",)
 					break
 				case 'dict':
 					state.value.formDict = string2json(editVal)
@@ -575,17 +591,34 @@ const dialogConfirm = (editVal: string) => {
 						state.value.formData.events = {}
 					}
 					state.value.formData.events[drawer.type] = stringToObj(editVal)
+					console.log("3==============>",)
 					break
 				default:
 					state.value.formData = stringToObj(editVal)
+					console.log("4==============>",)
 			}
       	}
       	dialogCancel()
     } catch (res) {
 		// console.log(res.message)
-		//ElMessage.error(res.message)
+		ElMessage.error(res.message)
     }
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:53:30
+@ 功能: 级联选择与树
+*/
+const dialogConfirmTree = (val:treeStruct[]) => {
+	// console.log("级联选择与树",val)
+	// const newObj =
+	// 		drawer.codeType === 'json'? string2json(val): stringToObj(val)
+	// 		drawer.callback(newObj)
+			controlData.value.options = val
+	// console.log("级联选择与树--->",controlData)
+}
+
+
 </script>
 <template>
 	<el-aside class="asideBox leftBox">
@@ -634,14 +667,17 @@ const dialogConfirm = (editVal: string) => {
 			@form-name-change="formNameChanged"
 		/>
 	</el-aside>
+	
 	<ace-drawer
 		v-model="drawer.visible"
 		:title="drawer.title"
 		:direction="drawer.direction"
 		:content="drawer.content"
 		:code-type="drawer.codeType"
+		:data="drawer"
 		@before-close="dialogCancel"
 		@confirm="dialogConfirm"
+		@confirmTree="dialogConfirmTree"
 	/>
 	<PreviewPage v-model:state="state"   @clickClose="closePreviewPage" />
 </template>