vxe-table 4.1.4 → 4.1.7

package/packages/table/src/table.ts

@@ -2313,16 +2313,12 @@ export default defineComponent({
           const oRow = tableSourceData[rowIndex]
           if (oRow && row) {
             if (field) {
-              XEUtils.set(oRow, field, XEUtils.get(record || row, field))
+              const newValue = XEUtils.get(record || row, field)
+              XEUtils.set(row, field, newValue)
+              XEUtils.set(oRow, field, newValue)
             } else {
-              if (record) {
-                tableSourceData[rowIndex] = record
-                XEUtils.clear(row, undefined)
-                Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)))
-                tablePrivateMethods.cacheRowMap(true)
-              } else {
-                XEUtils.destructuring(oRow, XEUtils.clone(row, true))
-              }
+              const newRecord = XEUtils.clone({ ...record }, true)
+              XEUtils.destructuring(oRow, Object.assign(row, newRecord))
             }
           }
           reactData.tableData = tableData.slice(0)
@@ -2341,8 +2337,8 @@ export default defineComponent({
         const { tableSourceData, fullDataRowIdData, fullAllDataRowIdData } = internalData
         const treeOpts = computeTreeOpts.value
         const { children } = treeOpts
-        const rest = fullAllDataRowIdData[getRowid($xetable, row)]
-        const parentLevel = rest ? rest.level : 0
+        const parentRest = fullAllDataRowIdData[getRowid($xetable, row)]
+        const parentLevel = parentRest ? parentRest.level : 0
         return tableMethods.createData(childRecords).then((rows) => {
           if (keepSource) {
             const rowid = getRowid($xetable, row)
@@ -3090,6 +3086,16 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const reserveSelection: any[] = []
         if (checkboxOpts.reserve) {
+          const afterFullIdMaps: { [key: string]: number } = {}
+          if (treeConfig) {
+            XEUtils.eachTree(afterFullData, row => {
+              afterFullIdMaps[getRowid($xetable, row)] = 1
+            }, treeOpts)
+          } else {
+            afterFullData.forEach(row => {
+              afterFullIdMaps[getRowid($xetable, row)] = 1
+            })
+          }
           XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
             if (oldRow) {
               if (isFull) {
@@ -3097,14 +3103,8 @@ export default defineComponent({
                   reserveSelection.push(oldRow)
                 }
               } else {
-                if (treeConfig) {
-                  if (!XEUtils.findTree(afterFullData, row => getRowid($xetable, row) === oldRowid, treeOpts)) {
-                    reserveSelection.push(oldRow)
-                  }
-                } else {
-                  if (!afterFullData.some(row => getRowid($xetable, row) === oldRowid)) {
-                    reserveSelection.push(oldRow)
-                  }
+                if (!afterFullIdMaps[oldRowid]) {
+                  reserveSelection.push(oldRow)
                 }
               }
             }
@@ -3154,11 +3154,12 @@ export default defineComponent({
        * @param {Row} row 行对象
        */
       setCurrentRow (row) {
+        const rowOpts = computeRowOpts.value
         const el = refElem.value
         tableMethods.clearCurrentRow()
         tableMethods.clearCurrentColumn()
         reactData.currentRow = row
-        if (props.highlightCurrentRow) {
+        if (rowOpts.isCurrent || props.highlightCurrentRow) {
           if (el) {
             XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xetable, row)}"]`), elem => addClass(elem, 'row--current'))
           }
@@ -3204,7 +3205,8 @@ export default defineComponent({
        * 用于当前行，获取当前行的数据
        */
       getCurrentRecord () {
-        return props.highlightCurrentRow ? reactData.currentRow : null
+        const rowOpts = computeRowOpts.value
+        return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null
       },
       /**
        * 用于单选行，获取当已选中的数据
@@ -3228,7 +3230,7 @@ export default defineComponent({
                 return selectRow
               }
             } else {
-              if (afterFullData.indexOf(selectRow) > -1) {
+              if ($xetable.findRowIndexOf(afterFullData, selectRow) > -1) {
                 return selectRow
               }
             }
@@ -3237,7 +3239,8 @@ export default defineComponent({
         return null
       },
       getCurrentColumn () {
-        return props.highlightCurrentColumn ? reactData.currentColumn : null
+        const columnOpts = computeColumnOpts.value
+        return columnOpts.isCurrent || props.highlightCurrentColumn ? reactData.currentColumn : null
       },
       /**
        * 用于当前列，设置某列行为高亮状态
@@ -3990,6 +3993,7 @@ export default defineComponent({
       const { mouseConfig, keyboardConfig } = props
       const { filterStore, ctxMenuStore, editStore } = reactData
       const mouseOpts = computeMouseOpts.value
+      const keyboardOpts = computeKeyboardOpts.value
       const { actived } = editStore
       const isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE)
       if (isEsc) {
@@ -4003,13 +4007,15 @@ export default defineComponent({
               $xetable.closeMenu()
             }
             tableMethods.closeFilter()
-            // 如果是激活编辑状态，则取消编辑
-            if (actived.row) {
-              const params = actived.args
-              $xetable.clearActived(evnt)
-              // 如果配置了选中功能，则为选中状态
-              if (mouseOpts.selected) {
-                nextTick(() => $xetable.handleSelected(params, evnt))
+            if (keyboardConfig && keyboardOpts.isEsc) {
+              // 如果是激活编辑状态，则取消编辑
+              if (actived.row) {
+                const params = actived.args
+                $xetable.clearActived(evnt)
+                // 如果配置了选中功能，则为选中状态
+                if (mouseOpts.selected) {
+                  nextTick(() => $xetable.handleSelected(params, evnt))
+                }
               }
             }
           }
@@ -4034,6 +4040,7 @@ export default defineComponent({
           const editOpts = computeEditOpts.value
           const treeOpts = computeTreeOpts.value
           const menuList = computeMenuList.value
+          const rowOpts = computeRowOpts.value
           const { selected, actived } = editStore
           const keyCode = evnt.keyCode
           const isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE)
@@ -4072,7 +4079,7 @@ export default defineComponent({
               $xetable.closeMenu()
             }
             tableMethods.closeFilter()
-            if (actived.row) {
+            if (keyboardConfig && keyboardOpts.isEsc) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 const params = actived.args
@@ -4106,7 +4113,7 @@ export default defineComponent({
             keyCtxTimeout = setTimeout(() => {
               internalData._keyCtx = false
             }, 1000)
-          } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && highlightCurrentRow && currentRow))) {
+          } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
             // 退出选中
             if (hasCtrlKey) {
               // 如果是激活编辑状态，则取消编辑
@@ -4135,7 +4142,7 @@ export default defineComponent({
                     $xetable.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt)
                   }
                 }
-              } else if (treeConfig && highlightCurrentRow && currentRow) {
+              } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果是树形表格当前行回车移动到子节点
                 const childrens = currentRow[treeOpts.children]
                 if (childrens && childrens.length) {
@@ -4158,7 +4165,7 @@ export default defineComponent({
               // 如果按下了方向键
               if (selected.row && selected.column) {
                 $xetable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt)
-              } else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+              } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                 // 当前行按键上下移动
                 $xetable.moveCurrentRow(isUpArrow, isDwArrow, evnt)
               }
@@ -4170,7 +4177,7 @@ export default defineComponent({
             } else if (actived.row || actived.column) {
               $xetable.moveTabSelected(actived.args, hasShiftKey, evnt)
             }
-          } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+          } else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
             if (!isEditStatus) {
               const { delMethod, backMethod } = keyboardOpts
               // 如果是删除键
@@ -4202,7 +4209,7 @@ export default defineComponent({
                   // 如果按下 del 键，更新表尾数据
                   tableMethods.updateFooter()
                 }
-              } else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+              } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果树形表格回退键关闭当前行返回父节点
                 const { parent: parentRow } = XEUtils.findTree(internalData.afterFullData, item => item === currentRow, treeOpts)
                 if (parentRow) {
@@ -4827,6 +4834,7 @@ export default defineComponent({
       triggerHeaderCellClickEvent (evnt, params) {
         const { _lastResizeTime } = internalData
         const sortOpts = computeSortOpts.value
+        const columnOpts = computeColumnOpts.value
         const { column } = params
         const cell = evnt.currentTarget
         const triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300
@@ -4836,7 +4844,7 @@ export default defineComponent({
           tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column))
         }
         tableMethods.dispatchEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt)
-        if (props.highlightCurrentColumn) {
+        if (columnOpts.isCurrent || props.highlightCurrentColumn) {
           tableMethods.setCurrentColumn(column)
         }
       },
@@ -4856,6 +4864,7 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const radioOpts = computeRadioOpts.value
         const checkboxOpts = computeCheckboxOpts.value
+        const rowOpts = computeRowOpts.value
         const { actived } = editStore
         const { row, column } = params
         const { type, treeNode } = column
@@ -4882,7 +4891,7 @@ export default defineComponent({
         if (!triggerTreeNode) {
           if (!triggerExpandNode) {
             // 如果是高亮行
-            if (highlightCurrentRow) {
+            if (rowOpts.isCurrent || highlightCurrentRow) {
               if (!triggerCheckbox && !triggerRadio) {
                 tablePrivateMethods.triggerCurrentRowEvent(evnt, params)
               }
@@ -5189,6 +5198,7 @@ export default defineComponent({
         tablePrivateMethods.handleTableData()
         tablePrivateMethods.updateScrollYSpace()
       },
+      updateVirtualTreeData,
       /**
        * 处理固定列的显示状态
        */
@@ -5677,6 +5687,8 @@ export default defineComponent({
       const { leftList, rightList } = columnStore
       const tooltipOpts = computeTooltipOpts.value
       const treeOpts = computeTreeOpts.value
+      const rowOpts = computeRowOpts.value
+      const columnOpts = computeColumnOpts.value
       const vSize = computeSize.value
       const tableBorder = computeTableBorder.value
       const mouseOpts = computeMouseOpts.value
@@ -5691,8 +5703,8 @@ export default defineComponent({
           'cell--highlight': highlightCell,
           'cell--selected': mouseConfig && mouseOpts.selected,
           'cell--area': mouseConfig && mouseOpts.area,
-          'row--highlight': highlightHoverRow,
-          'column--highlight': highlightHoverColumn,
+          'row--highlight': rowOpts.isHover || highlightHoverRow,
+          'column--highlight': columnOpts.isHover || highlightHoverColumn,
           'is--header': showHeader,
           'is--footer': showFooter,
           'is--group': isGroup,

package/packages/v-x-e-table/src/conf.ts

@@ -13,6 +13,7 @@ const GlobalConfig: VXETableGlobalConfig = {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -20,7 +21,6 @@ const GlobalConfig: VXETableGlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,
@@ -93,6 +93,9 @@ const GlobalConfig: VXETableGlobalConfig = {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },

package/packages/v-x-e-table/src/renderer.ts

@@ -685,7 +685,7 @@ export const renderer: VxeGlobalRenderer = {
     XEUtils.each(opts, (options, name) => renderer.add(name, options))
     return renderer
   },
-  get (name) {
+  get (name: string) {
     return renderMap[name] || null
   },
   add (name, options) {

package/packages/validator/src/hook.ts

@@ -149,21 +149,21 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
           const ruleProps = Object.keys(validRest)
           return nextTick().then(() => {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0])
+              return validRest[ruleProps[0]][0]
             }
             if (cb) {
               cb()
             }
           })
         }).catch(firstErrParams => {
-          return new Promise<void>((resolve, reject) => {
+          return new Promise<void>((resolve) => {
             const finish = () => {
               nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  reject(validRest)
+                  resolve(validRest)
                 }
               })
             }

package/types/edit.d.ts

@@ -13,9 +13,12 @@ export interface TableEditMethods {
    */
   insert(records: RecordInfo | RecordInfo[]): Promise<{ row: any, rows: any[] }>;
   /**
-   * 往表格插入临时数据，从指定位置插入一行或多行；第二个参数：row 指定位置、null从第一行插入、-1 从最后插入
-   * @param records 新数据
-   * @param row 指定行
+   * 往表格指定行中插入临时数据
+   * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+   * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+   * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
+   * @param {Object/Array} records 新的数据
+   * @param {Row} row 指定行
    */
   insertAt(records: RecordInfo | RecordInfo[], row: any | -1 | null): Promise<{ row: any, rows: any[] }>;
   /**

package/types/plugins/pro.d.ts

@@ -28,9 +28,9 @@ export interface VxeTableProMethods {
    */
   pasteCellArea(): Promise<any>;
   /**
-   * 用于 mouse-config.area，用于清除鼠标选择的区域
+   * 用于 mouse-config.area，用于清除鼠标选择的区域，可以指定清除的区域
    */
-  clearCellAreas(): Promise<any>;
+  clearCellAreas(area?: number | VxeTableProDefines.MouseCellArea): Promise<any>;
   /**
    * 用于 mouse-config.area，手动清除标记为复制粘贴的区域
    */
@@ -40,9 +40,9 @@ export interface VxeTableProMethods {
    * @param areaConfigs 指定区域
    */
   setCellAreas(areaConfigs: VxeTableProDefines.CellAreaConfig[], activeArea?: {
-    area?: VxeTableProDefines.CellAreaConfig;
-    column: VxeTableDefines.ColumnInfo;
-    row: any;
+    area?: number | VxeTableProDefines.CellAreaConfig;
+    column?: number | VxeTableDefines.ColumnInfo;
+    row?: any;
   }): Promise<any>;
   /**
    * 用于 mouse-config.area，设置活动的区域的单元格
@@ -148,7 +148,7 @@ export namespace VxeTableProDefines {
   }
 
   export interface ActiveCellAreaConfig {
-    area: VxeTableProDefines.MouseCellArea;
+    area: VxeTableProDefines.MouseCellArea | number;
     column: VxeTableDefines.ColumnInfo | number;
     row: any;
   }

package/types/table.d.ts

@@ -707,6 +707,7 @@ export interface TablePrivateMethods {
   updateScrollYSpace(): void;
   updateScrollXData(): void;
   updateScrollYData(): void;
+  updateVirtualTreeData(): Promise<any>;
   checkScrolling(): void;
   updateZindex(): void;
   updateCellAreas(): void;
@@ -1208,6 +1209,8 @@ export namespace VxeTablePropTypes {
    * 列配置信息
    */
   export interface ColumnConfig {
+    isCurrent?: boolean;
+    isHover?: boolean;
     resizable?: VxeColumnPropTypes.Resizable;
     width?: VxeColumnPropTypes.Width;
     minWidth?: VxeColumnPropTypes.MinWidth;
@@ -1218,6 +1221,8 @@ export namespace VxeTablePropTypes {
    * 行配置信息
    */
   export interface RowConfig {
+    isCurrent?: boolean;
+    isHover?: boolean;
     height?: number;
   }
   export interface RowOpts extends RowConfig { }
@@ -1550,6 +1555,10 @@ export namespace VxeTablePropTypes {
      * 是否开启非编辑状态下，上下左右移动功能
      */
     isArrow?: boolean;
+    /**
+     * 是否开启Esc键退出编辑功能
+     */
+    isEsc?: boolean;
     /**
      * 是否开启删除键功能
      */

package/types/v-x-e-table/renderer.d.ts

@@ -17,6 +17,8 @@ export interface DefineRendererOption<T> {
   filterRemoteMethod?(params: VxeGlobalRendererHandles.FilterRemoteMethod): boolean;
   filterResetMethod?(params: VxeGlobalRendererHandles.FilterResetMethodParams): void;
   filterRecoverMethod?(params: VxeGlobalRendererHandles.FilterRecoverMethodParams): void;
+  // 默认行为
+  defaultFilterMethod?(params: VxeGlobalRendererHandles.FilterMethodParams): boolean;
 
   // 单元格渲染
   renderHeader?(renderOpts: VxeGlobalRendererHandles.RenderHeaderOptions, params: VxeGlobalRendererHandles.RenderHeaderParams): T;
@@ -197,7 +199,7 @@ export namespace VxeGlobalRendererHandles {
     /**
      * 渲染器名称
      */
-    name: string;
+    name?: string;
     /**
      * 目标组件渲染的参数
      */
@@ -246,7 +248,7 @@ export interface VxeGlobalRenderer {
   mixin(options: {
     [name: string]: RendererOptions;
   }): VxeGlobalRenderer;
-  get(name: string): DefineRendererOption<VxeGlobalRendererHandles.RenderResult>;
+  get(name: string | null | undefined): DefineRendererOption<VxeGlobalRendererHandles.RenderResult>;
   add(name: string, options: RendererOptions): VxeGlobalRenderer;
   delete(name: string): void;
 }