vxe-table 4.8.5 → 4.8.6

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.5";
+const version = "4.8.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2050,7 +2050,8 @@ core_.VxeUI.setConfig({
       autoClear: true,
       autoPos: true,
       message: 'inline',
-      msgMode: 'single'
+      msgMode: 'single',
+      theme: 'normal'
     },
     columnConfig: {
       maxFixedSize: 4
@@ -2388,7 +2389,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.8.5"}`;
+const log_version = `table v${"4.8.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5107,13 +5108,15 @@ const lineOffsetSizes = {
             ...errorValidItem
           };
           tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            class: ['vxe-cell--valid-error-hint', getPropClass(validOpts.className, validParams)],
+            class: ['vxe-cell--valid-error-tip', getPropClass(validOpts.className, validParams)],
             style: errRule && errRule.maxWidth ? {
               width: `${errRule.maxWidth}px`
             } : null
-          }, validSlot ? $xeTable.callSlot(validSlot, validParams) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
+          }, [validSlot ? $xeTable.callSlot(validSlot, validParams) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-cell--valid-error-msg'
-          }, errorValidItem.content)]));
+          }, errorValidItem.content)]])]));
         }
       }
       let cellHeight = '';
@@ -6720,7 +6723,7 @@ const {
     const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
     const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
     const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-    const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
+    const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
     const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
     const $xeTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTable', {});
@@ -6730,7 +6733,8 @@ const {
     const {
       computeCustomOpts,
       computeColumnOpts,
-      computeIsMaxFixedColumn
+      computeIsMaxFixedColumn,
+      computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const bodyElemRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -7197,6 +7201,11 @@ const {
       const {
         maxFixedSize
       } = columnOpts;
+      const resizableOpts = computeResizableOpts.value;
+      const {
+        minWidth: reMinWidth,
+        maxWidth: reMaxWidth
+      } = resizableOpts;
       const {
         mode
       } = customOpts;
@@ -7225,6 +7234,24 @@ const {
           column
         }) : true;
         if (isVisible) {
+          // 默认继承调整宽度
+          let customMinWidth = 0;
+          let customMaxWidth = 0;
+          if (allowResizable) {
+            const resizeParams = {
+              $table: $xeTable,
+              column,
+              columnIndex: index,
+              $columnIndex: index,
+              $rowIndex: -1
+            };
+            if (reMinWidth) {
+              customMinWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(reMinWidth) ? reMinWidth(resizeParams) : reMinWidth);
+            }
+            if (reMaxWidth) {
+              customMaxWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(reMaxWidth) ? reMaxWidth(resizeParams) : reMaxWidth);
+            }
+          }
           const isChecked = column.renderVisible;
           const isIndeterminate = column.halfVisible;
           const colTitle = formatText(column.getTitle(), 1);
@@ -7283,10 +7310,12 @@ const {
             title: colTitle
           }, colTitle)]), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--resizable'
-          }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUIInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIInputComponent, {
+          }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUINumberInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUINumberInputComponent, {
             type: 'integer',
             disabled: isDisabled || isHidden,
             modelValue: column.renderResizeWidth,
+            min: customMinWidth || undefined,
+            max: customMaxWidth || undefined,
             'onUpdate:modelValue'(value) {
               column.renderResizeWidth = Math.max(0, Number(value));
             }
@@ -7457,8 +7486,8 @@ const {
         if (!VxeUIButtonComponent) {
           errLog('vxe.error.reqComp', ['vxe-button']);
         }
-        if (!VxeUIInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-input']);
+        if (!VxeUINumberInputComponent) {
+          errLog('vxe.error.reqComp', ['vxe-number-input']);
         }
         if (!VxeUITooltipComponent) {
           errLog('vxe.error.reqComp', ['vxe-tooltip']);
@@ -8498,7 +8527,8 @@ const {
   hooks: table_hooks,
   globalEvents: table_globalEvents,
   GLOBAL_EVENT_KEYS,
-  useFns
+  useFns,
+  renderEmptyElement: table_renderEmptyElement
 } = core_.VxeUI;
 const isWebkit = browse['-webkit'] && !browse.edge;
 const customStorageKey = 'VXE_CUSTOM_STORE';
@@ -11112,10 +11142,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const {
               rowExpandedMaps
             } = reactData;
-            rowRest.expandLoaded = true;
+            if (rowRest) {
+              rowRest.expandLoaded = true;
+            }
             rowExpandedMaps[rowid] = row;
           }).catch(() => {
-            rowRest.expandLoaded = false;
+            if (rowRest) {
+              rowRest.expandLoaded = false;
+            }
           }).finally(() => {
             const {
               rowExpandLazyLoadedMaps
@@ -11671,13 +11705,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const rowid = getRowid($xeTable, row);
           if (!treeTempExpandedMaps[rowid]) {
             const rowRest = fullAllDataRowIdData[rowid];
-            const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
-            // 是否使用懒加载
-            if (isLoad) {
-              result.push(handleAsyncTreeExpandChilds(row));
-            } else {
-              if (row[childrenField] && row[childrenField].length) {
-                treeTempExpandedMaps[rowid] = row;
+            if (rowRest) {
+              const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
+              // 是否使用懒加载
+              if (isLoad) {
+                result.push(handleAsyncTreeExpandChilds(row));
+              } else {
+                if (row[childrenField] && row[childrenField].length) {
+                  treeTempExpandedMaps[rowid] = row;
+                }
               }
             }
           }
@@ -14805,7 +14841,22 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
     };
     const updateRowDropTipContent = tdEl => {
-      reactData.dragTipText = tdEl.textContent || '';
+      const {
+        dragRow
+      } = reactData;
+      const dragOpts = computeDragOpts.value;
+      const {
+        rowTooltipMethod
+      } = dragOpts;
+      let tipContent = '';
+      if (rowTooltipMethod) {
+        tipContent = `${rowTooltipMethod({
+          row: dragRow
+        }) || ''}`;
+      } else {
+        tipContent = table_getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
+      }
+      reactData.dragTipText = tipContent;
     };
     /**
      * 处理显示 tooltip
@@ -14846,6 +14897,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
+    const callSlot = (slotFunc, params) => {
+      if (slotFunc) {
+        if ($xeGrid) {
+          return $xeGrid.callSlot(slotFunc, params);
+        }
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
+          return getSlotVNs(slotFunc(params));
+        }
+      }
+      return [];
+    };
     /**
      * 内部方法
      */
@@ -14854,17 +14916,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return table_getConfig();
       },
       updateAfterDataIndex,
-      callSlot(slotFunc, params) {
-        if (slotFunc) {
-          if ($xeGrid) {
-            return $xeGrid.callSlot(slotFunc, params);
-          }
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
-            return getSlotVNs(slotFunc(params));
-          }
-        }
-        return [];
-      },
+      callSlot,
       /**
        * 获取父容器元素
        */
@@ -16624,7 +16676,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableColumn,
         tableGroupColumn,
         fixedColumn
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(body, {
+      }) : table_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(body, {
         ref: isFixedLeft ? refTableLeftBody : refTableRightBody,
         fixedType,
         tableData,
@@ -16636,7 +16688,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableColumn,
         fixedColumn,
         fixedType
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
+      }) : table_renderEmptyElement($xeTable)]);
     };
     const renderEmptyBody = () => {
       const emptyOpts = computeEmptyOpts.value;
@@ -16691,7 +16743,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         columnStore,
         filterStore,
         customStore,
-        tooltipStore
+        tooltipStore,
+        dragRow,
+        dragTipText
       } = reactData;
       const {
         leftList,
@@ -16703,6 +16757,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const checkboxOpts = computeCheckboxOpts.value;
       const treeOpts = computeTreeOpts.value;
       const rowOpts = computeRowOpts.value;
+      const dragOpts = computeDragOpts.value;
       const columnOpts = computeColumnOpts.value;
       const vSize = computeSize.value;
       const tableBorder = computeTableBorder.value;
@@ -16712,6 +16767,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const isMenu = computeIsMenu.value;
       const currLoading = reactData._isLoading || loading;
       const virtualScrollBars = computeVirtualScrollBars.value;
+      const dragSlots = dragOpts.slots || {};
+      const rowTipSlot = dragSlots.rowTip;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
@@ -16765,7 +16822,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableData,
         tableColumn,
         tableGroupColumn
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 表体
        */
@@ -16781,9 +16838,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         ref: refTableFooter,
         footerTableData,
         tableColumn
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }) : table_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--fixed-wrapper'
-      }, [leftList && leftList.length && overflowX ? renderFixed('left') : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), rightList && rightList.length && overflowX ? renderFixed('right') : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), virtualScrollBars.x ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [leftList && leftList.length && overflowX ? renderFixed('left') : table_renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderFixed('right') : table_renderEmptyElement($xeTable)])]), virtualScrollBars.x ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: 'vx',
         ref: refScrollXVirtualElem,
         class: 'vxe-table--scroll-x-virtual'
@@ -16794,7 +16851,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refScrollXSpaceElem,
         class: 'vxe-table--scroll-x-space'
-      })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), virtualScrollBars.y ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      })])]) : table_renderEmptyElement($xeTable), virtualScrollBars.y ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: 'vy',
         ref: refScrollYVirtualElem,
         class: 'vxe-table--scroll-y-virtual'
@@ -16805,7 +16862,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refScrollYSpaceElem,
         class: 'vxe-table--scroll-x-space'
-      })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      })])]) : table_renderEmptyElement($xeTable),
       /**
        * 空数据
        */
@@ -16848,7 +16905,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           $table: $xeTable,
           $grid: $xeGrid
         })
-      } : {}) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      } : {}) : table_renderEmptyElement($xeTable),
       /**
        * 自定义列
        */
@@ -16856,7 +16913,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'cs',
         ref: refTableCustom,
         customStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 筛选
        */
@@ -16864,7 +16921,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'tf',
         ref: refTableFilter,
         filterStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 导入
        */
@@ -16872,7 +16929,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'it',
         defaultOptions: reactData.importParams,
         storeData: reactData.importStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 导出
        */
@@ -16880,21 +16937,23 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'et',
         defaultOptions: reactData.exportParams,
         storeData: reactData.exportStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 快捷菜单
        */
       isMenu ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(menu_panel, {
         key: 'tm',
         ref: refTableMenu
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 拖拽提示
        */
-      rowOpts.drag ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      rowOpts.drag && (dragRow || dragTipText) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refRowDragTipElem,
-        class: 'vxe-table--row-drag-hint'
-      }, table_getI18n('vxe.table.dragTip', [reactData.dragTipText])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+        class: 'vxe-table--row-drag-tip'
+      }, rowTipSlot ? dragRow ? callSlot(rowTipSlot, {
+        row: dragRow
+      }) : [table_renderEmptyElement($xeTable)] : dragTipText ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', dragTipText)] : [table_renderEmptyElement($xeTable)]) : table_renderEmptyElement($xeTable),
       /**
        * 提示相关
        */
@@ -16925,7 +16984,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           'old-cell-valid': editRules && table_getConfig().cellVaildMode === 'obsolete'
         }, 'vxe-table--valid-error'],
         ...(validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
+      }) : table_renderEmptyElement($xeTable)]) : table_renderEmptyElement($xeTable)]);
     };
     const dataFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.data ? props.data.length : -1, () => {
@@ -21516,7 +21575,7 @@ validator_hook_hooks.add('tableValidatorModule', {
       const validOpts = computeValidOpts.value;
       if (validOpts.msgMode === 'single') {
         const keys = Object.keys(validErrMaps);
-        const resMaps = validErrMaps;
+        const resMaps = {};
         if (keys.length) {
           const firstKey = keys[0];
           resMaps[firstKey] = validErrMaps[firstKey];