vxe-table 4.18.13 → 4.18.15

package/es/table/src/cell.js

@@ -368,7 +368,7 @@ export const Cell = {
         const tableInternalData = $table.internalData;
         const { isRowGroupStatus } = tableReactData;
         const { editConfig } = tableProps;
-        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const isEnableEdit = editConfig && isEnableConf(editConfig);
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
@@ -444,8 +444,9 @@ export const Cell = {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
             }
             const renderOpts = editRenderOpts || cellRenderOpts;
-            // formatter > (renderTableCell | renderTableDefault)
-            if (renderOpts && !formatter) {
+            // 如果是编辑表格：renderTableCell > formatter
+            // 如果是查看表格：renderTableDefault > formatter
+            if (renderOpts) {
                 const compConf = renderer.get(renderOpts.name);
                 if (compConf) {
                     const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);

package/es/table/src/table.js

@@ -3650,6 +3650,7 @@ export default defineVxeComponent({
                 updateStyle();
             }).then(() => {
                 computeScrollLoad();
+                syncGanttScrollYStatus();
             }).then(() => {
                 const virtualYOpts = computeVirtualYOpts.value;
                 // 是否启用了虚拟滚动
@@ -3709,6 +3710,7 @@ export default defineVxeComponent({
                         reactData.isRowLoading = false;
                         handleRecalculateStyle(false, false, false);
                         updateTreeLineStyle();
+                        syncGanttScrollYStatus();
                         // 如果是自动行高，特殊情况需调用 recalculate 手动刷新
                         if (!props.showOverflow) {
                             setTimeout(() => {
@@ -4027,9 +4029,14 @@ export default defineVxeComponent({
             reactData.scrollXLoad = scrollXLoad;
             return scrollXLoad;
         };
+        const syncGanttScrollYStatus = () => {
+            const $xeGanttView = internalData.xeGanttView;
+            if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
+                $xeGanttView.handleUpdateSYStatus(reactData.scrollYLoad);
+            }
+        };
         const updateScrollYStatus = (fullData) => {
             const { treeConfig } = props;
-            const $xeGanttView = internalData.xeGanttView;
             const virtualYOpts = computeVirtualYOpts.value;
             const treeOpts = computeTreeOpts.value;
             const { transform } = treeOpts;
@@ -4037,9 +4044,7 @@ export default defineVxeComponent({
             // 如果gt为0，则总是启用
             const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
             reactData.scrollYLoad = scrollYLoad;
-            if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
-                $xeGanttView.handleUpdateSYStatus(scrollYLoad);
-            }
+            syncGanttScrollYStatus();
             return scrollYLoad;
         };
         /**

package/es/ui/index.js

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