vxe-table 3.13.20 → 3.13.22

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.20";
+const version = "3.13.22";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.20"}`;
+const log_version = `table v${"3.13.22"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -9097,24 +9097,26 @@ const Methods = {
     reactData.treeExpandedMaps = treeTempExpandedMaps;
   },
   cacheSourceMap(fullData) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const treeOpts = $xeTable.computeTreeOpts;
     let {
-      treeConfig,
-      treeOpts,
       sourceDataRowIdData
-    } = this;
+    } = internalData;
     const sourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
-    const rowkey = getRowkey(this);
-    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    const rowkey = getRowkey($xeTable);
+    sourceDataRowIdData = internalData.sourceDataRowIdData = {};
     const handleSourceRow = row => {
-      let rowid = getRowid(this, row);
+      let rowid = getRowid($xeTable, row);
       if (eqEmptyValue(rowid)) {
         rowid = getRowUniqueId();
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
       }
-      sourceDataRowIdData[rowid] = {
-        row,
-        rowid
-      };
+      sourceDataRowIdData[rowid] = row;
     };
     // 源数据缓存
     if (treeConfig) {
@@ -9125,7 +9127,7 @@ const Methods = {
     } else {
       sourceData.forEach(handleSourceRow);
     }
-    this.tableSourceData = sourceData;
+    internalData.tableSourceData = sourceData;
   },
   getParams() {
     return this.params;
@@ -9503,6 +9505,9 @@ const Methods = {
       keepSource,
       treeConfig
     } = props;
+    const {
+      editStore
+    } = reactData;
     const {
       fullAllDataRowIdData,
       fullDataRowIdData,
@@ -9511,6 +9516,9 @@ const Methods = {
       tableFullData,
       afterFullData
     } = internalData;
+    const removeTempMaps = {
+      ...editStore.removeMaps
+    };
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform
@@ -9545,6 +9553,7 @@ const Methods = {
                 external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
               }
               if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                delete removeTempMaps[rowid];
                 tableFullData.unshift(row);
                 afterFullData.unshift(row);
                 reDelFlag = true;
@@ -9556,6 +9565,7 @@ const Methods = {
     }
     if (rows) {
       if (reDelFlag) {
+        editStore.removeMaps = removeTempMaps;
         $xeTable.updateFooter();
         $xeTable.cacheRowMap(false);
         $xeTable.handleTableData(treeConfig && transform);
@@ -11923,8 +11933,9 @@ const Methods = {
             // 如果按下了方向键
             if (selected.row && selected.column) {
               this.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-            } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-              // 当前行按键上下移动
+            }
+            // 当前行按键上下移动
+            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               this.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
           }
@@ -25202,15 +25213,22 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
     },
     // 处理当前行方向键移动
     moveCurrentRow(isUpArrow, isDwArrow, evnt) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        treeConfig
+      } = props;
+      const {
+        currentRow
+      } = reactData;
       const {
-        currentRow,
-        treeConfig,
-        treeOpts,
         afterFullData
-      } = this;
+      } = internalData;
+      const treeOpts = $xeTable.computeTreeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let targetRow;
-      evnt.preventDefault();
       if (currentRow) {
         if (treeConfig) {
           const {
@@ -25225,7 +25243,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
             targetRow = items[index + 1];
           }
         } else {
-          const _rowIndex = this.getVTRowIndex(currentRow);
+          const _rowIndex = $xeTable.getVTRowIndex(currentRow);
           if (isUpArrow && _rowIndex > 0) {
             targetRow = afterFullData[_rowIndex - 1];
           } else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
@@ -25236,11 +25254,47 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         targetRow = afterFullData[0];
       }
       if (targetRow) {
+        evnt.preventDefault();
         const params = {
-          $table: this,
-          row: targetRow
+          $table: $xeTable,
+          row: targetRow,
+          rowIndex: $xeTable.getRowIndex(targetRow),
+          $rowIndex: $xeTable.getVMRowIndex(targetRow)
         };
-        this.scrollToRow(targetRow).then(() => this.triggerCurrentRowEvent(evnt, params));
+        $xeTable.scrollToRow(targetRow).then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
+      }
+    },
+    // 处理当前列方向键移动
+    moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        currentColumn
+      } = reactData;
+      const {
+        visibleColumn
+      } = internalData;
+      let targetCol = null;
+      if (currentColumn) {
+        const _columnIndex = $xeTable.getVTColumnIndex(currentColumn);
+        if (isLeftArrow && _columnIndex > 0) {
+          targetCol = visibleColumn[_columnIndex - 1];
+        } else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+          targetCol = visibleColumn[_columnIndex + 1];
+        }
+      } else {
+        targetCol = visibleColumn[0];
+      }
+      if (targetCol) {
+        evnt.preventDefault();
+        const params = {
+          $table: $xeTable,
+          column: targetCol,
+          columnIndex: $xeTable.getColumnIndex(targetCol),
+          $columnIndex: $xeTable.getVMColumnIndex(targetCol)
+        };
+        $xeTable.scrollToColumn(targetCol).then(() => $xeTable.triggerCurrentColumnEvent(evnt, params));
       }
     },
     // 处理可编辑方向键移动
@@ -29259,6 +29313,24 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
   }
   return null;
 }
+const getConfigSlot = ($xeGrid, slotConfigs) => {
+  const slots = $xeGrid.$scopedSlots;
+  const slotConf = {};
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectMap(slotConfigs, (slotFunc, slotKey) => {
+    if (slotFunc) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(slotFunc)) {
+        if (slots[slotFunc]) {
+          slotConf[slotKey] = slots[slotFunc];
+        } else {
+          errLog('vxe.error.notSlot', [slotFunc]);
+        }
+      } else {
+        slotConf[slotKey] = slotFunc;
+      }
+    }
+  });
+  return slotConf;
+};
 function getToolbarSlots(_vm) {
   const {
     $scopedSlots,
@@ -29288,26 +29360,6 @@ function getToolbarSlots(_vm) {
   }
   return slots;
 }
-function getPagerSlots(_vm) {
-  const {
-    pagerOpts
-  } = _vm;
-  const pagerOptSlots = pagerOpts.slots;
-  const slots = {};
-  let leftSlot;
-  let rightSlot;
-  if (pagerOptSlots) {
-    leftSlot = getFuncSlot(_vm, pagerOptSlots, 'left');
-    rightSlot = getFuncSlot(_vm, pagerOptSlots, 'right');
-    if (leftSlot) {
-      slots.left = leftSlot;
-    }
-    if (rightSlot) {
-      slots.right = rightSlot;
-    }
-  }
-  return slots;
-}
 function getTableOns(_vm) {
   const {
     $listeners,
@@ -29330,6 +29382,30 @@ function getTableOns(_vm) {
   }
   return ons;
 }
+function pageChangeEvent($xeGrid, params) {
+  const props = $xeGrid;
+  const reactData = $xeGrid;
+  const {
+    proxyConfig
+  } = props;
+  const {
+    tablePage
+  } = reactData;
+  const {
+    $event,
+    currentPage,
+    pageSize
+  } = params;
+  const proxyOpts = $xeGrid.computeProxyOpts;
+  tablePage.currentPage = currentPage;
+  tablePage.pageSize = pageSize;
+  $xeGrid.dispatchEvent('page-change', params, $event);
+  if (proxyConfig && isEnableConf(proxyOpts)) {
+    $xeGrid.commitProxy('query').then(rest => {
+      $xeGrid.dispatchEvent('proxy-query', rest, $event);
+    });
+  }
+}
 /**
  * 渲染表单
  */
@@ -29467,32 +29543,34 @@ function renderBottom(h, _vm) {
 function renderPager(h, $xeGrid) {
   const VxeUIPagerComponent = core_.VxeUI.getComponent('VxePager');
   const props = $xeGrid;
+  const slots = $xeGrid.$scopedSlots;
+  const reactData = $xeGrid;
   const {
-    pagerConfig,
-    proxyConfig
+    proxyConfig,
+    pagerConfig
   } = props;
-  const {
-    $scopedSlots,
-    tablePage
-  } = $xeGrid;
-  const pagerSlot = $scopedSlots.pager;
-  const hasPager = !!(pagerSlot || isEnableConf(pagerConfig));
-  if (hasPager) {
+  const proxyOpts = $xeGrid.computeProxyOpts;
+  const pagerOpts = $xeGrid.computePagerOpts;
+  const pagerSlot = slots.pager;
+  if (pagerConfig && isEnableConf(pagerOpts) || slots.pager) {
     return h('div', {
-      key: 'pager',
       ref: 'refPagerWrapper',
+      key: 'pager',
       class: 'vxe-grid--pager-wrapper'
     }, pagerSlot ? pagerSlot.call($xeGrid, {
       $grid: $xeGrid
-    }, h) : [VxeUIPagerComponent ? h(VxeUIPagerComponent, {
+    }) : [VxeUIPagerComponent ? h(VxeUIPagerComponent, {
+      ref: 'refPager',
       props: {
-        ...$xeGrid.pagerOpts,
-        ...(proxyConfig ? tablePage : {})
+        ...pagerOpts,
+        ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})
       },
       on: {
-        'page-change': $xeGrid.pageChangeEvent
+        'page-change'(params) {
+          pageChangeEvent($xeGrid, params);
+        }
       },
-      scopedSlots: getPagerSlots($xeGrid)
+      scopedSlots: getConfigSlot($xeGrid, pagerOpts.slots)
     }) : grid_renderEmptyElement($xeGrid)]);
   }
   return grid_renderEmptyElement($xeGrid);
@@ -29855,20 +29933,25 @@ Object.keys(table.methods).forEach(name => {
         isZMax
       } = reactData;
       const el = $xeGrid.$refs.refElem;
-      const formWrapper = $xeGrid.$refs.refFormWrapper;
-      const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
-      const topWrapper = $xeGrid.$refs.refTopWrapper;
-      const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
-      const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
-      const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
-      return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+      if (el) {
+        const formWrapper = $xeGrid.$refs.refFormWrapper;
+        const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
+        const topWrapper = $xeGrid.$refs.refTopWrapper;
+        const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
+        const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
+        const parentEl = el.parentElement;
+        const parentPaddingSize = isZMax ? 0 : parentEl ? getPaddingTopBottomSize(parentEl) : 0;
+        return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+      }
+      return 0;
     },
     getParentHeight() {
       const $xeGrid = this;
       const reactData = $xeGrid;
       const el = $xeGrid.$refs.refElem;
       if (el) {
-        return (reactData.isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - $xeGrid.getExcludeHeight();
+        const parentEl = el.parentElement;
+        return (reactData.isZMax ? getDomNode().visibleHeight : parentEl ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentEl).height) : 0) - $xeGrid.getExcludeHeight();
       }
       return 0;
     },
@@ -30510,30 +30593,6 @@ Object.keys(table.methods).forEach(name => {
         }
       }
     },
-    pageChangeEvent(params) {
-      const {
-        proxyConfig,
-        tablePage
-      } = this;
-      const {
-        currentPage,
-        pageSize
-      } = params;
-      tablePage.currentPage = currentPage;
-      tablePage.pageSize = pageSize;
-      this.$emit('page-change', Object.assign({
-        $grid: this
-      }, params));
-      if (proxyConfig) {
-        this.commitProxy('query').then(rest => {
-          this.$emit('proxy-query', {
-            ...rest,
-            $grid: this,
-            $event: params.$event
-          });
-        });
-      }
-    },
     sortChangeEvent(params) {
       const {
         $table,