vxe-table 3.4.2 → 3.4.5

package/lib/validator/src/mixin.js

@@ -216,7 +216,7 @@ var _default = {
           var ruleProps = Object.keys(validRest);
           return _this2.$nextTick().then(function () {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0]);
+              return validRest[ruleProps[0]][0];
             }
 
             if (cb) {
@@ -224,14 +224,14 @@ var _default = {
             }
           });
         }).catch(function (firstErrParams) {
-          return new Promise(function (resolve, reject) {
+          return new Promise(function (resolve) {
             var finish = function finish() {
               _this2.$nextTick(function () {
                 if (cb) {
                   cb(validRest);
                   resolve();
                 } else {
-                  reject(validRest);
+                  resolve(validRest);
                 }
               });
             };

package/lib/validator/src/mixin.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_utils=require("../../tools/src/utils");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 i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return _tools.UtilTools.getFuncText(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var r=e.type,i=e.min,l=e.max,n=e.pattern,e="number"===r,r=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(i)&&r<_xeUtils.default.toNumber(i)||(!_xeUtils.default.eqNull(l)&&r>_xeUtils.default.toNumber(l)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).test(t))))}var _default={methods:{_fullValidate:function(e,t){return this.beginValidate(e,t,!0)},_validate:function(e,t){return this.beginValidate(e,t)},handleValidError:function(t){var r=this;return new Promise(function(e){!1===r.validOpts.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},beginValidate:function(e,u,i){var a=this,s={},l=this.editRules,c=this.afterFullData,d=this.treeConfig,t=this.treeOpts;!0===e?r=c:e&&(_xeUtils.default.isFunction(e)?u=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||this.getInsertRecords().concat(this.getUpdateRecords()),n=[];if(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),l){var o=this.getColumns(),e=function(r){var e;!i&&a.validRuleErr||(e=[],o.forEach(function(t){!i&&a.validRuleErr||!_xeUtils.default.has(l,t.property)||e.push(a.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:a.getRowIndex(r),row:r,columnIndex:a.getColumnIndex(t),column:t,$table:a};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!i)return a.validRuleErr=!0,Promise.reject(e)}))}),n.push(Promise.all(e)))};return d?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(n).then(function(){var e=Object.keys(s);return a.$nextTick().then(function(){return e.length?Promise.reject(s[e[0]][0]):void(u&&u())})}).catch(function(o){return new Promise(function(e,t){function r(){a.$nextTick(function(){u?(u(s),e()):t(s)})}function i(){o.cell=a.getCell(o.row,o.column),_tools.DomTools.scrollToView(o.cell),a.handleValidError(o).then(r)}var l=o.row,n=c.indexOf(l),l=0<n?c[n-1]:l;!1===a.validOpts.autoPos?r():(d?a.scrollToTreeRow(l):a.scrollToRow(l)).then(i)})})}return this.$nextTick().then(function(){u&&u()})},hasCellRules:function(t,e,r){var i=this.editRules,r=r.property;if(r&&i){r=_xeUtils.default.get(i,r);return r&&_xeUtils.default.find(r,function(e){return"all"===t||!e.trigger||t===e.trigger})}return!1},validCellRules:function(n,o,u,e){var a,s,c=this,t=this.editRules,r=u.property,d=[],f=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(o,r):e,a.forEach(function(t){var e,r=t.type,i=t.trigger,l=t.required;"all"!==n&&i&&n!==i||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:o,rowIndex:c.getRowIndex(o),column:u,columnIndex:c.getColumnIndex(u),$table:c}))&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:i,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(function(e){c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:i,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(r="array"===r?!_xeUtils.default.isArray(s)||!s.length:(0,_utils.eqEmptyValue)(s),(l?r||validErrorRuleValue(t,s):!r&&validErrorRuleValue(t,s))&&(c.validRuleErr=!0,d.push(new Rule(t)))))}))),Promise.all(f).then(function(){if(d.length){var e={rules:d,rule:d[0]};return Promise.reject(e)}})},_clearValidate:function(){var e=this.$refs.validTip;return Object.assign(this.validStore,{visible:!1,row:null,column:null,content:"",rule:null}),e&&e.visible&&e.close(),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,i=this.editStore,l=this.editRules,n=this.validStore,i=i.actived;if(i.row&&l){var i=i.args,o=i.row,u=i.column,a=i.cell;if(this.hasCellRules(t,o,u))return this.validCellRules(t,o,u).then(function(){"row"===e.mode&&n.visible&&n.row===o&&n.column===u&&r.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:o,column:u,cell:a};return r.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,i=this.height,l=this.tableData,n=this.validOpts,o=e.rule,u=e.row,a=e.column,s=e.cell,c=r.validTip,d=o.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:u,column:a,rule:o,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!i&&l.length<2))return c.open(s,d)})}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_utils=require("../../tools/src/utils");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 l=t[r];l.enumerable=l.enumerable||!1,l.configurable=!0,"value"in l&&(l.writable=!0),Object.defineProperty(e,l.key,l)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return _tools.UtilTools.getFuncText(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var r=e.type,l=e.min,i=e.max,n=e.pattern,e="number"===r,r=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(l)&&r<_xeUtils.default.toNumber(l)||(!_xeUtils.default.eqNull(i)&&r>_xeUtils.default.toNumber(i)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).test(t))))}var _default={methods:{_fullValidate:function(e,t){return this.beginValidate(e,t,!0)},_validate:function(e,t){return this.beginValidate(e,t)},handleValidError:function(t){var r=this;return new Promise(function(e){!1===r.validOpts.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},beginValidate:function(e,o,l){var u=this,a={},i=this.editRules,s=this.afterFullData,c=this.treeConfig,t=this.treeOpts;!0===e?r=s:e&&(_xeUtils.default.isFunction(e)?o=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||this.getInsertRecords().concat(this.getUpdateRecords()),n=[];if(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),i){var d=this.getColumns(),e=function(r){var e;!l&&u.validRuleErr||(e=[],d.forEach(function(t){!l&&u.validRuleErr||!_xeUtils.default.has(i,t.property)||e.push(u.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:u.getRowIndex(r),row:r,columnIndex:u.getColumnIndex(t),column:t,$table:u};if(a[t.property]||(a[t.property]=[]),a[t.property].push(e),!l)return u.validRuleErr=!0,Promise.reject(e)}))}),n.push(Promise.all(e)))};return c?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(n).then(function(){var e=Object.keys(a);return u.$nextTick().then(function(){return e.length?a[e[0]][0]:void(o&&o())})}).catch(function(n){return new Promise(function(e){function t(){u.$nextTick(function(){o?(o(a),e()):e(a)})}function r(){n.cell=u.getCell(n.row,n.column),_tools.DomTools.scrollToView(n.cell),u.handleValidError(n).then(t)}var l=n.row,i=s.indexOf(l),l=0<i?s[i-1]:l;!1===u.validOpts.autoPos?t():(c?u.scrollToTreeRow(l):u.scrollToRow(l)).then(r)})})}return this.$nextTick().then(function(){o&&o()})},hasCellRules:function(t,e,r){var l=this.editRules,r=r.property;if(r&&l){r=_xeUtils.default.get(l,r);return r&&_xeUtils.default.find(r,function(e){return"all"===t||!e.trigger||t===e.trigger})}return!1},validCellRules:function(n,o,u,e){var a,s,c=this,t=this.editRules,r=u.property,d=[],f=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(o,r):e,a.forEach(function(t){var e,r=t.type,l=t.trigger,i=t.required;"all"!==n&&l&&n!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:o,rowIndex:c.getRowIndex(o),column:u,columnIndex:c.getColumnIndex(u),$table:c}))&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(function(e){c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:l,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(r="array"===r?!_xeUtils.default.isArray(s)||!s.length:(0,_utils.eqEmptyValue)(s),(i?r||validErrorRuleValue(t,s):!r&&validErrorRuleValue(t,s))&&(c.validRuleErr=!0,d.push(new Rule(t)))))}))),Promise.all(f).then(function(){if(d.length){var e={rules:d,rule:d[0]};return Promise.reject(e)}})},_clearValidate:function(){var e=this.$refs.validTip;return Object.assign(this.validStore,{visible:!1,row:null,column:null,content:"",rule:null}),e&&e.visible&&e.close(),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,l=this.editStore,i=this.editRules,n=this.validStore,l=l.actived;if(l.row&&i){var l=l.args,o=l.row,u=l.column,a=l.cell;if(this.hasCellRules(t,o,u))return this.validCellRules(t,o,u).then(function(){"row"===e.mode&&n.visible&&n.row===o&&n.column===u&&r.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:o,column:u,cell:a};return r.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,l=this.height,i=this.tableData,n=this.validOpts,o=e.rule,u=e.row,a=e.column,s=e.cell,c=r.validTip,d=o.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:u,column:a,rule:o,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!l&&i.length<2))return c.open(s,d)})}}};exports.default=_default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vxe-table",
-  "version": "3.4.2",
-  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
+  "version": "3.4.5",
+  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
     "lint": "vue-cli-service lint",
