vxe-table 3.18.0-beta.7 → 3.18.0

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.0-beta.7";
+const version = "3.18.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.0-beta.7"}`;
+const log_version = `table v${"3.18.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3185,7 +3185,7 @@ function getElementMarginAndWidth(elem) {
   }
   return 0;
 }
-function getCellHeight(height) {
+function getCalcHeight(height) {
   if (height === 'unset') {
     return 0;
   }
@@ -19721,7 +19721,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
-  const currCellHeight = getCellHeight(headerCellOpts.height) || defaultRowHeight;
+  const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -20173,7 +20173,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const cellOpts = $xeTable.computeCellOpts;
   const footerCellOpts = $xeTable.computeFooterCellOpts;
-  const currCellHeight = getCellHeight(footerCellOpts.height) || defaultRowHeight;
+  const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight;
   return tableColumn.map((column, $columnIndex) => {
     const {
       type,
@@ -27122,6 +27122,182 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
   });
   return params;
 }
+function handleCheckboxRangeEvent($xeTable, evnt, params) {
+  const internalData = $xeTable;
+  const {
+    elemStore
+  } = internalData;
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+  const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+  const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+  const {
+    column,
+    cell
+  } = params;
+  if (column.type === 'checkbox') {
+    let bodyWrapperElem = bodyScrollElem;
+    if (leftScrollElem && column.fixed === 'left') {
+      bodyWrapperElem = leftScrollElem;
+    } else if (rightScrollElem && column.fixed === 'right') {
+      bodyWrapperElem = rightScrollElem;
+    }
+    if (!bodyWrapperElem) {
+      return;
+    }
+    const el = $xeTable.$refs.refElem;
+    const disX = evnt.clientX;
+    const disY = evnt.clientY;
+    const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
+    const trElem = cell.parentNode;
+    const selectRecords = $xeTable.getCheckboxRecords();
+    let lastRangeRows = [];
+    const marginSize = 1;
+    const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem);
+    const startTop = offsetRest.offsetTop + evnt.offsetY;
+    const startLeft = offsetRest.offsetLeft + evnt.offsetX;
+    const startScrollTop = bodyWrapperElem.scrollTop;
+    const rowHeight = trElem.offsetHeight;
+    const trRect = trElem.getBoundingClientRect();
+    const offsetClientTop = disY - trRect.y;
+    let mouseScrollTimeout = null;
+    let isMouseScrollDown = false;
+    let mouseScrollSpaceSize = 1;
+    const triggerEvent = (type, evnt) => {
+      $xeTable.dispatchEvent(`checkbox-range-${type}`, {
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords()
+      }, evnt);
+    };
+    const handleChecked = evnt => {
+      const {
+        clientX,
+        clientY
+      } = evnt;
+      const offsetLeft = clientX - disX;
+      const offsetTop = clientY - disY + (bodyWrapperElem.scrollTop - startScrollTop);
+      let rangeHeight = Math.abs(offsetTop);
+      let rangeWidth = Math.abs(offsetLeft);
+      let rangeTop = startTop;
+      let rangeLeft = startLeft;
+      if (offsetTop < marginSize) {
+        // 向上
+        rangeTop += offsetTop;
+        if (rangeTop < marginSize) {
+          rangeTop = marginSize;
+          rangeHeight = startTop;
+        }
+      } else {
+        // 向下
+        rangeHeight = Math.min(rangeHeight, bodyWrapperElem.scrollHeight - startTop - marginSize);
+      }
+      if (offsetLeft < marginSize) {
+        // 向左
+        rangeLeft += offsetLeft;
+        if (rangeWidth > startLeft) {
+          rangeLeft = marginSize;
+          rangeWidth = startLeft;
+        }
+      } else {
+        // 向右
+        rangeWidth = Math.min(rangeWidth, bodyWrapperElem.clientWidth - startLeft - marginSize);
+      }
+      checkboxRangeElem.style.height = `${rangeHeight}px`;
+      checkboxRangeElem.style.width = `${rangeWidth}px`;
+      checkboxRangeElem.style.left = `${rangeLeft}px`;
+      checkboxRangeElem.style.top = `${rangeTop}px`;
+      checkboxRangeElem.style.display = 'block';
+      const rangeRows = getCheckboxRangeRows($xeTable, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
+      // 至少滑动 10px 才能有效匹配
+      if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
+        const isControlKey = hasControlKey(evnt);
+        lastRangeRows = rangeRows;
+        if (isControlKey) {
+          rangeRows.forEach(row => {
+            $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1);
+          });
+        } else {
+          $xeTable.setAllCheckboxRow(false);
+          $xeTable.handleCheckedCheckboxRow(rangeRows, true, false);
+        }
+        triggerEvent('change', evnt);
+      }
+    };
+    // 停止鼠标滚动
+    const stopMouseScroll = () => {
+      clearTimeout(mouseScrollTimeout);
+      mouseScrollTimeout = null;
+    };
+    // 开始鼠标滚动
+    const startMouseScroll = evnt => {
+      stopMouseScroll();
+      mouseScrollTimeout = setTimeout(() => {
+        if (mouseScrollTimeout) {
+          const {
+            scrollLeft,
+            scrollTop,
+            clientHeight,
+            scrollHeight
+          } = bodyWrapperElem;
+          const topSize = Math.ceil(mouseScrollSpaceSize * 50 / rowHeight);
+          if (isMouseScrollDown) {
+            if (scrollTop + clientHeight < scrollHeight) {
+              $xeTable.scrollTo(scrollLeft, scrollTop + topSize);
+              startMouseScroll(evnt);
+              handleChecked(evnt);
+            } else {
+              stopMouseScroll();
+            }
+          } else {
+            if (scrollTop) {
+              $xeTable.scrollTo(scrollLeft, scrollTop - topSize);
+              startMouseScroll(evnt);
+              handleChecked(evnt);
+            } else {
+              stopMouseScroll();
+            }
+          }
+        }
+      }, 50);
+    };
+    addClass(el, 'drag--range');
+    document.onmousemove = evnt => {
+      evnt.preventDefault();
+      evnt.stopPropagation();
+      const {
+        clientY
+      } = evnt;
+      const {
+        boundingTop
+      } = getAbsolutePos(bodyWrapperElem);
+      // 如果超过可视区，触发滚动
+      if (clientY < boundingTop) {
+        isMouseScrollDown = false;
+        mouseScrollSpaceSize = boundingTop - clientY;
+        if (!mouseScrollTimeout) {
+          startMouseScroll(evnt);
+        }
+      } else if (clientY > boundingTop + bodyWrapperElem.clientHeight) {
+        isMouseScrollDown = true;
+        mouseScrollSpaceSize = clientY - boundingTop - bodyWrapperElem.clientHeight;
+        if (!mouseScrollTimeout) {
+          startMouseScroll(evnt);
+        }
+      } else if (mouseScrollTimeout) {
+        stopMouseScroll();
+      }
+      handleChecked(evnt);
+    };
+    document.onmouseup = evnt => {
+      stopMouseScroll();
+      removeClass(el, 'drag--range');
+      checkboxRangeElem.removeAttribute('style');
+      document.onmousemove = null;
+      document.onmouseup = null;
+      triggerEvent('end', evnt);
+    };
+    triggerEvent('start', evnt);
+  }
+}
 /* harmony default export */ var keyboard_mixin = ({
   methods: {
     // 处理 Tab 键移动
@@ -27352,204 +27528,27 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
     },
     handleCellMousedownEvent(evnt, params) {
       const $xeTable = this;
+      const props = $xeTable;
       const {
         editConfig,
-        editOpts,
-        handleSelected,
         checkboxConfig,
-        checkboxOpts,
-        mouseConfig,
-        mouseOpts
-      } = this;
+        mouseConfig
+      } = props;
+      const checkboxOpts = $xeTable.computeCheckboxOpts;
+      const mouseOpts = $xeTable.computeMouseOpts;
+      const editOpts = $xeTable.computeEditOpts;
       if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
         return $xeTable.triggerCellAreaModnEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
-          this.handleCheckboxRangeEvent(evnt, params);
+          handleCheckboxRangeEvent($xeTable, evnt, params);
         }
         if (mouseConfig && mouseOpts.selected) {
           if (!editConfig || editOpts.mode === 'cell') {
-            handleSelected(params, evnt);
+            $xeTable.handleSelected(params, evnt);
           }
         }
       }
