vxe-table 4.21.9 → 4.22.0-beta.0

package/README.md

@@ -31,6 +31,7 @@
     * [ ] v4.? 重构虚拟渲染v7，优化百万级渲染量
     * [ ] v4.? 重构虚拟渲染v6，同时支持原生滚动条和虚拟滚动条
     * [ ] v4.? 功能需求收集中...
+    * [x] v4.22 编辑表格的渲染器支持 edit-render 和 edit-render 组合使用
     * [x] v4.21 重构全键盘操作，修复按键编辑为拼音输入法时首字母丢失问题；筛选支持自适应屏幕上下位置显示；优化虚拟渲染，解决滚动错位场景
     * [x] v4.20 内部重构优化，内部结构调整
     * [x] v4.19 增加对增删改操作撤销回退的支持；优化虚拟渲染，优化提升 Window/Mac 触摸板滚动流畅度
@@ -49,6 +50,7 @@
     * [ ] v3.? 重构虚拟渲染v7，优化百万级渲染量
     * [ ] v3.? 重构虚拟渲染v6，同时支持原生滚动条和虚拟滚动条
     * [ ] v3.? 功能需求收集中...
+    * [x] v3.24 编辑表格的渲染器支持 edit-render 和 edit-render 组合使用
     * [x] v3.23 重构全键盘操作，修复按键编辑为拼音输入法时首字母丢失问题；筛选支持自适应屏幕上下位置显示；优化虚拟渲染，解决滚动错位场景
     * [x] v3.22 内部重构优化，内部结构调整
     * [x] v3.21 增加对增删改操作撤销回退的支持；优化虚拟渲染，优化提升 Window/Mac 触摸板滚动流畅度

package/dist/all.esm.js

