Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 使用新的UI布局及替换toolbar的icon #111

Merged
merged 42 commits into from
Jul 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2cece06
feat: 设置最小宽度400
Jul 9, 2020
c472541
feat: undo和redo的icon处理
Jul 13, 2020
4bbc686
feat: 橡皮檫UI
Jul 13, 2020
0c8cd45
feat: 字体大小处理
Jul 13, 2020
fcc4446
feat: 加粗和斜体
Jul 13, 2020
844ea26
feat: 删除线处理
Jul 13, 2020
d43cbc7
feat: 下划线UI
Jul 13, 2020
2213af3
fix: 斜体插件hover文案修改
Jul 13, 2020
492810c
fix: fontsize功能有bug,先不要
Jul 13, 2020
2af57d9
feat: 列表图标修改
Jul 14, 2020
3a4605d
feat: 超链接icon
Jul 14, 2020
aa41689
feat: 代码块icon
Jul 14, 2020
cf06048
feat: 修改部分继承类
Jul 14, 2020
3d5fb0e
feat: 修改插件生成方式
Jul 14, 2020
c007acc
feat: 分割线UI
Jul 14, 2020
f406bda
feat: 图片上传按钮
Jul 14, 2020
e1ed486
feat: table 插件
Jul 14, 2020
1b6a788
feat: 插入媒体
Jul 14, 2020
41000f1
feat: 插入媒体Merge branch 'dev' into feat/ui
Jul 14, 2020
a9a85a5
feat: 全屏按钮放在toolbar下面,输入框的右上位置
Jul 14, 2020
1920592
feat: ui样式调整
Jul 14, 2020
0cefea9
feat: 修改箭头icon
Jul 15, 2020
c7e2df3
feat: 调整间距
Jul 15, 2020
cb20caa
feat: ui样式调整
Jul 15, 2020
041871d
feat: ui样式调整
Jul 15, 2020
451a4e4
feat: 样式调整
Jul 15, 2020
0ec4237
feat: 文案修改
Jul 15, 2020
a5d0b19
feat: 调色板部分UI
Jul 15, 2020
b74ec82
feat: scrollbar 样式
Jul 16, 2020
aa32885
feat: 修改toolbar背景颜色
Jul 16, 2020
f359f62
feat: 去除focus的阴影
Jul 16, 2020
9095cc4
feat: 去除focus的阴影
Jul 16, 2020
82d4d9b
feat: 修改样式
Jul 17, 2020
24296eb
feat: 修改样式
Jul 17, 2020
398b209
feat: 修改引用
Jul 17, 2020
88a9b58
feat: 修改引用
Jul 17, 2020
cccff58
feat: 修改引用
Jul 17, 2020
e862fd8
feat: 修改引用
Jul 17, 2020
4bb3140
feat: 修改引用
Jul 17, 2020
4836940
doc: 更新readme截图
Jul 17, 2020
46c757f
feat: 修改段落文字居中,fullscreen组件渲染方式
Jul 31, 2020
eeef861
feat: 去掉h5
Jul 31, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

