@kdcloudjs/kdesign 1.3.9 → 1.4.0

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.
@@ -17,8 +17,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
17
17
 
18
18
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
19
19
 
20
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
21
+
20
22
  var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
21
23
 
24
+ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
25
+
22
26
  var React = _interopRequireWildcard(require("react"));
23
27
 
24
28
  var _configProvider = require("../config-provider");
@@ -52,7 +56,7 @@ var MENU_ITEM_CONTAINER_NAME = 'menu-item-content-container';
52
56
  exports.MENU_ITEM_CONTAINER_NAME = MENU_ITEM_CONTAINER_NAME;
53
57
 
54
58
  var InternalMenuItem = function InternalMenuItem(props, ref) {
55
- var _classNames;
59
+ var _context, _classNames;
56
60
 
57
61
  var _React$useContext = React.useContext(_configProvider.ConfigContext),
58
62
  getPrefixCls = _React$useContext.getPrefixCls,
@@ -71,6 +75,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
71
75
  collapsed = _a.collapsed,
72
76
  keyValue = _a.keyValue,
73
77
  selectedKey = _a.selectedKey,
78
+ setSelectedKeyPath = _a.setSelectedKeyPath,
74
79
  subMenuMode = _a.subMenuMode,
75
80
  inlineIndent = _a.inlineIndent,
76
81
  className = _a.className,
@@ -78,11 +83,13 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
78
83
  _a$paddingLeft = _a.paddingLeft,
79
84
  paddingLeft = _a$paddingLeft === void 0 ? 0 : _a$paddingLeft,
80
85
  style = _a.style,
81
- restProps = __rest(_a, ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style"]);
86
+ parentPath = _a.parentPath,
87
+ restProps = __rest(_a, ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "setSelectedKeyPath", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style", "parentPath"]);
82
88
 
83
89
  (0, _devwarning.default)(!keyValue && keyValue !== 0, 'menuitem', 'cannot found children in Menu.Item');
84
90
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-item', customPrefixcls);
85
91
  var menuItemRef = ref || /*#__PURE__*/React.createRef();
92
+ var menuItemParentPath = Array.isArray(parentPath) ? (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)(parentPath), [keyValue]) : [keyValue];
86
93
 
87
94
  var renderItemChildren = function renderItemChildren(children) {
88
95
  if (typeof children === 'string') {
@@ -115,7 +122,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
115
122
  e.stopPropagation();
116
123
  var info = {
117
124
  key: keyValue,
118
- keyPath: [keyValue],
125
+ keyPath: menuItemParentPath,
119
126
  domEvent: e.nativeEvent
120
127
  };
121
128
  handleOnClick(info);
@@ -159,6 +166,11 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
159
166
  return renderItemChildren(children);
160
167
  };
161
168
 
169
+ React.useEffect(function () {
170
+ if (selectedKey && selectedKey === keyValue) {
171
+ setSelectedKeyPath(menuItemParentPath);
172
+ }
173
+ }, [selectedKey]);
162
174
  return /*#__PURE__*/React.createElement("li", (0, _extends2.default)({
163
175
  ref: menuItemRef,
164
176
  className: (0, _classnames.default)(className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, prefixCls, subMenuMode !== 'horizontal'), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),
@@ -104,65 +104,65 @@
104
104
  /* 多行显示省略号 */
105
105
  /* 单行显示省略号 */
106
106
  /** 浮层箭头样式 **/
107
- .hover {
107
+ .menu-dark-hover {
108
108
  background-color: var(--kd-c-menu-sub-color-background, #121319);
109
109
  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
110
110
  }
111
- .active {
111
+ .menu-dark-active {
112
112
  background-color: var(--kd-c-menu-sub-color-background, #121319);
113
113
  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
114
114
  }
115
- .active-inline-title {
116
- color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff)) !important;
117
- background: var(--kd-c-menu-color-background, #343848) !important;
115
+ .menu-dark-active-inline-title {
116
+ color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
117
+ background: var(--kd-c-menu-color-background, #343848);
118
118
  border: none;
119
119
  }
120
- .light {
120
+ .menu-light-base {
121
121
  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
122
122
  background: #ffffff;
123
123
  }
124
- .light .kd-menu-item-disabled,
125
- .light .kd-menu-submenu-disabled {
126
- background-color: #fff !important;
124
+ .menu-light-base .kd-menu-item-disabled,
125
+ .menu-light-base .kd-menu-submenu-disabled {
126
+ background-color: #fff;
127
127
  }
128
- .light .kd-menu-submenu-sub {
128
+ .menu-light-base .kd-menu-submenu-sub {
129
129
  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
130
- background: #FAFAFA;
130
+ background: #fafafa;
131
131
  }
132
- .light .kd-menu-item:hover {
132
+ .menu-light-base .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
133
133
  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
134
134
  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
135
135
  border: none;
136
136
  }
137
- .light .kd-menu-item-hover,
138
- .light .kd-menu-submenu-hover {
137
+ .menu-light-base .kd-menu-item-hover,
138
+ .menu-light-base .kd-menu-submenu-hover {
139
139
  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
140
140
  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
141
141
  border: none;
142
142
  }
143
- .light .kd-menu-item-active,
144
- .light .kd-menu-submenu-active {
145
- background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
146
- color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
143
+ .menu-light-base .kd-menu-item-active,
144
+ .menu-light-base .kd-menu-submenu-active {
145
+ background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
146
+ color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
147
147
  border: none;
148
148
  }
149
- .light-default {
149
+ .menu-light-default {
150
150
  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
151
151
  background: #ffffff;
152
152
  }
153
- .light-hover {
153
+ .menu-light-hover {
154
154
  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
155
155
  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
156
156
  border: none;
157
157
  }
158
- .light-active {
159
- background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
160
- color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
158
+ .menu-light-active {
159
+ background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
160
+ color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
161
161
  border: none;
162
162
  }
163
- .light-active-inline-title {
164
- color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
165
- background: #ffffff !important;
163
+ .menu-light-active-inline-title {
164
+ color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
165
+ background: #ffffff;
166
166
  border: none;
167
167
  }
168
168
  .kd-menu {
@@ -236,8 +236,8 @@
236
236
  }
237
237
  .kd-menu-item-disabled {
238
238
  cursor: not-allowed;
239
- color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2)) !important;
240
- background-color: var(--kd-c-menu-color-background, #343848) !important;
239
+ color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
240
+ background-color: var(--kd-c-menu-color-background, #343848);
241
241
  }
242
242
  .kd-menu-item-arrow {
243
243
  margin-left: auto;
@@ -310,8 +310,8 @@
310
310
  }
311
311
  .kd-menu-submenu-disabled {
312
312
  cursor: not-allowed;
313
- color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2)) !important;
314
- background-color: var(--kd-c-menu-color-background, #343848) !important;
313
+ color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
314
+ background-color: var(--kd-c-menu-color-background, #343848);
315
315
  }
316
316
  .kd-menu-submenu-arrow {
317
317
  margin-left: auto;
@@ -436,7 +436,7 @@
436
436
  .kd-menu-dark .kd-menu-submenu-sub-third {
437
437
  background: var(--kd-c-menu-sub-color-background, #121319);
438
438
  }
439
- .kd-menu-dark .kd-menu-item:hover {
439
+ .kd-menu-dark .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
440
440
  background-color: var(--kd-c-menu-sub-color-background, #121319);
441
441
  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
442
442
  }
@@ -456,13 +456,13 @@
456
456
  }
457
457
  .kd-menu-inline.kd-menu-dark .kd-menu-item-active .kd-menu-submenu-title,
458
458
  .kd-menu-inline.kd-menu-dark .kd-menu-submenu-active .kd-menu-submenu-title {
459
- color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff)) !important;
460
- background: var(--kd-c-menu-color-background, #343848) !important;
459
+ color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
460
+ background: var(--kd-c-menu-color-background, #343848);
461
461
  border: none;
462
462
  }
463
- .kd-menu-inline.kd-menu-dark .kd-menu-submenu:not(.kd-menu-submenu-disabled) > .kd-menu-submenu-title:hover {
464
- color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff)) !important;
465
- background: var(--kd-c-menu-color-background, #343848) !important;
463
+ .kd-menu-inline.kd-menu-dark .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active) > .kd-menu-submenu-title:hover {
464
+ color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
465
+ background: var(--kd-c-menu-color-background, #343848);
466
466
  border: none;
467
467
  }
468
468
  .kd-menu-light {
@@ -471,13 +471,13 @@
471
471
  }
472
472
  .kd-menu-light .kd-menu-item-disabled,
473
473
  .kd-menu-light .kd-menu-submenu-disabled {
474
- background-color: #fff !important;
474
+ background-color: #fff;
475
475
  }
476
476
  .kd-menu-light .kd-menu-submenu-sub {
477
477
  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
478
- background: #FAFAFA;
478
+ background: #fafafa;
479
479
  }
480
- .kd-menu-light .kd-menu-item:hover {
480
+ .kd-menu-light .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
481
481
  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
482
482
  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
483
483
  border: none;
@@ -490,17 +490,17 @@
490
490
  }
491
491
  .kd-menu-light .kd-menu-item-active,
492
492
  .kd-menu-light .kd-menu-submenu-active {
493
- background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
494
- color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
493
+ background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
494
+ color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
495
495
  border: none;
496
496
  }
497
497
  .kd-menu-inline.kd-menu-light .kd-menu-item-active .kd-menu-submenu-title,
498
498
  .kd-menu-inline.kd-menu-light .kd-menu-submenu-active .kd-menu-submenu-title {
499
- color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
500
- background: #ffffff !important;
499
+ color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
500
+ background: #ffffff;
501
501
  border: none;
502
502
  }
503
- .kd-menu-popper .kd-menu-submenu:hover,
503
+ .kd-menu-popper .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active):hover,
504
504
  .kd-menu-popper .kd-menu-submenu-hover {
505
505
  background-color: var(--kd-c-menu-sub-color-background, #121319);
506
506
  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
@@ -527,7 +527,7 @@
527
527
  -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
528
528
  box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
529
529
  }
530
- .kd-menu-popper .kd-menu-submenu-sub .kd-menu-item:hover,
530
+ .kd-menu-popper .kd-menu-submenu-sub .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover,
531
531
  .kd-menu-popper .kd-menu-submenu-sub .kd-menu-item-active {
532
532
  background-color: var(--kd-c-menu-sub-color-background, #121319);
533
533
  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
@@ -563,13 +563,13 @@
563
563
  }
564
564
  .kd-menu-popper.light .kd-menu-item-disabled,
565
565
  .kd-menu-popper.light .kd-menu-submenu-disabled {
566
- background-color: #fff !important;
566
+ background-color: #fff;
567
567
  }
568
568
  .kd-menu-popper.light .kd-menu-submenu-sub {
569
569
  color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
570
- background: #FAFAFA;
570
+ background: #fafafa;
571
571
  }
572
- .kd-menu-popper.light .kd-menu-item:hover {
572
+ .kd-menu-popper.light .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
573
573
  background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
574
574
  color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
575
575
  border: none;
@@ -582,7 +582,7 @@
582
582
  }
583
583
  .kd-menu-popper.light .kd-menu-item-active,
584
584
  .kd-menu-popper.light .kd-menu-submenu-active {
585
- background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
586
- color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
585
+ background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
586
+ color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
587
587
  border: none;
588
588
  }
@@ -135,55 +135,55 @@
135
135
  }
136
136
 
137
137
  .@{menuitem-prefix-cls} {
138
- &:hover {
139
- .hover();
138
+ &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
139
+ .menu-dark-hover();
140
140
  }
141
141
 
142
142
  &-active {
143
- .active()
143
+ .menu-dark-active()
144
144
  }
145
145
  }
146
146
 
147
147
  .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
148
- .active()
148
+ .menu-dark-active()
149
149
  }
150
150
 
151
151
  .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
152
- .hover()
152
+ .menu-dark-hover()
153
153
  }
154
154
  }
155
155
 
156
156
  .@{menu-inline-prefix-cls}.@{menu-dark-prefix-cls} {
157
157
  .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
158
158
  .@{submenu-prefix-cls}-title {
159
- .active-inline-title()
159
+ .menu-dark-active-inline-title()
160
160
  }
161
161
  }
162
162
 
163
- .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled) {
163
+ .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active) {
164
164
  > .@{submenu-prefix-cls}-title:hover {
165
- .active-inline-title()
165
+ .menu-dark-active-inline-title()
166
166
  }
167
167
  }
168
168
  }
169
169
 
170
170
  // light
171
171
  .@{menu-light-prefix-cls} {
172
- .light();
172
+ .menu-light-base();
173
173
  }
174
174
 
175
175
  .@{menu-inline-prefix-cls}.@{menu-light-prefix-cls} {
176
176
  .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
177
177
  .@{submenu-prefix-cls}-title {
178
- .light-active-inline-title()
178
+ .menu-light-active-inline-title()
179
179
  }
180
180
  }
181
181
  }
182
182
 
183
183
  .@{menu-popper-prefix-cls} {
184
- .@{submenu-prefix-cls}:hover,
184
+ .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active):hover,
185
185
  .@{submenu-prefix-cls}-hover {
186
- .hover();
186
+ .menu-dark-hover();
187
187
  }
188
188
 
189
189
  &.hidden {
@@ -206,9 +206,9 @@
206
206
  0 9px 28px 8px rgba(0, 0, 0, 0.05);
207
207
 
208
208
  .@{menuitem-prefix-cls} {
209
- &:hover,
209
+ &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover,
210
210
  &-active {
211
- .hover()
211
+ .menu-dark-hover()
212
212
  }
213
213
  }
214
214
 
@@ -234,7 +234,7 @@
234
234
  }
235
235
 
236
236
  &.light {
237
- .light();
237
+ .menu-light-base();
238
238
  }
239
239
  }
240
240
 
@@ -24,6 +24,7 @@
24
24
  align-items: center;
25
25
  height: 50px;
26
26
  .ellipsis();
27
+
27
28
  & > span {
28
29
  .ellipsis();
29
30
  opacity: 1;
@@ -57,8 +58,8 @@
57
58
 
58
59
  &-disabled {
59
60
  cursor: not-allowed;
60
- color: @menu-color-disabled !important;
61
- background-color: @menu-color-background !important;
61
+ color: @menu-color-disabled;
62
+ background-color: @menu-color-background;
62
63
  }
63
64
 
64
65
  &-arrow {
@@ -78,68 +79,67 @@
78
79
  }
79
80
 
80
81
 
81
- .hover {
82
+ .menu-dark-hover {
82
83
  background-color: @menu-sub-color-background;
83
84
  color: @menu-sub-color-hover;
84
85
  }
85
86
 
86
- .active {
87
+ .menu-dark-active {
87
88
  background-color: @menu-sub-color-background;
88
89
  color: @menu-sub-color-hover;
89
90
  }
90
91
 
91
- .active-inline-title {
92
- color: @menu-sub-color-hover !important;
93
- background: @menu-color-background !important;
92
+ .menu-dark-active-inline-title {
93
+ color: @menu-sub-color-hover;
94
+ background: @menu-color-background;
94
95
  border: none;
95
96
  }
96
97
 
97
-
98
- .light {
99
- .light-default();
98
+ .menu-light-base {
99
+ .menu-light-default();
100
100
 
101
101
  .@{menuitem-prefix-cls}-disabled, .@{submenu-prefix-cls}-disabled {
102
- background-color: #fff !important;
102
+ background-color: #fff;
103
103
  }
104
104
 
105
105
  .@{submenu-prefix-cls}-sub {
106
106
  color: @menu-light-color;
107
- background: #FAFAFA;
107
+ background: #fafafa;
108
108
  }
109
109
 
110
- .@{menuitem-prefix-cls}:hover {
111
- .light-hover();
110
+ .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
111
+ .menu-light-hover();
112
112
  }
113
113
 
114
114
  .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
115
- .light-hover();
115
+ .menu-light-hover();
116
116
  }
117
117
 
118
118
  .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
119
- .light-active();
119
+ .menu-light-active();
120
120
  }
121
121
  }
122
122
 
123
- .light-default {
123
+ .menu-light-default {
124
124
  color: @menu-light-color;
125
125
  background: #ffffff;
126
126
  }
127
127
 
128
- .light-hover {
128
+ .menu-light-hover {
129
129
  background-color: @menu-light-color-background-hover;
130
130
  color: @menu-light-color-hover;
131
131
  border: none;
132
132
  }
133
133
 
134
- .light-active {
135
- background-color: @menu-light-color-background-active !important;
136
- color: @menu-light-color-active !important;
134
+ .menu-light-active {
135
+ background-color: @menu-light-color-background-active;
136
+ color: @menu-light-color-active;
137
137
  border: none;
138
138
  }
139
139
 
140
- .light-active-inline-title {
141
- color: @menu-light-color-active !important;
142
- background: #ffffff !important;
140
+ .menu-light-active-inline-title {
141
+ color: @menu-light-color-active;
142
+ background: #ffffff;
143
143
  border: none;
144
144
  }
145
145
 
@@ -11,12 +11,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
11
11
 
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
13
13
 
14
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
14
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
15
15
 
16
- var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
16
+ var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
17
17
 
18
18
  var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
19
19
 
20
+ var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
21
+
20
22
  var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
21
23
 
22
24
  var _react = _interopRequireDefault(require("react"));
@@ -75,6 +77,7 @@ var SubMenu = function SubMenu(props) {
75
77
  keyValue = _a.keyValue,
76
78
  selectedKey = _a.selectedKey,
77
79
  selectedKeyPath = _a.selectedKeyPath,
80
+ setSelectedKeyPath = _a.setSelectedKeyPath,
78
81
  openKeys = _a.openKeys,
79
82
  triggerSubMenuAction = _a.triggerSubMenuAction,
80
83
  forceSubMenuRender = _a.forceSubMenuRender,
@@ -84,7 +87,7 @@ var SubMenu = function SubMenu(props) {
84
87
  handleOnOpenChange = _a.handleOnOpenChange,
85
88
  _a$paddingLeft = _a.paddingLeft,
86
89
  paddingLeft = _a$paddingLeft === void 0 ? 0 : _a$paddingLeft,
87
- restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
90
+ restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "setSelectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
88
91
 
89
92
  var isVertical = mode === 'vertical'; // 初始化level
90
93
 
@@ -92,6 +95,14 @@ var SubMenu = function SubMenu(props) {
92
95
  restProps.level = 1;
93
96
  }
94
97
 
98
+ if (Array.isArray(restProps.parentPath)) {
99
+ var _context;
100
+
101
+ restProps.parentPath = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)(restProps.parentPath), [keyValue]);
102
+ } else {
103
+ restProps.parentPath = [keyValue];
104
+ }
105
+
95
106
  if (mode === 'inline') {
96
107
  restProps.subMenuMode = 'vertical';
97
108
  restProps.popupOffset = [];
@@ -218,10 +229,7 @@ var SubMenu = function SubMenu(props) {
218
229
  if (!(0, _includes.default)(className).call(className, _menuItem.MENU_ITEM_CONTAINER_NAME)) {
219
230
  closeSubMenu();
220
231
  }
221
- }); // // 缩略模式自动关闭子菜单
222
- // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
223
- // closeSubMenu()
224
- // }
232
+ });
225
233
 
226
234
  var handleMouseEvent = function handleMouseEvent(status) {
227
235
  if (disabled || triggerSubMenuAction === 'click') return;
@@ -237,11 +245,6 @@ var SubMenu = function SubMenu(props) {
237
245
  };
238
246
 
239
247
  var handleOnClick = function handleOnClick(info) {
240
- var _context;
241
-
242
- // 保存路径
243
- info.keyPath = (0, _concat.default)(_context = info.keyPath).call(_context, [keyValue]);
244
-
245
248
  if (triggerSubMenuAction === 'click' && isVertical) {
246
249
  closeSubMenu();
247
250
  }
@@ -350,13 +353,15 @@ var SubMenu = function SubMenu(props) {
350
353
  mode: mode,
351
354
  theme: theme,
352
355
  selectedKey: selectedKey,
356
+ setSelectedKeyPath: setSelectedKeyPath,
353
357
  openKeys: openKeys,
354
358
  forceSubMenuRender: forceSubMenuRender,
355
359
  triggerSubMenuAction: triggerSubMenuAction,
356
360
  handleOnOpenChange: handleOnOpenChange,
357
361
  handleOnClick: handleOnClick,
358
362
  inlineIndent: inlineIndent,
359
- paddingLeft: curPaddingLeft
363
+ paddingLeft: curPaddingLeft,
364
+ parentPath: restProps.parentPath
360
365
  });
361
366
  }))), {
362
367
  arrow: false,
@@ -398,13 +403,15 @@ var SubMenu = function SubMenu(props) {
398
403
  collapsed: collapsed,
399
404
  mode: mode,
400
405
  selectedKey: selectedKey,
406
+ setSelectedKeyPath: setSelectedKeyPath,
401
407
  openKeys: openKeys,
402
408
  forceSubMenuRender: forceSubMenuRender,
403
409
  triggerSubMenuAction: triggerSubMenuAction,
404
410
  handleOnOpenChange: handleOnOpenChange,
405
411
  handleOnClick: handleOnClick,
406
412
  inlineIndent: inlineIndent,
407
- paddingLeft: curPaddingLeft
413
+ paddingLeft: curPaddingLeft,
414
+ parentPath: restProps.parentPath
408
415
  });
409
416
  }))));
410
417
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.3.9",
3
+ "version": "1.4.0",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [