vxe-table 4.9.30 → 4.9.32

package/es/table/module/edit/hook.js

@@ -6,7 +6,7 @@ import { getCellValue, setCellValue, getRowid } from '../../src/util';
 import { browse, removeClass, addClass } from '../../../ui/src/dom';
 import { warnLog, errLog } from '../../../ui/src/log';
 const { getConfig, renderer, hooks, getI18n } = VxeUI;
-const tableEditMethodKeys = ['insert', 'insertAt', 'insertNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
+const tableEditMethodKeys = ['insert', 'insertAt', 'insertNextAt', 'insertChild', 'insertChildAt', 'insertChildNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
 hooks.add('tableEditModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
@@ -94,7 +94,7 @@ hooks.add('tableEditModule', {
                 }
             });
         }
-        const handleInsertRowAt = (records, row, isInsertNextRow) => {
+        const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
             const { mergeList, editStore } = reactData;
             const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
@@ -105,7 +105,7 @@ hooks.add('tableEditModule', {
                 records = [records];
             }
             const newRecords = reactive($xeTable.defineField(records.map((record) => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record))));
-            if (XEUtils.eqNull(row)) {
+            if (XEUtils.eqNull(targetRow)) {
                 // 如果为虚拟树
                 if (treeConfig && transform) {
                     insertTreeRow(newRecords, false);
@@ -129,7 +129,7 @@ hooks.add('tableEditModule', {
                 }
             }
             else {
-                if (row === -1) {
+                if (targetRow === -1) {
                     // 如果为虚拟树
                     if (treeConfig && transform) {
                         insertTreeRow(newRecords, true);
@@ -155,7 +155,7 @@ hooks.add('tableEditModule', {
                 else {
                     // 如果为虚拟树
                     if (treeConfig && transform) {
-                        const matchMapObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildrenField });
+                        const matchMapObj = XEUtils.findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], { children: mapChildrenField });
                         if (matchMapObj) {
                             const { parent: parentRow } = matchMapObj;
                             const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
@@ -184,7 +184,7 @@ hooks.add('tableEditModule', {
                             });
                             // 源
                             if (parentRow) {
-                                const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: childrenField });
+                                const matchObj = XEUtils.findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], { children: childrenField });
                                 if (matchObj) {
                                     const parentChilds = matchObj.items;
                                     let targetIndex = matchObj.index;
@@ -208,13 +208,13 @@ hooks.add('tableEditModule', {
                         }
                         let afIndex = -1;
                         // 如果是可视索引
-                        if (XEUtils.isNumber(row)) {
-                            if (row < afterFullData.length) {
-                                afIndex = row;
+                        if (XEUtils.isNumber(targetRow)) {
+                            if (targetRow < afterFullData.length) {
+                                afIndex = targetRow;
                             }
                         }
                         else {
-                            afIndex = $xeTable.findRowIndexOf(afterFullData, row);
+                            afIndex = $xeTable.findRowIndexOf(afterFullData, targetRow);
                         }
                         // 如果是插入指定行的下一行
                         if (isInsertNextRow) {
@@ -224,7 +224,7 @@ hooks.add('tableEditModule', {
                             throw new Error(getI18n('vxe.error.unableInsert'));
                         }
                         afterFullData.splice(afIndex, 0, ...newRecords);
-                        tableFullData.splice($xeTable.findRowIndexOf(tableFullData, row), 0, ...newRecords);
+                        tableFullData.splice($xeTable.findRowIndexOf(tableFullData, targetRow), 0, ...newRecords);
                         // 刷新单元格合并
                         mergeList.forEach((mergeItem) => {
                             const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
@@ -264,6 +264,21 @@ hooks.add('tableEditModule', {
                 };
             });
         };
+        const handleInsertChildRowAt = (records, parentRow, targetRow, isInsertNextRow) => {
+            const { treeConfig } = props;
+            const treeOpts = computeTreeOpts.value;
+            const { transform, rowField, parentField } = treeOpts;
+            if (treeConfig && transform) {
+                if (!XEUtils.isArray(records)) {
+                    records = [records];
+                }
+                return handleInsertRowAt(records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
+            }
+            else {
+                errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true']);
+            }
+            return Promise.resolve({ row: null, rows: [] });
+        };
         const handleClearEdit = (evnt, targetRow) => {
             const { mouseConfig } = props;
             const { editStore } = reactData;
@@ -320,13 +335,22 @@ hooks.add('tableEditModule', {
              * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
              * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
              * @param {Object/Array} records 新的数据
-             * @param {Row} row 指定行
+             * @param {Row} targetRow 指定行
              */
-            insertAt(records, row) {
-                return handleInsertRowAt(records, row);
+            insertAt(records, targetRow) {
+                return handleInsertRowAt(records, targetRow);
+            },
+            insertNextAt(records, targetRow) {
+                return handleInsertRowAt(records, targetRow, true);
+            },
+            insertChild(records, parentRow) {
+                return handleInsertChildRowAt(records, parentRow, null);
+            },
+            insertChildAt(records, parentRow, targetRow) {
+                return handleInsertChildRowAt(records, parentRow, targetRow);
             },
-            insertNextAt(records, row) {
-                return handleInsertRowAt(records, row, true);
+            insertChildNextAt(records, parentRow, targetRow) {
+                return handleInsertChildRowAt(records, parentRow, targetRow, true);
             },
             /**
              * 删除指定行数据

package/es/table/module/export/hook.js

@@ -2,7 +2,7 @@ import { inject, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util';
-import { parseFile, formatText } from '../../../ui/src/utils';
+import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils';
 import { createHtmlPage, getExportBlobByContent } from './util';
 import { warnLog, errLog } from '../../../ui/src/log';
 const { getI18n, hooks, renderer } = VxeUI;
@@ -287,6 +287,9 @@ hooks.add('tableExportModule', {
         const toBooleanValue = (cellValue) => {
             return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue;
         };
+        const toStringValue = (cellValue) => {
+            return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
+        };
         const getBodyLabelData = (opts, columns, datas) => {
             const { isAllExpand, mode } = opts;
             const { treeConfig } = props;
@@ -351,7 +354,7 @@ hooks.add('tableExportModule', {
                                             cellValue = getCellValue(row, column);
                                         }
                                         else {
-                                            cellValue = `${$xeTable.getCellLabel(row, column)}`;
+                                            cellValue = $xeTable.getCellLabel(row, column);
                                             if (column.type === 'html') {
                                                 htmlCellElem.innerHTML = cellValue;
                                                 cellValue = htmlCellElem.innerText.trim();
@@ -365,7 +368,7 @@ hooks.add('tableExportModule', {
                                         }
                                 }
                             }
-                            item[column.id] = XEUtils.toValueString(cellValue);
+                            item[column.id] = toStringValue(cellValue);
                         });
                         expandMaps.set(row, 1);
                         rest.push(Object.assign(item, row));
@@ -412,7 +415,7 @@ hooks.add('tableExportModule', {
                                     cellValue = getCellValue(row, column);
                                 }
                                 else {
-                                    cellValue = `${$xeTable.getCellLabel(row, column)}`;
+                                    cellValue = $xeTable.getCellLabel(row, column);
                                     if (column.type === 'html') {
                                         htmlCellElem.innerHTML = cellValue;
                                         cellValue = htmlCellElem.innerText.trim();
@@ -426,7 +429,7 @@ hooks.add('tableExportModule', {
                                 }
                         }
                     }
-                    item[column.id] = XEUtils.toValueString(cellValue);
+                    item[column.id] = toStringValue(cellValue);
                 });
                 return item;
             });

package/es/table/module/filter/panel.js

@@ -184,11 +184,13 @@ export default defineComponent({
         const renderVN = () => {
             const { filterStore } = props;
             const { initStore } = tableReactData;
-            const { column } = filterStore;
+            const { visible, multiple, column } = filterStore;
             const filterRender = column ? column.filterRender : null;
             const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
             const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : '';
             const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
+            const filterOpts = computeFilterOpts.value;
+            const { destroyOnClose } = filterOpts;
             return h('div', {
                 class: [
                     'vxe-table--filter-wrapper',
@@ -196,12 +198,12 @@ export default defineComponent({
                     getPropClass(filterClassName, params),
                     {
                         'is--animat': $xeTable.props.animat,
-                        'is--multiple': filterStore.multiple,
-                        'is--active': filterStore.visible
+                        'is--multiple': multiple,
+                        'is--active': visible
                     }
                 ],
                 style: filterStore.style
-            }, initStore.filter && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : []);
+            }, initStore.filter && (destroyOnClose ? visible : true) && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : []);
         };
         return renderVN;
     }

package/es/table/src/table.js

@@ -4823,18 +4823,25 @@ export default defineComponent({
                 const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)];
                 return rowRest && !!rowRest.treeLoaded;
             },
-            clearTreeExpandLoaded(row) {
+            clearTreeExpandLoaded(rows) {
                 const { treeExpandedMaps } = reactData;
                 const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
-                const { transform, lazy } = treeOpts;
-                const rowid = getRowid($xeTable, row);
-                const rowRest = fullAllDataRowIdData[rowid];
-                if (lazy && rowRest) {
-                    rowRest.treeLoaded = false;
-                    if (treeExpandedMaps[rowid]) {
-                        delete treeExpandedMaps[rowid];
+                const { transform } = treeOpts;
+                if (rows) {
+                    if (!XEUtils.isArray(rows)) {
+                        rows = [rows];
                     }
+                    rows.forEach((row) => {
+                        const rowid = getRowid($xeTable, row);
+                        const rowRest = fullAllDataRowIdData[rowid];
+                        if (rowRest) {
+                            rowRest.treeLoaded = false;
+                            if (treeExpandedMaps[rowid]) {
+                                delete treeExpandedMaps[rowid];
+                            }
+                        }
+                    });
                 }
                 if (transform) {
                     handleVirtualTreeToList();

package/es/table/style.css

@@ -1772,22 +1772,6 @@
 .vxe-footer--column.fixed--width > .vxe-cell .vxe-ico-picker {
   width: 100%;
 }
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-input,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-textarea,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-select,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-tree-select,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-date-picker,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-number-input,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-ico-picker,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-input,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-textarea,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-select,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-tree-select,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-date-picker,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-number-input,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-ico-picker {
-  width: 100%;
-}
 
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-textarea, .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-select {
   width: 100%;
@@ -1795,6 +1779,9 @@
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-textarea, .vxe-body--column.fixed--width > .vxe-cell > .vxe-select, .vxe-body--column.fixed--width > .vxe-cell > .vxe-tree-select, .vxe-body--column.fixed--width > .vxe-cell > .vxe-date-picker, .vxe-body--column.fixed--width > .vxe-cell > .vxe-number-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-ico-picker {
   width: 100%;
 }
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-default-input,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-default-textarea,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-default-select,
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-input,
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-textarea,
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-select,
@@ -1811,15 +1798,6 @@
 .vxe-table--filter-template > .vxe-input, .vxe-table--filter-template > .vxe-textarea, .vxe-table--filter-template > .vxe-select, .vxe-table--filter-template > .vxe-tree-select, .vxe-table--filter-template > .vxe-date-picker, .vxe-table--filter-template > .vxe-number-input, .vxe-table--filter-template > .vxe-ico-picker {
   width: 100%;
 }
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-input,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-textarea,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-select,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-tree-select,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-date-picker,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-number-input,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-ico-picker {
-  width: 100%;
-}
 
 .vxe-cell .vxe-default-input,
 .vxe-cell .vxe-default-textarea,