vxe-table 3.6.13 → 3.6.14-beta.1

package/lib/tools/dom.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.browse=exports.DomTools=void 0,exports.getOffsetHeight=getOffsetHeight,exports.getPaddingTopBottomSize=getPaddingTopBottomSize,exports.setScrollLeft=setScrollLeft,exports.setScrollTop=setScrollTop;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var browse=_xeUtils.default.browse(),reClsMap=(exports.browse=browse,{});function getClsRE(e){return reClsMap[e]||(reClsMap[e]=new RegExp("(?:^|\\s)".concat(e,"(?!\\S)"),"g")),reClsMap[e]}function getNodeOffset(e,t,o){if(e){var s=e.parentNode;if(o.top+=e.offsetTop,o.left+=e.offsetLeft,s&&s!==document.documentElement&&s!==document.body&&(o.top-=s.scrollTop,o.left-=s.scrollLeft),(!t||e!==t&&e.offsetParent!==t)&&e.offsetParent)return getNodeOffset(e.offsetParent,t,o)}return o}function isScale(e){return e&&/^\d+%$/.test(e)}function hasClass(e,t){return e&&e.className&&e.className.match&&e.className.match(getClsRE(t))}function removeClass(e,t){e&&hasClass(e,t)&&(e.className=e.className.replace(getClsRE(t),""))}function getDomNode(){var e=document.documentElement,t=document.body;return{scrollTop:e.scrollTop||t.scrollTop,scrollLeft:e.scrollLeft||t.scrollLeft,visibleHeight:e.clientHeight||t.clientHeight,visibleWidth:e.clientWidth||t.clientWidth}}function getOffsetHeight(e){return e?e.offsetHeight:0}function getPaddingTopBottomSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingTop)+_xeUtils.default.toNumber(e.paddingBottom)):0}function setScrollTop(e,t){e&&(e.scrollTop=t)}function setScrollLeft(e,t){e&&(e.scrollLeft=t)}function isNodeElement(e){return e&&1===e.nodeType}var DomTools={browse:browse,isPx:function(e){return e&&/^\d+(px)?$/.test(e)},isScale:isScale,hasClass:hasClass,removeClass:removeClass,addClass:function(e,t){e&&!hasClass(e,t)&&(removeClass(e,t),e.className="".concat(e.className," ").concat(t))},updateCellTitle:function(e,t){t="html"===t.type?e.innerText:e.textContent;e.getAttribute("title")!==t&&e.setAttribute("title",t)},getDomNode:getDomNode,getEventTargetNode:function(e,t,o,s){for(var l,r=e.target;r&&r.nodeType&&r!==document;){if(o&&hasClass(r,o)&&(!s||s(r)))l=r;else if(r===t)return{flag:!o||!!l,container:t,targetElem:l};r=r.parentNode}return{flag:!1}},getOffsetPos:function(e,t){return getNodeOffset(e,t,{left:0,top:0})},getAbsolutePos:function(e){var e=e.getBoundingClientRect(),t=e.top,e=e.left,o=getDomNode();return{boundingTop:t,top:o.scrollTop+t,boundingLeft:e,left:o.scrollLeft+e,visibleHeight:o.visibleHeight,visibleWidth:o.visibleWidth}},scrollToView:function(e){var t="scrollIntoViewIfNeeded",o="scrollIntoView";e&&(e[t]?e[t]():e[o]&&e[o]())},triggerEvent:function(e,t){e&&e.dispatchEvent(new Event(t))},calcHeight:function(e,t){var o,t=e[t],s=0;return s=t?"auto"===t?e.parentHeight:(o=e.getExcludeHeight(),s=isScale(t)?Math.floor((_xeUtils.default.toInteger(t)||1)/100*e.parentHeight):_xeUtils.default.toNumber(t),Math.max(40,s-o)):s},isNodeElement:isNodeElement},_default=exports.DomTools=DomTools;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.browse=exports.DomTools=void 0,exports.getOffsetHeight=getOffsetHeight,exports.getPaddingTopBottomSize=getPaddingTopBottomSize,exports.setScrollLeft=setScrollLeft,exports.setScrollTop=setScrollTop;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var browse=_xeUtils.default.browse(),reClsMap=(exports.browse=browse,{});function getClsRE(e){return reClsMap[e]||(reClsMap[e]=new RegExp("(?:^|\\s)".concat(e,"(?!\\S)"),"g")),reClsMap[e]}function getNodeOffset(e,t,o){if(e){var s=e.parentNode;if(o.top+=e.offsetTop,o.left+=e.offsetLeft,s&&s!==document.documentElement&&s!==document.body&&(o.top-=s.scrollTop,o.left-=s.scrollLeft),(!t||e!==t&&e.offsetParent!==t)&&e.offsetParent)return getNodeOffset(e.offsetParent,t,o)}return o}function isScale(e){return e&&/^\d+%$/.test(e)}function hasClass(e,t){return e&&e.className&&e.className.match&&e.className.match(getClsRE(t))}function removeClass(e,t){e&&hasClass(e,t)&&(e.className=e.className.replace(getClsRE(t),""))}function getDomNode(){var e=document.documentElement,t=document.body;return{scrollTop:e.scrollTop||t.scrollTop,scrollLeft:e.scrollLeft||t.scrollLeft,visibleHeight:e.clientHeight||t.clientHeight,visibleWidth:e.clientWidth||t.clientWidth}}function getOffsetHeight(e){return e?e.offsetHeight:0}function getPaddingTopBottomSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingTop)+_xeUtils.default.toNumber(e.paddingBottom)):0}function setScrollTop(e,t){e&&(e.scrollTop=t)}function setScrollLeft(e,t){e&&(e.scrollLeft=t)}function isNodeElement(e){return e&&1===e.nodeType}var DomTools={browse:browse,isPx:function(e){return e&&/^\d+(px)?$/.test(e)},isScale:isScale,hasClass:hasClass,removeClass:removeClass,addClass:function(e,t){e&&!hasClass(e,t)&&(removeClass(e,t),e.className="".concat(e.className," ").concat(t))},updateCellTitle:function(e,t){t="html"===t.type?e.innerText:e.textContent;e.getAttribute("title")!==t&&e.setAttribute("title",t)},getDomNode:getDomNode,getEventTargetNode:function(e,t,o,s){for(var l,r=e.target.shadowRoot&&e.composed&&e.composedPath()[0]||e.target;r&&r.nodeType&&r!==document;){if(o&&hasClass(r,o)&&(!s||s(r)))l=r;else if(r===t)return{flag:!o||!!l,container:t,targetElem:l};r=r.parentNode}return{flag:!1}},getOffsetPos:function(e,t){return getNodeOffset(e,t,{left:0,top:0})},getAbsolutePos:function(e){var e=e.getBoundingClientRect(),t=e.top,e=e.left,o=getDomNode();return{boundingTop:t,top:o.scrollTop+t,boundingLeft:e,left:o.scrollLeft+e,visibleHeight:o.visibleHeight,visibleWidth:o.visibleWidth}},scrollToView:function(e){var t="scrollIntoViewIfNeeded",o="scrollIntoView";e&&(e[t]?e[t]():e[o]&&e[o]())},triggerEvent:function(e,t){e&&e.dispatchEvent(new Event(t))},calcHeight:function(e,t){var o,t=e[t],s=0;return s=t?"auto"===t?e.parentHeight:(o=e.getExcludeHeight(),s=isScale(t)?Math.floor((_xeUtils.default.toInteger(t)||1)/100*e.parentHeight):_xeUtils.default.toNumber(t),Math.max(40,s-o)):s},isNodeElement:isNodeElement},_default=exports.DomTools=DomTools;exports.default=_default;

