vxe-table 4.7.41 → 4.7.43

package/lib/table/render/index.js

@@ -310,7 +310,7 @@ function nativeEditRender(renderOpts, params) {
     value: cellValue
   }), getNativeEditOns(renderOpts, params)))];
 }
-function defaultCellRender(renderOpts, params) {
+function buttonCellRender(renderOpts, params) {
   return [(0, _vue.h)(getDefaultComponent(renderOpts), Object.assign(Object.assign({}, getCellEditProps(renderOpts, params, null)), getComponentOns(renderOpts, params)))];
 }
 function defaultEditRender(renderOpts, params) {
@@ -321,6 +321,19 @@ function defaultEditRender(renderOpts, params) {
   const cellValue = (0, _util.getCellValue)(row, column);
   return [(0, _vue.h)(getDefaultComponent(renderOpts), Object.assign(Object.assign({}, getCellEditProps(renderOpts, params, cellValue)), getEditOns(renderOpts, params)))];
 }
+function radioAndCheckboxEditRender(renderOpts, params) {
+  const {
+    options
+  } = renderOpts;
+  const {
+    row,
+    column
+  } = params;
+  const cellValue = (0, _util.getCellValue)(row, column);
+  return [(0, _vue.h)(getDefaultComponent(renderOpts), Object.assign(Object.assign({
+    options
+  }, getCellEditProps(renderOpts, params, cellValue)), getEditOns(renderOpts, params)))];
+}
 /**
  * 已废弃
  * @deprecated
@@ -659,7 +672,7 @@ renderer.mixin({
     autofocus: '.vxe-textarea--inner'
   },
   VxeButton: {
-    renderDefault: defaultCellRender
+    renderDefault: buttonCellRender
   },
   VxeButtonGroup: {
     renderDefault(renderOpts, params) {
@@ -703,6 +716,12 @@ renderer.mixin({
     defaultFilterMethod: handleFilterMethod,
     exportMethod: handleExportSelectMethod
   },
+  VxeRadioGroup: {
+    renderDefault: radioAndCheckboxEditRender
+  },
+  VxeCheckboxGroup: {
+    renderDefault: radioAndCheckboxEditRender
+  },
   VxeSwitch: {
     autofocus: '.vxe-switch--button',
     renderEdit: defaultEditRender,

package/lib/table/render/index.min.js

@@ -1 +1 @@
-"use strict";var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../../table/src/util"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,renderer,getI18n}=_ui.VxeUI,componentDefaultModelProp="modelValue",defaultCompProps={transfer:!0};function getModelEvent(e){switch(e.name){case"input":case"textarea":return"input"}return"update:modelValue"}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{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+t.type))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getDefaultComponent({name:e}){return(0,_vue.resolveComponent)(e)}function getOldComponent({name:e}){return(0,_vue.resolveComponent)(getOldComponentName(e))}function handleConfirmFilter(e,t,n){e=e.$panel;e.changeOption({},t,n)}function getNativeAttrs(e){let{name:t,attrs:n}=e;return n="input"===t?Object.assign({type:"text"},n):n}function getInputImmediateModel(e){var{name:e,immediate:t,props:n}=e;return t||("VxeInput"===e||"$input"===e?(t=(n||{})["type"],!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,n,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function getCellEditFilterProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,n){e=e.placeholder;return[(0,_vue.h)("span",{class:"vxe-cell--label"},e&&(0,_utils.isEmptyValue)(n)?[(0,_vue.h)("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(e),1))]:(0,_utils.formatText)(n,1))]}function getElementOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),a=getChangeEvent(e),i=a===o,u={};return l&&_xeUtils.default.objectEach(l,(t,e)=>{u[(0,_vn.getOnName)(e)]=function(...e){t(n,...e)}}),t&&(u[(0,_vn.getOnName)(o)]=function(e){t(e),i&&r&&r(e),l&&l[o]&&l[o](n,e)}),!i&&r&&(u[(0,_vn.getOnName)(a)]=function(...e){r(...e),l&&l[a]&&l[a](n,...e)}),u}function getComponentOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),a=getChangeEvent(e),i={};return _xeUtils.default.objectEach(l,(t,e)=>{i[(0,_vn.getOnName)(e)]=function(...e){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(n,...e)}}),t&&(i[(0,_vn.getOnName)(o)]=function(e){t(e),l&&l[o]&&l[o](n,e)}),r&&(i[(0,_vn.getOnName)(a)]=function(...e){r(...e),l&&l[a]&&l[a](n,...e)}),i}function getEditOns(e,t){const{$table:n,row:r,column:l}=t,o=e["name"],a=l["model"],i=isImmediateCell(e,t);return getComponentOns(e,t,e=>{i?(0,_util.setCellValue)(r,l,e):(a.update=!0,a.value=e)},e=>{!i&&["VxeInput","VxeTextarea","$input","$textarea"].includes(o)?(e=e.value,a.update=!0,a.value=e,n.updateStatus(t,e)):n.updateStatus(t)})}function getFilterOns(e,t,n){return getComponentOns(e,t,e=>{n.data=e},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeEditOns(t,n){const{$table:r,row:l,column:o}=n,a=o["model"];return getElementOns(t,n,e=>{e=e.target.value;isImmediateCell(t,n)?(0,_util.setCellValue)(l,o,e):(a.update=!0,a.value=e)},e=>{e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getElementOns(e,t,e=>{n.data=e.target.value},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function nativeEditRender(e,t){var{row:n,column:r}=t,l=e["name"],n=isImmediateCell(e,t)?(0,_util.getCellValue)(n,r):r.model.value;return[(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({class:"vxe-default-"+l},getNativeAttrs(e)),{value:n}),getNativeEditOns(e,t)))]}function defaultCellRender(e,t){return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function defaultEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function oldEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function oldButtonEditRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function oldButtonsEditRender(e,t){return e.children.map(e=>oldButtonEditRender(e,t)[0])}function renderNativeOptgroups(n,r,l){var{optionGroups:e,optionGroupProps:t={}}=n;const o=t.options||"options",a=t.label||"label";return e.map((e,t)=>(0,_vue.h)("optgroup",{key:t,label:e[a]},l(e[o],n,r)))}function renderNativeOptions(e,t,n){var{optionProps:r={}}=t,{row:l,column:o}=n;const a=r.label||"label",i=r.value||"value",u=r.disabled||"disabled",d=isImmediateCell(t,n)?(0,_util.getCellValue)(l,o):o.model.value;return e.map((e,t)=>(0,_vue.h)("option",{key:t,value:e[i],disabled:e[u],selected:e[i]==d},e[a]))}function nativeFilterRender(n,r){var e=r["column"];const l=n["name"],o=getNativeAttrs(n);return e.filters.map((e,t)=>(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({key:t,class:"vxe-default-"+l},o),{value:e.data}),getNativeFilterOns(n,r,e))))}function defaultFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function oldFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function handleFilterMethod({option:e,row:t,column:n}){e=e.data;return _xeUtils.default.get(t,n.property)==e}function nativeSelectEditRender(e,t){return[(0,_vue.h)("select",Object.assign(Object.assign({class:"vxe-default-select"},getNativeAttrs(e)),getNativeEditOns(e,t)),e.optionGroups?renderNativeOptgroups(e,t,renderNativeOptions):renderNativeOptions(e.options,e,t))]}function defaultSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i})),getEditOns(e,t)))]}function oldSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i})),getEditOns(e,t)))]}function getSelectCellValue(e,{row:t,column:n}){const{props:r={},options:l,optionGroups:o,optionProps:a={},optionGroupProps:i={}}=e;e=_xeUtils.default.get(t,n.property);let u;const d=a.label||"label",s=a.value||"value";return(0,_utils.isEmptyValue)(e)?"":_xeUtils.default.map(r.multiple?e:[e],o?t=>{var n=i.options||"options";for(let e=0;e<o.length&&!(u=_xeUtils.default.find(o[e][n],e=>e[s]==t));e++);return u?u[d]:t}:t=>(u=_xeUtils.default.find(l,e=>e[s]==t))?u[d]:t).join(", ")}function handleExportSelectMethod(e){var{row:t,column:n,options:r}=e;return r.original?(0,_util.getCellValue)(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}renderer.mixin({input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleFilterMethod},textarea:{autofocus:"textarea",renderEdit:nativeEditRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(n,r){var e=r["column"];return e.filters.map((e,t)=>(0,_vue.h)("select",Object.assign(Object.assign({key:t,class:"vxe-default-select"},getNativeAttrs(n)),getNativeFilterOns(n,r,e)),n.optionGroups?renderNativeOptgroups(n,r,renderNativeOptions):renderNativeOptions(n.options,n,r)))},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeInput:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,a=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let i=_xeUtils.default.get(l,o.property);if(i)switch(r.type){case"date":case"week":case"month":case"quarter":case"year":i=getLabelFormatDate(i,r);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,a),a)}return getCellLabelVNs(e,t,i)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeNumberInput:{autofocus:".vxe-number-input--inner",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t,o=n.digits||(null==(o=getConfig().numberInput)?void 0:o.digits)||2;let a=_xeUtils.default.get(r,l.property);return getCellLabelVNs(e,t,a=a&&"float"===n.type?_xeUtils.default.toFixed(_xeUtils.default.floor(a,o),o):a)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeDatePicker:{autofocus:".vxe-date-picker--inner",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t;let o=_xeUtils.default.get(r,l.property);if(o)switch(n.type){case"date":case"week":case"month":case"quarter":case"year":o=getLabelFormatDate(o,n)}return getCellLabelVNs(e,t,o)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeTextarea:{autofocus:".vxe-textarea--inner"},VxeButton:{renderDefault:defaultCellRender},VxeButtonGroup:{renderDefault(e,t){var n=e["options"];return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}},VxeSelect:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeSwitch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender},VxeUpload:{renderDefault:defaultEditRender},$input:{autofocus:".vxe-input--inner",renderEdit:oldEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,a=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let i=_xeUtils.default.get(l,o.property);if(i)switch(r.type){case"date":case"week":case"month":case"year":i=getLabelFormatDate(i,r);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,a),a)}return getCellLabelVNs(e,t,i)},renderDefault:oldEditRender,renderFilter:oldFilterRender,defaultFilterMethod:handleFilterMethod},$textarea:{autofocus:".vxe-textarea--inner"},$button:{renderDefault:oldButtonEditRender},$buttons:{renderDefault:oldButtonsEditRender},$select:{autofocus:".vxe-input--inner",renderEdit:oldSelectEditRender,renderDefault:oldSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input"},$checkbox:{autofocus:".vxe-checkbox--input"},$switch:{autofocus:".vxe-switch--button",renderEdit:oldEditRender,renderDefault:oldEditRender}});
+"use strict";var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../../table/src/util"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,renderer,getI18n}=_ui.VxeUI,componentDefaultModelProp="modelValue",defaultCompProps={transfer:!0};function getModelEvent(e){switch(e.name){case"input":case"textarea":return"input"}return"update:modelValue"}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{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+t.type))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getDefaultComponent({name:e}){return(0,_vue.resolveComponent)(e)}function getOldComponent({name:e}){return(0,_vue.resolveComponent)(getOldComponentName(e))}function handleConfirmFilter(e,t,n){e=e.$panel;e.changeOption({},t,n)}function getNativeAttrs(e){let{name:t,attrs:n}=e;return n="input"===t?Object.assign({type:"text"},n):n}function getInputImmediateModel(e){var{name:e,immediate:t,props:n}=e;return t||("VxeInput"===e||"$input"===e?(t=(n||{})["type"],!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,n,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function getCellEditFilterProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,n){e=e.placeholder;return[(0,_vue.h)("span",{class:"vxe-cell--label"},e&&(0,_utils.isEmptyValue)(n)?[(0,_vue.h)("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(e),1))]:(0,_utils.formatText)(n,1))]}function getElementOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),i=getChangeEvent(e),a=i===o,u={};return l&&_xeUtils.default.objectEach(l,(t,e)=>{u[(0,_vn.getOnName)(e)]=function(...e){t(n,...e)}}),t&&(u[(0,_vn.getOnName)(o)]=function(e){t(e),a&&r&&r(e),l&&l[o]&&l[o](n,e)}),!a&&r&&(u[(0,_vn.getOnName)(i)]=function(...e){r(...e),l&&l[i]&&l[i](n,...e)}),u}function getComponentOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),i=getChangeEvent(e),a={};return _xeUtils.default.objectEach(l,(t,e)=>{a[(0,_vn.getOnName)(e)]=function(...e){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(n,...e)}}),t&&(a[(0,_vn.getOnName)(o)]=function(e){t(e),l&&l[o]&&l[o](n,e)}),r&&(a[(0,_vn.getOnName)(i)]=function(...e){r(...e),l&&l[i]&&l[i](n,...e)}),a}function getEditOns(e,t){const{$table:n,row:r,column:l}=t,o=e["name"],i=l["model"],a=isImmediateCell(e,t);return getComponentOns(e,t,e=>{a?(0,_util.setCellValue)(r,l,e):(i.update=!0,i.value=e)},e=>{!a&&["VxeInput","VxeTextarea","$input","$textarea"].includes(o)?(e=e.value,i.update=!0,i.value=e,n.updateStatus(t,e)):n.updateStatus(t)})}function getFilterOns(e,t,n){return getComponentOns(e,t,e=>{n.data=e},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeEditOns(t,n){const{$table:r,row:l,column:o}=n,i=o["model"];return getElementOns(t,n,e=>{e=e.target.value;isImmediateCell(t,n)?(0,_util.setCellValue)(l,o,e):(i.update=!0,i.value=e)},e=>{e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getElementOns(e,t,e=>{n.data=e.target.value},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function nativeEditRender(e,t){var{row:n,column:r}=t,l=e["name"],n=isImmediateCell(e,t)?(0,_util.getCellValue)(n,r):r.model.value;return[(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({class:"vxe-default-"+l},getNativeAttrs(e)),{value:n}),getNativeEditOns(e,t)))]}function buttonCellRender(e,t){return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function defaultEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function radioAndCheckboxEditRender(e,t){var n=e["options"],{row:r,column:l}=t,r=(0,_util.getCellValue)(r,l);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,r)),getEditOns(e,t)))]}function oldEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function oldButtonEditRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function oldButtonsEditRender(e,t){return e.children.map(e=>oldButtonEditRender(e,t)[0])}function renderNativeOptgroups(n,r,l){var{optionGroups:e,optionGroupProps:t={}}=n;const o=t.options||"options",i=t.label||"label";return e.map((e,t)=>(0,_vue.h)("optgroup",{key:t,label:e[i]},l(e[o],n,r)))}function renderNativeOptions(e,t,n){var{optionProps:r={}}=t,{row:l,column:o}=n;const i=r.label||"label",a=r.value||"value",u=r.disabled||"disabled",d=isImmediateCell(t,n)?(0,_util.getCellValue)(l,o):o.model.value;return e.map((e,t)=>(0,_vue.h)("option",{key:t,value:e[a],disabled:e[u],selected:e[a]==d},e[i]))}function nativeFilterRender(n,r){var e=r["column"];const l=n["name"],o=getNativeAttrs(n);return e.filters.map((e,t)=>(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({key:t,class:"vxe-default-"+l},o),{value:e.data}),getNativeFilterOns(n,r,e))))}function defaultFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function oldFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function handleFilterMethod({option:e,row:t,column:n}){e=e.data;return _xeUtils.default.get(t,n.property)==e}function nativeSelectEditRender(e,t){return[(0,_vue.h)("select",Object.assign(Object.assign({class:"vxe-default-select"},getNativeAttrs(e)),getNativeEditOns(e,t)),e.optionGroups?renderNativeOptgroups(e,t,renderNativeOptions):renderNativeOptions(e.options,e,t))]}function defaultSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a})),getEditOns(e,t)))]}function oldSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a})),getEditOns(e,t)))]}function getSelectCellValue(e,{row:t,column:n}){const{props:r={},options:l,optionGroups:o,optionProps:i={},optionGroupProps:a={}}=e;e=_xeUtils.default.get(t,n.property);let u;const d=i.label||"label",s=i.value||"value";return(0,_utils.isEmptyValue)(e)?"":_xeUtils.default.map(r.multiple?e:[e],o?t=>{var n=a.options||"options";for(let e=0;e<o.length&&!(u=_xeUtils.default.find(o[e][n],e=>e[s]==t));e++);return u?u[d]:t}:t=>(u=_xeUtils.default.find(l,e=>e[s]==t))?u[d]:t).join(", ")}function handleExportSelectMethod(e){var{row:t,column:n,options:r}=e;return r.original?(0,_util.getCellValue)(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}renderer.mixin({input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleFilterMethod},textarea:{autofocus:"textarea",renderEdit:nativeEditRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(n,r){var e=r["column"];return e.filters.map((e,t)=>(0,_vue.h)("select",Object.assign(Object.assign({key:t,class:"vxe-default-select"},getNativeAttrs(n)),getNativeFilterOns(n,r,e)),n.optionGroups?renderNativeOptgroups(n,r,renderNativeOptions):renderNativeOptions(n.options,n,r)))},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeInput:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,i=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let a=_xeUtils.default.get(l,o.property);if(a)switch(r.type){case"date":case"week":case"month":case"quarter":case"year":a=getLabelFormatDate(a,r);break;case"float":a=_xeUtils.default.toFixed(_xeUtils.default.floor(a,i),i)}return getCellLabelVNs(e,t,a)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeNumberInput:{autofocus:".vxe-number-input--inner",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t,o=n.digits||(null==(o=getConfig().numberInput)?void 0:o.digits)||2;let i=_xeUtils.default.get(r,l.property);return getCellLabelVNs(e,t,i=i&&"float"===n.type?_xeUtils.default.toFixed(_xeUtils.default.floor(i,o),o):i)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeDatePicker:{autofocus:".vxe-date-picker--inner",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t;let o=_xeUtils.default.get(r,l.property);if(o)switch(n.type){case"date":case"week":case"month":case"quarter":case"year":o=getLabelFormatDate(o,n)}return getCellLabelVNs(e,t,o)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeTextarea:{autofocus:".vxe-textarea--inner"},VxeButton:{renderDefault:buttonCellRender},VxeButtonGroup:{renderDefault(e,t){var n=e["options"];return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}},VxeSelect:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:i,optionGroups:a,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:i,optionGroups:a,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeRadioGroup:{renderDefault:radioAndCheckboxEditRender},VxeCheckboxGroup:{renderDefault:radioAndCheckboxEditRender},VxeSwitch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender},VxeUpload:{renderDefault:defaultEditRender},$input:{autofocus:".vxe-input--inner",renderEdit:oldEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,i=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let a=_xeUtils.default.get(l,o.property);if(a)switch(r.type){case"date":case"week":case"month":case"year":a=getLabelFormatDate(a,r);break;case"float":a=_xeUtils.default.toFixed(_xeUtils.default.floor(a,i),i)}return getCellLabelVNs(e,t,a)},renderDefault:oldEditRender,renderFilter:oldFilterRender,defaultFilterMethod:handleFilterMethod},$textarea:{autofocus:".vxe-textarea--inner"},$button:{renderDefault:oldButtonEditRender},$buttons:{renderDefault:oldButtonsEditRender},$select:{autofocus:".vxe-input--inner",renderEdit:oldSelectEditRender,renderDefault:oldSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:i,optionGroups:a,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:i,optionGroups:a,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input"},$checkbox:{autofocus:".vxe-checkbox--input"},$switch:{autofocus:".vxe-switch--button",renderEdit:oldEditRender,renderDefault:oldEditRender}});

package/lib/table/src/table.js

@@ -517,7 +517,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       let fixedSize = 0;
       // 只判断第一层
       collectColumn.forEach(column => {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++;
         }
       });
@@ -916,9 +916,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return num;
     };
     const handleCustomRestore = storeData => {
-      const {
-        tableFullColumn
-      } = internalData;
       let {
         collectColumn
       } = internalData;
@@ -931,21 +928,24 @@ var _default = exports.default = (0, _vue.defineComponent)({
       let hasCustomSort = false;
       // 处理还原
       if (resizableData || sortData || visibleData || fixedData) {
-        tableFullColumn.forEach(column => {
+        _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
           const colKey = column.getKey();
+          // 支持一级
+          if (!parent) {
+            if (fixedData && fixedData[colKey]) {
+              column.fixed = fixedData[colKey];
+            }
+            if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
+              hasCustomSort = true;
+              column.renderSortNumber = sortData[colKey];
+            }
+          }
           if (resizableData && _xeUtils.default.isNumber(resizableData[colKey])) {
             column.resizeWidth = resizableData[colKey];
           }
           if (visibleData && _xeUtils.default.isBoolean(visibleData[colKey])) {
             column.visible = visibleData[colKey];
           }
-          if (fixedData && fixedData[colKey]) {
-            column.fixed = fixedData[colKey];
-          }
-          if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
-            hasCustomSort = true;
-            column.renderSortNumber = sortData[colKey];
-          }
         });
         // 如果自定义了顺序
         if (hasCustomSort) {
@@ -3819,16 +3819,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const targetColumn = (0, _util.getRootColumn)($xeTable, column);
         const isMaxFixedColumn = computeIsMaxFixedColumn.value;
         const columnOpts = computeColumnOpts.value;
-        const {
-          maxFixedSize
-        } = columnOpts;
         if (targetColumn && targetColumn.fixed !== fixed) {
           // 是否超过最大固定列数量
           if (!targetColumn.fixed && isMaxFixedColumn) {
             if (_ui.VxeUI.modal) {
               _ui.VxeUI.modal.message({
                 status: 'error',
-                content: getI18n('vxe.table.maxFixedCol', [maxFixedSize])
+                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
               });
             }
             return (0, _vue.nextTick)();
@@ -5308,7 +5305,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let hasFixedt = 0;
         let hasVisible = 0;
         _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
-          // 排序只支持一级
+          // 只支持一级
           if (!parent) {
             collectColumn.forEach(column => {
               const colKey = column.getKey();
@@ -5317,6 +5314,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 sortData[colKey] = column.renderSortNumber;
               }
             });
+            if (column.fixed && column.fixed !== column.defaultFixed) {
+              const colKey = column.getKey();
+              if (colKey) {
+                hasFixedt = 1;
+                fixedData[colKey] = column.fixed;
+              }
+            }
           }
           if (column.resizeWidth) {
             const colKey = column.getKey();
@@ -5325,13 +5329,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
               resizableData[colKey] = column.renderWidth;
             }
           }
-          if (column.fixed && column.fixed !== column.defaultFixed) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasFixedt = 1;
-              fixedData[colKey] = column.fixed;
-            }
-          }
           if (!checkMethod || checkMethod({
             column
           })) {