Commit 60680108 by 郁子恒

Merge branch 'master' of http://git.kivii.org/gy/Vue-WebDriver

parents cf2327c7 ce6be514
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
<span style="font-size: 13px;">操作</span> <span style="font-size: 13px;">操作</span>
</template> </template>
<template #default="{ row }"> <template #default="{ row }">
<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 !== ''">
<template v-else> <template v-else>
<el-tooltip class="item" effect="dark" content="点击按钮,右击页面元素添加数据" placement="top"> <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"> <img style="width: 24px;height: 24px;vertical-align: bottom;cursor: pointer;background-color: transparent;" src="../assets/addTable.svg" @click.stop="selectElement">
...@@ -264,7 +265,7 @@ export default { ...@@ -264,7 +265,7 @@ export default {
_this.selectTableData.unshift(info) _this.selectTableData.unshift(info)
if (this.$refs.xTableColumn !== undefined) { if (this.$refs.xTableColumn !== undefined) {
// if (this.SelectTableData.length > 1) { // if (this.SelectTableData.length > 1) {
this.$refs.xTableColumn.setCurrentRow(_this.SelectTableData[0]) this.$refs.xTableColumn.setCurrentRow(_this.selectTableData[0])
// } // }
} }
// 移除先前元素的背景色(如果有) // 移除先前元素的背景色(如果有)
...@@ -340,8 +341,8 @@ export default { ...@@ -340,8 +341,8 @@ export default {
} }
this.updateSelectTableData(); this.updateSelectTableData();
// this.setTableProperties(); this.setTableProperties();
// this.highlightTableAndCells(); this.highlightTableAndCells();
}, },
// 更新tableData // 更新tableData
updateSelectTableData () { updateSelectTableData () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment