x4js 1.4.28 → 1.4.31
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.
- package/lib/component.js +8 -0
- package/lib/treeview.js +3 -4
- package/lib/x4.css +4 -2
- package/package.json +1 -1
- package/src/component.ts +10 -0
- package/src/treeview.ts +5 -6
- package/src/x4.less +6 -2
package/lib/component.js
CHANGED
|
@@ -1664,6 +1664,11 @@ class Container extends Component {
|
|
|
1664
1664
|
seq = seq.replace(/CTRL/i, '');
|
|
1665
1665
|
reseq += 'ctrl+';
|
|
1666
1666
|
}
|
|
1667
|
+
let cmd = seq.match(/CMD/i);
|
|
1668
|
+
if (cmd) {
|
|
1669
|
+
seq = seq.replace(/CMD/i, '');
|
|
1670
|
+
reseq += 'cmd+';
|
|
1671
|
+
}
|
|
1667
1672
|
let alt = seq.match(/ALT/i);
|
|
1668
1673
|
if (alt) {
|
|
1669
1674
|
seq = seq.replace(/ALT/i, '');
|
|
@@ -1698,6 +1703,9 @@ class Container extends Component {
|
|
|
1698
1703
|
if (e.ctrlKey) {
|
|
1699
1704
|
seq += 'ctrl+';
|
|
1700
1705
|
}
|
|
1706
|
+
if (e.metaKey) {
|
|
1707
|
+
seq += 'cmd+';
|
|
1708
|
+
}
|
|
1701
1709
|
if (e.altKey) {
|
|
1702
1710
|
seq += 'alt+';
|
|
1703
1711
|
}
|
package/lib/treeview.js
CHANGED
|
@@ -378,15 +378,14 @@ class TreeView extends layout_1.VLayout {
|
|
|
378
378
|
return;
|
|
379
379
|
}
|
|
380
380
|
}
|
|
381
|
-
this.
|
|
382
|
-
this.
|
|
381
|
+
this.selection = nd.id;
|
|
382
|
+
this.emit('click', (0, x4events_1.EvClick)(nd));
|
|
383
383
|
this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, nd));
|
|
384
384
|
return;
|
|
385
385
|
}
|
|
386
386
|
dom = dom.parentElement;
|
|
387
387
|
}
|
|
388
|
-
this.
|
|
389
|
-
this.update();
|
|
388
|
+
this.selection = null;
|
|
390
389
|
this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, null));
|
|
391
390
|
}
|
|
392
391
|
/**
|
package/lib/x4.css
CHANGED
|
@@ -31,7 +31,9 @@
|
|
|
31
31
|
--x4-font-size: 13px;
|
|
32
32
|
--x4-base-color: #266888;
|
|
33
33
|
--x4-selection-color: #2458B3;
|
|
34
|
+
--x4-selection-text: white;
|
|
34
35
|
--x4-hover-color: rgba(36, 88, 179, 0.9);
|
|
36
|
+
--x4-hover-text: white;
|
|
35
37
|
--x4-mask-color: rgba(36, 88, 179, 0.6);
|
|
36
38
|
--x4-focus-color: #2458B3;
|
|
37
39
|
--x4-error-color: #b92a09;
|
|
@@ -758,11 +760,11 @@ textarea::selection {
|
|
|
758
760
|
}
|
|
759
761
|
.x-list-view .x-list-item:hover {
|
|
760
762
|
background-color: var(--x4-hover-color);
|
|
761
|
-
color:
|
|
763
|
+
color: var(--x4-hover-text);
|
|
762
764
|
}
|
|
763
765
|
.x-list-view .x-list-item.x-selected {
|
|
764
766
|
background-color: var(--x4-selection-color);
|
|
765
|
-
color:
|
|
767
|
+
color: var(--x4-selection-text);
|
|
766
768
|
}
|
|
767
769
|
.x-list-view .x-list-item:focus {
|
|
768
770
|
outline: none;
|
package/package.json
CHANGED
package/src/component.ts
CHANGED
|
@@ -2251,6 +2251,12 @@ export class Container<P extends ContainerProps = ContainerProps, E extends Cont
|
|
|
2251
2251
|
reseq += 'ctrl+';
|
|
2252
2252
|
}
|
|
2253
2253
|
|
|
2254
|
+
let cmd = seq.match(/CMD/i);
|
|
2255
|
+
if (cmd) {
|
|
2256
|
+
seq = seq.replace(/CMD/i, '');
|
|
2257
|
+
reseq += 'cmd+';
|
|
2258
|
+
}
|
|
2259
|
+
|
|
2254
2260
|
let alt = seq.match(/ALT/i);
|
|
2255
2261
|
if (alt) {
|
|
2256
2262
|
seq = seq.replace(/ALT/i, '');
|
|
@@ -2295,6 +2301,10 @@ export class Container<P extends ContainerProps = ContainerProps, E extends Cont
|
|
|
2295
2301
|
seq += 'ctrl+';
|
|
2296
2302
|
}
|
|
2297
2303
|
|
|
2304
|
+
if (e.metaKey) {
|
|
2305
|
+
seq += 'cmd+';
|
|
2306
|
+
}
|
|
2307
|
+
|
|
2298
2308
|
if (e.altKey) {
|
|
2299
2309
|
seq += 'alt+';
|
|
2300
2310
|
}
|
package/src/treeview.ts
CHANGED
|
@@ -520,20 +520,19 @@ export class TreeView extends VLayout<TreeViewProps, TreeViewEventMap> {
|
|
|
520
520
|
return;
|
|
521
521
|
}
|
|
522
522
|
}
|
|
523
|
-
|
|
524
|
-
this.m_selection = { id: nd.id, el: null };
|
|
525
|
-
this.update( );
|
|
526
523
|
|
|
524
|
+
this.selection = nd.id;
|
|
525
|
+
|
|
526
|
+
this.emit('click', EvClick(nd) );
|
|
527
527
|
this.emit('contextMenu', EvContextMenu(ev, nd));
|
|
528
|
+
|
|
528
529
|
return;
|
|
529
530
|
}
|
|
530
531
|
|
|
531
532
|
dom = dom.parentElement;
|
|
532
533
|
}
|
|
533
534
|
|
|
534
|
-
this.
|
|
535
|
-
this.update( );
|
|
536
|
-
|
|
535
|
+
this.selection = null;
|
|
537
536
|
this.emit('contextMenu', EvContextMenu(ev, null));
|
|
538
537
|
}
|
|
539
538
|
|
package/src/x4.less
CHANGED
|
@@ -36,7 +36,11 @@
|
|
|
36
36
|
--x4-base-color: #266888;
|
|
37
37
|
|
|
38
38
|
--x4-selection-color: #2458B3;
|
|
39
|
+
--x4-selection-text: white;
|
|
40
|
+
|
|
39
41
|
--x4-hover-color: fadeout( #2458B3, 10% );
|
|
42
|
+
--x4-hover-text: white;
|
|
43
|
+
|
|
40
44
|
--x4-mask-color: fadeout( #2458B3, 40% );
|
|
41
45
|
--x4-focus-color: #2458B3;
|
|
42
46
|
--x4-error-color: #b92a09;
|
|
@@ -947,12 +951,12 @@ textarea {
|
|
|
947
951
|
|
|
948
952
|
&:hover {
|
|
949
953
|
background-color: var( --x4-hover-color );
|
|
950
|
-
color:
|
|
954
|
+
color: var( --x4-hover-text );
|
|
951
955
|
}
|
|
952
956
|
|
|
953
957
|
&.x-selected {
|
|
954
958
|
background-color: var( --x4-selection-color );
|
|
955
|
-
color:
|
|
959
|
+
color: var( --x4-selection-text );
|
|
956
960
|
}
|
|
957
961
|
|
|
958
962
|
&:focus {
|