vxe-table 4.7.92 → 4.7.93

package/lib/index.umd.js

@@ -1998,9 +1998,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.92";
+const version = "4.7.93";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.92";
+core_.VxeUI.tableVersion = "4.7.93";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2384,7 +2384,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.92"}`;
+const log_version = `table v${"4.7.93"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4849,7 +4849,7 @@ const lineOffsetSizes = {
       let hasEllipsis = showTitle || showTooltip || showEllipsis;
       let isDirty;
       const tdOns = {};
-      const cellAlign = align || allAlign;
+      const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
       const errorValidItem = validErrorMaps[`${rowid}:${colid}`];
       const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
       const attrs = {
@@ -5669,6 +5669,10 @@ const lineOffsetSizes = {
 
 
 
+
+const {
+  renderer: header_renderer
+} = core_.VxeUI;
 const header_renderType = 'header';
 /* harmony default export */ var header = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeTableHeader',
@@ -5946,13 +5950,17 @@ const header_renderType = 'header';
             showHeaderOverflow,
             headerAlign,
             align,
-            headerClassName
+            headerClassName,
+            editRender,
+            cellRender
           } = column;
           const colid = column.id;
+          const renderOpts = editRender || cellRender;
+          const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : !!column.fixed && overflowX;
           const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-          const headAlign = headerAlign || align || allHeaderAlign || allAlign;
+          const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
           let showEllipsis = headOverflow === 'ellipsis';
           const showTitle = headOverflow === 'title';
           const showTooltip = headOverflow === true || headOverflow === 'tooltip';
@@ -6040,6 +6048,10 @@ const header_renderType = 'header';
 
 
 
+
+const {
+  renderer: footer_renderer
+} = core_.VxeUI;
 const footer_renderType = 'footer';
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
@@ -6279,13 +6291,17 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             showFooterOverflow,
             footerAlign,
             align,
-            footerClassName
+            footerClassName,
+            editRender,
+            cellRender
           } = column;
+          const renderOpts = editRender || cellRender;
+          const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
           const showAllTip = tooltipOpts.showAll;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
           const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-          const footAlign = footerAlign || align || allFooterAlign || allAlign;
+          const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
           let showEllipsis = footOverflow === 'ellipsis';
           const showTitle = footOverflow === 'title';
           const showTooltip = footOverflow === true || footOverflow === 'tooltip';