Lightweight rich text editor based on [ckeditor5](https://github.com/ckeditor/ckeditor5) and [upload-to-ali](https://github.com/FEMessage/upload-to-ali).

![view.png](https://i.loli.net/2020/02/03/5J8Holf2vqrGSwu.png)
![view.png](https://i.loli.net/2020/07/17/8geC2fBIv17SLaN.png)

[中文文档](./README-zh.md)

Expand Down Expand Up @@ -106,6 +106,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d

<!-- markdownlint-enable -->
<!-- prettier-ignore-end -->

<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
2 changes: 1 addition & 1 deletion docs/basic.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
```vue
<template>
<div>
<v-editor @ready="editor = $event" v-model="content" :on-upload-fail=onUploadFail/>
<v-editor @ready="editor = $event" v-model="content" :on-upload-fail="onUploadFail" />
<el-button @click="toggleInspector" style="margin-top: 5px">{{flag ? '关闭' : '打开'}}数据结构视图</el-button>
</div>
</template>
Expand Down
1 change: 1 addition & 0 deletions src/assets/bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/bulletedlist.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/dropdown-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/eraser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/fontcolor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions src/assets/fullscreen.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<template>
<svg
t="1594711303841"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="8602"
xmlns:xlink="http://www.w3.org/1999/xlink"
width="200"
height="200"
>
<defs></defs>
<path
d="M217.6 567.466667c12.8 0 17.066667 0 21.333333 4.266666l12.8 12.8c4.266667 4.266667 4.266667 12.8 4.266667 21.333334v102.4l119.466667-115.2c8.533333-8.533333 12.8-8.533333 17.066666-12.8h17.066667c4.266667 0 8.533333 4.266667 17.066667 12.8l8.533333 8.533333c12.8 12.8 12.8 34.133333 0 46.933333L315.733333 768h102.4c8.533333 0 17.066667 0 21.333334 4.266667l12.8 12.8c4.266667 4.266667 4.266667 12.8 4.266666 21.333333v8.533333c0 8.533333 0 17.066667-4.266666 21.333334l-12.8 12.8c-4.266667 4.266667-12.8 4.266667-21.333334 4.266666H209.066667c-8.533333 0-17.066667 0-21.333334-4.266666l-12.8-12.8c-4.266667-4.266667-4.266667-8.533333-4.266666-21.333334v-209.066666c0-12.8 0-17.066667 4.266666-21.333334l12.8-12.8c4.266667-4.266667 12.8-4.266667 21.333334-4.266666h8.533333z m597.333333-396.8c12.8 0 17.066667 0 21.333334 4.266666l12.8 12.8c4.266667 4.266667 4.266667 8.533333 4.266666 21.333334v213.333333c0 12.8 0 17.066667-4.266666 21.333333l-12.8 12.8c-4.266667 4.266667-12.8 4.266667-21.333334 4.266667h-8.533333c-12.8 0-17.066667 0-21.333333-4.266667l-12.8-12.8c-4.266667-4.266667-4.266667-8.533333-4.266667-21.333333V315.733333l-115.2 115.2c-8.533333 8.533333-12.8 8.533333-17.066667 12.8h-17.066666c-4.266667 0-12.8-4.266667-17.066667-12.8l-12.8-4.266666c-8.533333-8.533333-8.533333-12.8-12.8-17.066667s0-12.8 0-17.066667c0-4.266667 4.266667-12.8 12.8-17.066666L708.266667 256h-102.4c-12.8 0-17.066667 0-21.333334-4.266667l-12.8-12.8c-4.266667-4.266667-4.266667-12.8-4.266666-21.333333v-8.533333c0-12.8 0-17.066667 4.266666-21.333334l12.8-12.8c4.266667-4.266667 12.8-4.266667 21.333334-4.266666h209.066666z"
p-id="8603"
></path>
</svg>
</template>
19 changes: 19 additions & 0 deletions src/assets/fullscreenexit.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<template>
<svg
t="1594711270851"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="8483"
xmlns:xlink="http://www.w3.org/1999/xlink"
width="200"
height="200"
>
<defs></defs>
<path
d="M418.133333 567.466667c8.533333 0 17.066667 0 21.333334 4.266666l12.8 12.8c4.266667 4.266667 4.266667 12.8 4.266666 21.333334v209.066666c0 12.8 0 17.066667-4.266666 21.333334l-12.8 12.8c-4.266667 4.266667-12.8 4.266667-21.333334 4.266666h-8.533333c-12.8 0-17.066667 0-21.333333-4.266666l-12.8-12.8c-4.266667-4.266667-4.266667-12.8-4.266667-21.333334v-102.4l-119.466667 115.2c-8.533333 8.533333-12.8 8.533333-17.066666 12.8h-17.066667c-4.266667 0-8.533333-4.266667-17.066667-12.8l-8.533333-8.533333c-12.8-12.8-12.8-34.133333 0-46.933333l119.466667-119.466667H209.066667c-8.533333 0-17.066667 0-21.333334-4.266667l-12.8-12.8c-4.266667-4.266667-4.266667-8.533333-4.266666-21.333333v-8.533333c0-8.533333 0-17.066667 4.266666-21.333334l12.8-12.8c4.266667-4.266667 12.8-4.266667 21.333334-4.266666h209.066666zM614.4 170.666667c12.8 0 17.066667 0 21.333333 4.266666l12.8 12.8c4.266667 4.266667 4.266667 12.8 4.266667 21.333334v106.666666L768 200.533333c8.533333-8.533333 12.8-8.533333 17.066667-12.8h17.066666c4.266667 0 12.8 4.266667 17.066667 12.8l8.533333 8.533334c8.533333 8.533333 8.533333 12.8 12.8 17.066666v17.066667c0 4.266667-4.266667 12.8-12.8 17.066667l-119.466666 119.466666H810.666667c12.8 0 17.066667 0 21.333333 4.266667l12.8 12.8c8.533333 0 8.533333 4.266667 8.533333 17.066667v8.533333c0 12.8 0 17.066667-4.266666 21.333333l-12.8 12.8c-4.266667 4.266667-12.8 4.266667-21.333334 4.266667h-209.066666c-12.8 0-17.066667 0-21.333334-4.266667l-12.8-12.8c-4.266667-4.266667-4.266667-12.8-4.266666-21.333333v-213.333333c0-12.8 0-17.066667 4.266666-21.333334l12.8-12.8c4.266667-4.266667 12.8-4.266667 21.333334-4.266666h8.533333z"
p-id="8484"
></path>
</svg>
</template>
1 change: 1 addition & 0 deletions src/assets/horizontalline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/image.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/italic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/media.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/numberedlist.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/quotes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/redo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/strikethrough.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/table.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/todolist.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/underline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/undo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading