vxe-table 3.11.8 → 3.11.10

package/es/table/src/footer.js

@@ -298,7 +298,13 @@ export default {
             const { tableHeader, tableBody, tableFooter } = $xeTable.$refs;
             const headerElem = tableHeader ? tableHeader.$el : null;
             const footerElem = tableFooter ? tableFooter.$el : null;
-            const bodyElem = tableBody.$el;
+            if (!footerElem) {
+                return;
+            }
+            const bodyElem = tableBody ? tableBody.$el : null;
+            if (!bodyElem) {
+                return;
+            }
             const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
             const scrollLeft = footerElem.scrollLeft;
             const isRollX = true;

package/es/table/src/methods.js

@@ -676,7 +676,6 @@ const Methods = {
         scrollYStore.endIndex = 1;
         scrollXStore.startIndex = 0;
         scrollXStore.endIndex = 1;
-        editStore.insertList = [];
         editStore.insertMaps = {};
         editStore.removeList = [];
         editStore.removeMaps = {};
@@ -1532,14 +1531,18 @@ const Methods = {
     isInsertByRow(row) {
         const { editStore } = this;
         const rowid = getRowid(this, row);
-        return editStore.insertList.length && editStore.insertMaps[rowid];
+        return !!editStore.insertMaps[rowid];
     },
     /**
      * 删除所有新增的临时数据
      * @returns
      */
     removeInsertRow() {
-        return this.remove(this.editStore.insertList);
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { editStore } = reactData;
+        editStore.insertMaps = {};
+        return $xeTable.remove($xeTable.getInsertRecords());
     },
     /**
      * 检查行或列数据是否发生改变

package/es/table/src/table.js

@@ -327,7 +327,6 @@ export default {
                     row: null,
                     column: null
                 },
-                insertList: [],
                 insertMaps: {},
                 removeList: [],
                 removeMaps: {}

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.8";
+export const version = "3.11.10";
 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.11.8"}`;
+const version = `table v${"3.11.10"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.8";
+const version = "3.11.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2774,7 +2774,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.8"}`;
+const log_version = `table v${"3.11.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5631,7 +5631,6 @@ const Methods = {
     scrollYStore.endIndex = 1;
     scrollXStore.startIndex = 0;
     scrollXStore.endIndex = 1;
-    editStore.insertList = [];
     editStore.insertMaps = {};
     editStore.removeList = [];
     editStore.removeMaps = {};
@@ -6609,14 +6608,20 @@ const Methods = {
       editStore
     } = this;
     const rowid = getRowid(this, row);
-    return editStore.insertList.length && editStore.insertMaps[rowid];
+    return !!editStore.insertMaps[rowid];
   },
   /**
    * 删除所有新增的临时数据
    * @returns
    */
   removeInsertRow() {
-    return this.remove(this.editStore.insertList);
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      editStore
+    } = reactData;
+    editStore.insertMaps = {};
+    return $xeTable.remove($xeTable.getInsertRecords());
   },
   /**
    * 检查行或列数据是否发生改变
@@ -13702,7 +13707,10 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       const scrollBodyElem = this.$el;
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = tableFooter ? tableFooter.$el : null;
-      const bodyElem = tableBody.$el;
+      const bodyElem = tableBody ? tableBody.$el : null;
+      if (!bodyElem) {
+        return;
+      }
       const leftElem = leftBody ? leftBody.$el : null;
       const rightElem = rightBody ? rightBody.$el : null;
       const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
@@ -14663,7 +14671,13 @@ function footer_renderHeads(h, _vm, footerTableData) {
       } = $xeTable.$refs;
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = tableFooter ? tableFooter.$el : null;
-      const bodyElem = tableBody.$el;
+      if (!footerElem) {
+        return;
+      }
+      const bodyElem = tableBody ? tableBody.$el : null;
+      if (!bodyElem) {
+        return;
+      }
       const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
       const scrollLeft = footerElem.scrollLeft;
       const isRollX = true;
@@ -17748,17 +17762,25 @@ function insertTreeRow(_vm, newRecords, isAppend) {
   });
 }
 function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
+  const $xeTable = _vm;
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
   const {
-    tableFullTreeData,
     mergeList,
+    editStore
+  } = reactData;
+  const {
+    tableFullTreeData,
     afterFullData,
-    editStore,
     tableFullData,
-    treeConfig,
     fullDataRowIdData,
-    fullAllDataRowIdData,
-    treeOpts
-  } = _vm;
+    fullAllDataRowIdData
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
   const {
     transform,
     rowField,
@@ -17777,8 +17799,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     if (treeConfig && transform) {
       insertTreeRow(_vm, newRecords, false);
     } else {
-      afterFullData.unshift(...newRecords);
-      tableFullData.unshift(...newRecords);
+      newRecords.forEach(item => {
+        const rowid = getRowid($xeTable, item);
+        const rest = {
+          row: item,
+          rowid,
+          seq: -1,
+          index: -1,
+          _index: -1,
+          $index: -1,
+          items: afterFullData,
+          parent: null,
+          level: 0,
+          height: 0
+        };
+        fullDataRowIdData[rowid] = rest;
+        fullAllDataRowIdData[rowid] = rest;
+        afterFullData.push(item);
+        tableFullData.push(item);
+      });
       // 刷新单元格合并
       mergeList.forEach(mergeItem => {
         const {
@@ -17795,8 +17834,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       if (treeConfig && transform) {
         insertTreeRow(_vm, newRecords, true);
       } else {
-        afterFullData.push(...newRecords);
-        tableFullData.push(...newRecords);
+        newRecords.forEach(item => {
+          const rowid = getRowid($xeTable, item);
+          const rest = {
+            row: item,
+            rowid,
+            seq: -1,
+            index: -1,
+            _index: -1,
+            $index: -1,
+            items: afterFullData,
+            parent: null,
+            level: 0,
+            height: 0
+          };
+          fullDataRowIdData[rowid] = rest;
+          fullAllDataRowIdData[rowid] = rest;
+          afterFullData.push(item);
+          tableFullData.push(item);
+        });
         // 刷新单元格合并
         mergeList.forEach(mergeItem => {
           const {
@@ -17911,14 +17967,12 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     }
   }
   const {
-    insertList,
     insertMaps
   } = editStore;
   newRecords.forEach(newRow => {
-    const rowid = getRowid(_vm, newRow);
+    const rowid = getRowid($xeTable, newRow);
     insertMaps[rowid] = newRow;
   });
-  insertList.unshift(...newRecords);
   _vm.cacheRowMap();
   _vm.updateScrollYStatus();
   _vm.handleTableData(treeConfig && transform);
@@ -17972,18 +18026,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      * 如果为空则删除所有
      */
     _remove(rows) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        treeConfig
+      } = props;
       const {
-        afterFullData,
-        tableFullData,
-        tableFullTreeData,
-        treeConfig,
         mergeList,
         editStore,
-        checkboxOpts,
-        selectCheckboxMaps,
-        isInsertByRow,
-        treeOpts
-      } = this;
+        selectCheckboxMaps
+      } = reactData;
+      const {
+        tableFullTreeData,
+        afterFullData,
+        tableFullData
+      } = internalData;
+      const checkboxOpts = $xeTable.computeCheckboxOpts;
+      const treeOpts = $xeTable.computeTreeOpts;
       const {
         transform,
         mapChildrenField
@@ -17992,7 +18053,6 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       const {
         actived,
         removeList,
-        insertList,
         insertMaps
       } = editStore;
       const {
@@ -18006,7 +18066,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
       // 如果是新增，则保存记录
       rows.forEach(row => {
-        if (!isInsertByRow(row)) {
+        if (!$xeTable.isInsertByRow(row)) {
           removeList.push(row);
         }
       });
@@ -18079,27 +18139,25 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         }
       }
       // 如果当前行被激活编辑，则清除激活状态
-      if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
-        this.clearEdit();
+      if (actived.row && $xeTable.findRowIndexOf(rows, actived.row) > -1) {
+        $xeTable.clearEdit();
       }
       // 从新增中移除已删除的数据
       rows.forEach(row => {
-        const rowid = getRowid(this, row);
-        const iIndex = this.findRowIndexOf(insertList, row);
-        if (iIndex > -1) {
-          insertList.splice(iIndex, 1);
+        const rowid = getRowid($xeTable, row);
+        if (insertMaps[rowid]) {
+          delete insertMaps[rowid];
         }
-        delete insertMaps[rowid];
       });
-      this.handleTableData(treeConfig && transform);
+      $xeTable.updateFooter();
+      $xeTable.cacheRowMap();
+      $xeTable.handleTableData(treeConfig && transform);
       if (!(treeConfig && transform)) {
-        this.updateAfterDataIndex();
+        $xeTable.updateAfterDataIndex();
       }
-      this.updateFooter();
-      this.cacheRowMap();
-      this.checkSelectionStatus();
-      if (this.scrollYLoad) {
-        this.updateScrollYSpace();
+      $xeTable.checkSelectionStatus();
+      if (reactData.scrollYLoad) {
+        $xeTable.updateScrollYSpace();
       }
       return this.$nextTick().then(() => {
         this.updateCellAreas();
@@ -18162,13 +18220,20 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      * 获取新增的临时数据
      */
     _getInsertRecords() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        editStore
+      } = reactData;
       const {
         fullAllDataRowIdData
-      } = this;
-      const insertList = this.editStore.insertList;
+      } = internalData;
+      const {
+        insertMaps
+      } = editStore;
       const insertRecords = [];
-      insertList.forEach(row => {
-        const rowid = getRowid(this, row);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(insertMaps, (row, rowid) => {
         if (fullAllDataRowIdData[rowid]) {
           insertRecords.push(row);
         }
@@ -22170,7 +22235,6 @@ function handleUupdateResize(_vm) {
           row: null,
           column: null
         },
-        insertList: [],
         insertMaps: {},
         removeList: [],
         removeMaps: {}