-    },
-    handleCheckboxRangeEvent(evnt, params) {
-      const $xeTable = this;
-      const internalData = $xeTable;
-      const {
-        elemStore
-      } = internalData;
-      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-      const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
-      const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
-      const {
-        column,
-        cell
-      } = params;
-      if (column.type === 'checkbox') {
-        let bodyWrapperElem = bodyScrollElem;
-        if (leftScrollElem && column.fixed === 'left') {
-          bodyWrapperElem = leftScrollElem;
-        } else if (rightScrollElem && column.fixed === 'right') {
-          bodyWrapperElem = rightScrollElem;
-        }
-        if (!bodyWrapperElem) {
-          return;
-        }
-        const el = $xeTable.$refs.refElem;
-        const disX = evnt.clientX;
-        const disY = evnt.clientY;
-        const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-        const trElem = cell.parentNode;
-        const selectRecords = this.getCheckboxRecords();
-        let lastRangeRows = [];
-        const marginSize = 1;
-        const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem);
-        const startTop = offsetRest.offsetTop + evnt.offsetY;
-        const startLeft = offsetRest.offsetLeft + evnt.offsetX;
-        const startScrollTop = bodyWrapperElem.scrollTop;
-        const rowHeight = trElem.offsetHeight;
-        const trRect = trElem.getBoundingClientRect();
-        const offsetClientTop = disY - trRect.y;
-        let mouseScrollTimeout = null;
-        let isMouseScrollDown = false;
-        let mouseScrollSpaceSize = 1;
-        const triggerEvent = (type, evnt) => {
-          this.emitEvent(`checkbox-range-${type}`, {
-            records: () => this.getCheckboxRecords(),
-            reserves: () => this.getCheckboxReserveRecords()
-          }, evnt);
-        };
-        const handleChecked = evnt => {
-          const {
-            clientX,
-            clientY
-          } = evnt;
-          const offsetLeft = clientX - disX;
-          const offsetTop = clientY - disY + (bodyWrapperElem.scrollTop - startScrollTop);
-          let rangeHeight = Math.abs(offsetTop);
-          let rangeWidth = Math.abs(offsetLeft);
-          let rangeTop = startTop;
-          let rangeLeft = startLeft;
-          if (offsetTop < marginSize) {
-            // 向上
-            rangeTop += offsetTop;
-            if (rangeTop < marginSize) {
-              rangeTop = marginSize;
-              rangeHeight = startTop;
-            }
-          } else {
-            // 向下
-            rangeHeight = Math.min(rangeHeight, bodyWrapperElem.scrollHeight - startTop - marginSize);
-          }
-          if (offsetLeft < marginSize) {
-            // 向左
-            rangeLeft += offsetLeft;
-            if (rangeWidth > startLeft) {
-              rangeLeft = marginSize;
-              rangeWidth = startLeft;
-            }
-          } else {
-            // 向右
-            rangeWidth = Math.min(rangeWidth, bodyWrapperElem.clientWidth - startLeft - marginSize);
-          }
-          checkboxRangeElem.style.height = `${rangeHeight}px`;
-          checkboxRangeElem.style.width = `${rangeWidth}px`;
-          checkboxRangeElem.style.left = `${rangeLeft}px`;
-          checkboxRangeElem.style.top = `${rangeTop}px`;
-          checkboxRangeElem.style.display = 'block';
-          const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
-          // 至少滑动 10px 才能有效匹配
-          if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
-            const isControlKey = hasControlKey(evnt);
-            lastRangeRows = rangeRows;
-            if (isControlKey) {
-              rangeRows.forEach(row => {
-                $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1);
-              });
-            } else {
-              this.setAllCheckboxRow(false);
-              this.handleCheckedCheckboxRow(rangeRows, true, false);
-            }
-            triggerEvent('change', evnt);
-          }
-        };
-        // 停止鼠标滚动
-        const stopMouseScroll = () => {
-          clearTimeout(mouseScrollTimeout);
-          mouseScrollTimeout = null;
-        };
-        // 开始鼠标滚动
-        const startMouseScroll = evnt => {
-          stopMouseScroll();
-          mouseScrollTimeout = setTimeout(() => {
-            if (mouseScrollTimeout) {
-              const {
-                scrollLeft,
-                scrollTop,
-                clientHeight,
-                scrollHeight
-              } = bodyWrapperElem;
-              const topSize = Math.ceil(mouseScrollSpaceSize * 50 / rowHeight);
-              if (isMouseScrollDown) {
-                if (scrollTop + clientHeight < scrollHeight) {
-                  this.scrollTo(scrollLeft, scrollTop + topSize);
-                  startMouseScroll(evnt);
-                  handleChecked(evnt);
-                } else {
-                  stopMouseScroll();
-                }
-              } else {
-                if (scrollTop) {
-                  this.scrollTo(scrollLeft, scrollTop - topSize);
-                  startMouseScroll(evnt);
-                  handleChecked(evnt);
-                } else {
-                  stopMouseScroll();
-                }
-              }
-            }
-          }, 50);
-        };
-        addClass(el, 'drag--range');
-        document.onmousemove = evnt => {
-          evnt.preventDefault();
-          evnt.stopPropagation();
-          const {
-            clientY
-          } = evnt;
-          const {
-            boundingTop
-          } = getAbsolutePos(bodyWrapperElem);
-          // 如果超过可视区，触发滚动
-          if (clientY < boundingTop) {
-            isMouseScrollDown = false;
-            mouseScrollSpaceSize = boundingTop - clientY;
-            if (!mouseScrollTimeout) {
-              startMouseScroll(evnt);
-            }
-          } else if (clientY > boundingTop + bodyWrapperElem.clientHeight) {
-            isMouseScrollDown = true;
-            mouseScrollSpaceSize = clientY - boundingTop - bodyWrapperElem.clientHeight;
-            if (!mouseScrollTimeout) {
-              startMouseScroll(evnt);
-            }
-          } else if (mouseScrollTimeout) {
-            stopMouseScroll();
-          }
-          handleChecked(evnt);
-        };
-        document.onmouseup = evnt => {
-          stopMouseScroll();
-          removeClass(el, 'drag--range');
-          checkboxRangeElem.removeAttribute('style');
-          document.onmousemove = null;
-          document.onmouseup = null;
-          triggerEvent('end', evnt);
-        };
-        triggerEvent('start', evnt);
-      }
     }
   }
 });
@@ -29557,10 +29556,20 @@ function renderBody(h, $xeTable) {
     },
     computeHeaderCellOpts() {
       const $xeTable = this;
+      const $xeGantt = $xeTable.$xeGantt;
       const props = $xeTable;
       const headerCellOpts = Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+      const defaultRowHeight = $xeTable.computeDefaultRowHeight;
       const cellOpts = $xeTable.computeCellOpts;
-      headerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCellHeight(headerCellOpts.height || cellOpts.height));
+      let headCellHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCalcHeight(headerCellOpts.height || cellOpts.height));
+      if ($xeGantt) {
+        const taskScaleConfs = $xeGantt.computeTaskScaleConfs;
+        if (taskScaleConfs && taskScaleConfs.length > 2) {
+          const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskScaleConfs.length;
+          headCellHeight = Math.max(ganttMinHeadCellHeight, headCellHeight);
+        }
+      }
+      headerCellOpts.height = headCellHeight;
       return headerCellOpts;
     },
     computeFooterCellOpts() {
@@ -29568,7 +29577,7 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       const footerCellOpts = Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
       const cellOpts = $xeTable.computeCellOpts;
-      footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCellHeight(footerCellOpts.height || cellOpts.height));
+      footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCalcHeight(footerCellOpts.height || cellOpts.height));
       return footerCellOpts;
     },
     rowOpts() {
@@ -30542,6 +30551,17 @@ function renderBody(h, $xeTable) {
     this.preventEvent(null, 'activated');
   },
   deactivated() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      filterStore
+    } = reactData;
+    if (filterStore.visible) {
+      $xeTable.clearFilter();
+    }
+    $xeTable.closeTooltip();
+    internalData.isActivated = false;
     this.preventEvent(null, 'deactivated');
   },
   beforeDestroy() {
@@ -35189,6 +35209,7 @@ const Toolbar = VxeToolbar;
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
       repeatKey: '主键重复 {0}="{1}"，这可能会出现错误',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',
@@ -35681,6 +35702,37 @@ const Toolbar = VxeToolbar;
         ss: '秒'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{E}日',
+        date: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        date: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {