解决冲突文件

src/types/components.d.ts

@@ -123,7 +123,6 @@ declare module '@vue/runtime-core' {
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
-<<<<<<< HEAD
     IEpCollection: typeof import('~icons/ep/collection')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpDownload: typeof import('~icons/ep/download')['default']
@@ -136,24 +135,12 @@ declare module '@vue/runtime-core' {
     IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['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']
-    IEpRefresh: typeof import('~icons/ep/refresh')['default']
->>>>>>> v8_master
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
-<<<<<<< HEAD
     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']
-=======
-    IEpUser: typeof import('~icons/ep/user')['default']
->>>>>>> lwx_v8
     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']

src/views/sysworkflow/lowcodepage/pageDesignes.vue

@@ -569,10 +569,9 @@ onMounted(() => {
 	getInitData()
 })
 //监听版本变化
-// watch(() =>versionId.value ,(val:string)=>{
-// 	emits('update:formVersion', val)
-<<<<<<< HEAD
-// })	
+watch(() =>versionId.value ,(val:string)=>{
+	emits('update:formVersion', val)
+})	
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-09 14:29:06
@@ -584,7 +583,7 @@ const versionUpdateForm = (val:string) => {
 	
 	getInitData()
 }
-=======
+
 // })
 
 //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
@@ -617,7 +616,7 @@ function refreshFunc(){
 	index.value = index.value+1
 }
 
->>>>>>> lwx_v8
+
 </script>
 <template>
 	<div class="design_container">