vxe-table 3.15.18 → 3.15.20

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.18";
+const version = "3.15.20";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.18"}`;
+const log_version = `table v${"3.15.20"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7488,7 +7488,8 @@ const handleFooterMerge = ($xeTable, merges) => {
   } = reactData;
   const {
     mergeFooterList,
-    mergeFooterMaps
+    mergeFooterMaps,
+    fullColumnIdData
   } = internalData;
   if (merges) {
     const {
@@ -7508,6 +7509,12 @@ const handleFooterMerge = ($xeTable, merges) => {
       let mergeColumnIndex = -1;
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
         mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
       }
       if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
         rowspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(rowspan) || 1;
@@ -7540,36 +7547,92 @@ const handleFooterMerge = ($xeTable, merges) => {
     });
   }
 };
-function removeMerges($xeTable, merges, mList, rowList) {
-  // const props = $xeTable
+function removeBodyMerges($xeTable, merges) {
   const internalData = $xeTable;
+  const {
+    mergeBodyList,
+    fullColumnIdData,
+    fullAllDataRowIdData
+  } = internalData;
   const rest = [];
   if (merges) {
-    // const { treeConfig } = props
     const {
-      visibleColumn
-    } = internalData;
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
       merges = [merges];
     }
-    // if (treeConfig && merges.length) {
-    //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-    // }
     merges.forEach(item => {
-      let {
-        row,
-        col
+      const {
+        row: margeRow,
+        col: margeCol
       } = item;
-      if (rowList && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
-        row = rowList[row];
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow)) {
+        mergeRowIndex = margeRow;
+      } else {
+        const rowid = margeRow ? handleGetRowId(margeRow) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
       }
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(col)) {
-        col = visibleColumn[col];
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
       }
-      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mList, item => item._row === row && item._col === col);
+      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
       if (mcIndex > -1) {
-        const rItems = mList.splice(mcIndex, 1);
-        rest.push(rItems[0]);
+        const rItems = mergeBodyList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(rItems[0]);
+        }
+      }
+    });
+  }
+  return rest;
+}
+function removeFooterMerges($xeTable, merges) {
+  const internalData = $xeTable;
+  const {
+    mergeFooterList,
+    fullColumnIdData
+  } = internalData;
+  const rest = [];
+  if (merges) {
+    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      const {
+        row: margeRow,
+        col: margeCol
+      } = item;
+      const mergeRowIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeFooterList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      if (mcIndex > -1) {
+        const rItems = mergeFooterList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(item);
+        }
       }
     });
   }
@@ -13307,29 +13370,35 @@ const Methods = {
     } = params;
     const radioOpts = $xeTable.computeRadioOpts;
     const {
-      trigger
+      trigger,
+      checkMethod
     } = radioOpts;
     if (trigger === 'manual') {
       return;
     }
     evnt.stopPropagation();
-    let newValue = row;
-    let isChange = oldValue !== newValue;
-    if (isChange) {
-      handleCheckedRadioRow($xeTable, newValue);
-    } else if (!radioOpts.strict) {
-      isChange = oldValue === newValue;
+    if (!checkMethod || checkMethod({
+      $table: $xeTable,
+      row
+    })) {
+      let newValue = row;
+      let isChange = oldValue !== newValue;
       if (isChange) {
-        newValue = null;
-        $xeTable.clearRadioRow();
+        handleCheckedRadioRow($xeTable, newValue);
+      } else if (!radioOpts.strict) {
+        isChange = oldValue === newValue;
+        if (isChange) {
+          newValue = null;
+          $xeTable.clearRadioRow();
+        }
+      }
+      if (isChange) {
+        $xeTable.dispatchEvent('radio-change', {
+          oldValue,
+          newValue,
+          ...params
+        }, evnt);
       }
-    }
-    if (isChange) {
-      $xeTable.dispatchEvent('radio-change', {
-        oldValue,
-        newValue,
-        ...params
-      }, evnt);
     }
   },
   triggerCurrentColumnEvent(evnt, params) {
@@ -15400,7 +15469,9 @@ const Methods = {
     return rest;
   },
   /**
-   * 获取树表格状态
+   * 内部方法、获取树表格状态
+   * @deprecated
+   * @private
    */
   getTreeStatus() {
     if (this.treeConfig) {
@@ -16766,11 +16837,11 @@ const Methods = {
   removeMergeCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
-    const internalData = $xeTable;
     if (props.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+    const rest = removeBodyMerges($xeTable, merges);
+    $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
       $xeTable.updateCellAreas();
       updateStyle($xeTable);
@@ -16790,10 +16861,12 @@ const Methods = {
    */
   clearMergeCells() {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     internalData.mergeBodyList = [];
     internalData.mergeBodyMaps = {};
     internalData.mergeBodyCellMaps = {};
+    reactData.mergeBodyFlag++;
     return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
@@ -16814,11 +16887,11 @@ const Methods = {
   removeMergeFooterItems(merges) {
     const $xeTable = this;
     const props = $xeTable;
-    const internalData = $xeTable;
     if (props.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+    const rest = removeFooterMerges($xeTable, merges);
+    $xeTable.handleUpdateFooterMerge();
     return $xeTable.$nextTick().then(() => {
       $xeTable.updateCellAreas();
       updateStyle($xeTable);
@@ -16838,10 +16911,12 @@ const Methods = {
    */
   clearMergeFooterItems() {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     internalData.mergeFooterList = [];
     internalData.mergeFooterMaps = {};
     internalData.mergeFooterCellMaps = {};
+    reactData.mergeFootFlag++;
     return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
@@ -17880,7 +17955,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -18355,7 +18431,8 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -18829,7 +18906,8 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -28489,8 +28567,8 @@ function renderBody(h, $xeTable) {
     if (props.editConfig && editOpts.showStatus && !props.keepSource) {
       warnLog('vxe.error.reqProp', ['keep-source']);
     }
-    if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-      warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+    if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
+      warnLog('vxe.error.reqProp', ['show-overflow']);
     }
     if (treeConfig && !treeOpts.transform && props.stripe) {
       warnLog('vxe.error.noTree', ['stripe']);
@@ -31889,14 +31967,17 @@ function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
   } = renderOpts;
   const groupOptions = optionGroupProps.options || 'options';
   const groupLabel = optionGroupProps.label || 'label';
-  return optionGroups.map((group, gIndex) => {
-    return h('optgroup', {
-      key: gIndex,
-      attrs: {
-        label: group[groupLabel]
-      }
-    }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
-  });
+  if (optionGroups) {
+    return optionGroups.map((group, gIndex) => {
+      return h('optgroup', {
+        key: gIndex,
+        attrs: {
+          label: group[groupLabel]
+        }
+      }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
+    });
+  }
+  return [];
 }
 /**
  * 渲染原生的 option 标签
@@ -31913,19 +31994,22 @@ function renderNativeOptions(h, options, renderOpts, params) {
   const valueProp = optionProps.value || 'value';
   const disabledProp = optionProps.disabled || 'disabled';
   const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-  return options.map((option, oIndex) => {
-    return h('option', {
-      key: oIndex,
-      attrs: {
-        value: option[valueProp],
-        disabled: option[disabledProp]
-      },
-      domProps: {
-        /* eslint-disable eqeqeq */
-        selected: option[valueProp] == cellValue
-      }
-    }, option[labelProp]);
-  });
+  if (options) {
+    return options.map((option, oIndex) => {
+      return h('option', {
+        key: oIndex,
+        attrs: {
+          value: option[valueProp],
+          disabled: option[disabledProp]
+        },
+        domProps: {
+          /* eslint-disable eqeqeq */
+          selected: option[valueProp] == cellValue
+        }
+      }, option[labelProp]);
+    });
+  }
+  return [];
 }
 function nativeFilterRender(h, renderOpts, params) {
   const {
@@ -33048,7 +33132,7 @@ const Toolbar = VxeToolbar;
           year: 'yyyy'
         },
         weeks: {
-          w: '周',
+          w: '',
           w0: '周日',
           w1: '周一',
           w2: '周二',