vxe-table 4.12.3 → 4.12.5

package/lib/table/src/table.js

@@ -255,6 +255,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
       rowExpandedFlag: 1,
@@ -879,6 +880,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeBodyMenu,
       computeFooterMenu,
       computeIsMenu,
+      computeMenuList,
       computeMenuOpts,
       computeExportOpts,
       computeImportOpts,
@@ -1367,6 +1369,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const expandOpts = computeExpandOpts.value;
       const columnOpts = computeColumnOpts.value;
       const columnDragOpts = computeColumnDragOpts.value;
+      const virtualYOpts = computeVirtualYOpts.value;
       const {
         isCrossDrag,
         isSelfToChildDrag
@@ -1420,39 +1423,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
           htmlColumn = column;
         }
         if (treeNode) {
-          if (process.env.NODE_ENV === 'development') {
-            if (treeNodeColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
-            }
+          if (treeNodeColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
           }
           if (!treeNodeColumn) {
             treeNodeColumn = column;
           }
         } else if (type === 'expand') {
-          if (process.env.NODE_ENV === 'development') {
-            if (expandColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-            }
+          if (expandColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
           }
           if (!expandColumn) {
             expandColumn = column;
           }
         }
-        if (process.env.NODE_ENV === 'development') {
-          if (type === 'checkbox') {
-            if (checkboxColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-            }
-            if (!checkboxColumn) {
-              checkboxColumn = column;
-            }
-          } else if (type === 'radio') {
-            if (radioColumn) {
-              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-            }
-            if (!radioColumn) {
-              radioColumn = column;
-            }
+        if (type === 'checkbox') {
+          if (checkboxColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
+          }
+          if (!checkboxColumn) {
+            checkboxColumn = column;
+          }
+        } else if (type === 'radio') {
+          if (radioColumn) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
+          }
+          if (!radioColumn) {
+            radioColumn = column;
           }
         }
         if (isAllOverflow && column.showOverflow === false) {
@@ -1471,6 +1468,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } else {
         tableFullColumn.forEach(handleFunc);
       }
+      if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+        (0, _log.warnLog)('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+      }
       if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
         (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
@@ -3083,6 +3083,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
+      const expandOpts = computeExpandOpts.value;
       const {
         transform
       } = treeOpts;
@@ -3170,6 +3171,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
         if (sYLoad) {
+          if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+            (0, _log.errLog)('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+          }
           // if (showOverflow) {
           //   if (!rowOpts.height) {
           //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -4779,6 +4783,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
+        const {
+          updateCheckboxFlag
+        } = reactData;
         const {
           tableFullData,
           afterFullData,
@@ -4799,28 +4806,30 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let rowList = [];
-        if (checkField) {
-          if (treeConfig) {
-            const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
-            rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
-              children: transform ? mapChildrenField : childrenField
-            });
-          } else {
-            const currTableData = isFull ? tableFullData : afterFullData;
-            rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
-          }
-        } else {
-          _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
-            if (isFull) {
-              if (fullDataRowIdData[rowid]) {
-                rowList.push(fullDataRowIdData[rowid].row);
-              }
+        if (updateCheckboxFlag) {
+          if (checkField) {
+            if (treeConfig) {
+              const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
+              rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
+                children: transform ? mapChildrenField : childrenField
+              });
             } else {
-              if (afterFullRowMaps[rowid]) {
-                rowList.push(afterFullRowMaps[rowid]);
-              }
+              const currTableData = isFull ? tableFullData : afterFullData;
+              rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
             }
-          });
+          } else {
+            _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
+              if (isFull) {
+                if (fullDataRowIdData[rowid]) {
+                  rowList.push(fullDataRowIdData[rowid].row);
+                }
+              } else {
+                if (afterFullRowMaps[rowid]) {
+                  rowList.push(afterFullRowMaps[rowid]);
+                }
+              }
+            });
+          }
         }
         return rowList;
       },
@@ -11832,7 +11841,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           exportConfig,
           importConfig,
           treeConfig,
-          showOverflow
+          showOverflow,
+          highlightCurrentRow,
+          highlightCurrentColumn
         } = props;
         const {
           scrollXStore,
@@ -11848,6 +11859,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const mouseOpts = computeMouseOpts.value;
         const exportOpts = computeExportOpts.value;
         const importOpts = computeImportOpts.value;
+        const currentRowOpts = computeCurrentRowOpts.value;
+        const currentColumnOpts = computeCurrentColumnOpts.value;
+        const virtualXOpts = computeVirtualXOpts.value;
+        const virtualYOpts = computeVirtualYOpts.value;
+        const keyboardOpts = computeKeyboardOpts.value;
         if (props.rowId) {
           (0, _log.warnLog)('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
@@ -11887,6 +11903,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (props.highlightHoverColumn) {
           (0, _log.warnLog)('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
         }
+        // if (props.scrollY) {
+        //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
+        // }
+        // if (props.scrollX) {
+        //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
+        // }
         // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
         if (importConfig && importOpts.types && !importOpts.importMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(importOpts._typeMaps), importOpts.types)) {
           (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
@@ -11947,6 +11969,26 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (checkboxOpts.halfField) {
           (0, _log.warnLog)('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
         }
+        if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !_xeUtils.default.isBoolean(currentRowOpts.isFollowSelected)) {
+          (0, _log.warnLog)('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
+        }
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !_xeUtils.default.isBoolean(currentColumnOpts.isFollowSelected)) {
+          (0, _log.warnLog)('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
+        }
+        // 如果不支持虚拟滚动
+        if (props.spanMethod) {
+          if (virtualXOpts.enabled) {
+            (0, _log.warnLog)('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false']);
+          }
+          if (virtualYOpts.enabled) {
+            (0, _log.warnLog)('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false']);
+          }
+        }
+        if (props.footerSpanMethod) {
+          if (virtualXOpts.enabled) {
+            (0, _log.warnLog)('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
+          }
+        }
         // 检查是否有安装需要的模块
         if (props.editConfig && !$xeTable.insert) {
           (0, _log.errLog)('vxe.error.reqModule', ['Edit']);