Skip to content

Commit 36eb8ad

Browse files
committed
merge
2 parents bda3c32 + fcb7e60 commit 36eb8ad

File tree

4 files changed

+54
-46
lines changed

4 files changed

+54
-46
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export default {
2-
name: 'italic',
3-
icon: 'fa-italic',
4-
title: '斜体',
5-
action: {
6-
insert: ['*', '*']
7-
}
8-
}
2+
name: 'italic',
3+
icon: 'fa-italic',
4+
title: '斜体',
5+
action: {
6+
insert: [' _', '_ ']
7+
}
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export default {
2+
name: 'strikethrough',
3+
icon: 'fa-strikethrough',
4+
title: '删除线',
5+
action: {
6+
insert: ['~~', '~~']
7+
}
8+
}
Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
export default {
2-
name: 'table',
3-
icon: 'fa-table',
4-
title: '插入表格',
5-
action: {
6-
request: {
7-
title: '插入表格',
8-
body: [
9-
{
10-
name: 'row',
11-
title: '行数',
12-
default: '3'
13-
},
14-
{
15-
name: 'col',
16-
title: '列数',
17-
default: '2'
18-
}
19-
],
20-
callback (data) {
21-
let rowString = '';
22-
for(let i = 0; i < data.col; i++) {
23-
rowString += '| '
24-
}
25-
rowString += '|'
26-
27-
let divString = ''
28-
for(let i = 0; i < data.col; i++) {
29-
divString += '| ------------ '
30-
}
2+
name: 'table',
3+
icon: 'fa-table',
4+
title: '插入表格',
5+
action: {
6+
request: {
7+
title: '插入表格',
8+
body: [
9+
{
10+
name: 'row',
11+
title: '行数',
12+
default: '3'
13+
},
14+
{
15+
name: 'col',
16+
title: '列数',
17+
default: '2'
18+
}
19+
],
20+
callback (data) {
21+
let rowString = ''
22+
for (let i = 0; i < data.col; i++) {
23+
rowString += '| '
24+
}
25+
rowString += '|'
3126

32-
divString += '|'
27+
let divString = ''
28+
for (let i = 0; i < data.col; i++) {
29+
divString += '| ------------ '
30+
}
3331

34-
let outputString = rowString + '\n' + divString + '\n'
32+
divString += '|'
3533

36-
for(let i = 0; i < data.row - 1; i++) {
37-
outputString += rowString + '\n'
38-
}
34+
let outputString = rowString + '\n' + divString + '\n'
3935

40-
return outputString
41-
}
36+
for (let i = 0; i < data.row - 1; i++) {
37+
outputString += rowString + '\n'
4238
}
39+
40+
return outputString
41+
}
4342
}
43+
}
4444
}

src/components/toolbar-button/toolbarBtn.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

22
import BtnBold from './btn-bold'
3+
import BtnItalic from './btn-italic'
4+
import BtnStrikeThrough from './btn-strikethrough'
35
import Divider from './divider'
46
import BtnImg from './btn-img'
57
import BtnLink from './btn-link'
68
import BtnTable from './btn-table'
7-
import BtnDelete from './btn-delete'
8-
import BtnItalic from './btn-italic'
99
import BtnsHeader from './btn-header'
1010
import BtnUl from './btn-ul'
1111
import BtnOl from './btn-ol'
1212
import BtnHr from './btn-hr'
1313

1414
export let toolbarBtn = [
1515
BtnBold,
16-
BtnDelete,
16+
BtnStrikeThrough,
1717
BtnItalic,
1818
BtnHr,
1919
Divider,

0 commit comments

Comments
 (0)