vxe-table 4.5.1 → 4.5.3

package/lib/index.umd.js

@@ -2277,7 +2277,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.5.0"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.5.2"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -3400,8 +3400,8 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
     ons[getOnName(key)] = function (...args) {
       if (true) {
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(key)) {
-          errLog('vxe.error.errFunc', [key]);
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
+          errLog('vxe.error.errFunc', [func]);
         }
       }
       func(params, ...args);
@@ -4271,7 +4271,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.5.0",
+  version: "4.5.2",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -5627,10 +5627,15 @@ const editHook = {
           const parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
           const parentLevel = parentRest ? parentRest.level : 0;
           let parentChilds = parentRow[childrenField];
+          let mapChilds = parentRow[mapChildrenField];
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
             parentChilds = parentRow[childrenField] = [];
           }
+          if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(mapChilds)) {
+            mapChilds = parentRow[childrenField] = [];
+          }
           parentChilds[funcName](item);
+          mapChilds[funcName](item);
           const rest = {
             row: item,
             rowid,
@@ -5668,190 +5673,222 @@ const editHook = {
         }
       });
     }
-    editMethods = {
-      /**
-       * 往表格中插入临时数据
-       *
-       * @param {*} records
-       */
-      insert(records) {
-        return editMethods.insertAt(records, null);
-      },
-      /**
-       * 往表格指定行中插入临时数据
-       * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
-       * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
-       * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
-       * @param {Object/Array} records 新的数据
-       * @param {Row} row 指定行
-       */
-      insertAt(records, row) {
-        const {
-          treeConfig
-        } = props;
-        const {
-          mergeList,
-          editStore
-        } = reactData;
-        const {
-          tableFullTreeData,
-          afterFullData,
-          tableFullData,
-          fullDataRowIdData,
-          fullAllDataRowIdData
-        } = internalData;
-        const treeOpts = computeTreeOpts.value;
-        const {
-          transform,
-          rowField,
-          mapChildrenField
-        } = treeOpts;
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
-          records = [records];
+    const handleInsertRowAt = (records, row, isInsertNextRow) => {
+      const {
+        treeConfig
+      } = props;
+      const {
+        mergeList,
+        editStore
+      } = reactData;
+      const {
+        tableFullTreeData,
+        afterFullData,
+        tableFullData,
+        fullDataRowIdData,
+        fullAllDataRowIdData
+      } = internalData;
+      const treeOpts = computeTreeOpts.value;
+      const {
+        transform,
+        rowField,
+        mapChildrenField
+      } = treeOpts;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
+        records = [records];
+      }
+      const newRecords = $xetable.defineField(records.map(record => Object.assign(treeConfig && transform ? {
+        [mapChildrenField]: [],
+        [childrenField]: []
+      } : {}, record)));
+      if (!row) {
+        // 如果为虚拟树
+        if (treeConfig && transform) {
+          insertTreeRow(newRecords, false);
+        } else {
+          afterFullData.unshift(...newRecords);
+          tableFullData.unshift(...newRecords);
+          // 刷新单元格合并
+          mergeList.forEach(mergeItem => {
+            const {
+              row: mergeRowIndex
+            } = mergeItem;
+            if (mergeRowIndex > 0) {
+              mergeItem.row = mergeRowIndex + newRecords.length;
+            }
+          });
         }
-        const newRecords = $xetable.defineField(records.map(record => Object.assign({}, record)));
-        if (!row) {
+      } else {
+        if (row === -1) {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            insertTreeRow(newRecords, false);
+            insertTreeRow(newRecords, true);
           } else {
-            afterFullData.unshift(...newRecords);
-            tableFullData.unshift(...newRecords);
+            afterFullData.push(...newRecords);
+            tableFullData.push(...newRecords);
             // 刷新单元格合并
             mergeList.forEach(mergeItem => {
               const {
-                row: mergeRowIndex
+                row: mergeRowIndex,
+                rowspan: mergeRowspan
               } = mergeItem;
-              if (mergeRowIndex > 0) {
-                mergeItem.row = mergeRowIndex + newRecords.length;
+              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+                mergeItem.rowspan = mergeRowspan + newRecords.length;
               }
             });
           }
         } else {
-          if (row === -1) {
-            // 如果为虚拟树
-            if (treeConfig && transform) {
-              insertTreeRow(newRecords, true);
-            } else {
-              afterFullData.push(...newRecords);
-              tableFullData.push(...newRecords);
-              // 刷新单元格合并
-              mergeList.forEach(mergeItem => {
-                const {
-                  row: mergeRowIndex,
-                  rowspan: mergeRowspan
-                } = mergeItem;
-                if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                  mergeItem.rowspan = mergeRowspan + newRecords.length;
-                }
-              });
-            }
-          } else {
-            // 如果为虚拟树
-            if (treeConfig && transform) {
-              const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => row[rowField] === item[rowField], {
-                children: mapChildrenField
-              });
-              if (matchObj) {
-                const {
-                  parent: parentRow
-                } = matchObj;
-                const parentChilds = matchObj.items;
-                const parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
-                const parentLevel = parentRest ? parentRest.level : 0;
-                newRecords.forEach((item, i) => {
-                  const rowid = getRowid($xetable, item);
-                  if (true) {
-                    if (item[treeOpts.parentField]) {
-                      if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                        errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                      }
+          // 如果为虚拟树
+          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], {
+              children: mapChildrenField
+            });
+            if (matchMapObj) {
+              const {
+                parent: parentRow
+              } = matchMapObj;
+              const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
+              const parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
+              const parentLevel = parentRest ? parentRest.level : 0;
+              newRecords.forEach((item, i) => {
+                const rowid = getRowid($xetable, item);
+                if (true) {
+                  if (item[treeOpts.parentField]) {
+                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                      errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
                     }
                   }
-                  if (parentRow) {
-                    item[treeOpts.parentField] = parentRow[rowField];
-                  }
-                  parentChilds.splice(matchObj.index + i, 0, item);
-                  const rest = {
-                    row: item,
-                    rowid,
-                    seq: -1,
-                    index: -1,
-                    _index: -1,
-                    $index: -1,
-                    items: parentChilds,
-                    parent: parentRow,
-                    level: parentLevel + 1
-                  };
-                  fullDataRowIdData[rowid] = rest;
-                  fullAllDataRowIdData[rowid] = rest;
+                }
+                if (parentRow) {
+                  item[treeOpts.parentField] = parentRow[rowField];
+                }
+                let targetIndex = matchMapObj.index + i;
+                if (isInsertNextRow) {
+                  targetIndex = targetIndex + 1;
+                }
+                parentMapChilds.splice(targetIndex, 0, item);
+                const rest = {
+                  row: item,
+                  rowid,
+                  seq: -1,
+                  index: -1,
+                  _index: -1,
+                  $index: -1,
+                  items: parentMapChilds,
+                  parent: parentRow,
+                  level: parentLevel + 1
+                };
+                fullDataRowIdData[rowid] = rest;
+                fullAllDataRowIdData[rowid] = rest;
+              });
+              // 源
+              if (parentRow) {
+                const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => row[rowField] === item[rowField], {
+                  children: childrenField
                 });
-              } else {
-                if (true) {
-                  warnLog('vxe.error.unableInsert');
+                if (matchObj) {
+                  const parentChilds = matchObj.items;
+                  let targetIndex = matchObj.index;
+                  if (isInsertNextRow) {
+                    targetIndex = targetIndex + 1;
+                  }
+                  parentChilds.splice(targetIndex, 0, ...newRecords);
                 }
-                insertTreeRow(newRecords, true);
               }
             } else {
-              if (treeConfig) {
-                throw new Error(getLog('vxe.error.noTree', ['insert']));
-              }
-              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;
-                }
-              } else {
-                afIndex = $xetable.findRowIndexOf(afterFullData, row);
+              if (true) {
+                warnLog('vxe.error.unableInsert');
               }
-              if (afIndex === -1) {
-                throw new Error(errLog('vxe.error.unableInsert'));
+              insertTreeRow(newRecords, true);
+            }
+          } else {
+            if (treeConfig) {
+              throw new Error(getLog('vxe.error.noTree', ['insert']));
+            }
+            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;
               }
-              afterFullData.splice(afIndex, 0, ...newRecords);
-              tableFullData.splice($xetable.findRowIndexOf(tableFullData, row), 0, ...newRecords);
-              // 刷新单元格合并
-              mergeList.forEach(mergeItem => {
-                const {
-                  row: mergeRowIndex,
-                  rowspan: mergeRowspan
-                } = mergeItem;
-                if (mergeRowIndex > afIndex) {
-                  mergeItem.row = mergeRowIndex + newRecords.length;
-                } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                  mergeItem.rowspan = mergeRowspan + newRecords.length;
-                }
-              });
+            } else {
+              afIndex = $xetable.findRowIndexOf(afterFullData, row);
+            }
+            // 如果是插入指定行的下一行
+            if (isInsertNextRow) {
+              afIndex = Math.max(afterFullData.length, afIndex + 1);
+            }
+            if (afIndex === -1) {
+              throw new Error(errLog('vxe.error.unableInsert'));
             }
+            afterFullData.splice(afIndex, 0, ...newRecords);
+            tableFullData.splice($xetable.findRowIndexOf(tableFullData, row), 0, ...newRecords);
+            // 刷新单元格合并
+            mergeList.forEach(mergeItem => {
+              const {
+                row: mergeRowIndex,
+                rowspan: mergeRowspan
+              } = mergeItem;
+              if (mergeRowIndex > afIndex) {
+                mergeItem.row = mergeRowIndex + newRecords.length;
+              } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                mergeItem.rowspan = mergeRowspan + newRecords.length;
+              }
+            });
           }
         }
