vxe-table 3.8.19 → 3.8.21

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")),_utils=_interopRequireWildcard(require("../../tools/utils")),_log=require("../../tools/log");function _getRequireWildcardCache(e){var t,n;return"function"!=typeof WeakMap?null:(t=new WeakMap,n=new WeakMap,(_getRequireWildcardCache=function(e){return e?n: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 n,r,o={__proto__:null},a=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(n in e)"default"!==n&&{}.hasOwnProperty.call(e,n)&&((r=a?Object.getOwnPropertyDescriptor(e,n):null)&&(r.get||r.set)?Object.defineProperty(o,n,r):o[n]=e[n]);return o.default=e,t&&t.set(e,o),o}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}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)}function ownKeys(t,e){var n,r=Object.keys(t);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(t),e&&(n=n.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),r.push.apply(r,n)),r}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(n),!0).forEach(function(e){_defineProperty(t,e,n[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):ownKeys(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}function _defineProperty(e,t,n){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0===n)return("string"===t?String:Number)(e);n=n.call(e,t||"default");if("object"!=_typeof(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}var defaultCompProps={transfer:!0},componentDefaultModelProp="value";function isEmptyValue(e){return null==e||""===e}function getChangeEvent(e){switch(e.name){case"input":case"textarea":case"VxeInput":case"VxeTextarea":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){return e.name}function getOldComponentName(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;return n||("VxeInput"===t||"$input"===t?!(!(n=(e||{}).type)||"text"===n||"number"===n||"integer"===n||"float"===n):"input"!==t&&"textarea"!==t&&"$textarea"!==t)}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"},_utils.default.formatText((0,_utils.getFuncText)(t),1))]:_utils.default.formatText(r,1))]}function getNativeOns(e,o){var e=e.nativeEvents,t={};return _xeUtils.default.objectEach(e,function(r,e){t[e]=function(){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(r)||(0,_log.errLog)("vxe.error.errFunc",[r]);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,i="input",l=getChangeEvent(e),u=l===i,d={};return _xeUtils.default.objectEach(a,function(r,e){d[e]=function(){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(r)||(0,_log.errLog)("vxe.error.errFunc",[r]);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[i]=function(e){t(["VxeInput","VxeTextarea","$input","$textarea"].includes(n)?e.value:e),a&&a[i]&&a[i](o,e),u&&r&&r(e)}),!u&&r&&(d[l]=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[l]&&a[l].apply(a,[o].concat(t))}),d}function getEditOns(e,t){var n=t.$table,r=t.row,o=t.column,a=e.name,i=o.model,l=isImmediateCell(e,t);return getOns(e,t,function(e){l?_utils.default.setCellValue(r,o,e):(i.update=!0,i.value=e)},function(e){!l&&["VxeInput","VxeTextarea","$input","$textarea"].includes(a)?n.updateStatus(t,e.value):n.updateStatus(t)})}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,i=a.model;return getOns(t,n,function(e){e=e.target.value;isImmediateCell(t,n)?_utils.default.setCellValue(o,a,e):(i.update=!0,i.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,i=getNativeAttrs(t),r=isImmediateCell(t,n)?_utils.default.getCellValue(r,o):o.model.value;return[e(a,{class:"vxe-default-".concat(a),attrs:i,domProps:{value:r},on:getNativeEditOns(t,n)})]}function defaultCellRender(e,t,n){return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultEditRender(e,t,n){var r=n.row,o=n.column,r=_utils.default.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,r),on:getEditOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldEditRender(e,t,n){var r=n.row,o=n.column,r=_utils.default.getCellValue(r,o);return[e(getOldComponentName(t),{props:getCellEditProps(t,n,r),on:getEditOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonEditRender(e,t,n){return[e("vxe-button",{props:getCellEditProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonsEditRender(t,e,n){return e.children.map(function(e){return oldButtonEditRender(t,e,n)[0]})}function renderNativeOptgroups(n,r,o,a){var e=r.optionGroups,t=r.optionGroupProps,t=void 0===t?{}:t,i=t.options||"options",l=t.label||"label";return e.map(function(e,t){return n("optgroup",{key:t,domProps:{label:e[l]}},a(n,e[i],r,o))})}function renderNativeOptions(n,e,t,r){var o=t.optionProps,o=void 0===o?{}:o,a=r.row,i=r.column,l=o.label||"label",u=o.value||"value",d=o.disabled||"disabled",p=isImmediateCell(t,r)?_utils.default.getCellValue(a,i):i.model.value;return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[u],disabled:e[d]},domProps:{selected:e[u]==p}},e[l])})}function nativeFilterRender(n,r,o){var e=o.column,a=r.name,i=getNativeAttrs(r);return e.filters.map(function(e,t){return n(a,{key:t,class:"vxe-default-".concat(a),attrs:i,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 oldFilterRender(r,o,a){return a.column.filters.map(function(e,t){var n=e.data;return r(getOldComponentName(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 handleInputFilterMethod(e){var t=e.option,n=e.row,e=e.column,t=t.data,n=_xeUtils.default.get(n,e.property);return-1<_xeUtils.default.toValueString(n).indexOf(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,i=t.optionProps,l=t.optionGroups,u=t.optionGroupProps,r=_utils.default.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,r,{options:a,optionProps:i,optionGroups:l,optionGroupProps:u}),on:getEditOns(t,n)})]}function oldSelectEditRender(e,t,n){var r=n.row,o=n.column,a=t.options,i=t.optionProps,l=t.optionGroups,u=t.optionGroupProps,r=_utils.default.getCellValue(r,o);return[e(getOldComponentName(t),{props:getCellEditProps(t,n,r,{options:a,optionProps:i,optionGroups:l,optionGroupProps:u}),on:getEditOns(t,n)})]}function getSelectCellValue(e,t){var r,n=t.row,t=t.column,o=e.props,o=void 0===o?{}:o,a=e.options,i=e.optionGroups,l=e.optionProps,l=void 0===l?{}:l,e=e.optionGroupProps,u=void 0===e?{}:e,e=_xeUtils.default.get(n,t.property),d=l.label||"label",p=l.value||"value";return null!=e?_xeUtils.default.map(o.multiple?e:[e],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[p]==t}));n++);return r?r[d]:t}:function(t){return(r=_xeUtils.default.find(a,function(e){return e[p]==t}))?r[d]:t}).join(", "):null}function nativeItemRender(e,t,n){var r=n.data,o=n.property,a=t.name,i=getNativeAttrs(t),r=_xeUtils.default.get(r,o);return[e(a,{class:"vxe-default-".concat(a),attrs:i,domProps:!i||"input"!==a||"submit"!==i.type&&"reset"!==i.type?{value:r}:null,on:getNativeItemOns(t,n)})]}function defaultItemRender(e,t,n){var r=n.data,o=n.property,r=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,r),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldItemRender(e,t,n){var r=n.data,o=n.property,r=_xeUtils.default.get(r,o);return[e(getOldComponentName(t),{props:getItemProps(t,n,r),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonItemRender(e,t,n){return[e("vxe-button",{props:getItemProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonsItemRender(t,e,n){return e.children.map(function(e){return oldButtonItemRender(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",i=t.value||"value",l=t.disabled||"disabled",u=_xeUtils.default.get(o,r);return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[i],disabled:e[l]},domProps:{selected:e[i]==u}},e[a])})}function handleExportSelectMethod(e){var t=e.row,n=e.column;return e.options.original?_utils.default.getCellValue(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function defaultFormItemRender(e,t,n){var r=n.data,o=n.property,r=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,r),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function formItemRadioAndCheckboxRender(e,t,n){var r=t.options,o=t.optionProps,o=void 0===o?{}:o,a=n.data,i=n.property,a=_xeUtils.default.get(a,i);return[e(getDefaultComponentName(t),{props:_objectSpread({options:r,optionProps:o},getItemProps(t,n,a)),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldFormItemRadioAndCheckboxRender(n,e,t){var r=e.options,o=e.optionProps,o=void 0===o?{}:o,a=t.data,i=t.property,l=o.label||"label",u=o.value||"value",d=o.disabled||"disabled",o=_xeUtils.default.get(a,i),p=getOldComponentName(e);return r?[n("".concat(p,"-group"),{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)},r.map(function(e,t){return n(p,{key:t,props:{label:e[u],content:e[l],disabled:e[d]}})}))]:[n(p,{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:handleInputFilterMethod,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},VxeInput:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell:function(e,t,n){var r=t.props,o=void 0===r?{}:r,r=n.row,a=n.column,i=o.digits||_conf.default.input.digits,l=_xeUtils.default.get(r,a.property);if(l)switch(o.type){case"date":case"week":case"month":case"quarter":case"year":l=getLabelFormatDate(l,o);break;case"float":l=_xeUtils.default.toFixed(_xeUtils.default.floor(l,i),i)}return getCellLabelVNs(e,t,n,l)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleInputFilterMethod,renderItemContent:defaultItemRender},VxeTextarea:{autofocus:".vxe-textarea--inner",renderItemContent:defaultItemRender},VxeButton:{renderDefault:defaultCellRender,renderItemContent:defaultFormItemRender},VxeButtonGroup:{renderDefault:defaultCellRender,renderItemContent:function(e,t,n){var r=t.options,o=n.data,a=n.property,o=_xeUtils.default.get(o,a);return[e(getDefaultComponentName(t),{props:_objectSpread({options:r},getItemProps(t,n,o)),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}},VxeSelect:{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,i=o.options,l=o.optionProps,u=o.optionGroups,d=o.optionGroupProps,p=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:i,optionProps:l,optionGroups:u,optionGroupProps:d}),on:getFilterOns(o,a,e),nativeOn:p})})},defaultFilterMethod:handleFilterMethod,renderItemContent:function(e,t,n){var r=n.data,o=n.property,a=t.options,i=t.optionProps,l=t.optionGroups,u=t.optionGroupProps,r=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,r,{options:a,optionProps:i,optionGroups:l,optionGroupProps:u}),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]},cellExportMethod:handleExportSelectMethod},VxeRadio:{autofocus:".vxe-radio--input",renderItemContent:defaultFormItemRender},VxeRadioGroup:{autofocus:".vxe-radio--input",renderItemContent:formItemRadioAndCheckboxRender},VxeCheckbox:{autofocus:".vxe-checkbox--input",renderItemContent:defaultFormItemRender},VxeCheckboxGroup:{autofocus:".vxe-checkbox--input",renderItemContent:formItemRadioAndCheckboxRender},VxeSwitch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender,renderItemContent:defaultItemRender},$input:{autofocus:".vxe-input--inner",renderEdit:oldEditRender,renderCell:function(e,t,n){var r=t.props,o=void 0===r?{}:r,r=n.row,a=n.column,i=o.digits||_conf.default.input.digits,l=_xeUtils.default.get(r,a.property);if(l)switch(o.type){case"date":case"week":case"month":case"year":l=getLabelFormatDate(l,o);break;case"float":l=_xeUtils.default.toFixed(_xeUtils.default.floor(l,i),i)}return getCellLabelVNs(e,t,n,l)},renderDefault:oldEditRender,renderFilter:oldFilterRender,defaultFilterMethod:handleInputFilterMethod,renderItemContent:oldItemRender},$textarea:{autofocus:".vxe-textarea--inner",renderItemContent:oldItemRender},$button:{renderDefault:oldButtonEditRender,renderItemContent:oldButtonItemRender},$buttons:{renderDefault:oldButtonsEditRender,renderItemContent:oldButtonsItemRender},$select:{autofocus:".vxe-input--inner",renderEdit:oldSelectEditRender,renderDefault:oldSelectEditRender,renderCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderFilter:function(r,o,a){var e=a.column,i=o.options,l=o.optionProps,u=o.optionGroups,d=o.optionGroupProps,p=getNativeOns(o,a);return e.filters.map(function(e,t){var n=e.data;return r(getOldComponentName(o),{key:t,props:getFilterProps(o,a,n,{options:i,optionProps:l,optionGroups:u,optionGroupProps:d}),on:getFilterOns(o,a,e),nativeOn:p})})},defaultFilterMethod:handleFilterMethod,renderItemContent:function(e,t,n){var r=n.data,o=n.property,a=t.options,i=t.optionProps,l=t.optionGroups,u=t.optionGroupProps,r=_xeUtils.default.get(r,o);return[e(getOldComponentName(t),{props:getItemProps(t,n,r,{options:a,optionProps:i,optionGroups:l,optionGroupProps:u}),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]},cellExportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input",renderItemContent:oldFormItemRadioAndCheckboxRender},$checkbox:{autofocus:".vxe-checkbox--input",renderItemContent:oldFormItemRadioAndCheckboxRender},$switch:{autofocus:".vxe-switch--button",renderEdit:oldEditRender,renderDefault:oldEditRender,renderItemContent:oldItemRender}},renderer=exports.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||(0,_log.warnLog)("vxe.error.coverProp",["Renderer.".concat(n),t])}),Object.assign(r,e)):renderMap[n]=e),renderer},delete:function(e){return delete renderMap[e],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")),_utils=_interopRequireWildcard(require("../../tools/utils")),_log=require("../../tools/log");function _getRequireWildcardCache(e){var t,n;return"function"!=typeof WeakMap?null:(t=new WeakMap,n=new WeakMap,(_getRequireWildcardCache=function(e){return e?n: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 n,r,o={__proto__:null},a=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(n in e)"default"!==n&&{}.hasOwnProperty.call(e,n)&&((r=a?Object.getOwnPropertyDescriptor(e,n):null)&&(r.get||r.set)?Object.defineProperty(o,n,r):o[n]=e[n]);return o.default=e,t&&t.set(e,o),o}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}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)}function ownKeys(t,e){var n,r=Object.keys(t);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(t),e&&(n=n.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),r.push.apply(r,n)),r}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(n),!0).forEach(function(e){_defineProperty(t,e,n[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):ownKeys(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}function _defineProperty(e,t,n){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0===n)return("string"===t?String:Number)(e);n=n.call(e,t||"default");if("object"!=_typeof(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}var defaultCompProps={transfer:!0},componentDefaultModelProp="value";function isEmptyValue(e){return null==e||""===e}function getChangeEvent(e){switch(e.name){case"input":case"textarea":case"VxeInput":case"VxeTextarea":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){return e.name}function getOldComponentName(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;return n||("VxeInput"===t||"$input"===t?!(!(n=(e||{}).type)||"text"===n||"number"===n||"integer"===n||"float"===n):"input"!==t&&"textarea"!==t&&"$textarea"!==t)}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"},_utils.default.formatText((0,_utils.getFuncText)(t),1))]:_utils.default.formatText(r,1))]}function getNativeOns(e,o){var e=e.nativeEvents,t={};return _xeUtils.default.objectEach(e,function(r,e){t[e]=function(){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(r)||(0,_log.errLog)("vxe.error.errFunc",[r]);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(){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(r)||(0,_log.errLog)("vxe.error.errFunc",[r]);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(["VxeInput","VxeTextarea","$input","$textarea"].includes(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?_utils.default.setCellValue(r,o,e):(l.update=!0,l.value=e)},function(e){!i&&["VxeInput","VxeTextarea","$input","$textarea"].includes(a)?n.updateStatus(t,e.value):n.updateStatus(t)})}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)?_utils.default.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),r=isImmediateCell(t,n)?_utils.default.getCellValue(r,o):o.model.value;return[e(a,{class:"vxe-default-".concat(a),attrs:l,domProps:{value:r},on:getNativeEditOns(t,n)})]}function defaultCellRender(e,t,n){return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function defaultEditRender(e,t,n){var r=n.row,o=n.column,r=_utils.default.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,r),on:getEditOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldEditRender(e,t,n){var r=n.row,o=n.column,r=_utils.default.getCellValue(r,o);return[e(getOldComponentName(t),{props:getCellEditProps(t,n,r),on:getEditOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonEditRender(e,t,n){return[e("vxe-button",{props:getCellEditProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonsEditRender(t,e,n){return e.children.map(function(e){return oldButtonEditRender(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,o=void 0===o?{}:o,a=r.row,l=r.column,i=o.label||"label",u=o.value||"value",d=o.disabled||"disabled",p=isImmediateCell(t,r)?_utils.default.getCellValue(a,l):l.model.value;return e.map(function(e,t){return n("option",{key:t,attrs:{value:e[u],disabled:e[d]},domProps:{selected:e[u]==p}},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 oldFilterRender(r,o,a){return a.column.filters.map(function(e,t){var n=e.data;return r(getOldComponentName(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 handleInputFilterMethod(e){var t=e.option,n=e.row,e=e.column,t=t.data,n=_xeUtils.default.get(n,e.property);return-1<_xeUtils.default.toValueString(n).indexOf(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,r=_utils.default.getCellValue(r,o);return[e(getDefaultComponentName(t),{props:getCellEditProps(t,n,r,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,n)})]}function oldSelectEditRender(e,t,n){var r=n.row,o=n.column,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,r=_utils.default.getCellValue(r,o);return[e(getOldComponentName(t),{props:getCellEditProps(t,n,r,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getEditOns(t,n)})]}function getSelectCellValue(e,t){var r,n=t.row,t=t.column,o=e.props,o=void 0===o?{}:o,a=e.options,l=e.optionGroups,i=e.optionProps,i=void 0===i?{}:i,e=e.optionGroupProps,u=void 0===e?{}:e,e=_xeUtils.default.get(n,t.property),d=i.label||"label",p=i.value||"value";return null!=e?_xeUtils.default.map(o.multiple?e:[e],l?function(t){for(var e=u.options||"options",n=0;n<l.length&&!(r=_xeUtils.default.find(l[n][e],function(e){return e[p]==t}));n++);return r?r[d]:t}:function(t){return(r=_xeUtils.default.find(a,function(e){return e[p]==t}))?r[d]:t}).join(", "):null}function nativeItemRender(e,t,n){var r=n.data,o=n.property,a=t.name,l=getNativeAttrs(t),r=_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:r}:null,on:getNativeItemOns(t,n)})]}function defaultItemRender(e,t,n){var r=n.data,o=n.property,r=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,r),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldItemRender(e,t,n){var r=n.data,o=n.property,r=_xeUtils.default.get(r,o);return[e(getOldComponentName(t),{props:getItemProps(t,n,r),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonItemRender(e,t,n){return[e("vxe-button",{props:getItemProps(t,n),on:getOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldButtonsItemRender(t,e,n){return e.children.map(function(e){return oldButtonItemRender(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?_utils.default.getCellValue(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function defaultFormItemRender(e,t,n){var r=n.data,o=n.property,r=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,r),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function formItemRadioAndCheckboxRender(e,t,n){var r=t.options,o=t.optionProps,o=void 0===o?{}:o,a=n.data,l=n.property,a=_xeUtils.default.get(a,l);return[e(getDefaultComponentName(t),{props:_objectSpread({options:r,optionProps:o},getItemProps(t,n,a)),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}function oldFormItemRadioAndCheckboxRender(n,e,t){var r=e.options,o=e.optionProps,o=void 0===o?{}:o,a=t.data,l=t.property,i=o.label||"label",u=o.value||"value",d=o.disabled||"disabled",o=_xeUtils.default.get(a,l),p=getOldComponentName(e);return r?[n("".concat(p,"-group"),{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)},r.map(function(e,t){return n(p,{key:t,props:{label:e[u],content:e[i],disabled:e[d]}})}))]:[n(p,{props:getItemProps(e,t,o),on:getItemOns(e,t),nativeOn:getNativeOns(e,t)})]}var renderMap={input:{tableAutofocus:"input",renderTableEdit:nativeEditRender,renderTableDefault:nativeEditRender,renderTableFilter:nativeFilterRender,defaultTableFilterMethod:handleInputFilterMethod,renderFormItemContent:nativeItemRender},textarea:{tableAutofocus:"textarea",renderTableEdit:nativeEditRender,renderFormItemContent:nativeItemRender},select:{renderTableEdit:nativeSelectEditRender,renderTableDefault:nativeSelectEditRender,renderTableCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderTableFilter: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))})},defaultTableFilterMethod:handleFilterMethod,renderFormItemContent: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))]},tableExportMethod:handleExportSelectMethod},VxeInput:{tableAutofocus:".vxe-input--inner",renderTableEdit:defaultEditRender,renderTableCell:function(e,t,n){var r=t.props,o=void 0===r?{}:r,r=n.row,a=n.column,l=o.digits||_conf.default.input.digits,i=_xeUtils.default.get(r,a.property);if(i)switch(o.type){case"date":case"week":case"month":case"quarter":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)},renderTableDefault:defaultEditRender,renderTableFilter:defaultFilterRender,defaultTableFilterMethod:handleInputFilterMethod,renderFormItemContent:defaultItemRender},VxeTextarea:{tableAutofocus:".vxe-textarea--inner",renderFormItemContent:defaultItemRender},VxeButton:{renderTableDefault:defaultCellRender,renderFormItemContent:defaultFormItemRender},VxeButtonGroup:{renderTableDefault:defaultCellRender,renderFormItemContent:function(e,t,n){var r=t.options,o=n.data,a=n.property,o=_xeUtils.default.get(o,a);return[e(getDefaultComponentName(t),{props:_objectSpread({options:r},getItemProps(t,n,o)),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]}},VxeSelect:{tableAutofocus:".vxe-input--inner",renderTableEdit:defaultSelectEditRender,renderTableDefault:defaultSelectEditRender,renderTableCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderTableFilter:function(r,o,a){var e=a.column,l=o.options,i=o.optionProps,u=o.optionGroups,d=o.optionGroupProps,p=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:p})})},defaultTableFilterMethod:handleFilterMethod,renderFormItemContent:function(e,t,n){var r=n.data,o=n.property,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,r=_xeUtils.default.get(r,o);return[e(getDefaultComponentName(t),{props:getItemProps(t,n,r,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]},tableExportMethod:handleExportSelectMethod},VxeRadio:{tableAutofocus:".vxe-radio--input",renderFormItemContent:defaultFormItemRender},VxeRadioGroup:{tableAutofocus:".vxe-radio--input",renderFormItemContent:formItemRadioAndCheckboxRender},VxeCheckbox:{tableAutofocus:".vxe-checkbox--input",renderFormItemContent:defaultFormItemRender},VxeCheckboxGroup:{tableAutofocus:".vxe-checkbox--input",renderFormItemContent:formItemRadioAndCheckboxRender},VxeSwitch:{tableAutofocus:".vxe-switch--button",renderTableEdit:defaultEditRender,renderTableDefault:defaultEditRender,renderFormItemContent:defaultItemRender},$input:{tableAutofocus:".vxe-input--inner",renderTableEdit:oldEditRender,renderTableCell:function(e,t,n){var r=t.props,o=void 0===r?{}:r,r=n.row,a=n.column,l=o.digits||_conf.default.input.digits,i=_xeUtils.default.get(r,a.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)},renderTableDefault:oldEditRender,renderTableFilter:oldFilterRender,defaultTableFilterMethod:handleInputFilterMethod,renderFormItemContent:oldItemRender},$textarea:{tableAutofocus:".vxe-textarea--inner",renderFormItemContent:oldItemRender},$button:{renderTableDefault:oldButtonEditRender,renderFormItemContent:oldButtonItemRender},$buttons:{renderTableDefault:oldButtonsEditRender,renderFormItemContent:oldButtonsItemRender},$select:{tableAutofocus:".vxe-input--inner",renderTableEdit:oldSelectEditRender,renderTableDefault:oldSelectEditRender,renderTableCell:function(e,t,n){return getCellLabelVNs(e,t,n,getSelectCellValue(t,n))},renderTableFilter:function(r,o,a){var e=a.column,l=o.options,i=o.optionProps,u=o.optionGroups,d=o.optionGroupProps,p=getNativeOns(o,a);return e.filters.map(function(e,t){var n=e.data;return r(getOldComponentName(o),{key:t,props:getFilterProps(o,a,n,{options:l,optionProps:i,optionGroups:u,optionGroupProps:d}),on:getFilterOns(o,a,e),nativeOn:p})})},defaultTableFilterMethod:handleFilterMethod,renderFormItemContent:function(e,t,n){var r=n.data,o=n.property,a=t.options,l=t.optionProps,i=t.optionGroups,u=t.optionGroupProps,r=_xeUtils.default.get(r,o);return[e(getOldComponentName(t),{props:getItemProps(t,n,r,{options:a,optionProps:l,optionGroups:i,optionGroupProps:u}),on:getItemOns(t,n),nativeOn:getNativeOns(t,n)})]},tableExportMethod:handleExportSelectMethod},$radio:{tableAutofocus:".vxe-radio--input",renderFormItemContent:oldFormItemRadioAndCheckboxRender},$checkbox:{tableAutofocus:".vxe-checkbox--input",renderFormItemContent:oldFormItemRadioAndCheckboxRender},$switch:{tableAutofocus:".vxe-switch--button",renderTableEdit:oldEditRender,renderTableDefault:oldEditRender,renderFormItemContent:oldItemRender}},renderer=exports.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||(0,_log.warnLog)("vxe.error.coverProp",["Renderer.".concat(n),t])}),Object.assign(r,e)):renderMap[n]=e),renderer},delete:function(e){return delete renderMap[e],renderer}};

package/lib/vxe-form/style/style.css

@@ -208,15 +208,17 @@
 }
 .vxe-form .vxe-form--item {
   display: none;
-  padding: 0.5em 0.8em 0.5em 0;
-}
-.vxe-form .vxe-form--item.is--vertical {
-  padding: 0.25em 0 0.25em 0;
 }
 .vxe-form .vxe-form--item.is--active:not(.is--hidden) {
   display: inline-flex;
 }
 
+.vxe-form--item.is--padding {
+  padding: 0.6em;
+}
+.vxe-form--item.is--padding.is--vertical {
+  padding: 0.4em 0.6em;
+}
 .vxe-form--item.is--colon .vxe-form--item-title-postfix:after {
   content: ":";
   font-weight: normal;

package/lib/vxe-form/style/style.min.css

@@ -1 +1 @@
-.vxe-form--item .vxe-default-input[type=reset]:hover,.vxe-form--item .vxe-default-input[type=submit]:hover{color:#73b8ff;border-color:#73b8ff}.vxe-form{position:relative;font-size:14px;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff;text-align:left}.vxe-form--item-row{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form--item-row>.vxe-form--item-col_1{width:4.16667%}.vxe-form--item-row>.vxe-form--item-col_2{width:8.33333%}.vxe-form--item-row>.vxe-form--item-col_3{width:12.5%}.vxe-form--item-row>.vxe-form--item-col_4{width:16.66667%}.vxe-form--item-row>.vxe-form--item-col_5{width:20.83333%}.vxe-form--item-row>.vxe-form--item-col_6{width:25%}.vxe-form--item-row>.vxe-form--item-col_7{width:29.16667%}.vxe-form--item-row>.vxe-form--item-col_8{width:33.33333%}.vxe-form--item-row>.vxe-form--item-col_9{width:37.5%}.vxe-form--item-row>.vxe-form--item-col_10{width:41.66667%}.vxe-form--item-row>.vxe-form--item-col_11{width:45.83333%}.vxe-form--item-row>.vxe-form--item-col_12{width:50%}.vxe-form--item-row>.vxe-form--item-col_13{width:54.16667%}.vxe-form--item-row>.vxe-form--item-col_14{width:58.33333%}.vxe-form--item-row>.vxe-form--item-col_15{width:62.5%}.vxe-form--item-row>.vxe-form--item-col_16{width:66.66667%}.vxe-form--item-row>.vxe-form--item-col_17{width:70.83333%}.vxe-form--item-row>.vxe-form--item-col_18{width:75%}.vxe-form--item-row>.vxe-form--item-col_19{width:79.16667%}.vxe-form--item-row>.vxe-form--item-col_20{width:83.33333%}.vxe-form--item-row>.vxe-form--item-col_21{width:87.5%}.vxe-form--item-row>.vxe-form--item-col_22{width:91.66667%}.vxe-form--item-row>.vxe-form--item-col_23{width:95.83333%}.vxe-form--item-row>.vxe-form--item-col_24{width:100%}.vxe-form-slots{display:none}.vxe-form--item-content,.vxe-form--item-trigger-node{display:inline-block;vertical-align:middle}.vxe-form--item-title{display:flex;flex-direction:row;max-width:320px;padding-right:.8em}.vxe-form--item-title.is--ellipsis .vxe-form--item-title-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-form--item-title .vxe-form--item-title-postfix,.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{flex-shrink:0}.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{cursor:help;vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-prefix{margin-right:.25em}.vxe-form--item-title .vxe-form--item-title-suffix{margin-left:.2em}.vxe-form--item-title .vxe-form--item-title-postfix{display:flex;align-items:center}.vxe-form--item-title .vxe-form--item-title-content{flex-grow:1}.vxe-form--item-title .vxe-form--item-title-label{vertical-align:middle}.vxe-form--item-trigger-node{font-size:12px;min-width:100px;color:#909399;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-form--item-trigger-node .vxe-form--item-trigger-icon{display:inline-block;margin:0 .25em;transition:all .1s}.vxe-form--item-valid{position:absolute;width:100%;font-size:12px;line-height:1.2em;color:#f56c6c;background-color:inherit;z-index:1;opacity:0;transform-origin:center top;transform:scaleY(0);transition:all .2s ease-in-out}.vxe-form .vxe-form--gather{display:inline-flex;flex-direction:row;flex-wrap:wrap;align-content:flex-start}.vxe-form .vxe-form--wrapper{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form .vxe-form--item{display:none;padding:.5em .8em .5em 0}.vxe-form .vxe-form--item.is--vertical{padding:.25em 0 .25em 0}.vxe-form .vxe-form--item.is--active:not(.is--hidden){display:inline-flex}.vxe-form--item.is--colon .vxe-form--item-title-postfix:after{content:":";font-weight:400;margin-left:.2em}.vxe-form--item.is--asterisk.is--required .vxe-form--item-title-content:before{content:"*";color:#f56c6c;font-family:Verdana,Arial,Tahoma;margin-right:.2em;font-weight:400;vertical-align:middle}.vxe-form--item.is--vertical .vxe-form--item-inner{flex-direction:column;align-items:initial}.vxe-form--item.is--vertical .vxe-form--item-inner .vxe-form--item-title{height:2.5em;line-height:2.3em;padding-right:0;max-width:none}.vxe-form--item.is--vertical .vxe-form--item-inner .vxe-form--item-title-content{flex-grow:initial}.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),.vxe-form--item.is--span .vxe-default-select,.vxe-form--item.is--span .vxe-default-textarea,.vxe-form--item.is--span .vxe-input,.vxe-form--item.is--span .vxe-select,.vxe-form--item.is--span .vxe-textarea{width:100%}.vxe-form--item.is--error .vxe-default-input,.vxe-form--item.is--error .vxe-default-select,.vxe-form--item.is--error .vxe-default-textarea,.vxe-form--item.is--error .vxe-input>.vxe-input--inner,.vxe-form--item.is--error .vxe-select,.vxe-form--item.is--error .vxe-select.is--active>.vxe-input .vxe-input--inner,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner{border-color:#f56c6c}.vxe-form--item.is--error .vxe-default-input[type=search]:focus,.vxe-form--item.is--error .vxe-default-input[type=text]:focus,.vxe-form--item.is--error .vxe-default-select:focus,.vxe-form--item.is--error .vxe-default-textarea:focus,.vxe-form--item.is--error .vxe-input>.vxe-input--inner:focus,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner:focus{border-color:#f56c6c}.vxe-form--item.is--error .vxe-form--item-valid{opacity:1;transform:scaleY(1)}.vxe-form--item .vxe-form--item-inner{display:flex;flex-direction:row;align-items:center;flex-grow:1}.vxe-form--item .vxe-form--item-inner .vxe-form--item-title{flex-shrink:0}.vxe-form--item .vxe-form--item-inner .vxe-form--item-content{position:relative;flex-grow:1;word-break:break-all}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{outline:0;border:1px solid #dcdfe6;border-radius:4px}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select{height:34px}.vxe-form--item .vxe-default-input{padding:0 .8em}.vxe-form--item .vxe-default-textarea{height:68px;padding:.3em .6em}.vxe-form--item .vxe-default-input[type=number]{padding-right:.2em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text]{padding:0 1em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{color:#606266}.vxe-form--item .vxe-default-input[type=search]:focus,.vxe-form--item .vxe-default-input[type=text]:focus,.vxe-form--item .vxe-default-select:focus,.vxe-form--item .vxe-default-textarea:focus{border:1px solid #409eff}.vxe-form--item .vxe-default-input[type=search][disabled],.vxe-form--item .vxe-default-input[type=text][disabled],.vxe-form--item .vxe-default-select[disabled],.vxe-form--item .vxe-default-textarea[disabled]{cursor:not-allowed;background-color:#f3f3f3}.vxe-form--item .vxe-default-input[type=reset],.vxe-form--item .vxe-default-input[type=submit]{line-height:32px;background-color:#fff;cursor:pointer}.vxe-form--item .vxe-default-input[type=reset]:active,.vxe-form--item .vxe-default-input[type=submit]:active{color:#0d84ff;border-color:#0d84ff}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button{margin-top:6px}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button,.vxe-form--item .vxe-default-input[type=number]::-webkit-inner-spin-button{height:24px}.vxe-form--item .vxe-default-input::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input:-ms-input-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input::placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{width:180px}.vxe-form--item .vxe-default-textarea{resize:none;vertical-align:middle}.vxe-form--item .vxe-default-textarea::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-textarea:-ms-input-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-textarea::placeholder{color:#c0c4cc}.vxe-form .vxe-form--item-inner{min-height:36px}.vxe-form .vxe-form--item-inner>.align--center{text-align:center}.vxe-form .vxe-form--item-inner>.align--left{text-align:left}.vxe-form .vxe-form--item-inner>.align--right{text-align:right}.vxe-form.size--medium{font-size:14px}.vxe-form.size--medium .vxe-form--item-inner{min-height:34px}.vxe-form.size--medium .vxe-default-input[type=reset],.vxe-form.size--medium .vxe-default-input[type=submit]{line-height:30px}.vxe-form.size--medium .vxe-default-input,.vxe-form.size--medium .vxe-default-select{height:32px}.vxe-form.size--medium .vxe-default-textarea{height:64px}.vxe-form.size--small{font-size:13px}.vxe-form.size--small .vxe-form--item-inner{min-height:32px}.vxe-form.size--small .vxe-default-input[type=reset],.vxe-form.size--small .vxe-default-input[type=submit]{line-height:28px}.vxe-form.size--small .vxe-default-input,.vxe-form.size--small .vxe-default-select{height:30px}.vxe-form.size--small .vxe-default-textarea{height:60px}.vxe-form.size--mini{font-size:12px}.vxe-form.size--mini .vxe-form--item-inner{min-height:30px}.vxe-form.size--mini .vxe-default-input[type=reset],.vxe-form.size--mini .vxe-default-input[type=submit]{line-height:26px}.vxe-form.size--mini .vxe-default-input,.vxe-form.size--mini .vxe-default-select{height:28px}.vxe-form.size--mini .vxe-default-textarea{height:56px}
+.vxe-form--item .vxe-default-input[type=reset]:hover,.vxe-form--item .vxe-default-input[type=submit]:hover{color:#73b8ff;border-color:#73b8ff}.vxe-form{position:relative;font-size:14px;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff;text-align:left}.vxe-form--item-row{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form--item-row>.vxe-form--item-col_1{width:4.16667%}.vxe-form--item-row>.vxe-form--item-col_2{width:8.33333%}.vxe-form--item-row>.vxe-form--item-col_3{width:12.5%}.vxe-form--item-row>.vxe-form--item-col_4{width:16.66667%}.vxe-form--item-row>.vxe-form--item-col_5{width:20.83333%}.vxe-form--item-row>.vxe-form--item-col_6{width:25%}.vxe-form--item-row>.vxe-form--item-col_7{width:29.16667%}.vxe-form--item-row>.vxe-form--item-col_8{width:33.33333%}.vxe-form--item-row>.vxe-form--item-col_9{width:37.5%}.vxe-form--item-row>.vxe-form--item-col_10{width:41.66667%}.vxe-form--item-row>.vxe-form--item-col_11{width:45.83333%}.vxe-form--item-row>.vxe-form--item-col_12{width:50%}.vxe-form--item-row>.vxe-form--item-col_13{width:54.16667%}.vxe-form--item-row>.vxe-form--item-col_14{width:58.33333%}.vxe-form--item-row>.vxe-form--item-col_15{width:62.5%}.vxe-form--item-row>.vxe-form--item-col_16{width:66.66667%}.vxe-form--item-row>.vxe-form--item-col_17{width:70.83333%}.vxe-form--item-row>.vxe-form--item-col_18{width:75%}.vxe-form--item-row>.vxe-form--item-col_19{width:79.16667%}.vxe-form--item-row>.vxe-form--item-col_20{width:83.33333%}.vxe-form--item-row>.vxe-form--item-col_21{width:87.5%}.vxe-form--item-row>.vxe-form--item-col_22{width:91.66667%}.vxe-form--item-row>.vxe-form--item-col_23{width:95.83333%}.vxe-form--item-row>.vxe-form--item-col_24{width:100%}.vxe-form-slots{display:none}.vxe-form--item-content,.vxe-form--item-trigger-node{display:inline-block;vertical-align:middle}.vxe-form--item-title{display:flex;flex-direction:row;max-width:320px;padding-right:.8em}.vxe-form--item-title.is--ellipsis .vxe-form--item-title-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-form--item-title .vxe-form--item-title-postfix,.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{flex-shrink:0}.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{cursor:help;vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-prefix{margin-right:.25em}.vxe-form--item-title .vxe-form--item-title-suffix{margin-left:.2em}.vxe-form--item-title .vxe-form--item-title-postfix{display:flex;align-items:center}.vxe-form--item-title .vxe-form--item-title-content{flex-grow:1}.vxe-form--item-title .vxe-form--item-title-label{vertical-align:middle}.vxe-form--item-trigger-node{font-size:12px;min-width:100px;color:#909399;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-form--item-trigger-node .vxe-form--item-trigger-icon{display:inline-block;margin:0 .25em;transition:all .1s}.vxe-form--item-valid{position:absolute;width:100%;font-size:12px;line-height:1.2em;color:#f56c6c;background-color:inherit;z-index:1;opacity:0;transform-origin:center top;transform:scaleY(0);transition:all .2s ease-in-out}.vxe-form .vxe-form--gather{display:inline-flex;flex-direction:row;flex-wrap:wrap;align-content:flex-start}.vxe-form .vxe-form--wrapper{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form .vxe-form--item{display:none}.vxe-form .vxe-form--item.is--active:not(.is--hidden){display:inline-flex}.vxe-form--item.is--padding{padding:.6em}.vxe-form--item.is--padding.is--vertical{padding:.4em .6em}.vxe-form--item.is--colon .vxe-form--item-title-postfix:after{content:":";font-weight:400;margin-left:.2em}.vxe-form--item.is--asterisk.is--required .vxe-form--item-title-content:before{content:"*";color:#f56c6c;font-family:Verdana,Arial,Tahoma;margin-right:.2em;font-weight:400;vertical-align:middle}.vxe-form--item.is--vertical .vxe-form--item-inner{flex-direction:column;align-items:initial}.vxe-form--item.is--vertical .vxe-form--item-inner .vxe-form--item-title{height:2.5em;line-height:2.3em;padding-right:0;max-width:none}.vxe-form--item.is--vertical .vxe-form--item-inner .vxe-form--item-title-content{flex-grow:initial}.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),.vxe-form--item.is--span .vxe-default-select,.vxe-form--item.is--span .vxe-default-textarea,.vxe-form--item.is--span .vxe-input,.vxe-form--item.is--span .vxe-select,.vxe-form--item.is--span .vxe-textarea{width:100%}.vxe-form--item.is--error .vxe-default-input,.vxe-form--item.is--error .vxe-default-select,.vxe-form--item.is--error .vxe-default-textarea,.vxe-form--item.is--error .vxe-input>.vxe-input--inner,.vxe-form--item.is--error .vxe-select,.vxe-form--item.is--error .vxe-select.is--active>.vxe-input .vxe-input--inner,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner{border-color:#f56c6c}.vxe-form--item.is--error .vxe-default-input[type=search]:focus,.vxe-form--item.is--error .vxe-default-input[type=text]:focus,.vxe-form--item.is--error .vxe-default-select:focus,.vxe-form--item.is--error .vxe-default-textarea:focus,.vxe-form--item.is--error .vxe-input>.vxe-input--inner:focus,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner:focus{border-color:#f56c6c}.vxe-form--item.is--error .vxe-form--item-valid{opacity:1;transform:scaleY(1)}.vxe-form--item .vxe-form--item-inner{display:flex;flex-direction:row;align-items:center;flex-grow:1}.vxe-form--item .vxe-form--item-inner .vxe-form--item-title{flex-shrink:0}.vxe-form--item .vxe-form--item-inner .vxe-form--item-content{position:relative;flex-grow:1;word-break:break-all}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{outline:0;border:1px solid #dcdfe6;border-radius:4px}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select{height:34px}.vxe-form--item .vxe-default-input{padding:0 .8em}.vxe-form--item .vxe-default-textarea{height:68px;padding:.3em .6em}.vxe-form--item .vxe-default-input[type=number]{padding-right:.2em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text]{padding:0 1em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{color:#606266}.vxe-form--item .vxe-default-input[type=search]:focus,.vxe-form--item .vxe-default-input[type=text]:focus,.vxe-form--item .vxe-default-select:focus,.vxe-form--item .vxe-default-textarea:focus{border:1px solid #409eff}.vxe-form--item .vxe-default-input[type=search][disabled],.vxe-form--item .vxe-default-input[type=text][disabled],.vxe-form--item .vxe-default-select[disabled],.vxe-form--item .vxe-default-textarea[disabled]{cursor:not-allowed;background-color:#f3f3f3}.vxe-form--item .vxe-default-input[type=reset],.vxe-form--item .vxe-default-input[type=submit]{line-height:32px;background-color:#fff;cursor:pointer}.vxe-form--item .vxe-default-input[type=reset]:active,.vxe-form--item .vxe-default-input[type=submit]:active{color:#0d84ff;border-color:#0d84ff}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button{margin-top:6px}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button,.vxe-form--item .vxe-default-input[type=number]::-webkit-inner-spin-button{height:24px}.vxe-form--item .vxe-default-input::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input:-ms-input-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input::placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{width:180px}.vxe-form--item .vxe-default-textarea{resize:none;vertical-align:middle}.vxe-form--item .vxe-default-textarea::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-textarea:-ms-input-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-textarea::placeholder{color:#c0c4cc}.vxe-form .vxe-form--item-inner{min-height:36px}.vxe-form .vxe-form--item-inner>.align--center{text-align:center}.vxe-form .vxe-form--item-inner>.align--left{text-align:left}.vxe-form .vxe-form--item-inner>.align--right{text-align:right}.vxe-form.size--medium{font-size:14px}.vxe-form.size--medium .vxe-form--item-inner{min-height:34px}.vxe-form.size--medium .vxe-default-input[type=reset],.vxe-form.size--medium .vxe-default-input[type=submit]{line-height:30px}.vxe-form.size--medium .vxe-default-input,.vxe-form.size--medium .vxe-default-select{height:32px}.vxe-form.size--medium .vxe-default-textarea{height:64px}.vxe-form.size--small{font-size:13px}.vxe-form.size--small .vxe-form--item-inner{min-height:32px}.vxe-form.size--small .vxe-default-input[type=reset],.vxe-form.size--small .vxe-default-input[type=submit]{line-height:28px}.vxe-form.size--small .vxe-default-input,.vxe-form.size--small .vxe-default-select{height:30px}.vxe-form.size--small .vxe-default-textarea{height:60px}.vxe-form.size--mini{font-size:12px}.vxe-form.size--mini .vxe-form--item-inner{min-height:30px}.vxe-form.size--mini .vxe-default-input[type=reset],.vxe-form.size--mini .vxe-default-input[type=submit]{line-height:26px}.vxe-form.size--mini .vxe-default-input,.vxe-form.size--mini .vxe-default-select{height:28px}.vxe-form.size--mini .vxe-default-textarea{height:56px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.19",
+  "version": "3.8.21",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/custom/src/panel.js

@@ -473,7 +473,8 @@ const renderPopupPanel = (h, _vm) => {
                       h('vxe-tooltip', {
                         props: {
                           enterable: true,
-                          content: GlobalConfig.i18n('vxe.custom.setting.sortHelpTip')
+                          content: GlobalConfig.i18n('vxe.custom.setting.sortHelpTip'),
+                          popupClassName: 'vxe-table--ignore-clear'
                         },
                         scopedSlots: {
                           default: () => {

package/packages/edit/src/mixin.js

@@ -619,25 +619,26 @@ export default {
       const { editRender } = column
       if (isEnableConf(editRender)) {
         const compRender = VXETable.renderer.get(editRender.name)
-        let { autofocus, autoselect } = editRender
+        let autoFocus = editRender.autofocus || editRender.autoFocus
+        let autoSelect = editRender.autoSelect || editRender.autoselect
         let inputElem
-        if (!autofocus && compRender) {
-          autofocus = compRender.tableAutofocus || compRender.autofocus
+        if (!autoFocus && compRender) {
+          autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autoFocus || compRender.autofocus
         }
-        if (!autoselect && compRender) {
-          autoselect = compRender.tableAutoSelect || compRender.autoselect
+        if (!autoSelect && compRender) {
+          autoSelect = compRender.tableAutoSelect || compRender.autoSelect || compRender.autoselect
         }
         // 如果指定了聚焦 class
-        if (XEUtils.isFunction(autofocus)) {
-          inputElem = autofocus.call(this, params)
-        } else if (autofocus) {
-          inputElem = cell.querySelector(autofocus)
+        if (XEUtils.isFunction(autoFocus)) {
+          inputElem = autoFocus.call(this, params)
+        } else if (autoFocus) {
+          inputElem = cell.querySelector(autoFocus)
           if (inputElem) {
             inputElem.focus()
           }
         }
         if (inputElem) {
-          if (autoselect) {
+          if (autoSelect) {
             inputElem.select()
           } else {
             // 保持一致行为，光标移到末端

package/packages/export/src/mixin.js

@@ -42,7 +42,7 @@ function hasTreeChildren ($xetable, row) {
   return row[childrenField] && row[childrenField].length > 0
 }
 
-function getSeq ($xetable, row, $rowIndex, column, $columnIndex) {
+function getSeq ($xetable, cellValue, row, $rowIndex, column, $columnIndex) {
   const seqOpts = $xetable.seqOpts
   const seqMethod = seqOpts.seqMethod || column.seqMethod
   if (seqMethod) {
@@ -55,7 +55,7 @@ function getSeq ($xetable, row, $rowIndex, column, $columnIndex) {
       $columnIndex
     })
   }
-  return $xetable.getRowSeq(row)
+  return cellValue
 }
 
 function defaultFilterExportColumn (column) {
@@ -115,9 +115,11 @@ function getLabelData ($xetable, opts, columns, datas) {
             cellValue = bodyExportMethod({ $table: $xetable, row, column, options: opts })
           } else {
             switch (column.type) {
-              case 'seq':
-                cellValue = mode === 'all' ? path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('') : getSeq($xetable, row, $rowIndex, column, $columnIndex)
+              case 'seq': {
+                const seqValue = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+                cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex)
                 break
+              }
               case 'checkbox':
                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
                 item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''
@@ -164,16 +166,18 @@ function getLabelData ($xetable, opts, columns, datas) {
       if (!exportLabelMethod && renderOpts && renderOpts.name) {
         const compConf = VXETable.renderer.get(renderOpts.name)
         if (compConf) {
-          exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod
+          exportLabelMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod
         }
       }
       if (exportLabelMethod) {
         cellValue = exportLabelMethod({ $table: $xetable, row, column, options: opts })
       } else {
         switch (column.type) {
-          case 'seq':
-            cellValue = mode === 'all' ? $rowIndex + 1 : getSeq($xetable, row, $rowIndex, column, $columnIndex)
+          case 'seq': {
+            const seqValue = $rowIndex + 1
+            cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex)
             break
+          }
           case 'checkbox':
             cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
             item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''

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

@@ -27,8 +27,8 @@ const VxeFormConfigItem = {
   },
   render (h) {
     const { _e, $xeform, itemConfig: item } = this
-    const { rules, data, disabled, readonly, collapseAll, validOpts, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow, vertical: allVertical } = $xeform
-    const { slots, title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, vertical, children, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
+    const { rules, data, disabled, readonly, collapseAll, validOpts, titleBold: allTitleBold, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow, vertical: allVertical, padding: allPadding } = $xeform
+    const { slots, title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, vertical, padding, children, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
     const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
     const itemClassName = compConf ? (compConf.formItemClassName || compConf.itemClassName) : ''
     const itemStyle = compConf ? (compConf.formItemStyle || compConf.itemStyle) : null
@@ -38,18 +38,21 @@ const VxeFormConfigItem = {
     const itemTitleStyle = compConf ? (compConf.formItemTitleStyle || compConf.itemTitleStyle) : null
     const span = item.span || $xeform.span
     const align = item.align || $xeform.align
+    const itemPadding = XEUtils.eqNull(padding) ? allPadding : padding
+    const itemVertical = XEUtils.eqNull(vertical) ? allVertical : vertical
+    const titleBold = XEUtils.eqNull(item.titleBold) ? allTitleBold : item.titleBold
     const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
-    const titleWidth = XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth
+    const titleWidth = itemVertical ? null : (XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth)
     const titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon
     const titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk
-    const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
-    const itemVertical = (XEUtils.isUndefined(vertical) || XEUtils.isNull(vertical)) ? allVertical : vertical
+    const itemOverflow = XEUtils.eqNull(titleOverflow) ? allTitleOverflow : titleOverflow
     const ovEllipsis = itemOverflow === 'ellipsis'
     const ovTitle = itemOverflow === 'title'
     const ovTooltip = itemOverflow === true || itemOverflow === 'tooltip'
     const hasEllipsis = ovTitle || ovTooltip || ovEllipsis
     const params = { data, disabled, readonly, field, property: field, item, $form: $xeform, $grid: $xeform.xegrid }
-    let isRequired
+    let isRequired = false
+    let isValid = false
     if (visible === false) {
       return _e()
     }
@@ -70,7 +73,8 @@ const VxeFormConfigItem = {
     }
     if (!readonly && rules) {
       const itemRules = rules[field]
-      if (itemRules) {
+      if (itemRules && itemRules.length) {
+        isValid = true
         isRequired = itemRules.some(rule => rule.required)
       }
     }
@@ -101,8 +105,11 @@ const VxeFormConfigItem = {
         {
           'is--title': title,
           'is--colon': titleColon,
+          'is--bold': titleBold,
+          'is--padding': itemPadding,
           'is--vertical': itemVertical,
           'is--asterisk': titleAsterisk,
+          'is--valid': isValid,
           'is--required': isRequired,
           'is--hidden': folding && collapseAll,
           'is--active': isActivetem($xeform, item),

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

@@ -12,6 +12,10 @@ const props = {
   size: String,
   span: [String, Number],
   align: String,
+  titleBold: {
+    type: Boolean,
+    default: null
+  },
   titleAlign: {
     type: String,
     default: null
@@ -36,6 +40,10 @@ const props = {
     type: Boolean,
     default: null
   },
+  padding: {
+    type: Boolean,
+    default: null
+  },
   className: [String, Function],
   contentClassName: [String, Function],
   contentStyle: [Object, Function],
@@ -64,8 +72,8 @@ Object.keys(props).forEach(name => {
 })
 
 const renderItem = (h, _vm, item, slots) => {
-  const { _e, rules, data, disabled, readonly, collapseAll, validOpts, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow, vertical: allVertical } = _vm
-  const { title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, vertical, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
+  const { _e, rules, data, disabled, readonly, collapseAll, validOpts, titleBold: allTitleBold, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow, vertical: allVertical, padding: allPadding } = _vm
+  const { title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, vertical, padding, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
   const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
   const itemClassName = compConf ? (compConf.formItemClassName || compConf.itemClassName) : ''
   const itemStyle = compConf ? (compConf.formItemStyle || compConf.itemStyle) : null
@@ -75,24 +83,28 @@ const renderItem = (h, _vm, item, slots) => {
   const itemTitleStyle = compConf ? (compConf.formItemTitleStyle || compConf.itemTitleStyle) : null
   const span = item.span || _vm.span
   const align = item.align || _vm.align
+  const itemPadding = XEUtils.eqNull(padding) ? allPadding : padding
+  const itemVertical = XEUtils.eqNull(vertical) ? allVertical : vertical
+  const titleBold = XEUtils.eqNull(item.titleBold) ? allTitleBold : item.titleBold
   const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
-  const titleWidth = XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth
+  const titleWidth = itemVertical ? null : (XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth)
   const titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon
   const titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk
-  const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
-  const itemVertical = (XEUtils.isUndefined(vertical) || XEUtils.isNull(vertical)) ? allVertical : vertical
+  const itemOverflow = XEUtils.eqNull(titleOverflow) ? allTitleOverflow : titleOverflow
   const ovEllipsis = itemOverflow === 'ellipsis'
   const ovTitle = itemOverflow === 'title'
   const ovTooltip = itemOverflow === true || itemOverflow === 'tooltip'
   const hasEllipsis = ovTitle || ovTooltip || ovEllipsis
   const params = { data, disabled, readonly, field, property: field, item, $form: _vm, $grid: _vm.xegrid }
-  let isRequired
+  let isRequired = false
+  let isValid = false
   if (visible === false) {
     return _e()
   }
   if (!readonly && rules) {
     const itemRules = rules[field]
-    if (itemRules) {
+    if (itemRules && itemRules.length) {
+      isValid = true
       isRequired = itemRules.some(rule => rule.required)
     }
   }
@@ -123,8 +135,11 @@ const renderItem = (h, _vm, item, slots) => {
       {
         'is--title': title,
         'is--colon': titleColon,
+        'is--bold': titleBold,
+        'is--padding': itemPadding,
         'is--vertical': itemVertical,
         'is--asterisk': titleAsterisk,
+        'is--valid': isValid,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
         'is--active': isActivetem(_vm, item),

package/packages/form/src/form.js

@@ -74,6 +74,7 @@ export default {
     size: { type: String, default: () => GlobalConfig.form.size || GlobalConfig.size },
     span: { type: [String, Number], default: () => GlobalConfig.form.span },
     align: { type: String, default: () => GlobalConfig.form.align },
+    titleBold: { type: String, default: () => GlobalConfig.form.titleBold },
     titleAlign: { type: String, default: () => GlobalConfig.form.titleAlign },
     titleWidth: { type: [String, Number], default: () => GlobalConfig.form.titleWidth },
     titleColon: { type: Boolean, default: () => GlobalConfig.form.titleColon },
@@ -83,6 +84,7 @@ export default {
       type: Boolean,
       default: null
     },
+    padding: { type: Boolean, default: () => GlobalConfig.form.padding },
     className: [String, Function],
     disabled: Boolean,
     readonly: Boolean,
@@ -157,6 +159,9 @@ export default {
         [`size--${vSize}`]: vSize,
         'is--loading': loading
       }],
+      attrs: {
+        spellcheck: false
+      },
       on: {
         submit: this.submitEvent,
         reset: this.resetEvent
@@ -380,10 +385,12 @@ export default {
         return this.$nextTick()
       }
       let fields = []
-      if (XEUtils.isArray(fieldOrItem)) {
-        fields = fieldOrItem
-      } else {
-        fields = [fieldOrItem]
+      if (fieldOrItem) {
+        if (XEUtils.isArray(fieldOrItem)) {
+          fields = fieldOrItem
+        } else {
+          fields = [fieldOrItem]
+        }
       }
       return this.beginValidate(fields.map(field => handleFieldOrItem(this, field)), '', callback)
     },
@@ -569,13 +576,10 @@ export default {
           if (!i) {
             DomTools.scrollToView($el.querySelector(`.${item.id}`))
           }
+          const autoFocus = itemRender.autoFocus || itemRender.autofocus || (compConf ? compConf.formItemAutoFocus : null)
           // 如果指定了聚焦 class
-          if (itemRender.autofocus) {
-            inputElem = $el.querySelector(`.${item.id} ${itemRender.autofocus}`)
-          }
-          // 渲染器的聚焦处理
-          if (!inputElem && compConf && compConf.autofocus) {
-            inputElem = $el.querySelector(`.${item.id} ${compConf.autofocus}`)
+          if (autoFocus) {
+            inputElem = $el.querySelector(`.${item.id} ${autoFocus}`)
           }
           if (inputElem) {
             inputElem.focus()

package/packages/form/src/util.js

@@ -14,6 +14,8 @@ class ItemConfig {
       titleAlign: item.titleAlign,
       titleWidth: item.titleWidth,
       titleColon: item.titleColon,
+      vertical: item.vertical,
+      padding: item.padding,
       titleAsterisk: item.titleAsterisk,
       titlePrefix: item.titlePrefix,
       titleSuffix: item.titleSuffix,

package/packages/grid/src/grid.js

@@ -445,10 +445,10 @@ export default {
     }
   },
   created () {
-    const { data, formOpts, proxyOpts, proxyConfig } = this
-    if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
-      errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
-    }
+    // const { data, formOpts, proxyOpts, proxyConfig } = this
+    // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
+    //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
+    // }
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (this.toolbar) {
@@ -538,7 +538,7 @@ export default {
       const { proxyInited, proxyConfig, proxyOpts, formConfig, formOpts } = this
       if (proxyConfig) {
         if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
-          const formData = {}
+          const fData = {}
           formOpts.items.forEach(item => {
             const { field, itemRender } = item
             if (field) {
@@ -551,10 +551,10 @@ export default {
                   itemValue = defaultValue
                 }
               }
-              formData[field] = itemValue
+              fData[field] = itemValue
             }
           })
-          this.formData = formData
+          this.formData = fData
         }
         if (!proxyInited && proxyOpts.autoLoad !== false) {
           this.proxyInited = true
@@ -575,10 +575,11 @@ export default {
      * @param {String/Object} code 字符串或对象
      */
     commitProxy (proxyTarget, ...args) {
-      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isRespMsg, isActiveMsg, validConfig, pagerOpts } = this
+      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, isRespMsg, isActiveMsg, validConfig, pagerOpts } = this
       const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts
       const resConfigs = proxyOpts.response || proxyOpts.props || {}
       const $xetable = $refs.xTable
+      const formData = this.getFormData()
       let button
       let code
       if (XEUtils.isString(proxyTarget)) {
@@ -936,6 +937,10 @@ export default {
       }
       return Promise.resolve()
     },
+    getFormData () {
+      const { proxyConfig, proxyOpts, formOpts, formData } = this
+      return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data
+    },
     getFormItems (itemIndex) {
       const { formConfig, formOpts } = this
       const itemList = []
@@ -1078,7 +1083,7 @@ export default {
         return {
           data: this.tableData,
           filter: this.filterData,
-          form: this.formData,
+          form: this.getFormData(),
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,

package/packages/input/src/input.js

@@ -1165,7 +1165,8 @@ export default {
           maxlength: inpMaxlength,
           readonly: inpReadonly,
           disabled,
-          autocomplete: autoComplete || autocomplete
+          autocomplete: autoComplete || autocomplete,
+          spellcheck: false
         },
         on: {
           keydown: this.keydownEvent,