vxe-table 3.3.14-beta.0 → 3.3.16

package/lib/v-x-e-table/src/renderer.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderer=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_tools=require("../../tools");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var defaultCompProps={transfer:!0},componentDefaultModelProp="value";function isEmptyValue(e){return null==e||""===e}function getChangeEvent(e){switch(e.name){case"input":case"textarea":case"$input":case"$textarea":return"input"}return"change"}function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,n){var r=t.dateConfig,r=void 0===r?{}:r;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,_conf.default.i18n("vxe.input.date.labelFormat.".concat(t.type)))}function getDefaultComponentName(e){e=e.name;return"vxe-".concat(e.replace("$",""))}function handleConfirmFilter(e,t,n){e.$panel.changeOption({},t,n)}function getNativeAttrs(e){var t=e.name,e=e.attrs;return e="input"===t?Object.assign({type:"text"},e):e}function getInputImmediateModel(e){var t=e.name,n=e.immediate,e=e.props;if(n)return n;if("$input"!==t)return"input"!==t&&"textarea"!==t&&"$textarea"!==t;e=(e||{}).type;return!(!e||"text"===e||"number"===e||"integer"===e||"float"===e)}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellEditProps(e,t,n,r){t=t.$table.vSize;return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},t?{size:t}:{},defaultCompProps,r,e.props,_defineProperty({},componentDefaultModelProp,n))}function getFilterProps(e,t,n,r){t=t.$table.vSize;return _xeUtils.default.assign(t?{size:t}:{},defaultCompProps,r,e.props,_defineProperty({},componentDefaultModelProp,n))}function getItemProps(e,t,n,r){t=t.$form.vSize;return _xeUtils.default.assign(t?{size:t}:{},defaultCompProps,r,e.props,_defineProperty({},componentDefaultModelProp,n))}function getCellLabelVNs(e,t,n,r){t=t.placeholder;return[e("span",{class:"vxe-cell--label"},t&&isEmptyValue(r)?[e("span",{class:"vxe-cell--placeholder"},_tools.UtilTools.formatText(_tools.UtilTools.getFuncText(t),1))]:_tools.UtilTools.formatText(r,1))]}function getNativeOns(e,o){var e=e.nativeEvents,t={};return _xeUtils.default.objectEach(e,function(r,e){t[e]=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];r.apply(void 0,[o].concat(t))}}),t}function getOns(e,o,t,r){var n=e.name,a=e.events,l="input",i=getChangeEvent(e),u=i===l,d={};return _xeUtils.default.objectEach(a,function(r,e){d[e]=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];r.apply(void 0,[o].concat(t))}}),t&&(d[l]=function(e){t("$input"===n||"$textarea"===n?e.value:e),a&&a[l]&&a[l](o,e),u&&r&&r(e)}),!u&&r&&(d[i]=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];r.apply(void 0,t),a&&a[i]&&a[i].apply(a,[o].concat(t))}),d}function getEditOns(e,t){var n=t.$table,r=t.row,o=t.column,a=e.name,l=o.model,i=isImmediateCell(e,t);return getOns(e,t,function(e){i?_tools.UtilTools.setCellValue(r,o,e):(l.update=!0,l.value=e)},function(e){i||"$input"!==a&&"$textarea"!==a?n.updateStatus(t):n.updateStatus(t,e.value)})}function getFilterOns(e,t,n){return getOns(e,t,function(e){n.data=e},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getOns(e,t,function(e){_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function getNativeEditOns(t,n){var r=n.$table,o=n.row,a=n.column,l=a.model;return getOns(t,n,function(e){e=e.target.value;isImmediateCell(t,n)?_tools.UtilTools.setCellValue(o,a,e):(l.update=!0,l.value=e)},function(e){e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getOns(e,t,function(e){n.data=e.target.value},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getOns(e,t,function(e){e=e.target.value;_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function nativeEditRender(e,t,n){var r=n.row,o=n.column,a=t.name,l=getNativeAttrs(t),o=isImmediateCell(t,n)?_tools.UtilTools.getCellValue(r,o):o.model.value;return[e(a,{class:"vxe-default-".concat(a),attrs:l,domProps:{value:o},on:getNativeEditOns(t,n)})]}function defaultEditRender(e,t,n){var r=n.row,o=n.column,o=_tools.UtilTools.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,o),on:getEditOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonEditRender(e,t,n){return[e("vxe-button",{props:getCellEditProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonsEditRender(t,e,n){return e.children.map(function(e){return defaultButtonEditRender(t,e,n)[0]})}function renderNativeOptgroups(n,r,o,a){var e=r.optionGroups,t=r.optionGroupProps,t=void 0===t?{}:t,l=t.options||"options",i=t.label||"label";return e.map(function(e,t){return n("optgroup",{key:t,domProps:{label:e[i]}},a(n,e[l],r,o))})}function renderNativeOptions(n,e,t,r){var o=t.optionProps,a=void 0===o?{}:o,l=r.row,o=r.column,i=a.label||"label",u=a.value||"value",d=a.disabled||"disabled",s=isImmediateCell(t,r)?_tools.UtilTools.getCellValue(l,o):o.model.value;return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[u],disabled:e[d]},domProps:{selected:e[u]==s}},e[i])})}function nativeFilterRender(n,r,o){var e=o.column,a=r.name,l=getNativeAttrs(r);return e.filters.map(function(e,t){return n(a,{key:t,class:"vxe-default-".concat(a),attrs:l,domProps:{value:e.data},on:getNativeFilterOns(r,o,e)})})}function defaultFilterRender(r,o,a){return a.column.filters.map(function(e,t){var n=e.data;return r(getDefaultComponentName(o),{key:t,props:getFilterProps(o,o,n),on:getFilterOns(o,a,e)})})}function handleFilterMethod(e){var t=e.option,n=e.row,e=e.column,t=t.data;return _xeUtils.default.get(n,e.property)==t}function nativeSelectEditRender(e,t,n){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeEditOns(t,n)},t.optionGroups?renderNativeOptgroups(e,t,n,renderNativeOptions):renderNativeOptions(e,t.options,t,n))]}function defaultSelectEditRender(e,t,n){var r=n.row,o=n.column,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,o=_tools.UtilTools.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,o,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,n)})]}function getSelectCellValue(e,t){var r,n=t.row,o=t.column,a=e.props,t=void 0===a?{}:a,l=e.options,i=e.optionGroups,a=e.optionProps,a=void 0===a?{}:a,e=e.optionGroupProps,u=void 0===e?{}:e,o=_xeUtils.default.get(n,o.property),d=a.label||"label",s=a.value||"value";return isEmptyValue(o)?null:_xeUtils.default.map(t.multiple?o:[o],i?function(t){for(var e=u.options||"options",n=0;n<i.length&&!(r=_xeUtils.default.find(i[n][e],function(e){return e[s]==t}));n++);return r?r[d]:t}:function(t){return(r=_xeUtils.default.find(l,function(e){return e[s]==t}))?r[d]:t}).join(", ")}function nativeItemRender(e,t,n){var r=n.data,o=n.property,a=t.name,l=getNativeAttrs(t),o=_xeUtils.default.get(r,o);return[e(a,{class:"vxe-default-".concat(a),attrs:l,domProps:!l||"input"!==a||"submit"!==l.type&&"reset"!==l.type?{value:o}:null,on:getNativeItemOns(t,n)})]}function defaultItemRender(e,t,n){var r=n.data,o=n.property,o=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,o),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonItemRender(e,t,n){return[e("vxe-button",{props:getItemProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonsItemRender(t,e,n){return e.children.map(function(e){return defaultButtonItemRender(t,e,n)[0]})}function renderNativeFormOptions(n,e,t,r){var o=r.data,r=r.property,t=t.optionProps,t=void 0===t?{}:t,a=t.label||"label",l=t.value||"value",i=t.disabled||"disabled",u=_xeUtils.default.get(o,r);return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[l],disabled:e[i]},domProps:{selected:e[l]==u}},e[a])})}function handleExportSelectMethod(e){var t=e.row,n=e.column;return e.options.original?_tools.UtilTools.getCellValue(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function defaultFormItemRadioAndCheckboxRender(n,e,t){var r=e.options,o=e.optionProps,a=void 0===o?{}:o,l=t.data,o=t.property,i=a.label||"label",u=a.value||"value",d=a.disabled||"disabled",o=_xeUtils.default.get(l,o),s=getDefaultComponentName(e);return r?[n("".concat(s,"-group"),{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)},r.map(function(e,t){return n(s,{key:t,props:{label:e[u],content:e[i],disabled:e[d]}})}))]:[n(s,{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)})]}var renderMap={input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,filterMethod:handleFilterMethod,renderItemContent:nativeItemRender},textarea:{autofocus:"textarea",renderEdit:nativeEditRender,renderItemContent:nativeItemRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderFilter:function(n,r,o){return o.column.filters.map(function(e,t){return n("select",{key:t,class:"vxe-default-select",attrs:getNativeAttrs(r),on:getNativeFilterOns(r,o,e)},r.optionGroups?renderNativeOptgroups(n,r,o,renderNativeOptions):renderNativeOptions(n,r.options,r,o))})},filterMethod:handleFilterMethod,renderItemContent:function(e,t,n){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeItemOns(t,n)},t.optionGroups?renderNativeOptgroups(e,t,n,renderNativeFormOptions):renderNativeFormOptions(e,t.options,t,n))]},cellExportMethod:handleExportSelectMethod},$input:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell:function(e,t,n){var r=t.props,o=void 0===r?{}:r,a=n.row,r=n.column,l=o.digits||_conf.default.input.digits,i=_xeUtils.default.get(a,r.property);if(i)switch(o.type){case"date":case"week":case"month":case"year":i=getLabelFormatDate(i,o);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,l),l)}return getCellLabelVNs(e,t,n,i)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,filterMethod:handleFilterMethod,renderItemContent:defaultItemRender},$textarea:{autofocus:".vxe-textarea--inner",renderItemContent:defaultItemRender},$button:{renderDefault:defaultButtonEditRender,renderItemContent:defaultButtonItemRender},$buttons:{renderDefault:defaultButtonsEditRender,renderItemContent:defaultButtonsItemRender},$select:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderFilter:function(r,o,a){var e=a.column,l=o.options,i=o.optionProps,u=o.optionGroups,d=o.optionGroupProps,s=getNativeOns(o,a);return e.filters.map(function(e,t){var n=e.data;return r(getDefaultComponentName(o),{key:t,props:getFilterProps(o,a,n,{options:l,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(o,a,e),nativeOn:s})})},filterMethod:handleFilterMethod,renderItemContent:function(e,t,n){var r=n.data,o=n.property,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,o=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,o,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]},cellExportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$checkbox:{autofocus:".vxe-checkbox--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$switch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender,renderItemContent:defaultItemRender}},renderer={mixin:function(e){return _xeUtils.default.each(e,function(e,t){return renderer.add(t,e)}),renderer},get:function(e){return renderMap[e]||null},add:function(n,e){var r;return n&&e&&((r=renderMap[n])?("development"===process.env.NODE_ENV&&_xeUtils.default.each(e,function(e,t){_xeUtils.default.eqNull(r[t])||r[t]===e||_tools.UtilTools.warn("vxe.error.coverProp",["Renderer.".concat(n),t])}),Object.assign(r,e)):renderMap[n]=e),renderer},delete:function(e){return delete renderMap[e],renderer}};exports.renderer=renderer;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderer=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_tools=require("../../tools");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var defaultCompProps={transfer:!0},componentDefaultModelProp="value";function isEmptyValue(e){return null==e||""===e}function getChangeEvent(e){switch(e.name){case"input":case"textarea":case"$input":case"$textarea":return"input"}return"change"}function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,n){var r=t.dateConfig,r=void 0===r?{}:r;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,_conf.default.i18n("vxe.input.date.labelFormat.".concat(t.type)))}function getDefaultComponentName(e){e=e.name;return"vxe-".concat(e.replace("$",""))}function handleConfirmFilter(e,t,n){e.$panel.changeOption({},t,n)}function getNativeAttrs(e){var t=e.name,e=e.attrs;return e="input"===t?Object.assign({type:"text"},e):e}function getInputImmediateModel(e){var t=e.name,n=e.immediate,e=e.props;if(n)return n;if("$input"!==t)return"input"!==t&&"textarea"!==t&&"$textarea"!==t;e=(e||{}).type;return!(!e||"text"===e||"number"===e||"integer"===e||"float"===e)}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellEditProps(e,t,n,r){t=t.$table.vSize;return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},t?{size:t}:{},defaultCompProps,r,e.props,_defineProperty({},componentDefaultModelProp,n))}function getFilterProps(e,t,n,r){t=t.$table.vSize;return _xeUtils.default.assign(t?{size:t}:{},defaultCompProps,r,e.props,_defineProperty({},componentDefaultModelProp,n))}function getItemProps(e,t,n,r){t=t.$form.vSize;return _xeUtils.default.assign(t?{size:t}:{},defaultCompProps,r,e.props,_defineProperty({},componentDefaultModelProp,n))}function getCellLabelVNs(e,t,n,r){t=t.placeholder;return[e("span",{class:"vxe-cell--label"},t&&isEmptyValue(r)?[e("span",{class:"vxe-cell--placeholder"},_tools.UtilTools.formatText(_tools.UtilTools.getFuncText(t),1))]:_tools.UtilTools.formatText(r,1))]}function getNativeOns(e,o){var e=e.nativeEvents,t={};return _xeUtils.default.objectEach(e,function(r,e){t[e]=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];r.apply(void 0,[o].concat(t))}}),t}function getOns(e,o,t,r){var n=e.name,a=e.events,l="input",i=getChangeEvent(e),u=i===l,d={};return _xeUtils.default.objectEach(a,function(r,e){d[e]=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];r.apply(void 0,[o].concat(t))}}),t&&(d[l]=function(e){t("$input"===n||"$textarea"===n?e.value:e),a&&a[l]&&a[l](o,e),u&&r&&r(e)}),!u&&r&&(d[i]=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];r.apply(void 0,t),a&&a[i]&&a[i].apply(a,[o].concat(t))}),d}function getEditOns(e,t){var n=t.$table,r=t.row,o=t.column,a=e.name,l=o.model,i=isImmediateCell(e,t);return getOns(e,t,function(e){i?_tools.UtilTools.setCellValue(r,o,e):(l.update=!0,l.value=e)},function(e){i||"$input"!==a&&"$textarea"!==a?n.updateStatus(t):n.updateStatus(t,e.value)})}function getFilterOns(e,t,n){return getOns(e,t,function(e){n.data=e},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getOns(e,t,function(e){_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function getNativeEditOns(t,n){var r=n.$table,o=n.row,a=n.column,l=a.model;return getOns(t,n,function(e){e=e.target.value;isImmediateCell(t,n)?_tools.UtilTools.setCellValue(o,a,e):(l.update=!0,l.value=e)},function(e){e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getOns(e,t,function(e){n.data=e.target.value},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getOns(e,t,function(e){e=e.target.value;_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function nativeEditRender(e,t,n){var r=n.row,o=n.column,a=t.name,l=getNativeAttrs(t),o=isImmediateCell(t,n)?_tools.UtilTools.getCellValue(r,o):o.model.value;return[e(a,{class:"vxe-default-".concat(a),attrs:l,domProps:{value:o},on:getNativeEditOns(t,n)})]}function defaultEditRender(e,t,n){var r=n.row,o=n.column,o=_tools.UtilTools.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,o),on:getEditOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonEditRender(e,t,n){return[e("vxe-button",{props:getCellEditProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonsEditRender(t,e,n){return e.children.map(function(e){return defaultButtonEditRender(t,e,n)[0]})}function renderNativeOptgroups(n,r,o,a){var e=r.optionGroups,t=r.optionGroupProps,t=void 0===t?{}:t,l=t.options||"options",i=t.label||"label";return e.map(function(e,t){return n("optgroup",{key:t,domProps:{label:e[i]}},a(n,e[l],r,o))})}function renderNativeOptions(n,e,t,r){var o=t.optionProps,a=void 0===o?{}:o,l=r.row,o=r.column,i=a.label||"label",u=a.value||"value",d=a.disabled||"disabled",s=isImmediateCell(t,r)?_tools.UtilTools.getCellValue(l,o):o.model.value;return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[u],disabled:e[d]},domProps:{selected:e[u]==s}},e[i])})}function nativeFilterRender(n,r,o){var e=o.column,a=r.name,l=getNativeAttrs(r);return e.filters.map(function(e,t){return n(a,{key:t,class:"vxe-default-".concat(a),attrs:l,domProps:{value:e.data},on:getNativeFilterOns(r,o,e)})})}function defaultFilterRender(r,o,a){return a.column.filters.map(function(e,t){var n=e.data;return r(getDefaultComponentName(o),{key:t,props:getFilterProps(o,o,n),on:getFilterOns(o,a,e)})})}function handleFilterMethod(e){var t=e.option,n=e.row,e=e.column,t=t.data;return _xeUtils.default.get(n,e.property)==t}function nativeSelectEditRender(e,t,n){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeEditOns(t,n)},t.optionGroups?renderNativeOptgroups(e,t,n,renderNativeOptions):renderNativeOptions(e,t.options,t,n))]}function defaultSelectEditRender(e,t,n){var r=n.row,o=n.column,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,o=_tools.UtilTools.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,o,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,n)})]}function getSelectCellValue(e,t){var r,n=t.row,o=t.column,a=e.props,t=void 0===a?{}:a,l=e.options,i=e.optionGroups,a=e.optionProps,a=void 0===a?{}:a,e=e.optionGroupProps,u=void 0===e?{}:e,o=_xeUtils.default.get(n,o.property),d=a.label||"label",s=a.value||"value";return isEmptyValue(o)?null:_xeUtils.default.map(t.multiple?o:[o],i?function(t){for(var e=u.options||"options",n=0;n<i.length&&!(r=_xeUtils.default.find(i[n][e],function(e){return e[s]==t}));n++);return r?r[d]:t}:function(t){return(r=_xeUtils.default.find(l,function(e){return e[s]==t}))?r[d]:t}).join(", ")}function nativeItemRender(e,t,n){var r=n.data,o=n.property,a=t.name,l=getNativeAttrs(t),o=_xeUtils.default.get(r,o);return[e(a,{class:"vxe-default-".concat(a),attrs:l,domProps:!l||"input"!==a||"submit"!==l.type&&"reset"!==l.type?{value:o}:null,on:getNativeItemOns(t,n)})]}function defaultItemRender(e,t,n){var r=n.data,o=n.property,o=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,o),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonItemRender(e,t,n){return[e("vxe-button",{props:getItemProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultButtonsItemRender(t,e,n){return e.children.map(function(e){return defaultButtonItemRender(t,e,n)[0]})}function renderNativeFormOptions(n,e,t,r){var o=r.data,r=r.property,t=t.optionProps,t=void 0===t?{}:t,a=t.label||"label",l=t.value||"value",i=t.disabled||"disabled",u=_xeUtils.default.get(o,r);return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[l],disabled:e[i]},domProps:{selected:e[l]==u}},e[a])})}function handleExportSelectMethod(e){var t=e.row,n=e.column;return e.options.original?_tools.UtilTools.getCellValue(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function defaultFormItemRadioAndCheckboxRender(n,e,t){var r=e.options,o=e.optionProps,a=void 0===o?{}:o,l=t.data,o=t.property,i=a.label||"label",u=a.value||"value",d=a.disabled||"disabled",o=_xeUtils.default.get(l,o),s=getDefaultComponentName(e);return r?[n("".concat(s,"-group"),{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)},r.map(function(e,t){return n(s,{key:t,props:{label:e[u],content:e[i],disabled:e[d]}})}))]:[n(s,{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)})]}var renderMap={input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleFilterMethod,renderItemContent:nativeItemRender},textarea:{autofocus:"textarea",renderEdit:nativeEditRender,renderItemContent:nativeItemRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderFilter:function(n,r,o){return o.column.filters.map(function(e,t){return n("select",{key:t,class:"vxe-default-select",attrs:getNativeAttrs(r),on:getNativeFilterOns(r,o,e)},r.optionGroups?renderNativeOptgroups(n,r,o,renderNativeOptions):renderNativeOptions(n,r.options,r,o))})},defaultFilterMethod:handleFilterMethod,renderItemContent:function(e,t,n){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeItemOns(t,n)},t.optionGroups?renderNativeOptgroups(e,t,n,renderNativeFormOptions):renderNativeFormOptions(e,t.options,t,n))]},cellExportMethod:handleExportSelectMethod},$input:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell:function(e,t,n){var r=t.props,o=void 0===r?{}:r,a=n.row,r=n.column,l=o.digits||_conf.default.input.digits,i=_xeUtils.default.get(a,r.property);if(i)switch(o.type){case"date":case"week":case"month":case"year":i=getLabelFormatDate(i,o);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,l),l)}return getCellLabelVNs(e,t,n,i)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod,renderItemContent:defaultItemRender},$textarea:{autofocus:".vxe-textarea--inner",renderItemContent:defaultItemRender},$button:{renderDefault:defaultButtonEditRender,renderItemContent:defaultButtonItemRender},$buttons:{renderDefault:defaultButtonsEditRender,renderItemContent:defaultButtonsItemRender},$select:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderFilter:function(r,o,a){var e=a.column,l=o.options,i=o.optionProps,u=o.optionGroups,d=o.optionGroupProps,s=getNativeOns(o,a);return e.filters.map(function(e,t){var n=e.data;return r(getDefaultComponentName(o),{key:t,props:getFilterProps(o,a,n,{options:l,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(o,a,e),nativeOn:s})})},defaultFilterMethod:handleFilterMethod,renderItemContent:function(e,t,n){var r=n.data,o=n.property,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,o=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,o,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]},cellExportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$checkbox:{autofocus:".vxe-checkbox--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$switch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender,renderItemContent:defaultItemRender}},renderer={mixin:function(e){return _xeUtils.default.each(e,function(e,t){return renderer.add(t,e)}),renderer},get:function(e){return renderMap[e]||null},add:function(n,e){var r;return n&&e&&((r=renderMap[n])?("development"===process.env.NODE_ENV&&_xeUtils.default.each(e,function(e,t){_xeUtils.default.eqNull(r[t])||r[t]===e||_tools.UtilTools.warn("vxe.error.coverProp",["Renderer.".concat(n),t])}),Object.assign(r,e)):renderMap[n]=e),renderer},delete:function(e){return delete renderMap[e],renderer}};exports.renderer=renderer;

package/lib/v-x-e-table/src/store.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _tools=require("../../tools"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Store=function(){function r(){_classCallCheck(this,r),this.store={}}return _createClass(r,[{key:"mixin",value:function(e){return Object.assign(this.store,e),r}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(e,t){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[e])||this.store[e]===t||_tools.UtilTools.warn("vxe.error.coverProp",[this._name,e])),this.store[e]=t,r}},{key:"delete",value:function(e){return delete this.store[e],r}}]),r}(),_default=Store;exports.default=Store;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _tools=require("../../tools"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var Store=function(){function r(){_classCallCheck(this,r),this.store={}}return _createClass(r,[{key:"mixin",value:function(e){return Object.assign(this.store,e),r}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(e,t){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[e])||this.store[e]===t||_tools.UtilTools.warn("vxe.error.coverProp",[this._name,e])),this.store[e]=t,r}},{key:"delete",value:function(e){return delete this.store[e],r}}]),r}(),_default=Store;exports.default=_default;

package/lib/validator/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Validator=void 0;var _table=_interopRequireDefault(require("../table")),_mixin=_interopRequireDefault(require("./src/mixin")),_vXETable=_interopRequireDefault(require("../v-x-e-table"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Validator={install:function(){_vXETable.default.reg("valid"),_table.default.mixins.push(_mixin.default)}},_default=exports.Validator=Validator;exports.default=Validator;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Validator=void 0;var _table=_interopRequireDefault(require("../table")),_mixin=_interopRequireDefault(require("./src/mixin")),_vXETable=_interopRequireDefault(require("../v-x-e-table"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Validator={install:function(){_vXETable.default.reg("valid"),_table.default.mixins.push(_mixin.default)}},_default=exports.Validator=Validator;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.3.14-beta.0",
+  "version": "3.3.16",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -76,19 +76,19 @@
     "vue-router": "^3.2.0",
     "vue-template-compiler": "^2.6.14",
     "vuex": "^3.4.0",
-    "vxe-table-plugin-antd": "^1.11.2",
+    "vxe-table-plugin-antd": "^1.11.3",
     "vxe-table-plugin-charts": "^1.7.1",
-    "vxe-table-plugin-element": "^1.11.2",
+    "vxe-table-plugin-element": "^1.11.3",
     "vxe-table-plugin-export-pdf": "^1.9.2",
     "vxe-table-plugin-export-xlsx": "^2.2.1",
-    "vxe-table-plugin-iview": "^1.11.3",
-    "vxe-table-plugin-menus": "^2.0.1",
+    "vxe-table-plugin-iview": "^1.11.4",
+    "vxe-table-plugin-menus": "^2.0.2",
     "vxe-table-plugin-renderer": "^1.3.5",
     "vxe-table-plugin-shortcut-key": "^1.5.1",
-    "vxe-table-plugin-virtual-tree": "0.6.10",
+    "vxe-table-plugin-virtual-tree": "0.6.11",
     "xe-ajax": "^4.0.5",
     "xe-clipboard": "^1.10.1",
-    "xe-utils": "^3.3.4",
+    "xe-utils": "^3.4.0",
     "xlsx": "^0.17.0"
   },
   "peerDependencies": {

package/packages/filter/src/mixin.js

@@ -85,7 +85,7 @@ export default {
           // 判断面板不能大于表格高度
           let maxHeight = null
           if (filterHeight >= bodyElem.clientHeight) {
-            maxHeight = bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0)
+            maxHeight = Math.max(40, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0))
           }
           if (column.fixed === 'left') {
             left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth
@@ -111,6 +111,7 @@ export default {
           filterStore.maxHeight = maxHeight
         })
       }
+      this.emitEvent('filter-visible', { column, property: column.property, filterList: this.getCheckedFilters(), visible: filterStore.visible }, evnt)
     },
     _getCheckedFilters () {
       const { tableFullColumn } = this
@@ -150,7 +151,6 @@ export default {
           datas.push(item.data)
         }
       })
-      filterStore.visible = false
       const filterList = this.getCheckedFilters()
       // 如果是服务端筛选，则跳过本地筛选处理
       if (!filterOpts.remote) {

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

@@ -1,4 +1,5 @@
 import VxeFormItem from './form-item'
+import { UtilTools } from '../../tools'
 
 export default {
   name: 'VxeFormGather',
@@ -8,6 +9,15 @@ export default {
       xeformgather: this
     }
   },
+  created () {
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      this.$nextTick(() => {
+        if (this.$xeform && this.$xeform.customLayout) {
+          UtilTools.error('vxe.error.errConflicts', ['custom-layout', '<form-gather ...>'])
+        }
+      })
+    }
+  },
   render (h) {
     return h('div', this.$slots.default)
   }

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

@@ -1,4 +1,9 @@
+import XEUtils from 'xe-utils'
+import GlobalConfig from '../../v-x-e-table/src/conf'
+import VXETable from '../../v-x-e-table'
+import { UtilTools, isEnableConf } from '../../tools'
 import { createItem, destroyItem, assemItem } from './util'
+import { renderTitle } from './render'
 
 const props = {
   title: String,
@@ -27,6 +32,100 @@ Object.keys(props).forEach(name => {
   }
 })
 
+const renderItem = (h, _vm, item, slots) => {
+  const { rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
+  const { title, folding, visible, visibleMethod, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
+  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
+  const span = item.span || _vm.span
+  const align = item.align || _vm.align
+  const titleAlign = item.titleAlign || _vm.titleAlign
+  const titleWidth = item.titleWidth || _vm.titleWidth
+  let itemVisibleMethod = visibleMethod
+  const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
+  const showEllipsis = itemOverflow === 'ellipsis'
+  const showTitle = itemOverflow === 'title'
+  const showTooltip = itemOverflow === true || itemOverflow === 'tooltip'
+  const hasEllipsis = showTitle || showTooltip || showEllipsis
+  const params = { data, property: field, item, $form: _vm }
+  let isRequired
+  if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
+    itemVisibleMethod = compConf.itemVisibleMethod
+  }
+  if (rules) {
+    const itemRules = rules[field]
+    if (itemRules) {
+      isRequired = itemRules.some(rule => rule.required)
+    }
+  }
+  let contentVNs = []
+  if (slots && slots.default) {
+    contentVNs = _vm.callSlot(slots.default, params, h)
+  } else if (compConf && compConf.renderItemContent) {
+    contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
+  } else if (compConf && compConf.renderItem) {
+    contentVNs = compConf.renderItem.call(_vm, h, itemRender, params)
+  } else if (field) {
+    contentVNs = [`${XEUtils.get(data, field)}`]
+  }
+  const ons = showTooltip ? {
+    mouseenter (evnt) {
+      _vm.triggerHeaderHelpEvent(evnt, params)
+    },
+    mouseleave: _vm.handleTargetLeaveEvent
+  } : {}
+  return h('div', {
+    class: ['vxe-form--item', item.id, span ? `vxe-col--${span} is--span` : null, className ? (XEUtils.isFunction(className) ? className(params) : className) : '', {
+      'is--title': title,
+      'is--required': isRequired,
+      'is--hidden': visible === false || (folding && collapseAll),
+      'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+      'is--error': showError
+    }]
+  }, [
+    h('div', {
+      class: 'vxe-form--item-inner'
+    }, [
+      title || (slots && slots.title) ? h('div', {
+        class: ['vxe-form--item-title', titleAlign ? `align--${titleAlign}` : null, {
+          'is--ellipsis': hasEllipsis
+        }],
+        style: titleWidth ? {
+          width: isNaN(titleWidth) ? titleWidth : `${titleWidth}px`
+        } : null,
+        attrs: {
+          title: showTitle ? UtilTools.getFuncText(title) : null
+        },
+        on: ons
+      }, renderTitle(h, _vm, item)) : null,
+      h('div', {
+        class: ['vxe-form--item-content', align ? `align--${align}` : null]
+      }, contentVNs.concat(
+        [
+          collapseNode ? h('div', {
+            class: 'vxe-form--item-trigger-node',
+            on: {
+              click: _vm.toggleCollapseEvent
+            }
+          }, [
+            h('span', {
+              class: 'vxe-form--item-trigger-text'
+            }, collapseAll ? GlobalConfig.i18n('vxe.form.unfolding') : GlobalConfig.i18n('vxe.form.folding')),
+            h('i', {
+              class: ['vxe-form--item-trigger-icon', collapseAll ? GlobalConfig.icon.FORM_FOLDING : GlobalConfig.icon.FORM_UNFOLDING]
+            })
+          ]) : null,
+          errRule && validOpts.showMessage ? h('div', {
+            class: 'vxe-form--item-valid',
+            style: errRule.maxWidth ? {
+              width: `${errRule.maxWidth}px`
+            } : null
+          }, errRule.message) : null
+        ])
+      )
+    ])
+  ])
+}
+
 export default {
   name: 'VxeFormItem',
   props,
@@ -49,6 +148,7 @@ export default {
     destroyItem(this)
   },
   render (h) {
-    return h('div')
+    const { $xeform } = this
+    return $xeform && $xeform.customLayout ? renderItem(h, $xeform, this.itemConfig, this.$scopedSlots) : h('div')
   }
 }

package/packages/form/src/form.js

@@ -2,8 +2,9 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, isEnableConf } from '../../tools'
+import { UtilTools, DomTools, isEnableConf } from '../../tools'
 import { createItem } from './util'
