From b239fc56f5640dc88ff37b9111454697749f50ab Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 9 Oct 2025 10:09:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=A5=E5=8D=95=E6=89=93=E5=BC=80=E6=85=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20=20-=20[=E5=85=B3=E8=81=94]?=
 =?UTF-8?q?#[1478378178183168]=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=89=93=E5=BC=80=E6=85=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?=
 =?UTF-8?q?l/939050947543040/939050947543042/1478378178183168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TsSimpleTable/index.vue        | 112 ++++
 src/resources/plugins/TsSheet/TsSheet.vue     | 360 ++++++-----
 .../plugins/TsSheet/child-form-item.vue       |   8 +
 src/resources/plugins/TsSheet/form-item.vue   |  58 +-
 .../plugins/TsSheet/form/component/base.vue   |   6 +-
 .../TsSheet/form/component/formcollapse.vue   |   4 +
 .../TsSheet/form/component/formtab.vue        |   4 +-
 .../TsSheet/form/component/formtable.vue      |   3 +-
 .../formtableinputer/column-item.vue          | 579 ++++++++++++++++++
 .../form/component/formtableinputer/index.vue | 376 ++++++++----
 .../table-import-export-mixin.js              |  11 +-
 .../TsSheet/form/reaction/setValueOther.js    |   6 +-
 12 files changed, 1227 insertions(+), 300 deletions(-)
 create mode 100644 src/resources/components/TsSimpleTable/index.vue
 create mode 100644 src/resources/plugins/TsSheet/form/component/formtableinputer/column-item.vue

