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

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.5-canary.6
+ *   @kdcloudjs/table v1.1.5-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.5-canary.6
+ *   @kdcloudjs/table v1.1.5-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -6498,7 +6498,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var stateKey = 'contextMenu';
 function contextMenu() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function step(pipeline) {
@@ -6536,13 +6535,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({
@@ -6879,24 +6876,12 @@ function isElementInsideTheFooter(ele) {
   }
 
   return false;
-} // 禁止弹出右键菜单
-
-
-function suppressShowContextMenu(e) {
-  var path = Object(_utils__WEBPACK_IMPORTED_MODULE_11__["getEventPath"])(e.nativeEvent);
-  var pointIndex = 0;
-
-  while (pointIndex < path.length) {
-    var ele = path[pointIndex];
-
-    if (ele.classList.contains(_base_styles__WEBPACK_IMPORTED_MODULE_14__["Classes"].tableBody) || ele.classList.contains(_base_styles__WEBPACK_IMPORTED_MODULE_14__["Classes"].tableFooter)) {
-      return false;
-    }
+}
 
-    pointIndex++;
-  }
+function canShowContextMenu(e, pipeline) {
+  var _pipeline$ref$current, _pipeline$ref$current2;
 
-  return true;
+  return ((_pipeline$ref$current = pipeline.ref.current.domHelper) === null || _pipeline$ref$current === void 0 ? void 0 : _pipeline$ref$current.tableBody.contains(e.target)) || ((_pipeline$ref$current2 = pipeline.ref.current.domHelper) === null || _pipeline$ref$current2 === void 0 ? void 0 : _pipeline$ref$current2.tableFooter.contains(e.target));
 } // 默认选项
 
 
@@ -6969,7 +6954,7 @@ function DefaultFilterContent(_ref) {
       selectedValue = _React$useState2[0],
       setSelectedValue = _React$useState2[1];
 
-  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_6___default.a.useState((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filter) || ''),
+  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_6___default.a.useState((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filter) || []),
       _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState3, 2),
       innerValue = _React$useState4[0],
       setInnerValue = _React$useState4[1];
@@ -6987,7 +6972,7 @@ function DefaultFilterContent(_ref) {
   var confirm = function confirm() {
     hidePanel();
     setFilterModel({
-      filter: [innerValue],
+      filter: innerValue,
       filterCondition: selectedValue
     });
   };
@@ -7000,7 +6985,7 @@ function DefaultFilterContent(_ref) {
 
   Object(react__WEBPACK_IMPORTED_MODULE_6__["useEffect"])(function () {
     setSelectedValue((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filterCondition) || 'contain');
-    setInnerValue((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filter) || '');
+    setInnerValue((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filter) || []);
   }, [filterModel]);
   Object(react__WEBPACK_IMPORTED_MODULE_6__["useEffect"])(function () {
     // 兼容设置焦点后发生滚动
@@ -7030,9 +7015,9 @@ function DefaultFilterContent(_ref) {
     className: "filter-search"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("input", {
     className: "filter-search-inner",
-    value: innerValue,
+    value: innerValue[0],
     onChange: function onChange(e) {
-      setInnerValue(e.target.value);
+      setInnerValue([e.target.value]);
     },
     onKeyDown: handleKeyDown,
     ref: inputRef