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

package/dist/@kdcloudjs/table.css

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

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.5-canary.5
+ *   @kdcloudjs/table v1.1.5-canary.7
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -6503,6 +6503,7 @@ function contextMenu() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function step(pipeline) {
     var popupParent = opts.popupParent || document.body;
+    var menuClassName = opts.menuClassName;
     var menuHelper = new MenuHelper();
 
     var addPopup = function addPopup(menu) {
@@ -6611,7 +6612,8 @@ function contextMenu() {
         options: options,
         hideContextMenu: hideContextMenu,
         position: position,
-        getPopupParent: getPopupParent
+        getPopupParent: getPopupParent,
+        className: menuClassName
       });
 
       var _hidePopup = addPopup(menu);
@@ -6642,7 +6644,8 @@ function getMenuItemKey(_ref) {
 }
 
 function Menu(props) {
-  var _props$options = props.options,
+  var className = props.className,
+      _props$options = props.options,
       options = _props$options === void 0 ? [] : _props$options,
       hideContextMenu = props.hideContextMenu,
       position = props.position,
@@ -6663,7 +6666,7 @@ function Menu(props) {
     }
   }, [position]);
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_common_views__WEBPACK_IMPORTED_MODULE_10__["ContextMenuStyleWrap"], {
-    className: _base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menu,
+    className: classnames__WEBPACK_IMPORTED_MODULE_9___default()(_base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menu, className),
     ref: menuRef,
     style: {
       left: position.x,
@@ -6679,6 +6682,7 @@ function Menu(props) {
       }),
       name: item.name,
       action: item.action,
+      className: item.className,
       disabled: item.disabled,
       hideContextMenu: hideContextMenu
     });
@@ -6688,6 +6692,7 @@ function Menu(props) {
 function MenuItem(props) {
   var name = props.name,
       action = props.action,
+      className = props.className,
       disabled = props.disabled,
       hideContextMenu = props.hideContextMenu;
   var itemRef = Object(react__WEBPACK_IMPORTED_MODULE_7__["useRef"])();
@@ -6728,7 +6733,7 @@ function MenuItem(props) {
   };
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_9___default()(_base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menuOption, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, _base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menuOptionDisable, disabled)),
+    className: classnames__WEBPACK_IMPORTED_MODULE_9___default()(_base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menuOption, className, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, _base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menuOptionDisable, disabled)),
     ref: itemRef,
     onClick: handleClick,
     onMouseEnter: handleMouseEnter,
@@ -6964,7 +6969,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];
@@ -6982,7 +6987,7 @@ function DefaultFilterContent(_ref) {
   var confirm = function confirm() {
     hidePanel();
     setFilterModel({
-      filter: [innerValue],
+      filter: innerValue,
       filterCondition: selectedValue
     });
   };
@@ -6995,7 +7000,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 () {
     // 兼容设置焦点后发生滚动
@@ -7025,9 +7030,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
@@ -8180,6 +8185,7 @@ function rangeSelection(opts) {
     var SCROLL_SIZE = 30;
     var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
     var tableFooter = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableFooter;
+    var artTable = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.artTable;
 
     if (!tableBody) {
       return pipeline;
@@ -8211,6 +8217,13 @@ function rangeSelection(opts) {
         startColumn: startDragCell.column,
         footerRowRange: footerRowRange
       };
+
+      if (isCellRangeSingleCell(rangeSelection)) {
+        artTable.classList.remove(classnames__WEBPACK_IMPORTED_MODULE_17___default()(_base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].rangeSelection));
+      } else {
+        artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_17___default()(_base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].rangeSelection));
+      }
+
       rangeSelectedChange(rangeSelection);
     };
 
@@ -8240,6 +8253,7 @@ function rangeSelection(opts) {
       // shift + 点击选中
 
       shiftKeySelect(mouseDownEvent);
+      if (mouseDownEvent.shiftKey) return;
       var target = mouseDownEvent.target;
       var startDragCell = getTargetCell(target, columns);
       var mousemove$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_14__["fromEvent"])(window, 'mousemove');
@@ -8300,6 +8314,7 @@ function rangeSelection(opts) {
 
         if (columns.length && rowLen && !getElementEditable(e.target)) {
           opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
+          artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_17___default()(_base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].rangeSelection));
           rangeSelectedChange({
             startRow: 0,
             endRow: rowLen - 1,