diff --git a/src/resources/plugins/TsSheet/child-form-item.vue b/src/resources/plugins/TsSheet/child-form-item.vue
index f3d4a40b0c7d538591f63b23ff51582327aa9c93..35055725be610d463dec88305c1bdf08a23cd998 100644
--- a/src/resources/plugins/TsSheet/child-form-item.vue
+++ b/src/resources/plugins/TsSheet/child-form-item.vue
@@ -117,6 +117,31 @@ export default {
         }
       }
       return errorList;
+    },
+    validConfig() {
+      const errorList = [];
+      if (this.$refs) {
+        for (let name in this.$refs) {
+          if (this.$refs[name]) {
+            let formitem = this.$refs[name];
+            if (this.$refs[name] instanceof Array) {
+              formitem = this.$refs[name][0];
+            } else {
+              formitem = this.$refs[name];
+            }
+            if (formitem) {
+              const err = formitem.validConfig();
+              if (err && err.length > 0) {
+                errorList.push({
+                  uuid: formitem.formItem.uuid,
+                  errorList: err
+                });
+              }
+            }
+          }
+        }
+      }
+      return errorList;
     }
   },
   filter: {},
diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue
index baf7ffa364bcf74f38ad2265c161e97362da1b58..46d9c65acbad1a523b2f57ec4d4c59b9b94c39e2 100644
--- a/src/resources/plugins/TsSheet/form-edit.vue
+++ b/src/resources/plugins/TsSheet/form-edit.vue
@@ -147,15 +147,15 @@
                 </Dropdown>
               </div>
               <div class="action-item">
-                <Button type="primary" ghost @click="saveForm('saveother')">{{ $t('term.framework.saveothernewversion') }}</Button>
+                <Button type="primary" ghost @click.stop="saveForm('saveother')">{{ $t('term.framework.saveothernewversion') }}</Button>
               </div>
               <div class="action-item last">
-                <Button type="primary" @click="handleSaveForm()">{{ $t('page.save') }}</Button>
+                <Button type="primary" @click.stop="handleSaveForm()">{{ $t('page.save') }}</Button>
               </div>
             </template>
             <template v-else>
               <div class="action-item last">
-                <Button type="primary" @click="backPreFormData(formDataQueue[formDataQueue.length - 2])">确认</Button>
+                <Button type="primary" @click="backPreFormData(formDataQueue[formDataQueue.length - 2])">{{ $t('page.confirm') }}</Button>
               </div>
             </template>
           </div>
@@ -990,7 +990,7 @@ export default {
       }
       return isValid;
     },
-    jumpToItem(uuid) {
+    jumpToItem(uuid, item) {
       this.currentFormItem = null;
       this.$nextTick(() => {
         this.formData.formConfig.tableList.forEach(d => {
@@ -998,6 +998,13 @@ export default {
           if (!this.$utils.isEmpty(component) && component.uuid === uuid) {
             this.currentFormItem = component;
             this.$refs.sheet.selectCell(d);
+            if (item.uuid && !this.$utils.isEmpty(this.currentFormItem.component)) {
+              this.currentFormItem.component.forEach(c => {
+                if (c.uuid === item.uuid) {
+                  this.currentFormItem = c;
+                }
+              });
+            }
           }
         });
       });
diff --git a/src/resources/plugins/TsSheet/form/component/base.vue b/src/resources/plugins/TsSheet/form/component/base.vue
index 659b55c1fbb4ae1fcf2638ea137a507d5457b8f9..851e599261f79427dc046a253ca46d84decf11ca 100644
--- a/src/resources/plugins/TsSheet/form/component/base.vue
+++ b/src/resources/plugins/TsSheet/form/component/base.vue
@@ -50,6 +50,14 @@ export default {
           subErrorList.forEach(e => {
             if (e.field && e.error) {
               errorList.push(e);
+            } else if (!this.$utils.isEmpty(e.errorList)) { 
+              //选项卡和折叠面板校验
+              e.errorList.forEach(s => {
+                errorList.push({
+                  uuid: e.uuid,
+                  ...s
+                });
+              });
             }
           });
         }
diff --git a/src/resources/plugins/TsSheet/form/component/formcollapse.vue b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
index 708be60c88e08b27c35b9dd6d489163baec823b7..1313ed45667a8a760ed531913c9b3a62201cc688 100644
--- a/src/resources/plugins/TsSheet/form/component/formcollapse.vue
+++ b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
@@ -129,6 +129,28 @@ export default {
         }
       }
       return errorList;
+    },
+    validConfig() {
+      const errorList = [];
+      if (this.$refs) {
+        for (let name in this.$refs) {
+          if (this.$refs[name]) {
+            let formitem = this.$refs[name];
+            if (this.$refs[name] instanceof Array) {
+              formitem = this.$refs[name][0];
+            } else {
+              formitem = this.$refs[name];
+            }
+            if (formitem) {
+              const err = formitem.validConfig();
+              if (err && err.length > 0) {
+                errorList.push(...err);
+              }
+            }
+          }
+        }
+      }
+      return errorList;
     }
   },
   filter: {},
