mirror of
https://github.com/doocs/md.git
synced 2024-11-25 03:18:36 +08:00
fix: merge bug
This commit is contained in:
parent
b9b2722592
commit
0cd2301fbd
@ -2,8 +2,8 @@
|
|||||||
<el-dialog
|
<el-dialog
|
||||||
title="插入表格"
|
title="插入表格"
|
||||||
class="insert__dialog"
|
class="insert__dialog"
|
||||||
:visible="dialogFormVisible"
|
:visible="value"
|
||||||
@close="$emit('close')"
|
@close="$emit('input', false)"
|
||||||
border
|
border
|
||||||
>
|
>
|
||||||
<el-row class="tb-options" type="flex" align="middle" :gutter="10">
|
<el-row class="tb-options" type="flex" align="middle" :gutter="10">
|
||||||
@ -44,7 +44,7 @@
|
|||||||
</table>
|
</table>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button :type="btnType" plain @click="$emit('close')">取 消</el-button>
|
<el-button :type="btnType" plain @click="$emit('input', false)">取 消</el-button>
|
||||||
<el-button :type="btnType" @click="insertTable" plain>确 定</el-button>
|
<el-button :type="btnType" @click="insertTable" plain>确 定</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@ -58,7 +58,7 @@
|
|||||||
} from "vuex";
|
} from "vuex";
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
dialogFormVisible: {
|
value: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
}
|
}
|
||||||
@ -105,7 +105,7 @@
|
|||||||
this.rowNum = 1;
|
this.rowNum = 1;
|
||||||
this.colNum = 1;
|
this.colNum = 1;
|
||||||
this.editor.replaceSelection(`\n${table}\n`, "end");
|
this.editor.replaceSelection(`\n${table}\n`, "end");
|
||||||
this.$emit("close");
|
this.$emit('input', false);
|
||||||
this.editorRefresh();
|
this.editorRefresh();
|
||||||
},
|
},
|
||||||
...mapMutations(["editorRefresh"]),
|
...mapMutations(["editorRefresh"]),
|
||||||
|
Loading…
Reference in New Issue
Block a user