vxe-table 4.1.13 → 4.1.15-beta.2

package/es/input/src/input.js

@@ -2023,6 +2023,19 @@ export default defineComponent({
             reactData.inputValue = val;
             changeValue();
         });
+        watch(function () { return props.type; }, function () {
+            // 切换类型是重置内置变量
+            Object.assign(reactData, {
+                inputValue: props.modelValue,
+                datetimePanelValue: null,
+                datePanelValue: null,
+                datePanelLabel: '',
+                datePanelType: 'day',
+                selectMonth: null,
+                currentDate: null
+            });
+            initValue();
+        });
         watch(computeDateLabelFormat, function () {
             dateParseValue(reactData.datePanelValue);
             reactData.inputValue = reactData.datePanelLabel;

package/es/table/src/body.js

@@ -58,9 +58,12 @@ export default defineComponent({
             return 0;
         };
         var countTreeExpand = function (prevRow, params) {
+            var count = 1;
+            if (!prevRow) {
+                return count;
+            }
             var treeOpts = computeTreeOpts.value;
             var rowChildren = prevRow[treeOpts.children];
-            var count = 1;
             if ($xetable.isTreeExpandByRow(prevRow)) {
                 for (var index = 0; index < rowChildren.length; index++) {
                     count += countTreeExpand(rowChildren[index], params);
@@ -68,13 +71,12 @@ export default defineComponent({
             }
             return count;
         };
-        var calcTreeLine = function (params, items) {
-            var $rowIndex = params.$rowIndex;
+        var calcTreeLine = function (params, items, rIndex) {
             var expandSize = 1;
-            if ($rowIndex) {
-                expandSize = countTreeExpand(items[$rowIndex - 1], params);
+            if (rIndex) {
+                expandSize = countTreeExpand(items[rIndex - 1], params);
             }
-            return tableReactData.rowHeight * expandSize - ($rowIndex ? 1 : (12 - getOffsetSize()));
+            return tableReactData.rowHeight * expandSize - (rIndex ? 1 : (12 - getOffsetSize()));
         };
         // 滚动、拖动过程中不需要触发
         var isOperateMouse = function () {
@@ -82,11 +84,22 @@ export default defineComponent({
             var lastScrollTime = tableInternalData.lastScrollTime, _isResize = tableInternalData._isResize;
             return _isResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover);
         };
-        var renderLine = function (rowLevel, items, params) {
-            var column = params.column;
+        var renderLine = function (params) {
+            var row = params.row, column = params.column;
             var treeConfig = tableProps.treeConfig;
             var treeOpts = computeTreeOpts.value;
             var slots = column.slots, treeNode = column.treeNode;
+            var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData;
+            var rowid = getRowid($xetable, row);
+            var rest = fullAllDataRowIdData[rowid];
+            var rLevel = 0;
+            var rIndex = 0;
+            var items = [];
+            if (rest) {
+                rLevel = rest.level;
+                rIndex = rest._index;
+                items = rest.items;
+            }
             if (slots && slots.line) {
                 return $xetable.callSlot(slots.line, params);
             }
@@ -98,8 +111,8 @@ export default defineComponent({
                         h('div', {
                             class: 'vxe-tree--line',
                             style: {
-                                height: calcTreeLine(params, items) + "px",
-                                left: (rowLevel * treeOpts.indent) + (rowLevel ? 2 - getOffsetSize() : 0) + 16 + "px"
+                                height: calcTreeLine(params, items, rIndex) + "px",
+                                left: (rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize() : 0) + 16 + "px"
                             }
                         })
                     ])
@@ -242,7 +255,7 @@ export default defineComponent({
             }
             else {
                 // 渲染单元格
-                tdVNs.push.apply(tdVNs, __spreadArray(__spreadArray([], renderLine(rowLevel, items, params)), [h('div', {
+                tdVNs.push.apply(tdVNs, __spreadArray(__spreadArray([], renderLine(params)), [h('div', {
                         class: ['vxe-cell', {
                                 'c--title': showTitle,
                                 'c--tooltip': showTooltip,
@@ -296,7 +309,6 @@ export default defineComponent({
             tableData.forEach(function (row, $rowIndex) {
                 var trOn = {};
                 var rowIndex = $rowIndex;
-                var _rowIndex = $xetable.getVTRowIndex(row);
                 // 确保任何情况下 rowIndex 都精准指向真实 data 索引
                 rowIndex = $xetable.getRowIndex(row);
                 // 事件绑定
@@ -318,9 +330,11 @@ export default defineComponent({
                 var rest = fullAllDataRowIdData[rowid];
                 var rowLevel = 0;
                 var seq = -1;
+                var _rowIndex = 0;
                 if (rest) {
                     rowLevel = rest.level;
                     seq = rest.seq;
+                    _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 };
                 // 处理新增状态

package/es/table/src/table.js

@@ -3598,6 +3598,7 @@ export default defineComponent({
                         return handleAsyncTreeExpandChilds(row);
                     }).then(function () {
                         if (transform) {
+                            handleVirtualTreeToList();
                             return tablePrivateMethods.handleTableData();
                         }
                     }).then(function () {
@@ -3691,9 +3692,11 @@ export default defineComponent({
                 return tablePrivateMethods.handleTableData().then(function () {
                     if (transform) {
                         handleVirtualTreeToList();
+                        return tablePrivateMethods.handleTableData();
                     }
+                }).then(function () {
                     if (isExists) {
-                        tableMethods.recalculate();
+                        return tableMethods.recalculate();
                     }
                 });
             },

package/es/validator/src/hook.js

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { nextTick } from 'vue';
+import GlobalConfig from '../../v-x-e-table/src/conf';
 import XEUtils from 'xe-utils';
 import { getFuncText, eqEmptyValue } from '../../tools/utils';
 import { scrollToView } from '../../tools/dom';
@@ -167,7 +168,7 @@ var validatorHook = {
                         }
                     });
                 }).catch(function (firstErrParams) {
-                    return new Promise(function (resolve) {
+                    return new Promise(function (resolve, reject) {
                         var finish = function () {
                             nextTick(function () {
                                 if (cb) {
@@ -175,7 +176,13 @@ var validatorHook = {
                                     resolve();
                                 }
                                 else {
-                                    resolve(validRest);
+                                    if (GlobalConfig.validToReject === 'obsolete') {
+                                        // 已废弃，校验失败将不会执行catch
+                                        reject(validRest);
+                                    }
+                                    else {
+                                        resolve(validRest);
+                                    }
                                 }
                             });
                         };

package/lib/index.umd.js

@@ -17140,6 +17140,21 @@ function toStringTimeDate(str) {
       reactData.inputValue = val;
       changeValue();
     });
+    Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
+      return props.type;
+    }, function () {
+      // 切换类型是重置内置变量
+      Object.assign(reactData, {
+        inputValue: props.modelValue,
+        datetimePanelValue: null,
+        datePanelValue: null,
+        datePanelLabel: '',
+        datePanelType: 'day',
+        selectMonth: null,
+        currentDate: null
+      });
+      initValue();
+    });
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(computeDateLabelFormat, function () {
       dateParseValue(reactData.datePanelValue);
       reactData.inputValue = reactData.datePanelLabel;
@@ -21570,6 +21585,7 @@ var Keyboard = {
 
 
 
+
 
 /**
  * 校验规则
@@ -21753,14 +21769,19 @@ var validatorHook = {
             }
           });
         }).catch(function (firstErrParams) {
-          return new Promise(function (resolve) {
+          return new Promise(function (resolve, reject) {
             var finish = function finish() {
               Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
                 if (cb) {
                   cb(validRest);
                   resolve();
                 } else {
-                  resolve(validRest);
+                  if (conf.validToReject === 'obsolete') {
+                    // 已废弃，校验失败将不会执行catch
+                    reject(validRest);
+                  } else {
+                    resolve(validRest);
+                  }
                 }
               });
             };
@@ -30882,9 +30903,14 @@ var lineOffsetSizes = {
     };
 
     var countTreeExpand = function countTreeExpand(prevRow, params) {
+      var count = 1;
+
+      if (!prevRow) {
+        return count;
+      }
+
       var treeOpts = computeTreeOpts.value;
       var rowChildren = prevRow[treeOpts.children];
-      var count = 1;
 
       if ($xetable.isTreeExpandByRow(prevRow)) {
         for (var index = 0; index < rowChildren.length; index++) {
@@ -30895,15 +30921,14 @@ var lineOffsetSizes = {
       return count;
     };
 
-    var calcTreeLine = function calcTreeLine(params, items) {
-      var $rowIndex = params.$rowIndex;
+    var calcTreeLine = function calcTreeLine(params, items, rIndex) {
       var expandSize = 1;
 
-      if ($rowIndex) {
-        expandSize = countTreeExpand(items[$rowIndex - 1], params);
+      if (rIndex) {
+        expandSize = countTreeExpand(items[rIndex - 1], params);
       }
 
-      return tableReactData.rowHeight * expandSize - ($rowIndex ? 1 : 12 - getOffsetSize());
+      return tableReactData.rowHeight * expandSize - (rIndex ? 1 : 12 - getOffsetSize());
     }; // 滚动、拖动过程中不需要触发
 
 
@@ -30914,12 +30939,25 @@ var lineOffsetSizes = {
       return _isResize || lastScrollTime && Date.now() < lastScrollTime + delayHover;
     };
 
-    var renderLine = function renderLine(rowLevel, items, params) {
-      var column = params.column;
+    var renderLine = function renderLine(params) {
+      var row = params.row,
+          column = params.column;
       var treeConfig = tableProps.treeConfig;
       var treeOpts = computeTreeOpts.value;
       var slots = column.slots,
           treeNode = column.treeNode;
+      var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData;
+      var rowid = util_getRowid($xetable, row);
+      var rest = fullAllDataRowIdData[rowid];
+      var rLevel = 0;
+      var rIndex = 0;
+      var items = [];
+
+      if (rest) {
+        rLevel = rest.level;
+        rIndex = rest._index;
+        items = rest.items;
+      }
 
       if (slots && slots.line) {
         return $xetable.callSlot(slots.line, params);
@@ -30931,8 +30969,8 @@ var lineOffsetSizes = {
         }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
           class: 'vxe-tree--line',
           style: {
-            height: "".concat(calcTreeLine(params, items), "px"),
-            left: "".concat(rowLevel * treeOpts.indent + (rowLevel ? 2 - getOffsetSize() : 0) + 16, "px")
+            height: "".concat(calcTreeLine(params, items, rIndex), "px"),
+            left: "".concat(rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize() : 0) + 16, "px")
           }
         })])];
       }
@@ -31150,7 +31188,7 @@ var lineOffsetSizes = {
         }));
       } else {
         // 渲染单元格
-        tdVNs.push.apply(tdVNs, _toConsumableArray(renderLine(rowLevel, items, params)).concat([Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+        tdVNs.push.apply(tdVNs, _toConsumableArray(renderLine(params)).concat([Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
           class: ['vxe-cell', {
             'c--title': showTitle,
             'c--tooltip': showTooltip,
@@ -31210,10 +31248,7 @@ var lineOffsetSizes = {
       var rows = [];
       tableData.forEach(function (row, $rowIndex) {
         var trOn = {};
-        var rowIndex = $rowIndex;
-
-        var _rowIndex = $xetable.getVTRowIndex(row); // 确保任何情况下 rowIndex 都精准指向真实 data 索引
-
+        var rowIndex = $rowIndex; // 确保任何情况下 rowIndex 都精准指向真实 data 索引
 
         rowIndex = $xetable.getRowIndex(row); // 事件绑定
 
@@ -31242,10 +31277,12 @@ var lineOffsetSizes = {
         var rest = fullAllDataRowIdData[rowid];
         var rowLevel = 0;
         var seq = -1;
+        var _rowIndex = 0;
 
         if (rest) {
           rowLevel = rest.level;
           seq = rest.seq;
+          _rowIndex = rest._index;
         }
 
         var params = {
@@ -36280,6 +36317,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             return handleAsyncTreeExpandChilds(row);
           }).then(function () {
             if (transform) {
+              handleVirtualTreeToList();
               return tablePrivateMethods.handleTableData();
             }
           }).then(function () {
@@ -36390,10 +36428,11 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return tablePrivateMethods.handleTableData().then(function () {
           if (transform) {
             handleVirtualTreeToList();
+            return tablePrivateMethods.handleTableData();
           }
-
+        }).then(function () {
           if (isExists) {
-            tableMethods.recalculate();
+            return tableMethods.recalculate();
           }
         });
       },