vxe-table 3.6.1 → 3.6.5

package/lib/edit/src/mixin.js

@@ -813,6 +813,10 @@ var _default = {
 
         if (!autofocus && compRender) {
           autofocus = compRender.autofocus;
+        }
+
+        if (!autoselect && compRender) {
+          autoselect = compRender.autoselect;
         } // 如果指定了聚焦 class
 
 

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

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("../../table/src/util"),_dom=_interopRequireWildcard(require("../../tools/dom")),_log=require("../../tools/log");function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,r=new WeakMap;return(_getRequireWildcardCache=function(e){return e?r:t})(e)}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,i,n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((i=o?Object.getOwnPropertyDescriptor(e,r):null)&&(i.get||i.set)?Object.defineProperty(n,r,i):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,i=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),i.push.apply(i,r)),i}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,i=new Array(t);r<t;r++)i[r]=e[r];return i}function insertTreeRow(l,e,t){var a=l.tableFullTreeData,s=l.afterFullData,u=l.fullDataRowIdData,c=l.fullAllDataRowIdData,r=l.treeOpts,d=r.rowField,h=r.parentField,f=r.children,p=r.mapChildren,m=t?"push":"unshift";e.forEach(function(e){var t,r,i=e[h],n=(0,_util.getRowid)(l,e),o=i?_xeUtils.default.findTree(a,function(e){return i===e[d]},{children:p}):null;o?(t=o.item,o=(r=c[(0,_util.getRowid)(l,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[m](e),o={row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1},u[n]=o,c[n]=o):("development"===process.env.NODE_ENV&&i&&(0,_log.warnLog)("vxe.error.unableInsert"),s[m](e),a[m](e),e={row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0},u[n]=e,c[n]=e)})}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var i=this,r=this.tableFullTreeData,n=this.mergeList,o=this.afterFullData,l=this.editStore,a=this.tableFullData,s=this.treeConfig,u=this.fullDataRowIdData,c=this.fullAllDataRowIdData,d=this.treeOpts,h=d.transform,f=d.rowField,p=d.mapChildren,m=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return i.defineField(Object.assign({},e))});if(t)if(-1===t)s&&h?insertTreeRow(this,m,!0):(o.push.apply(o,_toConsumableArray(m)),a.push.apply(a,_toConsumableArray(m)),n.forEach(function(e){var t=e.row,r=e.rowspan;t+r>o.length&&(e.rowspan=r+m.length)}));else if(s&&h){var _,w,v,g=_xeUtils.default.findTree(r,function(e){return t[f]===e[f]},{children:p});g?(_=g.parent,w=g.items,p=c[(0,_util.getRowid)(this,_)],v=p?p.level:0,m.forEach(function(e,t){var r=(0,_util.getRowid)(i,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&_&&e[d.parentField]!==_[f]&&(0,_log.errLog)("vxe.error.errProp",["".concat(d.parentField,"=").concat(e[d.parentField]),"".concat(d.parentField,"=").concat(_[f])]),_&&(e[d.parentField]=_[f]),w.splice(g.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:w,parent:_,level:v+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(this,m,!0))}else{if(s)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var y=-1;if(_xeUtils.default.isNumber(t)?t<o.length&&(y=t):y=this.findRowIndexOf(o,t),-1===y)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));o.splice.apply(o,[y,0].concat(_toConsumableArray(m))),a.splice.apply(a,[this.findRowIndexOf(a,t),0].concat(_toConsumableArray(m))),n.forEach(function(e){var t=e.row,r=e.rowspan;y<t?e.row=t+m.length:y<t+r&&(e.rowspan=r+m.length)})}else s&&h?insertTreeRow(this,m,!1):(o.unshift.apply(o,_toConsumableArray(m)),a.unshift.apply(a,_toConsumableArray(m)),n.forEach(function(e){var t=e.row;0<t&&(e.row=t+m.length)}));return(l=l.insertList).unshift.apply(l,_toConsumableArray(m)),this.handleTableData(s&&h),s&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return i.updateCellAreas(),i.recalculate()}).then(function(){return{row:m.length?m[m.length-1]:null,rows:m}})},_remove:function(e){var n=this,o=this.afterFullData,r=this.tableFullData,i=this.tableFullTreeData,t=this.treeConfig,l=this.mergeList,a=this.editStore,s=this.checkboxOpts,u=this.selection,c=this.isInsertByRow,d=this.treeOpts,h=d.transform,f=a.actived,p=a.removeList,m=a.insertList,s=s.checkField,_=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){c(e)||p.push(e)}),s||e.forEach(function(e){e=n.findRowIndexOf(u,e);-1<e&&u.splice(e,1)}),r===e?(e=_=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&h?e.forEach(function(e){var t=(0,_util.getRowid)(n,e),r=_xeUtils.default.findTree(i,function(e){return t===(0,_util.getRowid)(n,e)},d);r&&(r=r.items.splice(r.index,1),_.push(r[0]));e=n.findRowIndexOf(o,e);-1<e&&o.splice(e,1)}):e.forEach(function(e){var t=n.findRowIndexOf(r,e);-1<t&&(t=r.splice(t,1),_.push(t[0]));var i=n.findRowIndexOf(o,e);-1<i&&(l.forEach(function(e){var t=e.row,r=e.rowspan;i<t?e.row=t-1:i<t+r&&(e.rowspan=r-1)}),o.splice(i,1))}),f.row&&-1<this.findRowIndexOf(e,f.row)&&this.clearActived(),e.forEach(function(e){e=n.findRowIndexOf(m,e);-1<e&&m.splice(e,1)}),this.handleTableData(t&&h),t&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:_.length?_[_.length-1]:null,rows:_}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,i=this.tableFullTreeData,t=this.tableFullData,n=this.treeOpts,o=this.editStore.insertList,l=[];return o.length&&(e&&n.transform?o.forEach(function(e){var t=(0,_util.getRowid)(r,e);_xeUtils.default.findTree(i,function(e){return t===(0,_util.getRowid)(r,e)},n)&&l.push(e)}):o.forEach(function(e){-1<t.indexOf(e)&&l.push(e)})),l},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,i=this.treeConfig,n=this.treeOpts,o=this.editStore;if(e){e=o.actived,o=e.row,e=e.column;return(o||e)&&this._syncActivedCell(),i?_xeUtils.default.filterTree(t,function(e){return r(e)},n):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,i=this,n=this.editStore,o=this.editOpts,l=this.tableColumn,a=this.editConfig,s=this.mouseConfig,u=o.mode,c=n.actived,d=e.row,h=e.column,f=h.editRender,n=e.cell=e.cell||this.getCell(d,h),o=o.beforeEditMethod||o.activeMethod;return(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(f)&&n&&(c.row!==d||"cell"===u&&c.column!==h?(r="edit-disabled",o&&!o(_objectSpread(_objectSpread({},e),{},{$table:this}))||(s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),c.column&&this.clearActived(t),r="edit-actived",h.renderHeight=n.offsetHeight,c.args=e,c.row=d,c.column=h,"row"===u?l.forEach(function(e){return i._getColumnModel(d,e)}):this._getColumnModel(d,h),this.$nextTick(function(){i.handleFocus(e,t)})),this.emitEvent(r,{row:d,rowIndex:this.getRowIndex(d),$rowIndex:this.getVMRowIndex(d),column:h,columnIndex:this.getColumnIndex(h),$columnIndex:this.getVMColumnIndex(h)},t)):(r=c.column,s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==h&&((s=r.model).update&&_utils.default.setCellValue(d,r,s.value),this.clearValidate()),h.renderHeight=n.offsetHeight,c.args=e,c.column=h,setTimeout(function(){i.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_utils.default.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_utils.default.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,i=this.editOpts,r=r.actived,n=r.row,r=r.column;(n||r)&&("row"===i.mode?e.forEach(function(e){return t._setColumnModel(n,e)}):this._setColumnModel(n,r))},_clearActived:function(e){return this.clearEdit(e)},_clearEdit:function(e){var t=this.editStore.actived,r=t.row,i=t.column;return(r||i)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:i,columnIndex:this.getColumnIndex(i),$columnIndex:this.getVMColumnIndex(i)},e)),_vXETable.default._valid?this.clearValidate():this.$nextTick()},_getActiveRecord:function(){return this.getEditRecord()},_getEditRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,i=t.actived,t=i.args,i=i.row;return t&&-1<this.findRowIndexOf(r,i)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.isEditByRow(e)},_isEditByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,i,n=e.row,o=e.column,l=e.cell,a=o.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.default.renderer.get(a.name),r=a.autofocus,a=a.autoselect,!r&&t&&(r=t.autofocus),_xeUtils.default.isFunction(r)?i=r.call(this,e):r&&(i=l.querySelector(r))&&i.focus(),i?a?i.select():_dom.browse.msie&&((i=i.createTextRange()).collapse(!1),i.select()):this.scrollToRow(n,o))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e){return this.setEditCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},_setActiveCell:function(e){return this.setEditCell(e)},_setEditCell:function(t,e){var r=this,i=this.editConfig,n=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&n&&(0,_utils.isEnableConf)(i)&&(0,_utils.isEnableConf)(n.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,n);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:n,columnIndex:r.getColumnIndex(n),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,i=this.editOpts,n=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==i.trigger&&(-1<(i=this.findRowIndexOf(r,e))&&(r=this.getCell(e,t),r={row:e,rowIndex:i,column:t,columnIndex:n.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,i=this.mouseConfig,n=this.mouseOpts,o=this.editOpts,l=this.editStore,a=l.actived,s=l.selected,u=e.row,c=e.column,d=i&&n.selected;return!d||s.row===u&&s.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),s.args=e,s.row=u,s.column=c,d&&r.addColSdCls(),r.focus(),t&&r.emitEvent("cell-selected",e,t)),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _dom.default.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_dom.default.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_dom.default.addClass(e,"col--selected"))}}};exports.default=_default;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("../../table/src/util"),_dom=_interopRequireWildcard(require("../../tools/dom")),_log=require("../../tools/log");function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,r=new WeakMap;return(_getRequireWildcardCache=function(e){return e?r:t})(e)}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,i,n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((i=o?Object.getOwnPropertyDescriptor(e,r):null)&&(i.get||i.set)?Object.defineProperty(n,r,i):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,i=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),i.push.apply(i,r)),i}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,i=new Array(t);r<t;r++)i[r]=e[r];return i}function insertTreeRow(l,e,t){var a=l.tableFullTreeData,s=l.afterFullData,u=l.fullDataRowIdData,c=l.fullAllDataRowIdData,r=l.treeOpts,d=r.rowField,h=r.parentField,f=r.children,p=r.mapChildren,m=t?"push":"unshift";e.forEach(function(e){var t,r,i=e[h],n=(0,_util.getRowid)(l,e),o=i?_xeUtils.default.findTree(a,function(e){return i===e[d]},{children:p}):null;o?(t=o.item,o=(r=c[(0,_util.getRowid)(l,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[m](e),o={row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1},u[n]=o,c[n]=o):("development"===process.env.NODE_ENV&&i&&(0,_log.warnLog)("vxe.error.unableInsert"),s[m](e),a[m](e),e={row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0},u[n]=e,c[n]=e)})}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var i=this,r=this.tableFullTreeData,n=this.mergeList,o=this.afterFullData,l=this.editStore,a=this.tableFullData,s=this.treeConfig,u=this.fullDataRowIdData,c=this.fullAllDataRowIdData,d=this.treeOpts,h=d.transform,f=d.rowField,p=d.mapChildren,m=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return i.defineField(Object.assign({},e))});if(t)if(-1===t)s&&h?insertTreeRow(this,m,!0):(o.push.apply(o,_toConsumableArray(m)),a.push.apply(a,_toConsumableArray(m)),n.forEach(function(e){var t=e.row,r=e.rowspan;t+r>o.length&&(e.rowspan=r+m.length)}));else if(s&&h){var _,w,v,g=_xeUtils.default.findTree(r,function(e){return t[f]===e[f]},{children:p});g?(_=g.parent,w=g.items,p=c[(0,_util.getRowid)(this,_)],v=p?p.level:0,m.forEach(function(e,t){var r=(0,_util.getRowid)(i,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&_&&e[d.parentField]!==_[f]&&(0,_log.errLog)("vxe.error.errProp",["".concat(d.parentField,"=").concat(e[d.parentField]),"".concat(d.parentField,"=").concat(_[f])]),_&&(e[d.parentField]=_[f]),w.splice(g.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:w,parent:_,level:v+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(this,m,!0))}else{if(s)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var y=-1;if(_xeUtils.default.isNumber(t)?t<o.length&&(y=t):y=this.findRowIndexOf(o,t),-1===y)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));o.splice.apply(o,[y,0].concat(_toConsumableArray(m))),a.splice.apply(a,[this.findRowIndexOf(a,t),0].concat(_toConsumableArray(m))),n.forEach(function(e){var t=e.row,r=e.rowspan;y<t?e.row=t+m.length:y<t+r&&(e.rowspan=r+m.length)})}else s&&h?insertTreeRow(this,m,!1):(o.unshift.apply(o,_toConsumableArray(m)),a.unshift.apply(a,_toConsumableArray(m)),n.forEach(function(e){var t=e.row;0<t&&(e.row=t+m.length)}));return(l=l.insertList).unshift.apply(l,_toConsumableArray(m)),this.handleTableData(s&&h),s&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return i.updateCellAreas(),i.recalculate()}).then(function(){return{row:m.length?m[m.length-1]:null,rows:m}})},_remove:function(e){var n=this,o=this.afterFullData,r=this.tableFullData,i=this.tableFullTreeData,t=this.treeConfig,l=this.mergeList,a=this.editStore,s=this.checkboxOpts,u=this.selection,c=this.isInsertByRow,d=this.treeOpts,h=d.transform,f=a.actived,p=a.removeList,m=a.insertList,s=s.checkField,_=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){c(e)||p.push(e)}),s||e.forEach(function(e){e=n.findRowIndexOf(u,e);-1<e&&u.splice(e,1)}),r===e?(e=_=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&h?e.forEach(function(e){var t=(0,_util.getRowid)(n,e),r=_xeUtils.default.findTree(i,function(e){return t===(0,_util.getRowid)(n,e)},d);r&&(r=r.items.splice(r.index,1),_.push(r[0]));e=n.findRowIndexOf(o,e);-1<e&&o.splice(e,1)}):e.forEach(function(e){var t=n.findRowIndexOf(r,e);-1<t&&(t=r.splice(t,1),_.push(t[0]));var i=n.findRowIndexOf(o,e);-1<i&&(l.forEach(function(e){var t=e.row,r=e.rowspan;i<t?e.row=t-1:i<t+r&&(e.rowspan=r-1)}),o.splice(i,1))}),f.row&&-1<this.findRowIndexOf(e,f.row)&&this.clearActived(),e.forEach(function(e){e=n.findRowIndexOf(m,e);-1<e&&m.splice(e,1)}),this.handleTableData(t&&h),t&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:_.length?_[_.length-1]:null,rows:_}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,i=this.tableFullTreeData,t=this.tableFullData,n=this.treeOpts,o=this.editStore.insertList,l=[];return o.length&&(e&&n.transform?o.forEach(function(e){var t=(0,_util.getRowid)(r,e);_xeUtils.default.findTree(i,function(e){return t===(0,_util.getRowid)(r,e)},n)&&l.push(e)}):o.forEach(function(e){-1<t.indexOf(e)&&l.push(e)})),l},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,i=this.treeConfig,n=this.treeOpts,o=this.editStore;if(e){e=o.actived,o=e.row,e=e.column;return(o||e)&&this._syncActivedCell(),i?_xeUtils.default.filterTree(t,function(e){return r(e)},n):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,i=this,n=this.editStore,o=this.editOpts,l=this.tableColumn,a=this.editConfig,s=this.mouseConfig,u=o.mode,c=n.actived,d=e.row,h=e.column,f=h.editRender,n=e.cell=e.cell||this.getCell(d,h),o=o.beforeEditMethod||o.activeMethod;return(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(f)&&n&&(c.row!==d||"cell"===u&&c.column!==h?(r="edit-disabled",o&&!o(_objectSpread(_objectSpread({},e),{},{$table:this}))||(s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),c.column&&this.clearActived(t),r="edit-actived",h.renderHeight=n.offsetHeight,c.args=e,c.row=d,c.column=h,"row"===u?l.forEach(function(e){return i._getColumnModel(d,e)}):this._getColumnModel(d,h),this.$nextTick(function(){i.handleFocus(e,t)})),this.emitEvent(r,{row:d,rowIndex:this.getRowIndex(d),$rowIndex:this.getVMRowIndex(d),column:h,columnIndex:this.getColumnIndex(h),$columnIndex:this.getVMColumnIndex(h)},t)):(r=c.column,s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==h&&((s=r.model).update&&_utils.default.setCellValue(d,r,s.value),this.clearValidate()),h.renderHeight=n.offsetHeight,c.args=e,c.column=h,setTimeout(function(){i.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_utils.default.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_utils.default.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,i=this.editOpts,r=r.actived,n=r.row,r=r.column;(n||r)&&("row"===i.mode?e.forEach(function(e){return t._setColumnModel(n,e)}):this._setColumnModel(n,r))},_clearActived:function(e){return this.clearEdit(e)},_clearEdit:function(e){var t=this.editStore.actived,r=t.row,i=t.column;return(r||i)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:i,columnIndex:this.getColumnIndex(i),$columnIndex:this.getVMColumnIndex(i)},e)),_vXETable.default._valid?this.clearValidate():this.$nextTick()},_getActiveRecord:function(){return this.getEditRecord()},_getEditRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,i=t.actived,t=i.args,i=i.row;return t&&-1<this.findRowIndexOf(r,i)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.isEditByRow(e)},_isEditByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,i,n=e.row,o=e.column,l=e.cell,a=o.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.default.renderer.get(a.name),r=a.autofocus,a=a.autoselect,!r&&t&&(r=t.autofocus),!a&&t&&(a=t.autoselect),_xeUtils.default.isFunction(r)?i=r.call(this,e):r&&(i=l.querySelector(r))&&i.focus(),i?a?i.select():_dom.browse.msie&&((i=i.createTextRange()).collapse(!1),i.select()):this.scrollToRow(n,o))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e){return this.setEditCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},_setActiveCell:function(e){return this.setEditCell(e)},_setEditCell:function(t,e){var r=this,i=this.editConfig,n=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&n&&(0,_utils.isEnableConf)(i)&&(0,_utils.isEnableConf)(n.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,n);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:n,columnIndex:r.getColumnIndex(n),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,i=this.editOpts,n=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==i.trigger&&(-1<(i=this.findRowIndexOf(r,e))&&(r=this.getCell(e,t),r={row:e,rowIndex:i,column:t,columnIndex:n.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,i=this.mouseConfig,n=this.mouseOpts,o=this.editOpts,l=this.editStore,a=l.actived,s=l.selected,u=e.row,c=e.column,d=i&&n.selected;return!d||s.row===u&&s.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),s.args=e,s.row=u,s.column=c,d&&r.addColSdCls(),r.focus(),t&&r.emitEvent("cell-selected",e,t)),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _dom.default.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_dom.default.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_dom.default.addClass(e,"col--selected"))}}};exports.default=_default;

package/lib/filter/src/panel.js

@@ -13,6 +13,8 @@ var _utils = _interopRequireDefault(require("../../tools/utils"));
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
+var _vn = require("../../tools/vn");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = {
@@ -70,10 +72,10 @@ var _default = {
       } else if (compConf && compConf.renderFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
+        }, (0, _vn.getSlotVNs)(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
           $panel: this,
           context: this
-        }, args)))];
+        }, args))))];
       }
 
       var isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {

package/lib/filter/src/panel.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireDefault(require("../../tools/utils")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default={name:"VxeTableFilter",props:{filterStore:Object},computed:{hasCheckOption:function(){var e=this.filterStore;return e&&e.options.some(function(e){return e.checked})}},render:function(e){var t=this.$parent,i=this.filterStore,l=i.args,n=i.column,r=n?n.filterRender:null,a=r?_vXETable.default.renderer.get(r.name):null,n=a?a.filterClassName:"";return e("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",a&&a.className?a.className:"",_utils.default.getClass(n,Object.assign({$panel:this,$table:t},l)),{"is--animat":t.animat,"is--multiple":i.multiple,"is--active":i.visible}],style:i.style},i.visible?this.renderOptions(e,r,a).concat(this.renderFooter(e)):[])},methods:{renderOptions:function(i,e,t){var l=this,n=this.$parent,r=this.filterStore,a=r.args,c=r.column,o=r.multiple,s=r.maxHeight,c=c.slots;if(c&&c.filter)return[i("div",{class:"vxe-table--filter-template"},n.callSlot(c.filter,Object.assign({$panel:this,context:this},a),i))];if(t&&t.renderFilter)return[i("div",{class:"vxe-table--filter-template"},t.renderFilter.call(n,i,e,Object.assign({$panel:this,context:this},a)))];e=o?r.isAllSelected:!r.options.some(function(e){return e._checked}),a=o&&r.isIndeterminate;return[i("ul",{class:"vxe-table--filter-header"},[i("li",{class:["vxe-table--filter-option",{"is--checked":e,"is--indeterminate":a}],attrs:{title:_conf.default.i18n(o?"vxe.table.allTitle":"vxe.table.allFilter")},on:{click:function(e){l.changeAllOption(e,!r.isAllSelected)}}},(o?[i("span",{class:["vxe-checkbox--icon",a?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:e?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([i("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.table.allFilter"))]))]),i("ul",{class:"vxe-table--filter-body",style:s?{maxHeight:"".concat(s,"px")}:{}},r.options.map(function(t){var e=t._checked;return i("li",{class:["vxe-table--filter-option",{"is--checked":e}],attrs:{title:t.label},on:{click:function(e){l.changeOption(e,!t._checked,t)}}},(o?[i("span",{class:["vxe-checkbox--icon",e?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([i("span",{class:"vxe-checkbox--label"},_utils.default.formatText(t.label,1))]))}))]},renderFooter:function(e){var t=this.hasCheckOption,i=this.filterStore,l=i.column,n=i.multiple,l=l.filterRender,l=l?_vXETable.default.renderer.get(l.name):null,i=!t&&!i.isAllSelected&&!i.isIndeterminate;return!n||l&&(_xeUtils.default.isBoolean(l.showFilterFooter)?!1===l.showFilterFooter:!1===l.isFooter)?[]:[e("div",{class:"vxe-table--filter-footer"},[e("button",{class:{"is--disabled":i},attrs:{disabled:i},on:{click:this.confirmFilter}},_conf.default.i18n("vxe.table.confirmFilter")),e("button",{on:{click:this.resetFilter}},_conf.default.i18n("vxe.table.resetFilter"))])]},filterCheckAllEvent:function(e,t){var i=this.filterStore;i.options.forEach(function(e){e._checked=t,e.checked=t}),i.isAllSelected=t,i.isIndeterminate=!1},changeRadioOption:function(e,t,i){var l=this.$parent;this.filterStore.options.forEach(function(e){e._checked=!1}),i._checked=t,l.checkFilterOptions(),this.confirmFilter(e)},changeMultipleOption:function(e,t,i){var l=this.$parent;i._checked=t,l.checkFilterOptions()},changeAllOption:function(e,t){this.filterStore.multiple?this.filterCheckAllEvent(e,t):this.resetFilter(e)},changeOption:function(e,t,i){this.filterStore.multiple?this.changeMultipleOption(e,t,i):this.changeRadioOption(e,t,i)},confirmFilter:function(e){var t=this.$parent;this.filterStore.options.forEach(function(e){e.checked=e._checked}),t.confirmFilterEvent(e)},resetFilter:function(e){this.$parent.resetFilterEvent(e)}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireDefault(require("../../tools/utils")),_xeUtils=_interopRequireDefault(require("xe-utils")),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default={name:"VxeTableFilter",props:{filterStore:Object},computed:{hasCheckOption:function(){var e=this.filterStore;return e&&e.options.some(function(e){return e.checked})}},render:function(e){var t=this.$parent,i=this.filterStore,l=i.args,n=i.column,r=n?n.filterRender:null,a=r?_vXETable.default.renderer.get(r.name):null,n=a?a.filterClassName:"";return e("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",a&&a.className?a.className:"",_utils.default.getClass(n,Object.assign({$panel:this,$table:t},l)),{"is--animat":t.animat,"is--multiple":i.multiple,"is--active":i.visible}],style:i.style},i.visible?this.renderOptions(e,r,a).concat(this.renderFooter(e)):[])},methods:{renderOptions:function(i,e,t){var l=this,n=this.$parent,r=this.filterStore,a=r.args,o=r.column,c=r.multiple,s=r.maxHeight,o=o.slots;if(o&&o.filter)return[i("div",{class:"vxe-table--filter-template"},n.callSlot(o.filter,Object.assign({$panel:this,context:this},a),i))];if(t&&t.renderFilter)return[i("div",{class:"vxe-table--filter-template"},(0,_vn.getSlotVNs)(t.renderFilter.call(n,i,e,Object.assign({$panel:this,context:this},a))))];e=c?r.isAllSelected:!r.options.some(function(e){return e._checked}),a=c&&r.isIndeterminate;return[i("ul",{class:"vxe-table--filter-header"},[i("li",{class:["vxe-table--filter-option",{"is--checked":e,"is--indeterminate":a}],attrs:{title:_conf.default.i18n(c?"vxe.table.allTitle":"vxe.table.allFilter")},on:{click:function(e){l.changeAllOption(e,!r.isAllSelected)}}},(c?[i("span",{class:["vxe-checkbox--icon",a?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:e?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([i("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.table.allFilter"))]))]),i("ul",{class:"vxe-table--filter-body",style:s?{maxHeight:"".concat(s,"px")}:{}},r.options.map(function(t){var e=t._checked;return i("li",{class:["vxe-table--filter-option",{"is--checked":e}],attrs:{title:t.label},on:{click:function(e){l.changeOption(e,!t._checked,t)}}},(c?[i("span",{class:["vxe-checkbox--icon",e?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([i("span",{class:"vxe-checkbox--label"},_utils.default.formatText(t.label,1))]))}))]},renderFooter:function(e){var t=this.hasCheckOption,i=this.filterStore,l=i.column,n=i.multiple,l=l.filterRender,l=l?_vXETable.default.renderer.get(l.name):null,i=!t&&!i.isAllSelected&&!i.isIndeterminate;return!n||l&&(_xeUtils.default.isBoolean(l.showFilterFooter)?!1===l.showFilterFooter:!1===l.isFooter)?[]:[e("div",{class:"vxe-table--filter-footer"},[e("button",{class:{"is--disabled":i},attrs:{disabled:i},on:{click:this.confirmFilter}},_conf.default.i18n("vxe.table.confirmFilter")),e("button",{on:{click:this.resetFilter}},_conf.default.i18n("vxe.table.resetFilter"))])]},filterCheckAllEvent:function(e,t){var i=this.filterStore;i.options.forEach(function(e){e._checked=t,e.checked=t}),i.isAllSelected=t,i.isIndeterminate=!1},changeRadioOption:function(e,t,i){var l=this.$parent;this.filterStore.options.forEach(function(e){e._checked=!1}),i._checked=t,l.checkFilterOptions(),this.confirmFilter(e)},changeMultipleOption:function(e,t,i){var l=this.$parent;i._checked=t,l.checkFilterOptions()},changeAllOption:function(e,t){this.filterStore.multiple?this.filterCheckAllEvent(e,t):this.resetFilter(e)},changeOption:function(e,t,i){this.filterStore.multiple?this.changeMultipleOption(e,t,i):this.changeRadioOption(e,t,i)},confirmFilter:function(e){var t=this.$parent;this.filterStore.options.forEach(function(e){e.checked=e._checked}),t.confirmFilterEvent(e)},resetFilter:function(e){this.$parent.resetFilterEvent(e)}}};exports.default=_default;

package/lib/footer/style/style.css

@@ -23,20 +23,3 @@
 /*select*/
 /*switch*/
 /*pulldown*/
-.vxe-table--footer-wrapper {
-  color: #606266;
-  margin-top: -1px; }
-  .vxe-table--footer-wrapper.body--wrapper {
-    overflow-x: auto; }
-
-.vxe-footer--column.col--ellipsis > .vxe-cell {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center; }
-  .vxe-footer--column.col--ellipsis > .vxe-cell .vxe-cell--item {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; }

package/lib/footer/style/style.min.css

@@ -1 +0,0 @@
-.vxe-table--footer-wrapper{color:#606266;margin-top:-1px}.vxe-table--footer-wrapper.body--wrapper{overflow-x:auto}.vxe-footer--column.col--ellipsis>.vxe-cell{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-footer--column.col--ellipsis>.vxe-cell .vxe-cell--item{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

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

@@ -27,8 +27,14 @@ var props = {
   size: String,
   span: [String, Number],
   align: String,
-  titleAlign: String,
-  titleWidth: [String, Number],
+  titleAlign: {
+    type: String,
+    default: null
+  },
+  titleWidth: {
+    type: [String, Number],
+    default: null
+  },
   titleColon: {
     type: Boolean,
     default: null
@@ -69,6 +75,10 @@ var renderItem = function renderItem(h, _vm, item, slots) {
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
+      allTitleAlign = _vm.titleAlign,
+      allTitleWidth = _vm.titleWidth,
+      allTitleColon = _vm.titleColon,
+      allTitleAsterisk = _vm.titleAsterisk,
       allTitleOverflow = _vm.titleOverflow;
   var title = item.title,
       folding = item.folding,
@@ -84,8 +94,10 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   var itemClassName = compConf ? compConf.itemClassName : '';
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
-  var titleAlign = item.titleAlign || _vm.titleAlign;
-  var titleWidth = item.titleWidth || _vm.titleWidth;
+  var titleAlign = _xeUtils.default.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+  var titleWidth = _xeUtils.default.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+  var titleColon = _xeUtils.default.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+  var titleAsterisk = _xeUtils.default.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
   var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var showEllipsis = itemOverflow === 'ellipsis';
   var showTitle = itemOverflow === 'title';
@@ -135,6 +147,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   return h('div', {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
       'is--title': title,
+      'is--colon': titleColon,
+      'is--asterisk': titleAsterisk,
       'is--required': isRequired,
       'is--hidden': folding && collapseAll,
       'is--active': (0, _util.isActivetem)(_vm, item),

package/lib/form/src/form-item.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var props={title:String,field:String,size:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visible:{type:Boolean,default:null},visibleMethod:Function,folding:Boolean,collapseNode:Boolean,itemRender:Object},watch={};Object.keys(props).forEach(function(t){watch[t]=function(e){this.itemConfig.update(t,e)}});var renderItem=function(e,t,i,l){var n,r=t._e,o=t.rules,a=t.data,s=t.collapseAll,u=t.validOpts,d=t.titleOverflow,f=i.title,c=i.folding,m=i.visible,v=i.field,g=i.collapseNode,p=i.itemRender,_=i.showError,x=i.errRule,h=i.className,b=i.titleOverflow,N=(0,_utils.isEnableConf)(p)?_vXETable.default.renderer.get(p.name):null,S=N?N.itemClassName:"",q=i.span||t.span,O=i.align||t.align,y=i.titleAlign||t.titleAlign,I=i.titleWidth||t.titleWidth,w=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?d:b,d="title"===w,b=!0===w||"tooltip"===w,w=d||b||"ellipsis"===w,C={data:a,field:v,property:v,item:i,$form:t};if(!1===m)return r();!o||(F=o[v])&&(n=F.some(function(e){return e.required}));var F=[];l&&l.default?F=t.callSlot(l.default,C,e):N&&N.renderItemContent?F=(0,_vn.getSlotVNs)(N.renderItemContent.call(t,e,p,C)):N&&N.renderItem?F=(0,_vn.getSlotVNs)(N.renderItem.call(t,e,p,C)):v&&(F=["".concat(_xeUtils.default.get(a,v))]);b=b?{mouseenter:function(e){t.triggerTitleTipEvent(e,C)},mouseleave:t.handleTitleTipLeaveEvent}:{};return e("div",{class:["vxe-form--item",i.id,q?"vxe-col--".concat(q," is--span"):"",h?_xeUtils.default.isFunction(h)?h(C):h:"",S?_xeUtils.default.isFunction(S)?S(C):S:"",{"is--title":f,"is--required":n,"is--hidden":c&&s,"is--active":(0,_util.isActivetem)(t,i),"is--error":_}]},[e("div",{class:"vxe-form--item-inner"},[f||l&&l.title?e("div",{class:["vxe-form--item-title",y?"align--".concat(y):null,{"is--ellipsis":w}],style:I?{width:isNaN(I)?I:"".concat(I,"px")}:null,attrs:{title:d?(0,_utils.getFuncText)(f):null},on:b},(0,_render.renderTitle)(e,t,i)):null,e("div",{class:["vxe-form--item-content",O?"align--".concat(O):null]},F.concat([g?e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},s?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",s?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,x&&u.showMessage?e("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:"".concat(x.maxWidth,"px")}:null},x.message):null]))])])},_default={name:"VxeFormItem",props:props,inject:{$xeform:{default:null},$xeformgather:{default:null}},provide:function(){return{$xeformitem:this,$xeformiteminfo:this}},data:function(){return{itemConfig:null}},watch:watch,mounted:function(){(0,_util.assemItem)(this)},created:function(){this.itemConfig=(0,_util.createItem)(this.$xeform,this)},destroyed:function(){(0,_util.destroyItem)(this)},render:function(e){var t=this.$xeform;return t&&t.customLayout?renderItem(e,t,this.itemConfig,this.$scopedSlots):e("div")}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var props={title:String,field:String,size:String,span:[String,Number],align:String,titleAlign:{type:String,default:null},titleWidth:{type:[String,Number],default:null},titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visible:{type:Boolean,default:null},visibleMethod:Function,folding:Boolean,collapseNode:Boolean,itemRender:Object},watch={};Object.keys(props).forEach(function(t){watch[t]=function(e){this.itemConfig.update(t,e)}});var renderItem=function(e,t,l,i){var n,r=t._e,o=t.rules,s=t.data,a=t.collapseAll,u=t.validOpts,d=t.titleAlign,f=t.titleWidth,c=t.titleColon,m=t.titleAsterisk,v=t.titleOverflow,g=l.title,p=l.folding,_=l.visible,x=l.field,h=l.collapseNode,N=l.itemRender,q=l.showError,b=l.errRule,y=l.className,S=l.titleOverflow,C=(0,_utils.isEnableConf)(N)?_vXETable.default.renderer.get(N.name):null,O=C?C.itemClassName:"",I=l.span||t.span,U=l.align||t.align,w=_xeUtils.default.eqNull(l.titleAlign)?d:l.titleAlign,d=_xeUtils.default.eqNull(l.titleWidth)?f:l.titleWidth,f=_xeUtils.default.eqNull(l.titleColon)?c:l.titleColon,c=_xeUtils.default.eqNull(l.titleAsterisk)?m:l.titleAsterisk,m=_xeUtils.default.isUndefined(S)||_xeUtils.default.isNull(S)?v:S,v="title"===m,S=!0===m||"tooltip"===m,m=v||S||"ellipsis"===m,A={data:s,field:x,property:x,item:l,$form:t};if(!1===_)return r();!o||(F=o[x])&&(n=F.some(function(e){return e.required}));var F=[];i&&i.default?F=t.callSlot(i.default,A,e):C&&C.renderItemContent?F=(0,_vn.getSlotVNs)(C.renderItemContent.call(t,e,N,A)):C&&C.renderItem?F=(0,_vn.getSlotVNs)(C.renderItem.call(t,e,N,A)):x&&(F=["".concat(_xeUtils.default.get(s,x))]);S=S?{mouseenter:function(e){t.triggerTitleTipEvent(e,A)},mouseleave:t.handleTitleTipLeaveEvent}:{};return e("div",{class:["vxe-form--item",l.id,I?"vxe-col--".concat(I," is--span"):"",y?_xeUtils.default.isFunction(y)?y(A):y:"",O?_xeUtils.default.isFunction(O)?O(A):O:"",{"is--title":g,"is--colon":f,"is--asterisk":c,"is--required":n,"is--hidden":p&&a,"is--active":(0,_util.isActivetem)(t,l),"is--error":q}]},[e("div",{class:"vxe-form--item-inner"},[g||i&&i.title?e("div",{class:["vxe-form--item-title",w?"align--".concat(w):null,{"is--ellipsis":m}],style:d?{width:isNaN(d)?d:"".concat(d,"px")}:null,attrs:{title:v?(0,_utils.getFuncText)(g):null},on:S},(0,_render.renderTitle)(e,t,l)):null,e("div",{class:["vxe-form--item-content",U?"align--".concat(U):null]},F.concat([h?e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},a?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",a?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,b&&u.showMessage?e("div",{class:"vxe-form--item-valid",style:b.maxWidth?{width:"".concat(b.maxWidth,"px")}:null},b.message):null]))])])},_default={name:"VxeFormItem",props:props,inject:{$xeform:{default:null},$xeformgather:{default:null}},provide:function(){return{$xeformitem:this,$xeformiteminfo:this}},data:function(){return{itemConfig:null}},watch:watch,mounted:function(){(0,_util.assemItem)(this)},created:function(){this.itemConfig=(0,_util.createItem)(this.$xeform,this)},destroyed:function(){(0,_util.destroyItem)(this)},render:function(e){var t=this.$xeform;return t&&t.customLayout?renderItem(e,t,this.itemConfig,this.$scopedSlots):e("div")}};exports.default=_default;

package/lib/form/src/render.js

@@ -11,6 +11,8 @@ var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
 var _utils = require("../../tools/utils");
 
+var _vn = require("../../tools/vn");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -64,7 +66,7 @@ function renderTitle(h, _vm, item) {
 
   titVNs.push(h('span', {
     class: 'vxe-form--item-title-label'
-  }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
+  }, compConf && compConf.renderItemTitle ? (0, _vn.getSlotVNs)(compConf.renderItemTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
   contVNs.push(h('div', {
     class: 'vxe-form--item-title-content'
   }, titVNs));

package/lib/form/src/render.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderTitle=renderTitle;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,n=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,r)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function renderPrefixIcon(e,t){return e("span",{class:"vxe-form--item-title-prefix"},[e("i",{class:t.icon||_conf.default.icon.FORM_PREFIX})])}function renderSuffixIcon(e,t){return e("span",{class:"vxe-form--item-title-suffix"},[e("i",{class:t.icon||_conf.default.icon.FORM_SUFFIX})])}function renderTitle(e,t,r){var n=t.data,o=t.tooltipOpts,i=r.slots,c=r.field,l=r.itemRender,s=r.titlePrefix,u=r.titleSuffix,f=(0,_utils.isEnableConf)(l)?_vXETable.default.renderer.get(l.name):null,a={data:n,field:c,property:c,item:r,$form:t},n=[],c=[];s&&c.push(s.content||s.message?e("vxe-tooltip",{props:_objectSpread(_objectSpread(_objectSpread({},o),s),{},{content:(0,_utils.getFuncText)(s.content||s.message)})},[renderPrefixIcon(e,s)]):renderPrefixIcon(e,s)),c.push(e("span",{class:"vxe-form--item-title-label"},f&&f.renderItemTitle?f.renderItemTitle(l,a):i&&i.title?t.callSlot(i.title,a,e):(0,_utils.getFuncText)(r.title))),n.push(e("div",{class:"vxe-form--item-title-content"},c));c=[];return u&&c.push(u.content||u.message?e("vxe-tooltip",{props:_objectSpread(_objectSpread(_objectSpread({},o),s),{},{content:(0,_utils.getFuncText)(u.content||u.message)})},[renderSuffixIcon(e,u)]):renderSuffixIcon(e,u)),n.push(e("div",{class:"vxe-form--item-title-postfix"},c)),n}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderTitle=renderTitle;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,n=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,r)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function renderPrefixIcon(e,t){return e("span",{class:"vxe-form--item-title-prefix"},[e("i",{class:t.icon||_conf.default.icon.FORM_PREFIX})])}function renderSuffixIcon(e,t){return e("span",{class:"vxe-form--item-title-suffix"},[e("i",{class:t.icon||_conf.default.icon.FORM_SUFFIX})])}function renderTitle(e,t,r){var n=t.data,o=t.tooltipOpts,i=r.slots,c=r.field,l=r.itemRender,s=r.titlePrefix,u=r.titleSuffix,f=(0,_utils.isEnableConf)(l)?_vXETable.default.renderer.get(l.name):null,a={data:n,field:c,property:c,item:r,$form:t},n=[],c=[];s&&c.push(s.content||s.message?e("vxe-tooltip",{props:_objectSpread(_objectSpread(_objectSpread({},o),s),{},{content:(0,_utils.getFuncText)(s.content||s.message)})},[renderPrefixIcon(e,s)]):renderPrefixIcon(e,s)),c.push(e("span",{class:"vxe-form--item-title-label"},f&&f.renderItemTitle?(0,_vn.getSlotVNs)(f.renderItemTitle(l,a)):i&&i.title?t.callSlot(i.title,a,e):(0,_utils.getFuncText)(r.title))),n.push(e("div",{class:"vxe-form--item-title-content"},c));c=[];return u&&c.push(u.content||u.message?e("vxe-tooltip",{props:_objectSpread(_objectSpread(_objectSpread({},o),s),{},{content:(0,_utils.getFuncText)(u.content||u.message)})},[renderSuffixIcon(e,u)]):renderSuffixIcon(e,u)),n.push(e("div",{class:"vxe-form--item-title-postfix"},c)),n}