vxe-table 3.16.0-beta.8 → 3.16.0

package/es/table/src/cell.js

@@ -166,14 +166,14 @@ function getRenderDefaultColumnTitle(h, column, content) {
 }
 function renderTitleContent(h, params, content) {
     const { $table, column } = params;
-    const { showHeaderOverflow } = column;
     const tableProps = $table;
     const tableReactData = $table;
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
     const { isRowGroupStatus } = tableReactData;
+    const { showHeaderOverflow } = column;
     const tooltipOpts = $table.computeTooltipOpts;
     const showAllTip = tooltipOpts.showAll;
-    const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+    const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
     const ons = {};
@@ -202,7 +202,10 @@ function renderTitleContent(h, params, content) {
     }
     const titleVN = getRenderDefaultColumnTitle(h, column, content);
     return [
-        h('span', Object.assign({ class: 'vxe-cell--title' }, ons), isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
+        h('span', {
+            class: 'vxe-cell--title',
+            on: ons
+        }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
             ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN)
             : [
                 titleVN

package/es/table/src/methods.js

@@ -10378,25 +10378,30 @@ const Methods = {
         });
     },
     /**
-     * 设置合并单元格
-     * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
+     * 设置合并单元格 [{ row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }]
      */
     setMergeCells(merges) {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
         if (props.spanMethod) {
             errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
         handleBodyMerge($xeTable, merges);
         $xeTable.handleUpdateBodyMerge();
         return $xeTable.$nextTick().then(() => {
+            const { expandColumn } = reactData;
+            const { mergeBodyList } = internalData;
+            if (expandColumn && mergeBodyList.length) {
+                warnLog('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method']);
+            }
             $xeTable.updateCellAreas();
             return updateStyle($xeTable);
         });
     },
     /**
-     * 移除单元格合并
-     * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
+     * 移除单元格合并 [{row:Row|number, col:ColumnInfo|number}]
      */
     removeMergeCells(merges) {
         const $xeTable = this;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.16.0-beta.8";
+export const version = "3.16.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.16.0-beta.8"}`;
+const version = `table v${"3.16.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.16.0-beta.8";
+const version = "3.16.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.0-beta.8"}`;
+const log_version = `table v${"3.16.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3687,9 +3687,6 @@ function renderTitleContent(h, params, content) {
     $table,
     column
   } = params;
-  const {
-    showHeaderOverflow
-  } = column;
   const tableProps = $table;
   const tableReactData = $table;
   const {
@@ -3698,9 +3695,12 @@ function renderTitleContent(h, params, content) {
   const {
     isRowGroupStatus
   } = tableReactData;
+  const {
+    showHeaderOverflow
+  } = column;
   const tooltipOpts = $table.computeTooltipOpts;
   const showAllTip = tooltipOpts.showAll;
-  const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+  const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
   const showTitle = headOverflow === 'title';
   const showTooltip = headOverflow === true || headOverflow === 'tooltip';
   const ons = {};
@@ -3729,7 +3729,7 @@ function renderTitleContent(h, params, content) {
   const titleVN = getRenderDefaultColumnTitle(h, column, content);
   return [h('span', {
     class: 'vxe-cell--title',
-    ...ons
+    on: ons
   }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN) : [titleVN])];
 }
 function getFooterContent(h, params) {
@@ -17338,25 +17338,34 @@ const Methods = {
     });
   },
   /**
-   * 设置合并单元格
-   * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
+   * 设置合并单元格 [{ row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }]
    */
   setMergeCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     if (props.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     handleBodyMerge($xeTable, merges);
     $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
+      const {
+        expandColumn
+      } = reactData;
+      const {
+        mergeBodyList
+      } = internalData;
+      if (expandColumn && mergeBodyList.length) {
+        warnLog('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method']);
+      }
       $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
   /**
-   * 移除单元格合并
-   * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
+   * 移除单元格合并 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells(merges) {
     const $xeTable = this;
@@ -34440,6 +34449,7 @@ const Toolbar = VxeToolbar;
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',