vxe-table 3.5.7 → 3.5.8-beta.0

package/lib/edit/src/mixin.js

@@ -851,7 +851,7 @@ var _default = {
      * 激活行编辑
      */
     _setEditRow: function _setEditRow(row) {
-      return this.setActiveCell(row, _xeUtils.default.find(this.visibleColumn, function (column) {
+      return this.setEditCell(row, _xeUtils.default.find(this.visibleColumn, function (column) {
         return (0, _utils.isEnableConf)(column.editRender);
       }));
     },

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 _,v,w,g=_xeUtils.default.findTree(r,function(e){return t[f]===e[f]},{children:p});g?(_=g.parent,v=g.items,p=c[(0,_util.getRowid)(this,_)],w=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]),v.splice(g.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:v,parent:_,level:w+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(_utils.default.getLog("vxe.error.noTree",["insert"]));var y=-1;if(_xeUtils.default.isNumber(t)?t<o.length&&(y=t):y=o.indexOf(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,[a.indexOf(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 i=this,n=this.afterFullData,r=this.tableFullData,o=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=u.indexOf(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)(i,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(i,e)},d);r&&(r=r.items.splice(r.index,1),_.push(r[0]));e=n.indexOf(e);-1<e&&n.splice(e,1)}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),_.push(t[0]));var i=n.indexOf(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)}),n.splice(i,1))}),f.row&&-1<e.indexOf(f.row)&&this.clearActived(),e.forEach(function(e){e=m.indexOf(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 i.updateCellAreas(),i.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=o.activeMethod,d=n.actived,h=e.row,f=e.column,o=f.editRender,n=e.cell=e.cell||this.getCell(h,f);return(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(o)&&n&&(d.row!==h||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(_objectSpread(_objectSpread({},e),{},{$table:this}))||(s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),d.column&&this.clearActived(t),r="edit-actived",f.renderHeight=n.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===u?l.forEach(function(e){return i._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){i.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((s=r.model).update&&_utils.default.setCellValue(h,r,s.value),this.clearValidate()),f.renderHeight=n.offsetHeight,d.args=e,d.column=f,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<r.indexOf(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=e.row,n=e.column,o=e.cell,l=n.editRender;(0,_utils.isEnableConf)(l)&&(t=_vXETable.default.renderer.get(l.name),e=l.autofocus,l=l.autoselect,(r=!(r=e?o.querySelector(e):r)&&t&&t.autofocus?o.querySelector(t.autofocus):r)?(r.focus(),l?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(i,n))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e){return this.setActiveCell(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=r.indexOf(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 _,v,w,g=_xeUtils.default.findTree(r,function(e){return t[f]===e[f]},{children:p});g?(_=g.parent,v=g.items,p=c[(0,_util.getRowid)(this,_)],w=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]),v.splice(g.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:v,parent:_,level:w+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(_utils.default.getLog("vxe.error.noTree",["insert"]));var y=-1;if(_xeUtils.default.isNumber(t)?t<o.length&&(y=t):y=o.indexOf(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,[a.indexOf(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 i=this,n=this.afterFullData,r=this.tableFullData,o=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=u.indexOf(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)(i,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(i,e)},d);r&&(r=r.items.splice(r.index,1),_.push(r[0]));e=n.indexOf(e);-1<e&&n.splice(e,1)}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),_.push(t[0]));var i=n.indexOf(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)}),n.splice(i,1))}),f.row&&-1<e.indexOf(f.row)&&this.clearActived(),e.forEach(function(e){e=m.indexOf(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 i.updateCellAreas(),i.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=o.activeMethod,d=n.actived,h=e.row,f=e.column,o=f.editRender,n=e.cell=e.cell||this.getCell(h,f);return(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(o)&&n&&(d.row!==h||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(_objectSpread(_objectSpread({},e),{},{$table:this}))||(s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),d.column&&this.clearActived(t),r="edit-actived",f.renderHeight=n.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===u?l.forEach(function(e){return i._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){i.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((s=r.model).update&&_utils.default.setCellValue(h,r,s.value),this.clearValidate()),f.renderHeight=n.offsetHeight,d.args=e,d.column=f,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<r.indexOf(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=e.row,n=e.column,o=e.cell,l=n.editRender;(0,_utils.isEnableConf)(l)&&(t=_vXETable.default.renderer.get(l.name),e=l.autofocus,l=l.autoselect,(r=!(r=e?o.querySelector(e):r)&&t&&t.autofocus?o.querySelector(t.autofocus):r)?(r.focus(),l?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(i,n))},_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=r.indexOf(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/form/src/form-config-item.js

@@ -46,6 +46,10 @@ var VxeFormConfigItem = {
         data = $xeform.data,
         collapseAll = $xeform.collapseAll,
         validOpts = $xeform.validOpts,
+        allTitleAlign = $xeform.titleAlign,
+        allTitleWidth = $xeform.titleWidth,
+        allTitleColon = $xeform.titleColon,
+        allTitleAsterisk = $xeform.titleAsterisk,
         allTitleOverflow = $xeform.titleOverflow;
     var slots = item.slots,
         title = item.title,
@@ -63,10 +67,10 @@ var VxeFormConfigItem = {
     var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
-    var titleAlign = item.titleAlign || $xeform.titleAlign;
-    var titleWidth = item.titleWidth || $xeform.titleWidth;
-    var titleColon = item.titleColon === null ? $xeform.titleColon : item.titleColon;
-    var titleAsterisk = item.titleAsterisk === null ? $xeform.titleAsterisk : item.titleAsterisk;
+    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 itemVisibleMethod = visibleMethod;
     var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
     var showEllipsis = itemOverflow === 'ellipsis';
@@ -126,7 +130,7 @@ var VxeFormConfigItem = {
     } else if (compConf && compConf.renderItem) {
       contentVNs = compConf.renderItem.call($xeform, h, itemRender, params);
     } else if (field) {
-      contentVNs = ["".concat(_xeUtils.default.get(data, field))];
+      contentVNs = [_xeUtils.default.toValueString(_xeUtils.default.get(data, field))];
     }
 
     var ons = showTooltip ? {

package/lib/form/src/form-config-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"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var VxeFormConfigItem={name:"VxeFormConfigItem",props:{itemConfig:Object},inject:{$xeform:{default:null}},provide:function(){return{$xeformgather:null,$xeformiteminfo:{itemConfig:this.itemConfig}}},render:function(i){var e,t=this._e,l=this.$xeform,n=this.itemConfig,r=l.rules,o=l.data,s=l.collapseAll,a=l.validOpts,u=l.titleOverflow,d=n.slots,f=n.title,c=n.folding,m=n.visible,v=n.visibleMethod,x=n.field,g=n.collapseNode,p=n.itemRender,_=n.showError,h=n.errRule,C=n.className,b=n.titleOverflow,q=n.children,F=(0,_utils.isEnableConf)(p)?_vXETable.default.renderer.get(p.name):null,I=n.span||l.span,O=n.align||l.align,M=n.titleAlign||l.titleAlign,N=n.titleWidth||l.titleWidth,R=(null===n.titleColon?l:n).titleColon,T=(null===n.titleAsterisk?l:n).titleAsterisk,U=v,v=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?u:b,u="title"===v,b=!0===v||"tooltip"===v,v=u||b||"ellipsis"===v,w={data:o,field:x,property:x,item:n,$form:l};if(!1===m)return t();if(q&&0<q.length){q=n.children.map(function(e,t){return i(VxeFormConfigItem,{key:t,props:{itemConfig:e}})});return q.length?i("div",{class:["vxe-form--gather vxe-row",n.id,I?"vxe-col--".concat(I," is--span"):"",C?_xeUtils.default.isFunction(C)?C(w):C:""]},q):t()}!U&&F&&F.itemVisibleMethod&&(U=F.itemVisibleMethod),!r||(E=r[x])&&(e=E.some(function(e){return e.required}));var E=[];d&&d.default?E=l.callSlot(d.default,w,i):F&&F.renderItemContent?E=F.renderItemContent.call(l,i,p,w):F&&F.renderItem?E=F.renderItem.call(l,i,p,w):x&&(E=["".concat(_xeUtils.default.get(o,x))]);b=b?{mouseenter:function(e){l.triggerTitleTipEvent(e,w)},mouseleave:l.handleTitleTipLeaveEvent}:{};return i("div",{class:["vxe-form--item",n.id,I?"vxe-col--".concat(I," is--span"):null,C?_xeUtils.default.isFunction(C)?C(w):C:"",{"is--title":f,"is--colon":R,"is--asterisk":T,"is--required":e,"is--hidden":c&&s,"is--active":!U||U(w),"is--error":_}],props:{itemConfig:n},key:n.id},[i("div",{class:"vxe-form--item-inner"},[f||d&&d.title?i("div",{class:["vxe-form--item-title",M?"align--".concat(M):null,{"is--ellipsis":v}],style:N?{width:isNaN(N)?N:"".concat(N,"px")}:null,attrs:{title:u?(0,_utils.getFuncText)(f):null},on:b},(0,_render.renderTitle)(i,l,n)):null,i("div",{class:["vxe-form--item-content",O?"align--".concat(O):null]},E.concat([g?i("div",{class:"vxe-form--item-trigger-node",on:{click:l.toggleCollapseEvent}},[i("span",{class:"vxe-form--item-trigger-text"},s?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),i("i",{class:["vxe-form--item-trigger-icon",s?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,h&&a.showMessage?i("div",{class:"vxe-form--item-valid",style:h.maxWidth?{width:"".concat(h.maxWidth,"px")}:null},h.content):null]))])])}},_default=VxeFormConfigItem;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"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var VxeFormConfigItem={name:"VxeFormConfigItem",props:{itemConfig:Object},inject:{$xeform:{default:null}},provide:function(){return{$xeformgather:null,$xeformiteminfo:{itemConfig:this.itemConfig}}},render:function(i){var e,t=this._e,l=this.$xeform,n=this.itemConfig,r=l.rules,o=l.data,s=l.collapseAll,a=l.validOpts,u=l.titleAlign,d=l.titleWidth,f=l.titleColon,c=l.titleAsterisk,m=l.titleOverflow,x=n.slots,v=n.title,g=n.folding,_=n.visible,p=n.visibleMethod,h=n.field,C=n.collapseNode,q=n.itemRender,U=n.showError,N=n.errRule,b=n.className,F=n.titleOverflow,I=n.children,O=(0,_utils.isEnableConf)(q)?_vXETable.default.renderer.get(q.name):null,M=n.span||l.span,R=n.align||l.align,T=_xeUtils.default.eqNull(n.titleAlign)?u:n.titleAlign,u=_xeUtils.default.eqNull(n.titleWidth)?d:n.titleWidth,d=_xeUtils.default.eqNull(n.titleColon)?f:n.titleColon,f=_xeUtils.default.eqNull(n.titleAsterisk)?c:n.titleAsterisk,c=p,p=_xeUtils.default.isUndefined(F)||_xeUtils.default.isNull(F)?m:F,m="title"===p,F=!0===p||"tooltip"===p,p=m||F||"ellipsis"===p,k={data:o,field:h,property:h,item:n,$form:l};if(!1===_)return t();if(I&&0<I.length){I=n.children.map(function(e,t){return i(VxeFormConfigItem,{key:t,props:{itemConfig:e}})});return I.length?i("div",{class:["vxe-form--gather vxe-row",n.id,M?"vxe-col--".concat(M," is--span"):"",b?_xeUtils.default.isFunction(b)?b(k):b:""]},I):t()}!c&&O&&O.itemVisibleMethod&&(c=O.itemVisibleMethod),!r||(w=r[h])&&(e=w.some(function(e){return e.required}));var w=[];x&&x.default?w=l.callSlot(x.default,k,i):O&&O.renderItemContent?w=O.renderItemContent.call(l,i,q,k):O&&O.renderItem?w=O.renderItem.call(l,i,q,k):h&&(w=[_xeUtils.default.toValueString(_xeUtils.default.get(o,h))]);F=F?{mouseenter:function(e){l.triggerTitleTipEvent(e,k)},mouseleave:l.handleTitleTipLeaveEvent}:{};return i("div",{class:["vxe-form--item",n.id,M?"vxe-col--".concat(M," is--span"):null,b?_xeUtils.default.isFunction(b)?b(k):b:"",{"is--title":v,"is--colon":d,"is--asterisk":f,"is--required":e,"is--hidden":g&&s,"is--active":!c||c(k),"is--error":U}],props:{itemConfig:n},key:n.id},[i("div",{class:"vxe-form--item-inner"},[v||x&&x.title?i("div",{class:["vxe-form--item-title",T?"align--".concat(T):null,{"is--ellipsis":p}],style:u?{width:isNaN(u)?u:"".concat(u,"px")}:null,attrs:{title:m?(0,_utils.getFuncText)(v):null},on:F},(0,_render.renderTitle)(i,l,n)):null,i("div",{class:["vxe-form--item-content",R?"align--".concat(R):null]},w.concat([C?i("div",{class:"vxe-form--item-trigger-node",on:{click:l.toggleCollapseEvent}},[i("span",{class:"vxe-form--item-trigger-text"},s?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),i("i",{class:["vxe-form--item-trigger-icon",s?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,N&&a.showMessage?i("div",{class:"vxe-form--item-valid",style:N.maxWidth?{width:"".concat(N.maxWidth,"px")}:null},N.content):null]))])])}},_default=VxeFormConfigItem;exports.default=_default;

package/lib/form/src/util.js

@@ -36,6 +36,8 @@ var ItemConfig = /*#__PURE__*/function () {
       align: item.align,
       titleAlign: item.titleAlign,
       titleWidth: item.titleWidth,
+      titleColon: item.titleColon,
+      titleAsterisk: item.titleAsterisk,
       titlePrefix: item.titlePrefix,
       titleSuffix: item.titleSuffix,
       titleOverflow: item.titleOverflow,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.getItemConfig=getItemConfig,exports.handleFieldOrItem=void 0,exports.isItem=isItem;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_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 i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var ItemConfig=function(){function i(e,t){_classCallCheck(this,i),Object.assign(this,{id:_xeUtils.default.uniqueId("item_"),title:t.title,field:t.field,span:t.span,align:t.align,titleAlign:t.titleAlign,titleWidth:t.titleWidth,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,titleOverflow:t.titleOverflow,resetValue:t.resetValue,visible:t.visible,visibleMethod:t.visibleMethod,folding:t.folding,collapseNode:t.collapseNode,className:t.className,itemRender:t.itemRender,showError:!1,errRule:null,slots:t.slots,children:[]}),"development"!==process.env.NODE_ENV||(t=t.itemRender?_vXETable.default.renderer.get(t.itemRender.name):null)&&!t.renderItemContent&&t.renderItem&&(0,_log.warnLog)("vxe.error.delProp",["item-render.renderItem","item-render.renderItemContent"])}return _createClass(i,[{key:"update",value:function(e,t){this[e]=t}}]),i}();function isItem(e){return e instanceof ItemConfig}function getItemConfig(e,t,i){return isItem(t)?t:new ItemConfig(e,t,i)}var handleFieldOrItem=function(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null};function createItem(e,t){return getItemConfig(e,t)}function destroyItem(e){var t=e.$xeform,i=e.itemConfig,t=_xeUtils.default.findTree(t.staticItems,function(e){return e===i});t&&t.items.splice(t.index,1)}function assemItem(e){var t=e.$el,i=e.$xeform,r=e.$xeformgather,n=e.itemConfig,l=r?r.itemConfig:null;n.slots=e.$scopedSlots,l?(l.children||(l.children=[]),l.children.splice([].indexOf.call(r.$el.children,t),0,n)):i.staticItems.splice([].indexOf.call(i.$refs.hideItem.children,t),0,n)}exports.handleFieldOrItem=handleFieldOrItem;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.getItemConfig=getItemConfig,exports.handleFieldOrItem=void 0,exports.isItem=isItem;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_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 i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var ItemConfig=function(){function i(e,t){_classCallCheck(this,i),Object.assign(this,{id:_xeUtils.default.uniqueId("item_"),title:t.title,field:t.field,span:t.span,align:t.align,titleAlign:t.titleAlign,titleWidth:t.titleWidth,titleColon:t.titleColon,titleAsterisk:t.titleAsterisk,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,titleOverflow:t.titleOverflow,resetValue:t.resetValue,visible:t.visible,visibleMethod:t.visibleMethod,folding:t.folding,collapseNode:t.collapseNode,className:t.className,itemRender:t.itemRender,showError:!1,errRule:null,slots:t.slots,children:[]}),"development"!==process.env.NODE_ENV||(t=t.itemRender?_vXETable.default.renderer.get(t.itemRender.name):null)&&!t.renderItemContent&&t.renderItem&&(0,_log.warnLog)("vxe.error.delProp",["item-render.renderItem","item-render.renderItemContent"])}return _createClass(i,[{key:"update",value:function(e,t){this[e]=t}}]),i}();function isItem(e){return e instanceof ItemConfig}function getItemConfig(e,t,i){return isItem(t)?t:new ItemConfig(e,t,i)}var handleFieldOrItem=function(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null};function createItem(e,t){return getItemConfig(e,t)}function destroyItem(e){var t=e.$xeform,i=e.itemConfig,t=_xeUtils.default.findTree(t.staticItems,function(e){return e===i});t&&t.items.splice(t.index,1)}function assemItem(e){var t=e.$el,i=e.$xeform,r=e.$xeformgather,l=e.itemConfig,n=r?r.itemConfig:null;l.slots=e.$scopedSlots,n?(n.children||(n.children=[]),n.children.splice([].indexOf.call(r.$el.children,t),0,l)):i.staticItems.splice([].indexOf.call(i.$refs.hideItem.children,t),0,l)}exports.handleFieldOrItem=handleFieldOrItem;

package/lib/index.umd.js

@@ -8804,7 +8804,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.7-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.7", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10073,7 +10073,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.7-beta.2",
+  version: "3.5.7",
   reg: reg,
   use: use,
   setup: setup,
@@ -22895,7 +22895,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
      * 激活行编辑
      */
     _setEditRow: function _setEditRow(row) {
-      return this.setActiveCell(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.find(this.visibleColumn, function (column) {
+      return this.setEditCell(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.find(this.visibleColumn, function (column) {
         return isEnableConf(column.editRender);
       }));
     },
@@ -36534,6 +36534,8 @@ var util_ItemConfig = /*#__PURE__*/function () {
       align: item.align,
       titleAlign: item.titleAlign,
       titleWidth: item.titleWidth,
+      titleColon: item.titleColon,
+      titleAsterisk: item.titleAsterisk,
       titlePrefix: item.titlePrefix,
       titleSuffix: item.titleSuffix,
       titleOverflow: item.titleOverflow,
@@ -36718,6 +36720,10 @@ var VxeFormConfigItem = {
         data = $xeform.data,
         collapseAll = $xeform.collapseAll,
         validOpts = $xeform.validOpts,
+        allTitleAlign = $xeform.titleAlign,
+        allTitleWidth = $xeform.titleWidth,
+        allTitleColon = $xeform.titleColon,
+        allTitleAsterisk = $xeform.titleAsterisk,
         allTitleOverflow = $xeform.titleOverflow;
     var slots = item.slots,
         title = item.title,
@@ -36735,10 +36741,10 @@ var VxeFormConfigItem = {
     var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
-    var titleAlign = item.titleAlign || $xeform.titleAlign;
-    var titleWidth = item.titleWidth || $xeform.titleWidth;
-    var titleColon = item.titleColon === null ? $xeform.titleColon : item.titleColon;
-    var titleAsterisk = item.titleAsterisk === null ? $xeform.titleAsterisk : item.titleAsterisk;
+    var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+    var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+    var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+    var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
     var itemVisibleMethod = visibleMethod;
     var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
     var showEllipsis = itemOverflow === 'ellipsis';
@@ -36798,7 +36804,7 @@ var VxeFormConfigItem = {
     } else if (compConf && compConf.renderItem) {
       contentVNs = compConf.renderItem.call($xeform, h, itemRender, params);
     } else if (field) {
-      contentVNs = ["".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field))];
+      contentVNs = [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field))];
     }
 
     var ons = showTooltip ? {