File tree 2 files changed +8
-12
lines changed
packages/web-pkg/src/components/FilesList
2 files changed +8
-12
lines changed Original file line number Diff line number Diff line change 1
1
<template >
2
- <oc-table
2
+ <component
3
+ :is =" configOptions.cernFeatures ? 'collapsible-oc-table' : 'oc-table'"
3
4
v-bind =" $attrs"
4
5
id =" files-space-table"
5
6
:class =" [
235
236
<!-- @slot Footer of the files table -->
236
237
<slot name =" footer" />
237
238
</template >
238
- </oc-table >
239
+ </component >
239
240
<Teleport v-if =" dragItem" to =" body" >
240
241
<resource-ghost-element ref =" ghostElement" :preview-items =" [dragItem, ...dragSelection]" />
241
242
</Teleport >
@@ -301,22 +302,21 @@ import { determineResourceTableSortFields } from '../../helpers/ui/resourceTable
301
302
import { useFileActionsRename } from ' ../../composables/actions'
302
303
import { createLocationCommon } from ' ../../router'
303
304
import get from ' lodash-es/get'
304
-
305
- // ODS component import is necessary here for CERN to overwrite OcTable
306
- import { OcTable } from ' @ownclouders/design-system/components'
305
+ import CollapsibleOcTable from ' ./../../cern/components/CollapsibleOcTable.vue'
307
306
import { storeToRefs } from ' pinia'
308
- import { OcButton } from ' @ownclouders/design-system/components'
307
+ import { OcButton , OcTable } from ' @ownclouders/design-system/components'
309
308
import { FieldType } from ' @ownclouders/design-system/helpers'
310
309
311
310
const TAGS_MINIMUM_SCREEN_WIDTH = 850
312
311
313
312
export default defineComponent ({
314
313
components: {
315
314
ContextMenuQuickAction ,
315
+ CollapsibleOcTable ,
316
316
ResourceGhostElement ,
317
- OcTable ,
318
317
ResourceListItem ,
319
- ResourceSize
318
+ ResourceSize ,
319
+ OcTable
320
320
},
321
321
props: {
322
322
/**
Original file line number Diff line number Diff line change @@ -24,10 +24,6 @@ export default defineConfig(async (args) => {
24
24
strictPort : true
25
25
}
26
26
27
- // collapsible table
28
- // FIXME: how to handle?
29
- ; ( config . resolve . alias as any ) [ '@ownclouders/design-system/src/components/OcTable/OcTable.vue' ] =
30
- join ( projectRootDir , 'packages/web-pkg/src/cern/components/CollapsibleOcTable.vue' )
31
27
// create space component
32
28
; ( config . resolve . alias as any ) [ '../../components/AppBar/CreateSpace.vue' ] = join (
33
29
projectRootDir ,
You can’t perform that action at this time.
0 commit comments