diff --git a/src/resources/plugins/TsSheet/form/component/formtab.vue b/src/resources/plugins/TsSheet/form/component/formtab.vue
index 30a87c2286fed71bac5cc81362739b2579e2176f..f8a378c41c0872352d352889da3702d688b33e51 100644
--- a/src/resources/plugins/TsSheet/form/component/formtab.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtab.vue
@@ -132,6 +132,28 @@ export default {
     },
     changeTab() {
       this.$emit('resize');
+    },
+    validConfig() {
+      const errorList = [];
+      if (this.$refs) {
+        for (let name in this.$refs) {
+          if (this.$refs[name]) {
+            let formitem = this.$refs[name];
+            if (this.$refs[name] instanceof Array) {
+              formitem = this.$refs[name][0];
+            } else {
+              formitem = this.$refs[name];
+            }
+            if (formitem) {
+              const err = formitem.validConfig();
+              if (err && err.length > 0) {
+                errorList.push(...err);
+              }
+            }
+          }
+        }
+      }
+      return errorList;
     }
   },
   filter: {},
diff --git a/src/resources/plugins/TsSheet/form/config/formcheckbox-conf.vue b/src/resources/plugins/TsSheet/form/config/formcheckbox-conf.vue
index 9143a2ced4f7a9c1446306b0cefd9d7d5503a991..4b9cebe29151a6a8a96ea981403aaa74e7f54d92 100644
--- a/src/resources/plugins/TsSheet/form/config/formcheckbox-conf.vue
+++ b/src/resources/plugins/TsSheet/form/config/formcheckbox-conf.vue
@@ -15,12 +15,22 @@
         @change="changDataSource"
       ></TsFormRadio>
     </TsFormItem>
-    <TsFormItem v-if="config.dataSource === 'static'" :label="$t('page.dropdownoption')" labelPosition="top">
+    <TsFormItem
+      v-if="config.dataSource === 'static'"
+      :label="$t('page.dropdownoption')"
+      labelPosition="top"
+      required
+    >
       <div class="radius-sm padding-md" :class="validClass('dataList')">
         <StaticDataEditor v-model="config.dataList" :disabled="disabled"></StaticDataEditor>
       </div>
     </TsFormItem>
-    <TsFormItem v-if="config.dataSource === 'matrix'" :label="$t('page.matrix')" labelPosition="top">
+    <TsFormItem
+      v-if="config.dataSource === 'matrix'"
+      :label="$t('page.matrix')"
+      labelPosition="top"
+      required
+    >
       <div class="radius-sm padding-md" :class="validClass('matrixUuid')">
         <TsFormSelect
           v-model="config.matrixUuid"
