vxe-table 4.14.0-beta.8 → 4.14.0

package/es/table/src/table.js

@@ -6562,8 +6562,7 @@ export default defineVxeComponent({
                 });
             },
             /**
-             * 设置合并单元格
-             * @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) {
                 if (props.spanMethod) {
@@ -6572,13 +6571,17 @@ export default defineVxeComponent({
                 handleBodyMerge(merges);
                 $xeTable.handleUpdateBodyMerge();
                 return 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();
                 });
             },
             /**
-             * 移除单元格合并
-             * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
+             * 移除单元格合并 [{row:Row|number, col:ColumnInfo|number}]
              */
             removeMergeCells(merges) {
                 if (props.spanMethod) {

package/es/ui/index.js

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

package/lib/index.common.js

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-var VxeTableExport = _interopRequireWildcard(require("./components"));
-Object.keys(VxeTableExport).forEach(function (key) {
+var VxeUITableExport = _interopRequireWildcard(require("./components"));
+Object.keys(VxeUITableExport).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === VxeTableExport[key]) return;
+  if (key in exports && exports[key] === VxeUITableExport[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return VxeTableExport[key];
+      return VxeUITableExport[key];
     }
   });
 });
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var _default = exports.default = VxeTableExport;
+var _default = exports.default = VxeUITableExport;

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.14.0-beta.8";
+const version = "4.14.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3628,7 +3628,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.14.0-beta.8"}`;
+const log_version = `table v${"4.14.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4948,7 +4948,7 @@ function renderTitleContent(params, content) {
   } = column;
   const tooltipOpts = computeTooltipOpts.value;
   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 = {};
@@ -11503,11 +11503,9 @@ if(transform){return handleVirtualTreeExpand(rows,expanded);}else{return handleB
              * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
              * 如果单元格配置了校验规则，则会进行校验
              */updateStatus(slotParams,cellValue){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(()=>{const{editRules}=props;if(slotParams&&editRules){return $xeTable.handleCellRuleUpdateStatus('change',slotParams,cellValue);}});},/**
-             * 设置合并单元格
-             * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
-             */setMergeCells(merges){if(props.spanMethod){errLog('vxe.error.errConflicts',['merge-cells','span-method']);}handleBodyMerge(merges);$xeTable.handleUpdateBodyMerge();return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(()=>{$xeTable.updateCellAreas();return updateStyle();});},/**
-             * 移除单元格合并
-             * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
+             * 设置合并单元格 [{ row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }]
+             */setMergeCells(merges){if(props.spanMethod){errLog('vxe.error.errConflicts',['merge-cells','span-method']);}handleBodyMerge(merges);$xeTable.handleUpdateBodyMerge();return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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();});},/**
+             * 移除单元格合并 [{row:Row|number, col:ColumnInfo|number}]
              */removeMergeCells(merges){if(props.spanMethod){errLog('vxe.error.errConflicts',['merge-cells','span-method']);}const rest=removeBodyMerges(merges);$xeTable.handleUpdateBodyMerge();return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(()=>{$xeTable.updateCellAreas();updateStyle();return rest;});},/**
              * 获取所有被合并的单元格
              */getMergeCells(){return internalData.mergeBodyList.slice(0);},/**
@@ -21690,6 +21688,7 @@ const Toolbar = VxeToolbar;
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',