vxe-table 3.20.0-beta.11 → 3.20.0-beta.13

package/packages/table/src/methods.ts

@@ -230,6 +230,7 @@ function handleCustomRestore ($xeTable: VxeTableConstructor & VxeTablePrivateMet
       const newCollectCols = XEUtils.toArrayTree(XEUtils.orderBy(allCols, 'renderSortNumber'), { key: 'id', parentKey: 'parentId', children: 'children' })
       internalData.collectColumn = newCollectCols
       internalData.tableFullColumn = getColumnList(newCollectCols)
+      reactData.updateColFlag++
     }
     reactData.isCustomStatus = true
   } else {
@@ -3633,12 +3634,14 @@ function handleTableColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
 }
 
 function handleUpdateColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
   const columnList = XEUtils.orderBy(internalData.collectColumn, 'renderSortNumber')
   internalData.collectColumn = columnList
-  const tableFullColumn = getColumnList(columnList)
-  internalData.tableFullColumn = tableFullColumn
+  const tFullColumn = getColumnList(columnList)
+  internalData.tableFullColumn = tFullColumn
+  reactData.updateColFlag++
   cacheColumnMap($xeTable)
 }
 
@@ -3830,8 +3833,9 @@ function handleInitColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
 
   const expandOpts = $xeTable.computeExpandOpts
   internalData.collectColumn = collectColumn
-  const tableFullColumn = getColumnList(collectColumn)
-  internalData.tableFullColumn = tableFullColumn
+  const tFullColumn = getColumnList(collectColumn)
+  internalData.tableFullColumn = tFullColumn
+  reactData.updateColFlag++
   reactData.isColLoading = true
   initColumnHierarchy($xeTable)
   return Promise.resolve(
@@ -5407,9 +5411,10 @@ const tableMethods: any = {
     const props = $xeTable
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { keepSource } = props
-    const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData
-    if (keepSource) {
+    const { keepSource, editConfig } = props
+    const { fullDataRowIdData, sourceDataRowIdData } = internalData
+    const keepFields = $xeTable.computeKeepFields
+    if (keepSource && editConfig) {
       const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId)
       const rowRest = fullDataRowIdData[rowid]
       // 新增的数据不需要检测
@@ -5422,9 +5427,8 @@ const tableMethods: any = {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field as string)
         }
-        for (let index = 0, len = tableFullColumn.length; index < len; index++) {
-          const property = tableFullColumn[index].field
-          if (property && !eqCellValue(oRow, row, property)) {
+        for (let i = 0; i < keepFields.length; i++) {
+          if (!eqCellValue(oRow, row, keepFields[i])) {
             return true
           }
         }

package/packages/table/src/props.ts

@@ -270,6 +270,8 @@ export const tableProps = {
   fnrConfig: Object,
   // 编辑配置项
   editConfig: [Boolean, Object] as PropType<VxeTablePropTypes.EditConfig>,
+  // 数据状态监听配置项
+  editDirtyConfig: Object as PropType<VxeTablePropTypes.EditDirtyConfig>,
   // 校验配置项
   validConfig: Object as PropType<VxeTablePropTypes.ValidConfig>,
   // 校验规则配置项

package/packages/table/src/table.ts

@@ -557,6 +557,7 @@ export default {
       reScrollFlag: 0,
       reLayoutFlag: 0,
       footFlag: 0,
+      kfFlag: 0,
       mergeFooteCellFlag: 0,
       crossTableDragRowInfo: crossTableDragRowGlobal
     }
@@ -905,7 +906,16 @@ export default {
       return this.computeEditOpts
     },
     computeEditOpts () {
-      return Object.assign({}, getConfig().table.editConfig, this.editConfig)
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+
+      return Object.assign({}, getConfig().table.editConfig, props.editConfig)
+    },
+    computeEditDirtyOpts () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+
+      return Object.assign({}, getConfig().table.editDirtyConfig, props.editDirtyConfig)
     },
     sortOpts () {
       return this.computeSortOpts
@@ -1267,6 +1277,36 @@ export default {
       }
       return false
     },
+    computeKeepFields () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
+
+      const { tableFullColumn } = internalData
+      const { updateColFlag } = reactData
+      const editDirtyOpts = $xeTable.computeEditDirtyOpts
+      const { includeFields, excludeFields } = editDirtyOpts
+      const kpFields: string[] = []
+      if (updateColFlag) {
+        if (includeFields && includeFields.length) {
+          return includeFields
+        }
+        const exfMaps: Record<string, number> = {}
+        if (excludeFields && excludeFields.length) {
+          excludeFields.forEach(field => {
+            exfMaps[field] = 1
+          })
+        }
+        for (let i = 0; i < tableFullColumn.length; i++) {
+          const column = tableFullColumn[i]
+          const { field, type, editRender, cellRender } = column
+          if (field && !type && (editRender || cellRender) && !exfMaps[field]) {
+            kpFields.push(field)
+          }
+        }
+      }
+      return kpFields
+    },
     computeTableBorder () {
       const $xeTable = this
       const props = $xeTable
@@ -1467,6 +1507,24 @@ export default {
       $xeTable.updateFooter()
     },
 
+    updateColFlag () {
+      this.kfFlag++
+    },
+    computeKeepFields () {
+      this.kfFlag++
+    },
+    kfFlag () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const internalData = $xeTable as unknown as TableInternalData
+
+      const keepFields = $xeTable.computeKeepFields
+      const kpfMaps: Record<string, number> = {}
+      keepFields.forEach(field => {
+        kpfMaps[field] = 1
+      })
+      internalData.keepUpdateFieldMaps = kpfMaps
+    },
+
     syncResize (value: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 

package/packages/table/src/util.ts

@@ -81,6 +81,8 @@ export function createInternalData (): TableInternalData {
     // 数据集（仅可视）
     visibleDataRowIdData: {},
 
+    keepUpdateFieldMaps: {},
+
     footerFullDataRowData: {},
 
     // 渲染中缓存数据
@@ -144,6 +146,7 @@ export function createInternalData (): TableInternalData {
 
 export function createReactData (): TableReactData {
   return {
+    updateColFlag: 0,
     // 低性能的静态列
     staticColumns: [],
     // 渲染的列分组