vxe-table 4.9.30 → 4.9.32

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.9.30";
+const version = "4.9.32";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2103,6 +2103,7 @@ core_.VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
+      // destroyOnClose: false,
       showIcon: true
     },
     treeConfig: {
@@ -2411,7 +2412,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.9.30"}`;
+const log_version = `table v${"4.9.32"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8248,6 +8249,8 @@ const {
         initStore
       } = tableReactData;
       const {
+        visible,
+        multiple,
         column
       } = filterStore;
       const filterRender = column ? column.filterRender : null;
@@ -8257,14 +8260,18 @@ const {
         $panel,
         $table: $xeTable
       });
+      const filterOpts = computeFilterOpts.value;
+      const {
+        destroyOnClose
+      } = filterOpts;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: ['vxe-table--filter-wrapper', 'filter--prevent-default', 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;
   }
@@ -14694,7 +14701,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)];
         return rowRest && !!rowRest.treeLoaded;
       },
-      clearTreeExpandLoaded(row) {
+      clearTreeExpandLoaded(rows) {
         const {
           treeExpandedMaps
         } = reactData;
@@ -14703,16 +14710,22 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
-          transform,
-          lazy
+          transform
         } = treeOpts;
-        const rowid = getRowid($xeTable, row);
-        const rowRest = fullAllDataRowIdData[rowid];
-        if (lazy && rowRest) {
-          rowRest.treeLoaded = false;
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid];
+        if (rows) {
+          if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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();
@@ -20095,7 +20108,7 @@ const {
   hooks: edit_hook_hooks,
   getI18n: hook_getI18n
 } = core_.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'];
 edit_hook_hooks.add('tableEditModule', {
   setupTable($xeTable) {
     const {
@@ -20242,7 +20255,7 @@ edit_hook_hooks.add('tableEditModule', {
         }
       });
     }
-    const handleInsertRowAt = (records, row, isInsertNextRow) => {
+    const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
       const {
         treeConfig
       } = props;
@@ -20271,7 +20284,7 @@ edit_hook_hooks.add('tableEditModule', {
         [mapChildrenField]: [],
         [childrenField]: []
       } : {}, record))));
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(row)) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(targetRow)) {
         // 如果为虚拟树
         if (treeConfig && transform) {
           insertTreeRow(newRecords, false);
@@ -20306,7 +20319,7 @@ edit_hook_hooks.add('tableEditModule', {
           });
         }
       } else {
-        if (row === -1) {
+        if (targetRow === -1) {
           // 如果为虚拟树
           if (treeConfig && transform) {
             insertTreeRow(newRecords, true);
@@ -20344,7 +20357,7 @@ edit_hook_hooks.add('tableEditModule', {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            const matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => row[rowField] === item[rowField], {
+            const matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], {
               children: mapChildrenField
             });
             if (matchMapObj) {
@@ -20388,7 +20401,7 @@ edit_hook_hooks.add('tableEditModule', {
               });
               // 源
               if (parentRow) {
-                const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => row[rowField] === item[rowField], {
+                const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], {
                   children: childrenField
                 });
                 if (matchObj) {
@@ -20412,12 +20425,12 @@ edit_hook_hooks.add('tableEditModule', {
             }
             let afIndex = -1;
             // 如果是可视索引
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
-              if (row < afterFullData.length) {
-                afIndex = row;
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(targetRow)) {
+              if (targetRow < afterFullData.length) {
+                afIndex = targetRow;
               }
             } else {
-              afIndex = $xeTable.findRowIndexOf(afterFullData, row);
+              afIndex = $xeTable.findRowIndexOf(afterFullData, targetRow);
             }
             // 如果是插入指定行的下一行
             if (isInsertNextRow) {
@@ -20427,7 +20440,7 @@ edit_hook_hooks.add('tableEditModule', {
               throw new Error(hook_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 {
@@ -20471,6 +20484,31 @@ edit_hook_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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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
@@ -20537,13 +20575,22 @@ edit_hook_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);
       },
-      insertNextAt(records, row) {
-        return handleInsertRowAt(records, row, true);
+      insertChildAt(records, parentRow, targetRow) {
+        return handleInsertChildRowAt(records, parentRow, targetRow);
+      },
+      insertChildNextAt(records, parentRow, targetRow) {
+        return handleInsertChildRowAt(records, parentRow, targetRow, true);
       },
       /**
        * 删除指定行数据
@@ -21588,6 +21635,9 @@ export_hook_hooks.add('tableExportModule', {
     const toBooleanValue = cellValue => {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(cellValue) ? cellValue ? 'TRUE' : 'FALSE' : cellValue;
     };
+    const toStringValue = cellValue => {
+      return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
+    };
     const getBodyLabelData = (opts, columns, datas) => {
       const {
         isAllExpand,
@@ -21665,7 +21715,7 @@ export_hook_hooks.add('tableExportModule', {
                     if (opts.original) {
                       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();
@@ -21678,7 +21728,7 @@ export_hook_hooks.add('tableExportModule', {
                     }
                 }
               }
-              item[column.id] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue);
+              item[column.id] = toStringValue(cellValue);
             });
             expandMaps.set(row, 1);
             rest.push(Object.assign(item, row));
@@ -21735,7 +21785,7 @@ export_hook_hooks.add('tableExportModule', {
                 if (opts.original) {
                   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();
@@ -21748,7 +21798,7 @@ export_hook_hooks.add('tableExportModule', {
                 }
             }
           }
-          item[column.id] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue);
+          item[column.id] = toStringValue(cellValue);
         });
         return item;
       });
@@ -26045,7 +26095,7 @@ const {
   GLOBAL_EVENT_KEYS: grid_GLOBAL_EVENT_KEYS
 } = core_.VxeUI;
 const tableComponentPropKeys = Object.keys(props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',