diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index f3203d5..b5be757 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -1124,12 +1124,9 @@ watch(
 );
 watch(
   () => props.formId,
-<<<<<<< HEAD
-  (_val: any) => {
-=======
+
   (val: any) => {
     tabsView(props.viewPage.list, 1)
->>>>>>> han_v5
     getPageData();
   },
   {
@@ -1137,16 +1134,12 @@ watch(
   }
 );
 
-<<<<<<< HEAD
-const timeAxisRef = ref();
-const calendarPageRef = ref();
-const cardPageRef = ref();
-=======
+
+
 const timeAxisRef = ref(null);
 const groupPageRef = ref(null);
 const calendarPageRef = ref(null);
 const cardPageRef = ref(null);
->>>>>>> han_v5
 const searchSend = reactive({
   formId: props.formId,
   page: state.currentPage,
@@ -1978,7 +1971,7 @@ const viewType = ref(1);
 const viewLayout = ref<any>();
 const resetViewClickStates = (excludeView?: string) => {
     if (!props.viewPage || typeof props.viewPage !== 'object') return;
-    const views = ['list', 'date', 'time', 'gantt', 'map', 'card', 'chart'];
+    const views = ['list', 'date', 'time', 'gantt', 'map','group', 'card', 'chart'];
     views.forEach(view => {
         const viewObj = props.viewPage[view];
         if (view !== excludeView && viewObj && typeof viewObj === 'object') {
@@ -1999,7 +1992,6 @@ const tabsView = (val: any, types: number) => {
   // console.log("切换视图展示方式",val)
   switch (types) {
     case 2:
-<<<<<<< HEAD
       resetViewClickStates('date');
       break;
     case 3:
@@ -2015,85 +2007,14 @@ const tabsView = (val: any, types: number) => {
     case 6:
       resetViewClickStates('card');
       break;
+    case 8:
+      resetViewClickStates('group');
+      break;
     case 7:
       resetViewClickStates('chart');
       break;
     default:
       resetViewClickStates('list');
-=======
-      props.viewPage.list.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
-      props.viewPage.group.isClick = false;
-      break;
-    case 3:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
-      props.viewPage.group.isClick = false;
-      getPageData();
-      break;
-    case 4:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
-      props.viewPage.group.isClick = false;
-      break;
-    case 5:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.chart.isClick = false;
-      props.viewPage.group.isClick = false;
-      break;
-    case 6:
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.chart.isClick = false;
-      props.viewPage.group.isClick = false;
-      break;
-    case 7:
-      props.viewPage.card.isClick = false;
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.group.isClick = false;
-      break;
-    case 8:
-      props.viewPage.card.isClick = false;
-      props.viewPage.list.isClick = false;
-      props.viewPage.date.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.chart.isClick = false;
-      break;
-    default:
-      props.viewPage.date.isClick = false;
-      props.viewPage.card.isClick = false;
-      props.viewPage.time.isClick = false;
-      props.viewPage.gantt.isClick = false;
-      props.viewPage.map.isClick = false;
-      props.viewPage.chart.isClick = false;
-      if(props.viewPage.group)
-        props.viewPage.group.isClick = false;
->>>>>>> han_v5
       break;
     }
 };
@@ -2500,12 +2421,7 @@ const getNonValue = () => {
         </div>
       </el-col>
 
-<<<<<<< HEAD
-      <el-col v-if="viewType == 1" :span="24" class="tableTdClass">
-     
-=======
       <el-col v-if="viewType == 1" :span="24" class="tableTdClass" id="special-table-container">
->>>>>>> han_v5
         <el-table
           v-bind="data.tableProps"
           ref="table"
@@ -2526,8 +2442,6 @@ const getNonValue = () => {
               config=""
               width="60"
               fixed
-<<<<<<< HEAD
-=======
                header-align="center"
               align="center"
             >
@@ -2554,7 +2468,6 @@ const getNonValue = () => {
               :prop="item.field"
               :label="item.label"
               :min-width="readerColumnSun(item)"
->>>>>>> han_v5
               header-align="center"
               sortable="custom"
               align="center"
@@ -2563,23 +2476,17 @@ const getNonValue = () => {
                 <tooltip :content="item.help" />
               </template>
             </el-table-column>
-<<<<<<< HEAD
-=======
 
            
->>>>>>> han_v5
             <el-table-column
               v-else-if="item.fieldClass == '__control'"
               :prop="item.field"
               :label="item.label"
               config=""
-<<<<<<< HEAD
               width="200"
               header-align="center"
-=======
               min-width='220'
                header-align="center"
->>>>>>> han_v5
               align="center"
               fixed="right"
             >
@@ -2759,14 +2666,11 @@ const getNonValue = () => {
               :prop="item.field"
               :label="item.label"
               config=""
-<<<<<<< HEAD
               min-width="220"
               header-align="center"
-=======
               :min-width="(item.label?.length || 2) * 14 + 20"
                header-align="center"
                sortable="custom"
->>>>>>> han_v5
               align="center"
             >
               <template v-if="item.help" #header="scope">