vxe-table 3.10.15 → 3.11.0

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

@@ -72,7 +72,7 @@ export default {
                     warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
                 }
             }
-            return this.beginValidate(rows, cb, true);
+            return this.beginValidate(rows, null, cb, true);
         },
         /**
          * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
@@ -83,7 +83,27 @@ export default {
                     warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
                 }
             }
-            return this.beginValidate(rows, cb);
+            return this.beginValidate(rows, null, cb);
+        },
+        /**
+         * 完整校验单元格，和 validateField 的区别就是会给有效数据中的每一行进行校验
+         */
+        _fullValidateField(rows, fieldOrColumn) {
+            const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn(this, column));
+            if (colList.length) {
+                return this.beginValidate(rows, colList, null, true);
+            }
+            return this.$nextTick();
+        },
+        /**
+         * 快速校验单元格，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
+         */
+        _validateField(rows, fieldOrColumn) {
+            const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn(this, column));
+            if (colList.length) {
+                return this.beginValidate(rows, colList, null);
+            }
+            return this.$nextTick();
         },
         /**
          * 聚焦到校验通过的单元格并弹出校验错误提示
@@ -126,7 +146,7 @@ export default {
          * 如果只传 callback 否则默认验证整个表格数据
          * 返回 Promise 对象，或者使用回调方式
          */
