vxe-table 3.13.0-beta.8 → 3.13.0

package/es/table/src/methods.js

@@ -295,7 +295,9 @@ const updateScrollYStatus = ($xeTable, fullData) => {
     return scrollYLoad;
 };
 function updateAfterListIndex($xeTable) {
+    const props = $xeTable;
     const internalData = $xeTable;
+    const { treeConfig } = props;
     const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
     const fullMaps = {};
     afterFullData.forEach((row, index) => {
@@ -303,7 +305,9 @@ function updateAfterListIndex($xeTable) {
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = index + 1;
         if (rowRest) {
-            rowRest.seq = seq;
+            if (!treeConfig) {
+                rowRest.seq = seq;
+            }
             rowRest._index = index;
         }
         else {
@@ -1928,6 +1932,15 @@ function updateRowExpandStyle($xeTable) {
         }
     }
 }
+function handleRowExpandScroll($xeTable) {
+    const internalData = $xeTable;
+    const { elemStore } = internalData;
+    const rowExpandEl = $xeTable.$refs.refRowExpandElem;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (rowExpandEl && bodyScrollElem) {
+        rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
+    }
+}
 const Methods = {
     callSlot(slotFunc, params, h, vNodes) {
         if (slotFunc) {
@@ -5439,7 +5452,7 @@ const Methods = {
                 const isSelected = sLen >= vLen;
                 const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
                 if (checkField) {
-                    XEUtils.get(row, checkField, isSelected);
+                    XEUtils.set(row, checkField, isSelected);
                 }
                 if (isSelected) {
                     if (!checkField) {
@@ -7293,12 +7306,12 @@ const Methods = {
      */
     setRowExpand(rows, expanded) {
         const $xeTable = this;
-        const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn: column } = this;
+        const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn } = this;
         let rExpandedMaps = Object.assign({}, rowExpandedMaps);
         const { reserve, lazy, accordion, toggleMethod } = expandOpts;
         const lazyRests = [];
-        const columnIndex = this.getColumnIndex(column);
-        const $columnIndex = this.getVMColumnIndex(column);
+        const columnIndex = $xeTable.getColumnIndex(expandColumn);
+        const $columnIndex = $xeTable.getVMColumnIndex(expandColumn);
         if (rows) {
             if (!XEUtils.isArray(rows)) {
                 rows = [rows];
@@ -7308,7 +7321,7 @@ const Methods = {
                 rExpandedMaps = {};
                 rows = rows.slice(rows.length - 1, rows.length);
             }
-            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
+            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
             if (expanded) {
                 validRows.forEach((row) => {
                     const rowid = getRowid(this, row);
@@ -7339,7 +7352,13 @@ const Methods = {
         this.rowExpandedMaps = rExpandedMaps;
         return Promise.all(lazyRests)
             .then(() => $xeTable.recalculate())
-            .then(() => $xeTable.updateCellAreas());
+            .then(() => {
+            if (expandColumn) {
+                updateRowExpandStyle($xeTable);
+                handleRowExpandScroll($xeTable);
+            }
+            return $xeTable.updateCellAreas();
+        });
     },
     /**
      * 判断行是否为展开状态

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.13.0-beta.8";
+export const version = "3.13.0";
 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.13.0-beta.8"}`;
+const version = `table v${"3.13.0"}`;
 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.13.0-beta.8";
+const version = "3.13.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.0-beta.8"}`;
+const log_version = `table v${"3.13.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5425,7 +5425,11 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   return scrollYLoad;
 };
 function updateAfterListIndex($xeTable) {
+  const props = $xeTable;
   const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
   const {
     afterFullData,
     fullDataRowIdData,
@@ -5437,7 +5441,9 @@ function updateAfterListIndex($xeTable) {
     const rowRest = fullAllDataRowIdData[rowid];
     const seq = index + 1;
     if (rowRest) {
-      rowRest.seq = seq;
+      if (!treeConfig) {
+        rowRest.seq = seq;
+      }
       rowRest._index = index;
     } else {
       const rest = {
@@ -7304,6 +7310,17 @@ function updateRowExpandStyle($xeTable) {
     }
   }
 }
+function handleRowExpandScroll($xeTable) {
+  const internalData = $xeTable;
+  const {
+    elemStore
+  } = internalData;
+  const rowExpandEl = $xeTable.$refs.refRowExpandElem;
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+  if (rowExpandEl && bodyScrollElem) {
+    rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
+  }
+}
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
     if (slotFunc) {
@@ -11393,7 +11410,7 @@ const Methods = {
         const isSelected = sLen >= vLen;
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         if (checkField) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField, isSelected);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, isSelected);
         }
         if (isSelected) {
           if (!checkField) {
@@ -13637,7 +13654,7 @@ const Methods = {
       fullAllDataRowIdData,
       rowExpandLazyLoadedMaps,
       expandOpts,
-      expandColumn: column
+      expandColumn
     } = this;
     let rExpandedMaps = {
       ...rowExpandedMaps
@@ -13649,8 +13666,8 @@ const Methods = {
       toggleMethod
     } = expandOpts;
     const lazyRests = [];
-    const columnIndex = this.getColumnIndex(column);
-    const $columnIndex = this.getVMColumnIndex(column);
+    const columnIndex = $xeTable.getColumnIndex(expandColumn);
+    const $columnIndex = $xeTable.getVMColumnIndex(expandColumn);
     if (rows) {
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
         rows = [rows];
@@ -13662,7 +13679,7 @@ const Methods = {
       }
       const validRows = toggleMethod ? rows.filter(row => toggleMethod({
         expanded,
-        column,
+        column: expandColumn,
         columnIndex,
         $columnIndex,
         row,
@@ -13695,7 +13712,13 @@ const Methods = {
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
-    return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas());
+    return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => {
+      if (expandColumn) {
+        updateRowExpandStyle($xeTable);
+        handleRowExpandScroll($xeTable);
+      }
+      return $xeTable.updateCellAreas();
+    });
   },
   /**
    * 判断行是否为展开状态
@@ -30294,6 +30317,11 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  formatOption: {
+    renderTableDefault(h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
+    }
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -30310,6 +30338,11 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  formatTree: {
+    renderTableDefault(h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+    }
+  },
   VxeColorPicker: {
     tableAutoFocus: 'input',
     renderTableEdit(h, renderOpts, params) {