diff --git a/src/components/form-designer/form-widget/field-widget/rich-editor-widget.vue b/src/components/form-designer/form-widget/field-widget/rich-editor-widget.vue
index 039fd0f..8ef5647 100644
--- a/src/components/form-designer/form-widget/field-widget/rich-editor-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/rich-editor-widget.vue
@@ -10,15 +10,16 @@
-->
-
+
+
+
@@ -30,12 +31,12 @@
import {deepClone} from "@/utils/util";
import fieldMixin from "@/components/form-designer/form-widget/field-widget/fieldMixin";
- //import { Quill, quillEditor } from 'vue3-quill'
+ import { Quill, quillEditor } from 'vue3-quill'
//const modules = import.meta.glob('../../../../../node_modules/vue3-quill/src/index.js')
//console.log('test=====', modules)
- import { QuillEditor } from '@vueup/vue-quill'
- import '@vueup/vue-quill/dist/vue-quill.snow.css'
+ // import { QuillEditor } from '@vueup/vue-quill'
+ // import '@vueup/vue-quill/dist/vue-quill.snow.css'
export default {
name: "rich-editor-widget",
@@ -73,9 +74,9 @@
// VueEditor: resolve => { //懒加载!!
// require(['vue2-editor'], ({VueEditor}) => resolve(VueEditor))
// }
- //quillEditor,
+ quillEditor,
- QuillEditor,
+ // QuillEditor,
},
inject: ['refList', 'formConfig', 'globalOptionData', 'globalModel'],
data() {
diff --git a/src/components/form-designer/widget-panel/widgetsConfig.js b/src/components/form-designer/widget-panel/widgetsConfig.js
index 5018780..710c62c 100644
--- a/src/components/form-designer/widget-panel/widgetsConfig.js
+++ b/src/components/form-designer/widget-panel/widgetsConfig.js
@@ -832,6 +832,7 @@ export const advancedFields = [
placeholder: '',
labelWidth: null,
labelHidden: false,
+ contentHeight: '200px',
disabled: false,
hidden: false,
required: false,
diff --git a/src/utils/i18n.js b/src/utils/i18n.js
index 1ac435d..3858832 100644
--- a/src/utils/i18n.js
+++ b/src/utils/i18n.js
@@ -37,7 +37,11 @@ const langResources = {
//locale.i18n((key, value) => i18n.t(key, value))
export const changeLocale = function(langName) {
- i18n.locale = langName
+ //console.log('11111', i18n.locale )
+ //i18n.locale = langName
+
+ i18n.global.locale = langName
+ //console.log('22222', i18n.locale )
localStorage.setItem('v_form_locale', langName)
}