Browse Source

refactor(gui): reorder filter and sort

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/2074/head
Pranav C 3 years ago
parent
commit
0890d61be0
  1. 1
      packages/nc-gui/components/auth/ShareOrInviteModal.vue
  2. 19
      packages/nc-gui/components/project/spreadsheet/RowsXcDataTable.vue

1
packages/nc-gui/components/auth/ShareOrInviteModal.vue

@ -2,6 +2,7 @@
<v-dialog <v-dialog
v-model="userEditDialog" v-model="userEditDialog"
:width="invite_token ? 700 : 700" :width="invite_token ? 700 : 700"
transition="dialog-top-transition"
@close="invite_token = null" @close="invite_token = null"
> >
<v-card v-if="selectedUser" style="min-height: 100%" class="elevation-0"> <v-card v-if="selectedUser" style="min-height: 100%" class="elevation-0">

19
packages/nc-gui/components/project/spreadsheet/RowsXcDataTable.vue

@ -80,17 +80,6 @@
:view-id="selectedViewId" :view-id="selectedViewId"
@updated="loadTableData" @updated="loadTableData"
/> />
<sort-list
v-if="!isForm"
v-model="sortList"
:is-locked="isLocked"
:meta="meta"
:view-id="selectedViewId"
@updated="loadTableData"
/>
<!-- v-model="sortList"-->
<!-- :field-list="[...realFieldList, ...formulaFieldList]"-->
<column-filter <column-filter
v-if="!isForm" v-if="!isForm"
v-model="filters" v-model="filters"
@ -101,6 +90,14 @@
:view-id="selectedViewId" :view-id="selectedViewId"
@updated="loadTableData" @updated="loadTableData"
/> />
<sort-list
v-if="!isForm"
v-model="sortList"
:is-locked="isLocked"
:meta="meta"
:view-id="selectedViewId"
@updated="loadTableData"
/>
</div> </div>
<share-view-menu <share-view-menu
v-if="!isGallery" v-if="!isGallery"

Loading…
Cancel
Save