vxe-table 3.9.12 → 3.9.14

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.12";
+const version = "3.9.14";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.12";
+core_.VxeUI.tableVersion = "3.9.14";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.9.12"}`;
+const log_version = `table v${"3.9.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11754,7 +11754,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   let hasEllipsis = showTitle || showTooltip || showEllipsis;
   let isDirty;
   const tdOns = {};
-  const cellAlign = align || allAlign;
+  const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
   const errorValidItem = validErrorMaps[`${rowid}:${column.id}`];
   const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
   const attrs = {
@@ -12270,9 +12270,9 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
       }, h);
     } else {
       const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
-      const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
-      if (renderTableEmptyView) {
-        emptyContent = getSlotVNs(renderTableEmptyView.call(this, h, emptyOpts, {
+      const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
+      if (rtEmptyView) {
+        emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, {
           $table: $xetable
         }));
       } else {
@@ -12578,6 +12578,10 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
 
 
 
+
+const {
+  renderer: header_renderer
+} = core_.VxeUI;
 const cellType = 'header';
 /* harmony default export */ var header = ({
   name: 'VxeTableHeader',
@@ -12742,14 +12746,18 @@ const cellType = 'header';
           showHeaderOverflow,
           headerAlign,
           align,
-          headerClassName
+          headerClassName,
+          editRender,
+          cellRender
         } = column;
         // const { enabled } = tooltipOpts
         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().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(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';
@@ -12947,7 +12955,11 @@ const cellType = 'header';
 
 
 
+
 const footer_cellType = 'footer';
+const {
+  renderer: footer_renderer
+} = core_.VxeUI;
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
     const {
@@ -13119,13 +13131,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 || tooltipOpts.enabled;
         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().isUndefined(showFooterOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(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';
@@ -20188,9 +20204,9 @@ function renderEmptyContenet(h, _vm) {
     emptyContent = $scopedSlots.empty.call(_vm, params, h);
   } else {
     const compConf = emptyOpts.name ? table_renderer.get(emptyOpts.name) : null;
-    const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
-    if (renderTableEmptyView) {
-      emptyContent = getSlotVNs(renderTableEmptyView.call(_vm, h, emptyOpts, params));
+    const rtEmptyView = compConf ? compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty : null;
+    if (rtEmptyView) {
+      emptyContent = getSlotVNs(rtEmptyView.call(_vm, h, emptyOpts, params));
     } else {
       emptyContent = getFuncText(_vm.emptyText) || table_getI18n('vxe.table.emptyText');
     }