diff --git a/src/resources/components/TsSimpleTable/index.vue b/src/resources/components/TsSimpleTable/index.vue
new file mode 100644
index 00000000..141cb2c2
--- /dev/null
+++ b/src/resources/components/TsSimpleTable/index.vue
@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <div class="tstable-container border bg-grey radius-lg">
+      <div>
+        <table class="tstable-body">
+          <thead>
+            <tr>
+              <th v-for="(col) in theadList" :key="col.key">
+                {{ col.title }}
+              </th>
+            </tr>
+          </thead>
+          <tbody class="tbody-main">
+            <tr
+              v-for="(row, rowIndex) in tbodyList"
+              :key="row.uuid"
+            >
+             
+              <td v-for="(col) in theadList" :key="row.uuid + '_' + col.key">
+                <slot
+                  :name="col.key"
+                  :row="row"
+                  :index="rowIndex"
+                >
+                  {{ row[col.key] }}
+                </slot>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+    <div v-if="rowNum > defaultShowSize && pageSize > 0" class="tstable-page text-right">
+      <Page
+        size="small"
+        :showSizer="true"
+        :showTotal="true"
+        :total="rowNum"
+        :current="currentPage"
+        :page-size="pageSize"
+        :page-size-opts="pageSizeOpts"
+        :transfer="true"
+        @on-change="changeCurrent"
+        @on-page-size-change="changePageSize"
+      />
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TsSimpleTable',
+  components: {},
+  props: {
+    rowNum: [Number, String], //总个数
+    currentPage: { type: Number }, //当前第几页
+    pageSize: {
+      type: Number,
+      default: 20
+    }, //每一页多少
+    pageSizeOpts: {
+      //每页条数切换的配置
+      type: Array,
+      default: () => [10, 20, 30, 40, 60, 80, 100]
+    },
+    defaultShowSize: {
+      // 控制是否显示分页，默认总条数小于10条数据不显示
+      type: Number,
+      default: 10
+    },
+    theadList: { type: Array }, //表头数据
+    tbodyList: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {
+      current: 1
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeCurrent(page) {
+      this.current = page;
+      this.$emit('changeCurrent', this.current);
+    },
+    changePageSize(size) {
+      this.$emit('changePageSize', size);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+::v-deep .tstable-container, .table-container {
+  overflow-x: scroll;
+  width: 100%;
+}
+</style>
diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index 0217f668..d42a83ac 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -8,12 +8,7 @@
     @contextmenu="handleContextMenu"
     @mousemove="doDrag"
     @mouseup="endResize"
-    @click="
-      event => {
-        isContextMenuShow = false;
-        event.stopPropagation();
-      }
-    "
+    @click="handleClick"
     @mouseleave="endResize"
   >
     <div v-if="mode === 'edit'" class="tssheet-toolbar">
@@ -127,11 +122,7 @@
       :class="{ editmode: mode === 'edit' }"
       style="position: relative; overflow: auto; width: 100%"
       :style="{ height: mode === 'edit' ? containerHeight : mode === 'editSubform' ? 'auto' : '100%' }"
-      @scroll="
-        event => {
-          scrollContainer(event);
-        }
-      "
+      @scroll="scrollContainer"
     >
       <table v-if="mode === 'edit'" class="tssheet-main-shadow-head" :style="{ top: scrollTop + 'px', width: tableSize.width + 'px' }">
         <thead>
@@ -145,27 +136,12 @@
               :style="{ width: head.width + 'px' }"
               @mouseup="isDragging = false"
               @mouseenter="multipleSelectColumn(index)"
-              @mousedown="
-                event => {
-                  if (mode === 'edit') {
-                    if (event.buttons === 1) {
-                      clearSelectedRowCol();
-                      isDragging = true;
-                      selectColumn(index);
-                      multipleSelectColumn(index);
-                    }
-                  }
-                }
-              "
+              @mousedown="handleColumnMouseDown(index, $event)"
             >
               <div
                 v-if="mode === 'edit'"
                 class="horizontal-resize-handler"
-                @mousedown.stop="
-                  event => {
-                    startResize(event, 'h', index);
-                  }
-                "
+                @mousedown.stop="startResize($event, 'h', index);"
               ></div>
               <span>{{ getHeadText(index) }}</span>
             </th>
@@ -179,35 +155,20 @@
           </tr>
         </thead>
         <tbody>
-          <tr v-for="(left, rowindex) in shownLefterList" :key="rowindex">
+          <tr v-for="(left) in shownLefterList" :key="left.rowUuid">
             <th
               class="thead-th"
               style="position: relative"
               :class="{ selected: !!left._selected }"
               :style="{ height: left.height + 'px' }"
-              @mousedown="
-                event => {
-                  if (mode === 'edit') {
-                    if (event.buttons === 1) {
-                      clearSelectedRowCol();
-                      isDragging = true;
-                      selectRow(left.index);
-                      multipleSelectRow(left.index);
-                    }
-                  }
-                }
-              "
+              @mousedown="handleRowMouseDown(left, $event)"
               @mouseup="isDragging = false"
               @mouseenter="multipleSelectRow(left.index)"
             >
               <div
                 v-if="mode === 'edit'"
                 class="vertical-resize-handler"
-                @mousedown.stop="
-                  event => {
-                    startResize(event, 'v', left.index);
-                  }
-                "
+                @mousedown.stop="startResize($event, 'v', left.index);"
               ></div>
               <div v-if="hasReaction(left.index)" class="corner-icon tsfont-lightning text-warning"></div>
               {{ left.index + 1 }}
@@ -216,19 +177,19 @@
           </tr>
         </tbody>
       </table>
-      <table class="tssheet-main" :class="{ 'bg-op': mode === 'edit','cell-spacing':mode !== 'edit' && formStyleData.cellSpacing }" :style="{ width: mode === 'edit' ? tableSize.width + 'px' : isFormSubassembly ? 'inherit' : containerWidth + 'px', height: tableSize.height + 'px', margin: mode === 'edit' ? 0 : '0 auto', '--padding': formStyleData.cellSpacing + 'px' || '0px'}">
+      <table class="tssheet-main" :class="tssheetMainClass" :style="tssheetMainStyle">
         <colgroup>
-          <col v-if="mode === 'edit'" :style="{ width: minWidth + 'px' }" />
+          <col v-if="mode === 'edit'" :style="colStyle" />
           <col
             v-for="(head, index) in config.headerList"
             :ref="'header' + index"
             :key="index"
-            :style="{ width: mode === 'edit' ? head.width + 'px' : tdWidth(head.width) }"
+            :style="colgroupStyle(head)"
           />
         </colgroup>
         <thead v-if="mode === 'edit'">
           <tr>
-            <th :style="{ height: minHeight + 'px' }"></th>
+            <th :style="theadThStyle"></th>
             <th v-for="(head, index) in config.headerList" :key="index" class="thead-th"></th>
           </tr>
         </thead>
@@ -236,55 +197,25 @@
           <tr
             v-for="(left, rowindex) in shownLefterList"
             :ref="'lefter' + rowindex"
-            :key="rowindex"
-            :style="{ height: left.height + 'px' }"
+            :key="left.rowUuid"
+            :style="tbodyTrStyle(left)"
           >
             <th v-if="mode === 'edit'" class="thead-th">
               {{ left.index + 1 }}
             </th>
             <td
-              v-for="(cell, cindex) in rowCells(left.index)"
-              :key="cindex"
-              :class="{ read: mode !== 'edit' && mode !== 'editSubform', selected: (mode === 'edit' || mode === 'editSubform') && (!!cell._selected || dropCell === cell), handler: !!cell._isHandler, ...cell.class }"
+              v-for="(cell) in rowCells(left.index)"
+              :key="cell.rowColUuid"
+              :class="tbodyTdClass(cell)"
               :colspan="cell.colspan"
               :rowspan="getActualRowSpan(cell)"
               :style="cell.style"
-              @dblclick="
-              /*if (mode === 'edit') {
-                  focusCell(cell);
-                }*/
-              "
+              @mouseenter="handleMouseEnter($event, cell)"
+              @mousedown="handlemousedown($event, cell)"
+              @mouseup="handleMouseUp"
               @dragover.prevent
-              @drop="
-                event => {
-                  if (mode === 'edit') {
-                    addItemKey(event);
-                  }
-                }
-              "
+              @drop="handleDrop($event)"
               @dragenter="activeDropContainer(cell)"
-              @mouseenter="
-                event => {
-                  if (mode === 'edit' && event.buttons === 1) multipleSelectCell(cell, event);
-                }
-              "
-              @mousedown="
-                event => {
-                  if (mode === 'edit') {
-                    clearSelectedRowCol();
-                    if (event.buttons === 1) {
-                      selectCell(cell);
-                      isDragging = true;
-                    } else if (event.buttons === 2) {
-                      if (!cell._selected) {
-                        selectCell(cell, true);
-                      }
-                      showContextMenu(event);
-                    }
-                  }
-                }
-              "
-              @mouseup="isDragging = false"
             >
               <div
                 v-if="mode === 'edit' && !$utils.isEmpty(cell.component)"
@@ -308,10 +239,11 @@
                   :formItem="cell.component"
                   :formData="formData"
                   :formItemList="formItemList"
+                  :formDataForWatch="formData"
                   :mode="mode"
                   :disabled="disabled"
                   :readonly="readonly || config.readOnly"
-                  :formHighlightData="formHighlightData"
+                  :formHighlightData="freezeFormHighlightData"
                   :isCustomValue="true"
                   :formExtendData="formExtendData"
                   :isClearSpecifiedAttr="isClearSpecifiedAttr"
@@ -321,29 +253,13 @@
                   class="padding-xs"
                   @changeConfig="addHistory()"
                   @change="resizeCell(cell.row, cell.col, true)"
-                  @resize="
-                    $nextTick(() => {
-                      resizeCell(cell.row, cell.col, true);
-                    })
-                  "
-                  @emit="
-                    val => {
-                      $emit('emit', val);
-                    }
-                  "
-                  @select="
-                    com => {
-                      $emit('selectCell', cell, com);
-                    }
-                  "
+                  @setValue="setValue"
+                  @resize="handleResize(cell)"
+                  @emit="handleEmit($event)"
+                  @select="handleSelect($event, cell)"
                   @delete="deleteFormItem(cell)"
                   @updateHiddenComponentList="updateHiddenComponentList"
-                  @dropHideComponent="
-                    event => {
-                      if (mode === 'edit') {
-                        addItemKey(event);
-                      }
-                    }"
+                  @dropHideComponent="dropHideComponent"
                 ></FormItem>
               </div>
               <div v-if="!cell._isHandler && cell.border">
@@ -438,6 +354,7 @@
 </template>
 <script>
 import conditionMixin from './form/conditionexpression/condition-mixin.js';
+const colorList = ['color-picker-th-', 'color-picker-', 'color-picker-border-', 'color-picker-tip-', 'color-picker-text-', 'color-picker-info-', 'color-picker-warning-', 'color-picker-success-', 'color-picker-error-', 'color-picker-info-grey-', 'color-picker-warning-grey-', 'color-picker-success-grey-', 'color-picker-error-grey-', 'color-picker-form-sheet-style-setting-'];
 export default {
   name: '',
   components: {
@@ -549,13 +466,14 @@ export default {
       //expressionList: EXPRESSIONS,
       componentIndex: 1,
       formData: {}, //表单控件的值，key是控件uuid
+     
       fontSizeList: [
         { value: '12px', text: this.$t('page.small') },
         { value: '14px', text: this.$t('page.medium') },
         { value: '16px', text: this.$t('page.big') },
         { value: '18px', text: this.$t('page.maximum') }
       ],
-      colorList: ['color-picker-th-', 'color-picker-', 'color-picker-border-', 'color-picker-tip-', 'color-picker-text-', 'color-picker-info-', 'color-picker-warning-', 'color-picker-success-', 'color-picker-error-', 'color-picker-info-grey-', 'color-picker-warning-grey-', 'color-picker-success-grey-', 'color-picker-error-grey-', 'color-picker-form-sheet-style-setting-'],
+      colorList: colorList,
       formExtendData: {}, //自定义组件消费数据
       hideComponentList: [], //底部隐藏组件列表
       hideComponentError: {},
@@ -568,7 +486,7 @@ export default {
       actionType: '', //当前操作类型,'add'新增组件，'copy'复制组件
       windowKeypressHandler: null, // 用于存储事件处理函数的引用
       formStyleData: {}, //表单样式设置
-      extendConfigList: this.defaultExtendConfigList || [] //扩展配置列表
+      extendConfigList: Object.freeze(this.defaultExtendConfigList) || [] //扩展配置列表
     };
   },
   beforeCreate() {
@@ -601,9 +519,74 @@ export default {
       // 移除事件监听
       container.removeEventListener('keydown', this.windowKeypressHandler);
     }
+    container?.removeEventListener('keydown', this.windowKeypressHandler);
+    this.formData = {};
+    this.extendConfigList = [];
+    this.reactionFnQueue.clear();
+    this.isReady = false;
   },
   destroyed() {},
   methods: {
+    handleColumnMouseDown(index, event) {
+      if (this.mode === 'edit') {
+        if (event.buttons === 1) {
+          this.clearSelectedRowCol();
+          this.isDragging = true;
+          this.selectColumn(index);
+          this.multipleSelectColumn(index);
+        }
+      }
+    },
+    handleRowMouseDown(left, event) {
+      if (this.mode === 'edit') {
+        if (event.buttons === 1) {
+          this.clearSelectedRowCol();
+          this.isDragging = true;
+          this.selectRow(left.index);
+          this.multipleSelectRow(left.index);
+        }
+      }
+    },
+    handleMouseUp() {
+      this.isDragging = false;
+    },
+    handleClick(event) {
+      this.isContextMenuShow = false;
+      event.stopPropagation();
+    },
+    handleMouseEnter(event, cell) {
+      if (this.mode === 'edit' && event.buttons === 1) this.multipleSelectCell(cell, event);
+    },
+    handlemousedown(event, cell) {
+      if (this.mode === 'edit') {
+        this.clearSelectedRowCol();
+        if (event.buttons === 1 && cell) {
+          this.selectCell(cell);
+          this.isDragging = true;
+        } else if (event.buttons === 2) {
+          if (!cell?._selected) {
+            this.selectCell(cell, true);
+          }
+          this.showContextMenu(event);
+        }
+      }
+    },
+    handleResize(cell) {
+      this.$nextTick(() => {
+        this.resizeCell(cell.row, cell.col, true);
+      });
+    },
+    handleEmit(val) {
+      this.$emit('emit', val);
+    },
+    handleSelect(com, cell) {
+      this.$emit('selectCell', cell, com);
+    },
+    dropHideComponent(event) {
+      if (this.mode === 'edit') {
+        this.addItemKey(event);
+      }
+    },
     enqueueReaction(componentUuid, updateFunction) {
       //this.reactionFnQueue.push(updateFunction);
       this.reactionFnQueue.set(componentUuid, updateFunction);
@@ -616,11 +599,11 @@ export default {
     executeReactions() {
       // 执行所有收集到的更新
       // console.log('开始批量处理', new Date());
-      this.reactionFnQueue.forEach(fn => fn && fn());
-      this.reactionFnQueue = new Map();
-      this.isDoingReaction = false;
+      // this.reactionFnQueue.forEach(fn => fn && fn());
+      // this.reactionFnQueue = new Map();
+      // this.isDoingReaction = false;
       // console.log('批量处理完毕', new Date());
-      this.$forceUpdate();
+      // this.$forceUpdate();
     },
     cutCell() {
       if (this.handlerCell) {
@@ -710,7 +693,7 @@ export default {
     initSheet() {
       this.hideComponentList = this.value?.hideComponentList || [];
       if (this.value && this.value.formCustomExtendConfig && !this.$utils.isEmpty(this.value.formCustomExtendConfig.extendConfigList)) {
-        this.extendConfigList = this.value.formCustomExtendConfig.extendConfigList;
+        this.extendConfigList = Object.freeze(this.value.formCustomExtendConfig.extendConfigList);
       }
       if (this.value && this.value.lefterList && this.value.headerList && this.value.tableList) {
         /**
@@ -730,6 +713,9 @@ export default {
           if (d.height < this.minHeight) {
             d.height = this.minHeight;
           }
+          if (d) {
+            d.rowUuid = this.$utils.setUuid();
+          }
         });
         this.config.headerList.forEach(d => {
           if (d.width < this.minWidth) {
@@ -739,6 +725,11 @@ export default {
         if (this.mode === 'edit' || !this.config.hiddenRowList) {
           this.$set(this.config, 'hiddenRowList', []);
         }
+        this.config.tableList.forEach(d => {
+          if (d) {
+            d.rowColUuid = this.$utils.setUuid();
+          }
+        });
         this.componentIndex = this.config.tableList.filter(d => !!d.component && !this.$utils.isEmpty(d.component)).length;
         this.formStyleData = this.value.formWidth || {};
       } else {
@@ -859,21 +850,24 @@ export default {
       if (this.init && this.init.length == 2) {
         const row = this.init[0];
         const col = this.init[1];
-        this.$set(this.config, 'headerList', []);
-        this.$set(this.config, 'lefterList', []);
-        this.$set(this.config, 'tableList', []);
-        this.$set(this.config, 'hiddenRowList', []);
+        let headerList = [];
+        let lefterList = [];
+        let tableList = [];
         for (let c = 0; c < col; c++) {
-          this.config.headerList.push({ width: this.defaultWidth });
+          headerList.push({ width: this.defaultWidth });
         }
         for (let r = 0; r < row; r++) {
-          this.config.lefterList.push({ height: this.minHeight });
+          lefterList.push({ height: this.minHeight, rowUuid: this.$utils.setUuid() });
         }
         for (let r = 0; r < row; r++) {
           for (let c = 0; c < col; c++) {
-            this.config.tableList.push({ row: r, col: c });
+            tableList.push({ row: r, col: c, rowColUuid: this.$utils.setUuid() });
           }
         }
+        this.$set(this.config, 'headerList', headerList);
+        this.$set(this.config, 'lefterList', lefterList);
+        this.$set(this.config, 'tableList', tableList);
+        this.$set(this.config, 'hiddenRowList', []);
       }
     },
     activeDropContainer(cell) {
@@ -1202,22 +1196,25 @@ export default {
     },
     //根据联动配置初始化watch
     initReactionWatch() {
-      this.needWatch = false;
-      if (this.reaction) {
-        for (let key in this.reaction) {
-          if (this.reaction[key].some(d => !this.$utils.isEmpty(d)) > 0) {
-            this.needWatch = true;
-            break;
-          }
-        }
-      }
-      if (this.needWatch && this.formData) {
+      if (this.formData) {
         this.$watch(
-          'formDataForWatch',
+          'formData',
           (newValue, oldValue) => {
             this.$nextTick(() => {
-              const newVal = newValue && JSON.parse(newValue);
-              const oldVal = oldValue && JSON.parse(oldValue);
+              const newVal = newValue;
+              const oldVal = oldValue;
+              this.needWatch = false;
+              if (this.reaction) {
+                for (let key in this.reaction) {
+                  if (this.reaction[key].some(d => !this.$utils.isEmpty(d)) > 0) {
+                    this.needWatch = true;
+                    break;
+                  }
+                }
+              }
+              if (!this.needWatch) {
+                return false;
+              }
               for (let key in this.reaction) {
                 this.reaction[key].forEach(reaction => {
                   if (this.mode !== 'edit' && reaction.rows && reaction.rows.length > 0) {
@@ -1805,9 +1802,21 @@ export default {
     },
     //检查当前单元格是否在其他单元格的span范围
     checkCellIsInSpan(cell) {
-      for (let i = 0; i < this.spanCells.length; i++) {
-        const spancell = this.spanCells[i];
-        if (spancell.row <= cell.row && spancell.row + (spancell.rowspan || 1) >= cell.row + (cell.rowspan || 1) && spancell.col <= cell.col && spancell.col + (spancell.colspan || 1) >= cell.col + (cell.colspan || 1) && spancell != cell) {
+      const cellEndRow = cell.row + (cell.rowspan || 1);
+      const cellEndCol = cell.col + (cell.colspan || 1);
+    
+      const spanCells = this.spanCells;
+      for (let i = 0; i < spanCells.length; i++) {
+        const spancell = spanCells[i];
+        // 提前计算合并单元格的结束行和列
+        const spancellEndRow = spancell.row + (spancell.rowspan || 1);
+        const spancellEndCol = spancell.col + (spancell.colspan || 1);
+      
+        if (
+          spancell.row <= cell.row && spancellEndRow >= cellEndRow &&
+        spancell.col <= cell.col && spancellEndCol >= cellEndCol &&
+        spancell !== cell
+        ) {
           return true;
         }
       }
@@ -2105,10 +2114,65 @@ export default {
       if (this.mode === 'edit') {
         event.preventDefault();
       }
+    },
+    setValue({uuid, value} = {}) {
+      if (uuid) {
+        if (this.$utils.isEmpty(this.formData)) {
+          this.formData = {}; // 处理为null是报错问题
+        }
+        this.$set(this.formData, uuid, value);
+      }
+    },
+    handleDrop(event) {
+      if (this.mode === 'edit') {
+        this.addItemKey(event);
+      }
     }
   },
   filter: {},
   computed: {
+    tssheetMainClass() {
+      return { 
+        'bg-op': this.mode === 'edit',
+        'cell-spacing': this.mode !== 'edit' && this?.formStyleData?.cellSpacing 
+      };
+    },
+    tssheetMainStyle() {
+      return {
+        width: this.mode === 'edit' ? this.tableSize.width + 'px' : this.isFormSubassembly ? 'inherit' : this.containerWidth + 'px',
+        height: this.tableSize.height + 'px',
+        margin: this.mode === 'edit' ? 0 : '0 auto',
+        '--padding': this.formStyleData.cellSpacing + 'px' || '0px'
+      }; 
+    },
+    colStyle() {
+      return { width: this.minWidth + 'px' };
+    },
+    colgroupStyle() {
+      return (head) => {
+        return { width: this.mode === 'edit' ? head.width + 'px' : this.tdWidth(head.width) };
+      };
+    },
+    theadThStyle() {
+      return { height: this.minHeight + 'px' };
+    },
+    tbodyTrStyle() {
+      return (left) => {
+        return { height: left.height + 'px' };
+      };
+    },
+    tbodyTdClass() {
+      return (cell) => {
+        return {
+          read: this.mode !== 'edit' && this.mode !== 'editSubform',
+          selected: (this.mode === 'edit' || this.mode === 'editSubform') && (!!cell._selected || this.dropCell === cell),
+          handler: !!cell._isHandler, ...cell.class
+        };
+      };
+    },
+    freezeFormHighlightData() {
+      return Object.freeze(this.formHighlightData);
+    },
     hasCopy() {
       if (this.handlerCell && this.handlerCell.component && !this.$utils.isEmpty(this.handlerCell.component) && !this.handlerCell.component.hasOwnProperty('inherit')) {
         return true;
@@ -2129,12 +2193,12 @@ export default {
       };
     },
     //如果reaction直接监听formData，由于都是同一个对象，所以watch无法获取前后值变化，需要用此计算属性转换一下数据
-    formDataForWatch() {
-      if (this.needWatch && this.formData) {
-        return JSON.stringify(this.formData);
-      }
-      return null;
-    },
+    // formDataForWatch() {
+    //   if (this.needWatch && this.formData) {
+    //     return JSON.stringify(this.formData);
+    //   }
+    //   return null;
+    // },
     //由于condition的valueList类型是数组，所以不能直接在script中以字符串的方式复制
     conditionData() {
       return uuid => {
@@ -2382,7 +2446,7 @@ export default {
       if (!this.$utils.isEmpty(this.hideComponentList)) {
         formItemList.push(...this.hideComponentList);
       }
-      return formItemList;
+      return Object.freeze(formItemList);
     },
     //能否回退
     canFallback() {
diff --git a/src/resources/plugins/TsSheet/child-form-item.vue b/src/resources/plugins/TsSheet/child-form-item.vue
index d245e94b..5e7b8938 100644
--- a/src/resources/plugins/TsSheet/child-form-item.vue
+++ b/src/resources/plugins/TsSheet/child-form-item.vue
@@ -21,6 +21,7 @@
       :needLabel="needLabel"
       :formItem="formItem"
       :formData="formData"
+      :formDataForWatch="formDataForWatch"
       :formItemList="formItemList"
       :mode="mode"
       :clearable="false"
@@ -70,6 +71,10 @@ export default {
       // 是否禁用删除
       type: Boolean,
       default: false
+    },
+    formDataForWatch: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -164,6 +169,9 @@ export default {
         }
       }
       return errorList;
+    },
+    setValue(val) {
+      this.$emit('setValue', {uuid: this.formItem.uuid, value: val});
     }
   },
   filter: {},
diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue
index 4915529e..e132aef3 100644
--- a/src/resources/plugins/TsSheet/form-item.vue
+++ b/src/resources/plugins/TsSheet/form-item.vue
@@ -73,6 +73,7 @@
           :externalData="externalData"
           :rowUuid="rowUuid"
           :extendConfigList="extendConfigList"
+          :formDataForWatch="formDataForWatch"
           @setValue="setValue"
           @resize="$emit('resize')"
           @select="selectFormItem"
@@ -87,6 +88,7 @@
           :style="{ width: mode != 'defaultvalue' ? (formItem.config && formItem.config.width) || '100%' : '100%' }"
           :formItem="formItem"
           :formItemList="formItemList"
+          :formDataForWatch="formDataForWatch"
           :value="formItemValue"
           :mode="mode"
           :filter="filter"
@@ -116,6 +118,7 @@
         :formItem="formItem"
         :formItemList="formItemList"
         :customFormItem="customFormItem"
+        :formDataForWatch="formDataForWatch"
         :value="formItemValue"
         :mode="mode"
         :filter="filter"
@@ -215,6 +218,10 @@ export default {
     isSetValue: { //是否更新formData
       type: Boolean,
       default: true
+    },
+    formDataForWatch: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -288,8 +295,8 @@ export default {
         if (this.reaction && !this.$utils.isEmpty(this.reaction)) {
           for (let action in this.reaction) {
             const reaction = this.reaction[action];
-            if (action === 'emit' && reaction.event) {
-              this.$set(this.reactionFormItemUuidMap, this.formItem.uuid, null);
+            if (action === 'emit' && reaction.event && (this.$utils.isEmpty(reaction.conditionGroupList) || reaction.conditionGroupList.length == 0)) { // 没有规则组合时，才需要设置联动的map，要不然设置规则后，没有满足规则也走这个逻辑
+              this.$set(this.reactionFormItemUuidMap, this.formItem.uuid, null); 
             }
             if (action !== 'filter') {
               const conditinoGroupList = reaction['conditionGroupList'];
@@ -564,7 +571,7 @@ export default {
     setValue(val) {
       //formData不一定会提供，例如在联动设置中就不会传入formData，只有在表单正式使用过程中才会有formData
       if (this.formData && this.isSetValue) {
-        this.$set(this.formData, this.formItem.uuid, val);
+        this.$emit('setValue', {uuid: this.formItem.uuid, value: val});
       }
       this.$emit('change', val);
     },
@@ -637,15 +644,6 @@ export default {
   },
   filter: {},
   computed: {
-    //如果reaction直接监听formData，由于都是同一个对象，所以watch无法获取前后值变化，需要用此计算属性转换一下数据
-    formDataForWatch() {
-      if (this.needWatch && this.formData) {
-        const str = JSON.stringify(this.formData);
-        // console.log('formDataForWatch', new Date());
-        return str;
-      }
-      return null;
-    },
     reaction() {
       return this.formItem && this.formItem.reaction;
     },
@@ -718,30 +716,30 @@ export default {
     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);
+          //this.enqueueReaction(this.componentUuid, () => {
+          const formData = 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);
+          }
+          // });
           this.$nextTick(() => {
             this.isFirstLoad = false;
           });
         }
       },
-      immediate: true
+      immediate: true,
+      deep: true
     }
   }
 };
diff --git a/src/resources/plugins/TsSheet/form/component/base.vue b/src/resources/plugins/TsSheet/form/component/base.vue
index b203d8dd..ad4b51ba 100644
--- a/src/resources/plugins/TsSheet/form/component/base.vue
+++ b/src/resources/plugins/TsSheet/form/component/base.vue
@@ -4,7 +4,7 @@ export default {
     mode: { type: String, default: 'edit' }, //表单的模式edit或read或condition,edut模式才会显示异常、联动等辅助图标
     value: { type: [Object, Array, String, Number] }, //当前表单组件的值
     formItem: { type: Object },
-    formItemList: { type: Array },
+    formItemList: { type: Array, default: () => [] },
     filter: { type: Array }, //格式[{column:'矩阵属性uuid',expression:'equal',valueList:["value"]}]
     readonly: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
@@ -38,6 +38,10 @@ export default {
       // 扩展配置列表
       type: Array,
       default: () => []
+    },
+    formDataForWatch: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
diff --git a/src/resources/plugins/TsSheet/form/component/formcollapse.vue b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
index 5c8ad1c9..30285d59 100644
--- a/src/resources/plugins/TsSheet/form/component/formcollapse.vue
+++ b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
@@ -30,6 +30,7 @@
                 :externalData="externalData"
                 :disabledDelete="formItem.hasOwnProperty('inherit')"
                 @resize="$emit('resize')"
+                @setValue="setValue"
                 @emit="
                   val => {
                     $emit('emit', val);
@@ -187,6 +188,9 @@ export default {
         this.currentTabObj.component.push(this.currentEventItem.uuid);
       }
       this.isShowFormItemKeyDialog = false;
+    },
+    setValue(val) {
+      this.$emit('setValue', val);
     }
   },
   filter: {},
diff --git a/src/resources/plugins/TsSheet/form/component/formtab.vue b/src/resources/plugins/TsSheet/form/component/formtab.vue
index 33855e90..9deb6948 100644
--- a/src/resources/plugins/TsSheet/form/component/formtab.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtab.vue
@@ -30,6 +30,7 @@
                 :formItem="component"
                 :formData="formData"
                 :formItemList="formItemList"
+                :formDataForWatch="formDataForWatch"
                 :mode="mode"
                 :disabled="disabled || tab.isDisabled"
                 :readonly="readonly || tab.isReadOnly"
@@ -334,9 +335,6 @@ export default {
         return [];
       };
     },
-    formDataForWatch() {
-      return JSON.parse(JSON.stringify(this.formData));
-    },
     conditionData() { //tab内规则用到的条件
       return uuid => {
         const conditionData = {};
diff --git a/src/resources/plugins/TsSheet/form/component/formtable.vue b/src/resources/plugins/TsSheet/form/component/formtable.vue
index c4a045c1..68ed5879 100644
--- a/src/resources/plugins/TsSheet/form/component/formtable.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtable.vue
@@ -8,7 +8,7 @@
       @updateRowSort="updateRowSort"
     >
       <template v-for="extra in config.dataConfig" :slot="extra.uuid" slot-scope="{ row, index }">
-        <div :key="extra.uuid" @click.stop>
+        <div :key="`${row.uuid}_${extra.uuid}`" @click.stop>
           <FormItem
             :ref="'formitem_' + extra.uuid + '_' + index"
             :formItem="extra"
@@ -18,6 +18,7 @@
             :readonly="readonly"
             :isCustomValue="isCustomValue"
             :externalData="externalData"
+            :formDataForWatch="{...filterUuid(initFormData),...formDataForWatch, ...row}"
             :rowUuid="row.uuid"
             mode="read"
             style="min-width:130px"
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/column-item.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/column-item.vue
new file mode 100644
index 00000000..5b5de235
--- /dev/null
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/column-item.vue
@@ -0,0 +1,579 @@
+<template>
+  <div class="form-item radius-md" :class="{ 'bg-error-grey': showStatusIcon && (hasDataError || hasConfigError) }">
+    <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) || currentItemReaction?.currentItemMask)" class="mask">
+    </div>
+    <div v-if="showStatusIcon && hasConfigError" class="corner-icon">
+      <Poptip
+        word-wrap
+        trigger="hover"
+        :title="$t('page.exception')"
+        transfer
+      >
+        <Tag color="error">
+          <b>{{ configErrorList.length }}</b>
+          个异常
+        </Tag>
+        <div slot="content">
+          <ul>
+            <li v-for="(error, index) in configErrorList" :key="index">{{ error.error }}</li>
+          </ul>
+        </div>
+      </Poptip>
+    </div>
+    <div v-else-if="showStatusIcon && mode === 'edit' && hasReaction" class="corner-icon tsfont-lightning text-warning"></div>
+    <div v-else-if="showStatusIcon && hasDataError" class="corner-icon">
+      <Poptip
+        v-if="isShowErrorMessage"
+        word-wrap
+        trigger="hover"
+        :title="$t('page.exception')"
+        transfer
+      >
+        <Tag color="error" closable @on-close="handleCloseErrorMessage">
+          <b>{{ dataErrorList.length }}</b>
+          个异常
+        </Tag>
+        <div slot="content">
+          <ul>
+            <li v-for="(error, index) in dataErrorList" :key="index">{{ error.error }}</li>
+          </ul>
+        </div>
+      </Poptip>
+    </div>
+    <div v-if="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>
+    <template v-if="isShowComponent(formItem)">
+      <template v-if="isFormType">
+        <component
+          :is="formItem.handler"
+          v-if="canRenderHandler"
+          ref="formItem"
+          :style="componentStyle"
+          :formItem="formItem"
+          :formItemList="formItemList"
+          :value="formItemValue"
+          :mode="mode"
+          :filter="filter"
+          :readonly="componentReadonly"
+          :disabled="componentDisabled"
+          :required="componentRequired"
+          :formData="formData"
+          :isClearEchoFailedDefaultValue="isClearEchoFailedDefaultValue"
+          :isCustomValue="isCustomValue"
+          :isClearSpecifiedAttr="isClearSpecifiedAttr"
+          :externalData="externalData"
+          :rowUuid="rowUuid"
+          :extendConfigList="Object.freeze(extendConfigList)"
+          :formDataForWatch="formDataForWatch"
+          @setValue="setValue"
+          @select="selectFormItem"
+          @dropHideComponent="dropHideComponent"
+        ></component>
+        <div v-else class="text-warning">
+          {{ getComponentTip }}
+        </div>
+      </template>
+      <div v-if="formItem.config && formItem.config.description" class="tsfont-info-o text-tip">{{ formItem.config.description }}</div>
+    </template>
+  </div>
+</template>
+<script>
+import formItems from '@/resources/plugins/TsSheet/form/component/index.js';
+import conditionMixin from '@/resources/plugins/TsSheet/form/conditionexpression/condition-mixin.js';
+import { REACTION } from '@/resources/plugins/TsSheet/form/reaction/index.js';
+import { FORMITEMS } from '@/resources/plugins/TsSheet/form/formitem-list.js';
+export default {
+  name: '',
+  components: {
+    ...formItems
+  },
+  mixins: [conditionMixin],
+  inject: [
+    'formDataForWatch',
+    'extraFormItemList',
+    'extendConfigList',
+    'formItemList',
+    'externalData',
+    'isClearSpecifiedAttr',
+    'isClearEchoFailedDefaultValue',
+    'isCustomValue',
+    'showStatusIcon',
+    'readonly',
+    'disabled',
+    'mode'
+  ],
+  props: {
+    rowUuid: { type: String }, //行uuid，表格组件引用时需要
+    extraUuid: {type: String},
+    rowData: {
+      type: Object,
+      default: () => {}
+    },
+    reactionData: {
+      type: Object,
+      default: () => {}
+    },
+    reactionValueData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      configErrorList: [],
+      dataErrorList: [],
+      isMask: false,
+      needWatch: false,
+      executeCount: {
+        mask: 0,
+        hide: 0,
+        display: 0,
+        readonly: 0,
+        disable: 0,
+        setvalue: 0,
+        emit: 0,
+        require: 0,
+        allowAdd: 0,
+        allowEdit: 0,
+        allowDelete: 0
+      }, //记录操作执行次数
+      isFirstLoad: true, //是否第一次加载，用于比较表单数据新旧值时，第一次触发一次操作
+      filter: [], //格式[{column:'矩阵属性uuid',expression:'equal',valueList:["value"]}]
+      REACTION: REACTION, //联动规则
+      isShowErrorMessage: true,
+      reactionFormItemUuidMap: {}, //规格内需要的表单组件值
+      currentItemReaction: { //(针对表格组件嵌套子组件)
+        currentItemHide: false, //当前组件是否隐藏
+        currentItemDisabled: false, //当前组件是否禁用
+        currentItemMask: false, //当前组件是否不可见
+        currentItemReadonly: false, //当前组件是否只读
+        cunrrentRequire: false //
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.initReactionFormItemUuid();
+    this.updateConfig();
+    this.initStatus();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    updateCurrentRow(reactionData) {
+      this.$emit('getCurrentRowData', { reactionData: reactionData, rowData: this.rowData});
+    },
+    dropHideComponent(event) {
+      this.$emit('dropHideComponent', event);
+    },
+    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);
+    },
+    //给container添加组件
+    addComponent(item) {
+      const formItem = this.$refs['formItem'];
+      if (formItem) {
+        formItem.addComponent(item);
+      }
+    },
+    //初始化组件状态
+    initStatus() {
+      const { formItem } = this;
+      if (this.$utils.isEmpty(formItem?.override_config)) {
+        return false;
+      }
+      const keyList = ['isHide', 'isReadOnly', 'isDisabled', 'isMask', 'isRequired'];
+      keyList.forEach((v) => {
+        if (formItem.override_config[v]) {
+          formItem.config[v] = true;
+        }
+      });
+    },
+    handleFilterValue(value, column, formItem = {}) {
+      let tmpText, tmpValue;
+      let { handler = '', config = {} } = formItem || {};
+      let { dataList = [] } = config;
+      if (typeof value === 'string') {
+        tmpText = tmpValue = value;
+        if (handler == 'formuserselect') {
+          tmpText = tmpValue = this.handleUserSelectValue(value);
+        } else if (!this.$utils.isEmpty(dataList)) {
+          const findData = dataList.find(f => f.value === value);
+          tmpText = findData ? findData.text : value;
+        }
+      } else if (typeof value === 'object') {
+        tmpText = value.text;
+        tmpValue = value[column];
+        if (handler == 'formuserselect') {
+          tmpText = this.handleUserSelectValue(tmpText);
+          tmpValue = this.handleUserSelectValue(tmpValue);
+        } else if (!this.$utils.isEmpty(dataList) && tmpValue) {
+          const findData = dataList.find(f => f[column] === tmpValue);
+          tmpText = findData ? findData.text : tmpText;
+        }
+      }
+      return { text: tmpText, value: tmpValue };
+    },
+    handleUserSelectValue(value) {
+      // 处理用户下拉组件的值，去掉前缀
+      let prefixList = ['user#', 'team#', 'role#'];
+      let currentValue = this.$utils.deepClone(value);
+      let uuid = '';
+      let parts = [];
+      prefixList.some(v => {
+        if (!this.$utils.isEmpty(currentValue) && currentValue.includes(v)) {
+          parts = currentValue.split(v) || [];
+          if (parts.length > 1) {
+            uuid = parts[1] || '';
+            return true;
+          }
+        }
+        return false;
+      });
+      return uuid;
+    },
+    isConditionDataChange(action, reaction, newFormData, oldFormData, formItemUuid) {
+      if (!newFormData) {
+        newFormData = {};
+      }
+      if (!oldFormData) {
+        oldFormData = {};
+      }
+      if (reaction && !this.$utils.isEmpty(reaction)) {
+        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 (newFormData[formItemUuid] != oldFormData[formItemUuid]) {
+                    return true;
+                  } else if (this.isFirstLoad) {
+                    this.isFirstLoad = false;
+                    return true;
+                  }
+                }
+              }
+            }
+          } else {
+            //如果没有条件，则比较所有数据是否一致
+            if (formItemUuid) {
+              if (!this.$utils.isSame(newFormData[formItemUuid], oldFormData[formItemUuid])) {
+                return true;
+              } else if (this.isFirstLoad) {
+                this.isFirstLoad = false;
+                return true;
+              }
+            } else {
+              if (!this.$utils.isSame(newFormData, oldFormData)) {
+                return true;
+              } else if (this.isFirstLoad) {
+                this.isFirstLoad = false;
+                return true;
+              }
+            }
+          }
+        } 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.$utils.isSame(newFormData[ruleFormItemUuid], oldFormData[ruleFormItemUuid])) {
+                return true;
+              } else if (this.isFirstLoad) {
+                this.isFirstLoad = false;
+                return true;
+              }
+            }
+          } else if (this.isFirstLoad) {
+            this.isFirstLoad = false;
+            return true;
+          }
+        }
+      }
+      return false;
+    },
+    //验证配置是否完整
+    validConfig() {
+      if (this.$refs['formItem']) {
+        this.configErrorList = this.$refs['formItem'].validConfigBase();
+        if (this.configErrorList && this.configErrorList.length > 0) {
+          return this.configErrorList;
+        }
+      }
+      return [];
+    },
+    //验证数据是否满足校验规则
+    async validData(validConifg) {
+      this.isShowErrorMessage = true;
+      if (this.$refs['formItem']) {
+        this.dataErrorList = await this.$refs['formItem'].validDataBase(validConifg);
+        if (this.dataErrorList && this.dataErrorList.length > 0) {
+          return this.dataErrorList;
+        }
+      }
+      return [];
+    },
+    setValue(val) {
+      this.$emit('change', { value: val, extraUuid: this.extraUuid, row: this.rowData});
+    },
+    call(name, ...args) {
+      const formItem = this.$refs['formItem'];
+      if (formItem && formItem[name] && typeof formItem[name] === 'function') {
+        formItem[name](...args);
+      }
+    },
+    addExecuteCount(action) {
+      if (!this.executeCount.hasOwnProperty(action)) {
+        this.executeCount[action] = 0;
+      }
+      this.executeCount[action] = this.executeCount[action] + 1;
+    },
+    saveFormExtendConfig() {
+      let list = [];
+      if (this.$refs['formItem'] && this.$refs['formItem'].saveFormExtendConfig) {
+        list = this.$refs['formItem'].saveFormExtendConfig();
+      }
+      return list;
+    },
+    updateConfig() {
+      if (this.mode === 'edit') {
+        //更新配置
+        const newFormItem = FORMITEMS.find(d => d.handler === this.formItem.handler && d.category === this.formItem.category);
+        if (!newFormItem) {
+          return;
+        }
+        Object.keys(newFormItem).forEach(key => {
+          if (!this.formItem.hasOwnProperty(key)) {
+            this.$set(this.formItem, key, newFormItem[key]);
+          } else if (!this.$utils.isEmpty(newFormItem[key]) && typeof newFormItem[key] === 'object') {
+            Object.keys(newFormItem[key]).forEach(subKey => {
+              if (!this.formItem[key].hasOwnProperty(subKey)) {
+                this.$set(this.formItem[key], subKey, newFormItem[key][subKey]);
+              }
+            });
+          }
+        });
+      }
+    },
+    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;
+    }
+  },
+  filter: {},
+  computed: {
+    formItem() {
+      const formItem = this.extraFormItemList.find(d => d.uuid === this.extraUuid);
+      return formItem;
+    },
+    componentStyle() {
+      return { width: this.mode != 'defaultvalue' ? (this.formItem.config && this.formItem.config.width) || '100%' : '100%' };
+    },
+    componentReadonly() {
+      const configIsReadOnly = this.formItem.config && this.formItem.config.isReadOnly;
+      const currentItemReactionIsReadOnly = this.currentItemReaction && this.currentItemReaction.currentItemReadonly;
+      return (this.mode != 'defaultvalue' && this.mode != 'condition' ? configIsReadOnly : false) || this.readonly || currentItemReactionIsReadOnly;
+    },
+    componentDisabled() {
+      return (this.mode != 'defaultvalue' && this.mode != 'condition' ? this.formItem.config && this.formItem.config.isDisabled : false) || this.disabled || this.currentItemReaction?.currentItemDisabled;
+    },
+    componentRequired() {
+      const configIsRequired = this.formItem.config && this.formItem.config.isRequired;
+      const currentItemReactionIsRequired = this.currentItemReaction && this.currentItemReaction.cunrrentRequire;
+      return (this.mode != 'defaultvalue' ? configIsRequired : false) || currentItemReactionIsRequired;
+    },
+    canRenderHandler() {
+      return this.isExistComponent && this.formItem.handler !== 'formcustom';
+    },
+    isFormType() {
+      return (!this.formItem.type || this.formItem.type === 'form');
+    },
+    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')}`;
+    },
+    reaction() {
+      return this.formItem && this.formItem.reaction;
+    },
+    //由于condition的valueList类型是数组，所以不能直接在script中以字符串的方式复制
+    conditionData() {
+      return uuid => {
+        const conditionData = {};
+        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) {
+                  cg.conditionList.forEach(c => {
+                    conditionData[c.uuid] = c;
+                  });
+                }
+              });
+            }
+          }
+        }
+        return conditionData[uuid];
+      };
+    },
+    //当前控件的值
+    formItemValue() {
+      const { formItemUuid = '', formData = {} } = this;
+      if (formData.hasOwnProperty(formItemUuid)) {
+        return formData[formItemUuid];
+      }
+      return null;
+    },
+    //是否配置联动
+    hasReaction() {
+      if (!this.$utils.isEmpty(this.reaction)) {
+        for (let action in this.reaction) {
+          if (!this.$utils.isEmpty(this.reaction[action])) {
+            return true;
+          }
+        }
+      }
+      return false;
+    },
+    hasConfigError() {
+      return this.configErrorList && this.configErrorList.length > 0;
+    },
+    hasDataError() {
+      return this.dataErrorList && this.dataErrorList.length > 0;
+    },
+    isShowComponent() {
+      return (formItem) => {
+        let isShow = true;
+        if (this?.currentItemReaction?.currentItemHide || (formItem && (this.mode === 'read' || this.mode === 'readSubform') && formItem.config && formItem.config.isHide) || formItem.isEditing || (formItem.override_config && formItem.override_config.isHide)) {
+          isShow = false;
+        }
+        return isShow;
+      };
+    },
+    formData() {
+      return {...(this.reactionValueData || {}), ...(this.rowData || {})};
+    },
+    formItemUuid() {
+      return this.formItem && this.formItem.uuid;
+    }
+  },
+  watch: {
+    reactionData: {
+      handler(val, oldVal) {
+        if (val && (this.mode === 'read' || this.mode === 'readSubform')) {
+          if (!this.$utils.isSame(val, this.reactionFormItemUuidMap)) {
+            this.executionReaction(val, this.reactionFormItemUuidMap);
+            this.reactionFormItemUuidMap = this.$utils.deepClone(val);
+          }
+          this.isFirstLoad = false;
+        }
+      },
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+@import '@/resources/plugins/TsSheet/form-item.less';
+</style>
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index 2ee218b4..a533a17b 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -4,8 +4,8 @@
       <div v-if="canAdd" class="action-item">
         <Button @click="addData()">{{ $t('dialog.title.addtarget', { target: $t('page.data') }) }}</Button>
       </div>
-      <div v-if="selectedIndexList && selectedIndexList.length > 0 && !$utils.isEmpty(tbodyList)" class="action-item">
-        <Button @click="removeSelectedItem">{{ $t('dialog.title.deletetarget', { target: $t('page.data') }) }}</Button>
+      <div v-if="isShowDeleteBtn && !$utils.isEmpty(pagedTbodyList)" class="action-item">
+        <Button @click.stop="removeSelectedItem">{{ $t('dialog.title.deletetarget', { target: $t('page.data') }) }}</Button>
       </div>
       <template v-if="canShowImportExportBtn">
         <span
@@ -29,11 +29,11 @@
         <span
           v-if="isShowExportExcel"
           class="action-item tsfont-download"
-          @click.stop="() => exportExcelData({
+          @click.stop="exportExcelData({
             extraList: extraList,
             formItem: formItem,
             tbodyList: tbodyList,
-            selectedIndexList: selectedIndexList,
+            selectedCurrentPageMap: selectedCurrentPageMap,
           })"
         >
           {{ $t('term.framework.exporttable') }}
@@ -56,14 +56,11 @@
           :max-size="maxSize"
           :on-format-error="handleFormatError"
           :on-exceeded-size="handleMaxSize"
-          :before-upload="
-            file =>
-              handleBeforeUpload({
-                file: file,
-                extraList: extraList,
-                tbodyList: tbodyList
-              })
-          "
+          :before-upload="(file)=> handleBeforeUpload({
+            file: file,
+            extraList: extraList,
+            tbodyList: tbodyList
+          })"
           type="drag"
           action=""
           class="forminputtable-upload ml-sm"
@@ -75,75 +72,104 @@
     </div>
     <Loading :loadingShow="isImportOperationLoading" type="fix"></Loading>
     <template v-if="showTable">
-      <TsTable
-        v-if="hasColumn"
-        :theadList="theadList"
-        :tbodyList="pagedTbodyList"
-        v-bind="tablePageConfig"
-        :loading="loading"
-        :multiple="true"
-        :fixedHeader="false"
-        :canDrag="!disabled && !readonly && config.isCanDrag"
-        :readonlyTextIsHighlight="readonlyTextIsHighlight"
-        @updateRowSort="updateRowSort"
-        @getSelected="getSelectedItem"
-        @changeCurrent="changeCurrent"
-        @changePageSize="changePageSize"
-      >
-        <template v-slot:delete="{ row, index }">
-          <div class="flex-start">
-            <span class="tsfont-plus text-action mr-nm" @click.stop="addRow(index)"></span>
-            <span class="tsfont-close text-action" @click.stop="deleteItem(row)"></span>
-          </div>
-        </template>
-        <template v-if="config.isShowNumber" v-slot:number="{ index }">
-          {{ index + 1 }}
-        </template>
-        <template v-for="extra in extraList" :slot="extra.uuid" slot-scope="{ row, index }">
-          <div :key="extra.uuid" @click.stop>
-            <FormItem
-              :ref="'formitem_' + extra.uuid + '_' + index"
-              :formItem="$utils.deepClone(extra)"
-              :formData="{ ...filterUuid(formData), ...row }"
-              :isSetValue="false"
-              :formItemList="formItemList"
-              :extraFormItemList="extraList"
-              :showStatusIcon="false"
-              mode="read"
-              :readonly="readonly"
-              :disabled="disabled"
-              :isClearEchoFailedDefaultValue="true"
-              :isCustomValue="true"
-              :isClearSpecifiedAttr="isClearSpecifiedAttr"
-              :externalData="externalData"
-              :rowUuid="row.uuid"
-              :extendConfigList="extendConfigList"
-              style="min-width: 130px"
-              @change="val => changeRow(val, extra.uuid, row)"
-              @updateCurrentRow="
-                data => {
-                  updateCurrentRow(row, data);
-                }
-              "
-            ></FormItem>
+      <template v-if="hasColumn">
+        <div class="tstable-container border bg-grey radius-lg">
+          <div>
+            <table class="tstable-body">
+              <thead>
+                <tr>
+                  <th v-for="(col) in theadList" :key="col.key">
+                    <div v-if="col.key === 'selection'">
+                      <Checkbox
+                        v-model="isSelectAllCurrentPage"
+                        :disabled="readonly || disabled"
+                        @on-change="selectAllCurrentPage"
+                      ></Checkbox>
+                    </div>
+                    <span v-else :class="col.isRequired ? 'require-label' : ''" :style="col.width ? {width: col.width} : {}">{{ col.title }}</span>
+                  </th>
+                </tr>
+              </thead>
+              <VueDraggable
+                v-model="pagedTbodyList"
+                :disabled="readonly || disabled"
+                :animation="150"
+                tag="tbody"
+                handle=".tsfont-drag"
+                class="tbody-main"
+                draggable="tr"
+              >
+                <tr
+                  v-for="(row, index) in pagedTbodyList"
+                  :key="row.uuid"
+                >
+                  <td v-if="config.isCanDrag && hasDragColumn">
+                    <span class="tsfont-drag" style="cursor:move;"></span>
+                  </td>
+                  <td v-if="hasDelete">
+                    <div class="flex-start">
+                      <span class="tsfont-plus text-action mr-nm" @click.stop="addRow(index)"></span>
+                      <span class="tsfont-close text-action mr-nm" @click.stop="deleteItem(row)"></span>
+                    </div>
+                  </td>
+                  <td v-if="hasDelete">
+                    <Checkbox
+                      :value="selectedCurrentPageMap[row.uuid]"
+                      :disabled="readonly || disabled"
+                      @on-change="handleSelectedRow($event, row)"
+                    ></Checkbox>
+                  </td>
+                  <td v-if="config.isShowNumber">
+                    {{ index + 1 }}
+                  </td>
+                  <td v-for="extra in extraList" :key="`${row.uuid}_ ${extra.uuid}`" @click.stop>
+                    <ColumnItem
+                      :ref="`formitem_${row.uuid}${extra.uuid}`"
+                      :rowData="row"
+                      :rowUuid="row.uuid"
+                      :extraUuid="extra.uuid"
+                      :reactionData="getReactionData(extra, row)"
+                      :reactionValueData="reactionValuesMap[extra.uuid]"
+                      class="form-item-width"
+                      @change="changeRow"
+                      @getCurrentRowData="getCurrentRowData"
+                    ></ColumnItem>
+                  </td>
+                </tr>
+              </VueDraggable>
+            </table>
           </div>
-        </template>
-      </TsTable>
-      <TsTable v-else :theadList="theadList"></TsTable>
+        </div>
+        <div v-if="tablePageConfig.rowNum > tablePageConfig.defaultShowSize && tablePageConfig.pageSize > 0" ref="tablepage" class="tstable-page text-right">
+          <Page
+            size="small"
+            :showSizer="true"
+            :showTotal="true"
+            :total="tablePageConfig.rowNum"
+            :current="tablePageConfig.currentPage"
+            :page-size="tablePageConfig.pageSize"
+            :page-size-opts="tablePageConfig.pageSizeOpts"
+            :transfer="true"
+            @on-change="changeCurrent"
+            @on-page-size-change="changePageSize"
+          />
+        </div>
+      </template>
+      <TsSimpleTable v-else :theadList="theadList"></TsSimpleTable>
     </template>
   </div>
 </template>
 <script>
 import base from '../base.vue';
 import validmixin from '../common/validate-mixin.js';
-import TsTable from '@/resources/components/TsTable/TsTable.vue'; //不能使用异步引入，会导致tssheet列高错位
 import conditionMixin from './condition-mixin.js';
 import TableImportExportMixin from './table-import-export-mixin.js';
 export default {
   name: '',
   components: {
-    TsTable,
-    FormItem: () => import('@/resources/plugins/TsSheet/form-item.vue')
+    VueDraggable: () => import('vuedraggable'),
+    TsSimpleTable: () => import('@/resources/components/TsSimpleTable/index.vue'),
+    ColumnItem: () => import('@/resources/plugins/TsSheet/form/component/formtableinputer/column-item.vue')
   },
   extends: base,
   mixins: [validmixin, conditionMixin, TableImportExportMixin],
@@ -151,10 +177,25 @@ export default {
     readonly: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false }
   },
+  provide() {
+    return {
+      formDataForWatch: Object.freeze(this.formDataForWatch),
+      extraFormItemList: this.frozenExtraFormItemList,
+      extendConfigList: this.frozenExtendConfigList,
+      formItemList: this.frozenFormItemList,
+      externalData: this.frozenExternalData,
+      isClearSpecifiedAttr: this.isClearSpecifiedAttr,
+      isClearEchoFailedDefaultValue: true,
+      isCustomValue: true,
+      showStatusIcon: false,
+      readonly: Object.freeze(this.readonly),
+      disabled: Object.freeze(this.disabled),
+      mode: 'read'
+    };
+  },
   data() {
     return {
       isReady: false,
-      selectedIndexList: [],
       loading: false,
       filterComponentList: ['formtableselector', 'formtableinputer', 'formsubassembly', 'formupload', 'formcube', 'formtable', 'formresoureces', 'formprotocol'], //过滤不参与规则的组件
       tablePageConfig: { //table分页配置
@@ -166,7 +207,11 @@ export default {
       },
       theadList: [],
       tbodyList: [],
-      validateMap: {}
+      validateMap: {},
+      reactionValuesMap: {}, // { extraUuid: { uuid: value } }
+      clonedExtrasMap: {},
+      isSelectAllCurrentPage: false,
+      selectedCurrentPageMap: {}
     };
   },
   beforeCreate() {},
@@ -174,6 +219,7 @@ export default {
     if (this.mode !== 'edit') {
       this.init();
     }
+    this.reactionWatch();
   },
   beforeMount() {},
   mounted() {
@@ -189,6 +235,37 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    handleSelectedRow(value, row) {
+      this.$set(selectedCurrentPageMap, row.uuid, val);
+    },
+    selectAllCurrentPage(selectedAll) {
+      if (selectedAll) {
+        this.pagedTbodyList.forEach((row) => {
+          this.selectedCurrentPageMap[row.uuid] = true;
+        });
+      } else {
+        this.selectedCurrentPageMap = {};
+      }
+    },
+    reactionWatch() {
+      this.reactionValuesMap = {};
+      this.extraList.forEach(extra => {
+        const deps = this.reactionDepsMap[extra.uuid] || [];
+        this.$set(this.reactionValuesMap, extra.uuid, {});
+        this.$set(this.clonedExtrasMap, extra.uuid, this.$utils.deepClone(extra));
+        deps.forEach(uuid => {
+          this.$set(this.reactionValuesMap[extra.uuid], uuid, this.formData[uuid]);
+          this.$watch(
+            () => this.formData[uuid],
+            (newVal, oldVal) => {
+              if (newVal !== oldVal) {
+                this.$set(this.reactionValuesMap[extra.uuid], uuid, newVal);
+              }
+            }
+          );
+        });
+      });
+    },
     init() {
       if (this.value && this.value instanceof Array && this.value.length > 0) {
         const value = this.$utils.deepClone(this.value);
@@ -226,9 +303,6 @@ export default {
         }
       }
     },
-    getSelectedItem(indexList) {
-      this.selectedIndexList = indexList;
-    },
     deleteItem(row) {
       const findIndex = this.tbodyList.findIndex(d => d.uuid === row.uuid);
       this.tbodyList.splice(findIndex, 1);
@@ -247,14 +321,18 @@ export default {
     },
     removeSelectedItem() {
       for (let i = this.tbodyList.length - 1; i >= 0; i--) {
-        const item = this.tbodyList[i];
-        if (item._selected) {
+        const row = this.tbodyList[i];
+        if (this.selectedCurrentPageMap[row.uuid]) {
           this.tbodyList.splice(i, 1);
+          this.$delete(this.selectedCurrentPageMap, row.uuid);
         }
       }
       if (!this.pagedTbodyList.length && this.tablePageConfig.currentPage > 1) {
         this.tablePageConfig.currentPage -= 1;
       }
+      if (this.isSelectAllCurrentPage) {
+        this.isSelectAllCurrentPage = false;
+      }
     },
     addData() {
       const data = { uuid: this.$utils.setUuid() };
@@ -413,40 +491,27 @@ export default {
         return errorList;
       }
     },
-    changeRow(val, uuid, row) {
-      if (!this.$utils.isSame(val, row[uuid])) {
-        this.$set(row, uuid, val);
+    changeRow(rowData) {
+      const { value, extraUuid = '', row = {} } = rowData || {};
+      if (!this.$utils.isSame(value, row[extraUuid])) {
+        row[extraUuid] = value;
       }
     },
-    updateRowSort(event) {
-      let beforeVal = this.tbodyList.splice(event.oldIndex, 1)[0];
-      this.tbodyList.splice(event.newIndex, 0, beforeVal);
-    },
-    updateCurrentRow(row, val) {
+    getCurrentRowData(currentRowData) {
+      const { reactionData = {}, rowData = {} } = currentRowData || {};
       this.$nextTick(() => {
-        if (val) {
-          Object.assign(row, val);
+        if (reactionData) {
+          Object.assign(rowData, reactionData);
         }
       });
     },
-    filterUuid(obj) {
-      // 解决循环引用报错问题
-      let formData = this.$utils.deepClone(obj);
-      if (formData.uuid) {
-        delete formData.uuid;
-      }
-      if (formData.hasOwnProperty(this.formItem.uuid)) {
-        delete formData[this.formItem.uuid];
-      }
-      return formData;
-    },
     changeCurrent(currentPage) {
       this.tablePageConfig.currentPage = currentPage;
-      this.$nextTick(() => {
-        if (!this.readonly && !this.disabled) {
+      if (!this.readonly && !this.disabled) {
+        this.$nextTick(() => {
           this.validData();
-        }
-      });
+        });
+      }
     },
     changePageSize(pageSize) {
       this.tablePageConfig.currentPage = 1;
@@ -594,6 +659,76 @@ export default {
   },
   filter: {},
   computed: {
+    config() {
+      return this.formItem?.config || {};
+    },
+    getReactionData() {
+      return (extra, row) => {
+        if (!extra || !row) return {};
+        const deps = this.reactionDepsMap[extra.uuid] || [];
+        if (!deps.length) return {};
+        const result = {};
+        deps.forEach(uuid => {
+          result[uuid] = this.formData.hasOwnProperty(uuid)
+            ? this.formData[uuid]
+            : row[uuid];
+        });
+        return result;
+      };
+    },
+    frozenFormItemList() {
+      return Object.freeze(this.formItemList);
+    },
+    frozenExtraFormItemList() {
+      return Object.freeze(this.extraList);
+    },
+    frozenExtendConfigList() {
+      return Object.freeze(this.extendConfigList);
+    },
+    frozenExternalData() {
+      return Object.freeze(this.externalData);
+    },
+    isShowDeleteBtn() {
+      if (this.isSelectAllCurrentPage) {
+        return true;
+      } else if (!this.$utils.isEmpty(this.selectedCurrentPageMap)) {
+        const selectedList = Object.values(this.selectedCurrentPageMap);
+        return selectedList.every(item => item);
+      }
+      return false;
+    },
+    reactionDepsMap() {
+      const map = {};
+      this.extraList.forEach(extra => {
+        const set = new Set();
+        const reactionValue = extra.reaction || {};
+        for (const action in reactionValue) {
+          const reaction = reactionValue[action];
+          if (!reaction) continue;
+          if (action !== 'filter') {
+            (reaction.conditionGroupList || []).forEach(group => {
+              (group.conditionList || []).forEach(cond => {
+                const uuid = (cond.formItemUuid || '').split('#')[0];
+                if (uuid) set.add(uuid);
+              });
+            });
+          } else {
+            (reaction.ruleList || []).forEach(rule => {
+              const uuid = (rule.formItemUuid || '').split('#')[0];
+              if (uuid) set.add(uuid);
+            });
+          }
+        }
+        map[extra.uuid] = Array.from(set);
+      });
+      return map;
+    },
+    hasDelete() {
+      return this.theadList.find(d => d.key === 'delete');
+    },
+    hasDragColumn() {
+      return this.theadList.find(d => d.key === 'drag');
+    },
     hasColumn() {
       if (this.mode != 'edit' && this.mode != 'editSubform' && this.config.dataConfig && this.config.dataConfig.length > 0) {
         return true;
@@ -601,7 +736,8 @@ export default {
       return false;
     },
     extraList() {
-      return this.config.dataConfig.filter(d => d.isPC);
+      const list = this.$utils.deepClone(this.config.dataConfig.filter(d => d.isPC));
+      return Object.freeze(list); // 浅冻结
     },
     canAdd() {
       return !this.config.hasOwnProperty('isCanAdd') || this.config.isCanAdd;
@@ -614,14 +750,22 @@ export default {
       const tbodyList = this.tbodyList || [];
       return hideHeaderWhenDataEmpty ? tbodyList.length > 0 : true;
     },
-    pagedTbodyList() {
-      this.tablePageConfig.rowNum = this.tbodyList.length;
-      const start = (this.tablePageConfig.currentPage - 1) * this.tablePageConfig.pageSize;
-      const end = start + this.tablePageConfig.pageSize;
-      if (this.tbodyList.length <= start) {
-        return [];
-      }
-      return this.tbodyList.slice(start, end);
+    pagedTbodyList: {
+      get() {
+        this.tablePageConfig.rowNum = this.tbodyList.length;
+        const start = (this.tablePageConfig.currentPage - 1) * this.tablePageConfig.pageSize;
+        const end = start + this.tablePageConfig.pageSize;
+        if (this.tbodyList.length <= start) {
+          return [];
+        }
+        return this.tbodyList.slice(start, end);
+      },
+      set(newPageList) {
+        const start = (this.tablePageConfig.currentPage - 1) * this.tablePageConfig.pageSize;
+        for (let i = 0; i < newPageList.length; i++) {
+          this.$set(this.tbodyList, start + i, newPageList[i]);
+        }
+      } 
     }
   },
   watch: {
@@ -630,8 +774,11 @@ export default {
         this.theadList = [];
         this.validateMap = {};
         if (!this.disabled && !this.readonly) {
+          if (this.config.isCanDrag) {
+            this.theadList.push({ key: 'drag', title: '拖拽行' });
+          }
           if (!this.config.hasOwnProperty('isCanAdd') || this.config.isCanAdd) {
-            this.theadList.push({ key: 'delete', width: 20 });
+            this.theadList.push({ key: 'delete', title: '操作' });
             this.theadList.push({ key: 'selection' });
           }
         }
@@ -685,4 +832,11 @@ export default {
     background: transparent;
   }
 }
+.form-item-width {
+  min-width: 130px;
+}
+::v-deep .tstable-container, .table-container {
+  overflow-x: scroll;
+  width: 100%;
+}
 </style>
diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js b/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js
index c40b14a4..528c6779 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/table-import-export-mixin.js
@@ -50,17 +50,17 @@ export default {
         });
       });
     },
-    async exportExcelData({ tbodyList = [], extraList = [], selectedIndexList = [], formItem = {} } = {}) {
-      // 导出excel带表格数据
+    async exportExcelData({ tbodyList = [], extraList = [], selectedCurrentPageMap = {}, formItem = {} } = {}) {
+      // 导出表格数据
       this.isShowExportExcel = false;
       const _workbook = new ExcelJS.Workbook(); // 创建工作簿
       let _sheet1 = _workbook.addWorksheet('sheet1'); // 添加工作表
       const { columnsList = [], columnsUuidList = [] } = this._generateExcelHeaderConfig({ extraList: extraList }) || {}; // 设置表头
       _sheet1.columns = columnsList;
       let deepClonetbodyList = this.$utils.deepClone(tbodyList);
-      if (selectedIndexList && selectedIndexList.length > 0) {
+      if (!this.$utils.isEmpty(selectedCurrentPageMap)) {
         // 选中行导出
-        deepClonetbodyList = deepClonetbodyList.filter((v, index) => selectedIndexList.includes(index));
+        deepClonetbodyList = deepClonetbodyList.filter((row) => selectedCurrentPageMap[row.uuid]);
       }
       deepClonetbodyList.forEach(item => {
         // 添加数据
@@ -527,7 +527,8 @@ export default {
     },
     _filterTheadColumns() {
       // 过滤表头列属性
-      return this.theadList.filter(v => v && v.key !== 'selection' && v.key !== 'number' && v.key !== 'delete');
+      const filterKeyList = ['selection', 'number', 'delete', 'drag'];
+      return this.theadList.filter(v => v && !filterKeyList.includes(v.key));
     }
   }
 };
diff --git a/src/resources/plugins/TsSheet/form/reaction/setValueOther.js b/src/resources/plugins/TsSheet/form/reaction/setValueOther.js
index 5bfef443..69142461 100644
--- a/src/resources/plugins/TsSheet/form/reaction/setValueOther.js
+++ b/src/resources/plugins/TsSheet/form/reaction/setValueOther.js
@@ -2,17 +2,21 @@ export default ({ reaction, result, view }) => {
   if (result) {
     const currentValue = view.formItemValue;
     const valueList = reaction.valueList || [];
-    let currentFormData = view.formData;
+    let currentFormData = {...view.formData || {}}; // 浅拷贝不改变原数据
+    let currentData = {};
     if (valueList.length > 0) {
       valueList.forEach(item => {
         if (item.type === 'dynamic') {
           view.$set(currentFormData, item.attrUuid, currentValue && currentValue[item.value]);
+          currentData[item.attrUuid] = currentValue && currentValue[item.value];
         } else {
           view.$set(currentFormData, item.attrUuid, item.value);
+          currentData[item.attrUuid] = item.value;
         }
       });
       // 更新当前行数据
       view.$emit('updateCurrentRow', currentFormData);
+      view?.updateCurrentRow?.(currentData); // 表格输入组件使用
       view.addExecuteCount('setValueOther');
     }
   }
-- 
Gitee


From 6d82e7335d67137c2973db69ab634e116994b68c Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Fri, 10 Oct 2025 16:31:32 +0800
Subject: [PATCH 2/6] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=A5=E5=8D=95=E6=89=93=E5=BC=80=E6=85=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=20-=20[=E5=85=B3=E8=81=94]#[1478?=
 =?UTF-8?q?378178183168]=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=89=93=E5=BC=80=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1478378178183168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/TsSheet/form/component/formtableinputer/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index a533a17b..3815a966 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -73,7 +73,7 @@
     <Loading :loadingShow="isImportOperationLoading" type="fix"></Loading>
     <template v-if="showTable">
       <template v-if="hasColumn">
-        <div class="tstable-container border bg-grey radius-lg">
+        <div class="tstable-container border bg-grey radius-lg tstable-no-fixedHeader">
           <div>
             <table class="tstable-body">
               <thead>
-- 
Gitee


From a2575aa0a1c5b24c59a340d21cf1d158e563ae76 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Sat, 11 Oct 2025 10:36:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99bug=20=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1529076920057857]=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99bug=20http://192.168.0.96:8?=
 =?UTF-8?q?090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1?=
 =?UTF-8?q?529076920057857?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form/component/formdate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formdate.vue b/src/resources/plugins/TsSheet/form/component/formdate.vue
index 6134981f..d717aa71 100644
--- a/src/resources/plugins/TsSheet/form/component/formdate.vue
+++ b/src/resources/plugins/TsSheet/form/component/formdate.vue
@@ -298,7 +298,7 @@ export default {
       }
     },
     getValidateList() {
-      let validateList = this.validateList;
+      let validateList = this.$utils.deepClone(this.validateList || []);
       let dateText = {
         later: this.$t('term.framework.later'),
         earlier: this.$t('term.framework.earlier'),
-- 
Gitee


From 2dc39e32a7f9883300e7065fdc9bbe0895429112 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sun, 19 Oct 2025 03:11:48 +0000
Subject: [PATCH 4/6] =?UTF-8?q?!1202=20[=E5=8A=9F=E8=83=BD]=20=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BD=9C=E4=B8=9A=E5=B1=9E=E6=80=A7=E5=80=BC=E4=B8=BA?=
 =?UTF-8?q?json=E7=B1=BB=E5=9E=8B=E6=97=B6=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=96=87=E6=9C=AC=E5=9F=9F=20*=20[=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD]=20=E5=AE=9A=E6=97=B6=E4=BD=9C=E4=B8=9A=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=80=BC=E4=B8=BAjson=E7=B1=BB=E5=9E=8B=E6=97=B6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=B9=E6=88=90=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=9F=9F=20*=20Merge=20remote-tracking=20branch=20'origin/deve?=
 =?UTF-8?q?lop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking?=
 =?UTF-8?q?=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20M?=
 =?UTF-8?q?erge=20remote-tracking=20branch=20'origin/develop3.0.0'=20into?=
 =?UTF-8?q?=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origi?=
 =?UTF-8?q?n/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-trac?=
 =?UTF-8?q?king=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*?=
 =?UTF-8?q?=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'=20i?=
 =?UTF-8?q?nto=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'or?=
 =?UTF-8?q?igin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20branch?=
 =?UTF-8?q?=20'develop3.0.0'=20of=20https://gitee.com/neat-logic/neatlogic?=
 =?UTF-8?q?-=E2=80=A6=20*=20Merge=20remote-tracking=20branch=20'origin/dev?=
 =?UTF-8?q?elop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking?=
 =?UTF-8?q?=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20M?=
 =?UTF-8?q?erge=20remote-tracking=20branch=20'origin/develop3.0.0'=20into?=
 =?UTF-8?q?=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origi?=
 =?UTF-8?q?n/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-trac?=
 =?UTF-8?q?king=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*?=
 =?UTF-8?q?=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'=20i?=
 =?UTF-8?q?nto=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'or?=
 =?UTF-8?q?igin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-t?=
 =?UTF-8?q?racking=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0?=
 =?UTF-8?q?=20*=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'?=
 =?UTF-8?q?=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20branch?=
 =?UTF-8?q?=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20re?=
 =?UTF-8?q?mote-tracking=20branch=20'origin/develop3.0.0'=20into=20develop?=
 =?UTF-8?q?3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/develop3?=
 =?UTF-8?q?.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20bra?=
 =?UTF-8?q?nch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge?=
 =?UTF-8?q?=20remote-tracking=20branch=20'origin/develop3.0.0'=20into=20de?=
 =?UTF-8?q?velop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/dev?=
 =?UTF-8?q?elop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking?=
 =?UTF-8?q?=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20M?=
 =?UTF-8?q?erge=20remote-tracking=20branch=20'origin/develop3.0.0'=20into?=
 =?UTF-8?q?=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origi?=
 =?UTF-8?q?n/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-trac?=
 =?UTF-8?q?king=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*?=
 =?UTF-8?q?=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'=20i?=
 =?UTF-8?q?nto=20develop3.0.0=20*=20Merge=20remote-tracking=20branch=20'or?=
 =?UTF-8?q?igin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-t?=
 =?UTF-8?q?racking=20branch=20'origin/develop3.0.0'=20into=20develop3.0.0?=
 =?UTF-8?q?=20*=20Merge=20remote-tracking=20branch=20'origin/develop3.0.0'?=
 =?UTF-8?q?=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20branch?=
 =?UTF-8?q?=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge=20re?=
 =?UTF-8?q?mote-tracking=20branch=20'origin/develop3.0.0'=20into=20develop?=
 =?UTF-8?q?3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/develop3?=
 =?UTF-8?q?.0.0'=20into=20develop3.0.0=20*=20Merge=20remote-tracking=20bra?=
 =?UTF-8?q?nch=20'origin/develop3.0.0'=20into=20develop3.0.0=20*=20Merge?=
 =?UTF-8?q?=20remote-tracking=20branch=20'origin/develop3.0.0'=20into=20de?=
 =?UTF-8?q?velop3.0.0=20*=20Merge=20remote-tracking=20branch=20'origin/dev?=
 =?UTF-8?q?elop3.0.0'=20into=20develop3.0.0=20*=20[=E5=8A=9F=E8=83=BD]=20?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=98=AF=E5=90=A6=E5=B7=B2=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/framework/schedule/job-edit-dialog.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/pages/framework/schedule/job-edit-dialog.vue b/src/views/pages/framework/schedule/job-edit-dialog.vue
index c81b36c2..40f2a484 100644
--- a/src/views/pages/framework/schedule/job-edit-dialog.vue
+++ b/src/views/pages/framework/schedule/job-edit-dialog.vue
@@ -51,6 +51,12 @@
                   border="border"
                   maxlength="50"
                 ></TsFormInput>
+                <TsFormInput
+                  v-else-if="row.dataType && (row.dataType.toLowerCase() == 'json')"
+                  v-model="row.value"
+                  type="textarea"
+                  border="border"
+                ></TsFormInput>
                 <TsFormInput
                   v-else
                   v-model="row.value"
-- 
Gitee


From 5865673dcea8e019cbdff4eb5e04c816fc8da5ed Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Mon, 20 Oct 2025 16:09:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=A1=8C=E8=81=94=E5=8A=A8=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88=20=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1536285267689472]=E8=A1=A8=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=8C=E8=81=94=E5=8A=A8=E8=A7=84=E5=88=99=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E6=95=88=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1536285267689?=
 =?UTF-8?q?472?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/TsSheet.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index d42a83ac..c651ca8a 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -1066,6 +1066,15 @@ export default {
     },
     clearReactionRow(reaction) { //清除行联动的废数据
       if (!this.$utils.isEmpty(reaction)) {
+        let tableRowList = [];
+        (this.config?.tableList || []).forEach((v) => {
+          if (v && v.hasOwnProperty('row')) {
+            const currentRow = v.row + 1;
+            if (!tableRowList.includes(currentRow)) {
+              tableRowList.push(currentRow);
+            }
+          }
+        });
         Object.keys(reaction).forEach(key => {
           if (!this.$utils.isEmpty(reaction[key])) {
             reaction[key].forEach(item => {
@@ -1087,11 +1096,17 @@ export default {
                 item.conditionGroupList = item.conditionGroupList.filter(c => !groupUuidList.includes(c.uuid));
               }
               if (this.$utils.isEmpty(item.conditionGroupList)) {
-                item.rows = [];
+                if (!this.$utils.isEmpty(item.rows)) {
+                  for (let j = item.rows.length - 1; j >= 0; j--) {
+                    if (!tableRowList.includes(j)) {
+                      item.rows.splice(j, 1);
+                    }
+                  }
+                }
                 item.conditionGroupRelList = [];
               }
             });
-            reaction[key] = reaction[key].filter(item => !this.$utils.isEmpty(item.conditionGroupList));
+            reaction[key] = reaction[key].filter(item => !this.$utils.isEmpty(item.rows));
           }
         });
         //更新配置
-- 
Gitee


From 79f484a4c74acb980f9be945fd65035a9c7ff0ec Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Mon, 20 Oct 2025 16:24:38 +0800
Subject: [PATCH 6/6] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=A1=8C=E8=81=94=E5=8A=A8=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1536285267689472]=E8=A1=A8=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=8C=E8=81=94=E5=8A=A8=E8=A7=84=E5=88=99=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E6=95=88=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1536285267689?=
 =?UTF-8?q?472?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/TsSheet.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index c651ca8a..630035d2 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -1069,7 +1069,7 @@ export default {
         let tableRowList = [];
         (this.config?.tableList || []).forEach((v) => {
           if (v && v.hasOwnProperty('row')) {
-            const currentRow = v.row + 1;
+            const currentRow = v.row;
             if (!tableRowList.includes(currentRow)) {
               tableRowList.push(currentRow);
             }
@@ -1097,11 +1097,7 @@ export default {
               }
               if (this.$utils.isEmpty(item.conditionGroupList)) {
                 if (!this.$utils.isEmpty(item.rows)) {
-                  for (let j = item.rows.length - 1; j >= 0; j--) {
-                    if (!tableRowList.includes(j)) {
-                      item.rows.splice(j, 1);
-                    }
-                  }
+                  item.rows = item.rows.filter(d => tableRowList.includes(d));
                 }
                 item.conditionGroupRelList = [];
               }
-- 
Gitee