amass/md
1
0
Fork 0
mirror of https://github.com/doocs/md.git synced 2024-11-28 13:36:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: merge bug

Browse Source
This commit is contained in:
hlwwlh 2020-07-13 04:05:09 +00:00
parent b9b2722592
commit 0cd2301fbd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/CodemirrorEditor/insertForm.vue
View File

@ -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
} }
@ -94,7 +94,7 @@
currRow = []; currRow = [];
for (let j = 0; j < cols; ++j) { for (let j = 0; j < cols; ++j) {
const rowIdx = i > 1 ? i - 1 : i; const rowIdx = i > 1 ? i - 1 : i;
i === 1 ? i === 1 ?
currRow.push("---\t") : currRow.push("---\t") :
currRow.push(this.tableData[`k_${rowIdx}_${j}`] || ""); currRow.push(this.tableData[`k_${rowIdx}_${j}`] || "");
} }
@ -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"]),