package/lib/tools/log.js

@@ -9,7 +9,7 @@ exports.warnLog = void 0;
 var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.13", "] ", _conf["default"].i18n(message, params));
+  return "[vxe-table v".concat("3.6.14-beta.1", "] ", _conf["default"].i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {

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.13","] ",_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.1","] ",_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.13",
+  version: "3.6.14-beta.1",
   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.13",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.1",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.13",
+  "version": "3.6.14-beta.1",
   "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/footer/src/footer.js

@@ -68,11 +68,13 @@ export default {
       overflowX,
       scrollbarWidth,
       tooltipOpts,
-      visibleColumn
+      visibleColumn,
+      expandColumn
     } = $xetable
     // 如果是使用优化模式
     if (fixedType) {
-      if (scrollXLoad || allColumnFooterOverflow) {
+      // 如果存在展开行使用全量渲染
+      if (!expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
         if (!mergeFooterList.length || !footerSpanMethod) {
           tableColumn = fixedColumn
         } else {

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

@@ -31,6 +31,7 @@ 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 span = item.span || $xeform.span
     const align = item.align || $xeform.align
     const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
@@ -100,7 +101,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'

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

@@ -55,6 +55,7 @@ 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 span = item.span || _vm.span
   const align = item.align || _vm.align
   const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
@@ -109,7 +110,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'

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]
@@ -520,10 +520,11 @@ export default {
   },
   render (h) {
     const { _e, $parent: $xetable, fixedColumn, fixedType } = this
-    let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts } = $xetable
+    let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, expandColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts } = $xetable
     // 如果是使用优化模式
     if (fixedType) {
-      if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+      // 如果存在展开行使用全量渲染
+      if (!expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
         if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
           tableColumn = fixedColumn
         } else {

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
     // 全量数据
@@ -879,40 +882,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)
+        }
+      })
+      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)
         }
-        XEUtils.set(record, field, cellValue)
+      })
+      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 对象
@@ -1017,7 +1025,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]
   },
   /**
    * 删除所有新增的临时数据
@@ -2044,7 +2054,8 @@ const Methods = {
 
           // 如果是使用优化模式
           if (fixedType) {
-            if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+            // 如果存在展开行使用全量渲染
+            if (!this.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
               if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                 renderColumnList = fixedColumn
               } else {
@@ -2070,7 +2081,8 @@ const Methods = {
 
           // 如果是使用优化模式
           if (fixedType) {
-            if (scrollXLoad || allColumnFooterOverflow) {
+            // 如果存在展开行使用全量渲染
+            if (!this.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
               if (!mergeFooterList.length || !footerSpanMethod) {
                 renderColumnList = fixedColumn
               } else {

package/packages/table/src/table.js

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

package/packages/tools/dom.js

@@ -114,7 +114,7 @@ export const DomTools = {
    */
   getEventTargetNode (evnt, container, queryCls, queryMethod) {
     let targetElem
-    let target = evnt.target
+    let target = (evnt.target.shadowRoot && evnt.composed) ? (evnt.composedPath()[0] || evnt.target) : evnt.target
     while (target && target.nodeType && target !== document) {
       if (queryCls && hasClass(target, queryCls) && (!queryMethod || queryMethod(target))) {
         targetElem = target

package/types/table.d.ts

@@ -272,6 +272,7 @@ export declare class Table extends VXETableComponent {
    */
   clearAll(): Promise<any>;
   /**
+   * 该方法已废弃！！！
    * 同步 data 数据；如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    * @deprecated

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,7 @@ export interface RendererMapOptions {
 
   // 表单-项渲染
   itemClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
+  itemStyle?: 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 +180,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