vxe-table 3.10.5 → 3.10.7

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.5";
+const version = "3.10.7";
 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.5"}`;
+const log_version = `table v${"3.10.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5179,7 +5180,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) {
@@ -10779,10 +10795,14 @@ const Methods = {
           const {
             rowExpandedMaps
           } = this;
-          rowRest.expandLoaded = true;
+          if (rowRest) {
+            rowRest.expandLoaded = true;
+          }
           rowExpandedMaps[rowid] = row;
         }).catch(() => {
-          rowRest.expandLoaded = false;
+          if (rowRest) {
+            rowRest.expandLoaded = false;
+          }
         }).finally(() => {
           const {
             rowExpandLazyLoadedMaps
@@ -11256,13 +11276,15 @@ const Methods = {
         const rowid = getRowid(this, row);
         if (!treeTempExpandedMaps[rowid]) {
           const rowRest = fullAllDataRowIdData[rowid];
-          const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
-          // 是否使用懒加载
-          if (isLoad) {
-            result.push(this.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(this.handleAsyncTreeExpandChilds(row));
+            } else {
+              if (row[childrenField] && row[childrenField].length) {
+                treeTempExpandedMaps[rowid] = row;
+              }
             }
           }
         }
@@ -12512,13 +12534,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 = '';
@@ -14383,7 +14407,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;
@@ -14409,6 +14433,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;
@@ -14431,6 +14460,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);
@@ -14503,11 +14550,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 ? 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) {
@@ -14698,7 +14747,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(() => {
@@ -14720,7 +14769,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) {
@@ -20162,7 +20211,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];
@@ -21977,6 +22026,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,
@@ -22021,13 +22071,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,
@@ -22232,10 +22289,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', {}, [
     /**
      * 提示相关
      */