From a68d8c61c73397cdddbad17728d597f2d9800fda Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Wed, 29 Sep 2021 18:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4iView=E7=89=88=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E7=AA=97=E5=8F=A3=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form-designer/setting-panel/index.vue     | 23 ++++++++++---------
 .../form-designer/toolbar-panel/index.vue     | 12 +++++-----
 .../form-designer/setting-panel/index.vue     | 14 +++++------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/components-iview/form-designer/setting-panel/index.vue b/src/components-iview/form-designer/setting-panel/index.vue
index 6bf24e5..e3292f7 100644
--- a/src/components-iview/form-designer/setting-panel/index.vue
+++ b/src/components-iview/form-designer/setting-panel/index.vue
@@ -5,7 +5,7 @@
 				<Scroll class="setting-scrollbar" :height="scrollerHeight">
 					<template v-if="!!designer.selectedWidget && !designer.selectedWidget.category">
 						<Form :model="optionModel" size="mini" label-position="left" :labelWidth="120"
-							class="setting-form">
+							class="setting-form" @submit.native.prevent>
 							<Collapse v-model="widgetActiveCollapseNames" class="setting-collapse">
 								<Panel name="1">
 									{{i18nt('designer.setting.commonSetting')}}
@@ -670,7 +670,7 @@
 								{{i18nt('designer.setting.commonSetting')}}
 								<div slot="content">
 									<Form :model="optionModel" size="mini" label-position="left" :labelWidth="120"
-										class="setting-form">
+										class="setting-form" @submit.native.prevent>
 										<FormItem :label="i18nt('designer.setting.widgetName')"
 											v-if="hasConfig('name')">
 											<Input type="text" v-model="optionModel.name" />
@@ -726,7 +726,7 @@
 									</Form>
 
 									<Form :model="optionModel" size="mini" v-if="selectedWidget.type === 'grid'"
-										label-position="top" class="setting-form">
+										label-position="top" class="setting-form" @submit.native.prevent>
 										<FormItem :label="i18nt('designer.setting.colsOfGrid')">
 											<li v-for="(colItem, colIdx) in selectedWidget.cols" :key="colIdx"
 												class="col-item">
@@ -749,7 +749,7 @@
 									</Form>
 
 									<Form :model="optionModel" size="small" v-if="selectedWidget.type === 'grid-col'"
-										label-position="left" :labelWidth="120" class="setting-form">
+										label-position="left" :labelWidth="120" class="setting-form" @submit.native.prevent>
 										<FormItem :label="i18nt('designer.setting.colSpanTitle')">
 											<Input type="number" v-model.number="optionModel.span" :min="1" :max="24"
 												style="width: 100%" />
@@ -757,7 +757,7 @@
 									</Form>
 									<Form :model="optionModel" size="small" v-if="selectedWidget.type === 'tab'" 
 										label-position="left" :labelWidth="120" 
-										class="setting-form panes-setting">
+										class="setting-form panes-setting" @submit.native.prevent>
 										<FormItem :label="i18nt('designer.setting.tabPaneType')" v-if="hasConfig('displayType')">
 											<Select v-model="optionModel.displayType">
 												<Option v-for="item in tabPaneType" :key="item.value"
@@ -809,7 +809,7 @@
 								{{i18nt('designer.setting.eventSetting')}}
 								<div slot="content">
 									<Form :model="optionModel" size="mini" label-position="left" :labelWidth="150"
-										class="setting-form">
+										class="setting-form" @submit.native.prevent>
 										<FormItem label="onSubFormRowAdd" :labelWidth="180" v-if="hasConfig('onSubFormRowAdd')">
 											<Button type="info" icon="el-icon-edit" plain round
 												@click="editEventHandler('onSubFormRowAdd')">
@@ -845,7 +845,7 @@
 			</TabPane>
 
 			<TabPane v-if="!!designer" :label="i18nt('designer.hint.formSetting')" name="2">
-				<Form :model="formConfig" size="mini" label-position="left" :labelWidth="120" class="setting-form">
+				<Form :model="formConfig" size="mini" label-position="left" :labelWidth="120" class="setting-form" @submit.native.prevent>
 					<Collapse v-model="formActiveCollapseNames" class="setting-collapse">
 						<Panel name="1">
 							{{i18nt('designer.setting.basicSetting')}}
@@ -937,7 +937,8 @@
 			</TabPane>
 		</Tabs>
 
-		<Modal :title="i18nt('designer.setting.editWidgetEventHandler')" v-model="showWidgetEventDialogFlag" :closable="true" class="small-padding-dialog" draggable :mask-closable="false">
+		<Modal :title="i18nt('designer.setting.editWidgetEventHandler')" v-model="showWidgetEventDialogFlag" :closable="true" 
+			width="800" class="small-padding-dialog" draggable :mask-closable="false">
 			<!-- <Alert :closable="false">{{(optionModel?optionModel.name:'') + '.' + eventParamsMap[curEventName]}}</Alert> -->
 			<div class="codeEditTip">{{(optionModel?optionModel.name:'') + '.' + eventParamsMap[curEventName]}}</div>
 			<code-editor v-if="showWidgetEventDialogFlag" :mode="'javascript'" :readonly="false" v-model="eventHandlerCode"></code-editor>
