Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
* dev:
  chore(release): v0.8.32
  feat: 目录滚动效果不再依赖scrollIntoView
  fix: #667 closed 修复视频封面无法展示的问题
  fix: #668 #662 closed 修复表格所见即所得编辑定位的问题,解决方案:先屏蔽拖拽行列的功能
  feat: #658 增加悬浮目录及相关配置、记忆、回显、跳转等功能
  fix: 修改@关键字及默认keyword顺序 (#664)

# Conflicts:
#	CHANGELOG.md
#	package.json
  • Loading branch information
jiawei686 committed Dec 18, 2023
2 parents da9ddaf + 7f9b6b0 commit 033dfb9
Show file tree
Hide file tree
Showing 32 changed files with 1,230 additions and 373 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.8.32](https://github.com/Tencent/cherry-markdown/compare/v0.8.30...v0.8.32) (2023-12-18)


### Features

* [#658](https://github.com/Tencent/cherry-markdown/issues/658) 增加悬浮目录及相关配置、记忆、回显、跳转等功能 ([308b15b](https://github.com/Tencent/cherry-markdown/commit/308b15b45a697a9761c72936529d06f82670f29e))
* 目录滚动效果不再依赖scrollIntoView ([6b9fdef](https://github.com/Tencent/cherry-markdown/commit/6b9fdef22c8059f35466b0fe4d353d7ae7ac0a65))


### Bug Fixes

* [#667](https://github.com/Tencent/cherry-markdown/issues/667) closed 修复视频封面无法展示的问题 ([b38dc15](https://github.com/Tencent/cherry-markdown/commit/b38dc152bd1319ae32a3f57b9aa38a68869174e0))
* [#668](https://github.com/Tencent/cherry-markdown/issues/668) [#662](https://github.com/Tencent/cherry-markdown/issues/662) closed 修复表格所见即所得编辑定位的问题,解决方案:先屏蔽拖拽行列的功能 ([ad8e9e4](https://github.com/Tencent/cherry-markdown/commit/ad8e9e452bbd9d1933732e24b4d12e57f812f7b1))
* 修改@关键字及默认keyword顺序 ([#664](https://github.com/Tencent/cherry-markdown/issues/664)) ([d35f790](https://github.com/Tencent/cherry-markdown/commit/d35f790699e11ba6e9425eda0ed3d457b694938c))

### [0.8.31](https://github.com/Tencent/cherry-markdown/compare/v0.8.30...v0.8.31) (2023-12-07)

### [0.8.30--skip.tag](https://github.com/Tencent/cherry-markdown/compare/v0.8.29...v0.8.30--skip.tag) (2023-12-07)
Expand Down
2 changes: 1 addition & 1 deletion dist/cherry-markdown.core.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/cherry-markdown.core.js

Large diffs are not rendered by default.

132 changes: 132 additions & 0 deletions dist/cherry-markdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,14 @@ span.CodeMirror-selectedtext {
content: "\ea6f";
}

.ch-icon-chevronsLeft:before {
content: "\ea70";
}

.ch-icon-chevronsRight:before {
content: "\ea71";
}

.cherry-markdown {
word-break: break-all;
/* Specify class=linenums on a pre to get line numbering */
Expand Down Expand Up @@ -3649,6 +3657,130 @@ div[data-type=codeBlock] .token.inserted {
cursor: pointer;
}

.cherry-flex-toc {
z-index: 11;
position: absolute;
width: 160px;
height: calc(100% - 220px);
max-height: 600px;
right: 0;
top: 200px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
background: rgba(255, 255, 255, 0.2);
margin-right: 8px;
box-sizing: border-box;
user-select: none;
box-shadow: 0px 5px 11px rgba(51, 51, 51, 0.2);
border-radius: 10px;
transition: all 0.3s;
}
.cherry-flex-toc:hover {
background-color: #FFF;
width: 260px;
}
.cherry-flex-toc .cherry-toc-head {
border-bottom: 1px dashed rgba(51, 51, 51, 0.2);
padding: 5px;
}
.cherry-flex-toc .cherry-toc-head .cherry-toc-title {
font-size: 16px;
font-weight: bold;
padding-left: 5px;
}
.cherry-flex-toc .cherry-toc-head .ch-icon-chevronsLeft {
display: none;
}
.cherry-flex-toc .cherry-toc-head .ch-icon-chevronsRight, .cherry-flex-toc .cherry-toc-head .ch-icon-chevronsLeft {
padding: 5px;
position: absolute;
right: 0;
top: 0;
}
.cherry-flex-toc .cherry-toc-head i {
cursor: pointer;
padding: 5px 5px 0;
}
.cherry-flex-toc .cherry-toc-head i:hover {
color: #3582fb;
}
.cherry-flex-toc .cherry-toc-list {
overflow-y: auto;
height: calc(100% - 40px);
overflow-x: hidden;
width: 100%;
padding-bottom: 10px;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a {
display: block;
text-decoration: none;
color: #000;
border-left: 5px solid rgba(51, 51, 51, 0.2);
height: 28px;
line-height: 28px;
transition: all 0.3s;
padding-left: 10px;
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
cursor: pointer;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a.current {
border-left-color: #3582fb;
color: #3582fb;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a:hover {
border-left-color: rgba(53, 130, 251, 0.6666666667);
color: rgba(53, 130, 251, 0.6666666667);
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a__1 {
font-weight: bold;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a__2 {
padding-left: 20px;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a__3 {
padding-left: 40px;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a__4 {
padding-left: 60px;
}
.cherry-flex-toc .cherry-toc-list .cherry-toc-one-a__5 {
padding-left: 80px;
}
.cherry-flex-toc.cherry-flex-toc__pure {
width: 30px;
height: calc(100% - 200px);
max-height: 600px;
background: rgba(255, 255, 255, 0);
box-shadow: none;
border-radius: 0;
}
.cherry-flex-toc.cherry-flex-toc__pure .cherry-toc-head {
height: 25px;
border-bottom: 1px dashed rgba(51, 51, 51, 0);
}
.cherry-flex-toc.cherry-flex-toc__pure .cherry-toc-head .cherry-toc-title {
display: none;
}
.cherry-flex-toc.cherry-flex-toc__pure .cherry-toc-head .ch-icon-chevronsRight {
display: none;
}
.cherry-flex-toc.cherry-flex-toc__pure .cherry-toc-head .ch-icon-chevronsLeft {
display: inline;
}
.cherry-flex-toc.cherry-flex-toc__pure .cherry-toc-list {
padding-left: 7px;
}
.cherry-flex-toc.cherry-flex-toc__pure .cherry-toc-list .cherry-toc-one-a {
overflow: hidden;
width: 0;
margin-bottom: 3px;
height: 5px;
border-left-width: 18px;
}

/** 引入自带的主题 */
/** 编辑器样式 */
.cherry.theme__default {
Expand Down
2 changes: 1 addition & 1 deletion dist/cherry-markdown.engine.core.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/cherry-markdown.engine.core.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/cherry-markdown.engine.core.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/cherry-markdown.esm.js

Large diffs are not rendered by default.

Loading

0 comments on commit 033dfb9

Please sign in to comment.