vxe-table 3.10.6 → 3.10.8

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.6";
+const version = "3.10.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2272,7 +2272,8 @@ core_.VxeUI.setConfig({
       autoClear: true,
       autoPos: true,
       message: 'inline',
-      msgMode: 'single'
+      msgMode: 'single',
+      theme: 'normal'
     },
     columnConfig: {
       maxFixedSize: 4
@@ -2768,7 +2769,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.6"}`;
+const log_version = `table v${"3.10.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3544,23 +3545,30 @@ function renderCellBaseVNs(h, params, content) {
   const {
     $table,
     column,
-    row
+    row,
+    level
   } = params;
   const {
     dragSort
   } = column;
-  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
+  const tableProps = $table;
+  const {
+    treeConfig
+  } = tableProps;
   const rowOpts = $table.computeRowOpts;
   const dragOpts = $table.computeDragOpts;
   const {
     showRowIcon,
     rowVisibleMethod
   } = dragOpts;
+  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
   if (dragSort && rowOpts.drag && showRowIcon && (!rowVisibleMethod || rowVisibleMethod({
     row,
     column
   }))) {
-    vns.unshift(renderCellDragIcon(h, params));
+    if (!treeConfig || !level) {
+      vns.unshift(renderCellDragIcon(h, params));
+    }
   }
   return vns;
 }
@@ -5146,6 +5154,16 @@ function clearRowDropOrigin($xeTable) {
     });
   }
 }
+function updateRowDropOrigin($xeTable, row) {
+  const el = $xeTable.$el;
+  if (el) {
+    const clss = 'row--drag-origin';
+    const rowid = getRowid($xeTable, row);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+      addClass(elem, clss);
+    });
+  }
+}
 function clearRowDropTarget($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -5155,6 +5173,17 @@ function clearRowDropTarget($xeTable) {
     });
   }
 }
+function updateRowDropTarget($xeTable, row, dragPos) {
+  const el = $xeTable.$el;
+  if (el) {
+    const clss = 'row--drag-active-target';
+    const rowid = getRowid($xeTable, row);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+      addClass(elem, clss);
+      elem.setAttribute('drag-pos', dragPos);
+    });
+  }
+}
 function showRowDropTip(evnt, $xeTable) {
   const rdTipEl = $xeTable.$refs.refRowDragTipElem;
   if (!rdTipEl) {
@@ -5179,7 +5208,22 @@ const hideRowDropTip = $xeTable => {
 };
 const updateRowDropTipContent = ($xeTable, tdEl) => {
   const reactData = $xeTable;
-  reactData.dragTipText = tdEl.textContent || '';
+  const {
+    dragRow
+  } = reactData;
+  const dragOpts = $xeTable.computeDragOpts;
+  const {
+    rowTooltipMethod
+  } = dragOpts;
+  let tipContent = '';
+  if (rowTooltipMethod) {
+    tipContent = `${rowTooltipMethod({
+      row: dragRow
+    }) || ''}`;
+  } else {
+    tipContent = methods_getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
+  }
+  reactData.dragTipText = tipContent;
 };
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
@@ -10236,7 +10280,9 @@ const Methods = {
     } = reactData;
     const {
       afterFullData,
+      afterTreeFullData,
       tableFullData,
+      tableFullTreeData,
       prevDragRow,
       prevDragPos
     } = internalData;
@@ -10251,18 +10297,35 @@ const Methods = {
             return;
           }
           const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-          // 移出源位置
-          const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-          const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-          afterFullData.splice(oafIndex, 1);
-          tableFullData.splice(otfIndex, 1);
-          // 插新位置
-          const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-          const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-          const nafIndex = pafIndex + dragOffsetIndex;
-          const ntfIndex = ptfIndex + dragOffsetIndex;
-          afterFullData.splice(nafIndex, 0, dragRow);
-          tableFullData.splice(ntfIndex, 0, dragRow);
+          let oafIndex = -1;
+          let nafIndex = -1;
+          if (treeConfig) {
+            // 移出源位置
+            oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+            const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+            afterTreeFullData.splice(oafIndex, 1);
+            tableFullTreeData.splice(otfIndex, 1);
+            // 插新位置
+            const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+            const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+            nafIndex = pafIndex + dragOffsetIndex;
+            const ntfIndex = ptfIndex + dragOffsetIndex;
+            afterTreeFullData.splice(nafIndex, 0, dragRow);
+            tableFullTreeData.splice(ntfIndex, 0, dragRow);
+          } else {
+            // 移出源位置
+            oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+            const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+            afterFullData.splice(oafIndex, 1);
+            tableFullData.splice(otfIndex, 1);
+            // 插新位置
+            const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+            const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+            nafIndex = pafIndex + dragOffsetIndex;
+            const ntfIndex = ptfIndex + dragOffsetIndex;
+            afterFullData.splice(nafIndex, 0, dragRow);
+            tableFullData.splice(ntfIndex, 0, dragRow);
+          }
           reactData.isDragRowMove = true;
           $xeTable.cacheRowMap();
           $xeTable.updateScrollYStatus();
@@ -10314,8 +10377,7 @@ const Methods = {
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      addClass(trEl, 'row--drag-active-target');
-      trEl.setAttribute('drag-pos', dragPos);
+      updateRowDropTarget($xeTable, row, dragPos);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
       $xeTable.dispatchEvent('row-dragover', {
@@ -10350,7 +10412,7 @@ const Methods = {
     }
     reactData.dragRow = row;
     trEl.draggable = true;
-    addClass(trEl, 'row--drag-origin');
+    updateRowDropOrigin($xeTable, row);
     showRowDropTip(evnt, $xeTable);
     updateRowDropTipContent($xeTable, tdEl);
     $xeTable.dispatchEvent('row-dragstart', params, evnt);
@@ -12518,13 +12580,15 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         ...errorValidItem
       };
       tdVNs.push(h('div', {
-        class: ['vxe-cell--valid-error-hint', getClass(validOpts.className, errorValidItem)],
+        class: ['vxe-cell--valid-error-tip', getClass(validOpts.className, errorValidItem)],
         style: errRule && errRule.maxWidth ? {
           width: `${errRule.maxWidth}px`
         } : null
-      }, validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
+      }, [h('div', {
+        class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
+      }, [validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
         class: 'vxe-cell--valid-error-msg'
-      }, errorValidItem.content)]));
+      }, errorValidItem.content)]])]));
     }
   }
   let cellHeight = '';
@@ -13212,7 +13276,7 @@ const cellType = 'header';
       tId,
       isGroup,
       visibleColumn,
-      resizable,
+      resizable: allResizable,
       border,
       columnKey,
       headerRowClassName,
@@ -13383,7 +13447,7 @@ const cellType = 'header';
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? h('div', {
+        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],
@@ -14389,7 +14453,7 @@ const renderSimplePanel = (h, _vm) => {
 const renderPopupPanel = (h, _vm) => {
   const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-  const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
+  const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeInput');
   const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
   const $xeTableCustomPanel = _vm;
   const $xeTable = _vm.$xeTable;
@@ -14398,6 +14462,7 @@ const renderPopupPanel = (h, _vm) => {
     customStore
   } = _vm;
   const {
+    resizable: allResizable,
     customOpts,
     customColumnList,
     columnOpts,
@@ -14415,6 +14480,11 @@ const renderPopupPanel = (h, _vm) => {
   const {
     maxFixedSize
   } = columnOpts;
+  const resizableOpts = $xeTable.computeResizableOpts;
+  const {
+    minWidth: reMinWidth,
+    maxWidth: reMaxWidth
+  } = resizableOpts;
   const modalOpts = Object.assign({}, modalOptions);
   const slots = customOpts.slots || {};
   const headerSlot = slots.header;
@@ -14437,6 +14507,24 @@ const renderPopupPanel = (h, _vm) => {
       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);
@@ -14509,11 +14597,13 @@ const renderPopupPanel = (h, _vm) => {
         }
       }, colTitle)]), allowResizable ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--resizable'
-      }, [column.children && column.children.length ? h('span', '-') : VxeUIInputComponent ? h(VxeUIInputComponent, {
+      }, [column.children && column.children.length || !(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('span', '-') : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
         props: {
           type: 'integer',
           disabled: isDisabled || isHidden,
-          value: column.renderResizeWidth
+          value: column.renderResizeWidth,
+          min: customMinWidth || undefined,
+          max: customMaxWidth || undefined
         },
         on: {
           modelValue(value) {
@@ -14704,7 +14794,7 @@ const renderPopupPanel = (h, _vm) => {
       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');
       this.$nextTick(() => {
@@ -14726,7 +14816,7 @@ const renderPopupPanel = (h, _vm) => {
         if (!VxeUIButtonComponent) {
           errLog('vxe.error.reqComp', ['vxe-button']);
         }
-        if (!VxeUIInputComponent) {
+        if (!VxeUINumberInputComponent) {
           errLog('vxe.error.reqComp', ['vxe-input']);
         }
         if (!VxeUITooltipComponent) {
@@ -20168,7 +20258,7 @@ function validErrorRuleValue(rule, val) {
       } = this;
       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];
@@ -21983,6 +22073,7 @@ function handleUupdateResize(_vm) {
     const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
     const $xeTable = this;
+    const reactData = $xeTable;
     const {
       _e,
       $scopedSlots,
@@ -22027,13 +22118,20 @@ function handleUupdateResize(_vm) {
       loadingOpts,
       editRules
     } = $xeTable;
+    const {
+      dragRow,
+      dragTipText
+    } = reactData;
     const {
       leftList,
       rightList
     } = columnStore;
     const currLoading = this._isLoading || loading;
     const vSize = computeSize;
+    const dragOpts = $xeTable.computeDragOpts;
     const virtualScrollBars = $xeTable.computeVirtualScrollBars;
+    const dragSlots = dragOpts.slots || {};
+    const rowTipSlot = dragSlots.rowTip;
     return h('div', {
       class: ['vxe-table', 'vxe-table--render-default', `tid_${tId}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
         [`valid-msg--${validOpts.msgMode}`]: !!editRules,
@@ -22238,10 +22336,12 @@ function handleUupdateResize(_vm) {
     /**
        * 拖拽提示
        */
-    rowOpts.drag ? h('div', {
+    rowOpts.drag && (dragRow || dragTipText) ? h('div', {
       ref: 'refRowDragTipElem',
-      class: 'vxe-table--row-drag-hint'
-    }, table_getI18n('vxe.table.dragTip', [this.dragTipText])) : _e(), h('div', {}, [
+      class: 'vxe-table--row-drag-tip'
+    }, rowTipSlot ? dragRow ? this.callSlot(rowTipSlot, {
+      row: dragRow
+    }, h) : [table_renderEmptyElement($xeTable)] : dragTipText ? [h('span', dragTipText)] : [table_renderEmptyElement($xeTable)]) : _e(), h('div', {}, [
     /**
      * 提示相关
      */