vxe-table 3.20.0-beta.8 → 3.20.0

package/lib/table/module/export/mixin.js

@@ -1593,12 +1593,24 @@ var _default = exports.default = {
               };
               return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).then(rest => {
                 const listProp = resConfigs.list;
-                handleOptions.data = (listProp ? _xeUtils.default.isFunction(listProp) ? listProp({
-                  data: rest,
-                  $table: $xeTable,
-                  $grid: $xeGrid,
-                  $gantt: $xeGantt
-                }) : _xeUtils.default.get(rest, listProp) : rest) || [];
+                let tdData = [];
+                if (listProp) {
+                  if (_xeUtils.default.isFunction(listProp)) {
+                    tdData = listProp({
+                      data: rest,
+                      $table: $xeTable,
+                      $grid: $xeGrid,
+                      $gantt: $xeGantt
+                    });
+                  } else {
+                    tdData = _xeUtils.default.isArray(rest) ? rest : _xeUtils.default.get(rest, listProp);
+                  }
+                } else {
+                  if (_xeUtils.default.isArray(rest)) {
+                    tdData = rest;
+                  }
+                }
+                handleOptions.data = tdData;
                 if (afterQueryAll) {
                   afterQueryAll(params);
                 }

package/lib/table/module/export/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_util=require("../../src/util"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util2=require("./util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer}=_ui.VxeUI,htmlCellElem,csvBOM="\ufeff",enterSymbol="\r\n";function hasTreeChildren(e,t){e=e.computeTreeOpts,e=e.children||e.childrenField;return t[e]&&t[e].length}function getSeq(e,t,l,r,o,a){var i=e.computeSeqOpts.seqMethod||o.seqMethod;return i?i({$table:e,row:l,rowIndex:e.getRowIndex(l),_rowIndex:e.getVTRowIndex(l),$rowIndex:r,column:o,columnIndex:e.getColumnIndex(o),_columnIndex:e.getVTColumnIndex(o),$columnIndex:a}):t}function defaultFilterExportColumn(e){return!!e.field||-1===["seq","checkbox","radio"].indexOf(e.type||"")}function toTableBorder(e){return!0===e?"full":e||"default"}function toBooleanValue(e){return _xeUtils.default.isBoolean(e)?e?"TRUE":"FALSE":e}let toStringValue=e=>(0,_utils.eqEmptyValue)(e)?"":""+e;function getBodyLabelData(h,m,g,e){let{isAllExpand:x,mode:f}=m;var t=h.treeConfig;let v=h.computeRadioOpts,b=h.computeCheckboxOpts;var l=h.computeTreeOpts;let _=h.computeColumnOpts;if(htmlCellElem=htmlCellElem||document.createElement("div"),t){t=l.children||l.childrenField;let c=[],u={},p={},i=(0,_util.createHandleGetRowId)(h).handleGetRowId;return _xeUtils.default.eachTree(e,(e,n,t,s,l,r)=>{let d=e._row||e;var o=i(d);if(!p[o]){e=l&&l._row?l._row:l,l=e?i(e):"";if(x||!e||u[l]&&h.isTreeExpandByRow(e)){var a=hasTreeChildren(h,d);let i={_row:d,_level:r.length-1,_hasChild:a,_expand:a&&h.isTreeExpandByRow(d)};g.forEach((e,t)=>{let l="";var r=e.editRender||e.cellRender;let o=e.exportMethod||_.exportMethod;if(o=(o=!o&&r&&r.name&&(r=renderer.get(r.name))?r.tableExportMethod||r.exportMethod:o)||_.exportMethod)l=o({$table:h,row:d,column:e,options:m});else switch(e.type){case"seq":var a=s.map((e,t)=>t%2==0?Number(e)+1:".").join("");l="all"===f?a:getSeq(h,a,d,n,e,t);break;case"checkbox":l=toBooleanValue(h.isCheckedByCheckboxRow(d)),i._checkboxLabel=b.labelField?_xeUtils.default.get(d,b.labelField):"",i._checkboxDisabled=b.checkMethod&&!b.checkMethod({$table:h,row:d});break;case"radio":l=toBooleanValue(h.isCheckedByRadioRow(d)),i._radioLabel=v.labelField?_xeUtils.default.get(d,v.labelField):"",i._radioDisabled=v.checkMethod&&!v.checkMethod({$table:h,row:d});break;default:m.original?l=(0,_util.getCellValue)(d,e):(l=h.getCellLabel(d,e),"html"===e.type?(htmlCellElem.innerHTML=l,l=htmlCellElem.innerText.trim()):(a=h.getCellElement(d,e))&&!(0,_dom.hasClass)(a,"is--progress")&&(l=a.innerText.trim()))}i[e.id]=toStringValue(l)}),p[o]=!0,l&&(u[l]=!0),c.push(Object.assign(i,d))}}},{children:t}),c}return e.map((i,n)=>{let s={_row:i};return g.forEach((e,t)=>{let l="";var r=e.editRender||e.cellRender;let o=e.exportMethod||_.exportMethod;if(o=!o&&r&&r.name&&(r=renderer.get(r.name))?r.tableExportMethod||r.exportMethod:o)l=o({$table:h,row:i,column:e,options:m});else switch(e.type){case"seq":var a=n+1;l="all"===f?a:getSeq(h,a,i,n,e,t);break;case"checkbox":l=toBooleanValue(h.isCheckedByCheckboxRow(i)),s._checkboxLabel=b.labelField?_xeUtils.default.get(i,b.labelField):"",s._checkboxDisabled=b.checkMethod&&!b.checkMethod({$table:h,row:i});break;case"radio":l=toBooleanValue(h.isCheckedByRadioRow(i)),s._radioLabel=v.labelField?_xeUtils.default.get(i,v.labelField):"",s._radioDisabled=v.checkMethod&&!v.checkMethod({$table:h,row:i});break;default:m.original?l=(0,_util.getCellValue)(i,e):(l=h.getCellLabel(i,e),"html"===e.type?(htmlCellElem.innerHTML=l,l=htmlCellElem.innerText.trim()):(a=h.getCellElement(i,e))&&!(0,_dom.hasClass)(a,"is--progress")&&(l=a.innerText.trim()))}s[e.id]=toStringValue(l)}),s})}function getExportData(l,e){let r=l.$xeGrid,o=l.$xeGantt,{columns:t,dataFilterMethod:a}=e,i=e.data;return a&&(i=i.filter((e,t)=>a({$table:l,$grid:r,$gantt:o,row:e,$rowIndex:t}))),getBodyLabelData(l,e,t,i)}function getBooleanValue(e){return"TRUE"===e||"true"===e||!0===e}function getHeaderTitle(e,t,l){var r=e.computeColumnOpts,r=l.headerExportMethod||r.headerExportMethod;return r?r({column:l,options:t,$table:e}):(t.isTitle?l.getTitle():l.field)||""}function getFooterCellValue(e,t,l,r){var o=e.computeColumnOpts,a=r.editRender||r.cellRender;let i=r.footerExportMethod;return(i=(i=!i&&a&&a.name&&(a=renderer.get(a.name))?a.tableFooterExportMethod||a.footerExportMethod||a.footerCellExportMethod:i)||o.footerExportMethod)?(a=e.getVTColumnIndex(r),i({$table:e,items:l,itemIndex:a,row:l,_columnIndex:a,column:r,options:t})):e.getFooterCellLabel(l,r)}function getFooterData(l,e,t){let r=l.$xeGrid,o=l.$xeGantt,a=e.footerFilterMethod;return a?t.filter((e,t)=>a({$table:l,$grid:r,$gantt:o,items:e,$rowIndex:t})):t}function getCsvCellTypeLabel(e,t){if(t){if("seq"===e.type)return`	`+t;switch(e.cellType){case"string":if(isNaN(t))break;return`	`+t;case"number":break;default:if(12<=t.length&&!isNaN(t))return`	`+t}}return t}function toTxtCellLabel(e){return/[",\s\n]/.test(e)?`"${e.replace(/"/g,'""')}"`:e}function toCsv(l,r,e,t){var o=l;let a=csvBOM;return r.isHeader&&(a+=e.map(e=>toTxtCellLabel(getHeaderTitle(l,r,e))).join(",")+enterSymbol),t.forEach(t=>{a+=e.map(e=>toTxtCellLabel(getCsvCellTypeLabel(e,t[e.id]))).join(",")+enterSymbol}),r.isFooter&&(t=o.footerTableData,getFooterData(l,r,t).forEach(t=>{a+=e.map(e=>toTxtCellLabel(getFooterCellValue(l,r,t,e))).join(",")+enterSymbol})),a}function toTxt(l,r,e,t){var o=l;let a="";return r.isHeader&&(a+=e.map(e=>toTxtCellLabel(getHeaderTitle(l,r,e))).join("\t")+enterSymbol),t.forEach(t=>{a+=e.map(e=>toTxtCellLabel(t[e.id])).join("\t")+enterSymbol}),r.isFooter&&(t=o.footerTableData,getFooterData(l,r,t).forEach(t=>{a+=e.map(e=>toTxtCellLabel(getFooterCellValue(l,r,t,e))).join("\t")+enterSymbol})),a}function hasEllipsis(e,t,l,r){t=t[l],l=_xeUtils.default.isUndefined(t)||_xeUtils.default.isNull(t)?r:t;let o="title"===l||(!0===l||"tooltip"===l)||"ellipsis"===l;var{scrollXLoad:r,scrollYLoad:t}=e;return o=r||t?o||!0:o}function toHtml(d,n,e,t){var l=d;let{id:c,border:r,treeConfig:o,headerAlign:s,align:u,footerAlign:a,showOverflow:p,showHeaderOverflow:h}=d,{isAllSelected:m,isIndeterminate:i}=l,g=d.mergeBodyCellMaps,x=d.computeTreeOpts,{print:f,isHeader:v,isFooter:b,isColgroup:_,isMerge:$,colgroups:y,original:C}=n,w="check-all",T=[`<table class="${["vxe-table","border--"+toTableBorder(r),f?"is--print":"",v?"is--header":""].filter(e=>e).join(" ")}" border="0" cellspacing="0" cellpadding="0">`,`<colgroup>${e.map(e=>`<col style="width:${e.renderWidth}px">`).join("")}</colgroup>`];v&&(T.push("<thead>"),_&&!C?y.forEach(e=>{T.push(`<tr>${e.map(t=>{var e=t.headerAlign||t.align||s||u,l=hasEllipsis(d,t,"showHeaderOverflow",h)?["col--ellipsis"]:[],r=getHeaderTitle(d,n,t);let o=0,a=0;_xeUtils.default.eachTree([t],e=>{e.childNodes&&t.childNodes.length||a++,o+=e.renderWidth},{children:"childNodes"});var i=o-a;return e&&l.push("col--"+e),"checkbox"===t.type?`<th class="${l.join(" ")}" colspan="${t._colSpan}" rowspan="${t._rowSpan}"><div ${f?"":`style="width: ${i}px"`}><input type="checkbox" class="${w}" ${m?"checked":""}><span>${r}</span></div></th>`:`<th class="${l.join(" ")}" colspan="${t._colSpan}" rowspan="${t._rowSpan}" title="${r}"><div ${f?"":`style="width: ${i}px"`}><span>${(0,_utils.formatText)(r,!0)}</span></div></th>`}).join("")}</tr>`)}):T.push(`<tr>${e.map(e=>{var t=e.headerAlign||e.align||s||u,l=hasEllipsis(d,e,"showHeaderOverflow",h)?["col--ellipsis"]:[],r=getHeaderTitle(d,n,e);return t&&l.push("col--"+t),"checkbox"===e.type?`<th class="${l.join(" ")}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><input type="checkbox" class="${w}" ${m?"checked":""}><span>${r}</span></div></th>`:`<th class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><span>${(0,_utils.formatText)(r,!0)}</span></div></th>`}).join("")}</tr>`),T.push("</thead>")),t.length&&(T.push("<tbody>"),o?t.forEach(o=>{T.push("<tr>"+e.map(t=>{var e=t.align||u,l=hasEllipsis(d,t,"showOverflow",p)?["col--ellipsis"]:[],r=o[t.id];if(e&&l.push("col--"+e),t.treeNode){let e="";return o._hasChild&&(e=`<i class="${o._expand?"vxe-table--tree-fold-icon":"vxe-table--tree-unfold-icon"}"></i>`),l.push("vxe-table--tree-node"),"radio"===t.type?`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${o._level*x.indent}px"><div class="vxe-table--tree-icon-wrapper">${e}</div><div class="vxe-table--tree-cell"><input type="radio" name="radio_${c}" ${o._radioDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._radioLabel}</span></div></div></div></td>`:"checkbox"===t.type?`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${o._level*x.indent}px"><div class="vxe-table--tree-icon-wrapper">${e}</div><div class="vxe-table--tree-cell"><input type="checkbox" ${o._checkboxDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._checkboxLabel}</span></div></div></div></td>`:`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${o._level*x.indent}px"><div class="vxe-table--tree-icon-wrapper">${e}</div><div class="vxe-table--tree-cell">${r}</div></div></div></td>`}return"radio"===t.type?`<td class="${l.join(" ")}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><input type="radio" name="radio_${c}" ${o._radioDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._radioLabel}</span></div></td>`:"checkbox"===t.type?`<td class="${l.join(" ")}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><input type="checkbox" ${o._checkboxDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._checkboxLabel}</span></div></td>`:`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}>${(0,_utils.formatText)(r,!0)}</div></td>`}).join("")+"</tr>")}):t.forEach(s=>{T.push("<tr>"+e.map(e=>{var t=e.id,l=e.align||u,r=hasEllipsis(d,e,"showOverflow",p)?["col--ellipsis"]:[],t=s[t];let o=1,a=1;if($){var i=d.getVTRowIndex(s._row),n=d.getVTColumnIndex(e),i=g[i+":"+n];if(i){var{rowspan:n,colspan:i}=i;if(!n||!i)return"";1<n&&(o=n),1<i&&(a=i)}}return l&&r.push("col--"+l),"radio"===e.type?`<td class="${r.join(" ")}" rowspan="${o}" colspan="${a}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><input type="radio" name="radio_${c}" ${s._radioDisabled?"disabled ":""}${getBooleanValue(t)?"checked":""}><span>${s._radioLabel}</span></div></td>`:"checkbox"===e.type?`<td class="${r.join(" ")}" rowspan="${o}" colspan="${a}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><input type="checkbox" ${s._checkboxDisabled?"disabled ":""}${getBooleanValue(t)?"checked":""}><span>${s._checkboxLabel}</span></div></td>`:`<td class="${r.join(" ")}" rowspan="${o}" colspan="${a}" title="${t}"><div ${f?"":`style="width: ${e.renderWidth}px"`}>${(0,_utils.formatText)(t,!0)}</div></td>`}).join("")+"</tr>")}),T.push("</tbody>")),b&&(t=l.footerTableData,(l=getFooterData(d,n,t)).length)&&(T.push("<tfoot>"),l.forEach(o=>{T.push(`<tr>${e.map(e=>{var t=e.footerAlign||e.align||a||u,l=hasEllipsis(d,e,"showOverflow",p)?["col--ellipsis"]:[],r=getFooterCellValue(d,n,o,e);return t&&l.push("col--"+t),`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${e.renderWidth}px"`}>${(0,_utils.formatText)(r,!0)}</div></td>`}).join("")}</tr>`)}),T.push("</tfoot>"));t=!m&&i?`<script>(function(){var a=document.querySelector(".${w}");if(a){a.indeterminate=true}})()</script>`:"";return T.push("</table>",t),f?T.join(""):(0,_util2.createHtmlPage)(n,T.join(""))}function toXML(l,r,e,t){var o=l;let a=['<?xml version="1.0"?>','<?mso-application progid="Excel.Sheet"?>','<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40">','<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">',"<Version>16.00</Version>","</DocumentProperties>",'<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">',"<WindowHeight>7920</WindowHeight>","<WindowWidth>21570</WindowWidth>","<WindowTopX>32767</WindowTopX>","<WindowTopY>32767</WindowTopY>","<ProtectStructure>False</ProtectStructure>","<ProtectWindows>False</ProtectWindows>","</ExcelWorkbook>",`<Worksheet ss:Name="${r.sheetName}">`,"<Table>",e.map(e=>`<Column ss:Width="${e.renderWidth}"/>`).join("")].join("");return r.isHeader&&(a+=`<Row>${e.map(e=>`<Cell><Data ss:Type="String">${getHeaderTitle(l,r,e)}</Data></Cell>`).join("")}</Row>`),t.forEach(t=>{a+="<Row>"+e.map(e=>`<Cell><Data ss:Type="String">${t[e.id]}</Data></Cell>`).join("")+"</Row>"}),r.isFooter&&(t=o.footerTableData,getFooterData(l,r,t).forEach(t=>{a+=`<Row>${e.map(e=>`<Cell><Data ss:Type="String">${getFooterCellValue(l,r,t,e)}</Data></Cell>`).join("")}</Row>`})),a+"</Table></Worksheet></Workbook>"}function getContent(e,t,l,r){if(l.length)switch(t.type){case"csv":return toCsv(e,t,l,r);case"txt":return toTxt(e,t,l,r);case"html":return toHtml(e,t,l,r);case"xml":return toXML(e,t,l,r)}return""}function downloadFile(e,t,l){var{filename:r,type:o,download:a}=t;if(!a)return a=(0,_util2.getExportBlobByContent)(l,t),Promise.resolve({type:o,content:l,blob:a});_ui.VxeUI.saveFile&&_ui.VxeUI.saveFile({filename:r,type:o,content:l}).then(()=>{!1!==t.message&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({content:getI18n("vxe.table.expSuccess"),status:"success"})})}function clearColumnConvert(e){_xeUtils.default.eachTree(e,e=>{delete e._level,delete e._colSpan,delete e._rowSpan,delete e._children,delete e.childNodes},{children:"children"})}function handleExport(l,r){let o=l.$xeGrid,a=l.$xeGantt,{remote:i,columns:n,colgroups:s,exportMethod:d,afterExportMethod:t}=r;return new Promise(t=>{if(i){var e={options:r,$table:l,$grid:o,$gantt:a};t(d?d(e):e)}else{let e=getExportData(l,r);t(l.preventEvent(null,"event.export",{options:r,columns:n,colgroups:s,datas:e},()=>downloadFile(l,r,getContent(l,r,n,e))))}}).then(e=>(clearColumnConvert(n),r.print||t&&t({status:!0,options:r,$table:l,$grid:o,$gantt:a}),Object.assign({status:!0},e))).catch(()=>{clearColumnConvert(n),r.print||t&&t({status:!1,options:r,$table:l,$grid:o,$gantt:a});return Promise.reject({status:!1})})}function getElementsByTagName(e,t){return e.getElementsByTagName(t)}function getTxtCellKey(e){return`#${e}@`+_xeUtils.default.uniqueId()}function replaceTxtCell(e,t){return e.replace(/#\d+@\d+/g,e=>_xeUtils.default.hasOwnProp(t,e)?t[e]:e)}function getTxtCellValue(e,t){return replaceTxtCell(e,t).replace(/^"+$/g,e=>'"'.repeat(Math.ceil(e.length/2)))}function toExportField(e,t){var{fieldMaps:e,titleMaps:l}=e;return e[t]||(e=l[t])&&e.field&&(t=e.field),t}function parseCsvAndTxt(t,e,a){e=e.split(enterSymbol);let i=[],n=[];if(e.length){let r={},o=Date.now();e.forEach(e=>{if(e){let l={};e=(e=e.replace(/("")|(\n)/g,(e,t)=>{var l=getTxtCellKey(o);return r[l]=t?'"':"\n",l}).replace(/"(.*?)"/g,(e,t)=>{var l=getTxtCellKey(o);return r[l]=replaceTxtCell(t,r),l})).split(a);n.length?(e.forEach((e,t)=>{t<n.length&&(l[n[t]]=getTxtCellValue(e.trim(),r))}),i.push(l)):n=e.map(e=>toExportField(t,getTxtCellValue(e.trim(),r)))}})}return{fields:n,rows:i}}function parseCsv(e,t){return parseCsvAndTxt(e,t,",")}function parseTxt(e,t){return parseCsvAndTxt(e,t,"\t")}function parseHTML(t,e){var l,e=getElementsByTagName((new DOMParser).parseFromString(e,"text/html"),"body");let r=[],o=[];return e.length&&(e=getElementsByTagName(e[0],"table")).length&&(l=getElementsByTagName(e[0],"thead")).length&&(_xeUtils.default.arrayEach(getElementsByTagName(l[0],"tr"),e=>{_xeUtils.default.arrayEach(getElementsByTagName(e,"th"),e=>{o.push(toExportField(t,e.textContent||""))})}),(l=getElementsByTagName(e[0],"tbody")).length)&&_xeUtils.default.arrayEach(getElementsByTagName(l[0],"tr"),e=>{let l={};_xeUtils.default.arrayEach(getElementsByTagName(e,"td"),(e,t)=>{o[t]&&(l[o[t]]=e.textContent||"")}),r.push(l)}),{fields:o,rows:r}}function parseXML(t,e){var e=getElementsByTagName((new DOMParser).parseFromString(e,"application/xml"),"Worksheet");let r=[],o=[];return e.length&&(e=getElementsByTagName(e[0],"Table")).length&&(e=getElementsByTagName(e[0],"Row")).length&&(_xeUtils.default.arrayEach(getElementsByTagName(e[0],"Cell"),e=>{o.push(toExportField(t,e.textContent||""))}),_xeUtils.default.arrayEach(e,(e,t)=>{if(t){let l={};t=getElementsByTagName(e,"Cell");_xeUtils.default.arrayEach(t,(e,t)=>{o[t]&&(l[o[t]]=e.textContent)}),r.push(l)}})),{fields:o,rows:r}}function handleImport(l,e,r){let{tableFullColumn:t,_importResolve:o,_importReject:a}=l,i={fields:[],rows:[]},n={},s={};t.forEach(e=>{var t=e.field,l=e.getTitle();t&&(n[t]=e),l&&(s[e.getTitle()]=e)});var d={fieldMaps:n,titleMaps:s};switch(r.type){case"csv":i=parseCsv(d,e);break;case"txt":i=parseTxt(d,e);break;case"html":i=parseHTML(d,e);break;case"xml":i=parseXML(d,e)}let{fields:c,rows:u}=i;c.some(e=>n[e]||s[e])?l.createData(u).then(e=>{let t;return t="insert"===r.mode||"insertBottom"===r.mode?l.insertAt(e,-1):"insertTop"===r.mode?l.insert(e):l.reloadData(e),!1!==r.message&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:getI18n("vxe.table.impSuccess",[u.length]),status:"success"})),t.then(()=>{o&&o({status:!0})})}):!1!==r.message&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:getI18n("vxe.error.impFields"),status:"error"}),a)&&a({status:!1})}function handleFileImport(a,i,n){let s=a;var e=a.computeImportOpts;let{importMethod:d,afterImportMethod:t}=n,{type:c,filename:u}=(0,_utils.parseFile)(i);return d||_xeUtils.default.includes(_xeUtils.default.keys(e._typeMaps),c)?new Promise((t,l)=>{let e=e=>{t(e),a._importResolve=null,a._importReject=null},r=e=>{l(e),a._importResolve=null,a._importReject=null};if(a._importResolve=e,a._importReject=r,window.FileReader){let t=Object.assign({mode:"insertTop"},n,{type:c,filename:u});var o;t.remote?d?Promise.resolve(d({file:i,options:t,$table:a})).then(()=>{e({status:!0})}).catch(()=>{e({status:!0})}):e({status:!0}):(o=s.tableFullColumn,a.preventEvent(null,"event.import",{file:i,options:t,columns:o},()=>{var e=new FileReader;e.onerror=()=>{(0,_log.errLog)("vxe.error.notType",[c]),r({status:!1})},e.onload=e=>{handleImport(a,e.target.result,t)},e.readAsText(i,t.encoding||"UTF-8")}))}else(0,_log.errLog)("vxe.error.notExp"),e({status:!0})}).then(()=>{t&&t({status:!0,options:n,$table:a})}).catch(e=>(t&&t({status:!1,options:n,$table:a}),Promise.reject(e))):(!1!==n.message&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:getI18n("vxe.error.notType",[c]),status:"error"})),Promise.reject({status:!1}))}function handleCloseExport(){return _ui.VxeUI.modal?_ui.VxeUI.modal.close("VXE_EXPORT_MODAL"):Promise.resolve()}function handleFilterColumns(e,r,t){return t.some(e=>{var t,l;return(0,_util.isColumnInfo)(e)?r.id===e.id:_xeUtils.default.isString(e)?r.field===e:(t=e.id||e.colId,l=e.type,e=e.field,t?r.id===t:e&&l?r.field===e&&r.type===l:e?r.field===e:!!l&&r.type===l)})}function handleFilterFields(e,t,l,r){return(!r||!_xeUtils.default.includes(r,t.field))&&(l?!!_xeUtils.default.includes(l,t.field):e.original?!!t.field:defaultFilterExportColumn(t))}function handleExportAndPrint(n,e,t){var l=n.$xeGrid,r=n.$xeGantt,o=l||r,{treeConfig:a,showHeader:i,showFooter:s}=n,{initStore:d,isGroup:c,footerTableData:u,exportStore:p,exportParams:h}=n,{collectColumn:m,mergeBodyList:g,mergeFooterList:x}=n,f=n.computeExportOpts,v=n.computeCustomOpts,b=n.getCheckboxRecords(),o=o?o.computeProxyOpts:{},u=!!u.length,g=!(!g.length&&!x.length);let _=Object.assign({message:!0,isHeader:i,isTitle:i,isFooter:s,isColgroup:c,isMerge:g,useStyle:!0,current:"current",modes:(o.ajax&&o.ajax.queryAll?["all"]:[]).concat(["current","selected","empty"])},e);x=_.types||_xeUtils.default.keys(f._typeMaps),i=_.modes||[];let $=v.checkMethod;s=m.slice(0);let{columns:y,excludeFields:C,includeFields:w}=_;o=x.map(e=>({value:e,label:getI18n("vxe.export.types."+e)})),e=i.map(e=>e&&e.value?{value:e.value,label:e.label||e.value}:{value:e,label:getI18n("vxe.export.modes."+e)});_xeUtils.default.eachTree(s,(e,t,l,r,o)=>{var a=e.children&&0<e.children.length;let i=!1;i=y&&y.length?handleFilterColumns(_,e,y):C||w?handleFilterFields(_,e,w,C):e.visible&&(a||defaultFilterExportColumn(e)),e.checked=i,e.halfChecked=!1,e.disabled=o&&o.disabled||!!$&&!$({$table:n,column:e})}),Object.assign(p,{columns:s,typeList:o,modeList:e,hasFooter:u,hasMerge:g,hasTree:a,isPrint:t,hasColgroup:c,visible:!0}),Object.assign(h,{mode:b.length?"selected":"current"},_);let{filename:T,sheetName:E,mode:F,type:M}=h;return T&&(_xeUtils.default.isFunction(T)?h.filename=T({options:_,$table:n,$grid:l,$gantt:r}):h.filename=""+T),E&&(_xeUtils.default.isFunction(E)?h.sheetName=E({options:_,$table:n,$grid:l,$gantt:r}):h.sheetName=""+E),e.some(e=>e.value===F)||(h.mode=e[0].value),o.some(e=>e.value===M)||(h.type=o[0].value),d.export=!0,n.$nextTick()}let getConvertColumns=e=>{let t=[];return e.forEach(e=>{e.childNodes&&e.childNodes.length?(t.push(e),t.push(...getConvertColumns(e.childNodes))):t.push(e)}),t},convertToRows=e=>{let t=1,r=(l,e)=>{if(e&&(l._level=e._level+1,t<l._level)&&(t=l._level),l.childNodes&&l.childNodes.length){let t=0;l.childNodes.forEach(e=>{r(e,l),t+=e._colSpan}),l._colSpan=t}else l._colSpan=1},l=(e.forEach(e=>{e._level=1,r(e)}),[]);for(let e=0;e<t;e++)l.push([]);return getConvertColumns(e).forEach(e=>{e.childNodes&&e.childNodes.length?e._rowSpan=1:e._rowSpan=t-e._level+1,l[e._level-1].push(e)}),l};var _default=exports.default={methods:{_exportData(e){let n=this;var t=n,l=n,r=n;let s=n.$xeGrid,d=n.$xeGantt;var c=s||d,{treeConfig:t,showHeader:u,showFooter:p}=t,l=l.isGroup;let{tableFullColumn:a,afterFullData:o,afterTreeFullData:i,collectColumn:h,mergeBodyList:m,mergeFooterList:g}=r;var r=n.computeExportOpts,x=n.computeTreeOpts;let f=c?c.computeProxyOpts:{};var v=!(!m.length&&!g.length);let b=Object.assign({message:!0,isHeader:u,isTitle:u,isFooter:p,isColgroup:l,isMerge:v,useStyle:!0,current:"current",modes:(f.ajax&&f.ajax.queryAll?["all"]:[]).concat(["current","selected","empty"]),download:!0,type:"csv"},r,e),{filename:_,sheetName:$,type:y,mode:C,columns:w,original:T,columnFilterMethod:E,beforeExportMethod:F,includeFields:M,excludeFields:k}=b,I=[],U=n.getCheckboxRecords(),j=(C=C||(U.length?"selected":"current"),!1),O=[],L=(O=w&&w.length?(j=!0,w):_xeUtils.default.searchTree(h,e=>{var t=e.children&&0<e.children.length;let l=!1;return l=w&&w.length?handleFilterColumns(b,e,w):k||M?handleFilterFields(b,e,M,k):e.visible&&(t||defaultFilterExportColumn(e))},{children:"children",mapChildren:"childNodes",original:!0}),Object.assign({},b,{filename:"",sheetName:""})),V=(j||E||(E=({column:e})=>(!k||!_xeUtils.default.includes(k,e.field))&&(M?!!_xeUtils.default.includes(M,e.field):T?!!e.field:defaultFilterExportColumn(e)),L.columnFilterMethod=E),I=O?(L._isCustomColumn=!0,_xeUtils.default.searchTree(_xeUtils.default.mapTree(O,e=>{let r;if(e){if((0,_util.isColumnInfo)(e))r=e;else if(_xeUtils.default.isString(e))r=n.getColumnByField(e);else{var o=e.id||e.colId;let t=e.type,l=e.field;o?r=n.getColumnById(o):l&&t?r=a.find(e=>e.field===l&&e.type===t):l?r=n.getColumnByField(l):t&&(r=a.find(e=>e.type===t))}return r||{}}},{children:"childNodes",mapChildren:"_children"}),(e,t)=>(0,_util.isColumnInfo)(e)&&(!E||E({$table:n,$grid:s,$gantt:d,column:e,$columnIndex:t})),{children:"_children",mapChildren:"childNodes",original:!0})):_xeUtils.default.searchTree(l?h:a,(e,t)=>e.visible&&(!E||E({$table:n,$grid:s,$gantt:d,column:e,$columnIndex:t})),{children:"children",mapChildren:"childNodes",original:!0}),[]);if(_xeUtils.default.eachTree(I,e=>{e.children&&e.children.length||V.push(e)},{children:"childNodes"}),L.columns=V,L.colgroups=convertToRows(I),_&&(_xeUtils.default.isFunction(_)?L.filename=_({options:b,$table:n,$grid:s,$gantt:d}):L.filename=""+_),L.filename||(L.filename=getI18n(L.original?"vxe.table.expOriginFilename":"vxe.table.expFilename",[_xeUtils.default.toDateString(Date.now(),"yyyyMMddHHmmss")])),$&&(_xeUtils.default.isFunction($)?L.sheetName=$({options:b,$table:n,$grid:s,$gantt:d}):L.sheetName=""+$),L.sheetName||(L.sheetName=document.title||""),!L.exportMethod&&!_xeUtils.default.includes(_xeUtils.default.keys(r._typeMaps),y))return(0,_log.errLog)("vxe.error.notType",[y]),["xlsx","pdf"].includes(y)&&(0,_log.warnLog)("vxe.error.reqPlugin",[4,"plugin-export-xlsx"]),Promise.reject({status:!1});if(L.print||F&&F({options:L,$table:n,$grid:s,$gantt:d}),L.data)L._isCustomData=!0;else if(L.data=[],"selected"===C)-1<["html","pdf"].indexOf(y)&&t?L.data=_xeUtils.default.searchTree(n.getTableData().fullData,e=>-1<n.findRowIndexOf(U,e),Object.assign({},x,{data:"_row"})):L.data=U;else if("all"===C){if(c||(0,_log.errLog)("vxe.error.errProp",["all","mode=current,selected"]),c&&!L.remote){u=c.reactData;let e=c.computeProxyOpts;p=u.sortData;let{beforeQueryAll:t,afterQueryAll:r,ajax:l={}}=e,o=e.response||e.props||{};v=l.queryAll;let a=l.queryAllSuccess,i=l.queryAllError;if(v||(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.queryAll"]),v){let l={$table:n,$grid:s,$gantt:d,sort:p.length?p[0]:{},sorts:p,filters:u.filterData,form:u.formData,options:L};return Promise.resolve((t||v)(l)).then(e=>{var t=o.list;return L.data=(t?_xeUtils.default.isFunction(t)?t({data:e,$table:n,$grid:s,$gantt:d}):_xeUtils.default.get(e,t):e)||[],r&&r(l),a&&a(Object.assign(Object.assign({},l),{response:e})),handleExport(n,L)}).catch(e=>{i&&i(Object.assign(Object.assign({},l),{response:e}))})}}}else"current"===C&&(L.data=t?i:o);return handleExport(n,L)},_importByFile(e,t){var t=Object.assign({},t),l=t.beforeImportMethod;return l&&l({options:t,$table:this}),handleFileImport(this,e,t)},_importData(e){let t=this;var l=this.importOpts;let r=Object.assign({types:_xeUtils.default.keys(l._typeMaps)},l,e),{beforeImportMethod:o,afterImportMethod:a}=r;return o&&o({options:r,$table:this}),_ui.VxeUI.readFile(r).catch(e=>(a&&a({status:!1,options:r,$table:t}),Promise.reject(e))).then(e=>{e=e.file;return handleFileImport(t,e,r)})},_saveFile(e){return _ui.VxeUI.saveFile(e)},_readFile(e){return _ui.VxeUI.readFile(e)},_print(e){let l=this,r=l.$xeGrid,o=l.$xeGantt;var t=l.computePrintOpts;let a=Object.assign({original:!1},t,e,{type:"html",download:!1,remote:!1,print:!0});t=a.sheetName;let i="",n=(i=(i=t?_xeUtils.default.isFunction(t)?t({options:a,$table:l,$grid:r,$gantt:o}):""+t:i)||document.title||"",a.beforePrintMethod),s=a.html||a.content;return new Promise((e,t)=>{_ui.VxeUI.print?s?e(_ui.VxeUI.print({title:i,html:s,customStyle:a.style,beforeMethod:n?({html:e})=>n({html:e,content:e,options:a,$table:l,$grid:r,$gantt:o}):void 0})):e(l.exportData(a).then(({content:e})=>_ui.VxeUI.print({title:i,html:e,customStyle:a.style,beforeMethod:n?({html:e})=>n({html:e,content:e,options:a,$table:l,$grid:r,$gantt:o}):void 0}))):t({status:!1})})},_getPrintHtml(e){var t=this.computePrintOpts,t=Object.assign({original:!1},t,e,{type:"html",download:!1,remote:!1,print:!0});return this.exportData(t).then(({content:e})=>({html:e}))},_closeImport(){return _ui.VxeUI.modal?_ui.VxeUI.modal.close("VXE_IMPORT_MODAL"):Promise.resolve()},_openImport(e){var{treeConfig:t,importConfig:l}=this;let{initStore:r,importStore:o,importParams:a}=this;var i=this.computeImportOpts,i=Object.assign({mode:"insertTop",message:!0,types:_xeUtils.default.keys(i._typeMaps),modes:["insertTop","covering"]},i,e),e=i.types||[],n=i.modes||[];!t?(l||(0,_log.errLog)("vxe.error.reqProp",["import-config"]),t=e.map(e=>({value:e,label:getI18n("vxe.export.types."+e)})),l=n.map(e=>e&&e.value?{value:e.value,label:e.label||e.value}:{value:e,label:getI18n("vxe.import.modes."+e)}),Object.assign(o,{file:null,type:"",filename:"",modeList:l,typeList:t,visible:!0}),Object.assign(a,i),l.some(e=>e.value===a.mode)||(a.mode=l[0].value),r.import=!0):i.message&&_ui.VxeUI.modal.message({content:getI18n("vxe.error.treeNotImp"),status:"error"})},_closeExport:handleCloseExport,_openExport(e){var t=this.computeExportOpts,t=Object.assign({message:!0,types:_xeUtils.default.keys(t._typeMaps)},t,e);return this.exportConfig||(0,_log.errLog)("vxe.error.reqProp",["export-config"]),handleExportAndPrint(this,t)},_closePrint:handleCloseExport,_openPrint(e){var t=this.computePrintOpts,t=Object.assign({message:!0},t,e);return this.printConfig||(0,_log.errLog)("vxe.error.reqProp",["print-config"]),handleExportAndPrint(this,t,!0)}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_util=require("../../src/util"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util2=require("./util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer}=_ui.VxeUI,htmlCellElem,csvBOM="\ufeff",enterSymbol="\r\n";function hasTreeChildren(e,t){e=e.computeTreeOpts,e=e.children||e.childrenField;return t[e]&&t[e].length}function getSeq(e,t,l,r,o,a){var i=e.computeSeqOpts.seqMethod||o.seqMethod;return i?i({$table:e,row:l,rowIndex:e.getRowIndex(l),_rowIndex:e.getVTRowIndex(l),$rowIndex:r,column:o,columnIndex:e.getColumnIndex(o),_columnIndex:e.getVTColumnIndex(o),$columnIndex:a}):t}function defaultFilterExportColumn(e){return!!e.field||-1===["seq","checkbox","radio"].indexOf(e.type||"")}function toTableBorder(e){return!0===e?"full":e||"default"}function toBooleanValue(e){return _xeUtils.default.isBoolean(e)?e?"TRUE":"FALSE":e}let toStringValue=e=>(0,_utils.eqEmptyValue)(e)?"":""+e;function getBodyLabelData(h,m,g,e){let{isAllExpand:x,mode:f}=m;var t=h.treeConfig;let v=h.computeRadioOpts,b=h.computeCheckboxOpts;var l=h.computeTreeOpts;let _=h.computeColumnOpts;if(htmlCellElem=htmlCellElem||document.createElement("div"),t){t=l.children||l.childrenField;let c=[],u={},p={},i=(0,_util.createHandleGetRowId)(h).handleGetRowId;return _xeUtils.default.eachTree(e,(e,n,t,s,l,r)=>{let d=e._row||e;var o=i(d);if(!p[o]){e=l&&l._row?l._row:l,l=e?i(e):"";if(x||!e||u[l]&&h.isTreeExpandByRow(e)){var a=hasTreeChildren(h,d);let i={_row:d,_level:r.length-1,_hasChild:a,_expand:a&&h.isTreeExpandByRow(d)};g.forEach((e,t)=>{let l="";var r=e.editRender||e.cellRender;let o=e.exportMethod||_.exportMethod;if(o=(o=!o&&r&&r.name&&(r=renderer.get(r.name))?r.tableExportMethod||r.exportMethod:o)||_.exportMethod)l=o({$table:h,row:d,column:e,options:m});else switch(e.type){case"seq":var a=s.map((e,t)=>t%2==0?Number(e)+1:".").join("");l="all"===f?a:getSeq(h,a,d,n,e,t);break;case"checkbox":l=toBooleanValue(h.isCheckedByCheckboxRow(d)),i._checkboxLabel=b.labelField?_xeUtils.default.get(d,b.labelField):"",i._checkboxDisabled=b.checkMethod&&!b.checkMethod({$table:h,row:d});break;case"radio":l=toBooleanValue(h.isCheckedByRadioRow(d)),i._radioLabel=v.labelField?_xeUtils.default.get(d,v.labelField):"",i._radioDisabled=v.checkMethod&&!v.checkMethod({$table:h,row:d});break;default:m.original?l=(0,_util.getCellValue)(d,e):(l=h.getCellLabel(d,e),"html"===e.type?(htmlCellElem.innerHTML=l,l=htmlCellElem.innerText.trim()):(a=h.getCellElement(d,e))&&!(0,_dom.hasClass)(a,"is--progress")&&(l=a.innerText.trim()))}i[e.id]=toStringValue(l)}),p[o]=!0,l&&(u[l]=!0),c.push(Object.assign(i,d))}}},{children:t}),c}return e.map((i,n)=>{let s={_row:i};return g.forEach((e,t)=>{let l="";var r=e.editRender||e.cellRender;let o=e.exportMethod||_.exportMethod;if(o=!o&&r&&r.name&&(r=renderer.get(r.name))?r.tableExportMethod||r.exportMethod:o)l=o({$table:h,row:i,column:e,options:m});else switch(e.type){case"seq":var a=n+1;l="all"===f?a:getSeq(h,a,i,n,e,t);break;case"checkbox":l=toBooleanValue(h.isCheckedByCheckboxRow(i)),s._checkboxLabel=b.labelField?_xeUtils.default.get(i,b.labelField):"",s._checkboxDisabled=b.checkMethod&&!b.checkMethod({$table:h,row:i});break;case"radio":l=toBooleanValue(h.isCheckedByRadioRow(i)),s._radioLabel=v.labelField?_xeUtils.default.get(i,v.labelField):"",s._radioDisabled=v.checkMethod&&!v.checkMethod({$table:h,row:i});break;default:m.original?l=(0,_util.getCellValue)(i,e):(l=h.getCellLabel(i,e),"html"===e.type?(htmlCellElem.innerHTML=l,l=htmlCellElem.innerText.trim()):(a=h.getCellElement(i,e))&&!(0,_dom.hasClass)(a,"is--progress")&&(l=a.innerText.trim()))}s[e.id]=toStringValue(l)}),s})}function getExportData(l,e){let r=l.$xeGrid,o=l.$xeGantt,{columns:t,dataFilterMethod:a}=e,i=e.data;return a&&(i=i.filter((e,t)=>a({$table:l,$grid:r,$gantt:o,row:e,$rowIndex:t}))),getBodyLabelData(l,e,t,i)}function getBooleanValue(e){return"TRUE"===e||"true"===e||!0===e}function getHeaderTitle(e,t,l){var r=e.computeColumnOpts,r=l.headerExportMethod||r.headerExportMethod;return r?r({column:l,options:t,$table:e}):(t.isTitle?l.getTitle():l.field)||""}function getFooterCellValue(e,t,l,r){var o=e.computeColumnOpts,a=r.editRender||r.cellRender;let i=r.footerExportMethod;return(i=(i=!i&&a&&a.name&&(a=renderer.get(a.name))?a.tableFooterExportMethod||a.footerExportMethod||a.footerCellExportMethod:i)||o.footerExportMethod)?(a=e.getVTColumnIndex(r),i({$table:e,items:l,itemIndex:a,row:l,_columnIndex:a,column:r,options:t})):e.getFooterCellLabel(l,r)}function getFooterData(l,e,t){let r=l.$xeGrid,o=l.$xeGantt,a=e.footerFilterMethod;return a?t.filter((e,t)=>a({$table:l,$grid:r,$gantt:o,items:e,$rowIndex:t})):t}function getCsvCellTypeLabel(e,t){if(t){if("seq"===e.type)return`	`+t;switch(e.cellType){case"string":if(isNaN(t))break;return`	`+t;case"number":break;default:if(12<=t.length&&!isNaN(t))return`	`+t}}return t}function toTxtCellLabel(e){return/[",\s\n]/.test(e)?`"${e.replace(/"/g,'""')}"`:e}function toCsv(l,r,e,t){var o=l;let a=csvBOM;return r.isHeader&&(a+=e.map(e=>toTxtCellLabel(getHeaderTitle(l,r,e))).join(",")+enterSymbol),t.forEach(t=>{a+=e.map(e=>toTxtCellLabel(getCsvCellTypeLabel(e,t[e.id]))).join(",")+enterSymbol}),r.isFooter&&(t=o.footerTableData,getFooterData(l,r,t).forEach(t=>{a+=e.map(e=>toTxtCellLabel(getFooterCellValue(l,r,t,e))).join(",")+enterSymbol})),a}function toTxt(l,r,e,t){var o=l;let a="";return r.isHeader&&(a+=e.map(e=>toTxtCellLabel(getHeaderTitle(l,r,e))).join("\t")+enterSymbol),t.forEach(t=>{a+=e.map(e=>toTxtCellLabel(t[e.id])).join("\t")+enterSymbol}),r.isFooter&&(t=o.footerTableData,getFooterData(l,r,t).forEach(t=>{a+=e.map(e=>toTxtCellLabel(getFooterCellValue(l,r,t,e))).join("\t")+enterSymbol})),a}function hasEllipsis(e,t,l,r){t=t[l],l=_xeUtils.default.isUndefined(t)||_xeUtils.default.isNull(t)?r:t;let o="title"===l||(!0===l||"tooltip"===l)||"ellipsis"===l;var{scrollXLoad:r,scrollYLoad:t}=e;return o=r||t?o||!0:o}function toHtml(d,n,e,t){var l=d;let{id:c,border:r,treeConfig:o,headerAlign:s,align:u,footerAlign:a,showOverflow:p,showHeaderOverflow:h}=d,{isAllSelected:m,isIndeterminate:i}=l,g=d.mergeBodyCellMaps,x=d.computeTreeOpts,{print:f,isHeader:v,isFooter:b,isColgroup:_,isMerge:$,colgroups:y,original:C}=n,w="check-all",T=[`<table class="${["vxe-table","border--"+toTableBorder(r),f?"is--print":"",v?"is--header":""].filter(e=>e).join(" ")}" border="0" cellspacing="0" cellpadding="0">`,`<colgroup>${e.map(e=>`<col style="width:${e.renderWidth}px">`).join("")}</colgroup>`];v&&(T.push("<thead>"),_&&!C?y.forEach(e=>{T.push(`<tr>${e.map(t=>{var e=t.headerAlign||t.align||s||u,l=hasEllipsis(d,t,"showHeaderOverflow",h)?["col--ellipsis"]:[],r=getHeaderTitle(d,n,t);let o=0,a=0;_xeUtils.default.eachTree([t],e=>{e.childNodes&&t.childNodes.length||a++,o+=e.renderWidth},{children:"childNodes"});var i=o-a;return e&&l.push("col--"+e),"checkbox"===t.type?`<th class="${l.join(" ")}" colspan="${t._colSpan}" rowspan="${t._rowSpan}"><div ${f?"":`style="width: ${i}px"`}><input type="checkbox" class="${w}" ${m?"checked":""}><span>${r}</span></div></th>`:`<th class="${l.join(" ")}" colspan="${t._colSpan}" rowspan="${t._rowSpan}" title="${r}"><div ${f?"":`style="width: ${i}px"`}><span>${(0,_utils.formatText)(r,!0)}</span></div></th>`}).join("")}</tr>`)}):T.push(`<tr>${e.map(e=>{var t=e.headerAlign||e.align||s||u,l=hasEllipsis(d,e,"showHeaderOverflow",h)?["col--ellipsis"]:[],r=getHeaderTitle(d,n,e);return t&&l.push("col--"+t),"checkbox"===e.type?`<th class="${l.join(" ")}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><input type="checkbox" class="${w}" ${m?"checked":""}><span>${r}</span></div></th>`:`<th class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><span>${(0,_utils.formatText)(r,!0)}</span></div></th>`}).join("")}</tr>`),T.push("</thead>")),t.length&&(T.push("<tbody>"),o?t.forEach(o=>{T.push("<tr>"+e.map(t=>{var e=t.align||u,l=hasEllipsis(d,t,"showOverflow",p)?["col--ellipsis"]:[],r=o[t.id];if(e&&l.push("col--"+e),t.treeNode){let e="";return o._hasChild&&(e=`<i class="${o._expand?"vxe-table--tree-fold-icon":"vxe-table--tree-unfold-icon"}"></i>`),l.push("vxe-table--tree-node"),"radio"===t.type?`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${o._level*x.indent}px"><div class="vxe-table--tree-icon-wrapper">${e}</div><div class="vxe-table--tree-cell"><input type="radio" name="radio_${c}" ${o._radioDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._radioLabel}</span></div></div></div></td>`:"checkbox"===t.type?`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${o._level*x.indent}px"><div class="vxe-table--tree-icon-wrapper">${e}</div><div class="vxe-table--tree-cell"><input type="checkbox" ${o._checkboxDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._checkboxLabel}</span></div></div></div></td>`:`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${o._level*x.indent}px"><div class="vxe-table--tree-icon-wrapper">${e}</div><div class="vxe-table--tree-cell">${r}</div></div></div></td>`}return"radio"===t.type?`<td class="${l.join(" ")}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><input type="radio" name="radio_${c}" ${o._radioDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._radioLabel}</span></div></td>`:"checkbox"===t.type?`<td class="${l.join(" ")}"><div ${f?"":`style="width: ${t.renderWidth}px"`}><input type="checkbox" ${o._checkboxDisabled?"disabled ":""}${getBooleanValue(r)?"checked":""}><span>${o._checkboxLabel}</span></div></td>`:`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${t.renderWidth}px"`}>${(0,_utils.formatText)(r,!0)}</div></td>`}).join("")+"</tr>")}):t.forEach(s=>{T.push("<tr>"+e.map(e=>{var t=e.id,l=e.align||u,r=hasEllipsis(d,e,"showOverflow",p)?["col--ellipsis"]:[],t=s[t];let o=1,a=1;if($){var i=d.getVTRowIndex(s._row),n=d.getVTColumnIndex(e),i=g[i+":"+n];if(i){var{rowspan:n,colspan:i}=i;if(!n||!i)return"";1<n&&(o=n),1<i&&(a=i)}}return l&&r.push("col--"+l),"radio"===e.type?`<td class="${r.join(" ")}" rowspan="${o}" colspan="${a}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><input type="radio" name="radio_${c}" ${s._radioDisabled?"disabled ":""}${getBooleanValue(t)?"checked":""}><span>${s._radioLabel}</span></div></td>`:"checkbox"===e.type?`<td class="${r.join(" ")}" rowspan="${o}" colspan="${a}"><div ${f?"":`style="width: ${e.renderWidth}px"`}><input type="checkbox" ${s._checkboxDisabled?"disabled ":""}${getBooleanValue(t)?"checked":""}><span>${s._checkboxLabel}</span></div></td>`:`<td class="${r.join(" ")}" rowspan="${o}" colspan="${a}" title="${t}"><div ${f?"":`style="width: ${e.renderWidth}px"`}>${(0,_utils.formatText)(t,!0)}</div></td>`}).join("")+"</tr>")}),T.push("</tbody>")),b&&(t=l.footerTableData,(l=getFooterData(d,n,t)).length)&&(T.push("<tfoot>"),l.forEach(o=>{T.push(`<tr>${e.map(e=>{var t=e.footerAlign||e.align||a||u,l=hasEllipsis(d,e,"showOverflow",p)?["col--ellipsis"]:[],r=getFooterCellValue(d,n,o,e);return t&&l.push("col--"+t),`<td class="${l.join(" ")}" title="${r}"><div ${f?"":`style="width: ${e.renderWidth}px"`}>${(0,_utils.formatText)(r,!0)}</div></td>`}).join("")}</tr>`)}),T.push("</tfoot>"));t=!m&&i?`<script>(function(){var a=document.querySelector(".${w}");if(a){a.indeterminate=true}})()</script>`:"";return T.push("</table>",t),f?T.join(""):(0,_util2.createHtmlPage)(n,T.join(""))}function toXML(l,r,e,t){var o=l;let a=['<?xml version="1.0"?>','<?mso-application progid="Excel.Sheet"?>','<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40">','<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">',"<Version>16.00</Version>","</DocumentProperties>",'<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">',"<WindowHeight>7920</WindowHeight>","<WindowWidth>21570</WindowWidth>","<WindowTopX>32767</WindowTopX>","<WindowTopY>32767</WindowTopY>","<ProtectStructure>False</ProtectStructure>","<ProtectWindows>False</ProtectWindows>","</ExcelWorkbook>",`<Worksheet ss:Name="${r.sheetName}">`,"<Table>",e.map(e=>`<Column ss:Width="${e.renderWidth}"/>`).join("")].join("");return r.isHeader&&(a+=`<Row>${e.map(e=>`<Cell><Data ss:Type="String">${getHeaderTitle(l,r,e)}</Data></Cell>`).join("")}</Row>`),t.forEach(t=>{a+="<Row>"+e.map(e=>`<Cell><Data ss:Type="String">${t[e.id]}</Data></Cell>`).join("")+"</Row>"}),r.isFooter&&(t=o.footerTableData,getFooterData(l,r,t).forEach(t=>{a+=`<Row>${e.map(e=>`<Cell><Data ss:Type="String">${getFooterCellValue(l,r,t,e)}</Data></Cell>`).join("")}</Row>`})),a+"</Table></Worksheet></Workbook>"}function getContent(e,t,l,r){if(l.length)switch(t.type){case"csv":return toCsv(e,t,l,r);case"txt":return toTxt(e,t,l,r);case"html":return toHtml(e,t,l,r);case"xml":return toXML(e,t,l,r)}return""}function downloadFile(e,t,l){var{filename:r,type:o,download:a}=t;if(!a)return a=(0,_util2.getExportBlobByContent)(l,t),Promise.resolve({type:o,content:l,blob:a});_ui.VxeUI.saveFile&&_ui.VxeUI.saveFile({filename:r,type:o,content:l}).then(()=>{!1!==t.message&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({content:getI18n("vxe.table.expSuccess"),status:"success"})})}function clearColumnConvert(e){_xeUtils.default.eachTree(e,e=>{delete e._level,delete e._colSpan,delete e._rowSpan,delete e._children,delete e.childNodes},{children:"children"})}function handleExport(l,r){let o=l.$xeGrid,a=l.$xeGantt,{remote:i,columns:n,colgroups:s,exportMethod:d,afterExportMethod:t}=r;return new Promise(t=>{if(i){var e={options:r,$table:l,$grid:o,$gantt:a};t(d?d(e):e)}else{let e=getExportData(l,r);t(l.preventEvent(null,"event.export",{options:r,columns:n,colgroups:s,datas:e},()=>downloadFile(l,r,getContent(l,r,n,e))))}}).then(e=>(clearColumnConvert(n),r.print||t&&t({status:!0,options:r,$table:l,$grid:o,$gantt:a}),Object.assign({status:!0},e))).catch(()=>{clearColumnConvert(n),r.print||t&&t({status:!1,options:r,$table:l,$grid:o,$gantt:a});return Promise.reject({status:!1})})}function getElementsByTagName(e,t){return e.getElementsByTagName(t)}function getTxtCellKey(e){return`#${e}@`+_xeUtils.default.uniqueId()}function replaceTxtCell(e,t){return e.replace(/#\d+@\d+/g,e=>_xeUtils.default.hasOwnProp(t,e)?t[e]:e)}function getTxtCellValue(e,t){return replaceTxtCell(e,t).replace(/^"+$/g,e=>'"'.repeat(Math.ceil(e.length/2)))}function toExportField(e,t){var{fieldMaps:e,titleMaps:l}=e;return e[t]||(e=l[t])&&e.field&&(t=e.field),t}function parseCsvAndTxt(t,e,a){e=e.split(enterSymbol);let i=[],n=[];if(e.length){let r={},o=Date.now();e.forEach(e=>{if(e){let l={};e=(e=e.replace(/("")|(\n)/g,(e,t)=>{var l=getTxtCellKey(o);return r[l]=t?'"':"\n",l}).replace(/"(.*?)"/g,(e,t)=>{var l=getTxtCellKey(o);return r[l]=replaceTxtCell(t,r),l})).split(a);n.length?(e.forEach((e,t)=>{t<n.length&&(l[n[t]]=getTxtCellValue(e.trim(),r))}),i.push(l)):n=e.map(e=>toExportField(t,getTxtCellValue(e.trim(),r)))}})}return{fields:n,rows:i}}function parseCsv(e,t){return parseCsvAndTxt(e,t,",")}function parseTxt(e,t){return parseCsvAndTxt(e,t,"\t")}function parseHTML(t,e){var l,e=getElementsByTagName((new DOMParser).parseFromString(e,"text/html"),"body");let r=[],o=[];return e.length&&(e=getElementsByTagName(e[0],"table")).length&&(l=getElementsByTagName(e[0],"thead")).length&&(_xeUtils.default.arrayEach(getElementsByTagName(l[0],"tr"),e=>{_xeUtils.default.arrayEach(getElementsByTagName(e,"th"),e=>{o.push(toExportField(t,e.textContent||""))})}),(l=getElementsByTagName(e[0],"tbody")).length)&&_xeUtils.default.arrayEach(getElementsByTagName(l[0],"tr"),e=>{let l={};_xeUtils.default.arrayEach(getElementsByTagName(e,"td"),(e,t)=>{o[t]&&(l[o[t]]=e.textContent||"")}),r.push(l)}),{fields:o,rows:r}}function parseXML(t,e){var e=getElementsByTagName((new DOMParser).parseFromString(e,"application/xml"),"Worksheet");let r=[],o=[];return e.length&&(e=getElementsByTagName(e[0],"Table")).length&&(e=getElementsByTagName(e[0],"Row")).length&&(_xeUtils.default.arrayEach(getElementsByTagName(e[0],"Cell"),e=>{o.push(toExportField(t,e.textContent||""))}),_xeUtils.default.arrayEach(e,(e,t)=>{if(t){let l={};t=getElementsByTagName(e,"Cell");_xeUtils.default.arrayEach(t,(e,t)=>{o[t]&&(l[o[t]]=e.textContent)}),r.push(l)}})),{fields:o,rows:r}}function handleImport(l,e,r){let{tableFullColumn:t,_importResolve:o,_importReject:a}=l,i={fields:[],rows:[]},n={},s={};t.forEach(e=>{var t=e.field,l=e.getTitle();t&&(n[t]=e),l&&(s[e.getTitle()]=e)});var d={fieldMaps:n,titleMaps:s};switch(r.type){case"csv":i=parseCsv(d,e);break;case"txt":i=parseTxt(d,e);break;case"html":i=parseHTML(d,e);break;case"xml":i=parseXML(d,e)}let{fields:c,rows:u}=i;c.some(e=>n[e]||s[e])?l.createData(u).then(e=>{let t;return t="insert"===r.mode||"insertBottom"===r.mode?l.insertAt(e,-1):"insertTop"===r.mode?l.insert(e):l.reloadData(e),!1!==r.message&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:getI18n("vxe.table.impSuccess",[u.length]),status:"success"})),t.then(()=>{o&&o({status:!0})})}):!1!==r.message&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:getI18n("vxe.error.impFields"),status:"error"}),a)&&a({status:!1})}function handleFileImport(a,i,n){let s=a;var e=a.computeImportOpts;let{importMethod:d,afterImportMethod:t}=n,{type:c,filename:u}=(0,_utils.parseFile)(i);return d||_xeUtils.default.includes(_xeUtils.default.keys(e._typeMaps),c)?new Promise((t,l)=>{let e=e=>{t(e),a._importResolve=null,a._importReject=null},r=e=>{l(e),a._importResolve=null,a._importReject=null};if(a._importResolve=e,a._importReject=r,window.FileReader){let t=Object.assign({mode:"insertTop"},n,{type:c,filename:u});var o;t.remote?d?Promise.resolve(d({file:i,options:t,$table:a})).then(()=>{e({status:!0})}).catch(()=>{e({status:!0})}):e({status:!0}):(o=s.tableFullColumn,a.preventEvent(null,"event.import",{file:i,options:t,columns:o},()=>{var e=new FileReader;e.onerror=()=>{(0,_log.errLog)("vxe.error.notType",[c]),r({status:!1})},e.onload=e=>{handleImport(a,e.target.result,t)},e.readAsText(i,t.encoding||"UTF-8")}))}else(0,_log.errLog)("vxe.error.notExp"),e({status:!0})}).then(()=>{t&&t({status:!0,options:n,$table:a})}).catch(e=>(t&&t({status:!1,options:n,$table:a}),Promise.reject(e))):(!1!==n.message&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:getI18n("vxe.error.notType",[c]),status:"error"})),Promise.reject({status:!1}))}function handleCloseExport(){return _ui.VxeUI.modal?_ui.VxeUI.modal.close("VXE_EXPORT_MODAL"):Promise.resolve()}function handleFilterColumns(e,r,t){return t.some(e=>{var t,l;return(0,_util.isColumnInfo)(e)?r.id===e.id:_xeUtils.default.isString(e)?r.field===e:(t=e.id||e.colId,l=e.type,e=e.field,t?r.id===t:e&&l?r.field===e&&r.type===l:e?r.field===e:!!l&&r.type===l)})}function handleFilterFields(e,t,l,r){return(!r||!_xeUtils.default.includes(r,t.field))&&(l?!!_xeUtils.default.includes(l,t.field):e.original?!!t.field:defaultFilterExportColumn(t))}function handleExportAndPrint(n,e,t){var l=n.$xeGrid,r=n.$xeGantt,o=l||r,{treeConfig:a,showHeader:i,showFooter:s}=n,{initStore:d,isGroup:c,footerTableData:u,exportStore:p,exportParams:h}=n,{collectColumn:m,mergeBodyList:g,mergeFooterList:x}=n,f=n.computeExportOpts,v=n.computeCustomOpts,b=n.getCheckboxRecords(),o=o?o.computeProxyOpts:{},u=!!u.length,g=!(!g.length&&!x.length);let _=Object.assign({message:!0,isHeader:i,isTitle:i,isFooter:s,isColgroup:c,isMerge:g,useStyle:!0,current:"current",modes:(o.ajax&&o.ajax.queryAll?["all"]:[]).concat(["current","selected","empty"])},e);x=_.types||_xeUtils.default.keys(f._typeMaps),i=_.modes||[];let $=v.checkMethod;s=m.slice(0);let{columns:y,excludeFields:C,includeFields:w}=_;o=x.map(e=>({value:e,label:getI18n("vxe.export.types."+e)})),e=i.map(e=>e&&e.value?{value:e.value,label:e.label||e.value}:{value:e,label:getI18n("vxe.export.modes."+e)});_xeUtils.default.eachTree(s,(e,t,l,r,o)=>{var a=e.children&&0<e.children.length;let i=!1;i=y&&y.length?handleFilterColumns(_,e,y):C||w?handleFilterFields(_,e,w,C):e.visible&&(a||defaultFilterExportColumn(e)),e.checked=i,e.halfChecked=!1,e.disabled=o&&o.disabled||!!$&&!$({$table:n,column:e})}),Object.assign(p,{columns:s,typeList:o,modeList:e,hasFooter:u,hasMerge:g,hasTree:a,isPrint:t,hasColgroup:c,visible:!0}),Object.assign(h,{mode:b.length?"selected":"current"},_);let{filename:T,sheetName:E,mode:F,type:M}=h;return T&&(_xeUtils.default.isFunction(T)?h.filename=T({options:_,$table:n,$grid:l,$gantt:r}):h.filename=""+T),E&&(_xeUtils.default.isFunction(E)?h.sheetName=E({options:_,$table:n,$grid:l,$gantt:r}):h.sheetName=""+E),e.some(e=>e.value===F)||(h.mode=e[0].value),o.some(e=>e.value===M)||(h.type=o[0].value),d.export=!0,n.$nextTick()}let getConvertColumns=e=>{let t=[];return e.forEach(e=>{e.childNodes&&e.childNodes.length?(t.push(e),t.push(...getConvertColumns(e.childNodes))):t.push(e)}),t},convertToRows=e=>{let t=1,r=(l,e)=>{if(e&&(l._level=e._level+1,t<l._level)&&(t=l._level),l.childNodes&&l.childNodes.length){let t=0;l.childNodes.forEach(e=>{r(e,l),t+=e._colSpan}),l._colSpan=t}else l._colSpan=1},l=(e.forEach(e=>{e._level=1,r(e)}),[]);for(let e=0;e<t;e++)l.push([]);return getConvertColumns(e).forEach(e=>{e.childNodes&&e.childNodes.length?e._rowSpan=1:e._rowSpan=t-e._level+1,l[e._level-1].push(e)}),l};var _default=exports.default={methods:{_exportData(e){let s=this;var t=s,l=s,r=s;let d=s.$xeGrid,c=s.$xeGantt;var u=d||c,{treeConfig:t,showHeader:p,showFooter:h}=t,l=l.isGroup;let{tableFullColumn:a,afterFullData:o,afterTreeFullData:i,collectColumn:n,mergeBodyList:m,mergeFooterList:g}=r;var r=s.computeExportOpts,x=s.computeTreeOpts;let f=u?u.computeProxyOpts:{};var v=!(!m.length&&!g.length);let b=Object.assign({message:!0,isHeader:p,isTitle:p,isFooter:h,isColgroup:l,isMerge:v,useStyle:!0,current:"current",modes:(f.ajax&&f.ajax.queryAll?["all"]:[]).concat(["current","selected","empty"]),download:!0,type:"csv"},r,e),{filename:_,sheetName:$,type:y,mode:C,columns:w,original:T,columnFilterMethod:E,beforeExportMethod:F,includeFields:M,excludeFields:k}=b,I=[],U=s.getCheckboxRecords(),j=(C=C||(U.length?"selected":"current"),!1),O=[],L=(O=w&&w.length?(j=!0,w):_xeUtils.default.searchTree(n,e=>{var t=e.children&&0<e.children.length;let l=!1;return l=w&&w.length?handleFilterColumns(b,e,w):k||M?handleFilterFields(b,e,M,k):e.visible&&(t||defaultFilterExportColumn(e))},{children:"children",mapChildren:"childNodes",original:!0}),Object.assign({},b,{filename:"",sheetName:""})),V=(j||E||(E=({column:e})=>(!k||!_xeUtils.default.includes(k,e.field))&&(M?!!_xeUtils.default.includes(M,e.field):T?!!e.field:defaultFilterExportColumn(e)),L.columnFilterMethod=E),I=O?(L._isCustomColumn=!0,_xeUtils.default.searchTree(_xeUtils.default.mapTree(O,e=>{let r;if(e){if((0,_util.isColumnInfo)(e))r=e;else if(_xeUtils.default.isString(e))r=s.getColumnByField(e);else{var o=e.id||e.colId;let t=e.type,l=e.field;o?r=s.getColumnById(o):l&&t?r=a.find(e=>e.field===l&&e.type===t):l?r=s.getColumnByField(l):t&&(r=a.find(e=>e.type===t))}return r||{}}},{children:"childNodes",mapChildren:"_children"}),(e,t)=>(0,_util.isColumnInfo)(e)&&(!E||E({$table:s,$grid:d,$gantt:c,column:e,$columnIndex:t})),{children:"_children",mapChildren:"childNodes",original:!0})):_xeUtils.default.searchTree(l?n:a,(e,t)=>e.visible&&(!E||E({$table:s,$grid:d,$gantt:c,column:e,$columnIndex:t})),{children:"children",mapChildren:"childNodes",original:!0}),[]);if(_xeUtils.default.eachTree(I,e=>{e.children&&e.children.length||V.push(e)},{children:"childNodes"}),L.columns=V,L.colgroups=convertToRows(I),_&&(_xeUtils.default.isFunction(_)?L.filename=_({options:b,$table:s,$grid:d,$gantt:c}):L.filename=""+_),L.filename||(L.filename=getI18n(L.original?"vxe.table.expOriginFilename":"vxe.table.expFilename",[_xeUtils.default.toDateString(Date.now(),"yyyyMMddHHmmss")])),$&&(_xeUtils.default.isFunction($)?L.sheetName=$({options:b,$table:s,$grid:d,$gantt:c}):L.sheetName=""+$),L.sheetName||(L.sheetName=document.title||""),!L.exportMethod&&!_xeUtils.default.includes(_xeUtils.default.keys(r._typeMaps),y))return(0,_log.errLog)("vxe.error.notType",[y]),["xlsx","pdf"].includes(y)&&(0,_log.warnLog)("vxe.error.reqPlugin",[4,"plugin-export-xlsx"]),Promise.reject({status:!1});if(L.print||F&&F({options:L,$table:s,$grid:d,$gantt:c}),L.data)L._isCustomData=!0;else if(L.data=[],"selected"===C)-1<["html","pdf"].indexOf(y)&&t?L.data=_xeUtils.default.searchTree(s.getTableData().fullData,e=>-1<s.findRowIndexOf(U,e),Object.assign({},x,{data:"_row"})):L.data=U;else if("all"===C){if(u||(0,_log.errLog)("vxe.error.errProp",["all","mode=current,selected"]),u&&!L.remote){p=u.reactData;let e=u.computeProxyOpts;h=p.sortData;let{beforeQueryAll:t,afterQueryAll:o,ajax:l={}}=e,a=e.response||e.props||{};v=l.queryAll;let i=l.queryAllSuccess,n=l.queryAllError;if(v||(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.queryAll"]),v){let r={$table:s,$grid:d,$gantt:c,sort:h.length?h[0]:{},sorts:h,filters:p.filterData,form:p.formData,options:L};return Promise.resolve((t||v)(r)).then(e=>{var t=a.list;let l=[];return t?l=_xeUtils.default.isFunction(t)?t({data:e,$table:s,$grid:d,$gantt:c}):_xeUtils.default.isArray(e)?e:_xeUtils.default.get(e,t):_xeUtils.default.isArray(e)&&(l=e),L.data=l,o&&o(r),i&&i(Object.assign(Object.assign({},r),{response:e})),handleExport(s,L)}).catch(e=>{n&&n(Object.assign(Object.assign({},r),{response:e}))})}}}else"current"===C&&(L.data=t?i:o);return handleExport(s,L)},_importByFile(e,t){var t=Object.assign({},t),l=t.beforeImportMethod;return l&&l({options:t,$table:this}),handleFileImport(this,e,t)},_importData(e){let t=this;var l=this.importOpts;let r=Object.assign({types:_xeUtils.default.keys(l._typeMaps)},l,e),{beforeImportMethod:o,afterImportMethod:a}=r;return o&&o({options:r,$table:this}),_ui.VxeUI.readFile(r).catch(e=>(a&&a({status:!1,options:r,$table:t}),Promise.reject(e))).then(e=>{e=e.file;return handleFileImport(t,e,r)})},_saveFile(e){return _ui.VxeUI.saveFile(e)},_readFile(e){return _ui.VxeUI.readFile(e)},_print(e){let l=this,r=l.$xeGrid,o=l.$xeGantt;var t=l.computePrintOpts;let a=Object.assign({original:!1},t,e,{type:"html",download:!1,remote:!1,print:!0});t=a.sheetName;let i="",n=(i=(i=t?_xeUtils.default.isFunction(t)?t({options:a,$table:l,$grid:r,$gantt:o}):""+t:i)||document.title||"",a.beforePrintMethod),s=a.html||a.content;return new Promise((e,t)=>{_ui.VxeUI.print?s?e(_ui.VxeUI.print({title:i,html:s,customStyle:a.style,beforeMethod:n?({html:e})=>n({html:e,content:e,options:a,$table:l,$grid:r,$gantt:o}):void 0})):e(l.exportData(a).then(({content:e})=>_ui.VxeUI.print({title:i,html:e,customStyle:a.style,beforeMethod:n?({html:e})=>n({html:e,content:e,options:a,$table:l,$grid:r,$gantt:o}):void 0}))):t({status:!1})})},_getPrintHtml(e){var t=this.computePrintOpts,t=Object.assign({original:!1},t,e,{type:"html",download:!1,remote:!1,print:!0});return this.exportData(t).then(({content:e})=>({html:e}))},_closeImport(){return _ui.VxeUI.modal?_ui.VxeUI.modal.close("VXE_IMPORT_MODAL"):Promise.resolve()},_openImport(e){var{treeConfig:t,importConfig:l}=this;let{initStore:r,importStore:o,importParams:a}=this;var i=this.computeImportOpts,i=Object.assign({mode:"insertTop",message:!0,types:_xeUtils.default.keys(i._typeMaps),modes:["insertTop","covering"]},i,e),e=i.types||[],n=i.modes||[];!t?(l||(0,_log.errLog)("vxe.error.reqProp",["import-config"]),t=e.map(e=>({value:e,label:getI18n("vxe.export.types."+e)})),l=n.map(e=>e&&e.value?{value:e.value,label:e.label||e.value}:{value:e,label:getI18n("vxe.import.modes."+e)}),Object.assign(o,{file:null,type:"",filename:"",modeList:l,typeList:t,visible:!0}),Object.assign(a,i),l.some(e=>e.value===a.mode)||(a.mode=l[0].value),r.import=!0):i.message&&_ui.VxeUI.modal.message({content:getI18n("vxe.error.treeNotImp"),status:"error"})},_closeExport:handleCloseExport,_openExport(e){var t=this.computeExportOpts,t=Object.assign({message:!0,types:_xeUtils.default.keys(t._typeMaps)},t,e);return this.exportConfig||(0,_log.errLog)("vxe.error.reqProp",["export-config"]),handleExportAndPrint(this,t)},_closePrint:handleCloseExport,_openPrint(e){var t=this.computePrintOpts,t=Object.assign({message:!0},t,e);return this.printConfig||(0,_log.errLog)("vxe.error.reqProp",["print-config"]),handleExportAndPrint(this,t,!0)}}};

package/lib/table/module/keyboard/mixin.js

@@ -94,9 +94,21 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
     visibleColumn
   } = internalData;
   const params = Object.assign({}, args);
-  const _rowIndex = $xeTable.getVTRowIndex(params.row);
-  const _columnIndex = $xeTable.getVTColumnIndex(params.column);
-  evnt.preventDefault();
+  const {
+    row,
+    column
+  } = params;
+  const _rowIndex = $xeTable.getVTRowIndex(row);
+  const _columnIndex = $xeTable.getVTColumnIndex(column);
+  const refTableBody = $xeTable.$refs.refTableBody;
+  const tableBodyElem = refTableBody ? refTableBody.$el : null;
+  const tableWidth = tableBodyElem ? tableBodyElem.clientWidth : 0;
+  let colAlign = isLeftArrow || isRightArrow || column.renderWidth < tableWidth;
+  if (isLeftArrow && _columnIndex >= 0 || isRightArrow && _columnIndex <= visibleColumn.length - 1) {
+    colAlign = false;
+  } else {
+    evnt.preventDefault();
+  }
   if (isUpArrow && _rowIndex > 0) {
     // 移动到上一行
     params.rowIndex = _rowIndex - 1;
@@ -114,7 +126,9 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
     params.columnIndex = _columnIndex + 1;
     params.column = visibleColumn[params.columnIndex];
   }
-  $xeTable.scrollToRow(params.row, params.column).then(() => {
+  $xeTable.scrollToRow(params.row, params.column, {
+    colAlign
+  }).then(() => {
     params.cell = $xeTable.getCellElement(params.row, params.column);
     $xeTable.handleSelected(params, evnt);
   });

package/lib/table/module/keyboard/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util"),_dom=require("../../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getCheckboxRangeRows(t,e,l,o,r,n,u){var i=t.showOverflow,{fullAllDataRowIdData:c,isResizeCellHeight:s}=t,d=t.computeRowOpts,h=t.computeCellOpts,g=t.computeDefaultRowHeight,l=l.row;let a=0,m=[],C=0;var p=0<u,w=t.scrollYLoad,v=t.afterFullData;if(C=p?n+u:r.height-n+Math.abs(u),w){r=t.getVTRowIndex(l);if(!(s||h.height||d.height)&&i)m=p?v.slice(r,r+Math.ceil(C/g)):v.slice(r-Math.floor(C/g),r+1);else if(p)for(let e=r;e<v.length;e++){var f=v[e],x=c[t.getRowid(f)]||{};if(a+=x.resizeHeight||h.height||d.height||x.height||g,m.push(f),a>C)return m}else for(let e=r;0<=e;e--){var R=v[e],b=c[t.getRowid(R)]||{};if(a+=b.resizeHeight||h.height||d.height||b.height||g,m.push(R),a>C)return m}}else for(var I=p?"next":"previous";o&&a<C;){var E=t.getRowNode(o);E&&(m.push(E.item),a+=o.offsetHeight,o=o[I+"ElementSibling"])}return m}function handleMoveSelected(e,t,l,o,r,n,u){var{afterFullData:i,visibleColumn:c}=e;let s=Object.assign({},l);var l=e.getVTRowIndex(s.row),d=e.getVTColumnIndex(s.column);return t.preventDefault(),r&&0<l?(s.rowIndex=l-1,s.row=i[s.rowIndex]):u&&l<i.length-1?(s.rowIndex=l+1,s.row=i[s.rowIndex]):o&&d?(s.columnIndex=d-1,s.column=c[s.columnIndex]):n&&d<c.length-1&&(s.columnIndex=d+1,s.column=c[s.columnIndex]),e.scrollToRow(s.row,s.column).then(()=>{s.cell=e.getCellElement(s.row,s.column),e.handleSelected(s,t)}),s}function handleCheckboxRangeEvent(S,e,M){var t=S.elemStore,l=(0,_util.getRefElem)(t["main-body-scroll"]),o=(0,_util.getRefElem)(t["left-body-scroll"]),t=(0,_util.getRefElem)(t["right-body-scroll"]),{column:r,cell:n}=M;if("checkbox"===r.type){let T=l;if(o&&"left"===r.fixed?T=o:t&&"right"===r.fixed&&(T=t),T){l=T.getBoundingClientRect();let t=S.$refs.refElem,i=e.clientX,c=e.clientY,s=T.querySelector(".vxe-table--checkbox-range"),d=n.parentNode,h=S.getCheckboxRecords(),g=[],a=1,m=e.clientY-l.y+T.scrollTop,C=e.clientX-l.x+T.scrollLeft,p=T.scrollTop,u=d.offsetHeight,w=d.getBoundingClientRect(),v=c-w.y,f=null,x=!1,R=1,b=(e,t)=>{S.dispatchEvent("checkbox-range-"+e,{records:()=>S.getCheckboxRecords(),reserves:()=>S.getCheckboxReserveRecords()},t)},I=e=>{var{clientX:t,clientY:l}=e,t=t-i,l=l-c+(T.scrollTop-p);let o=Math.abs(l),r=Math.abs(t),n=m,u=C;l<a?(n+=l)<a&&(n=a,o=m):o=Math.min(o,T.scrollHeight-m-a),t<a?(u+=t,r>C&&(u=a,r=C)):r=Math.min(r,T.clientWidth-C-a),s.style.height=o+"px",s.style.width=r+"px",s.style.left=u+"px",s.style.top=n+"px",s.style.display="block";t=getCheckboxRangeRows(S,e,M,d,w,v,l<a?-o:o);10<o&&t.length!==g.length&&(l=(0,_dom.hasControlKey)(e),g=t,l?t.forEach(e=>{S.handleBatchSelectRows([e],-1===h.indexOf(e))}):(S.setAllCheckboxRow(!1),S.handleCheckedCheckboxRow(t,!0,!1)),b("change",e))},E=()=>{clearTimeout(f),f=null},O=n=>{E(),f=setTimeout(()=>{var e,t,l,o,r;f&&({scrollLeft:e,scrollTop:t,clientHeight:l,scrollHeight:o}=T,r=Math.ceil(50*R/u),x?t+l<o?(S.scrollTo(e,t+r),O(n),I(n)):E():t?(S.scrollTo(e,t-r),O(n),I(n)):E())},50)};(0,_dom.addClass)(t,"drag--range"),document.onmousemove=e=>{e.preventDefault(),e.stopPropagation();var t=e.clientY,l=(0,_dom.getAbsolutePos)(T).boundingTop;t<l?(x=!1,R=l-t,f||O(e)):t>l+T.clientHeight?(x=!0,R=t-l-T.clientHeight,f||O(e)):f&&E(),I(e)},document.onmouseup=e=>{E(),(0,_dom.removeClass)(t,"drag--range"),s.removeAttribute("style"),document.onmousemove=null,document.onmouseup=null,b("end",e)},b("start",e)}}}var _default=exports.default={methods:{moveTabSelected(e,t,l){let o=this;var r=o.editConfig,{afterFullData:n,visibleColumn:u}=o,i=o.computeEditOpts,c=o.computeRowOpts,s=o.computeCurrentRowOpts,d=o.computeColumnOpts,h=o.computeCurrentColumnOpts;let g,a,m,C=Object.assign({},e);var e=o.getVTRowIndex(C.row),p=o.getVTColumnIndex(C.column),t=(l.preventDefault(),t?p<=0?0<e&&(a=e-1,g=n[a],m=u.length-1):m=p-1:p>=u.length-1?e<n.length-1&&(a=e+1,g=n[a],m=0):m=p+1,u[m]);t&&(g?(C.rowIndex=a,C.row=g):C.rowIndex=e,C.columnIndex=m,C.column=t,C.cell=o.getCellElement(C.row,C.column),c.isCurrent&&s.isFollowSelected&&o.triggerCurrentRowEvent(l,C),d.isCurrent&&h.isFollowSelected&&o.triggerCurrentColumnEvent(l,C),r?"click"!==i.trigger&&"dblclick"!==i.trigger||("row"===i.mode?o.handleEdit(C,l):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)})):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)}))},moveCurrentRow(e,t,l){let o=this;var r=o,n=o,u=o,r=r.treeConfig;let i=n.currentRow;var n=u.afterFullData,u=o.computeTreeOpts,u=u.children||u.childrenField;let c;if(i?r?({index:r,items:u}=_xeUtils.default.findTree(n,e=>e===i,{children:u}),e&&0<r?c=u[r-1]:t&&r<u.length-1&&(c=u[r+1])):(u=o.getVTRowIndex(i),e&&0<u?c=n[u-1]:t&&u<n.length-1&&(c=n[u+1])):c=n[0],c){l.preventDefault();let e={$table:o,row:c,rowIndex:o.getRowIndex(c),$rowIndex:o.getVMRowIndex(c)};o.scrollToRow(c).then(()=>o.triggerCurrentRowEvent(l,e))}},moveCurrentColumn(e,t,l){let o=this;var r=o.currentColumn,n=o.visibleColumn;let u=null;if(r?(r=o.getVTColumnIndex(r),e&&0<r?u=n[r-1]:t&&r<n.length-1&&(u=n[r+1])):u=n[0],u){l.preventDefault();let e={$table:o,column:u,columnIndex:o.getColumnIndex(u),$columnIndex:o.getVMColumnIndex(u)};o.scrollToColumn(u).then(()=>o.triggerCurrentColumnEvent(l,e))}},moveArrowSelected(e,t,l,o,r,n){var u=this,{highlightCurrentRow:i,highlightCurrentColumn:c}=u,s=u.computeRowOpts,d=u.computeCurrentRowOpts,h=u.computeColumnOpts,g=u.computeCurrentColumnOpts,e=handleMoveSelected(u,n,e,t,l,o,r);(s.isCurrent||i)&&(d.isFollowSelected?u.triggerCurrentRowEvent(n,e):(l||r)&&(s.isCurrent||i)&&u.moveCurrentRow(l,r,n)),(h.isCurrent||c)&&(g.isFollowSelected?u.triggerCurrentColumnEvent(n,e):(t||o)&&(h.isCurrent||c)&&u.moveCurrentColumn(t,o,n))},moveEnterSelected(e,t,l,o,r,n){var u=this,{highlightCurrentRow:i,highlightCurrentColumn:c}=u,s=u.computeRowOpts,d=u.computeCurrentRowOpts,h=u.computeColumnOpts,g=u.computeCurrentColumnOpts,e=handleMoveSelected(u,n,e,t,l,o,r);(s.isCurrent||i)&&d.isFollowSelected&&u.triggerCurrentRowEvent(n,e),(h.isCurrent||c)&&g.isFollowSelected&&u.triggerCurrentColumnEvent(n,e)},moveSelected(e,t,l,o,r,n){handleMoveSelected(this,n,e,t,l,o,r)},handleCellMousedownEvent(e,t){var l=this,{editConfig:o,checkboxConfig:r,mouseConfig:n}=l,u=l.computeCheckboxOpts,i=l.computeMouseOpts,c=l.computeEditOpts;if(n&&i.area&&l.triggerClAreaModnEvent)return l.triggerClAreaModnEvent(e,t);r&&u.range&&handleCheckboxRangeEvent(l,e,t),n&&i.selected&&(o&&"cell"!==c.mode||l.handleSelected(t,e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util"),_dom=require("../../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getCheckboxRangeRows(t,e,l,o,n,r,i){var u=t.showOverflow,{fullAllDataRowIdData:c,isResizeCellHeight:s}=t,d=t.computeRowOpts,h=t.computeCellOpts,g=t.computeDefaultRowHeight,l=l.row;let a=0,m=[],C=0;var p=0<i,w=t.scrollYLoad,v=t.afterFullData;if(C=p?r+i:n.height-r+Math.abs(i),w){n=t.getVTRowIndex(l);if(!(s||h.height||d.height)&&u)m=p?v.slice(n,n+Math.ceil(C/g)):v.slice(n-Math.floor(C/g),n+1);else if(p)for(let e=n;e<v.length;e++){var f=v[e],x=c[t.getRowid(f)]||{};if(a+=x.resizeHeight||h.height||d.height||x.height||g,m.push(f),a>C)return m}else for(let e=n;0<=e;e--){var R=v[e],b=c[t.getRowid(R)]||{};if(a+=b.resizeHeight||h.height||d.height||b.height||g,m.push(R),a>C)return m}}else for(var I=p?"next":"previous";o&&a<C;){var E=t.getRowNode(o);E&&(m.push(E.item),a+=o.offsetHeight,o=o[I+"ElementSibling"])}return m}function handleMoveSelected(e,t,l,o,n,r,i){var{afterFullData:u,visibleColumn:c}=e;let s=Object.assign({},l);var{row:l,column:d}=s,l=e.getVTRowIndex(l),h=e.getVTColumnIndex(d),g=e.$refs.refTableBody,g=g?g.$el:null,g=g?g.clientWidth:0;let a=o||r||d.renderWidth<g;return o&&0<=h||r&&h<=c.length-1?a=!1:t.preventDefault(),n&&0<l?(s.rowIndex=l-1,s.row=u[s.rowIndex]):i&&l<u.length-1?(s.rowIndex=l+1,s.row=u[s.rowIndex]):o&&h?(s.columnIndex=h-1,s.column=c[s.columnIndex]):r&&h<c.length-1&&(s.columnIndex=h+1,s.column=c[s.columnIndex]),e.scrollToRow(s.row,s.column,{colAlign:a}).then(()=>{s.cell=e.getCellElement(s.row,s.column),e.handleSelected(s,t)}),s}function handleCheckboxRangeEvent(S,e,M){var t=S.elemStore,l=(0,_util.getRefElem)(t["main-body-scroll"]),o=(0,_util.getRefElem)(t["left-body-scroll"]),t=(0,_util.getRefElem)(t["right-body-scroll"]),{column:n,cell:r}=M;if("checkbox"===n.type){let O=l;if(o&&"left"===n.fixed?O=o:t&&"right"===n.fixed&&(O=t),O){l=O.getBoundingClientRect();let t=S.$refs.refElem,u=e.clientX,c=e.clientY,s=O.querySelector(".vxe-table--checkbox-range"),d=r.parentNode,h=S.getCheckboxRecords(),g=[],a=1,m=e.clientY-l.y+O.scrollTop,C=e.clientX-l.x+O.scrollLeft,p=O.scrollTop,i=d.offsetHeight,w=d.getBoundingClientRect(),v=c-w.y,f=null,x=!1,R=1,b=(e,t)=>{S.dispatchEvent("checkbox-range-"+e,{records:()=>S.getCheckboxRecords(),reserves:()=>S.getCheckboxReserveRecords()},t)},I=e=>{var{clientX:t,clientY:l}=e,t=t-u,l=l-c+(O.scrollTop-p);let o=Math.abs(l),n=Math.abs(t),r=m,i=C;l<a?(r+=l)<a&&(r=a,o=m):o=Math.min(o,O.scrollHeight-m-a),t<a?(i+=t,n>C&&(i=a,n=C)):n=Math.min(n,O.clientWidth-C-a),s.style.height=o+"px",s.style.width=n+"px",s.style.left=i+"px",s.style.top=r+"px",s.style.display="block";t=getCheckboxRangeRows(S,e,M,d,w,v,l<a?-o:o);10<o&&t.length!==g.length&&(l=(0,_dom.hasControlKey)(e),g=t,l?t.forEach(e=>{S.handleBatchSelectRows([e],-1===h.indexOf(e))}):(S.setAllCheckboxRow(!1),S.handleCheckedCheckboxRow(t,!0,!1)),b("change",e))},E=()=>{clearTimeout(f),f=null},T=r=>{E(),f=setTimeout(()=>{var e,t,l,o,n;f&&({scrollLeft:e,scrollTop:t,clientHeight:l,scrollHeight:o}=O,n=Math.ceil(50*R/i),x?t+l<o?(S.scrollTo(e,t+n),T(r),I(r)):E():t?(S.scrollTo(e,t-n),T(r),I(r)):E())},50)};(0,_dom.addClass)(t,"drag--range"),document.onmousemove=e=>{e.preventDefault(),e.stopPropagation();var t=e.clientY,l=(0,_dom.getAbsolutePos)(O).boundingTop;t<l?(x=!1,R=l-t,f||T(e)):t>l+O.clientHeight?(x=!0,R=t-l-O.clientHeight,f||T(e)):f&&E(),I(e)},document.onmouseup=e=>{E(),(0,_dom.removeClass)(t,"drag--range"),s.removeAttribute("style"),document.onmousemove=null,document.onmouseup=null,b("end",e)},b("start",e)}}}var _default=exports.default={methods:{moveTabSelected(e,t,l){let o=this;var n=o.editConfig,{afterFullData:r,visibleColumn:i}=o,u=o.computeEditOpts,c=o.computeRowOpts,s=o.computeCurrentRowOpts,d=o.computeColumnOpts,h=o.computeCurrentColumnOpts;let g,a,m,C=Object.assign({},e);var e=o.getVTRowIndex(C.row),p=o.getVTColumnIndex(C.column),t=(l.preventDefault(),t?p<=0?0<e&&(a=e-1,g=r[a],m=i.length-1):m=p-1:p>=i.length-1?e<r.length-1&&(a=e+1,g=r[a],m=0):m=p+1,i[m]);t&&(g?(C.rowIndex=a,C.row=g):C.rowIndex=e,C.columnIndex=m,C.column=t,C.cell=o.getCellElement(C.row,C.column),c.isCurrent&&s.isFollowSelected&&o.triggerCurrentRowEvent(l,C),d.isCurrent&&h.isFollowSelected&&o.triggerCurrentColumnEvent(l,C),n?"click"!==u.trigger&&"dblclick"!==u.trigger||("row"===u.mode?o.handleEdit(C,l):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)})):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)}))},moveCurrentRow(e,t,l){let o=this;var n=o,r=o,i=o,n=n.treeConfig;let u=r.currentRow;var r=i.afterFullData,i=o.computeTreeOpts,i=i.children||i.childrenField;let c;if(u?n?({index:n,items:i}=_xeUtils.default.findTree(r,e=>e===u,{children:i}),e&&0<n?c=i[n-1]:t&&n<i.length-1&&(c=i[n+1])):(i=o.getVTRowIndex(u),e&&0<i?c=r[i-1]:t&&i<r.length-1&&(c=r[i+1])):c=r[0],c){l.preventDefault();let e={$table:o,row:c,rowIndex:o.getRowIndex(c),$rowIndex:o.getVMRowIndex(c)};o.scrollToRow(c).then(()=>o.triggerCurrentRowEvent(l,e))}},moveCurrentColumn(e,t,l){let o=this;var n=o.currentColumn,r=o.visibleColumn;let i=null;if(n?(n=o.getVTColumnIndex(n),e&&0<n?i=r[n-1]:t&&n<r.length-1&&(i=r[n+1])):i=r[0],i){l.preventDefault();let e={$table:o,column:i,columnIndex:o.getColumnIndex(i),$columnIndex:o.getVMColumnIndex(i)};o.scrollToColumn(i).then(()=>o.triggerCurrentColumnEvent(l,e))}},moveArrowSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&(d.isFollowSelected?i.triggerCurrentRowEvent(r,e):(l||n)&&(s.isCurrent||u)&&i.moveCurrentRow(l,n,r)),(h.isCurrent||c)&&(g.isFollowSelected?i.triggerCurrentColumnEvent(r,e):(t||o)&&(h.isCurrent||c)&&i.moveCurrentColumn(t,o,r))},moveEnterSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&d.isFollowSelected&&i.triggerCurrentRowEvent(r,e),(h.isCurrent||c)&&g.isFollowSelected&&i.triggerCurrentColumnEvent(r,e)},moveSelected(e,t,l,o,n,r){handleMoveSelected(this,r,e,t,l,o,n)},handleCellMousedownEvent(e,t){var l=this,{editConfig:o,checkboxConfig:n,mouseConfig:r}=l,i=l.computeCheckboxOpts,u=l.computeMouseOpts,c=l.computeEditOpts;if(r&&u.area&&l.triggerClAreaModnEvent)return l.triggerClAreaModnEvent(e,t);n&&i.range&&handleCheckboxRangeEvent(l,e,t),r&&u.selected&&(o&&"cell"!==c.mode||l.handleSelected(t,e))}}};

