vxe-table 4.3.6 → 4.3.8

package/lib/index.umd.js

@@ -2260,7 +2260,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.3.5"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.3.8"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -2813,7 +2813,37 @@ function getCellValue(row, column) {
 function setCellValue(row, column, value) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, column.field, value);
 }
-function getColMinWidth(params) {
+/**
+ * 列宽拖动最大宽度
+ * @param params
+ * @returns
+ */
+function getColReMaxWidth(params) {
+  const {
+    $table
+  } = params;
+  const {
+    computeResizableOpts
+  } = $table.getComputeMaps();
+  const resizableOpts = computeResizableOpts.value;
+  const {
+    maxWidth: reMaxWidth
+  } = resizableOpts;
+  // 如果自定义调整宽度逻辑
+  if (reMaxWidth) {
+    const customMaxWidth = XEUtils.isFunction(reMaxWidth) ? reMaxWidth(params) : reMaxWidth;
+    if (customMaxWidth !== 'auto') {
+      return Math.max(1, XEUtils.toNumber(customMaxWidth));
+    }
+  }
+  return -1;
+}
+/**
+ * 列宽拖动最小宽度
+ * @param params
+ * @returns
+ */
+function getColReMinWidth(params) {
   const {
     $table,
     column,
@@ -4027,7 +4057,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.3.5",
+  version: "4.3.8",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -6719,7 +6749,9 @@ function useSize(props) {
     icon: String,
     text: String
   },
-  setup(props) {
+  setup(props, {
+    slots
+  }) {
     const computeLoadingIcon = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return props.icon || conf.icon.LOADING;
     });
@@ -6734,7 +6766,9 @@ function useSize(props) {
         class: ['vxe-loading', {
           'is--visible': props.modelValue
         }]
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, slots.default ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-loading--warpper'
+      }, slots.default({}))] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-loading--chunk'
       }, [loadingIcon ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: loadingIcon
@@ -8760,17 +8794,22 @@ const quarterSize = 8;
         const dateMultipleValue = computeDateMultipleValue.value;
         if (isDateTimeType) {
           // 如果是datetime特殊类型
-          const dateListValue = computeDateListValue.value;
+          const dateListValue = [...computeDateListValue.value];
           const datetimeRest = [];
+          const eqIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(dateListValue, val => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, val, 'yyyyMMdd'));
+          if (eqIndex === -1) {
+            dateListValue.push(date);
+          } else {
+            dateListValue.splice(eqIndex, 1);
+          }
           dateListValue.forEach(item => {
-            if (item && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, item, 'yyyyMMdd')) {
+            if (item) {
               item.setHours(datetimePanelValue.getHours());
               item.setMinutes(datetimePanelValue.getMinutes());
               item.setSeconds(datetimePanelValue.getSeconds());
               datetimeRest.push(item);
             }
           });
-          datetimeRest.push(date);
           emitModel(datetimeRest.map(date => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(date, dateValueFormat)).join(','), {
             type: 'update'
           });
@@ -9283,10 +9322,40 @@ const quarterSize = 8;
       const {
         multiple
       } = props;
+      const {
+        datetimePanelValue
+      } = reactData;
       const dateValue = computeDateValue.value;
       const isDateTimeType = computeIsDateTimeType.value;
-      if (isDateTimeType || multiple) {
-        dateChange(dateValue || reactData.currentDate);
+      if (isDateTimeType) {
+        const dateValueFormat = computeDateValueFormat.value;
+        if (multiple) {
+          // 如果为多选
+          const dateMultipleValue = computeDateMultipleValue.value;
+          if (isDateTimeType) {
+            // 如果是datetime特殊类型
+            const dateListValue = [...computeDateListValue.value];
+            const datetimeRest = [];
+            dateListValue.forEach(item => {
+              if (item) {
+                item.setHours(datetimePanelValue.getHours());
+                item.setMinutes(datetimePanelValue.getMinutes());
+                item.setSeconds(datetimePanelValue.getSeconds());
+                datetimeRest.push(item);
+              }
+            });
+            emitModel(datetimeRest.map(date => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(date, dateValueFormat)).join(','), {
+              type: 'update'
+            });
+          } else {
+            // 如果是日期类型
+            emitModel(dateMultipleValue.join(','), {
+              type: 'update'
+            });
+          }
+        } else {
+          dateChange(dateValue || reactData.currentDate);
+        }
       }
       hidePanel();
     };
@@ -16540,7 +16609,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       methodKeys.forEach(name => {
         funcs[name] = (...args) => {
           const $xetable = refTable.value;
-          return $xetable && $xetable[name](...args);
+          if ($xetable && $xetable[name]) {
+            return $xetable[name](...args);
+          }
         };
       });
       return funcs;
@@ -16549,7 +16620,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     tableComponentMethodKeys.forEach(name => {
       gridExtendTableMethods[name] = (...args) => {
         const $xetable = refTable.value;
-        return $xetable && $xetable[name](...args);
+        if ($xetable && $xetable[name]) {
+          return $xetable && $xetable[name](...args);
+        }
       };
     });
     const computeProxyOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -17039,6 +17112,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       const proxyOpts = computeProxyOpts.value;
       const tableOns = Object.assign({}, tableCompEvents);
       const emptySlot = slots.empty;
+      const loadingSlot = slots.loading;
       if (proxyConfig) {
         if (proxyOpts.sort) {
           tableOns.onSortChange = sortChangeEvent;
@@ -17047,13 +17121,18 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           tableOns.onFilterChange = filterChangeEvent;
         }
       }
+      const slotObj = {};
+      if (emptySlot) {
+        slotObj.empty = () => emptySlot({});
+      }
+      if (loadingSlot) {
+        slotObj.loading = () => loadingSlot({});
+      }
       return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-table'), {
         ref: refTable,
         ...tableProps,
         ...tableOns
-      }, emptySlot ? {
-        empty: () => emptySlot({})
-      } : {})];
+      }, slotObj)];
     };
     /**
      * 渲染表格底部区域
@@ -23765,7 +23844,7 @@ const header_renderType = 'header';
       const pos = getOffsetPos(dragBtnElem, wrapperElem);
       const dragBtnWidth = dragBtnElem.clientWidth;
       const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
-      const minInterval = getColMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
+      const minInterval = getColReMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
       let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
       let dragPosLeft = pos.left + dragBtnOffsetWidth;
       const domMousemove = document.onmousemove;
@@ -30305,8 +30384,14 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         } = params;
         const 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;
           }
         }
@@ -31415,6 +31500,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         leftList,
         rightList
       } = columnStore;
+      const loadingSlot = slots.loading;
       const tipConfig = computeTipConfig.value;
       const treeOpts = computeTreeOpts.value;
       const rowOpts = computeRowOpts.value;
@@ -31532,7 +31618,9 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         modelValue: loading,
         icon: loadingOpts.icon,
         text: loadingOpts.text
-      }),
+      }, loadingSlot ? {
+        default: () => loadingSlot({})
+      } : {}),
       /**
        * 筛选
        */