vxe-table 3.15.18 → 3.15.20

package/es/table/render/index.js

@@ -380,14 +380,17 @@ function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
     const { optionGroups, optionGroupProps = {} } = renderOpts;
     const groupOptions = optionGroupProps.options || 'options';
     const groupLabel = optionGroupProps.label || 'label';
-    return optionGroups.map((group, gIndex) => {
-        return h('optgroup', {
-            key: gIndex,
-            attrs: {
-                label: group[groupLabel]
-            }
-        }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
-    });
+    if (optionGroups) {
+        return optionGroups.map((group, gIndex) => {
+            return h('optgroup', {
+                key: gIndex,
+                attrs: {
+                    label: group[groupLabel]
+                }
+            }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
+        });
+    }
+    return [];
 }
 /**
  * 渲染原生的 option 标签
@@ -399,19 +402,22 @@ function renderNativeOptions(h, options, renderOpts, params) {
     const valueProp = optionProps.value || 'value';
     const disabledProp = optionProps.disabled || 'disabled';
     const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-    return options.map((option, oIndex) => {
-        return h('option', {
-            key: oIndex,
-            attrs: {
-                value: option[valueProp],
-                disabled: option[disabledProp]
-            },
-            domProps: {
-                /* eslint-disable eqeqeq */
-                selected: option[valueProp] == cellValue
-            }
-        }, option[labelProp]);
-    });
+    if (options) {
+        return options.map((option, oIndex) => {
+            return h('option', {
+                key: oIndex,
+                attrs: {
+                    value: option[valueProp],
+                    disabled: option[disabledProp]
+                },
+                domProps: {
+                    /* eslint-disable eqeqeq */
+                    selected: option[valueProp] == cellValue
+                }
+            }, option[labelProp]);
+        });
+    }
+    return [];
 }
 function nativeFilterRender(h, renderOpts, params) {
     const { column } = params;

package/es/table/src/body.js

@@ -789,7 +789,8 @@ export default {
                         xid: xID,
                         cellspacing: 0,
                         cellpadding: 0,
-                        border: 0
+                        border: 0,
+                        xvm: isOptimizeMode ? '1' : null
                     }
                 }, [
                     /**

package/es/table/src/footer.js

@@ -354,7 +354,8 @@ export default {
                         xid: xID,
                         cellspacing: 0,
                         cellpadding: 0,
-                        border: 0
+                        border: 0,
+                        xvm: isOptimizeMode ? '1' : null
                     }
                 }, [
                     /**

package/es/table/src/header.js

@@ -349,7 +349,8 @@ export default {
                         xid: xID,
                         cellspacing: 0,
                         cellpadding: 0,
-                        border: 0
+                        border: 0,
+                        xvm: isOptimizeMode ? '1' : null
                     }
                 }, [
                     /**

package/es/table/src/methods.js

@@ -1800,7 +1800,7 @@ const handleFooterMerge = ($xeTable, merges) => {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { footerTableData } = reactData;
-    const { mergeFooterList, mergeFooterMaps } = internalData;
+    const { mergeFooterList, mergeFooterMaps, fullColumnIdData } = internalData;
     if (merges) {
         const { visibleColumn } = internalData;
         if (!XEUtils.isArray(merges)) {
@@ -1813,6 +1813,13 @@ const handleFooterMerge = ($xeTable, merges) => {
             if (XEUtils.isNumber(margeCol)) {
                 mergeColumnIndex = margeCol;
             }
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
             if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
                 rowspan = XEUtils.toNumber(rowspan) || 1;
                 colspan = XEUtils.toNumber(colspan) || 1;
@@ -1845,31 +1852,80 @@ const handleFooterMerge = ($xeTable, merges) => {
         });
     }
 };
-function removeMerges($xeTable, merges, mList, rowList) {
-    // const props = $xeTable
+function removeBodyMerges($xeTable, merges) {
     const internalData = $xeTable;
+    const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData } = internalData;
     const rest = [];
     if (merges) {
-        // const { treeConfig } = props
-        const { visibleColumn } = internalData;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
         if (!XEUtils.isArray(merges)) {
             merges = [merges];
         }
-        // if (treeConfig && merges.length) {
-        //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-        // }
         merges.forEach((item) => {
-            let { row, col } = item;
-            if (rowList && XEUtils.isNumber(row)) {
-                row = rowList[row];
+            const { row: margeRow, col: margeCol } = item;
+            let mergeRowIndex = -1;
+            let mergeColumnIndex = -1;
+            if (XEUtils.isNumber(margeRow)) {
+                mergeRowIndex = margeRow;
             }
-            if (XEUtils.isNumber(col)) {
-                col = visibleColumn[col];
+            else {
+                const rowid = margeRow ? handleGetRowId(margeRow) : null;
+                const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+                if (rowRest) {
+                    mergeRowIndex = rowRest._index;
+                }
+            }
+            if (XEUtils.isNumber(margeCol)) {
+                mergeColumnIndex = margeCol;
+            }
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
+            const mcIndex = XEUtils.findIndexOf(mergeBodyList, item => (item.row === mergeRowIndex) && (item.col === mergeColumnIndex));
+            if (mcIndex > -1) {
+                const rItems = mergeBodyList.splice(mcIndex, 1);
+                const item = rItems[0];
+                if (item) {
+                    rest.push(rItems[0]);
+                }
+            }
+        });
+    }
+    return rest;
+}
+function removeFooterMerges($xeTable, merges) {
+    const internalData = $xeTable;
+    const { mergeFooterList, fullColumnIdData } = internalData;
+    const rest = [];
+    if (merges) {
+        if (!XEUtils.isArray(merges)) {
+            merges = [merges];
+        }
+        merges.forEach((item) => {
+            const { row: margeRow, col: margeCol } = item;
+            const mergeRowIndex = XEUtils.isNumber(margeRow) ? margeRow : -1;
+            let mergeColumnIndex = -1;
+            if (XEUtils.isNumber(margeCol)) {
+                mergeColumnIndex = margeCol;
             }
-            const mcIndex = XEUtils.findIndexOf(mList, item => item._row === row && item._col === col);
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
+            const mcIndex = XEUtils.findIndexOf(mergeFooterList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
             if (mcIndex > -1) {
-                const rItems = mList.splice(mcIndex, 1);
-                rest.push(rItems[0]);
+                const rItems = mergeFooterList.splice(mcIndex, 1);
+                const item = rItems[0];
+                if (item) {
+                    rest.push(item);
+                }
             }
         });
     }
@@ -6886,25 +6942,27 @@ const Methods = {
         const { selectRadioRow: oldValue } = reactData;
         const { row } = params;
         const radioOpts = $xeTable.computeRadioOpts;
-        const { trigger } = radioOpts;
+        const { trigger, checkMethod } = radioOpts;
         if (trigger === 'manual') {
             return;
         }
         evnt.stopPropagation();
-        let newValue = row;
-        let isChange = oldValue !== newValue;
-        if (isChange) {
-            handleCheckedRadioRow($xeTable, newValue);
-        }
-        else if (!radioOpts.strict) {
-            isChange = oldValue === newValue;
+        if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
+            let newValue = row;
+            let isChange = oldValue !== newValue;
             if (isChange) {
-                newValue = null;
-                $xeTable.clearRadioRow();
+                handleCheckedRadioRow($xeTable, newValue);
+            }
+            else if (!radioOpts.strict) {
+                isChange = oldValue === newValue;
+                if (isChange) {
+                    newValue = null;
+                    $xeTable.clearRadioRow();
+                }
+            }
+            if (isChange) {
+                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
             }
-        }
-        if (isChange) {
-            $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
         }
     },
     triggerCurrentColumnEvent(evnt, params) {
@@ -8649,7 +8707,9 @@ const Methods = {
         return rest;
     },
     /**
-     * 获取树表格状态
+     * 内部方法、获取树表格状态
+     * @deprecated
+     * @private
      */
     getTreeStatus() {
         if (this.treeConfig) {
@@ -9829,11 +9889,11 @@ const Methods = {
     removeMergeCells(merges) {
         const $xeTable = this;
         const props = $xeTable;
-        const internalData = $xeTable;
         if (props.spanMethod) {
             errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
-        const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+        const rest = removeBodyMerges($xeTable, merges);
+        $xeTable.handleUpdateBodyMerge();
         return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             updateStyle($xeTable);
@@ -9853,10 +9913,12 @@ const Methods = {
      */
     clearMergeCells() {
         const $xeTable = this;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         internalData.mergeBodyList = [];
         internalData.mergeBodyMaps = {};
         internalData.mergeBodyCellMaps = {};
+        reactData.mergeBodyFlag++;
         return $xeTable.$nextTick().then(() => {
             return updateStyle($xeTable);
         });
@@ -9877,11 +9939,11 @@ const Methods = {
     removeMergeFooterItems(merges) {
         const $xeTable = this;
         const props = $xeTable;
-        const internalData = $xeTable;
         if (props.footerSpanMethod) {
             errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+        const rest = removeFooterMerges($xeTable, merges);
+        $xeTable.handleUpdateFooterMerge();
         return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             updateStyle($xeTable);
@@ -9901,10 +9963,12 @@ const Methods = {
      */
     clearMergeFooterItems() {
         const $xeTable = this;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         internalData.mergeFooterList = [];
         internalData.mergeFooterMaps = {};
         internalData.mergeFooterCellMaps = {};
+        reactData.mergeFootFlag++;
         return $xeTable.$nextTick().then(() => {
             return updateStyle($xeTable);
         });

package/es/table/src/table.js

@@ -1450,8 +1450,8 @@ export default {
         if (props.editConfig && editOpts.showStatus && !props.keepSource) {
             warnLog('vxe.error.reqProp', ['keep-source']);
         }
-        if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-            warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+        if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
+            warnLog('vxe.error.reqProp', ['show-overflow']);
         }
         if (treeConfig && !treeOpts.transform && props.stripe) {
             warnLog('vxe.error.noTree', ['stripe']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.18";
+export const version = "3.15.20";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.15.18"}`;
+const version = `table v${"3.15.20"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);