vxe-table 3.19.49 → 3.19.52

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

@@ -309,8 +309,9 @@ export default {
             if (!menu.loading && !menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                 const gMenuOpts = menus.get(menu.code);
                 const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt });
-                if (gMenuOpts && gMenuOpts.menuMethod) {
-                    gMenuOpts.menuMethod(params, evnt);
+                const tmMethod = gMenuOpts ? (gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod) : null;
+                if (tmMethod) {
+                    tmMethod(params, evnt);
                 }
                 // 在 v4 中废弃事件 context-menu-click
                 if ($xeTable.$listeners['context-menu-click']) {

package/es/table/src/cell.js

@@ -370,7 +370,7 @@ export const Cell = {
         const tableInternalData = $table;
         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;
@@ -445,8 +445,9 @@ export const Cell = {
                 return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
             }
             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/style.css

@@ -1663,7 +1663,7 @@
           user-select: none;
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
-  background-color: var(--vxe-ui-table-menu-background-color);
+  background-color: var(--vxe-ui-layout-background-color);
 }
 
 .vxe-context-menu--link {
@@ -1695,7 +1695,7 @@
   margin: 0;
   padding: 0;
   list-style-type: none;
-  border-bottom: 1px solid #E8EAED;
+  border-bottom: 1px solid var(--vxe-ui-base-popup-border-color);
 }
 .vxe-context-menu--option-wrapper li,
 .vxe-table--context-menu-clild-wrapper li {
@@ -1709,12 +1709,8 @@
 }
 .vxe-context-menu--option-wrapper li.link--active,
 .vxe-table--context-menu-clild-wrapper li.link--active {
-  background-color: #C5C5C5;
-  border-color: #C5C5C5;
-}
-.vxe-context-menu--option-wrapper li.link--active > .vxe-context-menu--link,
-.vxe-table--context-menu-clild-wrapper li.link--active > .vxe-context-menu--link {
-  color: #2B2B2B;
+  background-color: var(--vxe-ui-base-hover-background-color);
+  border-color: var(--vxe-ui-base-hover-background-color);
 }
 .vxe-context-menu--option-wrapper li.link--loading > .vxe-context-menu--link, .vxe-context-menu--option-wrapper li.link--disabled > .vxe-context-menu--link,
 .vxe-table--context-menu-clild-wrapper li.link--loading > .vxe-context-menu--link,
@@ -1722,12 +1718,6 @@
   color: var(--vxe-ui-font-disabled-color);
   cursor: no-drop;
 }
-.vxe-context-menu--option-wrapper li.link--loading.link--active, .vxe-context-menu--option-wrapper li.link--disabled.link--active,
-.vxe-table--context-menu-clild-wrapper li.link--loading.link--active,
-.vxe-table--context-menu-clild-wrapper li.link--disabled.link--active {
-  border-color: #C0C1C2;
-  background-color: #EEEEEE;
-}
 .vxe-context-menu--option-wrapper li.link--loading.link--active:hover, .vxe-context-menu--option-wrapper li.link--disabled.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--loading.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--disabled.link--active:hover {