innov
/
am-editor11212
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(codeblock): unable to save the selected language

This commit is contained in:
yanmao 2021-12-29 23:34:19 +08:00
parent 19021ffdd7
commit ac6a258da8
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/engine/src/engine/index.ts
View File

@ -113,7 +113,7 @@ class Engine implements EngineInterface {
// 查找父级样式 overflow 或者 overflow-y 为 auto 或者 scroll 的节点
const targetValues = ['auto', 'scroll'];
let parent = this.container.parent();
while (parent && parent.length > 0 && parent.name !== 'body') {
while (!sn && parent && parent.length > 0 && parent.name !== 'body') {
if (
targetValues.includes(parent.css('overflow')) ||
targetValues.includes(parent.css('overflow-y'))

11
packages/engine/src/types/engine.ts
View File

@ -137,6 +137,12 @@ export interface EditorInterface {
* 剪切板
*/
clipboard: ClipboardInterface;
/**
* 设置滚动节点
* @param node 节点
*/
setScrollNode(node: HTMLElement): void;
/**
* 绑定事件
* @param eventType 事件类型
@ -532,11 +538,6 @@ export interface EngineInterface extends EditorInterface {
* 是否为空内容
*/
isEmpty(): boolean;
/**
* 设置滚动节点
* @param node 节点
*/
setScrollNode(node: HTMLElement): void;
/**
* 获取编辑器值
* @param ignoreCursor 是否包含光标位置信息

2
packages/engine/src/view.ts
View File

@ -115,7 +115,7 @@ class View implements ViewInterface {
// 查找父级样式 overflow 或者 overflow-y 为 auto 或者 scroll 的节点
const targetValues = ['auto', 'scroll'];
let parent = this.container.parent();
while (parent && parent.length > 0 && parent.name !== 'body') {
while (!sn && parent && parent.length > 0 && parent.name !== 'body') {
if (
targetValues.includes(parent.css('overflow')) ||
targetValues.includes(parent.css('overflow-y'))

2
plugins/codeblock-vue/src/component/editor.ts
View File

@ -155,7 +155,7 @@ class CodeBlockEditor implements CodeBlockEditorInterface {
'readOnly',
!isEngine(this.editor) || this.editor.readonly ? true : false,
);
if (code !== undefined) this.save();
this.save();
}
render(mode: string, value: string, options?: EditorConfiguration) {

2
plugins/codeblock-vue/src/component/index.ts
View File

@ -174,7 +174,7 @@ class CodeBlcok<V extends CodeBlockValue = CodeBlockValue> extends Card<V> {
if (!this.codeEditor.container.inEditor()) {
this.codeEditor.container = $(this.codeEditor.renderTemplate());
this.mirror = undefined;
this.getCenter().append(this.codeEditor.container);
this.getCenter().empty().append(this.codeEditor.container);
}
const value = this.getValue();

2
plugins/codeblock/src/component/editor.ts
View File

@ -156,7 +156,7 @@ class CodeBlockEditor implements CodeBlockEditorInterface {
'readOnly',
!isEngine(this.editor) || this.editor.readonly ? true : false,
);
if (code !== undefined) this.save();
this.save();
}
render(mode: string, value: string, options?: EditorConfiguration) {

2
plugins/codeblock/src/component/index.ts
View File

@ -171,7 +171,7 @@ class CodeBlcok<V extends CodeBlockValue = CodeBlockValue> extends Card<V> {
if (!this.codeEditor.container.inEditor()) {
this.codeEditor.container = $(this.codeEditor.renderTemplate());
this.mirror = undefined;
this.getCenter().append(this.codeEditor.container);
this.getCenter().empty().append(this.codeEditor.container);
}
const value = this.getValue();