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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/table v1.1.5-canary.5
3
+ * @kdcloudjs/table v1.1.5-canary.6
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/table v1.1.5-canary.5
3
+ * @kdcloudjs/table v1.1.5-canary.6
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -6503,6 +6503,7 @@ function contextMenu() {
6503
6503
  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
6504
6504
  return function step(pipeline) {
6505
6505
  var popupParent = opts.popupParent || document.body;
6506
+ var menuClassName = opts.menuClassName;
6506
6507
  var menuHelper = new MenuHelper();
6507
6508
 
6508
6509
  var addPopup = function addPopup(menu) {
@@ -6611,7 +6612,8 @@ function contextMenu() {
6611
6612
  options: options,
6612
6613
  hideContextMenu: hideContextMenu,
6613
6614
  position: position,
6614
- getPopupParent: getPopupParent
6615
+ getPopupParent: getPopupParent,
6616
+ className: menuClassName
6615
6617
  });
6616
6618
 
6617
6619
  var _hidePopup = addPopup(menu);
@@ -6642,7 +6644,8 @@ function getMenuItemKey(_ref) {
6642
6644
  }
6643
6645
 
6644
6646
  function Menu(props) {
6645
- var _props$options = props.options,
6647
+ var className = props.className,
6648
+ _props$options = props.options,
6646
6649
  options = _props$options === void 0 ? [] : _props$options,
6647
6650
  hideContextMenu = props.hideContextMenu,
6648
6651
  position = props.position,
@@ -6663,7 +6666,7 @@ function Menu(props) {
6663
6666
  }
6664
6667
  }, [position]);
6665
6668
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_common_views__WEBPACK_IMPORTED_MODULE_10__["ContextMenuStyleWrap"], {
6666
- className: _base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menu,
6669
+ className: classnames__WEBPACK_IMPORTED_MODULE_9___default()(_base_styles__WEBPACK_IMPORTED_MODULE_14__["MenuClasses"].menu, className),
6667
6670
  ref: menuRef,
6668
6671
  style: {
6669
6672
  left: position.x,
@@ -6679,6 +6682,7 @@ function Menu(props) {
6679
6682
  }),
6680
6683
  name: item.name,
6681
6684
  action: item.action,
6685
+ className: item.className,
6682
6686
  disabled: item.disabled,
6683
6687
  hideContextMenu: hideContextMenu
6684
6688
  });
@@ -6688,6 +6692,7 @@ function Menu(props) {
6688
6692
  function MenuItem(props) {
6689
6693
  var name = props.name,
6690
6694
  action = props.action,
6695
+ className = props.className,
6691
6696
  disabled = props.disabled,
6692
6697
  hideContextMenu = props.hideContextMenu;
6693
6698
  var itemRef = Object(react__WEBPACK_IMPORTED_MODULE_7__["useRef"])();
@@ -6728,7 +6733,7 @@ function MenuItem(props) {
6728
6733
  };
6729
6734
 
6730
6735
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
6731
- 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)),
6736
+ 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)),
6732
6737
  ref: itemRef,
6733
6738
  onClick: handleClick,
6734
6739
  onMouseEnter: handleMouseEnter,
@@ -8180,6 +8185,7 @@ function rangeSelection(opts) {
8180
8185
  var SCROLL_SIZE = 30;
8181
8186
  var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
8182
8187
  var tableFooter = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableFooter;
8188
+ var artTable = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.artTable;
8183
8189
 
8184
8190
  if (!tableBody) {
8185
8191
  return pipeline;
@@ -8211,6 +8217,13 @@ function rangeSelection(opts) {
8211
8217
  startColumn: startDragCell.column,
8212
8218
  footerRowRange: footerRowRange
8213
8219
  };
8220
+
8221
+ if (isCellRangeSingleCell(rangeSelection)) {
8222
+ artTable.classList.remove(classnames__WEBPACK_IMPORTED_MODULE_17___default()(_base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].rangeSelection));
8223
+ } else {
8224
+ artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_17___default()(_base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].rangeSelection));
8225
+ }
8226
+
8214
8227
  rangeSelectedChange(rangeSelection);
8215
8228
  };
8216
8229
 
@@ -8240,6 +8253,7 @@ function rangeSelection(opts) {
8240
8253
  // shift + 点击选中
8241
8254
 
8242
8255
  shiftKeySelect(mouseDownEvent);
8256
+ if (mouseDownEvent.shiftKey) return;
8243
8257
  var target = mouseDownEvent.target;
8244
8258
  var startDragCell = getTargetCell(target, columns);
8245
8259
  var mousemove$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_14__["fromEvent"])(window, 'mousemove');
@@ -8300,6 +8314,7 @@ function rangeSelection(opts) {
8300
8314
 
8301
8315
  if (columns.length && rowLen && !getElementEditable(e.target)) {
8302
8316
  opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
8317
+ artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_17___default()(_base_styles__WEBPACK_IMPORTED_MODULE_16__["Classes"].rangeSelection));
8303
8318
  rangeSelectedChange({
8304
8319
  startRow: 0,
8305
8320
  endRow: rowLen - 1,