-        beginValidate(rows, cb, isFull) {
+        beginValidate(rows, cols, cb, isFull) {
             const validRest = {};
             const { editRules, afterFullData, visibleColumn, treeConfig, treeOpts } = this;
             const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -151,12 +171,13 @@ export default {
             this.clearValidate();
             const validErrMaps = {};
             if (editRules) {
-                const columns = this.getColumns();
+                const columns = cols && cols.length ? cols : this.getColumns();
                 const handleVaild = (row) => {
                     if (isFull || !this.validRuleErr) {
                         const colVailds = [];
                         columns.forEach((column) => {
-                            if ((isFull || !this.validRuleErr) && XEUtils.has(editRules, column.property)) {
+                            const field = XEUtils.isString(column) ? column : column.field;
+                            if ((isFull || !this.validRuleErr) && XEUtils.has(editRules, field)) {
                                 colVailds.push(this.validCellRules('all', row, column)
                                     .catch(({ rule, rules }) => {
                                     const rest = {
@@ -166,11 +187,11 @@ export default {
                                         row,
                                         columnIndex: this.getColumnIndex(column),
                                         column,
-                                        field: column.property,
+                                        field,
                                         $table: this
                                     };
-                                    if (!validRest[column.property]) {
-                                        validRest[column.property] = [];
+                                    if (!validRest[field]) {
+                                        validRest[field] = [];
                                     }
                                     validErrMaps[`${getRowid(this, row)}:${column.id}`] = {
                                         column,
@@ -178,7 +199,7 @@ export default {
                                         rule,
                                         content: rule.content
                                     };
-                                    validRest[column.property].push(rest);
+                                    validRest[field].push(rest);
                                     if (!isFull) {
                                         this.validRuleErr = true;
                                         return Promise.reject(rest);
@@ -376,7 +397,7 @@ export default {
             const { validOpts, validErrorMaps } = this;
             const validTip = this.$refs.validTip;
             const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : []);
-            const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn(this, column)));
+            const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn(this, column));
             let validErrMaps = {};
             if (validTip && validTip.visible) {
                 validTip.close();

package/es/table/src/body.js

@@ -270,7 +270,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }, tdVNs);
 }
 function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
-    const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowList, pendingRowMaps } = $xeTable;
+    const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowList, pendingRowMaps, columnOpts, isDragColMove } = $xeTable;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const rows = [];
     tableData.forEach((row, $rowIndex) => {
@@ -325,31 +325,47 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
             rowChildren = row[childrenField];
             isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid];
         }
-        rows.push(h('tr', {
-            class: [
-                'vxe-body--row',
-                treeConfig ? `row--level-${rowLevel}` : '',
-                {
-                    'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
-                    'is--new': isNewRow,
-                    'is--expand-row': isExpandRow,
-                    'is--expand-tree': isExpandTree,
-                    'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
-                    'row--radio': radioOpts.highlight && $xeTable.selectRadioRow === row,
-                    'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                    'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
-                },
-                rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''
-            ],
-            attrs: {
-                rowid
+        const trClass = [
+            'vxe-body--row',
+            treeConfig ? `row--level-${rowLevel}` : '',
+            {
+                'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
+                'is--new': isNewRow,
+                'is--expand-row': isExpandRow,
+                'is--expand-tree': isExpandTree,
+                'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
+                'row--radio': radioOpts.highlight && $xeTable.selectRadioRow === row,
+                'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
+                'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
             },
-            style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-            key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
-            on: trOn
-        }, tableColumn.map((column, $columnIndex) => {
+            rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''
+        ];
+        const tdVNs = tableColumn.map((column, $columnIndex) => {
             return renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
-        })));
+        });
+        rows.push(columnOpts.drag
+            ? h('transition-group', {
+                props: {
+                    tag: 'tr',
+                    name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`
+                },
+                class: trClass,
+                attrs: {
+                    rowid
+                },
+                style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
+                key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
+                nativeOn: trOn
+            }, tdVNs)
+            : h('tr', {
+                class: trClass,
+                attrs: {
+                    rowid
+                },
+                style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
+                key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
+                on: trOn
+            }, tdVNs));
         // 如果行被展开了
         if (isExpandRow) {
             const { height: expandHeight, padding } = expandOpts;

package/es/table/src/cell.js

@@ -45,9 +45,12 @@ function renderTitleSuffixIcon(h, params) {
 }
 function renderCellDragIcon(h, params) {
     const { $table } = params;
-    const dragOpts = $table.computeDragOpts;
-    const { rowIcon, rowDisabledMethod } = dragOpts;
-    const isDisabled = rowDisabledMethod && rowDisabledMethod(params);
+    const tableProps = $table;
+    const { dragConfig } = tableProps;
+    const rowDragOpts = $table.computeRowDragOpts;
+    const { icon, disabledMethod } = rowDragOpts;
+    const rDisabledMethod = disabledMethod || (dragConfig ? dragConfig.rowDisabledMethod : null);
+    const isDisabled = rDisabledMethod && rDisabledMethod(params);
     return h('span', {
         key: 'dg',
         class: ['vxe-cell--drag-handle', {
@@ -63,26 +66,66 @@ function renderCellDragIcon(h, params) {
         }
     }, [
         h('i', {
-            class: rowIcon || getIcon().TABLE_DRAG_ROW
+            class: icon || (dragConfig ? dragConfig.rowIcon : '') || getIcon().TABLE_DRAG_ROW
         })
     ]);
 }
 function renderCellBaseVNs(h, params, content) {
-    const { $table, column, row, level } = params;
+    const { $table, column, level } = params;
     const { dragSort } = column;
     const tableProps = $table;
-    const { treeConfig } = tableProps;
+    const { treeConfig, dragConfig } = tableProps;
     const rowOpts = $table.computeRowOpts;
-    const dragOpts = $table.computeDragOpts;
-    const { showRowIcon, rowVisibleMethod } = dragOpts;
+    const rowDragOpts = $table.computeRowDragOpts;
+    const { showIcon, visibleMethod } = rowDragOpts;
+    const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
     const vns = XEUtils.isArray(content) ? content : [content];
-    if (dragSort && rowOpts.drag && (showRowIcon && (!rowVisibleMethod || rowVisibleMethod({ row, column })))) {
+    if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
         if (!treeConfig || !level) {
             vns.unshift(renderCellDragIcon(h, params));
         }
     }
     return vns;
 }
+function renderHeaderCellDragIcon(h, params) {
+    const { $table, column } = params;
+    const columnOpts = $table.computeColumnOpts;
+    const columnDragOpts = $table.computeColumnDragOpts;
+    const { showIcon, icon, visibleMethod, disabledMethod } = columnDragOpts;
+    const isDisabled = disabledMethod && disabledMethod(params);
+    if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
+        if (!(column.fixed || column.parentId)) {
+            return h('span', {
+                key: 'dg',
+                class: ['vxe-cell--drag-handle', {
+                        'is--disabled': isDisabled
+                    }],
+                on: {
+                    mousedown(evnt) {
+                        if (!isDisabled) {
+                            $table.handleHeaderCellDragMousedownEvent(evnt, params);
+                        }
+                    },
+                    mouseup: $table.handleHeaderCellDragMouseupEvent
+                }
+            }, [
+                h('i', {
+                    class: icon || getIcon().TABLE_DRAG_COLUMN
+                })
+            ]);
+        }
+    }
+    return renderEmptyElement($table);
+}
+function renderHeaderCellBaseVNs(h, params, content) {
+    const vns = [
+        renderTitlePrefixIcon(h, params),
+        renderHeaderCellDragIcon(h, params),
+        ...(XEUtils.isArray(content) ? content : [content]),
+        renderTitleSuffixIcon(h, params)
+    ];
+    return vns;
+}
 function renderTitleContent(h, params, content) {
     const { $table, column } = params;
     const { type, showHeaderOverflow } = column;
@@ -245,7 +288,7 @@ export const Cell = {
         return createColumn($xetable, _vm, renMaps);
     },
     /**
-     * 单元格
+     * 列头标题
      */
     renderHeaderTitle(h, params) {
         const { $table, column } = params;
@@ -264,7 +307,7 @@ export const Cell = {
         return renderTitleContent(h, params, formatText(column.getTitle(), 1));
     },
     renderDefaultHeader(h, params) {
-        return renderTitlePrefixIcon(h, params).concat(Cell.renderHeaderTitle(h, params)).concat(renderTitleSuffixIcon(h, params));
+        return renderHeaderCellBaseVNs(h, params, Cell.renderHeaderTitle(h, params));
     },
     renderDefaultCell(h, params) {
         const { $table, row, column } = params;
@@ -371,12 +414,12 @@ export const Cell = {
         ];
     },
     /**
-     * 索引
+     * 序号
      */
     renderSeqHeader(h, params) {
         const { $table, column } = params;
         const { slots } = column;
-        return renderTitleContent(h, params, slots && slots.header ? $table.callSlot(slots.header, params, h) : formatText(column.getTitle(), 1));
+        return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, slots && slots.header ? $table.callSlot(slots.header, params, h) : formatText(column.getTitle(), 1)));
     },
     renderSeqCell(h, params) {
         const { $table, column } = params;
@@ -402,13 +445,13 @@ export const Cell = {
         const { slots } = column;
         const headerSlot = slots ? slots.header : null;
         const titleSlot = slots ? slots.title : null;
-        return renderTitleContent(h, params, headerSlot
+        return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, headerSlot
             ? $table.callSlot(headerSlot, params, h)
             : [
                 h('span', {
                     class: 'vxe-radio--label'
                 }, titleSlot ? $table.callSlot(titleSlot, params, h) : formatText(column.getTitle(), 1))
-            ]);
+            ]));
     },
     renderRadioCell(h, params) {
         const { $table, column, isHidden } = params;
@@ -485,16 +528,16 @@ export const Cell = {
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate });
         if (headerSlot) {
-            return renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h));
+            return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
         }
         if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
-            return renderTitleContent(h, checkboxParams, [
+            return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
                 h('span', {
                     class: 'vxe-checkbox--label'
                 }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
-            ]);
+            ]));
         }
-        return renderTitleContent(h, checkboxParams, [
+        return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
             h('span', {
                 class: ['vxe-cell--checkbox', {
                         'is--checked': isAllCheckboxSelected,
@@ -516,7 +559,7 @@ export const Cell = {
                     }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
                 ]
                 : []))
-        ]);
+        ]));
     },
     renderCheckboxCell(h, params) {
         const { $table, row, column, isHidden } = params;
@@ -722,15 +765,13 @@ export const Cell = {
      * 排序和筛选
      */
     renderSortAndFilterHeader(h, params) {
-        return Cell.renderDefaultHeader(h, params)
-            .concat(Cell.renderSortIcon(h, params))
-            .concat(Cell.renderFilterIcon(h, params));
+        return renderHeaderCellBaseVNs(h, params, Cell.renderHeaderTitle(h, params).concat(Cell.renderSortIcon(h, params)));
     },
     /**
      * 排序
      */
     renderSortHeader(h, params) {
-        return Cell.renderDefaultHeader(h, params).concat(Cell.renderSortIcon(h, params));
+        return renderHeaderCellBaseVNs(h, params, Cell.renderHeaderTitle(h, params).concat(Cell.renderSortIcon(h, params)));
     },
     renderSortIcon(h, params) {
         const { $table, column } = params;
@@ -776,7 +817,7 @@ export const Cell = {
      * 筛选
      */
     renderFilterHeader(h, params) {
-        return Cell.renderDefaultHeader(h, params).concat(Cell.renderFilterIcon(h, params));
+        return renderHeaderCellBaseVNs(h, params, Cell.renderHeaderTitle(h, params).concat(Cell.renderFilterIcon(h, params)));
     },
     renderFilterIcon(h, params) {
         const { $table, column, hasFilter } = params;
@@ -820,22 +861,24 @@ export const Cell = {
                 isRequired = columnRules.some((rule) => rule.required);
             }
         }
-        return (isEnableConf(editConfig)
-            ? [
+        let editIconVNs = [];
+        if (isEnableConf(editConfig)) {
+            editIconVNs = [
                 isRequired && editOpts.showAsterisk
                     ? h('i', {
                         class: 'vxe-cell--required-icon'
                     })
-                    : null,
+                    : renderEmptyElement($table),
                 isEnableConf(editRender) && editOpts.showIcon
                     ? h('i', {
                         class: ['vxe-cell--edit-icon', editOpts.icon || getIcon().TABLE_EDIT]
                     })
-                    : null
-            ]
-            : []).concat(Cell.renderDefaultHeader(h, params))
+                    : renderEmptyElement($table)
+            ];
+        }
+        return renderHeaderCellBaseVNs(h, params, editIconVNs.concat(Cell.renderHeaderTitle(h, params))
             .concat(sortable || remoteSort ? Cell.renderSortIcon(h, params) : [])
-            .concat(filters ? Cell.renderFilterIcon(h, params) : []);
+            .concat(filters ? Cell.renderFilterIcon(h, params) : []));
     },
     // 行格编辑模式
     renderRowEdit(h, params) {