diff --git a/src/resources/plugins/TsSheet/form/config/formradio-conf.vue b/src/resources/plugins/TsSheet/form/config/formradio-conf.vue
index 0adf0b2b50218452ac09d0a27941f713b2cc0c55..e983f3f1b9ee9b2e62355d9df4f3f176b4d27a26 100644
--- a/src/resources/plugins/TsSheet/form/config/formradio-conf.vue
+++ b/src/resources/plugins/TsSheet/form/config/formradio-conf.vue
@@ -15,12 +15,22 @@
         @change="changDataSource"
       ></TsFormRadio>
     </TsFormItem>
-    <TsFormItem v-if="config.dataSource === 'static'" :label="$t('page.dropdownoption')" labelPosition="top">
+    <TsFormItem
+      v-if="config.dataSource === 'static'"
+      :label="$t('page.dropdownoption')"
+      labelPosition="top"
+      required
+    >
       <div class="radius-sm padding-md" :class="validClass('dataList')">
         <StaticDataEditor v-model="config.dataList" :disabled="disabled"></StaticDataEditor>
       </div>
     </TsFormItem>
-    <TsFormItem v-if="config.dataSource === 'matrix'" :label="$t('page.matrix')" labelPosition="top">
+    <TsFormItem
+      v-if="config.dataSource === 'matrix'"
+      :label="$t('page.matrix')"
+      labelPosition="top"
+      required
+    >
       <div class="radius-sm padding-md" :class="validClass('matrixUuid')">
         <TsFormSelect
           v-model="config.matrixUuid"
diff --git a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue
index 2ad56ffb6b1ed30c3ff31e15cf9c82b26fb9de9f..0c77979d61046259886f145fba23f9297624b50c 100644
--- a/src/resources/plugins/TsSheet/form/config/formselect-conf.vue
+++ b/src/resources/plugins/TsSheet/form/config/formselect-conf.vue
@@ -16,12 +16,22 @@
         @change="changDataSource"
       ></TsFormRadio>
     </TsFormItem>
-    <TsFormItem v-if="config.dataSource === 'static'" :label="$t('page.dropdownoption')" labelPosition="top">
+    <TsFormItem
+      v-if="config.dataSource === 'static'"
+      :label="$t('page.dropdownoption')"
+      labelPosition="top"
+      required
+    >
       <div class="radius-sm padding-md" :class="validClass('dataList')">
         <StaticDataEditor v-model="config.dataList" :disabled="disabled"></StaticDataEditor>
       </div>
     </TsFormItem>
-    <TsFormItem v-if="config.dataSource === 'matrix'" :label="$t('page.matrix')" labelPosition="top">
+    <TsFormItem
+      v-if="config.dataSource === 'matrix'"
+      :label="$t('page.matrix')"
+      labelPosition="top"
+      required
+    >
       <div class="radius-sm padding-md" :class="validClass('matrixUuid')">
         <TsFormSelect
           v-model="config.matrixUuid"
diff --git a/src/resources/plugins/TsSheet/subformconfig.vue b/src/resources/plugins/TsSheet/subformconfig.vue
index 97279679b6f8aa31845abc423f165de2df39c18f..8c41befc5c19924c7a73b1139cefd1a091b24d61 100644
--- a/src/resources/plugins/TsSheet/subformconfig.vue
+++ b/src/resources/plugins/TsSheet/subformconfig.vue
@@ -63,7 +63,8 @@ export default {
       let formConfig = this.$refs.sheet.getFormConfig();
       this.isFormLoaded = false;
       this.formDataQueue.pop();
-      this.currentFormData = this.formDataQueue[this.formDataQueue.length - 1];
+      let currentFormData = this.formDataQueue[this.formDataQueue.length - 1];
+      this.currentFormData = this.$utils.deepClone(currentFormData);
       if (this.currentFormData.formConfig && this.currentFormData.formConfig.tableList) {
         this.currentFormData.formConfig.tableList.forEach(t => {
           if (t.component) {