vxe-table 3.13.7 → 3.13.9

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.13.7";
+const version = "3.13.9";
 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.7"}`;
+const log_version = `table v${"3.13.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5329,7 +5329,8 @@ function cacheColumnMap($xeTable) {
       index,
       items,
       parent: parentColumn || null,
-      width: 0
+      width: 0,
+      oLeft: 0
     };
     if (field) {
       if (fullColumnFieldData[field]) {
@@ -6898,6 +6899,21 @@ function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
   }
   return $xeTable.$nextTick();
 }
+const handleRowExpandReserve = ($xeTable, row, expanded) => {
+  const internalData = $xeTable;
+  const {
+    rowExpandedReserveRowMap
+  } = internalData;
+  const expandOpts = $xeTable.computeExpandOpts;
+  if (expandOpts.reserve) {
+    const rowid = getRowid($xeTable, row);
+    if (expanded) {
+      rowExpandedReserveRowMap[rowid] = row;
+    } else if (rowExpandedReserveRowMap[rowid]) {
+      delete rowExpandedReserveRowMap[rowid];
+    }
+  }
+};
 // 计算可视渲染相关数据
 function computeScrollLoad($xeTable) {
   const reactData = $xeTable;
@@ -12011,7 +12027,7 @@ const Methods = {
     const rowid = getRowid(this, row);
     this.clearHoverRow();
     if ($el) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll(`[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
     }
     this.hoverRow = row;
   },
@@ -13731,7 +13747,7 @@ const Methods = {
         });
       }
       if (reserve) {
-        validRows.forEach(row => this.handleRowExpandReserve(row, expanded));
+        validRows.forEach(row => handleRowExpandReserve($xeTable, row, expanded));
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
@@ -13766,42 +13782,32 @@ const Methods = {
    */
   clearRowExpand() {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      expandOpts,
       tableFullData
-    } = this;
+    } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       reserve
     } = expandOpts;
-    const expList = this.getRowExpandRecords();
-    this.rowExpandedMaps = {};
+    const expList = $xeTable.getRowExpandRecords();
+    reactData.rowExpandedMaps = {};
     if (reserve) {
-      tableFullData.forEach(row => this.handleRowExpandReserve(row, false));
+      tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
     }
-    return this.$nextTick().then(() => {
+    return $xeTable.$nextTick().then(() => {
       if (expList.length) {
-        this.recalculate();
+        return $xeTable.recalculate();
       }
-    }).then(() => $xeTable.updateCellAreas());
+    }).then(() => {
+      return $xeTable.updateCellAreas();
+    });
   },
   clearRowExpandReserve() {
     this.rowExpandedReserveRowMap = {};
     return this.$nextTick();
   },
-  handleRowExpandReserve(row, expanded) {
-    const {
-      rowExpandedReserveRowMap,
-      expandOpts
-    } = this;
-    if (expandOpts.reserve) {
-      const rowid = getRowid(this, row);
-      if (expanded) {
-        rowExpandedReserveRowMap[rowid] = row;
-      } else if (rowExpandedReserveRowMap[rowid]) {
-        delete rowExpandedReserveRowMap[rowid];
-      }
-    }
-  },
   getRowExpandRecords() {
     const rest = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(this.rowExpandedMaps, item => {
@@ -18741,12 +18747,13 @@ const {
     }
   },
   render(h) {
+    const $panel = this;
     const $xeTable = this.$parent;
+    const tableInternalData = $xeTable;
     const {
       filterStore
     } = this;
     const {
-      args,
       visible,
       multiple,
       column
@@ -18754,15 +18761,16 @@ const {
     const filterRender = column ? column.filterRender : null;
     const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
     const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
+    const params = Object.assign({}, tableInternalData._currFilterParams, {
+      $panel,
+      $table: $xeTable
+    });
     const filterOpts = $xeTable.computeFilterOpts;
     const {
       destroyOnClose
     } = filterOpts;
     return h('div', {
-      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', getClass(filterClassName, Object.assign({
-        $panel: this,
-        $table: $xeTable
-      }, args)), {
+      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', getClass(filterClassName, params), {
         'is--animat': $xeTable.animat,
         'is--multiple': multiple,
         'is--active': visible
@@ -18772,32 +18780,32 @@ const {
   },
   methods: {
     renderOptions(h, filterRender, compConf) {
+      const $panel = this;
+      const $xeTable = this.$parent;
+      const tableInternalData = $xeTable;
       const {
-        $parent: $xetable,
         filterStore
       } = this;
       const {
-        args,
         column,
         multiple,
         maxHeight
       } = filterStore;
       const slots = column ? column.slots : null;
+      const filterSlot = slots ? slots.filter : null;
+      const params = Object.assign({}, tableInternalData._currFilterParams, {
+        $panel,
+        $table: $xeTable
+      });
       const rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
-      if (slots && slots.filter) {
+      if (filterSlot) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, $xetable.callSlot(slots.filter, Object.assign({
-          $panel: this,
-          context: this
-        }, args), h))];
+        }, $xeTable.callSlot(filterSlot, params, h))];
       } else if (rtFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, getSlotVNs(rtFilter.call($xetable, h, filterRender, Object.assign({
-          $panel: this,
-          context: this
-        }, args))))];
+        }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))];
       }
       const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked);
       const isAllIndeterminate = multiple && filterStore.isIndeterminate;
