提交 62d7dde0 编写于 作者: 郭维嘉

fix:修复卡片样式

上级 d1ea6911
文件已添加
无法预览此类型文件
...@@ -28,14 +28,17 @@ ...@@ -28,14 +28,17 @@
<div id="app"></div> <div id="app"></div>
<!-- <textarea class="text" name="" id="" cols="30" rows="10"></textarea> --> <!-- <textarea class="text" name="" id="" cols="30" rows="10"></textarea> -->
<!-- <div contenteditable="true" class="text"></div> --> <!-- <div contenteditable="true" class="text"></div> -->
<a
href="https://codechina.csdn.net/xiongjiamu/jupyter-101/-/blob/master/002-demo.ipynb"
class="jupyterEl"
></a>
<button id="a">111111</button> <button id="a">111111</button>
<button id="b">2222222</button> <button id="b">2222222</button>
<script src="./markdown-editor.js"></script> <script src="./markdown-editor.js"></script>
<script> <script>
console.log("send");
ipcRenderer.send("token", 1);
</script>
<script>
// setTimeout(() => {
try { try {
const ee = new MdEditor({ const ee = new MdEditor({
el: "#app", // required el: "#app", // required
...@@ -105,23 +108,24 @@ ...@@ -105,23 +108,24 @@
height: 400, height: 400,
// rows: 'auto', // rows: 'auto',
// height: 40, // height: 40,
toolsOptions: { // toolsOptions: {
format: true, // // call: true,
bold: true, // format: true,
italic: true, // bold: true,
quote: true, // italic: true,
code: true, // quote: true,
link: true, // code: true,
ul: true, // link: true,
ol: true, // ul: true,
task: true, // ol: true,
table: true, // task: true,
img: true, // table: true,
file: true, // img: true,
test1: true, // file: true,
// help: false, // test1: true,
fullScreen: true // // help: false,
}, // fullScreen: true
// },
zIndex: 7000, zIndex: 7000,
// maxLength: 20000, // maxLength: 20000,
showWordLimit: true, showWordLimit: true,
...@@ -252,9 +256,8 @@ ...@@ -252,9 +256,8 @@
callback(list); callback(list);
} }
}); });
} catch (e) { } catch (e) {}
alert(e); // }, 3000);
}
// ee.registerTools([ // ee.registerTools([
// { // {
// name: "test", // name: "test",
......
此差异已折叠。
{ {
"name": "awesome-markdown-editor", "name": "awesome-markdown-editor",
"description": " A open source markdown editor of csdn codechina team contributed", "description": " A open source markdown editor of csdn codechina team contributed",
"version": "0.9.1", "version": "0.9.2",
"publisher": "guoweijia", "publisher": "guoweijia",
"scripts": { "scripts": {
"start": "webpack serve --mode=development", "start": "webpack serve --mode=development",
......
...@@ -366,9 +366,9 @@ export function formatElements(html) { ...@@ -366,9 +366,9 @@ export function formatElements(html) {
userList.push(item.dataset.user); userList.push(item.dataset.user);
} }
}); });
Array.from(virtualDom.querySelectorAll("img")).forEach(item => { // Array.from(virtualDom.querySelectorAll("img")).forEach(item => {
item.className = "md_img"; // item.className = "md_img";
}); // });
const list = Array.from(new Set(userList)); // 去重 const list = Array.from(new Set(userList)); // 去重
return { callUserList: list, userHtml: virtualDom.innerHTML }; return { callUserList: list, userHtml: virtualDom.innerHTML };
} }
...@@ -413,19 +413,20 @@ export function removeLinkHeadAndEnd(link) { ...@@ -413,19 +413,20 @@ export function removeLinkHeadAndEnd(link) {
} }
export function renderLinkCard(title, item) { export function renderLinkCard(title, item) {
const linkType = item.linkType; let linkType = item.linkType;
let content; let content;
switch (linkType) { switch (linkType) {
case "1": case "title":
content = `<span class="md_link_url">${title || item.title || ""}</span>`; content = `<span class="md_link_url">${title || item.title || ""}</span>`;
break; break;
case "2": default:
case "link":
content = `<span class="md_link_url">${item.url}</span>`; content = `<span class="md_link_url">${item.url}</span>`;
break; break;
case "3": // case "link":
content = `<span class="">${item.url}</span>`; // content = `<span class="">${item.url}</span>`;
break; // break;
default: case "card":
content = `<div class="md_link_card"> content = `<div class="md_link_card">
${ ${
removeLinkHeadAndEnd(item.title) === removeLinkHeadAndEnd(item.url) removeLinkHeadAndEnd(item.title) === removeLinkHeadAndEnd(item.url)
...@@ -443,8 +444,8 @@ export function renderLinkCard(title, item) { ...@@ -443,8 +444,8 @@ export function renderLinkCard(title, item) {
? `<img class="md_link_img" referrerpolicy="no-referrer" id="md_link_img" src="${item.icon}" />` ? `<img class="md_link_img" referrerpolicy="no-referrer" id="md_link_img" src="${item.icon}" />`
: "<span class='md_link_img icon iconfont icon-lianjie'></span>" : "<span class='md_link_img icon iconfont icon-lianjie'></span>"
} }
<span class="flex-1"> <span class="flex-1 md_link_url">
<span class="md_link_url">${item.url}</span> ${item.url}
</span> </span>
</span></div>`; </span></div>`;
break; break;
...@@ -490,4 +491,4 @@ export function getfilesize(size) { ...@@ -490,4 +491,4 @@ export function getfilesize(size) {
return (size / Math.pow(num, 4)).toFixed(2) + "T"; //T return (size / Math.pow(num, 4)).toFixed(2) + "T"; //T
} }
export const linkTypeSpiltStr = "/%ra"; export const linkTypeSpiltStr = "?%ra=";
...@@ -53,9 +53,8 @@ ...@@ -53,9 +53,8 @@
line-height: 1.2 !important; line-height: 1.2 !important;
color: var(--md-editor-border-color-active); color: var(--md-editor-border-color-active);
overflow: hidden; overflow: hidden;
display: -webkit-box; text-overflow: ellipsis;
-webkit-line-clamp: 1; white-space: nowrap;
-webkit-box-orient: vertical;
} }
} }
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
} }
.icon-help:before { .icon-help:before {
content: "\e642"; content: "\e7bf";
} }
.icon-file:before { .icon-file:before {
......
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
} }
// ![img](...)渲染图片 // ![img](...)渲染图片
let out = let out =
'<p class="md_img_container"><img src="' + '<p class="md_img_container"><img class="md_img" src="' +
href + href +
'" alt="' + '" alt="' +
text + text +
......
...@@ -8,12 +8,13 @@ export default { ...@@ -8,12 +8,13 @@ export default {
let typeStr = ""; let typeStr = "";
switch (index) { switch (index) {
case 0: case 0:
typeStr = linkTypeSpiltStr + "card";
break; break;
case 1: case 1:
typeStr = linkTypeSpiltStr + "1"; typeStr = linkTypeSpiltStr + "title";
break; break;
case 2: case 2:
typeStr = linkTypeSpiltStr + "2"; typeStr = linkTypeSpiltStr + "link";
break; break;
case 3: case 3:
typeStr = linkTypeSpiltStr + "3"; typeStr = linkTypeSpiltStr + "3";
......
...@@ -292,7 +292,6 @@ export default { ...@@ -292,7 +292,6 @@ export default {
cursor: pointer; cursor: pointer;
position: relative; position: relative;
line-height: 1; line-height: 1;
overflow: hidden;
&.active { &.active {
.icon { .icon {
color: var(--md-editor-border-color-active); color: var(--md-editor-border-color-active);
...@@ -343,9 +342,9 @@ export default { ...@@ -343,9 +342,9 @@ export default {
color: var(--md-editor-text-color); color: var(--md-editor-text-color);
display: inline-block; display: inline-block;
vertical-align: text-bottom; vertical-align: text-bottom;
@media screen and (max-width: 768px) { // @media screen and (max-width: 768px) {
vertical-align: text-top; // vertical-align: text-top;
} // }
@media (any-hover: hover) { @media (any-hover: hover) {
&:hover { &:hover {
color: var(--md-editor-border-color-active); color: var(--md-editor-border-color-active);
...@@ -368,6 +367,12 @@ export default { ...@@ -368,6 +367,12 @@ export default {
&.icon-file { &.icon-file {
font-size: 19px; font-size: 19px;
} }
&.icon-help {
@media screen and (max-width: 768px) {
font-size: 16px;
transform: translateY(-1px);
}
}
} }
} }
</style> </style>
...@@ -118,8 +118,8 @@ export default { ...@@ -118,8 +118,8 @@ export default {
toolsShow() { toolsShow() {
const toolsList = this.toolButtonList; const toolsList = this.toolButtonList;
const toolsOptions = this.toolsOptions; const toolsOptions = this.toolsOptions;
if (!toolsOptions) return toolsList;
if (this.showPreview) return this.previewTools; if (this.showPreview) return this.previewTools;
if (!toolsOptions) return toolsList;
return toolsList.filter(item => { return toolsList.filter(item => {
return isNotFalse(toolsOptions[item.name]); return isNotFalse(toolsOptions[item.name]);
}); });
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
icon: "aite", icon: "aite",
tip: "@关注的人", tip: "@关注的人",
startStr: "@", startStr: "@",
endStr: "" endStr: "",
}, },
{ {
name: "headline", name: "headline",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册