@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.21.9";
+const version = "4.22.0-beta.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -931,7 +931,7 @@ function getPopupWrapperElement(panelElem) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.9"}`;
+const tableVersion = `table v${"4.22.0-beta.0"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -2701,18 +2701,27 @@ const Cell = {
             if (defaultSlot) {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
             }
-            const renderOpts = editRenderOpts || cellRenderOpts;
-            // 如果是编辑表格：renderTableCell > formatter
-            // 如果是查看表格：renderTableDefault > formatter
-            if (renderOpts) {
-                const compConf = renderer$a.get(renderOpts.name);
-                if (compConf) {
-                    const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);
-                    if (renderFn) {
-                        return renderCellBaseVNs(params, getSlotVNs(renderFn(renderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
-                    }
+            // 如果是编辑模式-查看：slot default > formatter > cellRender.renderTableDefault > editRender.renderTableCell > editRender.renderTableDefault > cellRender.tableCellFormatter > editRender.tableCellFormatter > field
+            // 如果是查看表格：slot default > formatter > cellRender.renderTableDefault > cellRender.tableCellFormatter > field
+            const cellCompConf = cellRenderOpts ? renderer$a.get(cellRenderOpts.name) : null;
+            if (cellRenderOpts) {
+                const cellDefaultRenderFn = cellCompConf ? (cellCompConf.renderTableDefault || cellCompConf.renderDefault) : null;
+                if (cellDefaultRenderFn && cellRenderOpts) {
+                    return renderCellBaseVNs(params, getSlotVNs(cellDefaultRenderFn(cellRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
+                }
+            }
+            if (editRenderOpts) {
+                const editCompConf = editRenderOpts ? renderer$a.get(editRenderOpts.name) : null;
+                const editCellRenderFn = editCompConf
+                    ? ((editCompConf.renderTableCell || editCompConf.renderCell) ||
+                        (editCompConf.renderTableDefault || editCompConf.renderDefault))
+                    : null;
+                if (editCellRenderFn) {
+                    return renderCellBaseVNs(params, getSlotVNs(editCellRenderFn(editRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
                 }
             }
+            // 如果是编辑模式-查看：cellRender.tableCellFormatter > editRender.tableCellFormatter > field
+            // 如果是查看表格：cellRender.tableCellFormatter > field
             cellValue = $table.getCellLabel(row, column);
         }
         const cellPlaceholder = editRenderOpts ? editRenderOpts.placeholder : '';
@@ -3481,6 +3490,7 @@ const Cell = {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, cellParams));
             }
         }
+        // slot default > formatter
         if (formatter) {
             return renderCellBaseVNs(params, [
                 h('span', {
@@ -11086,7 +11096,7 @@ hooks$4.add('tableExportModule', {
             const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts;
             const { treeConfig } = props;
             const { isRowGroupStatus } = reactData;
-            const { fullColumnFieldData } = internalData;
+            const { fullColumnFieldData, fullAllDataRowIdData } = internalData;
             const radioOpts = computeRadioOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const treeOpts = computeTreeOpts.value;
@@ -11242,6 +11252,7 @@ hooks$4.add('tableExportModule', {
             }
             if (treeConfig) {
                 // 如果是树结构
+                const { seqMode } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const rest = [];
                 const expandMaps = {};
@@ -11262,6 +11273,7 @@ hooks$4.add('tableExportModule', {
                             _hasChild: hasRowChild,
                             _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
                         };
+                        const rowRest = fullAllDataRowIdData[rowid] || {};
                         columns.forEach((column, $columnIndex) => {
                             let cellValue = '';
                             const renderOpts = column.editRender || column.cellRender;
@@ -11281,7 +11293,10 @@ hooks$4.add('tableExportModule', {
                             else {
                                 switch (column.type) {
                                     case 'seq': {
-                                        const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                                        let seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                                        if (seqMode === 'increasing') {
+                                            seqVal = rowRest ? (rowRest._index + 1) : -1;
+                                        }
                                         cellValue = expMode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex);
                                         break;
                                     }
@@ -21271,13 +21286,17 @@ var VxeTableComponent = defineVxeComponent({
                     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;
-                const tcFormatter = compConf ? compConf.tableCellFormatter : null;
+                const isEnableEdit = editConfig && isEnableConf(editConfig);
+                const editRenderOpts = formatter ? null : (isEnableEdit && isEnableConf(editRender) ? editRender : null);
+                const cellRenderOpts = formatter ? null : (isEnableConf(cellRender) ? cellRender : null);
+                // formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
+                const cellCompConf = cellRenderOpts ? renderer$1.get(cellRenderOpts.name) : null;
+                const editCompConf = editRenderOpts ? renderer$1.get(editRenderOpts.name) : null;
+                const cellDfFormatter = cellCompConf ? cellCompConf.tableCellFormatter : null;
+                const editDfFormatter = editCompConf ? editCompConf.tableCellFormatter : null;
                 const cellValue = getCellValue(row, column);
                 let cellLabel = cellValue;
-                if (formatter || tcFormatter) {
+                if (formatter || cellDfFormatter || editDfFormatter) {
                     let formatData;
                     const { fullAllDataRowIdData } = internalData;
                     const rowid = getRowid($xeTable, row);
@@ -21318,8 +21337,11 @@ var VxeTableComponent = defineVxeComponent({
                             cellLabel = formatter(formatParams);
                         }
                     }
-                    else if (renderOpts && tcFormatter) {
-                        cellLabel = tcFormatter(renderOpts, formatParams);
+                    else if (cellRenderOpts && cellDfFormatter) {
+                        cellLabel = cellDfFormatter(cellRenderOpts, formatParams);
+                    }
+                    else if (editRenderOpts && editDfFormatter) {
+                        cellLabel = editDfFormatter(editRenderOpts, formatParams);
                     }
                     if (formatData) {
                         const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize];
@@ -32696,6 +32718,10 @@ var VxeGridComponent = defineVxeComponent({
                 return handleZoom();
             },
             getFormData,
+            /**
+             * 已废弃，被 getFormFlatItems 替换
+             * @deprecated
+             */
             getFormItems(itemIndex) {
                 const formOpts = computeFormOpts.value;
                 const { formConfig } = props;
@@ -32704,8 +32730,30 @@ var VxeGridComponent = defineVxeComponent({
                 XEUtils.eachTree(formConfig && isEnableConf(formOpts) && items ? items : [], item => {
                     itemList.push(item);
                 }, { children: 'children' });
+                // errLog('vxe.error.delFunc', ['getFormItems', 'getFormFlatItems'])
                 return XEUtils.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
             },
+            getFormFlatItems() {
+                const $form = refForm.value;
+                if ($form) {
+                    return $form.getFlatItems();
+                }
+                return [];
+            },
+            getFormNestedItems() {
+                const $form = refForm.value;
+                if ($form) {
+                    return $form.getNestedItems();
+                }
+                return [];
+            },
+            getFormItemByField(field) {
+                const $form = refForm.value;
+                if ($form) {
+                    return $form.getItemByField(field);
+                }
+                return null;
+            },
             resetForm() {
                 const $form = refForm.value;
                 if ($form) {