vxe-table 3.17.0-beta.0 → 3.17.0-beta.2

package/es/table/src/columnInfo.js

@@ -9,6 +9,7 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const { field, editRender } = _vm;
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
@@ -53,11 +54,19 @@ export class ColumnInfo {
                 errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
             }
         }
+        if (field && editRender) {
+            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+            }
+            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+            }
+        }
         Object.assign(this, {
             // 基本属性
             type: _vm.type,
             property: _vm.field,
-            field: _vm.field,
+            field: field,
             title: _vm.title,
             width: _vm.width,
             minWidth: _vm.minWidth,
@@ -94,7 +103,7 @@ export class ColumnInfo {
             rowResize: _vm.rowResize,
             cellType: _vm.cellType,
             cellRender: _vm.cellRender,
-            editRender: _vm.editRender,
+            editRender: editRender,
             contentRender: _vm.contentRender,
             headerExportMethod: _vm.headerExportMethod,
             exportMethod: _vm.exportMethod,

package/es/table/src/methods.js

@@ -500,6 +500,32 @@ function handleRowGroupVirtualExpand($xeTable, rows, expanded) {
         }, 30);
     });
 }
+/**
+ * 处理默认展开分组行
+ */
+function handleDefaultRowGroupExpand($xeTable) {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { isRowGroupStatus } = reactData;
+    if (isRowGroupStatus) {
+        const { fullDataRowIdData } = internalData;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
+        const { expandAll, expandRowKeys } = aggregateOpts;
+        if (expandAll) {
+            $xeTable.setAllRowGroupExpand(true);
+        }
+        else if (expandRowKeys) {
+            const defExpandeds = [];
+            expandRowKeys.forEach((rowid) => {
+                const rowRest = fullDataRowIdData[rowid];
+                if (rowRest) {
+                    defExpandeds.push(rowRest.row);
+                }
+            });
+            $xeTable.setRowGroupExpand(defExpandeds, true);
+        }
+    }
+}
 function updateAfterListIndex($xeTable) {
     const props = $xeTable;
     const internalData = $xeTable;
@@ -2952,6 +2978,13 @@ function loadTableData($xeTable, datas, isReset) {
                 }
                 reactData.isRowLoading = false;
                 handleRecalculateStyle($xeTable, false, false, false);
+                // 如果是自动行高，特殊情况需调用 recalculate 手动刷新
+                if (!props.showOverflow) {
+                    setTimeout(() => {
+                        handleLazyRecalculate($xeTable, false, true, true);
+                        setTimeout(() => handleLazyRecalculate($xeTable, false, true, true), 3000);
+                    }, 2000);
+                }
                 // 是否变更虚拟滚动
                 if (oldScrollYLoad === sYLoad) {
                     restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
@@ -2984,6 +3017,7 @@ function handleLoadDefaults($xeTable) {
     handleDefaultRadioChecked($xeTable);
     handleDefaultRowExpand($xeTable);
     handleDefaultTreeExpand($xeTable);
+    handleDefaultRowGroupExpand($xeTable);
     handleDefaultMergeCells($xeTable);
     handleDefaultMergeFooterItems($xeTable);
     $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
@@ -5217,7 +5251,7 @@ const Methods = {
         evnt.preventDefault();
         const { column } = params;
         const { columnStore, overflowX, scrollbarHeight } = reactData;
-        const { elemStore, visibleColumn } = internalData;
+        const { visibleColumn } = internalData;
         const { leftList, rightList } = columnStore;
         const resizableOpts = $xeTable.computeResizableOpts;
         const osbHeight = overflowX ? scrollbarHeight : 0;
@@ -5235,24 +5269,29 @@ const Methods = {
         const { clientX: dragClientX } = evnt;
         const dragBtnElem = evnt.target;
         let resizeColumn = column;
-        if (column.children && column.children.length) {
+        const isDragGroupCol = column.children && column.children.length;
+        if (isDragGroupCol) {
             XEUtils.eachTree(column.children, childColumn => {
                 resizeColumn = childColumn;
             });
         }
-        const cell = dragBtnElem.parentNode;
-        const cellParams = Object.assign(params, { cell });
-        let dragLeft = 0;
-        const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-        if (!bodyScrollElem) {
+        let cell = dragBtnElem.parentElement;
+        if (isDragGroupCol) {
+            const trEl = cell ? cell.parentElement : null;
+            const theadEl = trEl ? trEl.parentElement : null;
+            cell = theadEl ? theadEl.querySelector(`.vxe-header--column[colid="${resizeColumn.id}"]`) : null;
+        }
+        if (!cell) {
             return;
         }
+        const cellParams = XEUtils.assign(params, { cell });
+        let dragLeft = 0;
         const tableRect = tableEl.getBoundingClientRect();
         const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null;
         const cellRect = cell.getBoundingClientRect();
         const dragBtnRect = dragBtnElem.getBoundingClientRect();
         const dragBtnWidth = dragBtnElem.clientWidth;
-        const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
+        const dragBtnOffsetWidth = XEUtils.floor(dragBtnWidth / 2);
         const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth;
         const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
         const dragMinLeft = isRightFixed ? 0 : (cellRect.x - tableRect.x + dragBtnWidth + minInterval);
@@ -8670,8 +8709,7 @@ const Methods = {
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
-        // 已废弃，即将去掉事件触发 new Event('click') -> null
-        return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+        return handleSortEvent($xeTable, null, sortConfs, isUpdate);
     },
     setSortByEvent(evnt, sortConfs, isUpdate) {
         const $xeTable = this;
@@ -10201,8 +10239,6 @@ const Methods = {
     },
     /**
      * 如果有滚动条，则滚动到对应的位置
-     * @param {Number} scrollLeft 左距离
-     * @param {Number} scrollTop 上距离
      */
     scrollTo(scrollLeft, scrollTop) {
         const $xeTable = this;
@@ -10217,6 +10253,12 @@ const Methods = {
         const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
         const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
         internalData.intoRunScroll = true;
+        if (scrollLeft) {
+            if (!XEUtils.isNumber(scrollLeft)) {
+                scrollTop = scrollLeft.top;
+                scrollLeft = scrollLeft.left;
+            }
+        }
         if (XEUtils.isNumber(scrollLeft)) {
             setScrollLeft(xHandleEl, scrollLeft);
             setScrollLeft(bodyScrollElem, scrollLeft);

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.0";
+const version = "3.17.0-beta.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.0"}`;
+const log_version = `table v${"3.17.0-beta.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2690,6 +2690,10 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const {
+      field,
+      editRender
+    } = _vm;
     const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
@@ -2735,11 +2739,19 @@ class ColumnInfo {
         errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
       }
     }
+    if (field && editRender) {
+      if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+      }
+      if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+      }
+    }
     Object.assign(this, {
       // 基本属性
       type: _vm.type,
       property: _vm.field,
-      field: _vm.field,
+      field: field,
       title: _vm.title,
       width: _vm.width,
       minWidth: _vm.minWidth,
@@ -2776,7 +2788,7 @@ class ColumnInfo {
       rowResize: _vm.rowResize,
       cellType: _vm.cellType,
       cellRender: _vm.cellRender,
-      editRender: _vm.editRender,
+      editRender: editRender,
       contentRender: _vm.contentRender,
       headerExportMethod: _vm.headerExportMethod,
       exportMethod: _vm.exportMethod,
@@ -5820,6 +5832,38 @@ function handleRowGroupVirtualExpand($xeTable, rows, expanded) {
     }, 30);
   });
 }
+/**
+ * 处理默认展开分组行
+ */
+function handleDefaultRowGroupExpand($xeTable) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    isRowGroupStatus
+  } = reactData;
+  if (isRowGroupStatus) {
+    const {
+      fullDataRowIdData
+    } = internalData;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const {
+      expandAll,
+      expandRowKeys
+    } = aggregateOpts;
+    if (expandAll) {
+      $xeTable.setAllRowGroupExpand(true);
+    } else if (expandRowKeys) {
+      const defExpandeds = [];
+      expandRowKeys.forEach(rowid => {
+        const rowRest = fullDataRowIdData[rowid];
+        if (rowRest) {
+          defExpandeds.push(rowRest.row);
+        }
+      });
+      $xeTable.setRowGroupExpand(defExpandeds, true);
+    }
+  }
+}
 function updateAfterListIndex($xeTable) {
   const props = $xeTable;
   const internalData = $xeTable;
@@ -8727,6 +8771,13 @@ function loadTableData($xeTable, datas, isReset) {
         }
         reactData.isRowLoading = false;
         handleRecalculateStyle($xeTable, false, false, false);
+        // 如果是自动行高，特殊情况需调用 recalculate 手动刷新
+        if (!props.showOverflow) {
+          setTimeout(() => {
+            handleLazyRecalculate($xeTable, false, true, true);
+            setTimeout(() => handleLazyRecalculate($xeTable, false, true, true), 3000);
+          }, 2000);
+        }
         // 是否变更虚拟滚动
         if (oldScrollYLoad === sYLoad) {
           restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
@@ -8756,6 +8807,7 @@ function handleLoadDefaults($xeTable) {
   handleDefaultRadioChecked($xeTable);
   handleDefaultRowExpand($xeTable);
   handleDefaultTreeExpand($xeTable);
+  handleDefaultRowGroupExpand($xeTable);
   handleDefaultMergeCells($xeTable);
   handleDefaultMergeFooterItems($xeTable);
   $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
@@ -11331,7 +11383,6 @@ const Methods = {
       scrollbarHeight
     } = reactData;
     const {
-      elemStore,
       visibleColumn
     } = internalData;
     const {
@@ -11356,26 +11407,31 @@ const Methods = {
     } = evnt;
     const dragBtnElem = evnt.target;
     let resizeColumn = column;
-    if (column.children && column.children.length) {
+    const isDragGroupCol = column.children && column.children.length;
+    if (isDragGroupCol) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
         resizeColumn = childColumn;
       });
     }
-    const cell = dragBtnElem.parentNode;
-    const cellParams = Object.assign(params, {
+    let cell = dragBtnElem.parentElement;
+    if (isDragGroupCol) {
+      const trEl = cell ? cell.parentElement : null;
+      const theadEl = trEl ? trEl.parentElement : null;
+      cell = theadEl ? theadEl.querySelector(`.vxe-header--column[colid="${resizeColumn.id}"]`) : null;
+    }
+    if (!cell) {
+      return;
+    }
+    const cellParams = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(params, {
       cell
     });
     let dragLeft = 0;
-    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-    if (!bodyScrollElem) {
-      return;
-    }
     const tableRect = tableEl.getBoundingClientRect();
     const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null;
     const cellRect = cell.getBoundingClientRect();
     const dragBtnRect = dragBtnElem.getBoundingClientRect();
     const dragBtnWidth = dragBtnElem.clientWidth;
-    const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
+    const dragBtnOffsetWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(dragBtnWidth / 2);
     const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth;
     const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
     const dragMinLeft = isRightFixed ? 0 : cellRect.x - tableRect.x + dragBtnWidth + minInterval;
@@ -15337,8 +15393,7 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    // 已废弃，即将去掉事件触发 new Event('click') -> null
-    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    return handleSortEvent($xeTable, null, sortConfs, isUpdate);
   },
   setSortByEvent(evnt, sortConfs, isUpdate) {
     const $xeTable = this;
@@ -17132,8 +17187,6 @@ const Methods = {
   },
   /**
    * 如果有滚动条，则滚动到对应的位置
-   * @param {Number} scrollLeft 左距离
-   * @param {Number} scrollTop 上距离
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
@@ -17150,6 +17203,12 @@ const Methods = {
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     internalData.intoRunScroll = true;
+    if (scrollLeft) {
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
+        scrollTop = scrollLeft.top;
+        scrollLeft = scrollLeft.left;
+      }
+    }
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
       setScrollLeft(xHandleEl, scrollLeft);
       setScrollLeft(bodyScrollElem, scrollLeft);
@@ -34135,6 +34194,7 @@ const Toolbar = VxeToolbar;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',