Merge pull request #1172 from VisActor/1166-feature-contextmenuitems-col

1166 feature contextmenuitems col
VisActor · Feb 29, 2024 · 6bc126a · 6bc126a
2 parents d39831e + c62bc85
commit 6bc126a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/common/changes/@visactor/vtable/fix-contextMenuItems-add-col-param-2024-02-29-08-05.json b/common/changes/@visactor/vtable/fix-contextMenuItems-add-col-param-2024-02-29-08-05.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix-contextMenuItems-add-col-param",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
diff --git a/packages/react-vtable/src/components/component/menu.tsx b/packages/react-vtable/src/components/component/menu.tsx
@@ -8,7 +8,7 @@ export type MenuProps = {
   /** 内置下拉菜单的全局设置项 目前只针对基本表格有效 会对每个表头单元格开启默认的下拉菜单功能。代替原来的option.dropDownMenu*/
   defaultHeaderMenuItems?: TYPES.MenuListItem[];
   /** 右键菜单。代替原来的option.contextmenu */
-  contextMenuItems?: TYPES.MenuListItem[] | ((field: string, row: number) => TYPES.MenuListItem[]);
+  contextMenuItems?: TYPES.MenuListItem[] | ((field: string, row: number, col: number) => TYPES.MenuListItem[]);
   /** 设置选中状态的菜单。代替原来的option.dropDownMenuHighlight  */
   dropDownMenuHighlight?: TYPES.DropDownMenuHighlightInfo[];
 } & BaseComponentProps;

diff --git a/packages/vtable/examples/style/border.ts b/packages/vtable/examples/style/border.ts
@@ -311,8 +311,8 @@ export function createTable() {
     menu: {
       renderMode: 'html',
       defaultHeaderMenuItems: ['升序排序', '降序排序', '冻结列'],
-      contextMenuItems: (field: string, row: number) => {
-        console.log(field, row);
+      contextMenuItems: (field: string, row: number, col: number) => {
+        console.log(field, row, col);
         return [
           { text: '复制表头', menuKey: '复制表头$1' },
           { text: '复制单元格', menuKey: '复制单元格$1' }

diff --git a/packages/vtable/src/components/menu/dom/MenuHandler.ts b/packages/vtable/src/components/menu/dom/MenuHandler.ts
@@ -203,7 +203,7 @@ export class MenuHandler {
         const abstractPos = table._getMouseAbstractPoint(e.event, false);
         let menu = null;
         if (abstractPos.inTable && typeof table.internalProps.menu?.contextMenuItems === 'function') {
-          menu = table.internalProps.menu.contextMenuItems(table.getHeaderField(e.col, e.row) as string, e.row);
+          menu = table.internalProps.menu.contextMenuItems(table.getHeaderField(e.col, e.row) as string, e.row, e.col);
         } else if (abstractPos.inTable && Array.isArray(table.internalProps.menu?.contextMenuItems)) {
           menu = table.internalProps.menu?.contextMenuItems;
         }

diff --git a/packages/vtable/src/scenegraph/component/menu.ts b/packages/vtable/src/scenegraph/component/menu.ts
@@ -298,7 +298,7 @@ export class MenuHandler {
         const { field } = this._table.isHeader(col, row)
           ? this._table.getHeaderDefine(col, row)
           : this._table.getBodyColumnDefine(col, row);
-        menuInfo = contextmenu(field, row);
+        menuInfo = contextmenu(field, row, col);
       }
       return {
         menuInfo,

diff --git a/packages/vtable/src/ts-types/base-table.ts b/packages/vtable/src/ts-types/base-table.ts
@@ -158,7 +158,7 @@ export interface IBaseTableProtected {
     /** 内置下拉菜单的全局设置项 目前只针对基本表格有效 会对每个表头单元格开启默认的下拉菜单功能。代替原来的option.dropDownMenu*/
     defaultHeaderMenuItems?: MenuListItem[];
     /** 右键菜单。代替原来的option.contextmenu */
-    contextMenuItems?: MenuListItem[] | ((field: FieldDef, row: number) => MenuListItem[]);
+    contextMenuItems?: MenuListItem[] | ((field: FieldDef, row: number, col: number) => MenuListItem[]);
     /** 设置选中状态的菜单。代替原来的option.dropDownMenuHighlight  */
     dropDownMenuHighlight?: DropDownMenuHighlightInfo[];
   };
@@ -301,7 +301,7 @@ export interface BaseTableConstructorOptions {
     /** 内置下拉菜单的全局设置项 目前只针对基本表格有效 会对每个表头单元格开启默认的下拉菜单功能。代替原来的option.dropDownMenu*/
     defaultHeaderMenuItems?: MenuListItem[];
     /** 右键菜单。代替原来的option.contextmenu */
-    contextMenuItems?: MenuListItem[] | ((field: string, row: number) => MenuListItem[]);
+    contextMenuItems?: MenuListItem[] | ((field: string, row: number, col: number) => MenuListItem[]);
     /** 设置选中状态的菜单。代替原来的option.dropDownMenuHighlight  */
     dropDownMenuHighlight?: DropDownMenuHighlightInfo[];
   };