Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history 
* dev:
  chore(release): v0.8.22
  feat: custom export file name close(#506) (#517)
  feat: 增加超链接新页面打开配置能力，同时顺手关掉联想里的续写和总结功能
  feat: 增加chatgpt输入联想功能
  feat: 点击chatgpt的时候增加loading
  【issue】cherry markdown支持chatgpt续写、总结功能 (#515)
  fix: 二级菜单定位错误 close #514
  fix: 导出时处理懒加载的图片 close #504
  fix: 修复导出PDF的bug close #512
  fix: 纯预览模式下不提供表格所见即所得编辑能力 close #513
  fix: 导出PDF不支持背景 closed #456 ；fix: 表格里不支持转义符
  Fix broken link to Features.md in README.md (#509)
  添加新主题，并修复背景颜色导出bug（方法为对css文件做统一修改） (#507)
  • Loading branch information
@jiawei686
jiawei686 committed Aug 1, 2023
2 parents e263e21 + 2e00cd5 commit 0712486
Show file tree
Hide file tree
Showing 46 changed files with 8,511 additions and 2,438 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

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.22](https://github.com/Tencent/cherry-markdown/compare/v0.8.21...v0.8.22) (2023-08-01)


### Features

* 点击chatgpt的时候增加loading ([ede7e45](https://github.com/Tencent/cherry-markdown/commit/ede7e45c48b93a33ace00e81b4f086eb6f16e41b))
* 增加超链接新页面打开配置能力，同时顺手关掉联想里的续写和总结功能 ([be1800a](https://github.com/Tencent/cherry-markdown/commit/be1800a64e9592f9f3b2c5c1ebd36b45ab471f14))
* 增加chatgpt输入联想功能 ([6714211](https://github.com/Tencent/cherry-markdown/commit/6714211187afb468e3a05dc40e8c6a825e35177d))
* custom export file name close([#506](https://github.com/Tencent/cherry-markdown/issues/506)) ([#517](https://github.com/Tencent/cherry-markdown/issues/517)) ([4b60dd7](https://github.com/Tencent/cherry-markdown/commit/4b60dd761848a57e3c124fca2894a174a88c3882))


### Bug Fixes

* 纯预览模式下不提供表格所见即所得编辑能力 close [#513](https://github.com/Tencent/cherry-markdown/issues/513) ([edbd0fe](https://github.com/Tencent/cherry-markdown/commit/edbd0fe4f13e06b5a2dd7d33f0086ed9a573fd4d))
* 导出时处理懒加载的图片 close [#504](https://github.com/Tencent/cherry-markdown/issues/504) ([8a26cda](https://github.com/Tencent/cherry-markdown/commit/8a26cda2233ae074b4da3c6f34e41cb2ef739fc5))
* 导出PDF不支持背景 closed [#456](https://github.com/Tencent/cherry-markdown/issues/456) ；fix: 表格里不支持转义符 ([7a4d5d2](https://github.com/Tencent/cherry-markdown/commit/7a4d5d2693da06cfdedbefd4274fe40570b5d969))
* 二级菜单定位错误 close [#514](https://github.com/Tencent/cherry-markdown/issues/514) ([a437562](https://github.com/Tencent/cherry-markdown/commit/a437562bb7d222284fc35cc8809da70caa9ffd69))
* 修复导出PDF的bug close [#512](https://github.com/Tencent/cherry-markdown/issues/512) ([8fdaf6a](https://github.com/Tencent/cherry-markdown/commit/8fdaf6aa00db6be36a3bb97d1e27d15cefeed172))

### [0.8.21](https://github.com/Tencent/cherry-markdown/compare/v0.8.20...v0.8.21) (2023-07-14)


Expand Down
1 change: 1 addition & 0 deletions client/src/components/cherryConfigs.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ export const defaultConfig = {
{ className: 'green', label: '清新' },
{ className: 'red', label: '热情' },
{ className: 'violet', label: '淡雅' },
{ className: 'blue', label: '清幽' },
],
// 预览页面不需要绑定事件
isPreviewOnly: false,
Expand Down
2 changes: 1 addition & 1 deletion dist/cherry-markdown.core.common.js
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

235 changes: 235 additions & 0 deletions dist/cherry-markdown.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2312,6 +2312,23 @@ div[data-type=codeBlock] .token.inserted {
background: white;
overflow: hidden;
}
.cherry-toolbar .icon-loading.loading {
display: inline-block;
width: 8px;
height: 8px;
}
.cherry-toolbar .icon-loading.loading:after {
content: " ";
display: block;
width: 8px;
height: 8px;
margin-left: 2px;
margin-top: -2px;
border-radius: 50%;
border: 2px solid #000;
border-color: #000 transparent #000 transparent;
animation: loading 1.2s linear infinite;
}
[data-toolbar-theme=dark] .cherry-toolbar {
background: #20304b;
box-shadow: 0 0 10px rgba(128, 145, 165, 0.2);
Expand Down Expand Up @@ -2755,6 +2772,7 @@ div[data-type=codeBlock] .token.inserted {
background-color: #f8fafb;
min-height: auto;
overflow-y: auto;
-webkit-print-color-adjust: exact;
}
.cherry-previewer .cherry-mobile-previewer-content {
width: 375px;
Expand Down Expand Up @@ -3051,6 +3069,7 @@ div[data-type=codeBlock] .token.inserted {
/** 预览区域样式 */
.cherry-markdown.theme__dark {
color: rgb(200, 200, 200);
background-color: rgb(51, 51, 51);
/** 行内代码 */
/**
* 代码块
Expand Down Expand Up @@ -3271,6 +3290,7 @@ div[data-type=codeBlock] .token.inserted {
/** 预览区域样式 */
.cherry-markdown.theme__light {
color: rgb(63, 74, 86);
background-color: rgb(255, 255, 255);
/** 行内代码 */
/**
* 代码块
Expand Down Expand Up @@ -3456,6 +3476,7 @@ div[data-type=codeBlock] .token.inserted {
/** 预览区域样式 */
.cherry-markdown.theme__green {
color: #2b8a3e;
background-color: #ebfbee;
/** 行内代码 */
/**
* 代码块
Expand Down Expand Up @@ -3665,6 +3686,7 @@ div[data-type=codeBlock] .token.inserted {
/** 预览区域样式 */
.cherry-markdown.theme__red {
color: #a61e4d;
background-color: #fff0f6;
/** 行内代码 */
/**
* 代码块
Expand Down Expand Up @@ -3876,6 +3898,7 @@ div[data-type=codeBlock] .token.inserted {
/** 预览区域样式 */
.cherry-markdown.theme__violet {
color: #5f3dc4;
background-color: #FFF;
/** 行内代码 */
/**
* 代码块
Expand Down Expand Up @@ -3984,6 +4007,218 @@ div[data-type=codeBlock] .token.inserted {
color: #7048e8;
}

/** 色值可以参考：https://yeun.github.io/open-color/ */
/** 工具栏样式 */
/** 编辑区域样式 */
/** 预览区域样式 */
/** markdown样式 */
/** 编辑器样式 */
.cherry.theme__blue {
/** 顶部按钮, 选中文字时弹出的按钮, 光标focus到空行时联想出的按钮, 侧边栏按钮 */
/** 二级菜单 */
/** 选中文字时弹出的按钮 */
}
.cherry.theme__blue .cherry-toolbar, .cherry.theme__blue .cherry-floatmenu, .cherry.theme__blue .cherry-bubble, .cherry.theme__blue .cherry-sidebar {
background: #e5dbff;
border-color: #e5dbff;
}
.cherry.theme__blue .cherry-toolbar .cherry-toolbar-button, .cherry.theme__blue .cherry-floatmenu .cherry-toolbar-button, .cherry.theme__blue .cherry-bubble .cherry-toolbar-button, .cherry.theme__blue .cherry-sidebar .cherry-toolbar-button {
color: #3b5bdb;
}
.cherry.theme__blue .cherry-toolbar .cherry-toolbar-button i, .cherry.theme__blue .cherry-floatmenu .cherry-toolbar-button i, .cherry.theme__blue .cherry-bubble .cherry-toolbar-button i, .cherry.theme__blue .cherry-sidebar .cherry-toolbar-button i {
color: #3b5bdb;
}
.cherry.theme__blue .cherry-toolbar .cherry-toolbar-button:hover, .cherry.theme__blue .cherry-floatmenu .cherry-toolbar-button:hover, .cherry.theme__blue .cherry-bubble .cherry-toolbar-button:hover, .cherry.theme__blue .cherry-sidebar .cherry-toolbar-button:hover {
background-color: #845ef7;
color: #edf2ff !important;
border-color: #e5dbff;
}
.cherry.theme__blue .cherry-toolbar .cherry-toolbar-button:hover i, .cherry.theme__blue .cherry-floatmenu .cherry-toolbar-button:hover i, .cherry.theme__blue .cherry-bubble .cherry-toolbar-button:hover i, .cherry.theme__blue .cherry-sidebar .cherry-toolbar-button:hover i {
color: #edf2ff !important;
}
.cherry.theme__blue .cherry-dropdown {
background: #e5dbff;
/** 选择颜色的按钮 */
}
.cherry.theme__blue .cherry-dropdown .cherry-dropdown-item {
color: #3b5bdb;
}
.cherry.theme__blue .cherry-dropdown .cherry-dropdown-item:hover {
background-color: #845ef7;
color: #edf2ff;
}
.cherry.theme__blue .cherry-dropdown.cherry-color-wrap {
/** 色盘的标题 */
/** 色盘里的每一个色块 */
}
.cherry.theme__blue .cherry-dropdown.cherry-color-wrap h3 {
color: #3b5bdb;
}
.cherry.theme__blue .cherry-dropdown.cherry-color-wrap .cherry-color-item {
border-color: #845ef7;
}
.cherry.theme__blue .cherry-dropdown.cherry-color-wrap .cherry-color-item:hover {
border-color: #364fc7;
}
.cherry.theme__blue .cherry-bubble {
/** 粘贴HTML内容时弹出的选择按钮 */
}
.cherry.theme__blue .cherry-bubble .cherry-bubble-bottom {
border-top-color: #e5dbff;
}
.cherry.theme__blue .cherry-editor {
background-color: #f3f0ff;
}
.cherry.theme__blue .cherry-editor .CodeMirror {
background-color: #f3f0ff;
}
.cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-cursor {
border-left: 1px solid #364fc7;
}
.cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll span, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-variable-2, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-string, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-strong, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-em, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-meta {
color: #364fc7;
}
.cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-image-marker, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-quote, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-header {
color: #4263eb;
}
.cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-url {
background-color: #e5dbff;
}
.cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-comment, .cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-scroll .cm-url {
color: #5c7cfa;
}
.cherry.theme__blue .cherry-editor .CodeMirror .CodeMirror-selected {
background-color: #d0bfff;
}
.cherry.theme__blue .cherry-sidebar {
box-shadow: 0 0 10px #bac8ff;
}
.cherry.theme__blue .cherry-previewer {
background-color: #f3f0ff;
}
.cherry.theme__blue .cherry-previewer .cherry-mobile-previewer-content {
background-color: #f3f0ff;
}
.cherry.theme__blue .cherry-previewer-table-content-hander .cherry-previewer-table-content-hander__input textarea {
background-color: #f3f0ff;
color: #364fc7;
outline-color: #4263eb;
}

/** 预览区域样式 */
.cherry-markdown.theme__blue {
color: #364fc7;
background-color: #f3f0ff;
/** 行内代码 */
/**
* 代码块
*/
/**
* 表格
*/
/** 可以理解为上下结构的音标，下部是文字，上部是对应的拼音 */
/** 脚注 */
/** 行间公式 */
/** 段落公式 */
/** 目录 */
}
.cherry-markdown.theme__blue h1, .cherry-markdown.theme__blue h2, .cherry-markdown.theme__blue h3, .cherry-markdown.theme__blue h4, .cherry-markdown.theme__blue h5 {
color: #4263eb;
text-align: center;
border-bottom: 1px dashed #3b5bdb;
padding-bottom: 15px;
margin-bottom: 25px;
}
.cherry-markdown.theme__blue h1, .cherry-markdown.theme__blue h2, .cherry-markdown.theme__blue h3, .cherry-markdown.theme__blue h4, .cherry-markdown.theme__blue h5, .cherry-markdown.theme__blue h6 {
/** 标题前面的锚点或序号 */
}
.cherry-markdown.theme__blue ul {
/** checklist 模式，未勾选时 */
/** checklist 模式，勾选时 */
}
.cherry-markdown.theme__blue ul.cherry-list__upper-roman {
list-style: upper-roman;
}
.cherry-markdown.theme__blue ul.cherry-list__lower-greek {
list-style: lower-greek;
}
.cherry-markdown.theme__blue ul.cherry-list__cjk-ideographic {
list-style: cjk-ideographic;
}
.cherry-markdown.theme__blue ul.cherry-list__circle {
list-style: circle;
}
.cherry-markdown.theme__blue ul.cherry-list__square {
list-style: square;
}
.cherry-markdown.theme__blue blockquote {
color: #364fc7;
background-color: #e5dbff;
border-color: #3b5bdb;
}
.cherry-markdown.theme__blue a {
text-decoration: none;
color: #5c7cfa;
}
.cherry-markdown.theme__blue a:hover {
text-decoration: underline;
color: #4263eb;
}
.cherry-markdown.theme__blue hr {
border-color: #3b5bdb;
}
.cherry-markdown.theme__blue p code, .cherry-markdown.theme__blue li code {
background-color: #e5dbff;
color: #5c7cfa;
border: 1px solid #3b5bdb;
}
.cherry-markdown.theme__blue table, .cherry-markdown.theme__blue .cherry-table {
color: #364fc7;
}
.cherry-markdown.theme__blue table th, .cherry-markdown.theme__blue .cherry-table th {
background-color: #e5dbff;
}
.cherry-markdown.theme__blue table tr, .cherry-markdown.theme__blue table th, .cherry-markdown.theme__blue table td, .cherry-markdown.theme__blue .cherry-table tr, .cherry-markdown.theme__blue .cherry-table th, .cherry-markdown.theme__blue .cherry-table td {
border-color: #3b5bdb;
}
.cherry-markdown.theme__blue ruby {
/** 上部的拼音 */
}
.cherry-markdown.theme__blue .footnote {
border-color: #3b5bdb;
}
.cherry-markdown.theme__blue .footnote .footnote-title {
background-color: #e5dbff;
}
.cherry-markdown.theme__blue .footnote .one-footnote {
color: #364fc7;
border-color: #3b5bdb;
}
.cherry-markdown.theme__blue .footnote .one-footnote a.footnote-ref {
padding: 5px;
}
.cherry-markdown.theme__blue .toc {
border-bottom: 1px solid #3b5bdb;
padding-bottom: 15px;
margin-bottom: 30px;
}
.cherry-markdown.theme__blue .toc .toc-title {
text-align: center;
padding-bottom: 15px;
margin-top: 30px;
margin-bottom: 15px;
border-bottom: 1px solid #3b5bdb;
}
.cherry-markdown.theme__blue .toc .toc-li {
border: none;
}
.cherry-markdown.theme__blue .toc .toc-li a {
color: #364fc7;
}
.cherry-markdown.theme__blue .toc .toc-li a:hover {
color: #4263eb;
}

/* BASICS */
.CodeMirror {
/* Set height, width, borders, and global font properties here */
Expand Down
2 changes: 1 addition & 1 deletion dist/cherry-markdown.engine.core.common.js
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

Loading

0 comments on commit 0712486

Please sign in to comment.