vxe-table 3.20.0-beta.9 → 3.20.1

package/packages/table/module/keyboard/mixin.ts

@@ -79,9 +79,18 @@ function handleMoveSelected ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
 
   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 as any).$el as HTMLDivElement : 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
@@ -99,7 +108,9 @@ function handleMoveSelected ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
     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)
   })
@@ -335,17 +346,15 @@ export default {
             if (editOpts.mode === 'row') {
               $xeTable.handleEdit(params, evnt)
             } else {
-              $xeTable.scrollToRow(params.row, params.column)
-                .then(() => {
-                  $xeTable.handleSelected(params, evnt)
-                })
+              $xeTable.scrollToRow(params.row, params.column).then(() => {
+                $xeTable.handleSelected(params, evnt)
+              })
             }
           }
         } else {
-          $xeTable.scrollToRow(params.row, params.column)
-            .then(() => {
-              $xeTable.handleSelected(params, evnt)
-            })
+          $xeTable.scrollToRow(params.row, params.column).then(() => {
+            $xeTable.handleSelected(params, evnt)
+          })
         }
       }
     },

package/packages/table/module/validator/mixin.ts

@@ -122,19 +122,20 @@ function validRuleValue (rule: VxeTableDefines.ValidatorRule, val: any, required
   return true
 }
 
-function checkRuleStatus (rule: VxeTableDefines.ValidatorRule, val: any) {
-  const { required } = rule
-  const isEmptyVal = XEUtils.isArray(val) ? !val.length : eqEmptyValue(val)
+function checkRuleStatus (rule: VxeTableDefines.ValidatorRule, row: any, val: any) {
+  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
       }
     }
@@ -473,7 +474,7 @@ export default {
                   }
                 }
               } else {
-                if (!checkRuleStatus(rule, cellValue)) {
+                if (!checkRuleStatus(rule, row, cellValue)) {
                   internalData.validRuleErr = true
                   errorRules.push(new Rule(rule))
                 }

package/packages/table/render/index.ts

@@ -793,6 +793,17 @@ function handleNumberCell (h: CreateElement, renderOpts: VxeGlobalRendererHandle
     : {})
 }
 
+function handleFormatDatePicker (renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.TableCellFormatterParams) {
+  const { props = {} } = renderOpts
+  const { cellValue } = params
+  if (cellValue) {
+    if (props.type !== 'time') {
+      return getLabelFormatDate(cellValue, props)
+    }
+  }
+  return cellValue
+}
+
 function handleFormatSelect (renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.TableCellFormatterParams | VxeGlobalRendererHandles.TableCellCopyMethodParams) {
   const { cellValue } = params
   return handleSelectCellValue(cellValue, renderOpts)
@@ -1022,6 +1033,7 @@ renderer.mixin({
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue)
     },
+    tableCellFormatter: handleFormatDatePicker,
     renderTableDefault: defaultEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,

package/packages/table/src/body.ts

@@ -106,7 +106,7 @@ function renderTdColumn (
 
   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
@@ -125,7 +125,7 @@ function renderTdColumn (
   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] || {}
@@ -280,8 +280,8 @@ function renderTdColumn (
     }
   }
   // 如果编辑列开启显示状态
-  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)
@@ -598,6 +598,13 @@ function renderRows (h: CreateElement, _vm: any, fixedType: 'left' | 'right' | '
       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',
@@ -612,7 +619,7 @@ function renderRows (h: CreateElement, _vm: any, fixedType: 'left' | 'right' | '
                 colspan: tableColumn.length
               },
               style: {
-                height: `${rowExpandHeightFlag ? (rowRest.expandHeight || expandHeight) : 0}px`
+                height: `${expHeight}px`
               }
             })
           ])

package/packages/table/src/column.ts

@@ -138,7 +138,7 @@ export const columnProps = {
   contentRender: Object,
 
   // 聚合函数
-  aggFunc: [String, Boolean] as PropType<VxeColumnPropTypes.AggFunc>,
+  aggFunc: [Boolean, String] as PropType<VxeColumnPropTypes.AggFunc>,
   // 将单元格复制到剪贴板
   copyMethod: Function as PropType<VxeColumnPropTypes.CopyMethod>,
   // 将剪贴单元格的值清除

package/packages/table/src/columnInfo.ts

@@ -174,6 +174,8 @@ export class ColumnInfo {
       renderSortNumber: 0, // 用于记录自定义列顺序
 
       renderAggFn: '',
+      renderAggDigits: null,
+      renderAggFormat: null,
 
       renderFixed: '',
       renderVisible: false,