vxe-table 3.15.52 → 3.15.54

package/es/table/src/columnInfo.js

@@ -9,6 +9,7 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const { field, editRender } = _vm;
         const proxyOpts = $xeGrid ? $xeGrid.proxyOpts : null;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
@@ -53,6 +54,14 @@ export class ColumnInfo {
                 errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
             }
         }
+        if (field && editRender) {
+            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+            }
+            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+            }
+        }
         Object.assign(this, {
             // 基本属性
             type: _vm.type,

package/es/table/src/footer.js

@@ -14,7 +14,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
     const $xeGrid = $xeTable.$xeGrid;
     const { fixedType } = props;
     const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
-    const { scrollXLoad, scrollYLoad, overflowX, currentColumn } = tableReactData;
+    const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFootFlag } = tableReactData;
     const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData;
     const virtualXOpts = $xeTable.computeVirtualXOpts;
     const tooltipOpts = $xeTable.computeTooltipOpts;
@@ -89,7 +89,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         };
         let isMergeCell = false;
         // 合并行或列
-        if (mergeFooterList.length) {
+        if (mergeFootFlag && mergeFooterList.length) {
             const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
             if (spanRest) {
                 const { rowspan, colspan } = spanRest;

package/es/table/src/methods.js

@@ -8476,8 +8476,7 @@ const Methods = {
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
-        // 已废弃，即将去掉事件触发 new Event('click') -> null
-        return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+        return handleSortEvent($xeTable, null, sortConfs, isUpdate);
     },
     setSortByEvent(evnt, sortConfs, isUpdate) {
         const $xeTable = this;
@@ -10200,12 +10199,19 @@ const Methods = {
     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);
         });

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.52";
+export const version = "3.15.54";
 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.15.52"}`;
+const version = `table v${"3.15.54"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.15.52";
+const version = "3.15.54";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3906,7 +3906,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.52"}`;
+const log_version = `table v${"3.15.54"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3929,6 +3929,10 @@ class ColumnInfo {
   } = {}) {
     const tableProps = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const {
+      field,
+      editRender
+    } = _vm;
     const proxyOpts = $xeGrid ? $xeGrid.proxyOpts : null;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
@@ -3974,6 +3978,14 @@ class ColumnInfo {
         errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
       }
     }
+    if (field && editRender) {
+      if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+      }
+      if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+      }
+    }
     Object.assign(this, {
       // 基本属性
       type: _vm.type,
@@ -4966,7 +4978,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) {
@@ -16344,8 +16356,7 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    // 已废弃，即将去掉事件触发 new Event('click') -> null
-    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    return handleSortEvent($xeTable, null, sortConfs, isUpdate);
   },
   setSortByEvent(evnt, sortConfs, isUpdate) {
     const $xeTable = this;
@@ -18361,12 +18372,23 @@ const Methods = {
   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);
     });
@@ -20093,7 +20115,8 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     scrollXLoad,
     scrollYLoad,
     overflowX,
-    currentColumn
+    currentColumn,
+    mergeFootFlag
   } = tableReactData;
   const {
     fullColumnIdData,
@@ -20189,7 +20212,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     };
     let isMergeCell = false;
     // 合并行或列
-    if (mergeFooterList.length) {
+    if (mergeFootFlag && mergeFooterList.length) {
       const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
       if (spanRest) {
         const {
@@ -35100,6 +35123,7 @@ const Toolbar = VxeToolbar;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
@@ -35179,8 +35203,26 @@ const Toolbar = VxeToolbar;
       operError: '发生错误，操作失败！'
     },
     select: {
+      clear: '清除',
+      allChecked: '全选',
+      total: '{0} / {1}',
       search: '搜索',
       loadingText: '加载中',
+      emptyText: '暂无数据',
+      maxSize: '最大可选择的数量不能超过 {0} 个',
+      overSizeErr: '已超出最大可选数量 {0} 个，超出部分将被忽略！',
+      searchEmpty: '未匹配到数据！'
+    },
+    tree: {
+      searchEmpty: '未匹配到数据！'
+    },
+    treeSelect: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      allExpand: '全部展开',
+      clearExpand: '全部收起',
+      total: '已选 {0}',
+      search: '搜索',
       emptyText: '暂无数据'
     },
     pager: {
@@ -35420,6 +35462,7 @@ const Toolbar = VxeToolbar;
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',