vxe-table 3.11.34 → 3.11.36

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.34";
+const version = "3.11.36";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2325,6 +2325,7 @@ core_.VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
+      // destroyOnClose: false,
       showIcon: true
     },
     treeConfig: {
@@ -2792,7 +2793,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.34"}`;
+const log_version = `table v${"3.11.36"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8057,7 +8058,7 @@ const Methods = {
         rceTimeout
       } = internalData;
       const el = $xeTable.$refs.refElem;
-      if (!el || !el.clientWidth) {
+      if (el && el.clientWidth) {
         $xeTable.autoCellWidth();
       }
       if (rceTimeout) {
@@ -12293,7 +12294,7 @@ const Methods = {
     const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)];
     return rowRest && !!rowRest.treeLoaded;
   },
-  clearTreeExpandLoaded(row) {
+  clearTreeExpandLoaded(rows) {
     const $xeTable = this;
     const {
       treeOpts,
@@ -12301,16 +12302,22 @@ const Methods = {
       fullAllDataRowIdData
     } = this;
     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) {
       this.handleVirtualTreeToList();
@@ -13674,7 +13681,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (true) {
@@ -17027,28 +17034,34 @@ const {
     }
   },
   render(h) {
+    const $xeTable = this.$parent;
     const {
-      $parent: $xetable,
       filterStore
     } = this;
     const {
       args,
+      visible,
+      multiple,
       column
     } = filterStore;
     const filterRender = column ? column.filterRender : null;
     const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
     const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
+    const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      destroyOnClose
+    } = filterOpts;
     return h('div', {
       class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', getClass(filterClassName, Object.assign({
         $panel: this,
-        $table: $xetable
+        $table: $xeTable
       }, args)), {
-        'is--animat': $xetable.animat,
-        'is--multiple': filterStore.multiple,
-        'is--active': filterStore.visible
+        'is--animat': $xeTable.animat,
+        'is--multiple': multiple,
+        'is--active': visible
       }],
       style: filterStore.style
-    }, filterStore.visible && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
+    }, filterStore.visible && (destroyOnClose ? visible : true) && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
   },
   methods: {
     renderOptions(h, filterRender, compConf) {
@@ -18889,8 +18902,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     }
   });
 }
-function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
-  const $xeTable = _vm;
+function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -18918,14 +18930,14 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
   if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
     records = [records];
   }
-  const newRecords = _vm.defineField(records.map(record => Object.assign(treeConfig && transform ? {
+  const newRecords = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? {
     [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(_vm, newRecords, false);
+      insertTreeRow($xeTable, newRecords, false);
     } else {
       newRecords.forEach(item => {
         const rowid = getRowid($xeTable, item);
@@ -18957,10 +18969,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       });
     }
   } else {
-    if (row === -1) {
+    if (targetRow === -1) {
       // 如果为虚拟树
       if (treeConfig && transform) {
-        insertTreeRow(_vm, newRecords, true);
+        insertTreeRow($xeTable, newRecords, true);
       } else {
         newRecords.forEach(item => {
           const rowid = getRowid($xeTable, item);
@@ -18995,7 +19007,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     } 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) {
@@ -19003,10 +19015,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
             parent: parentRow
           } = matchMapObj;
           const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
-          const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
+          const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)];
           const parentLevel = parentRest ? parentRest.level : 0;
           newRecords.forEach((item, i) => {
-            const rowid = getRowid(_vm, item);
+            const rowid = getRowid($xeTable, item);
             if (true) {
               if (item[treeOpts.parentField]) {
                 if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
@@ -19039,7 +19051,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           });
           // 源
           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) {
@@ -19055,7 +19067,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           if (true) {
             warnLog('vxe.error.unableInsert');
           }
-          insertTreeRow(_vm, newRecords, true);
+          insertTreeRow($xeTable, newRecords, true);
         }
       } else {
         if (treeConfig) {
@@ -19063,12 +19075,12 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         }
         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 = _vm.findRowIndexOf(afterFullData, row);
+          afIndex = $xeTable.findRowIndexOf(afterFullData, targetRow);
         }
         // 如果是插入指定行的下一行
         if (isInsertNextRow) {
@@ -19078,7 +19090,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           throw new Error(errLog('vxe.error.unableInsert'));
         }
         afterFullData.splice(afIndex, 0, ...newRecords);
-        tableFullData.splice(_vm.findRowIndexOf(tableFullData, row), 0, ...newRecords);
+        tableFullData.splice($xeTable.findRowIndexOf(tableFullData, targetRow), 0, ...newRecords);
         // 刷新单元格合并
         mergeList.forEach(mergeItem => {
           const {
@@ -19101,20 +19113,20 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     const rowid = getRowid($xeTable, newRow);
     insertMaps[rowid] = newRow;
   });
-  _vm.cacheRowMap();
-  _vm.updateScrollYStatus();
-  _vm.handleTableData(treeConfig && transform);
+  $xeTable.cacheRowMap();
+  $xeTable.updateScrollYStatus();
+  $xeTable.handleTableData(treeConfig && transform);
   if (!(treeConfig && transform)) {
-    _vm.updateAfterDataIndex();
+    $xeTable.updateAfterDataIndex();
   }
-  _vm.updateFooter();
-  _vm.checkSelectionStatus();
-  if (_vm.scrollYLoad) {
-    _vm.updateScrollYSpace();
+  $xeTable.updateFooter();
+  $xeTable.checkSelectionStatus();
+  if ($xeTable.scrollYLoad) {
+    $xeTable.updateScrollYSpace();
   }
-  return _vm.$nextTick().then(() => {
-    _vm.updateCellAreas();
-    return _vm.recalculate();
+  return $xeTable.$nextTick().then(() => {
+    $xeTable.updateCellAreas();
+    return $xeTable.recalculate();
   }).then(() => {
     return {
       row: newRecords.length ? newRecords[newRecords.length - 1] : null,
@@ -19122,6 +19134,32 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     };
   });
 }
+function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInsertNextRow) {
+  const props = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  const treeOpts = $xeTable.computeTreeOpts;
+  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($xeTable, 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: []
+  });
+}
 /* harmony default export */ var edit_mixin = ({
   methods: {
     /**
@@ -19138,14 +19176,23 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      * 如果 row 为 -1 则从插入到底部
      * 如果 row 为有效行则插入到该行的位置
      * @param {Object/Array} records 新的数据
-     * @param {Row} row 指定行
+     * @param {Row} targetRow 指定行
      * @returns
      */
-    _insertAt(records, row) {
-      return handleInsertRowAt(this, records, row);
+    _insertAt(records, targetRow) {
+      return handleInsertRowAt(this, records, targetRow);
+    },
+    _insertNextAt(records, targetRow) {
+      return handleInsertRowAt(this, records, targetRow, true);
+    },
+    _insertChild(records, parentRow) {
+      return handleInsertChildRowAt(this, records, parentRow, null);
+    },
+    _insertChildAt(records, parentRow, targetRow) {
+      return handleInsertChildRowAt(this, records, parentRow, targetRow);
     },
-    _insertNextAt(records, row) {
-      return handleInsertRowAt(this, records, row, true);
+    _insertChildNextAt(records, parentRow, targetRow) {
+      return handleInsertChildRowAt(this, records, parentRow, targetRow, true);
     },
     /**
      * 删除指定行数据
@@ -19992,7 +20039,10 @@ function toTableBorder(border) {
 function toBooleanValue(cellValue) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(cellValue) ? cellValue ? 'TRUE' : 'FALSE' : cellValue;
 }
-function getBodyLabelData($xetable, opts, columns, datas) {
+const toStringValue = cellValue => {
+  return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
+};
+function getBodyLabelData($xeTable, opts, columns, datas) {
   const {
     isAllExpand,
     mode
@@ -20003,7 +20053,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
     radioOpts,
     checkboxOpts,
     columnOpts
-  } = $xetable;
+  } = $xeTable;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div');
@@ -20015,13 +20065,13 @@ function getBodyLabelData($xetable, opts, columns, datas) {
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
       const row = item._row || item;
       const parentRow = parent && parent._row ? parent._row : parent;
-      if (isAllExpand || !parentRow || expandMaps.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)) {
-        const hasRowChild = hasTreeChildren($xetable, row);
+      if (isAllExpand || !parentRow || expandMaps.has(parentRow) && $xeTable.isTreeExpandByRow(parentRow)) {
+        const hasRowChild = hasTreeChildren($xeTable, row);
         const item = {
           _row: row,
           _level: nodes.length - 1,
           _hasChild: hasRowChild,
-          _expand: hasRowChild && $xetable.isTreeExpandByRow(row)
+          _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
         };
         columns.forEach((column, $columnIndex) => {
           let cellValue = '';
@@ -20038,7 +20088,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
           }
           if (bodyExportMethod) {
             cellValue = bodyExportMethod({
-              $table: $xetable,
+              $table: $xeTable,
               row,
               column,
               options: opts
@@ -20048,18 +20098,18 @@ function getBodyLabelData($xetable, opts, columns, datas) {
               case 'seq':
                 {
                   const seqValue = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-                  cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
+                  cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
                   break;
                 }
               case 'checkbox':
-                cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
+                cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                 item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
                 item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({
                   row
                 });
                 break;
               case 'radio':
-                cellValue = toBooleanValue($xetable.isCheckedByRadioRow(row));
+                cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                 item._radioLabel = radioOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, radioOpts.labelField) : '';
                 item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({
                   row
@@ -20069,12 +20119,12 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                 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();
                   } else {
-                    const cell = $xetable.getCellElement(row, column);
+                    const cell = $xeTable.getCellElement(row, column);
                     if (cell) {
                       cellValue = cell.innerText.trim();
                     }
@@ -20082,7 +20132,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                 }
             }
           }
-          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));
@@ -20111,7 +20161,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
       }
       if (bodyExportMethod) {
         cellValue = bodyExportMethod({
-          $table: $xetable,
+          $table: $xeTable,
           row,
           column,
           options: opts
@@ -20121,18 +20171,18 @@ function getBodyLabelData($xetable, opts, columns, datas) {
           case 'seq':
             {
               const seqValue = $rowIndex + 1;
-              cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
+              cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
               break;
             }
           case 'checkbox':
-            cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
+            cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
             item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
             item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({
               row
             });
             break;
           case 'radio':
-            cellValue = toBooleanValue($xetable.isCheckedByRadioRow(row));
+            cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
             item._radioLabel = radioOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, radioOpts.labelField) : '';
             item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({
               row
@@ -20142,12 +20192,12 @@ function getBodyLabelData($xetable, opts, columns, datas) {
             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();
               } else {
-                const cell = $xetable.getCellElement(row, column);
+                const cell = $xeTable.getCellElement(row, column);
                 if (cell) {
                   cellValue = cell.innerText.trim();
                 }
@@ -20155,7 +20205,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
             }
         }
       }
-      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;
   });