vxe-table 4.3.6 → 4.3.8

package/es/table/src/table.js

@@ -5016,8 +5016,14 @@ export default defineComponent({
                 var row = params.row, column = params.column;
                 var cell = evnt.currentTarget;
                 handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
-                if (isEnableConf(editConfig)) {
-                    if ((editOpts.mode === 'row' && actived.row === row) || (actived.row === row && actived.column === column)) {
+                // 单元格处于编辑状态时不触发提示框
+                if (column.editRender && isEnableConf(editConfig)) {
+                    // 如果是行编辑模式
+                    if (editOpts.mode === 'row' && actived.row === row) {
+                        return;
+                    }
+                    // 如果是单元格编辑模式
+                    if (actived.row === row && actived.column === column) {
                         return;
                     }
                 }
@@ -5940,6 +5946,7 @@ export default defineComponent({
             var loading = props.loading, stripe = props.stripe, showHeader = props.showHeader, height = props.height, treeConfig = props.treeConfig, mouseConfig = props.mouseConfig, showFooter = props.showFooter, highlightCell = props.highlightCell, highlightHoverRow = props.highlightHoverRow, highlightHoverColumn = props.highlightHoverColumn, editConfig = props.editConfig;
             var isGroup = reactData.isGroup, overflowX = reactData.overflowX, overflowY = reactData.overflowY, scrollXLoad = reactData.scrollXLoad, scrollYLoad = reactData.scrollYLoad, scrollbarHeight = reactData.scrollbarHeight, tableData = reactData.tableData, tableColumn = reactData.tableColumn, tableGroupColumn = reactData.tableGroupColumn, footerTableData = reactData.footerTableData, initStore = reactData.initStore, columnStore = reactData.columnStore, filterStore = reactData.filterStore;
             var leftList = columnStore.leftList, rightList = columnStore.rightList;
+            var loadingSlot = slots.loading;
             var tipConfig = computeTipConfig.value;
             var treeOpts = computeTreeOpts.value;
             var rowOpts = computeRowOpts.value;
@@ -6065,7 +6072,9 @@ export default defineComponent({
                     modelValue: loading,
                     icon: loadingOpts.icon,
                     text: loadingOpts.text
-                }),
+                }, loadingSlot ? {
+                    default: function () { return loadingSlot({}); }
+                } : {}),
                 /**
                  * 筛选
                  */

package/es/table/src/util.js

@@ -88,7 +88,31 @@ export function getCellValue(row, column) {
 export function setCellValue(row, column, value) {
     return XEUtils.set(row, column.field, value);
 }
-export function getColMinWidth(params) {
+/**
+ * 列宽拖动最大宽度
+ * @param params
+ * @returns
+ */
+export function getColReMaxWidth(params) {
+    var $table = params.$table;
+    var computeResizableOpts = $table.getComputeMaps().computeResizableOpts;
+    var resizableOpts = computeResizableOpts.value;
+    var reMaxWidth = resizableOpts.maxWidth;
+    // 如果自定义调整宽度逻辑
+    if (reMaxWidth) {
+        var customMaxWidth = XEUtils.isFunction(reMaxWidth) ? reMaxWidth(params) : reMaxWidth;
+        if (customMaxWidth !== 'auto') {
+            return Math.max(1, XEUtils.toNumber(customMaxWidth));
+        }
+    }
+    return -1;
+}
+/**
+ * 列宽拖动最小宽度
+ * @param params
+ * @returns
+ */
+export function getColReMinWidth(params) {
     var $table = params.$table, column = params.column, cell = params.cell;
     var tableProps = $table.props;
     var computeResizableOpts = $table.getComputeMaps().computeResizableOpts;

package/es/table/style.css

@@ -281,7 +281,7 @@
 .vxe-loading.is--visible {
   display: block;
 }
-.vxe-loading > .vxe-loading--chunk {
+.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--warpper {
   width: 100%;
   position: absolute;
   top: 50%;

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".concat("4.3.6-beta.0", "] ").concat(GlobalConfig.i18n(message, params));
+    return "[vxe-table v".concat("4.3.8", "] ").concat(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.3.6-beta.0",
+    version: "4.3.8",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,