From fb10ee4ee37e5c76d8246466240e801fcf9935e1 Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Thu, 19 May 2022 09:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=AD=E8=A8=80=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E5=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form-designer/index.vue | 2 +-
 src/components/form-render/index.vue   | 9 ++++++---
 src/main.js                            | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/form-designer/index.vue b/src/components/form-designer/index.vue
index ef00d00..94ddcfa 100644
--- a/src/components/form-designer/index.vue
+++ b/src/components/form-designer/index.vue
@@ -15,7 +15,7 @@
         <img src="../../assets/vform-logo.png" @click="openHome">
         <span class="bold">VForm 3</span> {{i18nt('application.productTitle')}} <span class="version-span">Ver {{vFormVersion}}</span></div>
       <div class="float-right external-link">
-        <el-dropdown v-if="showLink('languageMenu')" @command="handleLanguageChanged">
+        <el-dropdown v-if="showLink('languageMenu')" :hide-timeout="2000" @command="handleLanguageChanged">
           <span class="el-dropdown-link">{{curLangName}}<svg-icon icon-class="el-arrow-down" /></span>
           <template #dropdown>
             <el-dropdown-menu>
diff --git a/src/components/form-render/index.vue b/src/components/form-render/index.vue
index 46b2bd9..2d92b2c 100644
--- a/src/components/form-render/index.vue
+++ b/src/components/form-render/index.vue
@@ -152,9 +152,11 @@
       this.handleOnMounted()
     },
     methods: {
-      initFormObject() {
+      initFormObject(insertHtmlCodeFlag = true) {
         this.formId = 'vfRender' + generateId()
-        this.insertCustomStyleAndScriptNode()
+        if (!!insertHtmlCodeFlag) {
+          this.insertCustomStyleAndScriptNode()
+        }
         this.addFieldChangeEventHandler()
         this.addFieldValidateEventHandler()
         this.registerFormToRefList()
@@ -418,8 +420,9 @@
             this.formJsonObj['formConfig'] = newFormJsonObj.formConfig
             this.formJsonObj['widgetList'] = newFormJsonObj.widgetList
 
+            this.insertCustomStyleAndScriptNode()  /* 必须先插入表单全局函数，否则VForm内部引用全局函数会报错！！！ */
             this.$nextTick(() => {
-              this.initFormObject()
+              this.initFormObject(false)
               this.handleOnMounted()
             })
           } else {
diff --git a/src/main.js b/src/main.js
index 0dd6f48..7e70afc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,6 @@ import 'element-plus/dist/index.css'
 import '@/styles/index.scss'
 import '@/iconfont/iconfont.css'
 import Draggable from '@/../lib/vuedraggable/dist/vuedraggable.umd.js'
-//import Draggable from 'vuedraggable'
 import {registerIcon} from '@/utils/el-icons'
 import SvgIcon from '@/components/svg-icon'  //svg组件
 import 'virtual:svg-icons-register'