vxe-table 3.19.0 → 3.19.1

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.0";
+const version = "3.19.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2695,7 +2695,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.0"}`;
+const log_version = `table v${"3.19.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3568,29 +3568,23 @@ function getRefElem(refEl) {
   }
   return null;
 }
-function clearTableDefaultStatus(_vm) {
-  _vm.initStatus = false;
-  _vm.clearSort();
-  _vm.clearCurrentRow();
-  _vm.clearCurrentColumn();
-  _vm.clearRadioRow();
-  _vm.clearRadioReserve();
-  _vm.clearCheckboxRow();
-  _vm.clearCheckboxReserve();
-  _vm.clearRowExpand();
-  _vm.clearTreeExpand();
-  _vm.clearTreeExpandReserve();
-  if (_vm.clearEdit) {
-    _vm.clearEdit();
-  }
-  if (_vm.clearSelected && (_vm.keyboardConfig || _vm.mouseConfig)) {
-    _vm.clearSelected();
-  }
-  if (_vm.clearCellAreas && _vm.mouseConfig) {
-    _vm.clearCellAreas();
-    _vm.clearCopyCellArea();
-  }
-  return _vm.clearScroll();
+function clearTableDefaultStatus($xeTable) {
+  const props = $xeTable;
+  const internalData = $xeTable;
+  internalData.initStatus = false;
+  const actionList = [$xeTable.clearSort(), $xeTable.clearCurrentRow(), $xeTable.clearCurrentColumn(), $xeTable.clearRadioRow(), $xeTable.clearRadioReserve(), $xeTable.clearCheckboxRow(), $xeTable.clearCheckboxReserve(), $xeTable.clearRowExpand(), $xeTable.clearTreeExpand(), $xeTable.clearTreeExpandReserve(), $xeTable.clearPendingRow()];
+  if ($xeTable.clearFilter) {
+    actionList.push($xeTable.clearFilter());
+  }
+  if ($xeTable.clearSelected && (props.keyboardConfig || props.mouseConfig)) {
+    actionList.push($xeTable.clearSelected());
+  }
+  if ($xeTable.clearCellAreas && props.mouseConfig) {
+    actionList.push($xeTable.clearCellAreas(), $xeTable.clearCopyCellArea());
+  }
+  return Promise.all(actionList).then(() => {
+    return $xeTable.clearScroll();
+  });
 }
 function clearTableAllStatus(_vm) {
   if (_vm.clearFilter) {
@@ -7212,7 +7206,7 @@ function updateStyle($xeTable) {
   } = internalData;
   const $xeGanttView = internalData.xeGanttView;
   const el = $xeTable.$refs.refElem;
-  if (!el || !el.clientHeight) {
+  if (!el || internalData.tBodyHeight && !el.clientHeight) {
     return;
   }
   const containerList = ['main', 'left', 'right'];
@@ -8716,7 +8710,8 @@ function calcTableHeight($xeTable, key) {
   const props = $xeTable;
   const reactData = $xeTable;
   const {
-    editConfig
+    editConfig,
+    editRules
   } = props;
   const {
     parentHeight
@@ -8727,7 +8722,7 @@ function calcTableHeight($xeTable, key) {
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val)) {
       if (eqEmptyValue(defMinHeight)) {
         // 编辑模式默认最小高度
-        if (isEnableConf(editConfig)) {
+        if (editRules && isEnableConf(editConfig)) {
           val = 144;
         }
       } else {
@@ -18204,22 +18199,51 @@ const Methods = {
    * 获取表格的滚动状态
    */
   getScroll() {
+    const $xeTable = this;
+    return $xeTable.getScrollData();
+  },
+  /**
+   * 获取表格的滚动数据
+   */
+  getScrollData() {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       scrollXLoad,
-      scrollYLoad
+      scrollYLoad,
+      scrollbarHeight,
+      scrollbarWidth
     } = reactData;
     const {
       elemStore
     } = internalData;
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    const scrollTop = bodyScrollElem ? bodyScrollElem.scrollTop : 0;
+    const scrollLeft = bodyScrollElem ? bodyScrollElem.scrollLeft : 0;
+    const clientHeight = bodyScrollElem ? bodyScrollElem.clientHeight : 0;
+    const clientWidth = bodyScrollElem ? bodyScrollElem.clientWidth : 0;
+    const scrollHeight = bodyScrollElem ? bodyScrollElem.scrollHeight : 0;
+    const scrollWidth = bodyScrollElem ? bodyScrollElem.scrollWidth : 0;
+    const isTop = scrollTop <= 0;
+    const isBottom = scrollTop + clientHeight >= scrollHeight;
+    const isLeft = scrollLeft <= 0;
+    const isRight = scrollLeft + clientWidth >= scrollWidth;
     return {
       virtualX: scrollXLoad,
       virtualY: scrollYLoad,
-      scrollTop: bodyScrollElem ? bodyScrollElem.scrollTop : 0,
-      scrollLeft: bodyScrollElem ? bodyScrollElem.scrollLeft : 0
+      isTop,
+      isBottom,
+      isLeft,
+      isRight,
+      scrollbarHeight,
+      scrollbarWidth,
+      scrollTop,
+      scrollLeft,
+      scrollHeight,
+      scrollWidth,
+      clientHeight,
+      clientWidth
     };
   },
   handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
@@ -18577,15 +18601,14 @@ const Methods = {
     } = reactData;
     const leftFixedWidth = $xeTable.computeLeftFixedWidth;
     const rightFixedWidth = $xeTable.computeRightFixedWidth;
-    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
-      return;
-    }
     const {
       elemStore,
       lastScrollTop,
       lastScrollLeft
     } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
+    const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
+    const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
@@ -18594,12 +18617,6 @@ const Methods = {
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
     const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
     const rowExpandEl = $xeTable.$refs.refRowExpandElem;
-    if (!xHandleEl) {
-      return;
-    }
-    if (!yHandleEl) {
-      return;
-    }
     if (!bodyScrollElem) {
       return;
     }
@@ -18612,13 +18629,28 @@ const Methods = {
     const scrollLeft = currScrollLeft + deltaLeft;
     const isRollX = scrollLeft !== lastScrollLeft;
     const isRollY = scrollTop !== lastScrollTop;
+    if (isRollX) {
+      // 如果禁用滚动
+      if (scrollbarXOpts.visible === 'hidden') {
+        evnt.preventDefault();
+        return;
+      }
+    }
     if (isRollY) {
+      // 如果禁用滚动
+      if (scrollbarYOpts.visible === 'hidden') {
+        evnt.preventDefault();
+        return;
+      }
       const isTopWheel = deltaTop < 0;
       // 如果滚动位置已经是顶部或底部，则不需要触发
       if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
         return;
       }
     }
+    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
+      return;
+    }
     if (rowOpts.isHover || highlightHoverRow) {
       $xeTable.clearHoverRow();
     }
@@ -19201,6 +19233,8 @@ const Methods = {
     scrollYStore.endIndex = scrollYStore.visibleSize;
     scrollYStore.visibleEndIndex = scrollYStore.visibleSize;
     return $xeTable.$nextTick().then(() => {
+      internalData.lastScrollLeft = 0;
+      internalData.lastScrollTop = 0;
       internalData.intoRunScroll = false;
     });
   },
@@ -30167,7 +30201,7 @@ function renderViewFixed(h, $xeTable, fixedType) {
   const osYBehavior = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
   return h('div', {
     ref: isFixedLeft ? 'refLeftContainer' : 'refRightContainer',
-    class: [`vxe-table--fixed-${fixedType}-wrapper`, {
+    class: [`vxe-table--fixed-${fixedType}-wrapper`, `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`, {
       [`x-ob--${osXBehavior}`]: osXBehavior,
       [`y-ob--${osYBehavior}`]: osYBehavior
     }]
@@ -30515,7 +30549,7 @@ function renderViewport(h, $xeTable) {
       [`y-ob--${osYBehavior}`]: osYBehavior
     }]
   }, [h('div', {
-    class: 'vxe-table--main-wrapper'
+    class: ['vxe-table--main-wrapper', `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`]
   }, [
   /**
      * 表头
@@ -31520,6 +31554,12 @@ function renderBody(h, $xeTable) {
     },
     computeVxeLanguage() {
       return core_.VxeUI.getLanguage();
+    },
+    computeScrollbarVisible() {
+      const $xeTable = this;
+      const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
+      const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
+      return `${scrollbarXOpts.visible}${scrollbarYOpts.visible}`;
     }
   },
   watch: {
@@ -31596,6 +31636,9 @@ function renderBody(h, $xeTable) {
     computeVxeLanguage() {
       this.reLayoutFlag++;
     },
+    computeScrollbarVisible() {
+      this.reLayoutFlag++;
+    },
     reLayoutFlag() {
       const $xeTable = this;
       $xeTable.$nextTick(() => $xeTable.recalculate(true));
@@ -32251,10 +32294,12 @@ function renderBody(h, $xeTable) {
     h('div', {
       key: 'tn',
       ref: 'refEmptyPlaceholder',
+      class: 'vxe-table--empty-place-wrapper'
+    }, [h('div', {
       class: 'vxe-table--empty-placeholder'
     }, [h('div', {
       class: 'vxe-table--empty-content'
-    }, renderEmptyBody(h, $xeTable))]),
+    }, renderEmptyBody(h, $xeTable))])]),
     /**
      * 边框线
      */
@@ -33780,7 +33825,11 @@ function grid_createInternalData() {
      */
     getExcludeHeight() {
       const $xeGrid = this;
+      const props = $xeGrid;
       const reactData = $xeGrid.reactData;
+      const {
+        height
+      } = props;
       const {
         isZMax
       } = reactData;
@@ -33792,7 +33841,10 @@ function grid_createInternalData() {
         const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
         const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
         const parentEl = el.parentElement;
-        const parentPaddingSize = isZMax ? 0 : parentEl ? getPaddingTopBottomSize(parentEl) : 0;
+        let parentPaddingSize = 0;
+        if (parentEl && (height === '100%' || height === 'auto')) {
+          parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(parentEl);
+        }
         return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
       }
       return 0;
@@ -34063,6 +34115,7 @@ function grid_createInternalData() {
               if (!isInited && reactData.tableLoading) {
                 return $xeGrid.$nextTick();
               }
+              let operPromise = null;
               let sortList = [];
               let filterList = [];
               let pageParams = {};
@@ -34122,7 +34175,7 @@ function grid_createInternalData() {
               } else {
                 if ($xeTable) {
                   if (isReload) {
-                    $xeTable.clearAll();
+                    operPromise = $xeTable.clearAll();
                   } else {
                     sortList = $xeTable.getSortColumns();
                     filterList = $xeTable.getCheckedFilters();
@@ -34147,8 +34200,7 @@ function grid_createInternalData() {
               reactData.sortData = sortList;
               reactData.filterData = filterList;
               reactData.tableLoading = true;
-              const applyArgs = [commitParams].concat(args);
-              return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
+              return Promise.all([Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args)), operPromise]).then(([rest]) => {
                 let tableData = [];
                 reactData.tableLoading = false;
                 if (rest) {
@@ -34186,14 +34238,15 @@ function grid_createInternalData() {
                 if ($xeTable) {
                   $xeTable.loadData(tableData);
                 } else {
-                  $xeTable.$nextTick(() => {
+                  $xeGrid.$nextTick(() => {
+                    const $xeTable = $xeGrid.$refs.refTable;
                     if ($xeTable) {
                       $xeTable.loadData(tableData);
                     }
                   });
                 }
                 if (afterQuery) {
-                  afterQuery(...applyArgs);
+                  afterQuery(commitParams, ...args);
                 }
                 if (querySuccessMethods) {
                   querySuccessMethods({
@@ -34253,14 +34306,12 @@ function grid_createInternalData() {
                     reactData.tableLoading = false;
                     $xeTable.setPendingRow(removeRecords, false);
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!core_.VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
+                      if (core_.VxeUI.modal) {
+                        core_.VxeUI.modal.message({
+                          content: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'),
+                          status: 'success'
+                        });
                       }
-                      core_.VxeUI.modal.message({
-                        content: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'),
-                        status: 'success'
-                      });
                     }
                     if (afterDelete) {
                       afterDelete(...applyArgs);
@@ -34279,15 +34330,13 @@ function grid_createInternalData() {
                   }).catch(rest => {
                     reactData.tableLoading = false;
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!core_.VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
+                      if (core_.VxeUI.modal) {
+                        core_.VxeUI.modal.message({
+                          id: code,
+                          content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'),
+                          status: 'error'
+                        });
                       }
-                      core_.VxeUI.modal.message({
-                        id: code,
-                        content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'),
-                        status: 'error'
-                      });
                     }
                     if (deleteErrorMethods) {
                       deleteErrorMethods({
@@ -34302,15 +34351,13 @@ function grid_createInternalData() {
                 });
               } else {
                 if (isActiveMsg) {
-                  // 检测弹窗模块
-                  if (!core_.VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal']);
+                  if (core_.VxeUI.modal) {
+                    core_.VxeUI.modal.message({
+                      id: code,
+                      content: grid_getI18n('vxe.grid.selectOneRecord'),
+                      status: 'warning'
+                    });
                   }
-                  core_.VxeUI.modal.message({
-                    id: code,
-                    content: grid_getI18n('vxe.grid.selectOneRecord'),
-                    status: 'warning'
-                  });
                 }
               }
             } else {
@@ -34366,14 +34413,12 @@ function grid_createInternalData() {
                     reactData.tableLoading = false;
                     $xeTable.clearPendingRow();
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!core_.VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
+                      if (core_.VxeUI.modal) {
+                        core_.VxeUI.modal.message({
+                          content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'),
+                          status: 'success'
+                        });
                       }
-                      core_.VxeUI.modal.message({
-                        content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'),
-                        status: 'success'
-                      });
                     }
                     if (afterSave) {
                       afterSave(...applyArgs);
@@ -34392,15 +34437,13 @@ function grid_createInternalData() {
                   }).catch(rest => {
                     reactData.tableLoading = false;
                     if (isRespMsg) {
-                      // 检测弹窗模块
-                      if (!core_.VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
+                      if (core_.VxeUI.modal) {
+                        core_.VxeUI.modal.message({
+                          id: code,
+                          content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'),
+                          status: 'error'
+                        });
                       }
-                      core_.VxeUI.modal.message({
-                        id: code,
-                        content: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'),
-                        status: 'error'
-                      });
                     }
                     if (saveErrorMethods) {
                       saveErrorMethods({
@@ -34414,15 +34457,13 @@ function grid_createInternalData() {
                   });
                 } else {
                   if (isActiveMsg) {
-                    // 检测弹窗模块
-                    if (!core_.VxeUI.modal) {
-                      errLog('vxe.error.reqModule', ['Modal']);
+                    if (core_.VxeUI.modal) {
+                      core_.VxeUI.modal.message({
+                        id: code,
+                        content: grid_getI18n('vxe.grid.dataUnchanged'),
+                        status: 'info'
+                      });
                     }
-                    core_.VxeUI.modal.message({
-                      id: code,
-                      content: grid_getI18n('vxe.grid.dataUnchanged'),
-                      status: 'info'
-                    });
                   }
                 }
               });