Skip to content

Commit c115338

Browse files
ArgoZhangzhaijunlei955
ArgoZhang
and
zhaijunlei955
authored
feat(DockView): bump version 9.1.5 (#378)
* feat: update dockview to V4.2.0 * feat: update dockview to V4.2.1 * refactor: 代码格式化 * chore: bump version 9.1.5 --------- Co-authored-by: zhaijunlei <276318515@qq.com>
1 parent 991e648 commit c115338

9 files changed

Lines changed: 485 additions & 492 deletions

File tree

‎src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.1.4</Version>
4+
<Version>9.1.5</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/components/BootstrapBlazor.DockView/wwwroot/css/dockview-bb.css‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -208,24 +208,6 @@
208208
transition-duration: .3s;
209209
}
210210

211-
.ribbon-body.ribbon-body > div,
212-
.bb-dockview .dv-split-view-container,
213-
.bb-dockview .dv-split-view-container .dv-view-container .dv-view {
214-
overflow: initial;
215-
}
216-
217-
.bb-dockview .dv-split-view-container .dv-view-container .dv-view.bb-maximize {
218-
z-index: 99;
219-
}
220-
221-
.bb-dockview .dv-split-view-container .dv-view-container > .dv-view > .dv-groupview:not(.empty) {
222-
overflow: initial !important;
223-
}
224-
225-
.bb-dockview .dv-resize-container .dv-groupview .dv-tabs-and-actions-container {
226-
z-index: 12;
227-
}
228-
229211
.bb-dockview .bb-dockview-btn-wrapper {
230212
cursor: pointer;
231213
float: left;
@@ -288,9 +270,6 @@
288270
.bb-dockview .dv-tabs-and-actions-container:has(.dropdown-item) .dv-scrollbar-horizontal {
289271
display: none;
290272
}
291-
.bb-dockview .dv-scrollable {
292-
width: initial;
293-
}
294273
.bb-dockview .dv-tab.dv-inactive-tab .dv-default-tab .dv-default-tab-action {
295274
visibility: visible;
296275
}

‎src/components/BootstrapBlazor.DockView/wwwroot/css/dockview.css‎

Lines changed: 68 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.dv-scrollable {
22
position: relative;
33
overflow: hidden;
4-
width: 100%;
54
}
65
.dv-scrollable .dv-scrollbar-horizontal {
76
position: absolute;
@@ -249,10 +248,10 @@
249248
opacity: 0;
250249
transition: none;
251250
}
252-
.dockview-theme-dracula .dv-groupview.dv-active-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-active-tab {
251+
.dockview-theme-dracula .dv-groupview.dv-active-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-active-tab {
253252
position: relative;
254253
}
255-
.dockview-theme-dracula .dv-groupview.dv-active-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-active-tab::after {
254+
.dockview-theme-dracula .dv-groupview.dv-active-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-active-tab::after {
256255
position: absolute;
257256
left: 0px;
258257
top: 0px;
@@ -262,10 +261,10 @@
262261
background-color: #94527e;
263262
z-index: 999;
264263
}
265-
.dockview-theme-dracula .dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-active-tab {
264+
.dockview-theme-dracula .dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-active-tab {
266265
position: relative;
267266
}
268-
.dockview-theme-dracula .dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-active-tab::after {
267+
.dockview-theme-dracula .dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-active-tab::after {
269268
position: absolute;
270269
left: 0px;
271270
bottom: 0px;
@@ -577,6 +576,62 @@
577576
.dockview-theme-light-spaced .dv-resize-container .dv-groupview {
578577
border: 2px solid rgba(255, 255, 255, 0.1);
579578
}
579+
.dv-dockview {
580+
position: relative;
581+
background-color: var(--dv-group-view-background-color);
582+
}
583+
.dv-dockview .dv-watermark-container {
584+
position: absolute;
585+
top: 0px;
586+
left: 0px;
587+
height: 100%;
588+
width: 100%;
589+
z-index: 1;
590+
}
591+
.dv-dockview .dv-overlay-render-container {
592+
position: relative;
593+
}
594+
595+
.dv-groupview.dv-active-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-active-tab {
596+
background-color: var(--dv-activegroup-visiblepanel-tab-background-color);
597+
color: var(--dv-activegroup-visiblepanel-tab-color);
598+
}
599+
.dv-groupview.dv-active-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-inactive-tab {
600+
background-color: var(--dv-activegroup-hiddenpanel-tab-background-color);
601+
color: var(--dv-activegroup-hiddenpanel-tab-color);
602+
}
603+
.dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-active-tab {
604+
background-color: var(--dv-inactivegroup-visiblepanel-tab-background-color);
605+
color: var(--dv-inactivegroup-visiblepanel-tab-color);
606+
}
607+
.dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container .dv-tabs-container > .dv-tab.dv-inactive-tab {
608+
background-color: var(--dv-inactivegroup-hiddenpanel-tab-background-color);
609+
color: var(--dv-inactivegroup-hiddenpanel-tab-color);
610+
}
611+
612+
/**
613+
* when a tab is dragged we lose the above stylings because they are conditional on parent elements
614+
* therefore we also set some stylings for the dragging event
615+
**/
616+
.dv-tab.dv-tab-dragging {
617+
background-color: var(--dv-activegroup-visiblepanel-tab-background-color);
618+
color: var(--dv-activegroup-visiblepanel-tab-color);
619+
}
620+
.dv-groupview {
621+
display: flex;
622+
flex-direction: column;
623+
height: 100%;
624+
background-color: var(--dv-group-view-background-color);
625+
overflow: hidden;
626+
}
627+
.dv-groupview:focus {
628+
outline: none;
629+
}
630+
.dv-groupview > .dv-content-container {
631+
flex-grow: 1;
632+
min-height: 0;
633+
outline: none;
634+
}
580635
.dv-drop-target {
581636
position: relative;
582637
--dv-transition-duration: 70ms;
@@ -631,62 +686,6 @@
631686
background-color: var(--dv-drag-over-background-color);
632687
opacity: 1;
633688
}
634-
.dv-dockview {
635-
position: relative;
636-
background-color: var(--dv-group-view-background-color);
637-
}
638-
.dv-dockview .dv-watermark-container {
639-
position: absolute;
640-
top: 0px;
641-
left: 0px;
642-
height: 100%;
643-
width: 100%;
644-
z-index: 1;
645-
}
646-
.dv-dockview .dv-overlay-render-container {
647-
position: relative;
648-
}
649-
650-
.dv-groupview.dv-active-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-active-tab {
651-
background-color: var(--dv-activegroup-visiblepanel-tab-background-color);
652-
color: var(--dv-activegroup-visiblepanel-tab-color);
653-
}
654-
.dv-groupview.dv-active-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-inactive-tab {
655-
background-color: var(--dv-activegroup-hiddenpanel-tab-background-color);
656-
color: var(--dv-activegroup-hiddenpanel-tab-color);
657-
}
658-
.dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-active-tab {
659-
background-color: var(--dv-inactivegroup-visiblepanel-tab-background-color);
660-
color: var(--dv-inactivegroup-visiblepanel-tab-color);
661-
}
662-
.dv-groupview.dv-inactive-group > .dv-tabs-and-actions-container > .dv-scrollable > .dv-tabs-container > .dv-tab.dv-inactive-tab {
663-
background-color: var(--dv-inactivegroup-hiddenpanel-tab-background-color);
664-
color: var(--dv-inactivegroup-hiddenpanel-tab-color);
665-
}
666-
667-
/**
668-
* when a tab is dragged we lose the above stylings because they are conditional on parent elements
669-
* therefore we also set some stylings for the dragging event
670-
**/
671-
.dv-tab.dv-tab-dragging {
672-
background-color: var(--dv-activegroup-visiblepanel-tab-background-color);
673-
color: var(--dv-activegroup-visiblepanel-tab-color);
674-
}
675-
.dv-groupview {
676-
display: flex;
677-
flex-direction: column;
678-
height: 100%;
679-
background-color: var(--dv-group-view-background-color);
680-
overflow: hidden;
681-
}
682-
.dv-groupview:focus {
683-
outline: none;
684-
}
685-
.dv-groupview > .dv-content-container {
686-
flex-grow: 1;
687-
min-height: 0;
688-
outline: none;
689-
}
690689
.dv-root-wrapper {
691690
height: 100%;
692691
width: 100%;
@@ -1104,7 +1103,7 @@
11041103
.dv-tabs-container {
11051104
display: flex;
11061105
height: 100%;
1107-
overflow: hidden;
1106+
overflow: auto;
11081107
scrollbar-width: thin;
11091108
/* Track */
11101109
/* Handle */
@@ -1130,6 +1129,10 @@
11301129
background: var(--dv-tabs-container-scrollbar-color);
11311130
}
11321131

1132+
.dv-scrollable > .dv-tabs-container {
1133+
overflow: hidden;
1134+
}
1135+
11331136
.dv-tab {
11341137
-webkit-user-drag: element;
11351138
outline: none;
@@ -1166,6 +1169,9 @@
11661169
height: var(--dv-tabs-and-actions-container-height);
11671170
font-size: var(--dv-tabs-and-actions-container-font-size);
11681171
}
1172+
.dv-tabs-and-actions-container.dv-single-tab.dv-full-width-single-tab .dv-scrollable {
1173+
flex-grow: 1;
1174+
}
11691175
.dv-tabs-and-actions-container.dv-single-tab.dv-full-width-single-tab .dv-tabs-container {
11701176
flex-grow: 1;
11711177
}

‎src/components/BootstrapBlazor.DockView/wwwroot/js/dockview-config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ const saveConfig = dockview => {
305305
if (dockview.params.options.enableLocalStorage && dockview._inited === true) {
306306
saveParamsIsActive(dockview)
307307
const json = dockview.toJSON();
308-
if(dockview.floatingGroups && dockview.floatingGroups.length > 0) {
308+
if (dockview.floatingGroups && dockview.floatingGroups.length > 0) {
309309
json.floatingGroups.forEach((fg, index) => {
310310
const width = dockview.floatingGroups[index].group.width
311311
fg.position.width = fg.position.width || (width ? width + 2 : 300)

0 commit comments

Comments
 (0)