diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index 4068f56712f32215fa42cdf2f0ba7021cf9cee67..462826c310a8c994a4ad0dec82f4a5dbdff99be8 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -1167,9 +1167,9 @@ export default {
     //根据联动配置初始化watch
     initReactionWatch() {
       this.needWatch = false;
-      if (this.config.reaction) {
-        for (let key in this.config.reaction) {
-          if (this.config.reaction[key].some(d => !this.$utils.isEmpty(d)) > 0) {
+      if (this.reaction) {
+        for (let key in this.reaction) {
+          if (this.reaction[key].some(d => !this.$utils.isEmpty(d)) > 0) {
             this.needWatch = true;
             break;
           }
@@ -1182,9 +1182,8 @@ export default {
             this.$nextTick(() => {
               const newVal = newValue && JSON.parse(newValue);
               const oldVal = oldValue && JSON.parse(oldValue);
-
-              for (let key in this.config.reaction) {
-                this.config.reaction[key].forEach(reaction => {
+              for (let key in this.reaction) {
+                this.reaction[key].forEach(reaction => {
                   if (this.mode !== 'edit' && reaction.rows && reaction.rows.length > 0) {
                     const reactionResult = this.executeReaction(reaction, newVal, oldVal);
                     if (key === 'hiderow') {
@@ -1780,9 +1779,9 @@ export default {
     },
     //行是否有联动设置
     hasReaction(index) {
-      if (this.config.reaction) {
-        for (let key in this.config.reaction) {
-          const reactionList = this.config.reaction[key];
+      if (this.reaction) {
+        for (let key in this.reaction) {
+          const reactionList = this.reaction[key];
           if (reactionList && reactionList.length > 0) {
             for (let i = 0; i < reactionList.length; i++) {
               const reaction = reactionList[i];
@@ -1796,9 +1795,9 @@ export default {
       return false;
     },
     isHideRow(index) {
-      if (this.config.reaction && this.config.reaction.hiderow) {
-        for (let i = 0; i < this.config.reaction.hiderow.length; i++) {
-          const hiderow = this.config.reaction.hiderow[i];
+      if (this.reaction && this.reaction.hiderow) {
+        for (let i = 0; i < this.reaction.hiderow.length; i++) {
+          const hiderow = this.reaction.hiderow[i];
           if (hiderow.rows && hiderow.rows.length > 0 && hiderow.rows.includes(index)) {
             return true;
           }
@@ -2104,9 +2103,9 @@ export default {
     conditionData() {
       return uuid => {
         const conditionData = {};
-        if (this.config.reaction) {
-          for (let key in this.config.reaction) {
-            const reactionList = this.config.reaction[key];
+        if (this.reaction) {
+          for (let key in this.reaction) {
+            const reactionList = this.reaction[key];
             if (reactionList && reactionList.length > 0) {
               reactionList.forEach(reaction => {
                 if (reaction && !this.$utils.isEmpty(reaction) && reaction.conditionGroupList) {
@@ -2400,6 +2399,9 @@ export default {
         let {componentTopLeftTip = ''} = config;
         return componentTopLeftTip;
       };
+    },
+    reaction() {
+      return this.config && this.config.reaction;
     }
   },
   watch: {
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index f76674e0c5644f71134a93337e2ea6983c6aa9b7..57439642ff452751a2ae4fe492387954887eba8a 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="form-item radius-md" :class="{ 'bg-error-grey': showStatusIcon && (hasDataError || hasConfigError) }">
-    <i v-if="isShowComponent(formItem) && formItem.config && formItem.config.isRequired && !readonly && !formItem.config.isReadOnly" class="require-tip text-error">*</i>
     <!--编辑模式下的非container组件需要增加遮罩屏蔽所有操作，container组件需要接受拖拽组件进去，不需要遮罩-->
     <div v-if="(mode === 'edit' || mode === 'editSubform') && !formItem.isContainer" class="editor-mask"></div>
     <div v-if="mode != 'defaultvalue' && mode !== 'condition' && ((formItem.override_config && formItem.override_config.isMask) || (formItem.config && formItem.config.isMask))" class="mask">
@@ -50,84 +49,87 @@
     <div v-if="clearable && mode == 'edit'" class="corner-close-icon tsfont-close-o text-tip-active" @mousedown.prevent.stop="$emit('delete')"></div>
     <div v-if="mode == 'edit' && formItem.config && formItem.config.isHide" class="corner-bottom-icon text-grey tsfont-eye-off"></div>
     <div v-if="needLabel" class="mb-xs">{{ formItem.label }}</div>
-    <template v-if="isShowComponent(formItem) && (!formItem.type || formItem.type === 'form')">
-      <component
-        :is="formItem.handler"
-        v-if="isExistComponent && formItem.handler !== 'formcustom'"
-        ref="formItem"
-        :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
-        :formItem="formItem"
-        :formItemList="formItemList"
-        :value="formItemValue"
-        :mode="mode"
-        :filter="filter"
-        :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-        :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-        :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
-        :formData="formData"
-        :readonlyTextIsHighlight="readonlyTextIsHighlight"
-        :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
-        :isCustomValue="isCustomValue"
-        :isClearSpecifiedAttr="isClearSpecifiedAttr"
-        :externalData="externalData"
-        :rowUuid="rowUuid"
-        :extendConfigList="extendConfigList"
-        @setValue="setValue"
-        @resize="$emit('resize')"
-        @select="selectFormItem"
-        @dropHideComponent="(enevt)=>{
-          $emit('dropHideComponent', enevt)
-        }"
-      ></component>
-      <component
-        :is="formItem.customName"
-        v-else-if="isExistComponent && formItem.handler === 'formcustom'"
+    <template v-if="isShowComponent(formItem)">
+      <i v-if="formItem.config && formItem.config.isRequired && !readonly && !formItem.config.isReadOnly" class="require-tip text-error">*</i>
+      <template v-if=" (!formItem.type || formItem.type === 'form')">
+        <component
+          :is="formItem.handler"
+          v-if="isExistComponent && formItem.handler !== 'formcustom'"
+          ref="formItem"
+          :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
+          :formItem="formItem"
+          :formItemList="formItemList"
+          :value="formItemValue"
+          :mode="mode"
+          :filter="filter"
+          :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
+          :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
+          :formData="formData"
+          :readonlyTextIsHighlight="readonlyTextIsHighlight"
+          :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
+          :isCustomValue="isCustomValue"
+          :isClearSpecifiedAttr="isClearSpecifiedAttr"
+          :externalData="externalData"
+          :rowUuid="rowUuid"
+          :extendConfigList="extendConfigList"
+          @setValue="setValue"
+          @resize="$emit('resize')"
+          @select="selectFormItem"
+          @dropHideComponent="(enevt)=>{
+            $emit('dropHideComponent', enevt)
+          }"
+        ></component>
+        <component
+          :is="formItem.customName"
+          v-else-if="isExistComponent && formItem.handler === 'formcustom'"
+          ref="formItem"
+          :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
+          :formItem="formItem"
+          :formItemList="formItemList"
+          :value="formItemValue"
+          :mode="mode"
+          :filter="filter"
+          :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
+          :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
+          :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
+          :formData="formData"
+          :readonlyTextIsHighlight="readonlyTextIsHighlight"
+          :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
+          :isCustomValue="isCustomValue"
+          :isClearSpecifiedAttr="isClearSpecifiedAttr"
+          :externalData="externalData"
+          :historyValue="isCustomValue ? formItemValue : ''"
+          @setValue="setValue"
+          @resize="$emit('resize')"
+          @select="selectFormItem"
+          @setExtendValue="setExtendValue"
+        ></component>
+        <div v-else class="text-warning">
+          {{ getComponentTip() }}
+        </div>
+      </template>
+      <CustomItem
+        v-else-if="formItem.type === 'custom'"
         ref="formItem"
-        :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
+        :style="{ width: (formItem.config && formItem.config.width) || '100%' }"
         :formItem="formItem"
         :formItemList="formItemList"
+        :customFormItem="customFormItem"
         :value="formItemValue"
         :mode="mode"
         :filter="filter"
-        :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-        :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-        :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false"
-        :formData="formData"
+        :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
+        :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled"
         :readonlyTextIsHighlight="readonlyTextIsHighlight"
-        :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
-        :isCustomValue="isCustomValue"
         :isClearSpecifiedAttr="isClearSpecifiedAttr"
         :externalData="externalData"
-        :historyValue="isCustomValue ? formItemValue : ''"
         @setValue="setValue"
         @resize="$emit('resize')"
         @select="selectFormItem"
-        @setExtendValue="setExtendValue"
-      ></component>
-      <div v-else class="text-warning">
-        {{ getComponentTip(formItem) }}
-      </div>
+      ></CustomItem>
+      <div v-if=" formItem.config && formItem.config.description" class="tsfont-info-o text-tip">{{ formItem.config.description }}</div>
     </template>
-    <CustomItem
-      v-else-if="isShowComponent(formItem) && formItem.type === 'custom'"
-      ref="formItem"
-      :style="{ width: (formItem.config && formItem.config.width) || '100%' }"
-      :formItem="formItem"
-      :formItemList="formItemList"
-      :customFormItem="customFormItem"
-      :value="formItemValue"
-      :mode="mode"
-      :filter="filter"
-      :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly"
-      :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled"
-      :readonlyTextIsHighlight="readonlyTextIsHighlight"
-      :isClearSpecifiedAttr="isClearSpecifiedAttr"
-      :externalData="externalData"
-      @setValue="setValue"
-      @resize="$emit('resize')"
-      @select="selectFormItem"
-    ></CustomItem>
-    <div v-if="isShowComponent(formItem) && formItem.config && formItem.config.description" class="tsfont-info-o text-tip">{{ formItem.config.description }}</div>
   </div>
 </template>
 <script>
@@ -205,6 +207,14 @@ export default {
     extendConfigList: {
       type: Array,
       default: () => []
+    },
+    extraFormItemList: {
+      type: Array,
+      default: () => []
+    },
+    isSetValue: { //是否更新formData
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -231,14 +241,15 @@ export default {
       filter: [], //格式[{column:'矩阵属性uuid',expression:'equal',valueList:["value"]}]
       REACTION: REACTION, //联动规则
       isShowErrorMessage: true,
-      currentItemHide: false //当前组件是否隐藏
+      currentItemHide: false, //当前组件是否隐藏
+      reactionFormItemUuidMap: {} //规格内需要的表单组件值
     };
   },
   beforeCreate() {},
   created() {
+    this.initReactionFormItemUuid();
     this.updateConfig();
     this.initStatus();
-    this.initReactionWatch();
   },
   beforeMount() {},
   mounted() {
@@ -253,6 +264,78 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    initReactionFormItemUuid() { //获取规则内用到的表单组件uuid
+      this.needWatch = false;
+      if (this.reaction) {
+        for (let key in this.reaction) {
+          if (!this.$utils.isEmpty(this.reaction[key])) {
+            this.needWatch = true;
+            break;
+          }
+        }
+      }
+      if (this.mode === 'read' || this.mode === 'readSubform') {
+        if (!this.$utils.isEmpty(this.reactionFormItemUuidMap) || !this.needWatch) {
+          return;
+        }
+        if (this.reaction && !this.$utils.isEmpty(this.reaction)) {
+          for (let action in this.reaction) {
+            const reaction = this.reaction[action];
+            if (action !== 'filter') {
+              const conditinoGroupList = reaction['conditionGroupList'];
+              if (conditinoGroupList && conditinoGroupList.length > 0) {
+                for (let i = 0; i < reaction['conditionGroupList'].length; i++) {
+                  const conditionGroup = reaction['conditionGroupList'][i];
+                  const conditionList = conditionGroup['conditionList'];
+                  if (conditionList && conditionList.length > 0) {
+                    for (let j = 0; j < conditionList.length; j++) {
+                      const condition = conditionList[j];
+                      const uuidList = condition['formItemUuid'].split('#');
+                      const formItemUuid = uuidList[0];
+                      if (!this.reactionFormItemUuidMap.hasOwnProperty(formItemUuid)) {
+                        this.$set(this.reactionFormItemUuidMap, formItemUuid, null);
+                      }
+                    }
+                  }
+                }
+              }
+            } else {
+              const ruleList = reaction['ruleList'];
+              if (ruleList && ruleList.length > 0) {
+                for (let i = 0; i < reaction['ruleList'].length; i++) {
+                  const rule = reaction['ruleList'][i];
+                  let list = rule['formItemUuid'].split('#');
+                  let ruleFormItemUuid = list[0];
+                  if (!this.reactionFormItemUuidMap.hasOwnProperty(ruleFormItemUuid)) {
+                    this.$set(this.reactionFormItemUuidMap, ruleFormItemUuid, null);
+                  }
+                }
+              }
+            }
+          }
+        }
+        if (!this.$utils.isEmpty(this.reactionFormItemUuidMap) && this.formData) {
+          Object.keys(this.reactionFormItemUuidMap).forEach((key) => {
+            this.$set(this.reactionFormItemUuidMap, key, this.formData[key]);
+          });
+        }
+        this.executionReaction(this.reactionFormItemUuidMap);
+      }
+    },
+    executionReaction(newVal, oldVal) { //规则
+      for (let action in this.reaction) {
+        //如果override_config有配置，则相关联动不生效
+        const overrideConfig = this.formItem.override_config || {};
+        const reaction = this.reaction[action];
+        if (reaction && !this.$utils.isEmpty(reaction) && this.isConditionDataChange(action, reaction, newVal, oldVal, this.formItem.uuid)) {
+          const result = this.executeReaction(reaction, newVal, oldVal);
+          if (this.REACTION[action]) {
+            //联动操作
+            this.REACTION[action]({ overrideConfig: overrideConfig, reaction: reaction, result: result, view: this });
+          }
+        }
+      }
+    },
     selectFormItem(formItem) {
       this.$emit('select', formItem);
     },
@@ -283,13 +366,13 @@ export default {
         }
       }
     },
-    //根据联动配置初始化watch
+    //根据联动配置初始化watch，----废弃
     initReactionWatch() {
       if (this.mode === 'read' || this.mode === 'readSubform') {
         this.needWatch = false;
-        if (this.formItem.reaction) {
-          for (let key in this.formItem.reaction) {
-            if (!this.$utils.isEmpty(this.formItem.reaction[key])) {
+        if (this.reaction) {
+          for (let key in this.reaction) {
+            if (!this.$utils.isEmpty(this.reaction[key])) {
               this.needWatch = true;
               break;
             }
@@ -300,13 +383,12 @@ export default {
             'formDataForWatch',
             (newValue, oldValue) => {
               this.enqueueReaction(this.componentUuid, () => {
-                // console.log('开始单个处理');
                 const newVal = newValue && JSON.parse(newValue);
                 const oldVal = oldValue && JSON.parse(oldValue);
-                for (let action in this.formItem.reaction) {
+                for (let action in this.reaction) {
                   //如果override_config有配置，则相关联动不生效
                   const overrideConfig = this.formItem.override_config || {};
-                  const reaction = this.formItem.reaction[action];
+                  const reaction = this.reaction[action];
                   if (reaction && !this.$utils.isEmpty(reaction) && this.isConditionDataChange(action, reaction, newVal, oldVal, this.formItem.uuid)) {
                     const result = this.executeReaction(reaction, newVal, oldVal);
                     if (this.REACTION[action]) {
@@ -471,7 +553,7 @@ export default {
     },
     setValue(val) {
       //formData不一定会提供，例如在联动设置中就不会传入formData，只有在表单正式使用过程中才会有formData
-      if (this.formData) {
+      if (this.formData && this.isSetValue) {
         this.$set(this.formData, this.formItem.uuid, val);
       }
       this.$emit('change', val);
@@ -522,6 +604,25 @@ export default {
     },
     handleCloseErrorMessage() {
       this.isShowErrorMessage = false;
+    },
+    isExistComponent() {
+      let handler = '';
+      if (this.formItem.handler === 'formcustom') {
+        handler = this.formItem.customName;
+      } else {
+        handler = this.formItem.handler;
+      }
+      let component = true;
+      if (!handler || !formItems[handler]) {
+        component = false;
+      }
+      return component;
+    },
+    getComponentTip() {
+      const { label = '', customName = '' } = this.formItem || {};
+      const nameParts = customName.split('-');
+      const componentName = nameParts.length > 1 ? nameParts[0] : customName;
+      return `【${label}(${componentName})】${this.$t('term.framework.componentnoexist')}`;
     }
   },
   filter: {},
@@ -535,13 +636,16 @@ export default {
       }
       return null;
     },
+    reaction() {
+      return this.formItem && this.formItem.reaction;
+    },
     //由于condition的valueList类型是数组，所以不能直接在script中以字符串的方式复制
     conditionData() {
       return uuid => {
         const conditionData = {};
-        if (this.formItem.reaction) {
-          for (let key in this.formItem.reaction) {
-            const reaction = this.formItem.reaction[key];
+        if (this.reaction) {
+          for (let key in this.reaction) {
+            const reaction = this.reaction[key];
             if (reaction && !this.$utils.isEmpty(reaction) && reaction.conditionGroupList) {
               reaction.conditionGroupList.forEach(cg => {
                 if (cg.conditionList) {
@@ -567,9 +671,9 @@ export default {
     },
     //是否配置联动
     hasReaction() {
-      if (!this.$utils.isEmpty(this.formItem.reaction)) {
-        for (let action in this.formItem.reaction) {
-          if (!this.$utils.isEmpty(this.formItem.reaction[action])) {
+      if (!this.$utils.isEmpty(this.reaction)) {
+        for (let action in this.reaction) {
+          if (!this.$utils.isEmpty(this.reaction[action])) {
             return true;
           }
         }
@@ -598,30 +702,35 @@ export default {
         readonlyTextIsHighlight = true;
       }
       return readonlyTextIsHighlight;
-    },
-    isExistComponent() {
-      let handler = '';
-      if (this.formItem.handler === 'formcustom') {
-        handler = this.formItem.customName;
-      } else {
-        handler = this.formItem.handler;
-      }
-      let component = true;
-      if (!handler || !formItems[handler]) {
-        component = false;
-      }
-      return component;
-    },
-    getComponentTip() {
-      return (formItem) => {
-        const { label = '', customName = '' } = formItem || {};
-        const nameParts = customName.split('-');
-        const componentName = nameParts.length > 1 ? nameParts[0] : customName;
-        return `【${label}(${componentName})】${this.$t('term.framework.componentnoexist')}`;
-      };
     }
   },
-  watch: {}
+  watch: {
+    formDataForWatch: {
+      handler(val) {
+        if (val && (this.mode === 'read' || this.mode === 'readSubform')) {
+          this.enqueueReaction(this.componentUuid, () => {
+            //联动规格
+            const formData = JSON.parse(val);
+            if (!this.$utils.isEmpty(this.reactionFormItemUuidMap)) {
+              let reactionFormItemUuidMap = this.$utils.deepClone(this.reactionFormItemUuidMap);
+              Object.keys(reactionFormItemUuidMap).forEach((key) => {
+                reactionFormItemUuidMap[key] = formData[key];
+              });
+              if (!this.$utils.isSame(reactionFormItemUuidMap, this.reactionFormItemUuidMap)) {
+                this.executionReaction(reactionFormItemUuidMap, this.reactionFormItemUuidMap);
+                this.reactionFormItemUuidMap = reactionFormItemUuidMap;
+              }
+            }
+            if (this.formItem.config && this.formItem.config.isHide && this.formItem.config.isRequired) {
+              // 拿到隐藏+必填表单uuid
+              this.$emit('updateHiddenComponentList', val, this.formItem.uuid);
+            }
+          });
+        }
+      },
+      immediate: true
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index 50bd6d0f2f69451aa330d3428f53537aed71a139..9c39f9083c3852b38f7a4a516e3bcc68a98840f5 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -71,10 +71,11 @@
           <div :key="extra.uuid" @click.stop>
             <FormItem
               :ref="'formitem_' + extra.uuid + '_' + index"
-              :formItem="getExtraFormItem(extra, row)"
-              :value="getDefaultValue(extra.uuid, row)"
-              :formData="{ ...filterUuid(initFormData), ...row }"
-              :formItemList="$utils.deepClone(extraList.concat(formItemList))"
+              :formItem="$utils.deepClone(extra)"
+              :formData="{ ...filterUuid(formData), ...row }"
+              :isSetValue="false"
+              :formItemList="formItemList"
+              :extraFormItemList="extraList"
               :showStatusIcon="false"
               mode="read"
               :readonly="readonly"
@@ -130,17 +131,14 @@ export default {
       isShowExportExcelTemplate: true,
       isShowExportExcel: true,
       loading: false,
-      conditionFormItemUuidList: [], //外部组件参与联动条件的uuid列表
       filterComponentList: ['formtableselector', 'formtableinputer', 'formsubassembly', 'formupload', 'formcube', 'formtable', 'formresoureces', 'formprotocol'], //过滤不参与规则的组件
-      initExternalData: {}, //用于对比外部组件值变换
-      initFormData: this.$utils.deepClone(this.formData)
+      initExternalData: {} //用于对比外部组件值变换
     };
   },
   beforeCreate() {},
   created() {
     if (this.mode !== 'edit') {
       this.init();
-      this.getConditionFormItemList();
     }
   },
   beforeMount() {},
@@ -231,33 +229,6 @@ export default {
       Object.assign(data, this.initExternalData);
       this.tableData.tbodyList.push(data);
     },
-    //从表格选择列表行数据中获取指定字段作为扩展字段的过滤值
-    getExtraFormItem(extraFormItem, row) {
-      //由于每行的过滤值都不一样，所以需要复制，避免互相影响
-      if (!this.rowFormItem[row.uuid]) {
-        this.rowFormItem[row.uuid] = {};
-      }
-      if (!this.rowFormItem[row.uuid][extraFormItem.uuid]) {
-        this.rowFormItem[row.uuid][extraFormItem.uuid] = this.$utils.deepClone(extraFormItem);
-      }
-      const formItem = this.rowFormItem[row.uuid][extraFormItem.uuid];
-      const config = formItem.config;
-      if (config && config.sourceColumnList && config.sourceColumnList.length > 0) {
-        config.sourceColumnList.forEach(sourceColumn => {
-          if (sourceColumn.valueColumn) {
-            sourceColumn.valueList = [row[sourceColumn.valueColumn]];
-            sourceColumn.expression = 'equal';
-          }
-        });
-      }
-      if (this.disabled) {
-        this.$set(formItem.config, 'isDisabled', true);
-      }
-      if (this.readonly) {
-        this.$set(formItem.config, 'isReadOnly', true);
-      }
-      return { ...formItem };
-    },
     validConfig() {
       const errorList = [];
       if (!this.config.dataConfig || this.config.dataConfig.length == 0) {
@@ -394,7 +365,9 @@ export default {
       }
     },
     changeRow(val, uuid, row) {
-      this.$set(row, uuid, val);
+      if (!this.$utils.isSame(val, row[uuid])) {
+        this.$set(row, uuid, val);
+      }
     },
     updateRowSort(event) {
       let beforeVal = this.tableData.tbodyList.splice(event.oldIndex, 1)[0];
@@ -863,16 +836,6 @@ export default {
       }
       return typeof value == 'number' ? String(value) : value;
     },
-    getConditionFormItemList() {
-      //获取可以作为联动的条件的组件(外部组件和当前行下组件的属性)
-      this.conditionFormItemUuidList = [];
-      let allFormItem = this.formItemList.concat(this.formItem.config.dataConfig);
-      let formItemList = allFormItem.filter(d => d.hasValue && (!this.formItem || (this.formItem && d.uuid != this.formItem.uuid)) && !this.filterComponentList.includes(d.handler));
-      if (formItemList && formItemList.length > 0) {
-        this.conditionFormItemUuidList = this.$utils.mapArray(formItemList, 'uuid');
-      }
-      this.conditionFormItemUuidList.push('uuid');
-    },
     updateCurrentRow(row, val) {
       this.$nextTick(() => {
         if (val) {
@@ -881,10 +844,14 @@ export default {
       });
     },
     filterUuid(obj) {
-      if (obj.uuid) {
-        delete obj.uuid;
+      let formData = this.$utils.deepClone(obj);
+      if (formData.uuid) {
+        delete formData.uuid;
+      }
+      if (formData.hasOwnProperty(this.formItem.uuid)) {
+        delete formData[this.formItem.uuid];
       }
-      return obj;
+      return formData;
     }
   },
   filter: {},
@@ -898,48 +865,12 @@ export default {
     extraList() {
       return this.config.dataConfig.filter(d => d.isPC);
     },
-    getDefaultValue() {
-      return (uuid, row) => {
-        let dataConfig = null;
-        if (!this.$utils.isEmpty(this.value) && Array.isArray(this.value)) {
-          let valueItem = this.value.find(i => i.uuid === row.uuid);
-          if (valueItem) {
-            dataConfig = valueItem;
-          }
-        }
-        if (!dataConfig) {
-          dataConfig = this.config.dataConfig.find(d => d.uuid === uuid);
-        }
-        if (dataConfig) {
-          if (dataConfig.config) {
-            const defaultValue = dataConfig.config.defaultValue;
-            if (dataConfig.config.defaultValueType === 'custom') {
-              return defaultValue;
-            } else if (dataConfig.config.defaultValueType === 'matrix') {
-              if (['formselect', 'formradio', 'formcheckbox'].includes(dataConfig.handler)) {
-                const defaultValueField = dataConfig.config.defaultValueField;
-                const defaultTextField = dataConfig.config.defaultTextField;
-                return { text: row[defaultValueField], value: row[defaultTextField] };
-              } else {
-                return row[defaultValue];
-              }
-            } else {
-              return defaultValue;
-            }
-          }
-        }
-        return null;
-      };
-    },
     canAdd() {
       return !this.config.hasOwnProperty('isCanAdd') || this.config.isCanAdd;
     },
     canShowImportExportBtn() {
       return !this.config.hasOwnProperty('isShowImportExportBtn') || this.config.isShowImportExportBtn;
     },
-    formDataForWatch() {
-      return JSON.parse(JSON.stringify(this.formData));
-    },
     showTable() {
       const { hideHeaderWhenDataEmpty = false } = this.config || {};
       const { tbodyList = [] } = this.tableData || {};
@@ -982,15 +913,6 @@ export default {
       },
       deep: true,
       immediate: true
-    },
-    formDataForWatch: {
-      handler(val) {
-        if (this.mode != 'edit' && this.mode != 'editSubform' && !this.$utils.isSame(val, this.initFormData)) {
-          this.initFormData = this.$utils.deepClone(val) || {};
-        }
-      },
-      deep: true,
-      immediate: true
     }
   }
 };
diff --git a/src/resources/plugins/TsSheet/form/conditionexpression/change.js b/src/resources/plugins/TsSheet/form/conditionexpression/change.js
index a889822340c25a72bef89a68de7482a10b1300a8..69df687dc968570f1c992ebdcc5ea0c3ed5afd0d 100644
--- a/src/resources/plugins/TsSheet/form/conditionexpression/change.js
+++ b/src/resources/plugins/TsSheet/form/conditionexpression/change.js
@@ -1,5 +1,6 @@
-export default (currentValue, oldValue, condition) => {
-  if (JSON.stringify(currentValue) !== JSON.stringify(oldValue)) {
+import utils from '@/resources/assets/js/util.js';
+export default (currentValue, oldValue, condition, view) => {
+  if (!utils.isSame(currentValue, oldValue)) {
     return true;
   }
   return false;
diff --git a/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js b/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
index f308e4fb2d6cc4806467d6019cc811b4c638fe89..a933d4ed5cdf5ed4a27830528c01cfb83d9563f0 100644
--- a/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
+++ b/src/resources/plugins/TsSheet/form/conditionexpression/exclude.js
@@ -1,10 +1,11 @@
+import utils from '@/resources/assets/js/util.js';
 export default (currentValue, oldValue, condition) => {
   let isExclude = false;
   let conditionValue = condition.valueList;
   //处理隐藏属性过滤
   let uuidList = (condition.formItemUuid && condition.formItemUuid.split('#')) || [];
   let uuid = uuidList[1] || 'value';
-  if (currentValue == null || currentValue == '' || currentValue == [] || currentValue == {}) {
+  if (utils.isEmpty(currentValue)) {
     isExclude = true;
   } else {
     let conditionValueList = [];
diff --git a/src/resources/plugins/TsSheet/form/reaction/filter.js b/src/resources/plugins/TsSheet/form/reaction/filter.js
index 667fe1b7780107040cc53d6975d82f5441a69bc1..2825d1a33b3ffdf9e55391e1a6ef44d6265eb56b 100644
--- a/src/resources/plugins/TsSheet/form/reaction/filter.js
+++ b/src/resources/plugins/TsSheet/form/reaction/filter.js
@@ -6,6 +6,9 @@ export default ({ reaction, view }) => {
       let formItemUuid = list[0];
       let column = list[1] ? list[1] : 'value';
       let formItem = view.formItemList.find(d => d.uuid === formItemUuid);
+      if (!formItem) {
+        formItem = view.extraFormItemList.find(d => d.uuid === formItemUuid);
+      }
       if (formItem && formItem.config) {
         let valueList = [];
         let textList = [];
diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
index 52746bc9ffcf074b2211b8994c3c386b789b5ff9..05a80fa7a0a95ed29ced202743dc944fda548a63 100644
--- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
@@ -617,7 +617,7 @@ export default {
         file: true,
         reportingHistory: true
       },
-      loadingShow: false, // 解决固定页面之后，tab的顺序改变了，不是渲染前的顺序
+      loadingShow: true, // 解决固定页面之后，tab的顺序改变了，不是渲染前的顺序
       fixedPageList: [],
       mouseoverTabName: '', // 鼠标进入事件
       hasAccessoriesList: true,
@@ -979,23 +979,25 @@ export default {
       this.setTimeUpdata = setTimeout(() => {
         this.$nextTick(() => {
           // 确保子组件渲染完成，否则第一次拿不到formdata的值，导致返回上一层页面，路由数据对比有问题
-          let allData = this.getData();
-          this.$emit('update', allData);
+          if (this.actionConfig.save) {
+            let allData = this.getData();
+            this.$emit('update', allData);
+          }
         });
         this.setTimeUpdata = null;
       }, 300);
     },
-    async initData() {
-      await this.getStepStatusList();
+    initData() {
+      this.getStepStatusList();
       this.wipeCenterDetail();
       this.getActivityList();
       this.getAllFileList();
-    
       this.getTaskComment();
       this.getRepeatList();
       this.initTabList();
       this.$nextTick(() => {
         this.update();
+        this.loadingShow = false;
       });
     },
     wipeCenterDetail() {
@@ -1060,6 +1062,19 @@ export default {
           }
         }
       }
+      //补充默认展示前置步骤tab（eoa）
+      if (this.processTaskConfig.currentProcessTaskStep && this.processTaskConfig.currentProcessTaskStep.viewPrevNodeUuidList) {
+        let viewPrevNodeUuidList = this.processTaskConfig.currentProcessTaskStep.viewPrevNodeUuidList;
+        const viewPrevNodeList = this.processTaskConfig.currentProcessTaskStep.viewPrevNodeList || [];
+        if (!this.$utils.isEmpty(viewPrevNodeUuidList)) {
+          viewPrevNodeUuidList.forEach(pre => {
+            let step = viewPrevNodeList.find(step => step.processStepUuid === pre);
+            if (!this.$utils.isEmpty(step)) {
+              this.viewStepData.push(step);
+            }
+          });
+        }
+      }
     },
     getStepList(data) {
       //刷新子策略数据
@@ -1095,7 +1110,7 @@ export default {
       let data = {
         processTaskId: this.processTaskId
       };
-      return this.$api.process.processtask.getStepStatusList(data).then(res => {
+      this.$api.process.processtask.getStepStatusList(data).then(res => {
         if (res.Status == 'OK') {
           this.stepData = res.Return;
           mutations.setStepList(res.Return);
@@ -1104,18 +1119,6 @@ export default {
             this.stepData.forEach(item => {
               this.$set(item, 'isShow', false);
             });
-            //补充默认展示步骤tab
-            if (this.processTaskConfig.currentProcessTaskStep && this.processTaskConfig.currentProcessTaskStep.handlerStepInfo) {
-              let viewPrevNodeUuidList = this.processTaskConfig.currentProcessTaskStep.viewPrevNodeUuidList;
-              if (!this.$utils.isEmpty(viewPrevNodeUuidList)) {
-                viewPrevNodeUuidList.forEach(pre => {
-                  let step = this.stepData.find(step => step.processStepUuid === pre);
-                  if (!this.$utils.isEmpty(step)) {
-                    this.viewStepData.push(step);
-                  }
-                });
-              }
-            }
           }
         }
       });
diff --git a/src/views/pages/process/task/task-dispatch.vue b/src/views/pages/process/task/task-dispatch.vue
index b7821812a3ccee12e7df2b399e67befb06e7e9a9..5e07bbdd2f5b0fb6cfb3a18b0a57b1f9fcd1ac94 100644
--- a/src/views/pages/process/task/task-dispatch.vue
+++ b/src/views/pages/process/task/task-dispatch.vue
@@ -181,9 +181,10 @@ export default {
     this.invoke = invoke;
     await this.getChannel();
     this.getChannelInfo();
-    this.$nextTick(() => {
-      this.setTimer();
-    });
+    //草稿屏蔽定时保存
+    // this.$nextTick(() => {
+    //   this.setTimer();
+    // });
   },
   beforeMount() {},
   mounted() {},