@@ -953,7 +954,7 @@
 		</Modal>
 
 		<Modal :title="i18nt('designer.setting.editFormEventHandler')"
-			v-model="showFormEventDialogFlag" :closable="true" class="small-padding-dialog" draggable
+			v-model="showFormEventDialogFlag" :closable="true" class="small-padding-dialog" width="800" draggable
 			:mask-closable="false">
 			<div class="codeEditTip">{{'form.' + eventParamsMap[curEventName]}}</div>
 			<code-editor v-if="showFormEventDialogFlag" :mode="'javascript'" :readonly="false" v-model="formEventHandlerCode"></code-editor>
@@ -969,7 +970,7 @@
 		</Modal>
 
 		<Modal :title="i18nt('designer.setting.formCss')"
-			v-model="showEditFormCssDialogFlag" :closable="true" class="small-padding-dialog" draggable
+			v-model="showEditFormCssDialogFlag" :closable="true" class="small-padding-dialog" width="800" draggable
 			:mask-closable="false">
 			<code-editor v-if="showEditFormCssDialogFlag" :mode="'css'" :readonly="false" v-model="formCssCode"></code-editor>
 			<div slot="footer" class="dialog-footer">
@@ -983,7 +984,7 @@
 		</Modal>
 
 		<Modal :title="i18nt('designer.setting.globalFunctions')"
-			v-model="showEditFunctionsDialogFlag" :closable="true" class="small-padding-dialog" draggable
+			v-model="showEditFunctionsDialogFlag" :closable="true" class="small-padding-dialog" width="800" draggable
 			:mask-closable="false">
 			<code-editor v-if="showEditFunctionsDialogFlag" :mode="'javascript'" :readonly="false" v-model="functionsCode"></code-editor>
 			<div slot="footer" class="dialog-footer">
diff --git a/src/components-iview/form-designer/toolbar-panel/index.vue b/src/components-iview/form-designer/toolbar-panel/index.vue
index 020c46d..7051131 100644
--- a/src/components-iview/form-designer/toolbar-panel/index.vue
+++ b/src/components-iview/form-designer/toolbar-panel/index.vue
@@ -31,7 +31,7 @@
 
 		<Modal :title="i18nt('designer.toolbar.preview')"
 			v-model="showPreviewDialogFlag" :closable="true" class="small-padding-dialog" draggable
-			:mask-closable="false" width="75%"
+			:mask-closable="false" width="1200" 
 			:fullscreen ="layoutType === 'H5'">
 			<div v-if="showPreviewDialogFlag">
 				<div class="form-render-wrapper" :class="[layoutType === 'H5' ? 'h5-layout' : '']">
@@ -52,7 +52,7 @@
 		</Modal>
 
 		<Modal :title="i18nt('designer.toolbar.importJson')"
-			v-model="showImportJsonDialogFlag" :closable="true" class="small-padding-dialog" draggable
+			v-model="showImportJsonDialogFlag" :closable="true" class="small-padding-dialog" width="800" draggable
 			:mask-closable="false">
 			<Alert show-icon>{{i18nt('designer.hint.importJsonHint')}}</Alert>
 			<code-editor v-if="showImportJsonDialogFlag" :mode="'json'" :readonly="false" v-model="importTemplate"></code-editor>
@@ -68,7 +68,7 @@
 		
 		<Modal :title="i18nt('designer.toolbar.exportJson')"
 			v-model="showExportJsonDialogFlag" :closable="true" class="small-padding-dialog" draggable
-			:mask-closable="false">
+			width="800" :mask-closable="false">
 			<code-editor v-if="showExportJsonDialogFlag" :mode="'json'" :readonly="true" v-model="jsonContent"></code-editor>
 			<div slot="footer" class="dialog-footer">
 				<Button size="default" type="primary" class="copy-json-btn" :data-clipboard-text="jsonRawContent">
@@ -83,7 +83,7 @@
 		<Modal :title="i18nt('designer.toolbar.exportCode')"
 			v-model="showExportCodeDialogFlag" :closable="true" class="small-padding-dialog" draggable
 			:mask-closable="false"
-			width="65%">
+			width="960">
 			<Tabs type="line" class="no-box-shadow" v-model="activeCodeTab">
 				<TabPane label="Vue" name="vue">
 					<code-editor v-if="showExportCodeDialogFlag" :mode="'html'" :readonly="true" v-model="vueCode" :user-worker="false"></code-editor>
@@ -108,7 +108,7 @@
 		</Modal>
 
 		<Modal :title="i18nt('designer.hint.exportFormData')"
-			v-model="showFormDataDialogFlag" :closable="true" class="dialog-title-light-bg" draggable
+			v-model="showFormDataDialogFlag" :closable="true" class="dialog-title-light-bg" width="800" draggable
 			:mask-closable="false">
 			<div style="border: 1px solid #DCDFE6">
 				<code-editor v-if="showFormDataDialogFlag" :mode="'json'" :readonly="true" v-model="formDataJson"></code-editor>
@@ -124,7 +124,7 @@
 		</Modal>
 		
 		