@@ -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

@@ -3,6 +3,43 @@ import VXETable from '../../v-x-e-table'
 import { UtilTools, DomTools, isEnableConf } from '../../tools'
 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: {
     /**
@@ -22,56 +59,101 @@ export default {
      * @param {Row} row 指定行
      */
     _insertAt (records, row) {
-      const { mergeList, afterFullData, editStore, sYOpts, scrollYLoad, tableFullData, treeConfig } = this
+      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) {
-        afterFullData.unshift(...newRecords)
-        tableFullData.unshift(...newRecords)
-        // 刷新单元格合并
-        mergeList.forEach(mergeItem => {
-          const { row: mergeRowIndex } = mergeItem
-          if (mergeRowIndex > 0) {
-            mergeItem.row = mergeRowIndex + newRecords.length
-          }
-        })
-      } 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
-            }
-          })
+        // 如果为虚拟树
+        if (treeConfig && transform) {
+          insertTreeRow(this, newRecords, false)
         } 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)
+          afterFullData.unshift(...newRecords)
+          tableFullData.unshift(...newRecords)
           // 刷新单元格合并
           mergeList.forEach(mergeItem => {
-            const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
-            if (mergeRowIndex > afIndex) {
+            const { row: mergeRowIndex } = mergeItem
+            if (mergeRowIndex > 0) {
               mergeItem.row = mergeRowIndex + newRecords.length
-            } else if (mergeRowIndex + mergeRowspan > afIndex) {
-              mergeItem.rowspan = mergeRowspan + newRecords.length
             }
           })
         }