+import { renderTitle } from './render'
 import { eqEmptyValue } from '../../tools/src/utils'
 import { browse } from '../../tools/src/dom'
 
@@ -57,95 +58,6 @@ function getResetValue (value, resetValue) {
   return resetValue
 }
 
-function callSlot (_vm, slotFunc, params, h) {
-  if (slotFunc) {
-    const { $scopedSlots } = _vm
-    if (XEUtils.isString(slotFunc)) {
-      slotFunc = $scopedSlots[slotFunc] || null
-    }
-    if (XEUtils.isFunction(slotFunc)) {
-      return slotFunc.call(_vm, params, h)
-    }
-  }
-  return []
-}
-
-function renderPrefixIcon (h, titlePrefix) {
-  return h('span', {
-    class: 'vxe-form--item-title-prefix'
-  }, [
-    h('i', {
-      class: titlePrefix.icon || GlobalConfig.icon.FORM_PREFIX
-    })
-  ])
-}
-
-function renderSuffixIcon (h, titleSuffix) {
-  return h('span', {
-    class: 'vxe-form--item-title-suffix'
-  }, [
-    h('i', {
-      class: titleSuffix.icon || GlobalConfig.icon.FORM_SUFFIX
-    })
-  ])
-}
-
-function renderTitle (h, _vm, item) {
-  const { data } = _vm
-  const { slots, field, itemRender, titlePrefix, titleSuffix } = item
-  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
-  const params = { data, property: field, item, $form: _vm }
-  const contVNs = []
-  const titVNs = []
-  if (titlePrefix) {
-    titVNs.push(
-      titlePrefix.message
-        ? h('vxe-tooltip', {
-          props: {
-            content: UtilTools.getFuncText(titlePrefix.message),
-            enterable: titlePrefix.enterable,
-            theme: titlePrefix.theme
-          }
-        }, [
-          renderPrefixIcon(h, titlePrefix)
-        ])
-        : renderPrefixIcon(h, titlePrefix)
-    )
-  }
-  titVNs.push(
-    h('span', {
-      class: 'vxe-form--item-title-label'
-    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? callSlot(_vm, slots.title, params, h) : UtilTools.getFuncText(item.title)))
-  )
-  contVNs.push(
-    h('div', {
-      class: 'vxe-form--item-title-content'
-    }, titVNs)
-  )
-  const fixVNs = []
-  if (titleSuffix) {
-    fixVNs.push(
-      titleSuffix.message
-        ? h('vxe-tooltip', {
-          props: {
-            content: UtilTools.getFuncText(titleSuffix.message),
-            enterable: titleSuffix.enterable,
-            theme: titleSuffix.theme
-          }
-        }, [
-          renderSuffixIcon(h, titleSuffix)
-        ])
-        : renderSuffixIcon(h, titleSuffix)
-    )
-  }
-  contVNs.push(
-    h('div', {
-      class: 'vxe-form--item-title-postfix'
-    }, fixVNs)
-  )
-  return contVNs
-}
-
 function renderItems (h, _vm, itemList) {
   const { _e, rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
   return itemList.map((item, index) => {
@@ -185,7 +97,7 @@ function renderItems (h, _vm, itemList) {
     }
     let contentVNs = []
     if (slots && slots.default) {
-      contentVNs = callSlot(_vm, slots.default, params, h)
+      contentVNs = _vm.callSlot(slots.default, params, h)
     } else if (compConf && compConf.renderItemContent) {
       contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
     } else if (compConf && compConf.renderItem) {
@@ -258,6 +170,7 @@ export default {
   name: 'VxeForm',
   mixins: [vSize],
   props: {
+    collapseStatus: { type: Boolean, default: true },
     loading: Boolean,
     data: Object,
     size: { type: String, default: () => GlobalConfig.form.size || GlobalConfig.size },
@@ -272,11 +185,12 @@ export default {
     items: Array,
     rules: Object,
     preventSubmit: { type: Boolean, default: () => GlobalConfig.form.preventSubmit },
-    validConfig: Object
+    validConfig: Object,
+    customLayout: { type: Boolean, default: () => GlobalConfig.form.customLayout }
   },
   data () {
     return {
-      collapseAll: true,
+      collapseAll: this.collapseStatus,
       staticItems: [],
       formItems: [],
 
@@ -305,24 +219,32 @@ export default {
       return opts
     }
   },
-  created () {
-    this.$nextTick(() => {
-      const { items } = this
-      if (items) {
-        this.loadItem(items)
-      }
-    })
-  },
   watch: {
     staticItems (value) {
       this.formItems = value
     },
     items (value) {
       this.loadItem(value)
+    },
+    collapseStatus (value) {
+      this.collapseAll = !!value
     }
   },
+  created () {
+    this.$nextTick(() => {
+      const { items } = this
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (this.customLayout && this.items) {
+          UtilTools.error('vxe.error.errConflicts', ['custom-layout', 'items'])
+        }
+      }
+      if (items) {
+        this.loadItem(items)
+      }
+    })
+  },
   render (h) {
-    const { _e, loading, className, data, vSize, tooltipOpts, formItems } = this
+    const { _e, loading, className, data, vSize, tooltipOpts, formItems, customLayout } = this
     const hasUseTooltip = VXETable._tooltip
     return h('form', {
       class: ['vxe-form', className ? (XEUtils.isFunction(className) ? className({ items: formItems, data, $form: this }) : className) : '', {
@@ -338,11 +260,11 @@ export default {
     }, [
       h('div', {
         class: 'vxe-form--wrapper vxe-row'
-      }, renderItems(h, this, formItems)),
+      }, customLayout ? this.$slots.default : renderItems(h, this, formItems)),
       h('div', {
         class: 'vxe-form-slots',
         ref: 'hideItem'
-      }, this.$slots.default),
+      }, customLayout ? [] : this.$slots.default),
       h('div', {
         class: ['vxe-loading', {
           'is--visible': loading
@@ -362,6 +284,18 @@ export default {
     ])
   },
   methods: {
+    callSlot (slotFunc, params, h) {
+      if (slotFunc) {
+        const { $scopedSlots } = this
+        if (XEUtils.isString(slotFunc)) {
+          slotFunc = $scopedSlots[slotFunc] || null
+        }
+        if (XEUtils.isFunction(slotFunc)) {
+          return slotFunc.call(this, params, h)
+        }
+      }
+      return []
+    },
     loadItem (list) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         const { $scopedSlots } = this
@@ -388,12 +322,16 @@ export default {
       return itemList
     },
     toggleCollapse () {
-      this.collapseAll = !this.collapseAll
+      const status = !this.collapseAll
+      this.collapseAll = status
+      this.$emit('update:collapseStatus', status)
       return this.$nextTick()
     },
     toggleCollapseEvent (evnt) {
       this.toggleCollapse()
-      this.$emit('toggle-collapse', { collapse: !this.collapseAll, data: this.data, $form: this, $event: evnt }, evnt)
+      const status = this.collapseAll
+      this.$emit('toggle-collapse', { status, collapse: status, data: this.data, $form: this, $event: evnt }, evnt)
+      this.$emit('collapse', { status, collapse: status, data: this.data, $form: this, $event: evnt }, evnt)
     },
     submitEvent (evnt) {
       evnt.preventDefault()
@@ -631,12 +569,16 @@ export default {
     handleFocus (fields) {
       const { $el } = this
       const itemList = this.getItems()
-      fields.some(property => {
+      fields.some((property, index) => {
         const item = itemList.find(item => item.field === property)
         if (item && isEnableConf(item.itemRender)) {
           const { itemRender } = item
           const compConf = VXETable.renderer.get(itemRender.name)
           let inputElem
+          // 定位到第一个
+          if (!index) {
+            DomTools.scrollToView($el.querySelector(`.${item.id}`))
+          }
           // 如果指定了聚焦 class
           if (itemRender.autofocus) {
             inputElem = $el.querySelector(`.${item.id} ${itemRender.autofocus}`)

package/packages/form/src/render.js

@@ -0,0 +1,79 @@
+import GlobalConfig from '../../v-x-e-table/src/conf'
+import VXETable from '../../v-x-e-table'
+import { UtilTools, isEnableConf } from '../../tools'
+
+function renderPrefixIcon (h, titlePrefix) {
+  return h('span', {
+    class: 'vxe-form--item-title-prefix'
+  }, [
+    h('i', {
+      class: titlePrefix.icon || GlobalConfig.icon.FORM_PREFIX
+    })
+  ])
+}
+
+function renderSuffixIcon (h, titleSuffix) {
+  return h('span', {
+    class: 'vxe-form--item-title-suffix'
+  }, [
+    h('i', {
+      class: titleSuffix.icon || GlobalConfig.icon.FORM_SUFFIX
+    })
+  ])
+}
+
+export function renderTitle (h, _vm, item) {
+  const { data } = _vm
+  const { slots, field, itemRender, titlePrefix, titleSuffix } = item
+  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
+  const params = { data, property: field, item, $form: _vm }
+  const contVNs = []
+  const titVNs = []
+  if (titlePrefix) {
+    titVNs.push(
+      titlePrefix.message
+        ? h('vxe-tooltip', {
+          props: {
+            content: UtilTools.getFuncText(titlePrefix.message),
+            enterable: titlePrefix.enterable,
+            theme: titlePrefix.theme
+          }
+        }, [
+          renderPrefixIcon(h, titlePrefix)
+        ])
+        : renderPrefixIcon(h, titlePrefix)
+    )
+  }
+  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) : UtilTools.getFuncText(item.title)))
+  )
+  contVNs.push(
+    h('div', {
+      class: 'vxe-form--item-title-content'
+    }, titVNs)
+  )
+  const fixVNs = []
+  if (titleSuffix) {
+    fixVNs.push(
+      titleSuffix.message
+        ? h('vxe-tooltip', {
+          props: {
+            content: UtilTools.getFuncText(titleSuffix.message),
+            enterable: titleSuffix.enterable,
+            theme: titleSuffix.theme
+          }
+        }, [
+          renderSuffixIcon(h, titleSuffix)
+        ])
+        : renderSuffixIcon(h, titleSuffix)
+    )
+  }
+  contVNs.push(
+    h('div', {
+      class: 'vxe-form--item-title-postfix'
+    }, fixVNs)
+  )
+  return contVNs
+}

package/packages/grid/src/grid.js

@@ -40,8 +40,8 @@ function renderDefaultForm (h, _vm) {
         on: {
           submit: _vm.submitEvent,
           reset: _vm.resetEvent,
-          'submit-invalid': _vm.submitInvalidEvent,
-          'toggle-collapse': _vm.togglCollapseEvent
+          collapse: _vm.collapseEvent,
+          'submit-invalid': _vm.submitInvalidEvent
         },
         scopedSlots: formSlots
       })
@@ -819,9 +819,10 @@ export default {
     submitInvalidEvent (params) {
       this.$emit('form-submit-invalid', Object.assign({ $grid: this }, params))
     },
-    togglCollapseEvent (params) {
+    collapseEvent (params) {
       this.$nextTick(() => this.recalculate(true))
       this.$emit('form-toggle-collapse', Object.assign({ $grid: this }, params))
+      this.$emit('form-collapse', Object.assign({ $grid: this }, params))
     },
     triggerZoomEvent (evnt) {
       this.zoom()