package/lib/table/module/validator/mixin.js

@@ -130,21 +130,23 @@ function validRuleValue(rule, val, required) {
   }
   return true;
 }
-function checkRuleStatus(rule, val) {
+function checkRuleStatus(rule, row, val) {
   const {
-    required
+    required,
+    field
   } = rule;
-  const isEmptyVal = _xeUtils.default.isArray(val) ? !val.length : (0, _utils.eqEmptyValue)(val);
+  const currVal = field ? _xeUtils.default.get(row, field) : val;
+  const isEmptyVal = _xeUtils.default.isArray(currVal) ? !currVal.length : (0, _utils.eqEmptyValue)(currVal);
   if (required) {
     if (isEmptyVal) {
       return false;
     }
-    if (!validRuleValue(rule, val, required)) {
+    if (!validRuleValue(rule, currVal, required)) {
       return false;
     }
   } else {
     if (!isEmptyVal) {
-      if (!validRuleValue(rule, val, required)) {
+      if (!validRuleValue(rule, currVal, required)) {
         return false;
       }
     }
@@ -498,7 +500,7 @@ var _default = exports.default = {
                   }
                 }
               } else {
-                if (!checkRuleStatus(rule, cellValue)) {
+                if (!checkRuleStatus(rule, row, cellValue)) {
                   internalData.validRuleErr = true;
                   errorRules.push(new Rule(rule));
                 }

package/lib/table/module/validator/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util=require("../../src/util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,validators}=_ui.VxeUI;class Rule{constructor(e){Object.defineProperty(this,"$options",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}get content(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}get message(){return this.content}}function validREValue(e,t){return!(e&&!(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(t))}function validMaxValue(e,t){return!(!_xeUtils.default.eqNull(e)&&t>_xeUtils.default.toNumber(e))}function validMinValue(e,t){return!(!_xeUtils.default.eqNull(e)&&t<_xeUtils.default.toNumber(e))}function validRuleValue(e,t,l){var{type:e,min:r,max:i,pattern:a}=e,u="array"===e,n="number"===e,e="string"===e,s=""+t;if(!validREValue(a,s))return!1;if(u){if(!_xeUtils.default.isArray(t))return!1;if(l&&!t.length)return!1;if(!validMinValue(r,t.length))return!1;if(!validMaxValue(i,t.length))return!1}else if(n){a=Number(t);if(isNaN(a))return!1;if(!validMinValue(r,a))return!1;if(!validMaxValue(i,a))return!1}else{if(e&&!_xeUtils.default.isString(t))return!1;if(l&&!s)return!1;if(!validMinValue(r,s.length))return!1;if(!validMaxValue(i,s.length))return!1}return!0}function checkRuleStatus(e,t){var l=e.required,r=_xeUtils.default.isArray(t)?!t.length:(0,_utils.eqEmptyValue)(t);if(l){if(r)return!1;if(!validRuleValue(e,t,l))return!1}else if(!r&&!validRuleValue(e,t,l))return!1;return!0}function handleValidError(t,l){return new Promise(e=>{!1===t.computeValidOpts.autoPos?(t.dispatchEvent("valid-error",l,null),e()):t.handleEdit(l,{type:"valid-error",trigger:"call"}).then(()=>{setTimeout(()=>{e(t.showValidTooltip(l))},10)})})}function handleErrMsgMode(e,t){var l;return"single"===e.computeValidOpts.msgMode?(e={},(l=Object.keys(t)).length&&(e[l=l[0]]=t[l]),e):t}function beginValidate(a,e,l,u,n){let r=a,s=a,o={},{editRules:d,treeConfig:i}=a;var c=r.isRowGroupStatus;let{afterFullData:t,pendingRowMaps:g,removeRowMaps:f}=s;var h=a.computeTreeOpts,m=a.computeAggregateOpts;let p=a.computeValidOpts,v,x=(!0===e?v=t:e&&(_xeUtils.default.isFunction(e)?u=e:v=_xeUtils.default.isArray(e)?e:[e]),v=v||a.getInsertRecords().concat(a.getUpdateRecords()),[]),_=(s._lastCallTime=Date.now(),s.validRuleErr=!1,a.clearValidate(),{});if(d){let t=l&&l.length?l:a.getColumns();e=i=>{var e=(0,_util.getRowid)(a,i);if(!f[e]&&!g[e]&&!a.isAggregateRecord(i)&&(n||!s.validRuleErr)){let e=[];t.forEach(l=>{let r=_xeUtils.default.isString(l)?l:l.field;!n&&s.validRuleErr||!_xeUtils.default.has(d,r)||e.push(a.validCellRules("all",i,l).catch(({rule:e,rules:t})=>{t={rule:e,rules:t,rowIndex:a.getRowIndex(i),row:i,columnIndex:a.getColumnIndex(l),column:l,field:r,$table:a};if(o[r]||(o[r]=[]),_[(0,_util.getRowid)(a,i)+":"+l.id]={column:l,row:i,rule:e,content:e.content},o[r].push(t),!n)return s.validRuleErr=!0,Promise.reject(t)}))}),x.push(Promise.all(e))}};return c?_xeUtils.default.eachTree(v,e,{children:m.mapChildrenField}):i?(l=h.children||h.childrenField,_xeUtils.default.eachTree(v,e,{children:l})):v.forEach(e),Promise.all(x).then(()=>{let e=Object.keys(o);return r.validErrorMaps=handleErrMsgMode(a,_),a.$nextTick().then(()=>{if(e.length)return Promise.reject(o[e[0]][0]);u&&u()})}).catch(i=>new Promise((e,t)=>{let l=()=>{a.$nextTick(()=>{u?(u(o),e()):("obsolete"===getConfig().validToReject?t:e)(o)})};var r;!1===p.autoPos?l():(r=i.row,a.scrollToRow(r,i.column).then(()=>{i.cell=a.getCellElement(i.row,i.column),(0,_dom.scrollToView)(i.cell),handleValidError(a,i).then(l)}))}))}return r.validErrorMaps={},a.$nextTick().then(()=>{u&&u()})}var _default=exports.default={methods:{_fullValidate(e,t){return _xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),beginValidate(this,e,null,t,!0)},_validate(e,t){return _xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),beginValidate(this,e,null,t)},_fullValidateField(e,t){t=(_xeUtils.default.isArray(t)?t:t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(this,e));return t.length?beginValidate(this,e,t,null,!0):this.$nextTick()},_validateField(e,t){t=(_xeUtils.default.isArray(t)?t:t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(this,e));return t.length?beginValidate(this,e,t,null):this.$nextTick()},hasCellRules(t,e,l){var r=this.editRules,l=l.property;return!(!l||!r)&&(r=_xeUtils.default.get(r,l))&&_xeUtils.default.find(r,e=>"all"===t||!e.trigger||t===e.trigger)},validCellRules(e,s,o,t){let d=this;var l=d;let c=d;var l=l.editRules,r=o.field;let g=[],f=[];if(r&&l){let n=_xeUtils.default.get(l,r);if(n){let u=_xeUtils.default.isUndefined(t)?_xeUtils.default.get(s,r):t;n.forEach(t=>{let{trigger:l,validator:r}=t;if("all"===e||!l||e===l)if(r){var i,a={cellValue:u,rule:t,rules:n,row:s,rowIndex:d.getRowIndex(s),column:o,columnIndex:d.getColumnIndex(o),field:o.field,$table:d};let e;_xeUtils.default.isString(r)?(i=validators.get(r))&&(i=i.tableCellValidatorMethod||i.cellValidatorMethod)?e=i(a):(0,_log.errLog)("vxe.error.notValidators",[r]):e=r(a),e&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(e=>{c.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:l,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))}else checkRuleStatus(t,u)||(c.validRuleErr=!0,g.push(new Rule(t)))})}}return Promise.all(f).then(()=>{var e;if(g.length)return e={rules:g,rule:g[0]},Promise.reject(e)})},_clearValidate(e,t){let r=this;var l=r,i=l.validErrorMaps,a=r.$refs.refValidTooltip,u=r.computeValidOpts,e=_xeUtils.default.isArray(e)?e:e?[e]:[];let n=(_xeUtils.default.isArray(t)?t:t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(r,e)),s={};if(a&&a.reactData.visible&&a.close(),"single"===u.msgMode)l.validErrorMaps={};else{if(e.length&&n.length)s=Object.assign({},i),e.forEach(t=>{n.forEach(e=>{e=(0,_util.getRowid)(r,t)+":"+e.id;s[e]&&delete s[e]})});else if(e.length){let l=e.map(e=>""+(0,_util.getRowid)(r,e));_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[0])&&(s[t]=e)})}else if(n.length){let l=n.map(e=>""+e.id);_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[1])&&(s[t]=e)})}l.validErrorMaps=s}return r.$nextTick()},triggerValidate(i){let a=this;var e=a,t=a,{editConfig:e,editRules:l}=e,u=t.editStore,u=u.actived;let n=a.computeEditOpts;var r=a.computeValidOpts;if(l&&"single"===r.msgMode&&(t.validErrorMaps={}),e&&l&&u.row){let{row:t,column:l,cell:r}=u.args;if(a.hasCellRules(i,t,l))return a.validCellRules(i,t,l).then(()=>{"row"===n.mode&&a.clearValidate(t,l)}).catch(({rule:e})=>e.trigger&&i!==e.trigger?Promise.resolve():(e={rule:e,row:t,column:l,cell:r},a.showValidTooltip(e),Promise.reject(e)))}return Promise.resolve()},showValidTooltip(e){var t=this,l=t,r=t.height,{tableData:i,validStore:a,validErrorMaps:u}=l,{rule:n,row:s,column:o,cell:d}=e,c=t.computeValidOpts,g=t.$refs.refValidTooltip,f=n.content;return a.visible=!0,"single"===c.msgMode?l.validErrorMaps={[(0,_util.getRowid)(t,s)+":"+o.id]:{column:o,row:s,rule:n,content:f}}:l.validErrorMaps=Object.assign({},u,{[(0,_util.getRowid)(t,s)+":"+o.id]:{column:o,row:s,rule:n,content:f}}),t.dispatchEvent("valid-error",e,null),g&&("tooltip"===c.message||"default"===c.message&&!r&&i.length<2)?g.open(d,f):t.$nextTick()}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util=require("../../src/util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,validators}=_ui.VxeUI;class Rule{constructor(e){Object.defineProperty(this,"$options",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}get content(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}get message(){return this.content}}function validREValue(e,t){return!(e&&!(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(t))}function validMaxValue(e,t){return!(!_xeUtils.default.eqNull(e)&&t>_xeUtils.default.toNumber(e))}function validMinValue(e,t){return!(!_xeUtils.default.eqNull(e)&&t<_xeUtils.default.toNumber(e))}function validRuleValue(e,t,l){var{type:e,min:r,max:i,pattern:a}=e,u="array"===e,n="number"===e,e="string"===e,s=""+t;if(!validREValue(a,s))return!1;if(u){if(!_xeUtils.default.isArray(t))return!1;if(l&&!t.length)return!1;if(!validMinValue(r,t.length))return!1;if(!validMaxValue(i,t.length))return!1}else if(n){a=Number(t);if(isNaN(a))return!1;if(!validMinValue(r,a))return!1;if(!validMaxValue(i,a))return!1}else{if(e&&!_xeUtils.default.isString(t))return!1;if(l&&!s)return!1;if(!validMinValue(r,s.length))return!1;if(!validMaxValue(i,s.length))return!1}return!0}function checkRuleStatus(e,t,l){var{required:r,field:i}=e,t=i?_xeUtils.default.get(t,i):l,i=_xeUtils.default.isArray(t)?!t.length:(0,_utils.eqEmptyValue)(t);if(r){if(i)return!1;if(!validRuleValue(e,t,r))return!1}else if(!i&&!validRuleValue(e,t,r))return!1;return!0}function handleValidError(t,l){return new Promise(e=>{!1===t.computeValidOpts.autoPos?(t.dispatchEvent("valid-error",l,null),e()):t.handleEdit(l,{type:"valid-error",trigger:"call"}).then(()=>{setTimeout(()=>{e(t.showValidTooltip(l))},10)})})}function handleErrMsgMode(e,t){var l;return"single"===e.computeValidOpts.msgMode?(e={},(l=Object.keys(t)).length&&(e[l=l[0]]=t[l]),e):t}function beginValidate(a,e,l,u,n){let r=a,s=a,o={},{editRules:d,treeConfig:i}=a;var c=r.isRowGroupStatus;let{afterFullData:t,pendingRowMaps:g,removeRowMaps:f}=s;var h=a.computeTreeOpts,m=a.computeAggregateOpts;let p=a.computeValidOpts,v,x=(!0===e?v=t:e&&(_xeUtils.default.isFunction(e)?u=e:v=_xeUtils.default.isArray(e)?e:[e]),v=v||a.getInsertRecords().concat(a.getUpdateRecords()),[]),_=(s._lastCallTime=Date.now(),s.validRuleErr=!1,a.clearValidate(),{});if(d){let t=l&&l.length?l:a.getColumns();e=i=>{var e=(0,_util.getRowid)(a,i);if(!f[e]&&!g[e]&&!a.isAggregateRecord(i)&&(n||!s.validRuleErr)){let e=[];t.forEach(l=>{let r=_xeUtils.default.isString(l)?l:l.field;!n&&s.validRuleErr||!_xeUtils.default.has(d,r)||e.push(a.validCellRules("all",i,l).catch(({rule:e,rules:t})=>{t={rule:e,rules:t,rowIndex:a.getRowIndex(i),row:i,columnIndex:a.getColumnIndex(l),column:l,field:r,$table:a};if(o[r]||(o[r]=[]),_[(0,_util.getRowid)(a,i)+":"+l.id]={column:l,row:i,rule:e,content:e.content},o[r].push(t),!n)return s.validRuleErr=!0,Promise.reject(t)}))}),x.push(Promise.all(e))}};return c?_xeUtils.default.eachTree(v,e,{children:m.mapChildrenField}):i?(l=h.children||h.childrenField,_xeUtils.default.eachTree(v,e,{children:l})):v.forEach(e),Promise.all(x).then(()=>{let e=Object.keys(o);return r.validErrorMaps=handleErrMsgMode(a,_),a.$nextTick().then(()=>{if(e.length)return Promise.reject(o[e[0]][0]);u&&u()})}).catch(i=>new Promise((e,t)=>{let l=()=>{a.$nextTick(()=>{u?(u(o),e()):("obsolete"===getConfig().validToReject?t:e)(o)})};var r;!1===p.autoPos?l():(r=i.row,a.scrollToRow(r,i.column).then(()=>{i.cell=a.getCellElement(i.row,i.column),(0,_dom.scrollToView)(i.cell),handleValidError(a,i).then(l)}))}))}return r.validErrorMaps={},a.$nextTick().then(()=>{u&&u()})}var _default=exports.default={methods:{_fullValidate(e,t){return _xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),beginValidate(this,e,null,t,!0)},_validate(e,t){return _xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),beginValidate(this,e,null,t)},_fullValidateField(e,t){t=(_xeUtils.default.isArray(t)?t:t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(this,e));return t.length?beginValidate(this,e,t,null,!0):this.$nextTick()},_validateField(e,t){t=(_xeUtils.default.isArray(t)?t:t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(this,e));return t.length?beginValidate(this,e,t,null):this.$nextTick()},hasCellRules(t,e,l){var r=this.editRules,l=l.property;return!(!l||!r)&&(r=_xeUtils.default.get(r,l))&&_xeUtils.default.find(r,e=>"all"===t||!e.trigger||t===e.trigger)},validCellRules(e,s,o,t){let d=this;var l=d;let c=d;var l=l.editRules,r=o.field;let g=[],f=[];if(r&&l){let n=_xeUtils.default.get(l,r);if(n){let u=_xeUtils.default.isUndefined(t)?_xeUtils.default.get(s,r):t;n.forEach(t=>{let{trigger:l,validator:r}=t;if("all"===e||!l||e===l)if(r){var i,a={cellValue:u,rule:t,rules:n,row:s,rowIndex:d.getRowIndex(s),column:o,columnIndex:d.getColumnIndex(o),field:o.field,$table:d};let e;_xeUtils.default.isString(r)?(i=validators.get(r))&&(i=i.tableCellValidatorMethod||i.cellValidatorMethod)?e=i(a):(0,_log.errLog)("vxe.error.notValidators",[r]):e=r(a),e&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(e=>{c.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:l,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))}else checkRuleStatus(t,s,u)||(c.validRuleErr=!0,g.push(new Rule(t)))})}}return Promise.all(f).then(()=>{var e;if(g.length)return e={rules:g,rule:g[0]},Promise.reject(e)})},_clearValidate(e,t){let r=this;var l=r,i=l.validErrorMaps,a=r.$refs.refValidTooltip,u=r.computeValidOpts,e=_xeUtils.default.isArray(e)?e:e?[e]:[];let n=(_xeUtils.default.isArray(t)?t:t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(r,e)),s={};if(a&&a.reactData.visible&&a.close(),"single"===u.msgMode)l.validErrorMaps={};else{if(e.length&&n.length)s=Object.assign({},i),e.forEach(t=>{n.forEach(e=>{e=(0,_util.getRowid)(r,t)+":"+e.id;s[e]&&delete s[e]})});else if(e.length){let l=e.map(e=>""+(0,_util.getRowid)(r,e));_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[0])&&(s[t]=e)})}else if(n.length){let l=n.map(e=>""+e.id);_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[1])&&(s[t]=e)})}l.validErrorMaps=s}return r.$nextTick()},triggerValidate(i){let a=this;var e=a,t=a,{editConfig:e,editRules:l}=e,u=t.editStore,u=u.actived;let n=a.computeEditOpts;var r=a.computeValidOpts;if(l&&"single"===r.msgMode&&(t.validErrorMaps={}),e&&l&&u.row){let{row:t,column:l,cell:r}=u.args;if(a.hasCellRules(i,t,l))return a.validCellRules(i,t,l).then(()=>{"row"===n.mode&&a.clearValidate(t,l)}).catch(({rule:e})=>e.trigger&&i!==e.trigger?Promise.resolve():(e={rule:e,row:t,column:l,cell:r},a.showValidTooltip(e),Promise.reject(e)))}return Promise.resolve()},showValidTooltip(e){var t=this,l=t,r=t.height,{tableData:i,validStore:a,validErrorMaps:u}=l,{rule:n,row:s,column:o,cell:d}=e,c=t.computeValidOpts,g=t.$refs.refValidTooltip,f=n.content;return a.visible=!0,"single"===c.msgMode?l.validErrorMaps={[(0,_util.getRowid)(t,s)+":"+o.id]:{column:o,row:s,rule:n,content:f}}:l.validErrorMaps=Object.assign({},u,{[(0,_util.getRowid)(t,s)+":"+o.id]:{column:o,row:s,rule:n,content:f}}),t.dispatchEvent("valid-error",e,null),g&&("tooltip"===c.message||"default"===c.message&&!r&&i.length<2)?g.open(d,f):t.$nextTick()}}};