+      } else {
+        if (row === -1) {
+          // 如果为虚拟树
+          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
+              }
+            })
+          }
+        } 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()
@@ -95,7 +177,8 @@ export default {
      * 如果为空则删除所有
      */
     _remove (rows) {
-      const { afterFullData, tableFullData, treeConfig, mergeList, editStore, checkboxOpts, selection, isInsertByRow, sYOpts, scrollYLoad } = this
+      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 = []
@@ -126,26 +209,43 @@ export default {
         this.afterFullData = []
         this.clearMergeCells()
       } else {
-        rows.forEach(row => {
-          const tfIndex = tableFullData.indexOf(row)
-          if (tfIndex > -1) {
-            const rItems = tableFullData.splice(tfIndex, 1)
-            rest.push(rItems[0])
-          }
-          const afIndex = afterFullData.indexOf(row)
-          if (afIndex > -1) {
-            // 刷新单元格合并
-            mergeList.forEach(mergeItem => {
-              const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex - 1
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan - 1
-              }
-            })
-            afterFullData.splice(afIndex, 1)
-          }
-        })
+        // 如果为虚拟树
+        if (treeConfig && transform) {
+          rows.forEach((row) => {
+            const rowid = getRowid(this, row)
+            const matchObj = XEUtils.findTree(treeFullData, item => rowid === getRowid(this, item), treeOpts)
+            if (matchObj) {
+              const rItems = matchObj.items.splice(matchObj.index, 1)
+              rest.push(rItems[0])
+            }
+            const afIndex = afterFullData.indexOf(row)
+            if (afIndex > -1) {
+              afterFullData.splice(afIndex, 1)
+            }
+            this.updateVirtualTreeData()
+          })
+        } else {
+          rows.forEach(row => {
+            const tfIndex = tableFullData.indexOf(row)
+            if (tfIndex > -1) {
+              const rItems = tableFullData.splice(tfIndex, 1)
+              rest.push(rItems[0])
+            }
+            const afIndex = afterFullData.indexOf(row)
+            if (afIndex > -1) {
+              // 刷新单元格合并
+              mergeList.forEach(mergeItem => {
+                const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
+                if (mergeRowIndex > afIndex) {
+                  mergeItem.row = mergeRowIndex - 1
+                } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                  mergeItem.rowspan = mergeRowspan - 1
+                }
+              })
+              afterFullData.splice(afIndex, 1)
+            }
+          })
+        }
       }
       // 如果当前行被激活编辑，则清除激活状态
       if (actived.row && rows.indexOf(actived.row) > -1) {
@@ -159,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()
@@ -216,14 +316,26 @@ export default {
      * 获取新增的临时数据
      */
     _getInsertRecords () {
+      const { treeConfig, treeFullData, tableFullData, treeOpts } = this
       const insertList = this.editStore.insertList
       const insertRecords = []
       if (insertList.length) {
-        this.tableFullData.forEach(row => {
-          if (insertList.indexOf(row) > -1) {
-            insertRecords.push(row)
-          }
-        })
+        // 如果为虚拟树
+        if (treeConfig && treeOpts.transform) {
+          insertList.forEach(row => {
+            const rowid = getRowid(this, row)
+            const matchObj = XEUtils.findTree(treeFullData, item => rowid === getRowid(this, item), treeOpts)
+            if (matchObj) {
+              insertRecords.push(row)
+            }
+          })
+        } else {
+          insertList.forEach(row => {
+            if (tableFullData.indexOf(row) > -1) {
+              insertRecords.push(row)
+            }
+          })
+        }
       }
       return insertRecords
     },

package/packages/header/src/header.js

@@ -121,7 +121,7 @@ export default {
             if (scrollXLoad && !hasEllipsis) {
               showEllipsis = hasEllipsis = true
             }
-            if (highlightCurrentColumn || tableListeners['header-cell-click'] || sortOpts.trigger === 'cell') {
+            if (columnOpts.isCurrent || highlightCurrentColumn || tableListeners['header-cell-click'] || sortOpts.trigger === 'cell') {
               thOns.click = evnt => $xetable.triggerHeaderCellClickEvent(evnt, params)
             }
             if (tableListeners['header-cell-dblclick']) {

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/body.js

@@ -141,7 +141,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
     }
   }
   // 点击事件处理
-  if (highlightCurrentRow ||
+  if ((rowOpts.isCurrent || highlightCurrentRow) ||
     tableListeners['cell-click'] ||
     (editRender && editConfig) ||
     (expandOpts.trigger === 'row' || (expandOpts.trigger === 'cell')) ||
@@ -287,7 +287,8 @@ function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn)
     checkboxOpts,
     expandColumn,
     hasFixedColumn,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    rowOpts
   } = $xetable
   const rows = []
   tableData.forEach((row, $rowIndex) => {
@@ -301,7 +302,7 @@ function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn)
     // 确保任何情况下 rowIndex 都精准指向真实 data 索引
     rowIndex = $xetable.getRowIndex(row)
     // 事件绑定
-    if (highlightHoverRow) {
+    if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = evnt => {
         if (isOperateMouse($xetable)) {
           return
@@ -579,7 +580,7 @@ export default {
      */
     scrollEvent (evnt) {
       const { $el: scrollBodyElem, $parent: $xetable, fixedType } = this
-      const { $refs, elemStore, highlightHoverRow, scrollXLoad, scrollYLoad, lastScrollTop, lastScrollLeft } = $xetable
+      const { $refs, elemStore, highlightHoverRow, scrollXLoad, scrollYLoad, lastScrollTop, lastScrollLeft, rowOpts } = $xetable
       const { tableHeader, tableBody, leftBody, rightBody, tableFooter, validTip } = $refs
       const headerElem = tableHeader ? tableHeader.$el : null
       const footerElem = tableFooter ? tableFooter.$el : null
@@ -597,7 +598,7 @@ export default {
       $xetable.lastScrollTop = scrollTop
       $xetable.lastScrollLeft = scrollLeft
       $xetable.lastScrollTime = Date.now()
-      if (highlightHoverRow) {
+      if (rowOpts.isHover || highlightHoverRow) {
         $xetable.clearHoverRow()
       }
       if (leftElem && fixedType === 'left') {
@@ -683,7 +684,7 @@ export default {
     wheelEvent (evnt) {
       const { deltaY, deltaX } = evnt
       const { $el: scrollBodyElem, $parent: $xetable } = this
-      const { $refs, highlightHoverRow, scrollYLoad, lastScrollTop, lastScrollLeft } = $xetable
+      const { $refs, highlightHoverRow, scrollYLoad, lastScrollTop, lastScrollLeft, rowOpts } = $xetable
       const { tableBody } = $refs
       const bodyElem = tableBody.$el
 
@@ -706,7 +707,7 @@ export default {
         $xetable.lastScrollTop = scrollTop
         $xetable.lastScrollLeft = scrollLeft
         $xetable.lastScrollTime = Date.now()
-        if (highlightHoverRow) {
+        if (rowOpts.isHover || highlightHoverRow) {
           $xetable.clearHoverRow()
         }
         this.handleWheel(evnt, isTopWheel, deltaTop, isRollX, isRollY)