Browse Source
修复tinymce嵌入表单示例页面换行错误,清理!important,revert(vbenjs#1996) (#1999)
* revert: "修改tinymce富文本下拉菜单错位的bug (#1996)"
* style: 修复tinymce嵌入表单示例页面换行错误,清理!important
pull/1404/merge
Tanimodori
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
5 additions and
18 deletions
-
src/design/index.less
-
src/views/demo/editor/markdown/Editor.vue
-
src/views/demo/editor/tinymce/Editor.vue
|
|
|
@ -21,8 +21,8 @@ html, |
|
|
|
body { |
|
|
|
width: 100%; |
|
|
|
height: 100%; |
|
|
|
overflow: visible !important; |
|
|
|
//overflow-x: hidden !important; // 这个会导致tinymce富文本,下拉菜单错位!!! |
|
|
|
overflow: visible; |
|
|
|
overflow-x: hidden; |
|
|
|
|
|
|
|
&.color-weak { |
|
|
|
filter: invert(80%); |
|
|
|
@ -40,5 +40,5 @@ button, |
|
|
|
div, |
|
|
|
svg, |
|
|
|
span { |
|
|
|
outline: none !important; |
|
|
|
outline: none; |
|
|
|
} |
|
|
|
|
|
|
|
@ -5,6 +5,7 @@ |
|
|
|
:labelWidth="100" |
|
|
|
:schemas="schemas" |
|
|
|
:actionColOptions="{ span: 24 }" |
|
|
|
:baseColProps="{ span: 24 }" |
|
|
|
@submit="handleSubmit" |
|
|
|
/> |
|
|
|
</CollapseContainer> |
|
|
|
|
|
|
|
@ -5,6 +5,7 @@ |
|
|
|
:labelWidth="100" |
|
|
|
:schemas="schemas" |
|
|
|
:actionColOptions="{ span: 24 }" |
|
|
|
:baseColProps="{ span: 24 }" |
|
|
|
@submit="handleSubmit" |
|
|
|
/> |
|
|
|
</CollapseContainer> |
|
|
|
@ -41,21 +42,6 @@ |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'tinymce2', |
|
|
|
component: 'Input', |
|
|
|
label: 'tinymce2', |
|
|
|
defaultValue: 'tinymce2', |
|
|
|
rules: [{ required: true }], |
|
|
|
render: ({ model, field }) => { |
|
|
|
return h(Tinymce, { |
|
|
|
value: model[field], |
|
|
|
onChange: (value: string) => { |
|
|
|
model[field] = value; |
|
|
|
}, |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
]; |
|
|
|
export default defineComponent({ |
|
|
|
components: { BasicForm, CollapseContainer, PageWrapper }, |
|
|
|
|