package/lib/table/render/index.js

@@ -873,6 +873,20 @@ function handleNumberCell(h, renderOpts, params) {
     class: 'is--negative'
   } : {});
 }
+function handleFormatDatePicker(renderOpts, params) {
+  const {
+    props = {}
+  } = renderOpts;
+  const {
+    cellValue
+  } = params;
+  if (cellValue) {
+    if (props.type !== 'time') {
+      return getLabelFormatDate(cellValue, props);
+    }
+  }
+  return cellValue;
+}
 function handleFormatSelect(renderOpts, params) {
   const {
     cellValue
@@ -1150,6 +1164,7 @@ renderer.mixin({
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue);
     },
+    tableCellFormatter: handleFormatDatePicker,
     renderTableDefault: defaultEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,

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

@@ -1 +1 @@
-var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../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}}let{getConfig,renderer,getI18n,getComponent}=_ui.VxeUI,componentDefaultModelProp="value",defaultCompProps={};function handleDefaultValue(e,t,l){return _xeUtils.default.eqNull(e)?_xeUtils.default.eqNull(t)?l:t:e}function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,l){var{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||l)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+(t.type||"date")))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getOldComponent({name:e}){return getOldComponentName(e)}function getDefaultComponent({name:e}){return getComponent(e)||e}function updateFilterChangeOption(e,t,l){e=e.$table;e.updateFilterOptionStatus(l,t)}function saveFilterEvent(e){var{$table:e,column:t}=e;e.saveFilterByEvent(new Event("change"),t)}function getNativeAttrs(e){let{name:t,attrs:l}=e;return l="input"===t?Object.assign({type:"text"},l):l}function getInputImmediateModel(e){var{name:e,immediate:t,props:l}=e;return t||("VxeInput"===e||"$input"===e?(t=(l||{}).type,!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,l,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function getCellEditFilterProps(e,t,l,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,l,r,n){t=t.placeholder;return[e("span",{class:["vxe-cell--label",n?n.class:""]},t&&(0,_utils.isEmptyValue)(r)?[e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(t),1))]:(0,_utils.formatText)(r,1))]}function getNativeElementOns(e,l,t){let r=e.events,n=(0,_vn.getModelEvent)(e),a=(0,_vn.getChangeEvent)(e),{model:o,change:u,blur:i}=t||{},d=a===n,s={};return r&&_xeUtils.default.objectEach(r,(t,e)=>{s[(0,_vn.getOnName)(e)]=function(...e){t(l,...e)}}),o&&(s[(0,_vn.getOnName)(n)]=function(e){o(e),d&&u&&u(e),r&&r[n]&&r[n](l,e)}),!d&&u&&(s[(0,_vn.getOnName)(a)]=function(e){u(e),r&&r[a]&&r[a](l,e)}),i&&(s[(0,_vn.getOnName)(blurEvent)]=function(e){i(e),r&&r[blurEvent]&&r[blurEvent](l,e)}),s}let blurEvent="blur",clearEvent="clear";function getComponentOns(e,l,t,r){let n=e.events,a=(0,_vn.getModelEvent)(e),o=(0,_vn.getChangeEvent)(e),{model:u,change:i,blur:d,clear:s}=t||{},p={};return _xeUtils.default.objectEach(n,(t,e)=>{p[(0,_vn.getOnName)(e)]=function(...e){_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(l,...e)}}),u&&(p[(0,_vn.getOnName)(a)]=function(e){u(e),n&&n[a]&&n[a](l,e)}),i&&(p[(0,_vn.getOnName)(o)]=function(...e){i(...e),n&&n[o]&&n[o](l,...e)}),d&&(p[(0,_vn.getOnName)(blurEvent)]=function(...e){d(...e),n&&n[blurEvent]&&n[blurEvent](l,...e)}),s&&(p[(0,_vn.getOnName)(clearEvent)]=function(...e){s(...e),n&&n[clearEvent]&&n[clearEvent](l,...e)}),r?Object.assign(p,r):p}function getEditOns(e,t){let{$table:l,row:r,column:n}=t,a=e.name,o=n.model,u=isImmediateCell(e,t);return getComponentOns(e,t,{model(e){o.update=!0,o.value=e,u&&(0,_util.setCellValue)(r,n,e)},change(e){!u&&a&&["VxeInput","VxeNumberInput","VxeTextarea","$input","$textarea"].includes(a)?(e=e.value,o.update=!0,o.value=e,l.updateStatus(t,e)):l.updateStatus(t)},blur(){u?l.handleCellRuleUpdateStatus("blur",t):l.handleCellRuleUpdateStatus("blur",t,o.value)}})}function getFilterOns(e,t,l){return getComponentOns(e,t,{model(e){l.data=e},change(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l)},blur(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l)}})}function getFloatingFilterOns(e,t,l){let{$table:r,column:n}=t;return(0,_vn.hasInputType)(e)?getComponentOns(e,t,{model(e){l.data=e},change(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l)},clear(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),saveFilterEvent(t)},blur(){r.saveFilterByEvent(new Event("change"),n)}},"VxeNumberInput"===e.name?{[(0,_vn.getOnName)("plus-number")](){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),saveFilterEvent(t)},[(0,_vn.getOnName)("minus-number")](){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),saveFilterEvent(t)}}:{}):getComponentOns(e,t,{model(e){l.data=e},clear(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),r.saveFilterByEvent(new Event("change"),n)},change(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),r.saveFilterByEvent(new Event("change"),n)}})}function getNativeEditOns(t,l){let{$table:r,row:n,column:a}=l,o=a.model;return getNativeElementOns(t,l,{model(e){var e=e.target;e&&(e=e.value,isImmediateCell(t,l)?(0,_util.setCellValue)(n,a,e):(o.update=!0,o.value=e))},change(e){var e=e.target;e&&(e=e.value,r.updateStatus(l,e))},blur(e){var e=e.target;e&&(e=e.value,r.updateStatus(l,e))}})}function getNativeFilterOns(e,t,l){return getNativeElementOns(e,t,{model(e){e=e.target;e&&(l.data=e.value)},change(){updateFilterChangeOption(t,!_xeUtils.default.eqNull(l.data),l)},blur(){updateFilterChangeOption(t,!_xeUtils.default.eqNull(l.data),l)}})}function nativeEditRender(e,t,l){var{row:r,column:n}=l,a=t.name,r=isImmediateCell(t,l)?(0,_util.getCellValue)(r,n):n.model.value;return[e(""+a,{class:"vxe-default-"+a,attrs:getNativeAttrs(t),domProps:{value:r},on:getNativeEditOns(t,l)})]}function buttonCellRender(e,t,l){return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function defaultEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function checkboxEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function radioAndCheckboxGroupEditRender(e,t,l){var r=t.options,{row:n,column:a}=l,n=(0,_util.getCellValue)(n,a);return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,n)),on:getEditOns(t,l)})]}function oldEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function oldButtonEditRender(e,t,l){return[e("vxe-button",{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function oldButtonsEditRender(t,e,l){e=e.children;return e?e.map(e=>oldButtonEditRender(t,e,l)[0]):[]}function renderNativeOptgroups(l,r,n,a){var{optionGroups:e,optionGroupProps:t={}}=r;let o=t.options||"options",u=t.label||"label";return e?e.map((e,t)=>l("optgroup",{key:t,attrs:{label:e[u]}},a(l,e[o],r,n))):[]}function renderNativeOptions(l,e,t,r){var{optionProps:n={}}=t,{row:a,column:o}=r;let u=n.label||"label",i=n.value||"value",d=n.disabled||"disabled",s=isImmediateCell(t,r)?(0,_util.getCellValue)(a,o):o.model.value;return e?e.map((e,t)=>l("option",{key:t,attrs:{value:e[i],disabled:e[d]},domProps:{selected:e[i]==s}},e[u])):[]}function nativeFilterRender(l,r,n){var e=n.column;let a=r.name,o=getNativeAttrs(r);return e.filters.map((e,t)=>l(""+a,{key:t,class:"vxe-default-"+a,attrs:o,domProps:{value:e.data},on:getNativeFilterOns(r,n,e)}))}function defaultFilterRender(r,n,a){var e=a.column;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,a,e)})})}function defaultFloatingFilterRender(e,t,l){var r=l.option,n=r.data;return[e(getDefaultComponent(t),{props:getCellEditFilterProps(t,t,n),on:getFloatingFilterOns(t,l,r)})]}function defaultFilterOptions(){return[{data:null}]}function oldFilterRender(r,n,a){var e=a.column;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,a,e)})})}function handleFilterMethod({option:e,row:t,column:l}){e=e.data;return _xeUtils.default.get(t,l.field)==e}function handleInputFilterMethod({option:e,row:t,column:l}){e=e.data,t=_xeUtils.default.get(t,l.field);return-1<_xeUtils.default.toValueString(t).indexOf(e)}function nativeSelectEditRender(e,t,l){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeEditOns(t,l)},t.optionGroups?renderNativeOptgroups(e,t,l,renderNativeOptions):renderNativeOptions(e,t.options,t,l))]}function defaultSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}),on:getEditOns(t,l)})]}function defaultTableOrTreeSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:a,optionProps:o}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:a,optionProps:o}),on:getEditOns(t,l)})]}function oldSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}=t,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}),on:getEditOns(t,l)})]}function handleSelectCellValue(t,e){let{options:l,optionGroups:r,optionProps:n={},optionGroupProps:a={},props:o={}}=e,u,i=n.label||"label",d=n.value||"value";if(null==t)return"";{let e=[];return e=_xeUtils.default.isArray(t)?t:o.multiple&&-1<(""+t).indexOf(",")?(""+t).split(","):[t],_xeUtils.default.map(e,r?t=>{var l=a.options||"options";for(let e=0;e<r.length&&!(u=_xeUtils.default.find(r[e][l],e=>e[d]==t));e++);return u?u[i]:t}:t=>(u=_xeUtils.default.find(l,e=>e[d]==t))?u[i]:t).join(", ")}}function getSelectCellValue(e,{row:t,column:l}){return handleSelectCellValue(_xeUtils.default.get(t,l.field),e)}function handleExportSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getSelectCellValue(l.editRender||l.cellRender,e)}function handleTreeSelectCellValue(e,l){var{options:l,optionProps:r={}}=l;let n=r.label||"label",a=r.value||"value";if(null==e)return"";{let t={};return _xeUtils.default.eachTree(l,e=>{t[_xeUtils.default.get(e,a)]=e},{children:r.children||"children"}),_xeUtils.default.map(_xeUtils.default.isArray(e)?e:[e],e=>{e=t[e];return e&&_xeUtils.default.get(e,n)}).join(", ")}}function getTreeSelectCellValue(e,{row:t,column:l}){return handleTreeSelectCellValue(_xeUtils.default.get(t,l.field),e)}function handleExportTreeSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getTreeSelectCellValue(l.editRender||l.cellRender,e)}function handleNumberCell(e,t,l){var r,n,{props:a={},showNegativeStatus:o}=t,{row:u,column:i}=l,d=a.type;let s=_xeUtils.default.get(u,i.field),p=!1;return(0,_utils.isEmptyValue)(s)||(u=getConfig().numberInput||{},"float"===d?(i=handleDefaultValue(a.autoFill,u.autoFill,!0),n=handleDefaultValue(a.digits,u.digits,1),s=_xeUtils.default.toFixed(_xeUtils.default.floor(s,n),n),i||(s=_xeUtils.default.toNumber(s)),o&&s<0&&(p=!0)):"amount"===d?(n=handleDefaultValue(a.autoFill,u.autoFill,!0),i=handleDefaultValue(a.digits,u.digits,2),r=handleDefaultValue(a.showCurrency,u.showCurrency,!1),s=_xeUtils.default.toNumber(s),o&&s<0&&(p=!0),s=_xeUtils.default.commafy(s,{digits:i}),n||([i,n]=s.split("."),n&&(n=n.replace(/0+$/,""),s=n?[i,".",n].join(""):i)),r&&(s=""+(a.currencySymbol||u.currencySymbol||getI18n("vxe.numberInput.currencySymbol")||"")+s)):("integer"===d&&(s=_xeUtils.default.toInteger(s)),o&&_xeUtils.default.toNumber(s)<0&&(p=!0))),getCellLabelVNs(e,t,l,s,p?{class:"is--negative"}:{})}function handleFormatSelect(e,t){t=t.cellValue;return handleSelectCellValue(t,e)}function handleSetSelectValue(e,t){var{row:n,column:t,cellValue:a}=t,o=t.field;if(o){var{options:u,optionGroups:i,optionProps:t={},optionGroupProps:e={},props:l}=e;if((0,_utils.isEmptyValue)(a))_xeUtils.default.set(n,o,l&&l.multiple?[]:null);else{var d=-1<_xeUtils.default.indexOf(""+a,","),s=t.label||"label";let l=t.value||"value",r={};if(i&&i.length){var p=e.options||"options";for(let e=0;e<i.length;e++){var c=i[e][p]||{};for(let e=0;e<c.length;e++){var f=c[e];if(d)r[f[s]]=f;else if(f[s]==a)return void _xeUtils.default.set(n,o,f[l])}}}else if(u)for(let e=0;e<u.length;e++){var g=u[e];if(d)r[g[s]]=g;else if(g[s]==a)return void _xeUtils.default.set(n,o,g[l])}d?_xeUtils.default.set(n,o,(d?a.split(","):[a]).map(e=>{var t=r[e];return t?t[l]:e})):_xeUtils.default.set(n,o,a)}}}function handleFormatTreeSelect(e,t){t=t.cellValue;return handleTreeSelectCellValue(t,e)}function handleSetTreeSelectValue(e,l){let{row:r,column:t,cellValue:n}=l;l=t.field;if(l){var{options:e,optionProps:a={}}=e;let t=a.label||"label";var o=a.value||"value",e=_xeUtils.default.findTree(e||[],e=>_xeUtils.default.get(e,t)===n,{children:a.children||"children"});if(e){a=e.item;if(a)return void _xeUtils.default.set(r,l,a[o])}_xeUtils.default.set(r,l,n)}}renderer.mixin({input:{tableAutoFocus:"input",renderTableEdit:nativeEditRender,renderTableDefault:nativeEditRender,renderTableFilter:nativeFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},textarea:{tableAutoFocus:"textarea",renderTableEdit:nativeEditRender},select:{renderTableEdit:nativeSelectEditRender,renderTableDefault:nativeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(l,r,n){var e=n.column;return e.filters.map((e,t)=>l("select",{key:t,class:"vxe-default-select",attrs:getNativeAttrs(r),on:getNativeFilterOns(r,n,e)},r.optionGroups?renderNativeOptgroups(l,r,n,renderNativeOptions):renderNativeOptions(l,r.options,r,n)))},tableCellFormatter:handleFormatSelect,tableCellCopyMethod:handleFormatSelect,tableCellPasteMethod:handleSetSelectValue,tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:a}=l,o=getConfig().input||{},u=r.digits||o.digits||2;let i=_xeUtils.default.get(n,a.field);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,u),u)}return getCellLabelVNs(e,t,l,i)},renderTableDefault:defaultEditRender,createTableFilterOptions:defaultFilterOptions,renderTableFilter:defaultFilterRender,renderTableFloatingFilter:defaultFloatingFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},FormatNumberInput:{renderTableDefault:handleNumberCell,tableFilterDefaultMethod:handleInputFilterMethod,tableExportMethod(e){var{row:e,column:t}=e;return _xeUtils.default.get(e,t.field)}},VxeNumberInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell:handleNumberCell,renderTableFooter(e,t,l){var{props:t={}}=t,{row:l,column:r,_columnIndex:n}=l,a=t.type,n=_xeUtils.default.isArray(l)?l[n]:_xeUtils.default.get(l,r.field);if(_xeUtils.default.isNumber(n)){l=getConfig().numberInput||{};if("float"===a){var r=handleDefaultValue(t.autoFill,l.autoFill,!0),o=handleDefaultValue(t.digits,l.digits,1);let e=_xeUtils.default.toFixed(_xeUtils.default.floor(n,o),o);return e=r?e:_xeUtils.default.toNumber(e)}if("amount"===a){var o=handleDefaultValue(t.autoFill,l.autoFill,!0),r=handleDefaultValue(t.digits,l.digits,2),a=handleDefaultValue(t.showCurrency,l.showCurrency,!1);let e=_xeUtils.default.commafy(_xeUtils.default.toNumber(n),{digits:r});return o||([r,o]=e.split("."),o&&(o=o.replace(/0+$/,""),e=o?[r,".",o].join(""):r)),e=a?""+(t.currencySymbol||l.currencySymbol||getI18n("vxe.numberInput.currencySymbol")||"")+e:e}}return(0,_utils.getFuncText)(n,1)},renderTableDefault:defaultEditRender,createTableFilterOptions:defaultFilterOptions,renderTableFilter:defaultFilterRender,renderTableFloatingFilter:defaultFloatingFilterRender,tableFilterDefaultMethod:handleInputFilterMethod,tableExportMethod(e){var{row:e,column:t}=e;return _xeUtils.default.get(e,t.field)}},VxeDatePicker:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:a}=l;let o=_xeUtils.default.get(n,a.field);return getCellLabelVNs(e,t,l,o=o&&"time"!==r.type?getLabelFormatDate(o,r):o)},renderTableDefault:defaultEditRender,createTableFilterOptions:defaultFilterOptions,renderTableFilter:defaultFilterRender,renderTableFloatingFilter:defaultFloatingFilterRender,tableFilterDefaultMethod:handleFilterMethod},VxeDateRangePicker:{tableAutoFocus:"input",renderTableEdit(e,t,l){let{startField:r,endField:n}=t,{$table:a,row:o,column:u}=l,i=u.model;var d=(0,_util.getCellValue)(o,u),s={},p={};return r&&n&&(s.startValue=_xeUtils.default.get(o,r),s.endValue=_xeUtils.default.get(o,n),p["update:startValue"]=e=>{r&&_xeUtils.default.set(o,r,e)},p["update:endValue"]=e=>{n&&_xeUtils.default.set(o,n,e)}),[e(getDefaultComponent(t),{props:getCellEditProps(t,l,d,s),on:getComponentOns(t,l,{model(e){i.update=!0,i.value=e,(0,_util.setCellValue)(o,u,e)},change(){a.updateStatus(l)},blur(){a.handleCellRuleUpdateStatus("blur",l)}},p)})]},renderTableCell(e,t,l){var{startField:r,endField:n}=t,{row:a,column:o}=l;let u="",i="",d=(r&&n?(u=_xeUtils.default.get(a,r),i=_xeUtils.default.get(a,n)):(r=_xeUtils.default.get(a,o.field))&&(i=(_xeUtils.default.isArray(r)?(u=r[0],r):(n=(""+r).split(","),u=n[0],n))[1]),"");return getCellLabelVNs(e,t,l,d=u&&i?u+" ~ "+i:d)}},VxeTextarea:{tableAutoFocus:"textarea",renderTableEdit:defaultEditRender},VxeButton:{renderTableDefault:buttonCellRender},VxeButtonGroup:{renderTableDefault(e,t,l){var r=t.options;return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,null)),on:getComponentOns(t,l)})]}},VxeSelect:{tableAutoFocus:"input",renderTableEdit:defaultSelectEditRender,renderTableDefault:defaultSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},createTableFilterOptions:defaultFilterOptions,renderTableFilter(r,n,a){var e=a.column;let{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,a,l,{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}),on:getFilterOns(n,a,e)})})},renderTableFloatingFilter(e,t,l){var r=l.option,{options:n,optionProps:a,optionGroups:o,optionGroupProps:u}=t,i=r.data;return e(getDefaultComponent(t),{props:getCellEditFilterProps(t,l,i,{options:n,optionProps:a,optionGroups:o,optionGroupProps:u}),on:getFloatingFilterOns(t,l,r)})},tableCellFormatter:handleFormatSelect,tableCellCopyMethod:handleFormatSelect,tableCellPasteMethod:handleSetSelectValue,tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeText:{renderTableDefault(e,t,l){var{$table:r,row:n,column:a}=l,o=t.props,r=r.getCellLabel(n,a);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o||{}),{content:r}),on:getComponentOns(t,l)})]}},VxeLink:{renderTableDefault(e,t,l){var{$table:r,row:n,column:a}=l,o=t.props,u=(o||{}).href,r=r.getCellLabel(n,a);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o||{}),{content:r,href:_xeUtils.default.toFormatString(u,l)}),on:getComponentOns(t,l)})]}},formatOption:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))}},FormatSelect:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},tableCellFormatter:handleFormatSelect,tableCellCopyMethod:handleFormatSelect,tableCellPasteMethod:handleSetSelectValue,tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeTreeSelect:{tableAutoFocus:"input",renderTableEdit:defaultTableOrTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableCellFormatter:handleFormatTreeSelect,tableCellCopyMethod:handleFormatTreeSelect,tableCellPasteMethod:handleSetTreeSelectValue,tableExportMethod:handleExportTreeSelectMethod},VxeTableSelect:{tableAutoFocus:"input",renderTableEdit:defaultTableOrTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableCellFormatter:handleFormatTreeSelect,tableCellCopyMethod:handleFormatTreeSelect,tableCellPasteMethod:handleSetTreeSelectValue,tableExportMethod:handleExportTreeSelectMethod},formatTree:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))}},FormatTreeSelect:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableCellFormatter:handleFormatTreeSelect,tableCellCopyMethod:handleFormatTreeSelect,tableCellPasteMethod:handleSetTreeSelectValue,tableExportMethod:handleExportTreeSelectMethod},VxeColorPicker:{tableAutoFocus:"input",renderTableEdit(e,t,l){var{row:r,column:n}=l,a=t.options,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{colors:a}),on:getEditOns(t,l)})]},renderTableCell(e,t,l){var{row:l,column:r}=l;return e("span",{class:"vxe-color-picker--readonly"},[e("div",{class:"vxe-color-picker--readonly-color",style:{backgroundColor:_xeUtils.default.get(l,r.field)}})])}},VxeIconPicker:{tableAutoFocus:"input",renderTableEdit(e,t,l){var{row:r,column:n}=l,a=t.options,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{icons:a}),on:getEditOns(t,l)})]},renderTableCell(e,t,l){var{row:l,column:r}=l;return e("i",{class:_xeUtils.default.get(l,r.field)})}},VxeRadioGroup:{renderTableDefault:radioAndCheckboxGroupEditRender},VxeCheckbox:{renderTableDefault:checkboxEditRender},VxeCheckboxGroup:{renderTableDefault:radioAndCheckboxGroupEditRender},VxeSwitch:{tableAutoFocus:"button",renderTableEdit:defaultEditRender,renderTableDefault:defaultEditRender},VxeUpload:{renderTableEdit:defaultEditRender,renderTableCell:defaultEditRender,renderTableDefault:defaultEditRender},VxeImage:{renderTableDefault(e,t,l){var{row:r,column:n}=l,a=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},a),{src:r}),on:getEditOns(t,l)})]}},VxeImageGroup:{renderTableDefault(e,t,l){var{row:r,column:n}=l,a=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},a),{urlList:r}),on:getEditOns(t,l)})]}},VxeTextEllipsis:{renderTableDefault(e,t,l){var{row:r,column:n}=l,a=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},a),{content:r}),on:getEditOns(t,l)})]}},VxeRate:{renderTableDefault:defaultEditRender},VxeSlider:{renderTableDefault:defaultEditRender},$input:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldEditRender,renderTableCell(e,t,l){var r,{props:n={}}=t,{row:a,column:o}=l,u=n.digits||(null==(r=getConfig().input)?void 0:r.digits)||2;let i=_xeUtils.default.get(a,o.field);if(i)switch(n.type){case"date":case"week":case"month":case"year":i=getLabelFormatDate(i,n);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,u),u)}return getCellLabelVNs(e,t,l,i)},renderTableDefault:oldEditRender,renderTableFilter:oldFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},$textarea:{tableAutoFocus:".vxe-textarea--inner"},$button:{renderTableDefault:oldButtonEditRender},$buttons:{renderTableDefault:oldButtonsEditRender},$select:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldSelectEditRender,renderTableDefault:oldSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(r,n,a){var e=a.column;let{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,a,l,{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}),on:getFilterOns(n,a,e)})})},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},$radio:{tableAutoFocus:".vxe-radio--input"},$checkbox:{tableAutoFocus:".vxe-checkbox--input"},$switch:{tableAutoFocus:".vxe-switch--button",renderTableEdit:oldEditRender,renderTableDefault:oldEditRender}});
+var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../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}}let{getConfig,renderer,getI18n,getComponent}=_ui.VxeUI,componentDefaultModelProp="value",defaultCompProps={};function handleDefaultValue(e,t,l){return _xeUtils.default.eqNull(e)?_xeUtils.default.eqNull(t)?l:t:e}function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,l){var{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||l)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+(t.type||"date")))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getOldComponent({name:e}){return getOldComponentName(e)}function getDefaultComponent({name:e}){return getComponent(e)||e}function updateFilterChangeOption(e,t,l){e=e.$table;e.updateFilterOptionStatus(l,t)}function saveFilterEvent(e){var{$table:e,column:t}=e;e.saveFilterByEvent(new Event("change"),t)}function getNativeAttrs(e){let{name:t,attrs:l}=e;return l="input"===t?Object.assign({type:"text"},l):l}function getInputImmediateModel(e){var{name:e,immediate:t,props:l}=e;return t||("VxeInput"===e||"$input"===e?(t=(l||{}).type,!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,l,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function getCellEditFilterProps(e,t,l,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:l})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,l,r,n){t=t.placeholder;return[e("span",{class:["vxe-cell--label",n?n.class:""]},t&&(0,_utils.isEmptyValue)(r)?[e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(t),1))]:(0,_utils.formatText)(r,1))]}function getNativeElementOns(e,l,t){let r=e.events,n=(0,_vn.getModelEvent)(e),a=(0,_vn.getChangeEvent)(e),{model:o,change:u,blur:i}=t||{},d=a===n,s={};return r&&_xeUtils.default.objectEach(r,(t,e)=>{s[(0,_vn.getOnName)(e)]=function(...e){t(l,...e)}}),o&&(s[(0,_vn.getOnName)(n)]=function(e){o(e),d&&u&&u(e),r&&r[n]&&r[n](l,e)}),!d&&u&&(s[(0,_vn.getOnName)(a)]=function(e){u(e),r&&r[a]&&r[a](l,e)}),i&&(s[(0,_vn.getOnName)(blurEvent)]=function(e){i(e),r&&r[blurEvent]&&r[blurEvent](l,e)}),s}let blurEvent="blur",clearEvent="clear";function getComponentOns(e,l,t,r){let n=e.events,a=(0,_vn.getModelEvent)(e),o=(0,_vn.getChangeEvent)(e),{model:u,change:i,blur:d,clear:s}=t||{},p={};return _xeUtils.default.objectEach(n,(t,e)=>{p[(0,_vn.getOnName)(e)]=function(...e){_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(l,...e)}}),u&&(p[(0,_vn.getOnName)(a)]=function(e){u(e),n&&n[a]&&n[a](l,e)}),i&&(p[(0,_vn.getOnName)(o)]=function(...e){i(...e),n&&n[o]&&n[o](l,...e)}),d&&(p[(0,_vn.getOnName)(blurEvent)]=function(...e){d(...e),n&&n[blurEvent]&&n[blurEvent](l,...e)}),s&&(p[(0,_vn.getOnName)(clearEvent)]=function(...e){s(...e),n&&n[clearEvent]&&n[clearEvent](l,...e)}),r?Object.assign(p,r):p}function getEditOns(e,t){let{$table:l,row:r,column:n}=t,a=e.name,o=n.model,u=isImmediateCell(e,t);return getComponentOns(e,t,{model(e){o.update=!0,o.value=e,u&&(0,_util.setCellValue)(r,n,e)},change(e){!u&&a&&["VxeInput","VxeNumberInput","VxeTextarea","$input","$textarea"].includes(a)?(e=e.value,o.update=!0,o.value=e,l.updateStatus(t,e)):l.updateStatus(t)},blur(){u?l.handleCellRuleUpdateStatus("blur",t):l.handleCellRuleUpdateStatus("blur",t,o.value)}})}function getFilterOns(e,t,l){return getComponentOns(e,t,{model(e){l.data=e},change(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l)},blur(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l)}})}function getFloatingFilterOns(e,t,l){let{$table:r,column:n}=t;return(0,_vn.hasInputType)(e)?getComponentOns(e,t,{model(e){l.data=e},change(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l)},clear(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),saveFilterEvent(t)},blur(){r.saveFilterByEvent(new Event("change"),n)}},"VxeNumberInput"===e.name?{[(0,_vn.getOnName)("plus-number")](){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),saveFilterEvent(t)},[(0,_vn.getOnName)("minus-number")](){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),saveFilterEvent(t)}}:{}):getComponentOns(e,t,{model(e){l.data=e},clear(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),r.saveFilterByEvent(new Event("change"),n)},change(){updateFilterChangeOption(t,!(0,_utils.isEmptyValue)(l.data),l),r.saveFilterByEvent(new Event("change"),n)}})}function getNativeEditOns(t,l){let{$table:r,row:n,column:a}=l,o=a.model;return getNativeElementOns(t,l,{model(e){var e=e.target;e&&(e=e.value,isImmediateCell(t,l)?(0,_util.setCellValue)(n,a,e):(o.update=!0,o.value=e))},change(e){var e=e.target;e&&(e=e.value,r.updateStatus(l,e))},blur(e){var e=e.target;e&&(e=e.value,r.updateStatus(l,e))}})}function getNativeFilterOns(e,t,l){return getNativeElementOns(e,t,{model(e){e=e.target;e&&(l.data=e.value)},change(){updateFilterChangeOption(t,!_xeUtils.default.eqNull(l.data),l)},blur(){updateFilterChangeOption(t,!_xeUtils.default.eqNull(l.data),l)}})}function nativeEditRender(e,t,l){var{row:r,column:n}=l,a=t.name,r=isImmediateCell(t,l)?(0,_util.getCellValue)(r,n):n.model.value;return[e(""+a,{class:"vxe-default-"+a,attrs:getNativeAttrs(t),domProps:{value:r},on:getNativeEditOns(t,l)})]}function buttonCellRender(e,t,l){return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function defaultEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function checkboxEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function radioAndCheckboxGroupEditRender(e,t,l){var r=t.options,{row:n,column:a}=l,n=(0,_util.getCellValue)(n,a);return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,n)),on:getEditOns(t,l)})]}function oldEditRender(e,t,l){var{row:r,column:n}=l,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r),on:getEditOns(t,l)})]}function oldButtonEditRender(e,t,l){return[e("vxe-button",{props:getCellEditProps(t,l,null),on:getComponentOns(t,l)})]}function oldButtonsEditRender(t,e,l){e=e.children;return e?e.map(e=>oldButtonEditRender(t,e,l)[0]):[]}function renderNativeOptgroups(l,r,n,a){var{optionGroups:e,optionGroupProps:t={}}=r;let o=t.options||"options",u=t.label||"label";return e?e.map((e,t)=>l("optgroup",{key:t,attrs:{label:e[u]}},a(l,e[o],r,n))):[]}function renderNativeOptions(l,e,t,r){var{optionProps:n={}}=t,{row:a,column:o}=r;let u=n.label||"label",i=n.value||"value",d=n.disabled||"disabled",s=isImmediateCell(t,r)?(0,_util.getCellValue)(a,o):o.model.value;return e?e.map((e,t)=>l("option",{key:t,attrs:{value:e[i],disabled:e[d]},domProps:{selected:e[i]==s}},e[u])):[]}function nativeFilterRender(l,r,n){var e=n.column;let a=r.name,o=getNativeAttrs(r);return e.filters.map((e,t)=>l(""+a,{key:t,class:"vxe-default-"+a,attrs:o,domProps:{value:e.data},on:getNativeFilterOns(r,n,e)}))}function defaultFilterRender(r,n,a){var e=a.column;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,a,e)})})}function defaultFloatingFilterRender(e,t,l){var r=l.option,n=r.data;return[e(getDefaultComponent(t),{props:getCellEditFilterProps(t,t,n),on:getFloatingFilterOns(t,l,r)})]}function defaultFilterOptions(){return[{data:null}]}function oldFilterRender(r,n,a){var e=a.column;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,n,l),on:getFilterOns(n,a,e)})})}function handleFilterMethod({option:e,row:t,column:l}){e=e.data;return _xeUtils.default.get(t,l.field)==e}function handleInputFilterMethod({option:e,row:t,column:l}){e=e.data,t=_xeUtils.default.get(t,l.field);return-1<_xeUtils.default.toValueString(t).indexOf(e)}function nativeSelectEditRender(e,t,l){return[e("select",{class:"vxe-default-select",attrs:getNativeAttrs(t),on:getNativeEditOns(t,l)},t.optionGroups?renderNativeOptgroups(e,t,l,renderNativeOptions):renderNativeOptions(e,t.options,t,l))]}function defaultSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}),on:getEditOns(t,l)})]}function defaultTableOrTreeSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:a,optionProps:o}=t,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{options:a,optionProps:o}),on:getEditOns(t,l)})]}function oldSelectEditRender(e,t,l){var{row:r,column:n}=l,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}=t,r=(0,_util.getCellValue)(r,n);return[e(getOldComponent(t),{props:getCellEditProps(t,l,r,{options:a,optionProps:o,optionGroups:u,optionGroupProps:i}),on:getEditOns(t,l)})]}function handleSelectCellValue(t,e){let{options:l,optionGroups:r,optionProps:n={},optionGroupProps:a={},props:o={}}=e,u,i=n.label||"label",d=n.value||"value";if(null==t)return"";{let e=[];return e=_xeUtils.default.isArray(t)?t:o.multiple&&-1<(""+t).indexOf(",")?(""+t).split(","):[t],_xeUtils.default.map(e,r?t=>{var l=a.options||"options";for(let e=0;e<r.length&&!(u=_xeUtils.default.find(r[e][l],e=>e[d]==t));e++);return u?u[i]:t}:t=>(u=_xeUtils.default.find(l,e=>e[d]==t))?u[i]:t).join(", ")}}function getSelectCellValue(e,{row:t,column:l}){return handleSelectCellValue(_xeUtils.default.get(t,l.field),e)}function handleExportSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getSelectCellValue(l.editRender||l.cellRender,e)}function handleTreeSelectCellValue(e,l){var{options:l,optionProps:r={}}=l;let n=r.label||"label",a=r.value||"value";if(null==e)return"";{let t={};return _xeUtils.default.eachTree(l,e=>{t[_xeUtils.default.get(e,a)]=e},{children:r.children||"children"}),_xeUtils.default.map(_xeUtils.default.isArray(e)?e:[e],e=>{e=t[e];return e&&_xeUtils.default.get(e,n)}).join(", ")}}function getTreeSelectCellValue(e,{row:t,column:l}){return handleTreeSelectCellValue(_xeUtils.default.get(t,l.field),e)}function handleExportTreeSelectMethod(e){var{row:t,column:l,options:r}=e;return r.original?(0,_util.getCellValue)(t,l):getTreeSelectCellValue(l.editRender||l.cellRender,e)}function handleNumberCell(e,t,l){var r,n,{props:a={},showNegativeStatus:o}=t,{row:u,column:i}=l,d=a.type;let s=_xeUtils.default.get(u,i.field),p=!1;return(0,_utils.isEmptyValue)(s)||(u=getConfig().numberInput||{},"float"===d?(i=handleDefaultValue(a.autoFill,u.autoFill,!0),n=handleDefaultValue(a.digits,u.digits,1),s=_xeUtils.default.toFixed(_xeUtils.default.floor(s,n),n),i||(s=_xeUtils.default.toNumber(s)),o&&s<0&&(p=!0)):"amount"===d?(n=handleDefaultValue(a.autoFill,u.autoFill,!0),i=handleDefaultValue(a.digits,u.digits,2),r=handleDefaultValue(a.showCurrency,u.showCurrency,!1),s=_xeUtils.default.toNumber(s),o&&s<0&&(p=!0),s=_xeUtils.default.commafy(s,{digits:i}),n||([i,n]=s.split("."),n&&(n=n.replace(/0+$/,""),s=n?[i,".",n].join(""):i)),r&&(s=""+(a.currencySymbol||u.currencySymbol||getI18n("vxe.numberInput.currencySymbol")||"")+s)):("integer"===d&&(s=_xeUtils.default.toInteger(s)),o&&_xeUtils.default.toNumber(s)<0&&(p=!0))),getCellLabelVNs(e,t,l,s,p?{class:"is--negative"}:{})}function handleFormatDatePicker(e,t){var{props:e={}}=e,t=t.cellValue;return t&&"time"!==e.type?getLabelFormatDate(t,e):t}function handleFormatSelect(e,t){t=t.cellValue;return handleSelectCellValue(t,e)}function handleSetSelectValue(e,t){var{row:n,column:t,cellValue:a}=t,o=t.field;if(o){var{options:u,optionGroups:i,optionProps:t={},optionGroupProps:e={},props:l}=e;if((0,_utils.isEmptyValue)(a))_xeUtils.default.set(n,o,l&&l.multiple?[]:null);else{var d=-1<_xeUtils.default.indexOf(""+a,","),s=t.label||"label";let l=t.value||"value",r={};if(i&&i.length){var p=e.options||"options";for(let e=0;e<i.length;e++){var c=i[e][p]||{};for(let e=0;e<c.length;e++){var f=c[e];if(d)r[f[s]]=f;else if(f[s]==a)return void _xeUtils.default.set(n,o,f[l])}}}else if(u)for(let e=0;e<u.length;e++){var g=u[e];if(d)r[g[s]]=g;else if(g[s]==a)return void _xeUtils.default.set(n,o,g[l])}d?_xeUtils.default.set(n,o,(d?a.split(","):[a]).map(e=>{var t=r[e];return t?t[l]:e})):_xeUtils.default.set(n,o,a)}}}function handleFormatTreeSelect(e,t){t=t.cellValue;return handleTreeSelectCellValue(t,e)}function handleSetTreeSelectValue(e,l){let{row:r,column:t,cellValue:n}=l;l=t.field;if(l){var{options:e,optionProps:a={}}=e;let t=a.label||"label";var o=a.value||"value",e=_xeUtils.default.findTree(e||[],e=>_xeUtils.default.get(e,t)===n,{children:a.children||"children"});if(e){a=e.item;if(a)return void _xeUtils.default.set(r,l,a[o])}_xeUtils.default.set(r,l,n)}}renderer.mixin({input:{tableAutoFocus:"input",renderTableEdit:nativeEditRender,renderTableDefault:nativeEditRender,renderTableFilter:nativeFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},textarea:{tableAutoFocus:"textarea",renderTableEdit:nativeEditRender},select:{renderTableEdit:nativeSelectEditRender,renderTableDefault:nativeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(l,r,n){var e=n.column;return e.filters.map((e,t)=>l("select",{key:t,class:"vxe-default-select",attrs:getNativeAttrs(r),on:getNativeFilterOns(r,n,e)},r.optionGroups?renderNativeOptgroups(l,r,n,renderNativeOptions):renderNativeOptions(l,r.options,r,n)))},tableCellFormatter:handleFormatSelect,tableCellCopyMethod:handleFormatSelect,tableCellPasteMethod:handleSetSelectValue,tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:a}=l,o=getConfig().input||{},u=r.digits||o.digits||2;let i=_xeUtils.default.get(n,a.field);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,u),u)}return getCellLabelVNs(e,t,l,i)},renderTableDefault:defaultEditRender,createTableFilterOptions:defaultFilterOptions,renderTableFilter:defaultFilterRender,renderTableFloatingFilter:defaultFloatingFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},FormatNumberInput:{renderTableDefault:handleNumberCell,tableFilterDefaultMethod:handleInputFilterMethod,tableExportMethod(e){var{row:e,column:t}=e;return _xeUtils.default.get(e,t.field)}},VxeNumberInput:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell:handleNumberCell,renderTableFooter(e,t,l){var{props:t={}}=t,{row:l,column:r,_columnIndex:n}=l,a=t.type,n=_xeUtils.default.isArray(l)?l[n]:_xeUtils.default.get(l,r.field);if(_xeUtils.default.isNumber(n)){l=getConfig().numberInput||{};if("float"===a){var r=handleDefaultValue(t.autoFill,l.autoFill,!0),o=handleDefaultValue(t.digits,l.digits,1);let e=_xeUtils.default.toFixed(_xeUtils.default.floor(n,o),o);return e=r?e:_xeUtils.default.toNumber(e)}if("amount"===a){var o=handleDefaultValue(t.autoFill,l.autoFill,!0),r=handleDefaultValue(t.digits,l.digits,2),a=handleDefaultValue(t.showCurrency,l.showCurrency,!1);let e=_xeUtils.default.commafy(_xeUtils.default.toNumber(n),{digits:r});return o||([r,o]=e.split("."),o&&(o=o.replace(/0+$/,""),e=o?[r,".",o].join(""):r)),e=a?""+(t.currencySymbol||l.currencySymbol||getI18n("vxe.numberInput.currencySymbol")||"")+e:e}}return(0,_utils.getFuncText)(n,1)},renderTableDefault:defaultEditRender,createTableFilterOptions:defaultFilterOptions,renderTableFilter:defaultFilterRender,renderTableFloatingFilter:defaultFloatingFilterRender,tableFilterDefaultMethod:handleInputFilterMethod,tableExportMethod(e){var{row:e,column:t}=e;return _xeUtils.default.get(e,t.field)}},VxeDatePicker:{tableAutoFocus:"input",renderTableEdit:defaultEditRender,renderTableCell(e,t,l){var{props:r={}}=t,{row:n,column:a}=l;let o=_xeUtils.default.get(n,a.field);return getCellLabelVNs(e,t,l,o=o&&"time"!==r.type?getLabelFormatDate(o,r):o)},tableCellFormatter:handleFormatDatePicker,renderTableDefault:defaultEditRender,createTableFilterOptions:defaultFilterOptions,renderTableFilter:defaultFilterRender,renderTableFloatingFilter:defaultFloatingFilterRender,tableFilterDefaultMethod:handleFilterMethod},VxeDateRangePicker:{tableAutoFocus:"input",renderTableEdit(e,t,l){let{startField:r,endField:n}=t,{$table:a,row:o,column:u}=l,i=u.model;var d=(0,_util.getCellValue)(o,u),s={},p={};return r&&n&&(s.startValue=_xeUtils.default.get(o,r),s.endValue=_xeUtils.default.get(o,n),p["update:startValue"]=e=>{r&&_xeUtils.default.set(o,r,e)},p["update:endValue"]=e=>{n&&_xeUtils.default.set(o,n,e)}),[e(getDefaultComponent(t),{props:getCellEditProps(t,l,d,s),on:getComponentOns(t,l,{model(e){i.update=!0,i.value=e,(0,_util.setCellValue)(o,u,e)},change(){a.updateStatus(l)},blur(){a.handleCellRuleUpdateStatus("blur",l)}},p)})]},renderTableCell(e,t,l){var{startField:r,endField:n}=t,{row:a,column:o}=l;let u="",i="",d=(r&&n?(u=_xeUtils.default.get(a,r),i=_xeUtils.default.get(a,n)):(r=_xeUtils.default.get(a,o.field))&&(i=(_xeUtils.default.isArray(r)?(u=r[0],r):(n=(""+r).split(","),u=n[0],n))[1]),"");return getCellLabelVNs(e,t,l,d=u&&i?u+" ~ "+i:d)}},VxeTextarea:{tableAutoFocus:"textarea",renderTableEdit:defaultEditRender},VxeButton:{renderTableDefault:buttonCellRender},VxeButtonGroup:{renderTableDefault(e,t,l){var r=t.options;return[e(getDefaultComponent(t),{props:Object.assign({options:r},getCellEditProps(t,l,null)),on:getComponentOns(t,l)})]}},VxeSelect:{tableAutoFocus:"input",renderTableEdit:defaultSelectEditRender,renderTableDefault:defaultSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},createTableFilterOptions:defaultFilterOptions,renderTableFilter(r,n,a){var e=a.column;let{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getDefaultComponent(n),{key:t,props:getCellEditFilterProps(n,a,l,{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}),on:getFilterOns(n,a,e)})})},renderTableFloatingFilter(e,t,l){var r=l.option,{options:n,optionProps:a,optionGroups:o,optionGroupProps:u}=t,i=r.data;return e(getDefaultComponent(t),{props:getCellEditFilterProps(t,l,i,{options:n,optionProps:a,optionGroups:o,optionGroupProps:u}),on:getFloatingFilterOns(t,l,r)})},tableCellFormatter:handleFormatSelect,tableCellCopyMethod:handleFormatSelect,tableCellPasteMethod:handleSetSelectValue,tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeText:{renderTableDefault(e,t,l){var{$table:r,row:n,column:a}=l,o=t.props,r=r.getCellLabel(n,a);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o||{}),{content:r}),on:getComponentOns(t,l)})]}},VxeLink:{renderTableDefault(e,t,l){var{$table:r,row:n,column:a}=l,o=t.props,u=(o||{}).href,r=r.getCellLabel(n,a);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},o||{}),{content:r,href:_xeUtils.default.toFormatString(u,l)}),on:getComponentOns(t,l)})]}},formatOption:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))}},FormatSelect:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},tableCellFormatter:handleFormatSelect,tableCellCopyMethod:handleFormatSelect,tableCellPasteMethod:handleSetSelectValue,tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},VxeTreeSelect:{tableAutoFocus:"input",renderTableEdit:defaultTableOrTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableCellFormatter:handleFormatTreeSelect,tableCellCopyMethod:handleFormatTreeSelect,tableCellPasteMethod:handleSetTreeSelectValue,tableExportMethod:handleExportTreeSelectMethod},VxeTableSelect:{tableAutoFocus:"input",renderTableEdit:defaultTableOrTreeSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableCellFormatter:handleFormatTreeSelect,tableCellCopyMethod:handleFormatTreeSelect,tableCellPasteMethod:handleSetTreeSelectValue,tableExportMethod:handleExportTreeSelectMethod},formatTree:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))}},FormatTreeSelect:{renderTableDefault(e,t,l){return getCellLabelVNs(e,t,l,getTreeSelectCellValue(t,l))},tableCellFormatter:handleFormatTreeSelect,tableCellCopyMethod:handleFormatTreeSelect,tableCellPasteMethod:handleSetTreeSelectValue,tableExportMethod:handleExportTreeSelectMethod},VxeColorPicker:{tableAutoFocus:"input",renderTableEdit(e,t,l){var{row:r,column:n}=l,a=t.options,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{colors:a}),on:getEditOns(t,l)})]},renderTableCell(e,t,l){var{row:l,column:r}=l;return e("span",{class:"vxe-color-picker--readonly"},[e("div",{class:"vxe-color-picker--readonly-color",style:{backgroundColor:_xeUtils.default.get(l,r.field)}})])}},VxeIconPicker:{tableAutoFocus:"input",renderTableEdit(e,t,l){var{row:r,column:n}=l,a=t.options,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:getCellEditProps(t,l,r,{icons:a}),on:getEditOns(t,l)})]},renderTableCell(e,t,l){var{row:l,column:r}=l;return e("i",{class:_xeUtils.default.get(l,r.field)})}},VxeRadioGroup:{renderTableDefault:radioAndCheckboxGroupEditRender},VxeCheckbox:{renderTableDefault:checkboxEditRender},VxeCheckboxGroup:{renderTableDefault:radioAndCheckboxGroupEditRender},VxeSwitch:{tableAutoFocus:"button",renderTableEdit:defaultEditRender,renderTableDefault:defaultEditRender},VxeUpload:{renderTableEdit:defaultEditRender,renderTableCell:defaultEditRender,renderTableDefault:defaultEditRender},VxeImage:{renderTableDefault(e,t,l){var{row:r,column:n}=l,a=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},a),{src:r}),on:getEditOns(t,l)})]}},VxeImageGroup:{renderTableDefault(e,t,l){var{row:r,column:n}=l,a=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},a),{urlList:r}),on:getEditOns(t,l)})]}},VxeTextEllipsis:{renderTableDefault(e,t,l){var{row:r,column:n}=l,a=t.props,r=(0,_util.getCellValue)(r,n);return[e(getDefaultComponent(t),{props:Object.assign(Object.assign({},a),{content:r}),on:getEditOns(t,l)})]}},VxeRate:{renderTableDefault:defaultEditRender},VxeSlider:{renderTableDefault:defaultEditRender},$input:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldEditRender,renderTableCell(e,t,l){var r,{props:n={}}=t,{row:a,column:o}=l,u=n.digits||(null==(r=getConfig().input)?void 0:r.digits)||2;let i=_xeUtils.default.get(a,o.field);if(i)switch(n.type){case"date":case"week":case"month":case"year":i=getLabelFormatDate(i,n);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,u),u)}return getCellLabelVNs(e,t,l,i)},renderTableDefault:oldEditRender,renderTableFilter:oldFilterRender,tableFilterDefaultMethod:handleInputFilterMethod},$textarea:{tableAutoFocus:".vxe-textarea--inner"},$button:{renderTableDefault:oldButtonEditRender},$buttons:{renderTableDefault:oldButtonsEditRender},$select:{tableAutoFocus:".vxe-input--inner",renderTableEdit:oldSelectEditRender,renderTableDefault:oldSelectEditRender,renderTableCell(e,t,l){return getCellLabelVNs(e,t,l,getSelectCellValue(t,l))},renderTableFilter(r,n,a){var e=a.column;let{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}=n;return e.filters.map((e,t)=>{var l=e.data;return r(getOldComponent(n),{key:t,props:getCellEditFilterProps(n,a,l,{options:o,optionProps:u,optionGroups:i,optionGroupProps:d}),on:getFilterOns(n,a,e)})})},tableFilterDefaultMethod:handleFilterMethod,tableExportMethod:handleExportSelectMethod},$radio:{tableAutoFocus:".vxe-radio--input"},$checkbox:{tableAutoFocus:".vxe-checkbox--input"},$switch:{tableAutoFocus:".vxe-switch--button",renderTableEdit:oldEditRender,renderTableDefault:oldEditRender}});

