diff --git a/src/components/form-designer/form-widget/field-widget/fieldMixin.js b/src/components/form-designer/form-widget/field-widget/fieldMixin.js
index e161aea..08e1d8d 100644
--- a/src/components/form-designer/form-widget/field-widget/fieldMixin.js
+++ b/src/components/form-designer/form-widget/field-widget/fieldMixin.js
@@ -25,6 +25,13 @@ export default {
   methods: {
 
     //--------------------- 组件内部方法 begin ------------------//
+    getPropName() {
+      if (this.subFormItemFlag && !this.designState) {
+        return this.subFormName + "." + this.subFormRowIndex + "." + this.field.options.name + ""
+      } else {
+        return this.field.options.name
+      }
+    },
 
     initFieldModel() {
       if (!this.field.formItemFlag) {
@@ -304,7 +311,7 @@ export default {
       }
     },
 
-    handleChangeEvent(value) {
+    handleChangeEvent(value) {  /* input的清除输入小按钮会同时触发handleChangeEvent、handleInputCustomEvent！！ */
       this.syncUpdateFormModel(value)
       this.emitFieldDataChange(value, this.oldFieldValue)
 
@@ -312,7 +319,7 @@ export default {
       this.oldFieldValue = deepClone(value)  /* oldFieldValue需要在initFieldModel()方法中赋初值!! */
 
       /* 主动触发表单的单个字段校验，用于清除字段可能存在的校验错误提示 */
-      this.dispatch('VFormRender', 'fieldValidation', [this.field.options.name])
+      this.dispatch('VFormRender', 'fieldValidation', [this.getPropName()])
     },
 
     handleFocusCustomEvent(event) {
@@ -335,7 +342,7 @@ export default {
       this.syncUpdateFormModel(value)
 
       /* 主动触发表单的单个字段校验，用于清除字段可能存在的校验错误提示 */
-      this.dispatch('VFormRender', 'fieldValidation', [this.field.options.name])
+      this.dispatch('VFormRender', 'fieldValidation', [this.getPropName()])
 
       if (!!this.field.options.onInput) {
         let customFn = new Function('value', this.field.options.onInput)
@@ -429,11 +436,12 @@ export default {
     },
 
     resetField() {
+      if (!!this.subFormItemFlag) { //跳过子表单组件
+        return
+      }
+
       let defaultValue = this.field.options.defaultValue
       this.setValue(defaultValue)
-      this.$nextTick(() => {
-        //
-      })
 
       //清空上传组件文件列表
       if ((this.field.type === 'picture-upload') || (this.field.type === 'file-upload')) {
@@ -519,7 +527,7 @@ export default {
     reloadOptions(options) {
       this.field.options.optionItems = deepClone(options)
     },
-    
+
     /**
      * 返回radio/checkbox/select/cascader的选项数据
      * @returns 选择项数组
diff --git a/src/components/form-designer/index.vue b/src/components/form-designer/index.vue
index f322f1f..2a5362c 100644
--- a/src/components/form-designer/index.vue
+++ b/src/components/form-designer/index.vue
@@ -65,7 +65,13 @@
   import SettingPanel from './setting-panel/index'
   import VFormWidget from './form-widget/index'
   import {createDesigner} from "@/components/form-designer/designer"
-  import {addWindowResizeHandler, deepClone, getQueryParam} from "@/utils/util"
+  import {
+    addWindowResizeHandler,
+    deepClone,
+    getAllContainerWidgets,
+    getAllFieldWidgets,
+    getQueryParam
+  } from "@/utils/util"
   import {MOCK_CASE_URL, VARIANT_FORM_VERSION} from "@/utils/config"
   import i18n, { changeLocale } from "@/utils/i18n"
   import axios from "axios"
@@ -101,12 +107,15 @@
             externalLink: true,  //是否显示GitHub、文档等外部链接
             formTemplates: true,  //是否显示表单模板
             eventCollapse: true,  //是否显示组件事件属性折叠面板
+            widgetNameReadonly: false,  //禁止修改组件名称
+
             clearDesignerButton: true,  //是否显示清空设计器按钮
             previewFormButton: true,  //是否显示预览表单按钮
             importJsonButton: true,  //是否显示导入JSON按钮
             exportJsonButton: true,  //是否显示导出JSON器按钮
             exportCodeButton: true,  //是否显示导出代码按钮
             generateSFCButton: true,  //是否显示生成SFC按钮
+            toolBarMaxWidth: 420,  //设计器工具按钮栏最大宽度（单位像素）
 
             presetCssCode: '',  //设计器预设CSS样式代码
           }
@@ -327,6 +336,22 @@
         this.$refs.toolbarRef.generateSFC()
       },
 
+      /**
+       * 获取所有字段组件
+       * @returns {*[]}
+       */
+      getFieldWidgets() {
+        return getAllFieldWidgets(this.designer.widgetList)
+      },
+
+      /**
+       * 获取所有容器组件
+       * @returns {*[]}
+       */
+      getContainerWidgets() {
+        return getAllContainerWidgets(this.designer.widgetList)
+      },
+
       //TODO: 增加更多方法！！
 
     }
@@ -334,6 +359,14 @@
 </script>
 
 <style lang="scss" scoped>
+  .el-container.main-container {
+    ::v-deep aside {  /* 防止aside样式被外部样式覆盖！！ */
+      margin: 0;
+      padding: 0;
+      background: inherit;
+    }
+  }
+
   .el-container.full-height {
     height: 100%;
     overflow-y: hidden;
diff --git a/src/components/form-designer/setting-panel/property-editor-factory.js b/src/components/form-designer/setting-panel/property-editor-factory.js
index ea2b100..adc698e 100644
--- a/src/components/form-designer/setting-panel/property-editor-factory.js
+++ b/src/components/form-designer/setting-panel/property-editor-factory.js
@@ -49,7 +49,7 @@ export const createBooleanEditor = function (propName, propLabelKey) {
     render(h) {
       return (
         <el-form-item label={translate(propLabelKey)}>
-          <el-checkbox v-model={this.optionModel[propName]} />
+          <el-switch v-model={this.optionModel[propName]} />
         </el-form-item>
       )
     }
diff --git a/src/components/form-designer/setting-panel/property-editor/allowCreate-editor.vue b/src/components/form-designer/setting-panel/property-editor/allowCreate-editor.vue
index add2090..299fcb2 100644
--- a/src/components/form-designer/setting-panel/property-editor/allowCreate-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/allowCreate-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.allowCreate')">
-    <el-checkbox v-model="optionModel.allowCreate"></el-checkbox>
+    <el-switch v-model="optionModel.allowCreate"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/appendButton-editor.vue b/src/components/form-designer/setting-panel/property-editor/appendButton-editor.vue
index d844945..aa9d15e 100644
--- a/src/components/form-designer/setting-panel/property-editor/appendButton-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/appendButton-editor.vue
@@ -4,7 +4,7 @@
       <el-divider class="custom-divider">{{i18nt('designer.setting.inputButton')}}</el-divider>
     </el-form-item>
     <el-form-item :label="i18nt('designer.setting.appendButton')">
-      <el-checkbox v-model="optionModel.appendButton"></el-checkbox>
+      <el-switch v-model="optionModel.appendButton"></el-switch>
     </el-form-item>
   </div>
 </template>
diff --git a/src/components/form-designer/setting-panel/property-editor/appendButtonDisabled-editor.vue b/src/components/form-designer/setting-panel/property-editor/appendButtonDisabled-editor.vue
index b76e318..dd5c4f0 100644
--- a/src/components/form-designer/setting-panel/property-editor/appendButtonDisabled-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/appendButtonDisabled-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.appendButtonDisabled')">
-    <el-checkbox v-model="optionModel.appendButtonDisabled"></el-checkbox>
+    <el-switch v-model="optionModel.appendButtonDisabled"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/automaticDropdown-editor.vue b/src/components/form-designer/setting-panel/property-editor/automaticDropdown-editor.vue
index cb8d7c6..b5d5b40 100644
--- a/src/components/form-designer/setting-panel/property-editor/automaticDropdown-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/automaticDropdown-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.automaticDropdown')">
-    <el-checkbox v-model="optionModel.automaticDropdown"></el-checkbox>
+    <el-switch v-model="optionModel.automaticDropdown"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/border-editor.vue b/src/components/form-designer/setting-panel/property-editor/border-editor.vue
index 4f77bec..8f76f15 100644
--- a/src/components/form-designer/setting-panel/property-editor/border-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/border-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.border')">
-    <el-checkbox v-model="optionModel.border"></el-checkbox>
+    <el-switch v-model="optionModel.border"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/buttonStyle-editor.vue b/src/components/form-designer/setting-panel/property-editor/buttonStyle-editor.vue
index cc635df..060c0df 100644
--- a/src/components/form-designer/setting-panel/property-editor/buttonStyle-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/buttonStyle-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.buttonStyle')">
-    <el-checkbox v-model="optionModel.buttonStyle"></el-checkbox>
+    <el-switch v-model="optionModel.buttonStyle"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/clearable-editor.vue b/src/components/form-designer/setting-panel/property-editor/clearable-editor.vue
index 4f79ff0..bae7dc0 100644
--- a/src/components/form-designer/setting-panel/property-editor/clearable-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/clearable-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.clearable')">
-    <el-checkbox v-model="optionModel.clearable"></el-checkbox>
+    <el-switch v-model="optionModel.clearable"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/container-grid-col/grid-col-responsive-editor.vue b/src/components/form-designer/setting-panel/property-editor/container-grid-col/grid-col-responsive-editor.vue
index ad9076e..820802c 100644
--- a/src/components/form-designer/setting-panel/property-editor/container-grid-col/grid-col-responsive-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/container-grid-col/grid-col-responsive-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.responsive')">
-    <el-checkbox v-model="optionModel.responsive"></el-checkbox>
+    <el-switch v-model="optionModel.responsive"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/container-sub-form/showBlankRow-editor.vue b/src/components/form-designer/setting-panel/property-editor/container-sub-form/showBlankRow-editor.vue
index 32dabd0..629cdae 100644
--- a/src/components/form-designer/setting-panel/property-editor/container-sub-form/showBlankRow-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/container-sub-form/showBlankRow-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showBlankRow')">
-    <el-checkbox v-model="optionModel.showBlankRow"></el-checkbox>
+    <el-switch v-model="optionModel.showBlankRow"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/container-sub-form/showRowNumber-editor.vue b/src/components/form-designer/setting-panel/property-editor/container-sub-form/showRowNumber-editor.vue
index c69b365..3395796 100644
--- a/src/components/form-designer/setting-panel/property-editor/container-sub-form/showRowNumber-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/container-sub-form/showRowNumber-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showRowNumber')">
-    <el-checkbox v-model="optionModel.showRowNumber"></el-checkbox>
+    <el-switch v-model="optionModel.showRowNumber"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/disabled-editor.vue b/src/components/form-designer/setting-panel/property-editor/disabled-editor.vue
index a25eaca..baba3a0 100644
--- a/src/components/form-designer/setting-panel/property-editor/disabled-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/disabled-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.disabled')">
-    <el-checkbox v-model="optionModel.disabled"></el-checkbox>
+    <el-switch v-model="optionModel.disabled"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/editable-editor.vue b/src/components/form-designer/setting-panel/property-editor/editable-editor.vue
index 3f734c5..105aa51 100644
--- a/src/components/form-designer/setting-panel/property-editor/editable-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/editable-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.editable')">
-    <el-checkbox v-model="optionModel.editable"></el-checkbox>
+    <el-switch v-model="optionModel.editable"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-button/circle-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-button/circle-editor.vue
index 88522d5..a5c0f6a 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-button/circle-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-button/circle-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.circle')">
-    <el-checkbox v-model="optionModel.circle"></el-checkbox>
+    <el-switch v-model="optionModel.circle"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-button/plain-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-button/plain-editor.vue
index ed25895..f825841 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-button/plain-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-button/plain-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.plain')">
-    <el-checkbox v-model="optionModel.plain"></el-checkbox>
+    <el-switch v-model="optionModel.plain"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-button/round-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-button/round-editor.vue
index 8bde2a1..33c5612 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-button/round-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-button/round-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.round')">
-    <el-checkbox v-model="optionModel.round"></el-checkbox>
+    <el-switch v-model="optionModel.round"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-cascader/cascader-multiple-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-cascader/cascader-multiple-editor.vue
index f67a171..29f38c0 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-cascader/cascader-multiple-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-cascader/cascader-multiple-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.multiple')">
-    <el-checkbox v-model="optionModel.multiple"></el-checkbox>
+    <el-switch v-model="optionModel.multiple"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-cascader/checkStrictly-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-cascader/checkStrictly-editor.vue
index 9433225..3216dad 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-cascader/checkStrictly-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-cascader/checkStrictly-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.checkStrictly')">
-    <el-checkbox v-model="optionModel.checkStrictly"></el-checkbox>
+    <el-switch v-model="optionModel.checkStrictly"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-rate/allowHalf-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-rate/allowHalf-editor.vue
index fd80e44..929a36c 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-rate/allowHalf-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-rate/allowHalf-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.allowHalf')">
-    <el-checkbox v-model="optionModel.allowHalf"></el-checkbox>
+    <el-switch v-model="optionModel.allowHalf"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-rate/showScore-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-rate/showScore-editor.vue
index 6be1b18..f929132 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-rate/showScore-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-rate/showScore-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showScore')">
-    <el-checkbox v-model="optionModel.showScore"></el-checkbox>
+    <el-switch v-model="optionModel.showScore"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-rate/showText-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-rate/showText-editor.vue
index 76fa1a8..85625d5 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-rate/showText-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-rate/showText-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showText')">
-    <el-checkbox v-model="optionModel.showText"></el-checkbox>
+    <el-switch v-model="optionModel.showText"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-slider/range-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-slider/range-editor.vue
index 3a431b5..7b1ef04 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-slider/range-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-slider/range-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.range')">
-    <el-checkbox v-model="optionModel.range"></el-checkbox>
+    <el-switch v-model="optionModel.range"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-slider/showStops-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-slider/showStops-editor.vue
index e6a4edd..ae79fe8 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-slider/showStops-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-slider/showStops-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showStops')">
-    <el-checkbox v-model="optionModel.showStops"></el-checkbox>
+    <el-switch v-model="optionModel.showStops"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/field-slider/vertical-editor.vue b/src/components/form-designer/setting-panel/property-editor/field-slider/vertical-editor.vue
index e5f0a19..42cb5e3 100644
--- a/src/components/form-designer/setting-panel/property-editor/field-slider/vertical-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-slider/vertical-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.vertical')">
-    <el-checkbox v-model="optionModel.vertical"></el-checkbox>
+    <el-switch v-model="optionModel.vertical"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/filterable-editor.vue b/src/components/form-designer/setting-panel/property-editor/filterable-editor.vue
index b0f9b58..3c72077 100644
--- a/src/components/form-designer/setting-panel/property-editor/filterable-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/filterable-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.filterable')">
-    <el-checkbox v-model="optionModel.filterable"></el-checkbox>
+    <el-switch v-model="optionModel.filterable"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/hidden-editor.vue b/src/components/form-designer/setting-panel/property-editor/hidden-editor.vue
index 53eb456..a954304 100644
--- a/src/components/form-designer/setting-panel/property-editor/hidden-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/hidden-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.hidden')">
-    <el-checkbox v-model="optionModel.hidden"></el-checkbox>
+    <el-switch v-model="optionModel.hidden"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/labelHidden-editor.vue b/src/components/form-designer/setting-panel/property-editor/labelHidden-editor.vue
index 5225a1b..e512ab4 100644
--- a/src/components/form-designer/setting-panel/property-editor/labelHidden-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/labelHidden-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.labelHidden')">
-    <el-checkbox v-model="optionModel.labelHidden"></el-checkbox>
+    <el-switch v-model="optionModel.labelHidden"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/multiple-editor.vue b/src/components/form-designer/setting-panel/property-editor/multiple-editor.vue
index 48fde31..487e4ad 100644
--- a/src/components/form-designer/setting-panel/property-editor/multiple-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/multiple-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.multiple')">
-    <el-checkbox v-model="optionModel.multiple" @change="onMultipleSelected"></el-checkbox>
+    <el-switch v-model="optionModel.multiple" @change="onMultipleSelected"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/multipleSelect-editor.vue b/src/components/form-designer/setting-panel/property-editor/multipleSelect-editor.vue
index 0d2b7fc..8303980 100644
--- a/src/components/form-designer/setting-panel/property-editor/multipleSelect-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/multipleSelect-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.multipleSelect')">
-    <el-checkbox v-model="optionModel.multipleSelect"></el-checkbox>
+    <el-switch v-model="optionModel.multipleSelect"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/name-editor.vue b/src/components/form-designer/setting-panel/property-editor/name-editor.vue
index 6422634..a9c150e 100644
--- a/src/components/form-designer/setting-panel/property-editor/name-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/name-editor.vue
@@ -4,11 +4,11 @@
       <el-tooltip effect="light" :content="i18nt('designer.setting.editNameHelp')">
         <i class="el-icon-info"></i></el-tooltip>
     </span>
-    <template v-if="!!selectedWidget.category || noFieldList">
-      <el-input type="text" v-model="optionModel.name" @change="updateWidgetNameAndRef"></el-input>
+    <template v-if="(!!selectedWidget.category && (selectedWidget.type !== 'sub-form')) || noFieldList">
+      <el-input type="text" v-model="optionModel.name" :readonly="widgetNameReadonly" @change="updateWidgetNameAndRef"></el-input>
     </template>
     <template v-else>
-      <el-select v-model="optionModel.name" allow-create filterable @change="updateWidgetNameAndRef"
+      <el-select v-model="optionModel.name" allow-create filterable :disabled="widgetNameReadonly" @change="updateWidgetNameAndRef"
                  :title="i18nt('designer.setting.editNameHelp')">
         <el-option v-for="(sf, sfIdx) in serverFieldList" :key="sfIdx" :label="sf.label" :value="sf.name"></el-option>
       </el-select>
@@ -28,7 +28,7 @@
       selectedWidget: Object,
       optionModel: Object,
     },
-    inject: ['serverFieldList'],
+    inject: ['serverFieldList', 'getDesignerConfig'],
     data() {
       return {
         nameRequiredRule: [{required: true, message: 'name required'}],
@@ -39,6 +39,10 @@
         return !this.serverFieldList || (this.serverFieldList.length <= 0)
       },
 
+      widgetNameReadonly() {
+        return !!this.getDesignerConfig().widgetNameReadonly
+      },
+
     },
     methods: {
       updateWidgetNameAndRef(newName) {
diff --git a/src/components/form-designer/setting-panel/property-editor/readonly-editor.vue b/src/components/form-designer/setting-panel/property-editor/readonly-editor.vue
index 7ff8bfd..b13462e 100644
--- a/src/components/form-designer/setting-panel/property-editor/readonly-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/readonly-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.readonly')">
-    <el-checkbox v-model="optionModel.readonly"></el-checkbox>
+    <el-switch v-model="optionModel.readonly"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/remote-editor.vue b/src/components/form-designer/setting-panel/property-editor/remote-editor.vue
index 2cf2582..def1ff2 100644
--- a/src/components/form-designer/setting-panel/property-editor/remote-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/remote-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.remote')">
-    <el-checkbox v-model="optionModel.remote" @change="onRemoteChange"></el-checkbox>
+    <el-switch v-model="optionModel.remote" @change="onRemoteChange"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/required-editor.vue b/src/components/form-designer/setting-panel/property-editor/required-editor.vue
index 6684f39..6925b12 100644
--- a/src/components/form-designer/setting-panel/property-editor/required-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/required-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.required')">
-    <el-checkbox v-model="optionModel.required"></el-checkbox>
+    <el-switch v-model="optionModel.required"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/showFileList-editor.vue b/src/components/form-designer/setting-panel/property-editor/showFileList-editor.vue
index 597e1da..04e2def 100644
--- a/src/components/form-designer/setting-panel/property-editor/showFileList-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/showFileList-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showFileList')">
-    <el-checkbox v-model="optionModel.showFileList"></el-checkbox>
+    <el-switch v-model="optionModel.showFileList"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/showPassword-editor.vue b/src/components/form-designer/setting-panel/property-editor/showPassword-editor.vue
index 38c722f..902818d 100644
--- a/src/components/form-designer/setting-panel/property-editor/showPassword-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/showPassword-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showPassword')" v-if="optionModel.type === 'password'">
-    <el-checkbox v-model="optionModel.showPassword"></el-checkbox>
+    <el-switch v-model="optionModel.showPassword"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/showWordLimit-editor.vue b/src/components/form-designer/setting-panel/property-editor/showWordLimit-editor.vue
index 478f349..07fab83 100644
--- a/src/components/form-designer/setting-panel/property-editor/showWordLimit-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/showWordLimit-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.showWordLimit')">
-    <el-checkbox v-model="optionModel.showWordLimit"></el-checkbox>
+    <el-switch v-model="optionModel.showWordLimit"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/setting-panel/property-editor/withCredentials-editor.vue b/src/components/form-designer/setting-panel/property-editor/withCredentials-editor.vue
index 39b35eb..b965627 100644
--- a/src/components/form-designer/setting-panel/property-editor/withCredentials-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/withCredentials-editor.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.withCredentials')">
-    <el-checkbox v-model="optionModel.withCredentials"></el-checkbox>
+    <el-switch v-model="optionModel.withCredentials"></el-switch>
   </el-form-item>
 </template>
 
diff --git a/src/components/form-designer/toolbar-panel/index.vue b/src/components/form-designer/toolbar-panel/index.vue
index 4e634ac..c5b2ea1 100644
--- a/src/components/form-designer/toolbar-panel/index.vue
+++ b/src/components/form-designer/toolbar-panel/index.vue
@@ -236,7 +236,7 @@
             {label: '333', value: 3},
           ]
         },
-        
+
       }
     },
     computed: {
@@ -272,12 +272,13 @@
 
     },
     mounted() {
+      let maxTBWidth = this.designerConfig.toolBarMaxWidth
       let newTBWidth = window.innerWidth - 260 - 300 - 320 - 80
-      this.toolBarWidth = newTBWidth >= 420 ? 420 : (newTBWidth <= 300 ? 300 : newTBWidth)
+      this.toolBarWidth = newTBWidth >= maxTBWidth ? maxTBWidth : (newTBWidth <= 300 ? 300 : newTBWidth)
       addWindowResizeHandler(() => {
         this.$nextTick(() => {
           let newTBWidth2 = window.innerWidth - 260 - 300 - 320 - 80
-          this.toolBarWidth = newTBWidth2 >= 420 ? 420 : (newTBWidth2 <= 300 ? 300 : newTBWidth2)
+          this.toolBarWidth = newTBWidth2 >= maxTBWidth ? maxTBWidth : (newTBWidth2 <= 300 ? 300 : newTBWidth2)
         })
       })
     },
diff --git a/src/components/form-render/index.vue b/src/components/form-render/index.vue
index 976184b..8f9ae24 100644
--- a/src/components/form-render/index.vue
+++ b/src/components/form-render/index.vue
@@ -42,7 +42,7 @@
   import './container-item/index'
   import FieldComponents from '@/components/form-designer/form-widget/field-widget/index'
   import {
-    deepClone,
+    deepClone, getAllContainerWidgets, getAllFieldWidgets,
     insertCustomCssToHead,
     insertGlobalFunctionsToHtml,
     traverseFieldWidgets
@@ -549,6 +549,7 @@
         subFormNames.forEach(sfName => {
           if (!!this.subFormRefList[sfName].resetSubForm) {
             this.subFormRefList[sfName].resetSubForm()
+            this.subFormRefList[sfName].addSubFormRow()
           }
         })
 
@@ -623,7 +624,23 @@
             })
           }
         }
-      }
+      },
+
+      /**
+       * 获取所有字段组件
+       * @returns {*[]}
+       */
+      getFieldWidgets() {
+        return getAllFieldWidgets(this.formJsonObj.widgetList)
+      },
+
+      /**
+       * 获取所有容器组件
+       * @returns {*[]}
+       */
+      getContainerWidgets() {
+        return getAllContainerWidgets(this.formJsonObj.widgetList)
+      },
 
       //--------------------- 以上为组件支持外部调用的API方法 end ------------------//
 
diff --git a/src/utils/util.js b/src/utils/util.js
index bd993fa..8bc21da 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -210,8 +210,8 @@ function handleWidgetForTraverse(widget, handler) {
 
 /**
  * 遍历容器内的字段组件
- * @param con 
- * @param handler 
+ * @param con
+ * @param handler
  */
 export function traverseFieldWidgetsOfContainer(con, handler) {
   if (con.type === 'grid') {
@@ -245,6 +245,44 @@ export function traverseFieldWidgetsOfContainer(con, handler) {
   }
 }
 
+/**
+ * 获取所有字段组件
+ * @param widgetList
+ * @returns {[]}
+ */
+export function getAllFieldWidgets(widgetList) {
+  let result = []
+  let handlerFn = (w) => {
+    result.push({
+      type: w.type,
+      name: w.options.name,
+      field: w
+    })
+  }
+  traverseFieldWidgets(widgetList, handlerFn)
+
+  return result
+}
+
+/**
+ * 获取所有容器组件
+ * @param widgetList
+ * @returns {[]}
+ */
+export function getAllContainerWidgets(widgetList) {
+  let result = []
+  let handlerFn = (w) => {
+    result.push({
+      type: w.type,
+      name: w.options.name,
+      container: w
+    })
+  }
+  traverseContainWidgets(widgetList, handlerFn)
+
+  return result
+}
+
 export function copyToClipboard(content, clickEvent, $message, successMsg, errorMsg) {
   const clipboard = new Clipboard(clickEvent.target, {
     text: () => content