vxe-table 4.2.3 → 4.2.4-beta.2

package/es/table/src/body.js

@@ -338,14 +338,25 @@ export default defineComponent({
                     _rowIndex = rest._index;
                 }
                 var params = { $table: $xetable, seq: seq, rowid: rowid, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
+                // 行是否被展开
+                var isExpandRow = expandColumn && rowExpandeds.length && $xetable.findRowIndexOf(rowExpandeds, row) > -1;
+                // 树节点是否被展开
+                var isExpandTree = false;
+                var rowChildren = [];
                 // 处理新增状态
                 var isNewRow = false;
                 if (editConfig) {
                     isNewRow = $xetable.findRowIndexOf(editStore.insertList, row) > -1;
                 }
-                rows.push(h('tr', __assign({ class: ['vxe-body--row', {
+                if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
+                    rowChildren = row[treeOpts.children];
+                    isExpandTree = rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1;
+                }
+                rows.push(h('tr', __assign({ 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 && selectRow === row,
                             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
@@ -353,7 +364,7 @@ export default defineComponent({
                     return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 })));
                 // 如果行被展开了
-                if (expandColumn && rowExpandeds.length && $xetable.findRowIndexOf(rowExpandeds, row) > -1) {
+                if (isExpandRow) {
                     var cellStyle = void 0;
                     if (treeConfig) {
                         cellStyle = {
@@ -382,9 +393,9 @@ export default defineComponent({
                 }
                 // 如果是树形表格
                 if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
-                    var rowChildren = row[treeOpts.children];
-                    if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-                        rows.push.apply(rows, renderRows(fixedType, rowChildren, tableColumn));
+                    var rowChildren_1 = row[treeOpts.children];
+                    if (rowChildren_1 && rowChildren_1.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
+                        rows.push.apply(rows, renderRows(fixedType, rowChildren_1, tableColumn));
                     }
                 }
             });

package/es/table/src/emits.js

@@ -55,8 +55,10 @@ export default [
     'clear-cell-area-merge',
     'header-cell-area-selection',
     'cell-area-selection-start',
+    'cell-area-selection-drag',
     'cell-area-selection-end',
     'cell-area-extension-start',
+    'cell-area-extension-drag',
     'cell-area-extension-end',
     'cell-area-arrows-start',
     'cell-area-arrows-end',

package/es/table/src/util.js

@@ -1,4 +1,4 @@
-import { watch } from 'vue';
+import { watch, reactive } from 'vue';
 import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isPx, isScale } from '../../tools/dom';
@@ -146,7 +146,7 @@ export function isColumnInfo(column) {
     return column && (column.constructor === ColumnInfo || column instanceof ColumnInfo);
 }
 export function createColumn($xetable, options, renderOptions) {
-    return isColumnInfo(options) ? options : new ColumnInfo($xetable, options, renderOptions);
+    return isColumnInfo(options) ? options : reactive(new ColumnInfo($xetable, options, renderOptions));
 }
 export function watchColumn(props, column) {
     Object.keys(props).forEach(function (name) {

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.3" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.4-beta.2" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.3",
+    version: "4.2.4-beta.2",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/lib/index.umd.js

@@ -8802,7 +8802,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.3", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.4-beta.2", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -9614,7 +9614,7 @@ function isColumnInfo(column) {
   return column && (column.constructor === columnInfo_ColumnInfo || column instanceof columnInfo_ColumnInfo);
 }
 function util_createColumn($xetable, options, renderOptions) {
-  return isColumnInfo(options) ? options : new columnInfo_ColumnInfo($xetable, options, renderOptions);
+  return isColumnInfo(options) ? options : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(new columnInfo_ColumnInfo($xetable, options, renderOptions));
 }
 function watchColumn(props, column) {
   Object.keys(props).forEach(function (name) {
@@ -10807,7 +10807,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.3",
+  version: "4.2.4-beta.2",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -24754,7 +24754,7 @@ var es_array_sort = __webpack_require__("4e82");
   params: Object
 });
 // CONCATENATED MODULE: ./packages/table/src/emits.ts
-/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
+/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
 // CONCATENATED MODULE: ./packages/grid/src/grid.ts
 
 
@@ -31818,7 +31818,12 @@ var lineOffsetSizes = {
           rowIndex: rowIndex,
           $rowIndex: $rowIndex,
           _rowIndex: _rowIndex
-        }; // 处理新增状态
+        }; // 行是否被展开
+
+        var isExpandRow = expandColumn && rowExpandeds.length && $xetable.findRowIndexOf(rowExpandeds, row) > -1; // 树节点是否被展开
+
+        var isExpandTree = false;
+        var rowChildren = []; // 处理新增状态
 
         var isNewRow = false;
 
@@ -31826,10 +31831,17 @@ var lineOffsetSizes = {
           isNewRow = $xetable.findRowIndexOf(editStore.insertList, row) > -1;
         }
 
+        if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
+          rowChildren = row[treeOpts.children];
+          isExpandTree = rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1;
+        }
+
         rows.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('tr', _objectSpread2({
-          class: ['vxe-body--row', {
+          class: ['vxe-body--row', treeConfig ? "row--level-".concat(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 && selectRow === row,
             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
@@ -31841,7 +31853,7 @@ var lineOffsetSizes = {
           return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         }))); // 如果行被展开了
 
-        if (expandColumn && rowExpandeds.length && $xetable.findRowIndexOf(rowExpandeds, row) > -1) {
+        if (isExpandRow) {
           var cellStyle;
 
           if (treeConfig) {
@@ -31882,10 +31894,10 @@ var lineOffsetSizes = {
 
 
         if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
-          var rowChildren = row[treeOpts.children];
+          var _rowChildren = row[treeOpts.children];
 
-          if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-            rows.push.apply(rows, _toConsumableArray(renderRows(fixedType, rowChildren, tableColumn)));
+          if (_rowChildren && _rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
+            rows.push.apply(rows, _toConsumableArray(renderRows(fixedType, _rowChildren, tableColumn)));
           }
         }
       });