vxe-table 3.12.0 → 3.12.1-beta.1

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.0";
+const version = "3.12.1-beta.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2690,6 +2690,12 @@ function addClass(elem, cls) {
     elem.className = `${elem.className} ${cls}`;
   }
 }
+function toCssUnit(val, unit = 'px') {
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(val) || /^\d+$/.test(`${val}`)) {
+    return `${val}${unit}`;
+  }
+  return `${val || ''}`;
+}
 function getDomNode() {
   const documentElement = document.documentElement;
   const bodyElem = document.body;
@@ -2808,7 +2814,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0"}`;
+const log_version = `table v${"3.12.1-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5285,14 +5291,13 @@ const calcCellHeight = $xeTable => {
   } = props;
   const {
     tableData,
-    scrollXLoad,
-    scrollYLoad
+    scrollXLoad
   } = reactData;
   const {
     fullAllDataRowIdData
   } = internalData;
   const el = $xeTable.$refs.refElem;
-  if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+  if (!showOverflow && el) {
     let paddingTop = 0;
     let paddingBottom = 0;
     let calcPadding = false;
@@ -5561,7 +5566,7 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
 function handleRecalculateLayout($xeTable, reFull) {
   const internalData = $xeTable;
   const el = $xeTable.$refs.refElem;
-  internalData.reRunTime = Date.now();
+  internalData.rceRunTime = Date.now();
   if (!el || !el.clientWidth) {
     return $xeTable.$nextTick();
   }
@@ -5597,10 +5602,14 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     internalData.bodyScrollType = '';
     internalData.inFooterScroll = false;
     if (isRollX && scrollXLoad) {
-      $xeTable.updateScrollXData();
+      $xeTable.updateScrollXData().then(() => {
+        $xeTable.loadScrollXData();
+      });
     }
     if (isRollY && scrollYLoad) {
-      $xeTable.updateScrollYData();
+      $xeTable.updateScrollYData().then(() => {
+        $xeTable.loadScrollYData();
+      });
     }
     $xeTable.updateCellAreas();
   }, 200);
@@ -7830,6 +7839,7 @@ const Methods = {
   saveCustomStore(type) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const {
       customConfig
     } = props;
@@ -7845,6 +7855,9 @@ const Methods = {
     const isCustomVisible = isAllCustom || storageOpts.visible;
     const isCustomFixed = isAllCustom || storageOpts.fixed;
     const isCustomSort = isAllCustom || storageOpts.sort;
+    if (type !== 'reset') {
+      reactData.isCustomStatus = true;
+    }
     if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
@@ -8135,7 +8148,7 @@ const Methods = {
     return new Promise(resolve => {
       const {
         rceTimeout,
-        reRunTime
+        rceRunTime
       } = internalData;
       const resizeOpts = $xeTable.computeResizeOpts;
       const refreshDelay = resizeOpts.refreshDelay || 20;
@@ -8145,7 +8158,7 @@ const Methods = {
       }
       if (rceTimeout) {
         clearTimeout(rceTimeout);
-        if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+        if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
           resolve(handleRecalculateLayout($xeTable, !!reFull));
         } else {
           $xeTable.$nextTick(() => {
@@ -13219,7 +13232,9 @@ const Methods = {
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-        $xeTable.updateScrollXData();
+        $xeTable.updateScrollXData().then(() => {
+          $xeTable.loadScrollXData();
+        });
       } else {
         $xeTable.updateScrollXSpace();
       }
@@ -13236,7 +13251,9 @@ const Methods = {
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-        $xeTable.updateScrollYData();
+        $xeTable.updateScrollYData().then(() => {
+          $xeTable.loadScrollYData();
+        });
       } else {
         $xeTable.updateScrollYSpace();
       }
@@ -14168,12 +14185,14 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
     }
   }
   let cellHeight = '';
-  if (hasEllipsis && (scrollYRHeight || rowHeight)) {
-    cellHeight = `${scrollYRHeight || rowHeight}px`;
-  } else if (scrollXLoad || scrollYLoad) {
-    if (!hasEllipsis) {
-      cellHeight = `${rest.height || 24}px`;
+  if (hasEllipsis) {
+    if (scrollYRHeight || rowHeight) {
+      cellHeight = `${scrollYRHeight || rowHeight}px`;
+    } else if (!isAllOverflow) {
+      cellHeight = `${rest.height || 18}px`;
     }
+  } else {
+    cellHeight = `${rest.height || 18}px`;
   }
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
     if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
@@ -21842,7 +21861,7 @@ const convertToRows = originColumns => {
           handleOptions.data = afterFullData;
         }
       }
-      return handleExport($xeTable, opts);
+      return handleExport($xeTable, handleOptions);
     },
     _importByFile(file, options) {
       const opts = Object.assign({}, options);
@@ -26222,10 +26241,30 @@ Object.keys(table.methods).forEach(name => {
     computeZoomOpts() {
       return Object.assign({}, grid_getConfig().grid.zoomConfig, this.zoomConfig);
     },
-    renderStyle() {
-      return this.isZMax ? {
-        zIndex: this.tZindex
-      } : null;
+    computeStyles() {
+      const $xeGrid = this;
+      const props = $xeGrid;
+      const reactData = $xeGrid;
+      const {
+        height,
+        maxHeight
+      } = props;
+      const {
+        isZMax,
+        tZindex
+      } = reactData;
+      const stys = {};
+      if (isZMax) {
+        stys.zIndex = tZindex;
+      } else {
+        if (height) {
+          stys.height = height === 'auto' || height === '100%' ? '100%' : toCssUnit(height);
+        }
+        if (maxHeight) {
+          stys.maxHeight = maxHeight === 'auto' || maxHeight === '100%' ? '100%' : toCssUnit(maxHeight);
+        }
+      }
+      return stys;
     },
     tableExtendProps() {
       const rest = {};
@@ -26346,21 +26385,30 @@ Object.keys(table.methods).forEach(name => {
     grid_globalEvents.off(this, 'keydown');
   },
   render(h) {
-    const {
-      computeSize,
-      isZMax
-    } = this;
-    const vSize = computeSize;
+    const $xeGrid = this;
+    const props = $xeGrid;
+    const reactData = $xeGrid;
+    const slots = $xeGrid.$scopedSlots;
+    const vSize = $xeGrid.computeSize;
+    const styles = $xeGrid.computeStyles;
+    const asideLeftSlot = slots.asideLeft || slots['aside-left'];
+    const asideRightSlot = slots.asideRight || slots['aside-right'];
     return h('div', {
       class: ['vxe-grid', {
         [`size--${vSize}`]: vSize,
         'is--animat': !!this.animat,
         'is--round': this.round,
-        'is--maximize': isZMax,
-        'is--loading': this.loading || this.tableLoading
+        'is--maximize': reactData.isZMax,
+        'is--loading': props.loading || reactData.tableLoading
       }],
-      style: this.renderStyle
-    }, renderLayout(h, this));
+      style: styles
+    }, [asideLeftSlot ? h('div', {
+      class: 'vxe-grid--aside-left-wrapper'
+    }, asideLeftSlot.call($xeGrid, {})) : grid_renderEmptyElement($xeGrid), h('div', {
+      class: 'vxe-grid--body-content-wrapper'
+    }, renderLayout(h, $xeGrid)), asideRightSlot ? h('div', {
+      class: 'vxe-grid--aside-right-wrapper'
+    }, asideRightSlot.call($xeGrid, {})) : grid_renderEmptyElement($xeGrid)]);
   },
   methods: {
     ...grid_methods,