package/lib/table/src/body.js

@@ -140,7 +140,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     afterFullData,
     mergeBodyList,
     scrollXStore,
-    scrollYStore
+    scrollYStore,
+    keepUpdateFieldMaps
   } = tableInternalData;
   const cellOpts = $xeTable.computeCellOpts;
   const validOpts = $xeTable.computeValidOpts;
@@ -170,6 +171,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     selectCellToRow
   } = areaOpts;
   const {
+    field,
     type,
     cellRender,
     editRender,
@@ -350,8 +352,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
   }
   // 如果编辑列开启显示状态
-  if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-    isDirty = $xeTable.isUpdateByRow(row, column.field);
+  if (!fixedHiddenColumn && editConfig && (editOpts.showStatus || editOpts.showUpdateStatus) && keepUpdateFieldMaps[field]) {
+    isDirty = $xeTable.isUpdateByRow(row, field);
   }
   const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
   let cellHeight = (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight);
@@ -655,6 +657,13 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         mode: expandMode
       } = expandOpts;
       if (expandMode === 'fixed') {
+        const currExpHeight = rowRest.expandHeight;
+        let expHeight = 0;
+        if (rowExpandHeightFlag) {
+          if (currExpHeight || expandHeight) {
+            expHeight = (currExpHeight || expandHeight || 0) + 1;
+          }
+        }
         rows.push(h('tr', {
           class: 'vxe-body--row-expanded-place',
           key: `expand_${rowid}`,
@@ -667,7 +676,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
             colspan: tableColumn.length
           },
           style: {
-            height: `${rowExpandHeightFlag ? rowRest.expandHeight || expandHeight : 0}px`
+            height: `${expHeight}px`
           }
         })]));
       } else {