@kdcloudjs/table 1.1.5-canary.8 → 1.1.5-canary.9

package/es/table/pipeline/features/contextMenu.js

@@ -10,8 +10,7 @@ import { ContextMenuStyleWrap } from '../../common-views';
 import { copyDataToClipboard, executeOnTempElement, console, getEventPath, isElementInEventPath, getTargetEleInEventPath } from '../../utils';
 import { findByTree } from '../../utils/others';
 import { internals } from '../../internals';
-import { Classes, MenuClasses } from '../../base/styles';
-var stateKey = 'contextMenu';
+import { MenuClasses } from '../../base/styles';
 export function contextMenu() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function step(pipeline) {
@@ -49,13 +48,11 @@ export function contextMenu() {
     };
 
     var onContextMenu = function onContextMenu(e) {
-      if (suppressShowContextMenu(e)) {
-        return;
+      if (canShowContextMenu(e, pipeline)) {
+        e.preventDefault();
+        e.stopPropagation();
+        showContextMenu(e);
       }
-
-      e.preventDefault();
-      e.stopPropagation();
-      showContextMenu(e);
     };
 
     pipeline.addTableProps({
@@ -392,24 +389,12 @@ function isElementInsideTheFooter(ele) {
   }
 
   return false;
-} // 禁止弹出右键菜单
-
-
-function suppressShowContextMenu(e) {
-  var path = getEventPath(e.nativeEvent);
-  var pointIndex = 0;
-
-  while (pointIndex < path.length) {
-    var ele = path[pointIndex];
-
-    if (ele.classList.contains(Classes.tableBody) || ele.classList.contains(Classes.tableFooter)) {
-      return false;
-    }
+}
 
-    pointIndex++;
-  }
+function canShowContextMenu(e, pipeline) {
+  var _a, _b;
 
-  return true;
+  return ((_a = pipeline.ref.current.domHelper) === null || _a === void 0 ? void 0 : _a.tableBody.contains(e.target)) || ((_b = pipeline.ref.current.domHelper) === null || _b === void 0 ? void 0 : _b.tableFooter.contains(e.target));
 } // 默认选项
 
 

package/lib/table/pipeline/features/contextMenu.js

@@ -43,8 +43,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var stateKey = 'contextMenu';
-
 function contextMenu() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function step(pipeline) {
@@ -83,13 +81,11 @@ function contextMenu() {
     };
 
     var onContextMenu = function onContextMenu(e) {
-      if (suppressShowContextMenu(e)) {
-        return;
+      if (canShowContextMenu(e, pipeline)) {
+        e.preventDefault();
+        e.stopPropagation();
+        showContextMenu(e);
       }
-
-      e.preventDefault();
-      e.stopPropagation();
-      showContextMenu(e);
     };
 
     pipeline.addTableProps({
@@ -429,24 +425,12 @@ function isElementInsideTheFooter(ele) {
   }
 
   return false;
-} // 禁止弹出右键菜单
-
-
-function suppressShowContextMenu(e) {
-  var path = (0, _utils.getEventPath)(e.nativeEvent);
-  var pointIndex = 0;
-
-  while (pointIndex < path.length) {
-    var ele = path[pointIndex];
-
-    if (ele.classList.contains(_styles.Classes.tableBody) || ele.classList.contains(_styles.Classes.tableFooter)) {
-      return false;
-    }
+}
 
-    pointIndex++;
-  }
+function canShowContextMenu(e, pipeline) {
+  var _a, _b;
 
-  return true;
+  return ((_a = pipeline.ref.current.domHelper) === null || _a === void 0 ? void 0 : _a.tableBody.contains(e.target)) || ((_b = pipeline.ref.current.domHelper) === null || _b === void 0 ? void 0 : _b.tableFooter.contains(e.target));
 } // 默认选项
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.5-canary.8",
+  "version": "1.1.5-canary.9",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [