vxe-table 4.17.1 → 4.17.3

package/es/table/module/custom/hook.js

@@ -2,13 +2,12 @@ import { nextTick } from 'vue';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
 import { getColumnList } from '../../src/util';
-const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
+const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'getCustomVisible', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
 VxeUI.hooks.add('tableCustomModule', {
     setupTable($xeTable) {
         const { reactData, internalData } = $xeTable;
         const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps();
         const { refElem } = $xeTable.getRefMaps();
-        const $xeGrid = $xeTable.xeGrid;
         const $xeGantt = $xeTable.xeGantt;
         const calcMaxHeight = () => {
             const { customStore } = reactData;
@@ -279,8 +278,7 @@ VxeUI.hooks.add('tableCustomModule', {
             customStore.isIndeterminate = !customStore.isAll && collectColumn.some((column) => (!checkMethod || checkMethod({ $table: $xeTable, column })) && (column.renderVisible || column.halfVisible));
         };
         const emitCustomEvent = (type, evnt) => {
-            const comp = $xeGrid || $xeGantt || $xeTable;
-            comp.dispatchEvent('custom', { type }, evnt);
+            $xeTable.dispatchEvent('custom', { type }, evnt);
         };
         const customPrivateMethods = {
             checkCustomStatus,

package/es/table/module/custom/panel.js

@@ -73,6 +73,7 @@ export default defineVxeComponent({
             $xeTable.saveCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('confirm', $event);
+            $xeTable.emitCustomEvent('close', $event);
         };
         const cancelCloseEvent = ({ $event }) => {
             $xeTable.closeCustom();
@@ -82,11 +83,13 @@ export default defineVxeComponent({
             $xeTable.cancelCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('cancel', $event);
+            $xeTable.emitCustomEvent('close', $event);
         };
         const handleResetCustomEvent = (evnt) => {
             $xeTable.resetCustom(true);
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('reset', evnt);
+            $xeTable.emitCustomEvent('close', evnt);
         };
         const resetCustomEvent = ({ $event }) => {
             if (VxeUI.modal) {

package/es/table/module/menu/hook.js

@@ -10,6 +10,9 @@ hooks.add('tableMenuModule', {
         const { xID, props, reactData, internalData } = $xeTable;
         const { refElem, refTableFilter, refTableMenu } = $xeTable.getRefMaps();
         const { computeMouseOpts, computeIsContentMenu, computeMenuOpts } = $xeTable.getComputeMaps();
+        const $xeGrid = $xeTable.xeGrid;
+        const $xeGantt = $xeTable.xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         let menuMethods = {};
         let menuPrivateMethods = {};
         /**
@@ -32,7 +35,10 @@ hooks.add('tableMenuModule', {
                         if (!visibleMethod || visibleMethod(params)) {
                             evnt.preventDefault();
                             $xeTable.updateZindex();
-                            const el = refElem.value;
+                            const el = $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : refElem.value;
+                            if (!el) {
+                                return;
+                            }
                             const tableRect = el.getBoundingClientRect();
                             const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                             let top = evnt.clientY - tableRect.y;

package/es/table/src/cell.js

@@ -382,11 +382,9 @@ export const Cell = {
         const tableReactData = $table.reactData;
         const tableInternalData = $table.internalData;
         const { isRowGroupStatus } = tableReactData;
-        const { computeEditOpts } = $table.getComputeMaps();
         const { editConfig } = tableProps;
-        const editOpts = computeEditOpts.value;
-        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
-        const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
+        const renderOpts = editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null);
         const defaultSlot = slots ? slots.default : null;
         const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         let cellValue = '';
@@ -448,7 +446,8 @@ export const Cell = {
             if (defaultSlot) {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
             }
-            if (renderOpts) {
+            // formatter > (renderTableCell | renderTableDefault)
+            if (renderOpts && !formatter) {
                 const compConf = renderer.get(renderOpts.name);
                 if (compConf) {
                     const rtCell = compConf.renderTableCell || compConf.renderCell;

package/es/table/src/table.js

@@ -1510,7 +1510,7 @@ export default defineVxeComponent({
             const customOpts = computeCustomOpts.value;
             const { storage, storeOptions } = customOpts;
             const isAllCustom = storage === true;
-            const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+            const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
             const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
             const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
             const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -1603,7 +1603,7 @@ export default defineVxeComponent({
             const customOpts = computeCustomOpts.value;
             const { storage, restoreStore, storeOptions } = customOpts;
             const isAllCustom = storage === true;
-            const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+            const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
             const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
             const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
             const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -3245,6 +3245,9 @@ export default defineVxeComponent({
             calcScrollbar();
             updateStyle();
             updateRowExpandStyle();
+            if (reFull) {
+                updateTreeLineStyle();
+            }
             return computeScrollLoad().then(() => {
                 // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
                 if (reWidth) {
@@ -3262,6 +3265,9 @@ export default defineVxeComponent({
                     updateRowOffsetTop();
                 }
                 updateRowExpandStyle();
+                if (reFull) {
+                    updateTreeLineStyle();
+                }
                 if (reFull) {
                     return computeScrollLoad();
                 }
@@ -3979,6 +3985,7 @@ export default defineVxeComponent({
             }
             reactData.treeExpandedFlag++;
             return Promise.all(result).then(() => {
+                updateTreeLineStyle();
                 return $xeTable.recalculate();
             });
         };
@@ -4419,7 +4426,32 @@ export default defineVxeComponent({
          * 更新树连接线样式
          */
         const updateTreeLineStyle = () => {
-            // 待优化
+            // const { tableData } = reactData
+            // const { rowExpandedMaps } = internalData
+            // const treeOpts = computeTreeOpts.value
+            // const { transform, mapChildrenField } = treeOpts
+            // const childrenField = treeOpts.children || treeOpts.childrenField
+            // const { handleGetRowId } = createHandleGetRowId($xeTable)
+            // // 待优化
+            // if (transform) {
+            //   // x
+            // } else {
+            //   // x
+            // }
+            // const handleNodeRow = (row: any, parentRow: any) => {
+            //   const childList: any[] = row[transform ? mapChildrenField : childrenField]
+            //   if (childList && childList.length) {
+            //     childList.forEach(childRow => {
+            //       const childRowid = handleGetRowId(childRow)
+            //       if (rowExpandedMaps[childRowid]) {
+            //         handleNodeRow(childRow, row)
+            //       }
+            //     })
+            //   }
+            // }
+            // tableData.forEach(row => {
+            //   handleNodeRow(row, null)
+            // })
         };
         const handleRowExpandScroll = () => {
             const { elemStore } = internalData;
@@ -6841,6 +6873,7 @@ export default defineVxeComponent({
                     }
                     reactData.treeExpandedFlag++;
                 }).then(() => {
+                    updateTreeLineStyle();
                     if (expList.length) {
                         return $xeTable.recalculate();
                     }
@@ -7204,7 +7237,7 @@ export default defineVxeComponent({
                 const { fullColumnFieldData, collectColumn } = internalData;
                 const { storage, checkMethod, storeOptions } = customOpts;
                 const isAllCustom = storage === true;
-                const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+                const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
                 const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
                 const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
                 const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -7385,11 +7418,12 @@ export default defineVxeComponent({
                 }
                 else {
                     if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-                        tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
-                            if ($xeTable.closeCustom) {
+                        if (customStore.visible && $xeTable.closeCustom) {
+                            tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
                                 $xeTable.closeCustom();
-                            }
-                        });
+                                $xeTable.dispatchEvent('custom', { type: 'close' }, evnt);
+                            });
+                        }
                     }
                 }
             }
@@ -8820,7 +8854,7 @@ export default defineVxeComponent({
                 const customOpts = computeCustomOpts.value;
                 const { updateStore, storage, storeOptions } = customOpts;
                 const isAllCustom = storage === true;
-                const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+                const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
                 const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
                 const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
                 const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);

package/es/ui/index.js

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