Commit ba97f80d3330d7d54ed986b2e121093fc47c6259
Committed by
GitHub
1 parent
0902de75
修复tinymce嵌入表单示例页面换行错误,清理!important,revert(vbenjs#1996) (#1999)
* revert: "修改tinymce富文本下拉菜单错位的bug (#1996)" * style: 修复tinymce嵌入表单示例页面换行错误,清理!important
Showing
3 changed files
with
5 additions
and
18 deletions
src/design/index.less
@@ -21,8 +21,8 @@ html, | @@ -21,8 +21,8 @@ html, | ||
21 | body { | 21 | body { |
22 | width: 100%; | 22 | width: 100%; |
23 | height: 100%; | 23 | height: 100%; |
24 | - overflow: visible !important; | ||
25 | - //overflow-x: hidden !important; // 这个会导致tinymce富文本,下拉菜单错位!!! | 24 | + overflow: visible; |
25 | + overflow-x: hidden; | ||
26 | 26 | ||
27 | &.color-weak { | 27 | &.color-weak { |
28 | filter: invert(80%); | 28 | filter: invert(80%); |
@@ -40,5 +40,5 @@ button, | @@ -40,5 +40,5 @@ button, | ||
40 | div, | 40 | div, |
41 | svg, | 41 | svg, |
42 | span { | 42 | span { |
43 | - outline: none !important; | 43 | + outline: none; |
44 | } | 44 | } |
src/views/demo/editor/markdown/Editor.vue
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | :labelWidth="100" | 5 | :labelWidth="100" |
6 | :schemas="schemas" | 6 | :schemas="schemas" |
7 | :actionColOptions="{ span: 24 }" | 7 | :actionColOptions="{ span: 24 }" |
8 | + :baseColProps="{ span: 24 }" | ||
8 | @submit="handleSubmit" | 9 | @submit="handleSubmit" |
9 | /> | 10 | /> |
10 | </CollapseContainer> | 11 | </CollapseContainer> |
src/views/demo/editor/tinymce/Editor.vue
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | :labelWidth="100" | 5 | :labelWidth="100" |
6 | :schemas="schemas" | 6 | :schemas="schemas" |
7 | :actionColOptions="{ span: 24 }" | 7 | :actionColOptions="{ span: 24 }" |
8 | + :baseColProps="{ span: 24 }" | ||
8 | @submit="handleSubmit" | 9 | @submit="handleSubmit" |
9 | /> | 10 | /> |
10 | </CollapseContainer> | 11 | </CollapseContainer> |
@@ -41,21 +42,6 @@ | @@ -41,21 +42,6 @@ | ||
41 | }); | 42 | }); |
42 | }, | 43 | }, |
43 | }, | 44 | }, |
44 | - { | ||
45 | - field: 'tinymce2', | ||
46 | - component: 'Input', | ||
47 | - label: 'tinymce2', | ||
48 | - defaultValue: 'tinymce2', | ||
49 | - rules: [{ required: true }], | ||
50 | - render: ({ model, field }) => { | ||
51 | - return h(Tinymce, { | ||
52 | - value: model[field], | ||
53 | - onChange: (value: string) => { | ||
54 | - model[field] = value; | ||
55 | - }, | ||
56 | - }); | ||
57 | - }, | ||
58 | - }, | ||
59 | ]; | 45 | ]; |
60 | export default defineComponent({ | 46 | export default defineComponent({ |
61 | components: { BasicForm, CollapseContainer, PageWrapper }, | 47 | components: { BasicForm, CollapseContainer, PageWrapper }, |