Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m47s
All checks were successful
CI / Docker-Build (push) Successful in 2m47s
This commit is contained in:
commit
275fa685ef
@ -16,47 +16,50 @@
|
||||
}"
|
||||
style="max-width: 2000px"
|
||||
>
|
||||
<q-scroll-area
|
||||
<!-- <q-scroll-area
|
||||
v-if="props.height"
|
||||
id="draggable-dialog-scroll"
|
||||
:style="`width: ${props.width}px;height: ${props.height}px`"
|
||||
style="max-height: 90vh"
|
||||
>
|
||||
<div style="position: sticky; top: 0px; z-index: 9">
|
||||
<q-bar
|
||||
ref="headerRef"
|
||||
class="non-selectable q-gutter-l"
|
||||
style="
|
||||
cursor: move;
|
||||
border-top-right-radius: 0;
|
||||
border-top-left-radius: 0;
|
||||
"
|
||||
:style="`height: ${props.titleHeight}px;background: ${props.titleColor}`"
|
||||
>
|
||||
<div
|
||||
:style="`height: 100%; line-height: ${props.titleHeight}px; color:${props.fontColor};font-size: ${props.fontSize}px;`"
|
||||
>
|
||||
{{ props.title }}
|
||||
</div>
|
||||
<q-space />
|
||||
<div style="margin-right: 10px">
|
||||
<slot name="titleButton"></slot>
|
||||
</div>
|
||||
<q-btn dense flat icon="sym_o_close" v-close-popup></q-btn>
|
||||
</q-bar>
|
||||
</div>
|
||||
|
||||
<slot></slot>
|
||||
|
||||
<div :style="`width: ${props.width}px`">
|
||||
<slot name="footer"></slot>
|
||||
</div>
|
||||
<div
|
||||
:style="`width: ${props.width}px`"
|
||||
style="position: sticky; bottom: 0px"
|
||||
> -->
|
||||
<div style="position: sticky; top: 0px; z-index: 9">
|
||||
<q-bar
|
||||
ref="headerRef"
|
||||
class="non-selectable q-gutter-l"
|
||||
style="
|
||||
cursor: move;
|
||||
border-top-right-radius: 0;
|
||||
border-top-left-radius: 0;
|
||||
"
|
||||
:style="`height: ${props.titleHeight}px;background: ${props.titleColor}`"
|
||||
>
|
||||
<slot name="sticky-footer"></slot>
|
||||
</div>
|
||||
<div
|
||||
:style="`height: 100%; line-height: ${props.titleHeight}px; color:${props.fontColor};font-size: ${props.fontSize}px;`"
|
||||
>
|
||||
{{ props.title }}
|
||||
</div>
|
||||
<q-space />
|
||||
<div style="margin-right: 10px">
|
||||
<slot name="titleButton"></slot>
|
||||
</div>
|
||||
<q-btn dense flat icon="sym_o_close" v-close-popup></q-btn>
|
||||
</q-bar>
|
||||
</div>
|
||||
<q-scroll-area
|
||||
v-if="props.height"
|
||||
id="draggable-dialog-scroll"
|
||||
:style="`width: ${props.width}px;height: ${props.height}px`"
|
||||
style="max-height: calc(90vh - 100px)"
|
||||
>
|
||||
<slot></slot>
|
||||
</q-scroll-area>
|
||||
<slot name="footer"></slot>
|
||||
<div
|
||||
:style="`width: ${props.width}px`"
|
||||
style="position: sticky; bottom: 0px"
|
||||
>
|
||||
<slot name="sticky-footer"></slot>
|
||||
</div>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
</template>
|
||||
|
Loading…
Reference in New Issue
Block a user