vxe-table 3.20.0-beta.9 → 3.20.1

package/es/table/module/export/mixin.js

@@ -1338,7 +1338,21 @@ export default {
                             return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
                                 .then(rest => {
                                 const listProp = resConfigs.list;
-                                handleOptions.data = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) : XEUtils.get(rest, listProp)) : rest) || [];
+                                let tdData = [];
+                                if (listProp) {
+                                    if (XEUtils.isFunction(listProp)) {
+                                        tdData = listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
+                                    }
+                                    else {
+                                        tdData = XEUtils.isArray(rest) ? rest : XEUtils.get(rest, listProp);
+                                    }
+                                }
+                                else {
+                                    if (XEUtils.isArray(rest)) {
+                                        tdData = rest;
+                                    }
+                                }
+                                handleOptions.data = tdData;
                                 if (afterQueryAll) {
                                     afterQueryAll(params);
                                 }

package/es/table/module/keyboard/mixin.js

@@ -78,9 +78,19 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
     const internalData = $xeTable;
     const { afterFullData, visibleColumn } = internalData;
     const params = Object.assign({}, args);
-    const _rowIndex = $xeTable.getVTRowIndex(params.row);
-    const _columnIndex = $xeTable.getVTColumnIndex(params.column);
-    evnt.preventDefault();
+    const { row, column } = params;
+    const _rowIndex = $xeTable.getVTRowIndex(row);
+    const _columnIndex = $xeTable.getVTColumnIndex(column);
+    const refTableBody = $xeTable.$refs.refTableBody;
+    const tableBodyElem = refTableBody ? refTableBody.$el : null;
+    const tableWidth = tableBodyElem ? tableBodyElem.clientWidth : 0;
+    let colAlign = isLeftArrow || isRightArrow || (column.renderWidth < tableWidth);
+    if ((isLeftArrow && _columnIndex >= 0) || (isRightArrow && _columnIndex <= visibleColumn.length - 1)) {
+        colAlign = false;
+    }
+    else {
+        evnt.preventDefault();
+    }
     if (isUpArrow && _rowIndex > 0) {
         // 移动到上一行
         params.rowIndex = _rowIndex - 1;
@@ -101,7 +111,9 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         params.columnIndex = _columnIndex + 1;
         params.column = visibleColumn[params.columnIndex];
     }
-    $xeTable.scrollToRow(params.row, params.column).then(() => {
+    $xeTable.scrollToRow(params.row, params.column, {
+        colAlign
+    }).then(() => {
         params.cell = $xeTable.getCellElement(params.row, params.column);
         $xeTable.handleSelected(params, evnt);
     });
@@ -347,16 +359,14 @@ export default {
                             $xeTable.handleEdit(params, evnt);
                         }
                         else {
-                            $xeTable.scrollToRow(params.row, params.column)
-                                .then(() => {
+                            $xeTable.scrollToRow(params.row, params.column).then(() => {
                                 $xeTable.handleSelected(params, evnt);
                             });
                         }
                     }
                 }
                 else {
-                    $xeTable.scrollToRow(params.row, params.column)
-                        .then(() => {
+                    $xeTable.scrollToRow(params.row, params.column).then(() => {
                         $xeTable.handleSelected(params, evnt);
                     });
                 }

package/es/table/module/validator/mixin.js

@@ -117,20 +117,21 @@ function validRuleValue(rule, val, required) {
     }
     return true;
 }
-function checkRuleStatus(rule, val) {
-    const { required } = rule;
-    const isEmptyVal = XEUtils.isArray(val) ? !val.length : eqEmptyValue(val);
+function checkRuleStatus(rule, row, val) {
+    const { required, field } = rule;
+    const currVal = field ? XEUtils.get(row, field) : val;
+    const isEmptyVal = XEUtils.isArray(currVal) ? !currVal.length : eqEmptyValue(currVal);
     if (required) {
         if (isEmptyVal) {
             return false;
         }
-        if (!validRuleValue(rule, val, required)) {
+        if (!validRuleValue(rule, currVal, required)) {
             return false;
         }
     }
     else {
         if (!isEmptyVal) {
-            if (!validRuleValue(rule, val, required)) {
+            if (!validRuleValue(rule, currVal, required)) {
                 return false;
             }
         }
@@ -459,7 +460,7 @@ export default {
                                 }
                             }
                             else {
-                                if (!checkRuleStatus(rule, cellValue)) {
+                                if (!checkRuleStatus(rule, row, cellValue)) {
                                     internalData.validRuleErr = true;
                                     errorRules.push(new Rule(rule));
                                 }

package/es/table/render/index.js

@@ -725,6 +725,16 @@ function handleNumberCell(h, renderOpts, params) {
         }
         : {});
 }
+function handleFormatDatePicker(renderOpts, params) {
+    const { props = {} } = renderOpts;
+    const { cellValue } = params;
+    if (cellValue) {
+        if (props.type !== 'time') {
+            return getLabelFormatDate(cellValue, props);
+        }
+    }
+    return cellValue;
+}
 function handleFormatSelect(renderOpts, params) {
     const { cellValue } = params;
     return handleSelectCellValue(cellValue, renderOpts);
@@ -954,6 +964,7 @@ renderer.mixin({
             }
             return getCellLabelVNs(h, renderOpts, params, cellValue);
         },
+        tableCellFormatter: handleFormatDatePicker,
         renderTableDefault: defaultEditRender,
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter: defaultFilterRender,

package/es/table/src/body.js

@@ -80,7 +80,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const $xeGantt = $xeTable.$xeGantt;
     const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
     const { tableData, tableColumn, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
-    const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData;
+    const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore, keepUpdateFieldMaps } = tableInternalData;
     const cellOpts = $xeTable.computeCellOpts;
     const validOpts = $xeTable.computeValidOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -99,7 +99,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const areaOpts = $xeTable.computeAreaOpts;
     const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
     const { selectCellToRow } = areaOpts;
-    const { type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column;
+    const { field, type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column;
     const { verticalAlign: allVerticalAlign } = cellOpts;
     const { actived } = editStore;
     const rowRest = fullAllDataRowIdData[rowid] || {};
@@ -254,8 +254,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         }
     }
     // 如果编辑列开启显示状态
-    if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-        isDirty = $xeTable.isUpdateByRow(row, column.field);
+    if (!fixedHiddenColumn && editConfig && (editOpts.showStatus || editOpts.showUpdateStatus) && keepUpdateFieldMaps[field]) {
+        isDirty = $xeTable.isUpdateByRow(row, field);
     }
     const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
     let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
@@ -552,6 +552,13 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
             const expandOpts = $xeTable.computeExpandOpts;
             const { height: expandHeight, padding, mode: expandMode } = expandOpts;
             if (expandMode === 'fixed') {
+                const currExpHeight = rowRest.expandHeight;
+                let expHeight = 0;
+                if (rowExpandHeightFlag) {
+                    if (currExpHeight || expandHeight) {
+                        expHeight = (currExpHeight || expandHeight || 0) + 1;
+                    }
+                }
                 rows.push(h('tr', {
                     class: 'vxe-body--row-expanded-place',
                     key: `expand_${rowid}`,
@@ -565,7 +572,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                             colspan: tableColumn.length
                         },
                         style: {
-                            height: `${rowExpandHeightFlag ? (rowRest.expandHeight || expandHeight) : 0}px`
+                            height: `${expHeight}px`
                         }
                     })
                 ]));

package/es/table/src/column.js

@@ -133,7 +133,7 @@ export const columnProps = {
     // 内容渲染配置项
     contentRender: Object,
     // 聚合函数
-    aggFunc: [String, Boolean],
+    aggFunc: [Boolean, String],
     // 将单元格复制到剪贴板
     copyMethod: Function,
     // 将剪贴单元格的值清除

package/es/table/src/columnInfo.js

@@ -155,6 +155,8 @@ export class ColumnInfo {
             sortNumber: 0,
             renderSortNumber: 0,
             renderAggFn: '',
+            renderAggDigits: null,
+            renderAggFormat: null,
             renderFixed: '',
             renderVisible: false,
             renderWidth: 0,