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.

Sign up for GitHub

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

Jump to bottom

fix: 将之前的更新适配至electron客户端 #405

Merged
merged 7 commits into from
Mar 8, 2023
Merged

fix: 将之前的更新适配至electron客户端 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b819a11
fix: client窗体关闭提示
yxKryptonite Feb 25, 2023
a300168
feat: 客户端增加导出markdown文件功能
yxKryptonite Feb 25, 2023
4c7a5ed
feat: 客户端增加导出markdown文件功能（src/）
yxKryptonite Feb 25, 2023
bb39681
fix: const mainWindow
yxKryptonite Feb 26, 2023
edeb1f8
fix: 解决了导出markdown却导出html的问题，同时添加了导出html选项
yxKryptonite Feb 26, 2023
a793c06
Merge remote-tracking branch 'upstream/dev' into dev
yxKryptonite Mar 6, 2023
5c1d0ff
fix: 将之前的commit适配至客户端
yxKryptonite Mar 7, 2023
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
4 changes: 2 additions & 2 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
<body>
<div id="dom_mask" style="position: absolute; top: 40px; height: 20px; width: 100%;"></div>
<div id="markdown"></div>
<!-- <object data="./markdown/basic.md" type="text/markdown" name="demo-val" width="0" height="0"></object> -->
<object data="./markdown/basic.md" type="text/markdown" name="demo-val" width="0" height="0"></object>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@4.6.0/dist/echarts.js"></script>
<!--<script src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js" integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4" crossorigin="anonymous"></script>-->
<script src="./scripts/cherry-markdown.js"></script>
<script src="../dist/cherry-markdown.js"></script>
<script src="./scripts/index-demo.js"></script>
</body>

Expand Down
Loading