优化

src/components/collectionTable.vue

@@ -21,7 +21,7 @@
             <el-button size="mini" style="width: 74px;height: 20px;margin-right: 7px;" @click="getTable" v-if="isSelectTable">获取表格信息</el-button>
         </div>
         <!-- 全部表格信息 -->
-        <div style="overflow: auto;height: 230px;" :style="{ width: widthResize + 'px' }">git
+        <div style="overflow: auto;height: 230px;" :style="{ width: widthResize + 'px' }">
             <vxe-table :data="selectTableData" ref="xTableColumn" border class="mytable-scrollbar" height="220"
                 v-if="isSelectTable" auto-resize style="margin-bottom: 5px;" @current-change="currentChangeEvent"
                 highlight-hover-row highlight-current-row>
@@ -64,12 +64,10 @@
                         <span style="font-size: 13px;">操作</span>
                     </template>
                     <template #default="{ row }">
-<<<<<<< HEAD
+
                         <img style="width: 38px;height: 28px;vertical-align: bottom;cursor: pointer;"
                             src="../assets/close.svg" @click.stop="columnDelete(row)" v-if="row.xpath !== ''">
-=======
-                        <img style="width: 38px;height: 28px;vertical-align: bottom;cursor: pointer;" src="../assets/close.svg" @click.stop="columnDelete(row)" v-if="row.xpath !== ''">
->>>>>>> 5509792c37aa1abff718eb8e1a32b1f5cb234afd
+
                         <template v-else>
                             <el-tooltip class="item" effect="dark" content="点击按钮,右击页面元素添加数据" placement="top">
                                 <img style="width: 24px;height: 24px;vertical-align: bottom;cursor: pointer;background-color: transparent;" src="../assets/addTable.svg" @click.stop="selectElement">
@@ -268,17 +266,11 @@ export default {
             info.title = 'columnName'
             _this.selectTableData.unshift(info)
             if (this.$refs.xTableColumn !== undefined) {
-<<<<<<< HEAD
-                this.$refs.xTableColumn.setCurrentRow(_this.selectTableData[0])
-            }
-            if (this.selectedRow !== null) {
-                this.setElementBackgroundColor(this.selectedRow.xpath, '');
-=======
+
                 // if (this.SelectTableData.length > 1) {
-                this.$refs.xTableColumn.setCurrentRow(_this.SelectTableData[0])
+                this.$refs.xTableColumn.setCurrentRow(_this.selectTableData[0])
                 // }
 
->>>>>>> 5509792c37aa1abff718eb8e1a32b1f5cb234afd
             }
             // 移除先前元素的背景色（如果有）
             if (window.currentlyHighlighted) {
@@ -353,8 +345,8 @@ export default {
             }
 
             this.updateSelectTableData();
-            // this.setTableProperties();
-            // this.highlightTableAndCells();
+            this.setTableProperties();
+            this.highlightTableAndCells();
         },
         //    更新tableData
         updateSelectTableData () {