vxe-table 3.4.3-beta.0 → 3.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.4.3-beta.0",
+  "version": "3.4.6",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -35,20 +35,14 @@
     "@vue/cli-service": "~4.4.0",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "ant-design-vue": "^1.7.8",
-    "codemirror": "^5.53.2",
     "core-js": "^3.6.5",
-    "dayjs": "^1.10.4",
     "del": "^5.1.0",
-    "element-ui": "^2.15.6",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.2.2",
-    "exceljs": "^4.2.1",
-    "font-awesome": "^4.7.0",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^6.1.0",
     "gulp-babel": "^8.0.0",
@@ -60,15 +54,9 @@
     "gulp-sass": "^4.1.0",
     "gulp-sourcemaps": "^2.6.5",
     "gulp-uglify": "^3.0.2",
-    "highlight.js": "^10.5.0",
-    "jsbarcode": "^3.11.0",
-    "jspdf": "^2.3.1",
     "node-sass": "^4.14.0",
-    "qrcode": "^1.4.4",
     "sass-loader": "^8.0.2",
-    "sortablejs": "^1.10.2",
     "typescript": "~3.9.3",
-    "view-design": "^4.6.1",
     "vue": "^2.6.14",
     "vue-class-component": "^7.2.3",
     "vue-i18n": "^8.18.1",
@@ -76,15 +64,6 @@
     "vue-router": "^3.2.0",
     "vue-template-compiler": "^2.6.14",
     "vuex": "^3.4.0",
-    "vxe-table-plugin-antd": "^1.11.3",
-    "vxe-table-plugin-charts": "^1.7.1",
-    "vxe-table-plugin-element": "^1.11.3",
-    "vxe-table-plugin-export-pdf": "^1.9.2",
-    "vxe-table-plugin-export-xlsx": "^2.2.1",
-    "vxe-table-plugin-iview": "^1.11.4",
-    "vxe-table-plugin-menus": "^2.0.2",
-    "vxe-table-plugin-renderer": "^1.3.5",
-    "vxe-table-plugin-shortcut-key": "^1.5.1",
     "xe-ajax": "^4.0.5",
     "xe-clipboard": "^1.10.1",
     "xe-utils": "^3.4.0",

package/packages/edit/src/mixin.js

@@ -5,6 +5,41 @@ import { browse } from '../../tools/src/dom'
 
 const { getRowid } = UtilTools
 
