Commit 0b5c9b3c authored by Anton Koch's avatar Anton Koch

Merge branch 'shared---fix-broken-system-190607' into 'master'

fixed data-table position in page layout (no issue)

See merge request !16
parents d104e7eb 98f2f525
Pipeline #12127 passed with stage
in 7 minutes and 43 seconds
...@@ -7,42 +7,42 @@ ...@@ -7,42 +7,42 @@
.col-9.col-sm-7.col-md-8.col-lg-9.col-xl-9 .col-9.col-sm-7.col-md-8.col-lg-9.col-xl-9
q-search(v-model="filter", dark, icon="search") q-search(v-model="filter", dark, icon="search")
q-table( q-table.full-width(
v-if="cols.length > 0", v-if="cols.length > 0",
dark, dark,
ref="table", ref="table",
row-key="name", row-key="name",
:data="rows", :data="rows",
:columns="cols", :columns="cols",
:selection="selection", :selection="selection",
:selected.sync="selected", :selected.sync="selected",
@request="request", @request="request",
:loading="loading", :loading="loading",
:rows-per-page-options="rowsPerPage", :rows-per-page-options="rowsPerPage",
:pagination.sync="pagination", :pagination.sync="pagination",
:hide-bottom="hideBottom", :hide-bottom="hideBottom",
:filter="filter", :filter="filter",
:title="tableTitle") :title="tableTitle")
template(slot="top-left", slot-scope="props") template(slot="top-left", slot-scope="props")
slot(name="buttons-left") slot(name="buttons-left")
<!--template(slot="top-right", slot-scope="props")--> <!--template(slot="top-right", slot-scope="props")-->
<!--q-search(v-model="filter", dark, icon="search")--> <!--q-search(v-model="filter", dark, icon="search")-->
q-td(slot="body-cell-title", slot-scope="props", :props="props") q-td(slot="body-cell-title", slot-scope="props", :props="props")
template(v-if="customTitleLink") template(v-if="customTitleLink")
router-link.primary(:to="getCustomLink(customTitleLink, props.row._uuid)") router-link.primary(:to="getCustomLink(customTitleLink, props.row._uuid)")
promise-span(:value="props.value") promise-span(:value="props.value")
template(v-else) template(v-else)
router-link.primary(v-if="hasShow", :to="getViewLink(props.row._uuid)") router-link.primary(v-if="hasShow", :to="getViewLink(props.row._uuid)")
promise-span(:value="props.value") promise-span(:value="props.value")
promise-span(v-if="!hasShow", :value="props.value") promise-span(v-if="!hasShow", :value="props.value")
q-td(slot="body-cell-tags", slot-scope="props", :props="props") q-td(slot="body-cell-tags", slot-scope="props", :props="props")
promise-span(:value="props.value") promise-span(:value="props.value")
q-td(slot="body-cell-actions", slot-scope="props", :props="props") q-td(slot="body-cell-actions", slot-scope="props", :props="props")
q-btn(v-for="btn in props.value", :key="btn.icon", "flat", size="sm", :icon="btn.icon", q-btn(v-for="btn in props.value", :key="btn.icon", "flat", size="sm", :icon="btn.icon",
@click="defaultClick(btn, props)") {{ $t(btn.title) }} @click="defaultClick(btn, props)") {{ $t(btn.title) }}
</template> </template>
<script> <script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment