vxe-table 3.4.2 → 3.4.5

package/packages/table/src/methods.js

@@ -464,16 +464,12 @@ const Methods = {
       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, this.defineField(Object.assign({}, record)))
-            this.cacheRowMap(true)
-          } else {
-            XEUtils.destructuring(oRow, XEUtils.clone(row, true))
-          }
+          const newRecord = XEUtils.clone({ ...record }, true)
+          XEUtils.destructuring(oRow, Object.assign(row, newRecord))
         }
       }
       this.tableData = tableData.slice(0)
@@ -2135,7 +2131,7 @@ const Methods = {
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, () => {
-        const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, currentRow, bodyCtxMenu } = this
+        const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, currentRow, bodyCtxMenu, rowOpts } = this
         const { selected, actived } = editStore
         const { keyCode } = evnt
         const isBack = keyCode === 8
@@ -2198,7 +2194,7 @@ const Methods = {
           this.keyCtxTimeout = setTimeout(() => {
             this._keyCtx = false
           }, 1000)
-        } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && highlightCurrentRow && currentRow))) {
+        } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
           // 退出选中
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
@@ -2227,7 +2223,7 @@ const Methods = {
                   this.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) {
@@ -2245,7 +2241,7 @@ const Methods = {
             // 如果按下了方向键
             if (selected.row && selected.column) {
               this.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt)
-            } else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+            } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
               this.moveCurrentRow(isUpArrow, isDwArrow, evnt)
             }
@@ -2257,7 +2253,7 @@ const Methods = {
           } else if (actived.row || actived.column) {
             this.moveTabSelected(actived.args, hasShiftKey, evnt)
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
             const { delMethod, backMethod } = keyboardOpts
             // 如果是删除键
@@ -2289,7 +2285,7 @@ const Methods = {
                 // 如果按下 del 键，更新表尾数据
                 this.updateFooter()
               }
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               const { parent: parentRow } = XEUtils.findTree(this.afterFullData, item => item === currentRow, treeOpts)
               if (parentRow) {
@@ -2927,6 +2923,16 @@ const Methods = {
     const { fullDataRowIdData, afterFullData, checkboxReserveRowMap, checkboxOpts, treeConfig, treeOpts } = this
     const reserveSelection = []
     if (checkboxOpts.reserve) {
+      const afterFullIdMaps = {}
+      if (treeConfig) {
+        XEUtils.eachTree(afterFullData, row => {
+          afterFullIdMaps[getRowid(this, row)] = 1
+        }, treeOpts)
+      } else {
+        afterFullData.forEach(row => {
+          afterFullIdMaps[getRowid(this, row)] = 1
+        })
+      }
       XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
         if (oldRow) {
           if (isFull) {
@@ -2934,14 +2940,8 @@ const Methods = {
               reserveSelection.push(oldRow)
             }
           } else {
-            if (treeConfig) {
-              if (!XEUtils.findTree(afterFullData, row => getRowid(this, row) === oldRowid, treeOpts)) {
-                reserveSelection.push(oldRow)
-              }
-            } else {
-              if (!afterFullData.some(row => getRowid(this, row) === oldRowid)) {
-                reserveSelection.push(oldRow)
-              }
+            if (!afterFullIdMaps[oldRowid]) {
+              reserveSelection.push(oldRow)
             }
           }
         }
@@ -3052,11 +3052,11 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setCurrentRow (row) {
-    const { $el } = this
+    const { $el, rowOpts } = this
     this.clearCurrentRow()
     this.clearCurrentColumn()
     this.currentRow = row
-    if (this.highlightCurrentRow) {
+    if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
         XEUtils.arrayEach($el.querySelectorAll(`[rowid="${getRowid(this, row)}"]`), elem => addClass(elem, 'row--current'))
       }
@@ -3102,7 +3102,7 @@ const Methods = {
    * 用于当前行，获取当前行的数据
    */
   getCurrentRecord () {
-    return this.highlightCurrentRow ? this.currentRow : null
+    return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null
   },
   /**
    * 用于单选行，获取当已选中的数据
@@ -3164,7 +3164,7 @@ const Methods = {
       this.triggerSortEvent(evnt, column, getNextSortOrder(this, column))
     }
     this.emitEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt)
-    if (this.highlightCurrentColumn) {
+    if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
       return this.setCurrentColumn(column)
     }
     return this.$nextTick()
@@ -3173,7 +3173,7 @@ const Methods = {
     this.emitEvent('header-cell-dblclick', Object.assign({ cell: evnt.currentTarget }, params), evnt)
   },
   getCurrentColumn () {
-    return this.highlightCurrentColumn ? this.currentColumn : null
+    return this.columnOpts.isCurrent || this.highlightCurrentColumn ? this.currentColumn : null
   },
   /**
    * 用于当前列，设置某列行为高亮状态
@@ -3220,7 +3220,7 @@ const Methods = {
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent (evnt, params) {
-    const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, editConfig, editOpts, checkboxOpts } = this
+    const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, editConfig, editOpts, checkboxOpts, rowOpts } = this
     const { actived } = editStore
     const { row, column } = params
     const { type, treeNode } = column
@@ -3247,7 +3247,7 @@ const Methods = {
     if (!triggerTreeNode) {
       if (!triggerExpandNode) {
         // 如果是高亮行
-        if (highlightCurrentRow) {
+        if (rowOpts.isCurrent || highlightCurrentRow) {
           if (!triggerCheckbox && !triggerRadio) {
             this.triggerCurrentRowEvent(evnt, params)
           }
@@ -3843,8 +3843,10 @@ const Methods = {
   updateVirtualTreeData () {
     const { scrollYLoad: oldScrollYLoad, treeExpandeds, treeOpts, treeFullData } = this
     const fullData = []
+    const expandMaps = new Map()
     XEUtils.eachTree(treeFullData, (row, index, items, path, parent) => {
-      if (!parent || treeExpandeds.indexOf(parent) > -1) {
+      if (!parent || (expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1)) {
+        expandMaps.set(row, 1)
         fullData.push(row)
       }
     }, treeOpts)

package/packages/table/src/table.js

@@ -976,7 +976,9 @@ export default {
       ctxMenuStore,
       ctxMenuOpts,
       footerTableData,
-      hasTip
+      hasTip,
+      columnOpts,
+      rowOpts
     } = this
     const { leftList, rightList } = columnStore
     return h('div', {
@@ -985,8 +987,8 @@ export default {
         '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.js

@@ -11,6 +11,7 @@ export default {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -18,7 +19,6 @@ export default {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,

package/packages/validator/src/mixin.js

@@ -151,21 +151,21 @@ export default {
           const ruleProps = Object.keys(validRest)
           return this.$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((resolve, reject) => {
+          return new Promise((resolve) => {
             const finish = () => {
               this.$nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  reject(validRest)
+                  resolve(validRest)
                 }
               })
             }

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import * as VXETableExport from './all'
 
 /**
- * 一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...  
+ * 一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...  
  */
 declare const VXETable: typeof VXETableExport
 

package/types/table.d.ts

@@ -803,9 +803,12 @@ export declare class Table extends VXETableComponent {
    */
   insert(records: RecordInfo | RecordInfo[]): Promise<{ row: RowInfo, rows: RowInfo[] }>;
   /**
-   * 往表格插入临时数据，从指定位置插入一行或多行；第二个参数：row 指定位置、null从第一行插入、-1 从最后插入
-   * @param records 新数据
-   * @param row 指定行
+   * 往表格指定行中插入临时数据
+   * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+   * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+   * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
+   * @param {Object/Array} records 新的数据
+   * @param {Row} row 指定行
    */
   insertAt(records: RecordInfo | RecordInfo[], row: RowInfo | -1 | null): Promise<{ row: RowInfo, rows: RowInfo[] }>;
   /**
@@ -859,9 +862,9 @@ export declare class Table extends VXETableComponent {
    */
   clearActived(): Promise<any>;
   /**
-   * 用于 mouse-config.area，用于清除鼠标选择的区域
+   * 用于 mouse-config.area，用于清除鼠标选择的区域，可以指定清除的区域
    */
-  clearCellAreas(): Promise<any>;
+  clearCellAreas(area?: number | MouseCellArea): Promise<any>;
   /**
    * 用于 edit-config，获取已激活的行数据
    */
@@ -901,9 +904,9 @@ export declare class Table extends VXETableComponent {
    * @param areaConfigs 指定区域
    */
   setCellAreas(areaConfigs: CellAreaConfig[], activeArea?: {
-    area?: MouseCellArea;
-    column: ColumnInfo;
-    row: RowInfo;
+    area?: number | MouseCellArea;
+    column?: number | ColumnInfo;
+    row?: number | RowInfo;
   }): Promise<any>;
   /**
    * 用于 mouse-config.area，设置活动的区域的单元格
@@ -911,8 +914,8 @@ export declare class Table extends VXETableComponent {
    */
   setActiveCellArea(activeArea: {
     area: MouseCellArea;
-    column: ColumnInfo;
-    row: RowInfo;
+    column: number | ColumnInfo;
+    row: number | RowInfo;
   }): Promise<any>;
   /**
    * 临时合并单元格，如果为数组则合并多个

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

@@ -27,6 +27,8 @@ export interface RendererMapOptions {
   renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): VNode[] | string[];
   filterMethod?(params: ColumnFilterMethodParams): boolean;
   filterResetMethod?(params: ColumnFilterResetParams): void;
+  // 默认行为
+  defaultFilterMethod?(params: ColumnFilterMethodParams): boolean;
 
   // 单元格渲染
   renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
@@ -66,7 +68,7 @@ export class RenderOptions {
   /**
    * 渲染器名称
    */
-  name: string;
+  name?: string;
   /**
    * 目标组件渲染的参数
    */