@@ -18848,18 +18856,16 @@ const {
       }))];
     },
     renderFooter(h) {
+      const $xeTable = this.$parent;
       const {
-        $parent: $xetable,
         hasCheckOption,
         filterStore
       } = this;
-      const {
-        filterOpts
-      } = $xetable;
       const {
         column,
         multiple
       } = filterStore;
+      const filterOpts = $xeTable.computeFilterOpts;
       const filterRender = column.filterRender;
       const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
@@ -21006,7 +21012,7 @@ function handleClearEdit($xeTable, evnt, targetRow) {
   }
   return $xeTable.$nextTick().then(() => $xeTable.updateCellAreas());
 }
-function handleEditActive($xeTable, params, evnt, isFocus) {
+function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
   const props = $xeTable;
   const reactData = $xeTable;
   const {
@@ -21125,7 +21131,7 @@ function handleEditActive($xeTable, params, evnt, isFocus) {
         column.renderHeight = cell.offsetHeight;
         actived.args = params;
         actived.column = column;
-        if (isFocus) {
+        if (isPos) {
           setTimeout(() => {
             $xeTable.handleFocus(params, evnt);
           });
@@ -21156,7 +21162,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
           columnIndex: $xeTable.getColumnIndex(column),
           cell,
           $table: $xeTable
-        }, null, false);
+        }, null, isPos, isPos);
         internalData._lastCallTime = Date.now();
       }
       return $xeTable.$nextTick();
@@ -21476,7 +21482,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
      */
     handleEdit(params, evnt) {
       const $xeTable = this;
-      return handleEditActive($xeTable, params, evnt, true);
+      return handleEditActive($xeTable, params, evnt, true, true);
     },
     /**
      * @deprecated
@@ -21632,10 +21638,12 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
     _setEditRow(row, fieldOrColumn) {
       const $xeTable = this;
       let column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(this.visibleColumn, column => isEnableConf(column.editRender));
+      let isPos = false;
       if (fieldOrColumn) {
+        isPos = true;
         column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
       }
-      return handleEditCell($xeTable, row, column, false);
+      return handleEditCell($xeTable, row, column, isPos);
     },
     _setActiveCell(row, fieldOrColumn) {
       if (true) {
@@ -25761,6 +25769,8 @@ function renderBody(h, $xeTable) {
         mini: 36
       },
       scrollVMLoading: false,
+      scrollYHeight: 0,
+      scrollXWidth: 0,
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,
@@ -28669,7 +28679,7 @@ Object.keys(table.methods).forEach(name => {
         ajax = {}
       } = proxyOpts;
       const resConfigs = proxyOpts.response || proxyOpts.props || {};
-      const $xetable = $refs.xTable;
+      const $xeTable = $refs.xTable;
       const formData = this.getFormData();
       let button;
       let code;
@@ -28742,10 +28752,10 @@ Object.keys(table.methods).forEach(name => {
               }
               if (isInited) {
                 let defaultSort = null;
-                if ($xetable) {
+                if ($xeTable) {
                   const {
                     sortOpts
-                  } = $xetable;
+                  } = $xeTable;
                   defaultSort = sortOpts.defaultSort;
                 }
                 // 如果使用默认排序
@@ -28761,16 +28771,16 @@ Object.keys(table.methods).forEach(name => {
                     };
                   });
                 }
-                if ($xetable) {
-                  filterList = $xetable.getCheckedFilters();
+                if ($xeTable) {
+                  filterList = $xeTable.getCheckedFilters();
                 }
               } else {
-                if ($xetable) {
+                if ($xeTable) {
                   if (isReload) {
-                    $xetable.clearAll();
+                    $xeTable.clearAll();
                   } else {
-                    sortList = $xetable.getSortColumns();
-                    filterList = $xetable.getCheckedFilters();
+                    sortList = $xeTable.getSortColumns();
+                    filterList = $xeTable.getCheckedFilters();
                   }
                 }
               }
@@ -28792,6 +28802,7 @@ Object.keys(table.methods).forEach(name => {
               this.tableLoading = true;
               const applyArgs = [commitParams].concat(args);
               return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
+                let tableData = [];
                 this.tableLoading = false;
                 if (rest) {
                   if (pagerConfig && isEnableConf(pagerOpts)) {
@@ -28802,7 +28813,7 @@ Object.keys(table.methods).forEach(name => {
                     }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, totalProp || 'page.total')) || 0;
                     tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(total);
                     const resultProp = resConfigs.result;
-                    this.tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp({
+                    tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp({
                       data: rest,
                       $grid: this
                     }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
@@ -28813,13 +28824,20 @@ Object.keys(table.methods).forEach(name => {
                     }
                   } else {
                     const listProp = resConfigs.list;
-                    this.tableData = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
+                    tableData = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
                       data: rest,
                       $grid: this
                     }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
                   }
+                }
+                if ($xeTable) {
+                  $xeTable.loadData(tableData);
                 } else {
-                  this.tableData = [];
+                  $xeTable.$nextTick(() => {
+                    if ($xeTable) {
+                      $xeTable.loadData(tableData);
+                    }
+                  });
                 }
                 if (afterQuery) {
                   afterQuery(...applyArgs);
@@ -28858,8 +28876,8 @@ Object.keys(table.methods).forEach(name => {
             const deleteSuccessMethods = ajax.deleteSuccess;
             const deleteErrorMethods = ajax.deleteError;
             if (ajaxMethods) {
-              const selectRecords = $xetable.getCheckboxRecords();
-              const removeRecords = selectRecords.filter(row => !$xetable.isInsertByRow(row));
+              const selectRecords = $xeTable.getCheckboxRecords();
+              const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
               const body = {
                 removeRecords
               };
@@ -28875,12 +28893,12 @@ Object.keys(table.methods).forEach(name => {
               if (selectRecords.length) {
                 return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                   if (!removeRecords.length) {
-                    return $xetable.remove(selectRecords);
+                    return $xeTable.remove(selectRecords);
                   }
                   this.tableLoading = true;
                   return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs)).then(rest => {
                     this.tableLoading = false;
-                    $xetable.setPendingRow(removeRecords, false);
+                    $xeTable.setPendingRow(removeRecords, false);
                     if (isRespMsg) {
                       // 检测弹窗模块
                       if (true) {
@@ -28999,7 +29017,7 @@ Object.keys(table.methods).forEach(name => {
                   this.tableLoading = true;
                   return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
                     this.tableLoading = false;
-                    $xetable.clearPendingRow();
+                    $xeTable.clearPendingRow();
                     if (isRespMsg) {
                       // 检测弹窗模块
                       if (true) {
@@ -29083,7 +29101,7 @@ Object.keys(table.methods).forEach(name => {
                   code,
                   button,
                   $grid: this,
-                  $table: $xetable
+                  $table: $xeTable
                 }, ...args);
               } else {
                 if (true) {
@@ -29383,16 +29401,16 @@ Object.keys(table.methods).forEach(name => {
         sortData,
         proxyConfig
       } = this;
-      const $xetable = $refs.xTable;
+      const $xeTable = $refs.xTable;
       if (proxyConfig) {
         return {
-          data: this.tableData,
+          data: $xeTable ? $xeTable.getFullData() : [],
           filter: this.filterData,
           form: this.getFormData(),
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,
-          pendingRecords: $xetable ? $xetable.getPendingRecords() : []
+          pendingRecords: $xeTable ? $xeTable.getPendingRecords() : []
         };
       }
       return null;