vxe-table 4.20.10 → 4.20.11

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.20.10";
+const version = "4.20.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -758,7 +758,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.20.10"}`;
+const tableVersion = `table v${"4.20.11"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -20734,6 +20734,18 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 const { editConfig } = props;
                 const { formatter, editRender, cellRender } = column;
+                let etOpSize = null;
+                let etOgSize = null;
+                let clOpSize = null;
+                let clOgSize = null;
+                if (editRender) {
+                    etOpSize = editRender.options ? editRender.options.length : 0;
+                    etOgSize = editRender.optionGroups ? editRender.optionGroups.length : 0;
+                }
+                if (cellRender) {
+                    clOpSize = cellRender.options ? cellRender.options.length : 0;
+                    clOgSize = cellRender.optionGroups ? cellRender.optionGroups.length : 0;
+                }
                 // formatter > tableCellFormatter
                 const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null));
                 const compConf = renderOpts ? renderer$1.get(renderOpts.name) : null;
@@ -20752,7 +20764,8 @@ var VxeTableComponent = defineVxeComponent({
                             formatData = fullAllDataRowIdData[rowid].formatData = {};
                         }
                         if (rowRest && formatData[colid]) {
-                            if (formatData[colid].value === cellValue) {
+                            const ftValue = formatData[colid].value;
+                            if (ftValue && ftValue[0] === cellValue && ftValue[1] === etOpSize && ftValue[2] === etOgSize && ftValue[3] === clOpSize && ftValue[4] === clOgSize) {
                                 return formatData[colid].label;
                             }
                         }
@@ -20784,7 +20797,8 @@ var VxeTableComponent = defineVxeComponent({
                         cellLabel = tcFormatter(renderOpts, formatParams);
                     }
                     if (formatData) {
-                        formatData[colid] = { value: cellValue, label: cellLabel };
+                        const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize];
+                        formatData[colid] = { value: ftValue, label: cellLabel };
                     }
                 }
                 return cellLabel;
@@ -31748,12 +31762,13 @@ var VxeGridComponent = defineVxeComponent({
                                     else {
                                         let tableData = [];
                                         if (rest) {
+                                            const listProp = resConfigs.list;
+                                            const resultProp = resConfigs.result;
                                             const reParams = { data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null };
                                             if (pagerConfig && isEnableConf(pagerOpts)) {
                                                 const totalProp = resConfigs.total;
                                                 const total = (XEUtils.isFunction(totalProp) ? totalProp(reParams) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
                                                 tablePage.total = XEUtils.toNumber(total);
-                                                const resultProp = resConfigs.result;
                                                 tableData = (XEUtils.isFunction(resultProp) ? resultProp(reParams) : XEUtils.get(rest, resultProp || 'result')) || [];
                                                 // 检验当前页码，不能超出当前最大页数
                                                 const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
@@ -31762,7 +31777,6 @@ var VxeGridComponent = defineVxeComponent({
                                                 }
                                             }
                                             else {
-                                                const listProp = resConfigs.list;
                                                 if (XEUtils.isArray(rest)) {
                                                     tableData = rest;
                                                 }