-        const {
-          insertMaps
-        } = editStore;
-        newRecords.forEach(newRow => {
-          const rowid = getRowid($xetable, newRow);
-          insertMaps[rowid] = newRow;
-        });
-        $xetable.cacheRowMap();
-        $xetable.updateScrollYStatus();
-        $xetable.handleTableData(treeConfig && transform);
-        if (!(treeConfig && transform)) {
-          $xetable.updateAfterDataIndex();
-        }
-        $xetable.updateFooter();
-        $xetable.checkSelectionStatus();
-        if (reactData.scrollYLoad) {
-          $xetable.updateScrollYSpace();
-        }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
-          $xetable.updateCellAreas();
-          return $xetable.recalculate();
-        }).then(() => {
-          return {
-            row: newRecords.length ? newRecords[newRecords.length - 1] : null,
-            rows: newRecords
-          };
-        });
+      }
+      const {
+        insertMaps
+      } = editStore;
+      newRecords.forEach(newRow => {
+        const rowid = getRowid($xetable, newRow);
+        insertMaps[rowid] = newRow;
+      });
+      $xetable.cacheRowMap();
+      $xetable.updateScrollYStatus();
+      $xetable.handleTableData(treeConfig && transform);
+      if (!(treeConfig && transform)) {
+        $xetable.updateAfterDataIndex();
+      }
+      $xetable.updateFooter();
+      $xetable.checkSelectionStatus();
+      if (reactData.scrollYLoad) {
+        $xetable.updateScrollYSpace();
+      }
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+        $xetable.updateCellAreas();
+        return $xetable.recalculate();
+      }).then(() => {
+        return {
+          row: newRecords.length ? newRecords[newRecords.length - 1] : null,
+          rows: newRecords
+        };
+      });
+    };
+    editMethods = {
+      /**
+       * 往表格中插入临时数据
+       *
+       * @param {*} records
+       */
+      insert(records) {
+        return handleInsertRowAt(records, null);
+      },
+      /**
+       * 往表格指定行中插入临时数据
+       * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+       * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+       * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
+       * @param {Object/Array} records 新的数据
+       * @param {Row} row 指定行
+       */
+      insertAt(records, row) {
+        return handleInsertRowAt(records, row);
+      },
+      insertNextAt(records, row) {
+        return handleInsertRowAt(records, row, true);
       },
       /**
        * 删除指定行数据
@@ -5876,8 +5913,10 @@ const editHook = {
         const checkboxOpts = computeCheckboxOpts.value;
         const treeOpts = computeTreeOpts.value;
         const {
-          transform
+          transform,
+          mapChildrenField
         } = treeOpts;
+        const childrenField = treeOpts.children || treeOpts.childrenField;
         const {
           actived,
           removeMaps,
@@ -5886,7 +5925,7 @@ const editHook = {
         const {
           checkField
         } = checkboxOpts;
-        let rest = [];
+        let delList = [];
         if (!rows) {
           rows = tableFullData;
         } else if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
@@ -5914,7 +5953,7 @@ const editHook = {
         }
         // 从数据源中移除
         if (tableFullData === rows) {
-          rows = rest = tableFullData.slice(0);
+          rows = delList = tableFullData.slice(0);
           internalData.tableFullData = [];
           internalData.afterFullData = [];
           $xetable.clearMergeCells();
@@ -5923,10 +5962,18 @@ const editHook = {
           if (treeConfig && transform) {
             rows.forEach(row => {
               const rowid = getRowid($xetable, row);
-              const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => rowid === getRowid($xetable, item), treeOpts);
+              const matchMapObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => rowid === getRowid($xetable, item), {
+                children: mapChildrenField
+              });
+              if (matchMapObj) {
+                const rItems = matchMapObj.items.splice(matchMapObj.index, 1);
+                delList.push(rItems[0]);
+              }
+              const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, item => rowid === getRowid($xetable, item), {
+                children: childrenField
+              });
               if (matchObj) {
-                const rItems = matchObj.items.splice(matchObj.index, 1);
-                rest.push(rItems[0]);
+                matchObj.items.splice(matchObj.index, 1);
               }
               const afIndex = $xetable.findRowIndexOf(afterFullData, row);
               if (afIndex > -1) {
@@ -5938,7 +5985,7 @@ const editHook = {
               const tfIndex = $xetable.findRowIndexOf(tableFullData, row);
               if (tfIndex > -1) {
                 const rItems = tableFullData.splice(tfIndex, 1);
-                rest.push(rItems[0]);
+                delList.push(rItems[0]);
               }
               const afIndex = $xetable.findRowIndexOf(afterFullData, row);
               if (afIndex > -1) {
@@ -5985,8 +6032,8 @@ const editHook = {
           return $xetable.recalculate();
         }).then(() => {
           return {
-            row: rest.length ? rest[rest.length - 1] : null,
-            rows: rest
+            row: delList.length ? delList[delList.length - 1] : null,
+            rows: delList
           };
         });
       },