vxe-table 3.6.14-beta.0 → 3.6.14-beta.2

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.6.14-beta.0","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=outLog("warn"),errLog=(exports.warnLog=warnLog,outLog("error"));exports.errLog=errLog;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.6.14-beta.2","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=outLog("warn"),errLog=(exports.warnLog=warnLog,outLog("error"));exports.errLog=errLog;

package/lib/v-x-e-table/index.js

@@ -186,7 +186,7 @@ var v = 'v3';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "3.6.14-beta.0",
+  version: "3.6.14-beta.2",
   reg: reg,
   use: use,
   setup: _setup.setup,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_setup=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils")),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.6.14-beta.0",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_setup=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils")),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.6.14-beta.2",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.6.14-beta.0",
+  "version": "3.6.14-beta.2",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/edit/src/mixin.js

@@ -64,7 +64,7 @@ export default {
       if (!XEUtils.isArray(records)) {
         records = [records]
       }
-      const newRecords = records.map(record => this.defineField(Object.assign({}, record)))
+      const newRecords = this.defineField(records.map(record => Object.assign({}, record)))
       if (!row) {
         // 如果为虚拟树
         if (treeConfig && transform) {
@@ -158,13 +158,19 @@ export default {
           }
         }
       }
-      editStore.insertList.unshift(...newRecords)
+      const { insertList, insertMaps } = editStore
+      newRecords.forEach(newRow => {
+        const rowid = getRowid(this, newRow)
+        insertMaps[rowid] = newRow
+      })
+      insertList.unshift(...newRecords)
+      this.cacheRowMap()
+      this.updateScrollYStatus()
       this.handleTableData(treeConfig && transform)
       if (!(treeConfig && transform)) {
         this.updateAfterDataIndex()
       }
       this.updateFooter()
-      this.cacheRowMap()
       this.checkSelectionStatus()
       if (this.scrollYLoad) {
         this.updateScrollYSpace()
@@ -188,7 +194,7 @@ export default {
     _remove (rows) {
       const { afterFullData, tableFullData, tableFullTreeData, treeConfig, mergeList, editStore, checkboxOpts, selection, isInsertByRow, treeOpts } = this
       const { transform } = treeOpts
-      const { actived, removeList, insertList } = editStore
+      const { actived, removeList, insertList, insertMaps } = editStore
       const { checkField } = checkboxOpts
       let rest = []
       if (!rows) {
@@ -261,10 +267,12 @@ export default {
       }
       // 从新增中移除已删除的数据
       rows.forEach(row => {
+        const rowid = getRowid(this, row)
         const iIndex = this.findRowIndexOf(insertList, row)
         if (iIndex > -1) {
           insertList.splice(iIndex, 1)
         }
+        delete insertMaps[rowid]
       })
       this.handleTableData(treeConfig && transform)
       if (!(treeConfig && transform)) {
@@ -326,27 +334,15 @@ export default {
      * 获取新增的临时数据
      */
     _getInsertRecords () {
-      const { treeConfig, tableFullTreeData, tableFullData, treeOpts } = this
+      const { fullAllDataRowIdData } = this
       const insertList = this.editStore.insertList
       const insertRecords = []
-      if (insertList.length) {
-        // 如果为虚拟树
-        if (treeConfig && treeOpts.transform) {
-          insertList.forEach(row => {
-            const rowid = getRowid(this, row)
-            const matchObj = XEUtils.findTree(tableFullTreeData, item => rowid === getRowid(this, item), treeOpts)
-            if (matchObj) {
-              insertRecords.push(row)
-            }
-          })
-        } else {
-          insertList.forEach(row => {
-            if (tableFullData.indexOf(row) > -1) {
-              insertRecords.push(row)
-            }
-          })
+      insertList.forEach(row => {
+        const rowid = getRowid(this, row)
+        if (fullAllDataRowIdData[rowid]) {
+          insertRecords.push(row)
         }
-      }
+      })
       return insertRecords
     },
     /**

package/packages/form/src/form-config-item.js

@@ -31,6 +31,9 @@ const VxeFormConfigItem = {
     const { slots, title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, children } = item
     const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
     const itemClassName = compConf ? compConf.itemClassName : ''
+    const itemStyle = compConf ? compConf.itemStyle : null
+    const itemContentClassName = compConf ? compConf.itemContentClassName : ''
+    const itemContentStyle = compConf ? compConf.itemContentStyle : null
     const span = item.span || $xeform.span
     const align = item.align || $xeform.align
     const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
@@ -100,7 +103,8 @@ const VxeFormConfigItem = {
           'is--active': isActivetem($xeform, item),
           'is--error': showError
         }
-      ]
+      ],
+      style: XEUtils.isFunction(itemStyle) ? itemStyle(params) : itemStyle
     }, [
       h('div', {
         class: 'vxe-form--item-inner'
@@ -118,7 +122,8 @@ const VxeFormConfigItem = {
           on: ons
         }, renderTitle(h, $xeform, item)) : null,
         h('div', {
-          class: ['vxe-form--item-content', align ? `align--${align}` : null]
+          class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : ''],
+          style: XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
         }, contentVNs.concat(
           [
             collapseNode ? h('div', {

package/packages/form/src/form-item.js

@@ -55,6 +55,9 @@ const renderItem = (h, _vm, item, slots) => {
   const { title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
   const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
   const itemClassName = compConf ? compConf.itemClassName : ''
+  const itemStyle = compConf ? compConf.itemStyle : null
+  const itemContentClassName = compConf ? compConf.itemContentClassName : ''
+  const itemContentStyle = compConf ? compConf.itemContentStyle : null
   const span = item.span || _vm.span
   const align = item.align || _vm.align
   const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
@@ -109,7 +112,8 @@ const renderItem = (h, _vm, item, slots) => {
         'is--active': isActivetem(_vm, item),
         'is--error': showError
       }
-    ]
+    ],
+    style: XEUtils.isFunction(itemStyle) ? itemStyle(params) : itemStyle
   }, [
     h('div', {
       class: 'vxe-form--item-inner'
@@ -127,7 +131,8 @@ const renderItem = (h, _vm, item, slots) => {
         on: ons
       }, renderTitle(h, _vm, item)) : null,
       h('div', {
-        class: ['vxe-form--item-content', align ? `align--${align}` : null]
+        class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : ''],
+        style: XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
       }, contentVNs.concat(
         [
           collapseNode ? h('div', {

package/packages/select/src/select.js

@@ -706,13 +706,15 @@ export default {
         })
       }
     },
-    focusEvent () {
+    focusEvent (evnt) {
       if (!this.disabled) {
         this.isActivated = true
       }
+      this.$emit('focus', { $event: evnt })
     },
-    blurEvent () {
+    blurEvent (evnt) {
       this.isActivated = false
+      this.$emit('blur', { $event: evnt })
     },
     modelSearchEvent (value) {
       this.searchValue = value

package/packages/table/src/body.js

@@ -93,7 +93,8 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   const { height: rowHeight } = rowOpts
   const renderOpts = editRender || cellRender
   const compConf = renderOpts ? VXETable.renderer.get(renderOpts.name) : null
-  const cellClassName = compConf ? compConf.cellClassName : ''
+  const compCellClassName = compConf ? compConf.cellClassName : ''
+  const compCellStyle = compConf ? compConf.cellStyle : ''
   const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled
   const columnIndex = $xetable.getColumnIndex(column)
   const _columnIndex = $xetable.getVTColumnIndex(column)
@@ -275,7 +276,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
         'col--valid-error': hasValidError,
         'col--current': currentColumn === column
       },
-      UtilTools.getClass(cellClassName, params),
+      UtilTools.getClass(compCellClassName, params),
       UtilTools.getClass(className, params),
       UtilTools.getClass(allCellClassName, params)
     ],
@@ -283,7 +284,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
     attrs,
     style: Object.assign({
       height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
-    }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null),
+    }, XEUtils.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
     on: tdOns
   }, tdVNs)
 }
@@ -303,7 +304,6 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     editOpts,
     treeExpandeds,
     scrollYLoad,
-    editStore,
     rowExpandeds,
     radioOpts,
     checkboxOpts,
@@ -347,7 +347,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     // 是否新增行
     let isNewRow = false
     if (editConfig) {
-      isNewRow = editStore.insertList.indexOf(row) > -1
+      isNewRow = $xetable.isInsertByRow(row)
     }
     if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
       rowChildren = row[treeOpts.children]

package/packages/table/src/methods.js

@@ -343,8 +343,9 @@ const Methods = {
   updateScrollYStatus (fullData) {
     const { treeConfig, treeOpts, sYOpts } = this
     const { transform } = treeOpts
+    const allList = fullData || this.tableFullData
     // 如果gt为0，则总是启用
-    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= fullData.length)
+    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= allList.length)
     this.scrollYLoad = scrollYLoad
     return scrollYLoad
   },
@@ -397,7 +398,9 @@ const Methods = {
     scrollXStore.startIndex = 0
     scrollXStore.endIndex = 1
     editStore.insertList = []
+    editStore.insertMaps = {}
     editStore.removeList = []
+    editStore.removeMaps = {}
     const sYLoad = this.updateScrollYStatus(fullData)
     this.scrollYLoad = sYLoad
     // 全量数据
@@ -654,7 +657,7 @@ const Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap () {
-    const { tableFullColumn, collectColumn, fullColumnMap, showOverflow } = this
+    const { tableFullColumn, collectColumn, fullColumnMap, showOverflow, columnOpts, rowOpts } = this
     const fullColumnIdData = this.fullColumnIdData = {}
     const fullColumnFieldData = this.fullColumnFieldData = {}
     const isGroup = collectColumn.some(hasChildrenList)
@@ -663,6 +666,7 @@ const Methods = {
     let treeNodeColumn
     let checkboxColumn
     let radioColumn
+    let htmlColumn
     let hasFixed
     const handleFunc = (column, index, items, path, parent) => {
       const { id: colid, field, fixed, type, treeNode } = column
@@ -675,9 +679,14 @@ const Methods = {
         }
         fullColumnFieldData[field] = rest
       }
+
       if (!hasFixed && fixed) {
         hasFixed = fixed
       }
+      if (!htmlColumn && type === 'html') {
+        htmlColumn = column
+      }
+
       if (treeNode) {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           if (treeNodeColumn) {
@@ -725,6 +734,18 @@ const Methods = {
           warnLog('vxe.error.errConflicts', [`table.show-footer-overflow=${this.showFooterOverflow}`, `column.show-footer-overflow=${column.showFooterOverflow}`])
         }
       }
+
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (htmlColumn) {
+          if (!columnOpts.useKey) {
+            errLog('vxe.error.reqProp', ['column-config.useKey', 'column.type=html'])
+          }
+          if (!rowOpts.useKey) {
+            errLog('vxe.error.reqProp', ['row-config.useKey', 'column.type=html'])
+          }
+        }
+      }
+
       if (isAllOverflow && column.showOverflow === false) {
         isAllOverflow = false
       }
@@ -879,40 +900,45 @@ const Methods = {
   },
   /**
    * 定义行数据中的列属性，如果不存在则定义
-   * @param {Row} record 行数据
+   * @param {Row} records 行数据
    */
-  defineField (record) {
+  defineField (records) {
     const { radioOpts, checkboxOpts, treeConfig, treeOpts, expandOpts } = this
     const rowkey = getRowkey(this)
-    this.tableFullColumn.forEach(column => {
-      const { field, editRender } = column
-      if (field && !XEUtils.has(record, field)) {
-        let cellValue = null
-        if (editRender) {
-          const { defaultValue } = editRender
-          if (XEUtils.isFunction(defaultValue)) {
-            cellValue = defaultValue({ column })
-          } else if (!XEUtils.isUndefined(defaultValue)) {
-            cellValue = defaultValue
+    if (!XEUtils.isArray(records)) {
+      records = [records || {}]
+    }
+    return records.map(record => {
+      this.tableFullColumn.forEach(column => {
+        const { field, editRender } = column
+        if (field && !XEUtils.has(record, field)) {
+          let cellValue = null
+          if (editRender) {
+            const { defaultValue } = editRender
+            if (XEUtils.isFunction(defaultValue)) {
+              cellValue = defaultValue({ column })
+            } else if (!XEUtils.isUndefined(defaultValue)) {
+              cellValue = defaultValue
+            }
           }
+          XEUtils.set(record, field, cellValue)
         }
-        XEUtils.set(record, field, cellValue)
+      })
+      const otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField]
+      otherFields.forEach((key) => {
+        if (key && eqEmptyValue(XEUtils.get(record, key))) {
+          XEUtils.set(record, key, null)
+        }
+      })
+      if (treeConfig && treeOpts.lazy && XEUtils.isUndefined(record[treeOpts.children])) {
+        record[treeOpts.children] = null
       }
-    })
-    const otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField]
-    otherFields.forEach((key) => {
-      if (key && eqEmptyValue(XEUtils.get(record, key))) {
-        XEUtils.set(record, key, null)
+      // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
+      if (eqEmptyValue(XEUtils.get(record, rowkey))) {
+        XEUtils.set(record, rowkey, getRowUniqueId())
       }
+      return record
     })
-    if (treeConfig && treeOpts.lazy && XEUtils.isUndefined(record[treeOpts.children])) {
-      record[treeOpts.children] = null
-    }
-    // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
-    if (eqEmptyValue(XEUtils.get(record, rowkey))) {
-      XEUtils.set(record, rowkey, getRowUniqueId())
-    }
-    return record
   },
   /**
    * 创建 data 对象
@@ -920,10 +946,9 @@ const Methods = {
    * @param {Array} records 新数据
    */
   createData (records) {
-    const { treeConfig, treeOpts } = this
-    const handleRrecord = record => this.defineField(Object.assign({}, record))
-    const rows = treeConfig ? XEUtils.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord)
-    return this.$nextTick().then(() => rows)
+    return this.$nextTick().then(() => {
+      return this.defineField(records)
+    })
   },
   /**
    * 创建 Row|Rows 对象
@@ -935,7 +960,7 @@ const Methods = {
     if (!isArr) {
       records = [records]
     }
-    return this.$nextTick().then(() => this.createData(records).then(rows => isArr ? rows : rows[0]))
+    return this.createData(records).then(rows => isArr ? rows : rows[0])
   },
   /**
    * 还原数据
@@ -1017,7 +1042,9 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isInsertByRow (row) {
-    return this.editStore.insertList.indexOf(row) > -1
+    const { editStore } = this
+    const rowid = getRowid(this, row)
+    return editStore.insertList.length && editStore.insertMaps[rowid]
   },
   /**
    * 删除所有新增的临时数据
@@ -3723,13 +3750,17 @@ const Methods = {
    * 判断指定列是否为筛选状态，如果为空则判断所有列
    * @param {String} fieldOrColumn 字段名
    */
-  isFilter (fieldOrColumn) {
+  isActiveFilterByColumn (fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
     if (column) {
       return column.filters && column.filters.some(option => option.checked)
     }
     return this.getCheckedFilters().length > 0
   },
+  // 已废弃
+  isFilter (fieldOrColumn) {
+    return this.isActiveFilterByColumn(fieldOrColumn)
+  },
   /**
    * 判断展开行是否懒加载完成
    * @param {Row} row 行对象

package/packages/table/src/table.js

@@ -394,7 +394,9 @@ export default {
           column: null
         },
         insertList: [],
-        removeList: []
+        insertMaps: {},
+        removeList: [],
+        removeMaps: {}
       },
       // 存放 tooltip 相关信息
       tooltipStore: {

package/types/table.d.ts

@@ -272,6 +272,7 @@ export declare class Table extends VXETableComponent {
    */
   clearAll(): Promise<any>;
   /**
+   * 该方法已废弃！！！
    * 同步 data 数据；如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    * @deprecated
@@ -629,6 +630,11 @@ export declare class Table extends VXETableComponent {
    * 判断指定列是否为筛选状态，如果为空则判断所有列
    * @param column 列对象
    */
+  isActiveFilterByColumn(column: ColumnInfo): boolean;
+  /**
+   * 已废弃，请使用 isFilterByColumn
+   * @deprecated
+   */
   isFilter(column: ColumnInfo): boolean;
   /**
    * 用于 expand-config.lazy，用于懒加载展开行，判断展开行是否懒加载完成

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

@@ -1,5 +1,5 @@
-import { CreateElement, VNode } from 'vue'
-import { SlotVNodeType, RowInfo } from '../component'
+import { CreateElement } from 'vue'
+import { SlotVNodeType, RowInfo, VNodeStyle } from '../component'
 import { Table } from '../table'
 import { Grid } from '../grid'
 import { ColumnInfo, ColumnCellRenderOptions, ColumnContentRenderOptions } from '../column'
@@ -43,6 +43,7 @@ export interface RendererMapOptions {
 
   // 单元格渲染
   cellClassName?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => string | { [key: string]: boolean })
+  cellStyle?: string | VNodeStyle | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => string | VNodeStyle)
   renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
   renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
   renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): SlotVNodeType | SlotVNodeType[];
@@ -63,6 +64,9 @@ export interface RendererMapOptions {
 
   // 表单-项渲染
   itemClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
+  itemStyle?: string | VNodeStyle | ((params: FormItemRenderParams) => string | VNodeStyle)
+  itemContentClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
+  itemContentStyle?: string | VNodeStyle | ((params: FormItemRenderParams) => string | VNodeStyle)
   renderItemTitle?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): SlotVNodeType | SlotVNodeType[];
   renderItemContent?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): SlotVNodeType | SlotVNodeType[];
   itemVisibleMethod?(params: FormItemVisibleParams): boolean;
@@ -178,9 +182,9 @@ export class GridRenderParams extends TableRenderParams {
 
 export class EmptyRenderParams extends TableRenderParams { }
 
-export interface ColumnDefaultSlotParams extends ColumnCellRenderParams { }
-export interface ColumnContentSlotParams extends ColumnContentRenderParams { }
-export interface ColumnIconSlotParams extends ColumnIconRenderParams { }
+export type ColumnDefaultSlotParams = ColumnCellRenderParams
+export type ColumnContentSlotParams = ColumnContentRenderParams
+export type ColumnIconSlotParams = ColumnIconRenderParams
 
-export interface ColumnContentRenderParams extends ColumnCellRenderParams { }
-export interface ColumnIconRenderParams extends ColumnCellRenderParams { }
+export type ColumnContentRenderParams = ColumnCellRenderParams
+export type ColumnIconRenderParams = ColumnCellRenderParams