diff --git a/src/design/index.less b/src/design/index.less index 5db6bdf53..772758691 100644 --- a/src/design/index.less +++ b/src/design/index.less @@ -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; } diff --git a/src/views/demo/editor/markdown/Editor.vue b/src/views/demo/editor/markdown/Editor.vue index f9728917f..e0dabf63c 100644 --- a/src/views/demo/editor/markdown/Editor.vue +++ b/src/views/demo/editor/markdown/Editor.vue @@ -5,6 +5,7 @@ :labelWidth="100" :schemas="schemas" :actionColOptions="{ span: 24 }" + :baseColProps="{ span: 24 }" @submit="handleSubmit" /> diff --git a/src/views/demo/editor/tinymce/Editor.vue b/src/views/demo/editor/tinymce/Editor.vue index f64b690bd..c148a3cc2 100644 --- a/src/views/demo/editor/tinymce/Editor.vue +++ b/src/views/demo/editor/tinymce/Editor.vue @@ -5,6 +5,7 @@ :labelWidth="100" :schemas="schemas" :actionColOptions="{ span: 24 }" + :baseColProps="{ span: 24 }" @submit="handleSubmit" /> @@ -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 },