+function insertTreeRow (_vm, newRecords, isAppend) {
+  const { treeFullData, afterFullData, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
+  const funcName = isAppend ? 'push' : 'unshift'
+  newRecords.forEach(item => {
+    const parentRowId = item[treeOpts.parentField]
+    const rowid = getRowid(_vm, item)
+    const matchObj = parentRowId ? XEUtils.findTree(treeFullData, item => parentRowId === item[treeOpts.rowField], treeOpts) : null
+    if (matchObj) {
+      const { item: parentRow } = matchObj
+      const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)]
+      const parentLevel = parentRest ? parentRest.level : 0
+      let parentChilds = parentRow[treeOpts.children]
+      if (!XEUtils.isArray(parentChilds)) {
+        parentChilds = parentRow[treeOpts.children] = []
+      }
+      parentChilds[funcName](item)
+      const rest = { row: item, rowid, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
+      fullDataRowIdData[rowid] = rest
+      fullAllDataRowIdData[rowid] = rest
+    } else {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (parentRowId) {
+          UtilTools.warn('vxe.error.unableInsert')
+        }
+      }
+      afterFullData[funcName](item)
+      treeFullData[funcName](item)
+      const rest = { row: item, rowid, index: -1, _index: -1, $index: -1, items: treeFullData, parent: null, level: 0 }
+      fullDataRowIdData[rowid] = rest
+      fullAllDataRowIdData[rowid] = rest
+    }
+  })
+  _vm.updateVirtualTreeData()
+}
+
 export default {
   methods: {
     /**
@@ -25,39 +60,15 @@ export default {
      */
     _insertAt (records, row) {
       const { treeFullData, mergeList, afterFullData, editStore, sYOpts, scrollYLoad, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = this
+      const { transform } = treeOpts
       if (!XEUtils.isArray(records)) {
         records = [records]
       }
       const newRecords = records.map(record => this.defineField(Object.assign({}, record)))
       if (!row) {
         // 如果为虚拟树
-        if (treeConfig && treeOpts.transform) {
-          newRecords.forEach(item => {
-            const parentRowId = item[treeOpts.parentField]
-            const rowid = getRowid(this, item)
-            if (parentRowId) {
-              const matchObj = XEUtils.findTree(treeFullData, item => parentRowId === item[treeOpts.rowField], treeOpts)
-              if (matchObj) {
-                const { item: parentRow } = matchObj
-                const parentRest = fullAllDataRowIdData[getRowid(this, parentRow)]
-                const parentLevel = parentRest ? parentRest.level : 0
-                let parentChilds = parentRow[treeOpts.children]
-                if (!XEUtils.isArray(parentChilds)) {
-                  parentChilds = parentRow[treeOpts.children] = []
-                }
-                parentChilds.push(item)
-                const rest = { row: item, rowid, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
-                fullDataRowIdData[rowid] = rest
-                fullAllDataRowIdData[rowid] = rest
-              } else {
-                // 父节点不存在
-              }
-            } else {
-              afterFullData.unshift(item)
-              treeFullData.unshift(item)
-            }
-          })
-          this.updateVirtualTreeData()
+        if (treeConfig && transform) {
+          insertTreeRow(this, newRecords, false)
         } else {
           afterFullData.unshift(...newRecords)
           tableFullData.unshift(...newRecords)
@@ -71,39 +82,78 @@ export default {
         }
       } else {
         if (row === -1) {
-          afterFullData.push(...newRecords)
-          tableFullData.push(...newRecords)
-          // 刷新单元格合并
-          mergeList.forEach(mergeItem => {
-            const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
-            if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-              mergeItem.rowspan = mergeRowspan + newRecords.length
-            }
-          })
-        } else {
-          if (treeConfig) {
-            throw new Error(UtilTools.getLog('vxe.error.noTree', ['insert']))
-          }
-          const afIndex = afterFullData.indexOf(row)
-          if (afIndex === -1) {
-            throw new Error(UtilTools.error('vxe.error.unableInsert'))
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            insertTreeRow(this, newRecords, true)
+          } else {
+            afterFullData.push(...newRecords)
+            tableFullData.push(...newRecords)
+            // 刷新单元格合并
+            mergeList.forEach(mergeItem => {
+              const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
+              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+                mergeItem.rowspan = mergeRowspan + newRecords.length
+              }
+            })
           }
-          afterFullData.splice(afIndex, 0, ...newRecords)
-          tableFullData.splice(tableFullData.indexOf(row), 0, ...newRecords)
-          // 刷新单元格合并
-          mergeList.forEach(mergeItem => {
-            const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
-            if (mergeRowIndex > afIndex) {
-              mergeItem.row = mergeRowIndex + newRecords.length
-            } else if (mergeRowIndex + mergeRowspan > afIndex) {
-              mergeItem.rowspan = mergeRowspan + newRecords.length
+        } else {
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            const matchObj = XEUtils.findTree(treeFullData, item => row[treeOpts.rowField] === item[treeOpts.rowField], treeOpts)
+            if (matchObj) {
+              const { parent: parentRow } = matchObj
+              const parentChilds = matchObj.items
+              const parentRest = fullAllDataRowIdData[getRowid(this, parentRow)]
+              const parentLevel = parentRest ? parentRest.level : 0
+              newRecords.forEach((item, i) => {
+                const rowid = getRowid(this, item)
+                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                  if (item[treeOpts.parentField]) {
+                    if (parentRow && item[treeOpts.parentField] !== parentRow[treeOpts.rowField]) {
+                      UtilTools.error('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[treeOpts.rowField]}`])
+                    }
+                  }
+                }
+                if (parentRow) {
+                  item[treeOpts.parentField] = parentRow[treeOpts.rowField]
+                }
+                parentChilds.splice(matchObj.index + i, 0, item)
+                const rest = { row: item, rowid, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1 }
+                fullDataRowIdData[rowid] = rest
+                fullAllDataRowIdData[rowid] = rest
+              })
+              this.updateVirtualTreeData()
+            } else {
+              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                UtilTools.warn('vxe.error.unableInsert')
+              }
+              insertTreeRow(this, newRecords, true)
             }
-          })
+          } else {
+            if (treeConfig) {
+              throw new Error(UtilTools.getLog('vxe.error.noTree', ['insert']))
+            }
+            const afIndex = afterFullData.indexOf(row)
+            if (afIndex === -1) {
+              throw new Error(UtilTools.error('vxe.error.unableInsert'))
+            }
+            afterFullData.splice(afIndex, 0, ...newRecords)
+            tableFullData.splice(tableFullData.indexOf(row), 0, ...newRecords)
+            // 刷新单元格合并
+            mergeList.forEach(mergeItem => {
+              const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
+              if (mergeRowIndex > afIndex) {
+                mergeItem.row = mergeRowIndex + newRecords.length
+              } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                mergeItem.rowspan = mergeRowspan + newRecords.length
+              }
+            })
+          }
         }
       }
       editStore.insertList.unshift(...newRecords)
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
-      this.handleTableData()
+      this.handleTableData(transform)
       this.updateFooter()
       this.cacheRowMap()
       this.checkSelectionStatus()
@@ -128,6 +178,7 @@ export default {
      */
     _remove (rows) {
       const { afterFullData, tableFullData, treeFullData, treeConfig, mergeList, editStore, checkboxOpts, selection, isInsertByRow, sYOpts, scrollYLoad, treeOpts } = this
+      const { transform } = treeOpts
       const { actived, removeList, insertList } = editStore
       const { checkField: property } = checkboxOpts
       let rest = []
@@ -159,7 +210,7 @@ export default {
         this.clearMergeCells()
       } else {
         // 如果为虚拟树
-        if (treeConfig && treeOpts.transform) {
+        if (treeConfig && transform) {
           rows.forEach((row) => {
             const rowid = getRowid(this, row)
             const matchObj = XEUtils.findTree(treeFullData, item => rowid === getRowid(this, item), treeOpts)
@@ -208,7 +259,7 @@ export default {
         }
       })
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
-      this.handleTableData()
+      this.handleTableData(transform)
       this.updateFooter()
       this.cacheRowMap()
       this.checkSelectionStatus()

package/packages/export/src/mixin.js

@@ -40,10 +40,16 @@ function hasTreeChildren ($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0
 }
 
-function getSeq ($xetable, row, rowIndex, column, columnIndex) {
+function getSeq ($xetable, row, rowIndex, column, columnIndex, paths) {
   const seqOpts = $xetable.seqOpts
   const seqMethod = seqOpts.seqMethod || column.seqMethod
-  return seqMethod ? seqMethod({ row, rowIndex, column, columnIndex }) : (seqOpts.startIndex + rowIndex + 1)
+  if (seqMethod) {
+    return seqMethod({ row, rowIndex, column, columnIndex })
+  }
+  if (paths) {
+    return paths.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+  }
+  return seqOpts.startIndex + rowIndex + 1
 }
 
 function defaultFilterExportColumn (column) {
@@ -73,10 +79,11 @@ function getLabelData ($xetable, opts, columns, datas) {
   if (treeConfig) {
     // 如果是树表格只允许导出数据源
     const rest = []
+    const expandMaps = new Map()
     XEUtils.eachTree(datas, (item, rowIndex, items, path, parent, nodes) => {
       const row = item._row || item
       const parentRow = parent && parent._row ? parent._row : parent
-      if ((isAllExpand || !parentRow || $xetable.isTreeExpandByRow(parentRow))) {
+      if ((isAllExpand || !parentRow || (expandMaps.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)))) {
         const hasRowChild = hasTreeChildren($xetable, row)
         const item = {
           _row: row,
@@ -99,7 +106,7 @@ function getLabelData ($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex)
+                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, path)
                 break
               case 'checkbox':
                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
@@ -130,6 +137,7 @@ function getLabelData ($xetable, opts, columns, datas) {
           }
           item[column.id] = XEUtils.toValueString(cellValue)
         })
+        expandMaps.set(row, 1)
         rest.push(Object.assign(item, row))
       }
     }, treeOpts)
@@ -154,7 +162,7 @@ function getLabelData ($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex)
+            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, null)
             break
           case 'checkbox':
             cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
@@ -227,6 +235,9 @@ function getFooterData (opts, footerTableData) {
 
 function getCsvCellTypeLabel (column, cellValue) {
   if (cellValue) {
+    if (column.type === 'seq') {
+      return `\t${cellValue}`
+    }
     switch (column.cellType) {
       case 'string':
         if (!isNaN(cellValue)) {

package/packages/grid/src/grid.js

@@ -670,7 +670,11 @@ export default {
               body.insertRecords = insertRecords.filter(row => pendingRecords.indexOf(row) === -1)
             }
             // 只校验新增和修改的数据
-            return this.validate(body.insertRecords.concat(updateRecords)).then(() => {
+            return this.validate(body.insertRecords.concat(updateRecords)).then((errMap) => {
+              if (errMap) {
+                // 如果校验不通过
+                return
+              }
               if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
                 this.tableLoading = true
                 return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs))
@@ -715,7 +719,7 @@ export default {
                   VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
                 }
               }
-            }).catch(errMap => errMap)
+            })
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
               UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.save'])

package/packages/input/src/input.js

@@ -44,9 +44,16 @@ function getDateQuarter (date) {
   return 4
 }
 
+function toFloatValueFixed (inputValue, digitsValue) {
+  if (/^-/.test('' + inputValue)) {
+    return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
+  }
+  return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
+}
+
 function getNumberValue (_vm, val) {
   const { type, exponential, digitsValue, inpMaxlength } = _vm
-  const restVal = (type === 'float' ? XEUtils.toFixed(XEUtils.floor(val, digitsValue), digitsValue) : XEUtils.toValueString(val))
+  const restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue) : XEUtils.toValueString(val))
   if (exponential && (val === restVal || XEUtils.toValueString(val).toLowerCase() === XEUtils.toNumber(restVal).toExponential())) {
     return val
   }
@@ -1255,7 +1262,7 @@ export default {
         this.changeValue()
       } else if (type === 'float') {
         if (inputValue) {
-          const validValue = XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
+          const validValue = toFloatValueFixed(inputValue, digitsValue)
           if (inputValue !== validValue) {
             this.emitModel(validValue, { type: 'init' })
           }

package/packages/table/src/methods.js

@@ -464,16 +464,12 @@ const Methods = {
       const oRow = tableSourceData[rowIndex]
       if (oRow && row) {
         if (field) {
-          XEUtils.set(oRow, field, XEUtils.get(record || row, field))
+          const newValue = XEUtils.get(record || row, field)
+          XEUtils.set(row, field, newValue)
+          XEUtils.set(oRow, field, newValue)
         } else {
-          if (record) {
-            tableSourceData[rowIndex] = record
-            XEUtils.clear(row, undefined)
-            Object.assign(row, this.defineField(Object.assign({}, record)))
-            this.cacheRowMap(true)
-          } else {
-            XEUtils.destructuring(oRow, XEUtils.clone(row, true))
-          }
+          const newRecord = XEUtils.clone({ ...record }, true)
+          XEUtils.destructuring(oRow, Object.assign(row, newRecord))
         }
       }
       this.tableData = tableData.slice(0)
@@ -2101,7 +2097,7 @@ const Methods = {
    * 表格键盘事件
    */
   keydownEvent (evnt) {
-    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts } = this
+    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts, keyboardOpts } = this
     const { actived } = editStore
     const { keyCode } = evnt
     const isEsc = keyCode === 27
@@ -2114,13 +2110,15 @@ const Methods = {
           // 如果按下了 Esc 键，关闭快捷菜单、筛选
           this.closeFilter()
           this.closeMenu()
-          // 如果是激活编辑状态，则取消编辑
-          if (actived.row) {
-            const params = actived.args
-            this.clearActived(evnt)
-            // 如果配置了选中功能，则为选中状态
-            if (mouseConfig && mouseOpts.selected) {
-              this.$nextTick(() => this.handleSelected(params, evnt))
+          if (keyboardConfig && keyboardOpts.isEsc) {
+            // 如果是激活编辑状态，则取消编辑
+            if (actived.row) {
+              const params = actived.args
+              this.clearActived(evnt)
+              // 如果配置了选中功能，则为选中状态
+              if (mouseConfig && mouseOpts.selected) {
+                this.$nextTick(() => this.handleSelected(params, evnt))
+              }
             }
           }
         }
@@ -2927,6 +2925,16 @@ const Methods = {
     const { fullDataRowIdData, afterFullData, checkboxReserveRowMap, checkboxOpts, treeConfig, treeOpts } = this
     const reserveSelection = []
     if (checkboxOpts.reserve) {
+      const afterFullIdMaps = {}
+      if (treeConfig) {
+        XEUtils.eachTree(afterFullData, row => {
+          afterFullIdMaps[getRowid(this, row)] = 1
+        }, treeOpts)
+      } else {
+        afterFullData.forEach(row => {
+          afterFullIdMaps[getRowid(this, row)] = 1
+        })
+      }
       XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
         if (oldRow) {
           if (isFull) {
@@ -2934,14 +2942,8 @@ const Methods = {
               reserveSelection.push(oldRow)
             }
           } else {
-            if (treeConfig) {
-              if (!XEUtils.findTree(afterFullData, row => getRowid(this, row) === oldRowid, treeOpts)) {
-                reserveSelection.push(oldRow)
-              }
-            } else {
-              if (!afterFullData.some(row => getRowid(this, row) === oldRowid)) {
-                reserveSelection.push(oldRow)
-              }
+            if (!afterFullIdMaps[oldRowid]) {
+              reserveSelection.push(oldRow)
             }
           }
         }

package/packages/table/src/table.js

@@ -114,15 +114,15 @@ export default {
     footerAlign: { type: String, default: () => GlobalConfig.table.footerAlign },
     // 是否显示表头
     showHeader: { type: Boolean, default: () => GlobalConfig.table.showHeader },
-    // 是否要高亮当前选中行
+    // （即将废弃）是否要高亮当前选中行
     highlightCurrentRow: { type: Boolean, default: () => GlobalConfig.table.highlightCurrentRow },
-    // 鼠标移到行是否要高亮显示
+    // （即将废弃）鼠标移到行是否要高亮显示
     highlightHoverRow: { type: Boolean, default: () => GlobalConfig.table.highlightHoverRow },
-    // 是否要高亮当前选中列
+    // （即将废弃）是否要高亮当前选中列
     highlightCurrentColumn: { type: Boolean, default: () => GlobalConfig.table.highlightCurrentColumn },
-    // 鼠标移到列是否要高亮显示
+    // （即将废弃）鼠标移到列是否要高亮显示
     highlightHoverColumn: { type: Boolean, default: () => GlobalConfig.table.highlightHoverColumn },
-    // 激活单元格编辑时是否高亮显示
+    // （即将废弃）激活单元格编辑时是否高亮显示
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -235,7 +235,7 @@ export default {
     scrollX: Object,
     // 纵向虚拟滚动配置项
     scrollY: Object,
-    // 优化相关
+    // （即将废弃）优化相关
     animat: { type: Boolean, default: () => GlobalConfig.table.animat },
     delayHover: { type: Number, default: () => GlobalConfig.table.delayHover },
     // 额外的参数

package/packages/v-x-e-table/src/conf.js

@@ -11,6 +11,7 @@ export default {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -18,7 +19,6 @@ export default {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,
@@ -91,6 +91,9 @@ export default {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },

package/packages/validator/src/mixin.js

@@ -151,21 +151,21 @@ export default {
           const ruleProps = Object.keys(validRest)
           return this.$nextTick().then(() => {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0])
+              return validRest[ruleProps[0]][0]
             }
             if (cb) {
               cb()
             }
           })
         }).catch(firstErrParams => {
-          return new Promise((resolve, reject) => {
+          return new Promise((resolve) => {
             const finish = () => {
               this.$nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  reject(validRest)
+                  resolve(validRest)
                 }
               })
             }

package/types/table.d.ts

@@ -803,9 +803,12 @@ export declare class Table extends VXETableComponent {
    */
   insert(records: RecordInfo | RecordInfo[]): Promise<{ row: RowInfo, rows: RowInfo[] }>;
   /**
-   * 往表格插入临时数据，从指定位置插入一行或多行；第二个参数：row 指定位置、null从第一行插入、-1 从最后插入
-   * @param records 新数据
-   * @param row 指定行
+   * 往表格指定行中插入临时数据
+   * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+   * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+   * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
+   * @param {Object/Array} records 新的数据
+   * @param {Row} row 指定行
    */
   insertAt(records: RecordInfo | RecordInfo[], row: RowInfo | -1 | null): Promise<{ row: RowInfo, rows: RowInfo[] }>;
   /**
@@ -859,9 +862,9 @@ export declare class Table extends VXETableComponent {
    */
   clearActived(): Promise<any>;
   /**
-   * 用于 mouse-config.area，用于清除鼠标选择的区域
+   * 用于 mouse-config.area，用于清除鼠标选择的区域，可以指定清除的区域
    */
-  clearCellAreas(): Promise<any>;
+  clearCellAreas(area?: number | MouseCellArea): Promise<any>;
   /**
    * 用于 edit-config，获取已激活的行数据
    */
@@ -901,9 +904,9 @@ export declare class Table extends VXETableComponent {
    * @param areaConfigs 指定区域
    */
   setCellAreas(areaConfigs: CellAreaConfig[], activeArea?: {
-    area?: MouseCellArea;
-    column: ColumnInfo;
-    row: RowInfo;
+    area?: number | MouseCellArea;
+    column?: number | ColumnInfo;
+    row?: number | RowInfo;
   }): Promise<any>;
   /**
    * 用于 mouse-config.area，设置活动的区域的单元格
@@ -911,8 +914,8 @@ export declare class Table extends VXETableComponent {
    */
   setActiveCellArea(activeArea: {
     area: MouseCellArea;
-    column: ColumnInfo;
-    row: RowInfo;
+    column: number | ColumnInfo;
+    row: number | RowInfo;
   }): Promise<any>;
   /**
    * 临时合并单元格，如果为数组则合并多个

package/types/v-x-e-table/renderer.d.ts

@@ -27,6 +27,8 @@ export interface RendererMapOptions {
   renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): VNode[] | string[];
   filterMethod?(params: ColumnFilterMethodParams): boolean;
   filterResetMethod?(params: ColumnFilterResetParams): void;
+  // 默认行为
+  defaultFilterMethod?(params: ColumnFilterMethodParams): boolean;
 
   // 单元格渲染
   renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
@@ -66,7 +68,7 @@ export class RenderOptions {
   /**
    * 渲染器名称
    */
-  name: string;
+  name?: string;
   /**
    * 目标组件渲染的参数
    */