-		<Modal :title="i18nt('designer.toolbar.generateSFC')" width="85%"
+		<Modal :title="i18nt('designer.toolbar.generateSFC')" width="960" 
 		           v-model="showExportSFCDialogFlag" :closable="true" class="dialog-title-light-bg" draggable
 			:mask-closable="false">
 		  <Tabs type="line" class="no-box-shadow no-padding" v-model="activeSFCTab">
diff --git a/src/components/form-designer/setting-panel/index.vue b/src/components/form-designer/setting-panel/index.vue
index da28835..4085c14 100644
--- a/src/components/form-designer/setting-panel/index.vue
+++ b/src/components/form-designer/setting-panel/index.vue
@@ -4,7 +4,7 @@
       <el-tab-pane :label="i18nt('designer.hint.widgetSetting')" name="1">
         <el-scrollbar class="setting-scrollbar" :style="{height: scrollerHeight}">
         <template v-if="!!designer.selectedWidget && !designer.selectedWidget.category">
-          <el-form :model="optionModel" size="mini" label-position="left" label-width="120px" class="setting-form">
+          <el-form :model="optionModel" size="mini" label-position="left" label-width="120px" class="setting-form" @submit.native.prevent>
             <el-collapse v-model="widgetActiveCollapseNames" class="setting-collapse">
               <el-collapse-item name="1" :title="i18nt('designer.setting.commonSetting')">
                 <el-form-item :label="i18nt('designer.setting.fieldName')" v-if="hasConfig('name')"
@@ -467,7 +467,7 @@
 
           <el-collapse v-model="widgetActiveCollapseNames" class="setting-collapse">
             <el-collapse-item name="1" :title="i18nt('designer.setting.commonSetting')">
-              <el-form :model="optionModel" size="mini" label-position="left" label-width="120px" class="setting-form">
+              <el-form :model="optionModel" size="mini" label-position="left" label-width="120px" class="setting-form" @submit.native.prevent>
                 <el-form-item :label="i18nt('designer.setting.widgetName')" v-if="hasConfig('name')">
                   <el-input type="text" v-model="optionModel.name"></el-input>
                 </el-form-item>
@@ -511,7 +511,7 @@
               </el-form>
 
               <el-form :model="optionModel" size="mini" v-if="selectedWidget.type === 'grid'"
-                       label-position="top" class="setting-form">
+                       label-position="top" class="setting-form" @submit.native.prevent>
                 <el-form-item :label="i18nt('designer.setting.colsOfGrid')">
                   <li v-for="(colItem, colIdx) in selectedWidget.cols" :key="colIdx" class="col-item">
                     <span class="col-span-title">{{i18nt('designer.setting.colSpanTitle')}}{{colIdx + 1}}</span>
@@ -528,7 +528,7 @@
               </el-form>
 
               <el-form :model="optionModel" size="mini" v-if="selectedWidget.type === 'grid-col'"
-                       label-position="left" label-width="120px" class="setting-form">
+                       label-position="left" label-width="120px" class="setting-form" @submit.native.prevent>
                 <el-form-item :label="i18nt('designer.setting.colSpanTitle')">
                   <el-input-number v-model.number="optionModel.span" :min="1" :max="24"
                                    style="width: 100%"></el-input-number>
@@ -536,7 +536,7 @@
               </el-form>
 
               <el-form :model="optionModel" size="mini" v-if="selectedWidget.type === 'tab'"
-                       label-position="top" class="setting-form panes-setting">
+                       label-position="top" class="setting-form panes-setting" @submit.native.prevent>
                 <el-form-item :label="i18nt('designer.setting.tabPaneSetting')">
                   <draggable tag="ul" :list="selectedWidget.tabs"
                              v-bind="{group:'panesGroup', ghostClass: 'ghost', handle: '.drag-option'}">
@@ -558,7 +558,7 @@
             </el-collapse-item>
 
             <el-collapse-item name="3" :title="i18nt('designer.setting.eventSetting')">
-              <el-form :model="optionModel" size="mini" label-position="left" label-width="150px" class="setting-form">
+              <el-form :model="optionModel" size="mini" label-position="left" label-width="150px" class="setting-form" @submit.native.prevent>
                 <el-form-item label="onSubFormRowAdd" v-if="hasConfig('onSubFormRowAdd')">
                   <el-button type="info" icon="el-icon-edit" plain round @click="editEventHandler('onSubFormRowAdd')">
                     {{i18nt('designer.setting.addEventHandler')}}</el-button>
@@ -587,7 +587,7 @@
       <el-tab-pane v-if="!!designer" :label="i18nt('designer.hint.formSetting')" name="2">
         <el-scrollbar class="setting-scrollbar" :style="{height: scrollerHeight}">
         <el-form :model="formConfig" size="mini" label-position="left" label-width="120px"
-                 class="setting-form">
+                 class="setting-form" @submit.native.prevent>
           <el-collapse v-model="formActiveCollapseNames" class="setting-collapse">
             <el-collapse-item name="1" :title="i18nt('designer.setting.basicSetting')">
               <el-form-item :label="i18nt('designer.setting.formSize')">