nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-15 01:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- data renamed to entries

Browse Source
This commit is contained in:
Peter Papp
2021-04-19 09:39:09 +02:00
parent b0c81a692c
commit 7cd29fce98
11 changed files with 74 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/components/FilesView/EmptyPage.vue
+2 -2
View File
@@ -50,9 +50,9 @@
Spinner
},
computed: {
...mapGetters(['data', 'isLoading', 'currentFolder']),
...mapGetters(['entries', 'isLoading', 'currentFolder']),
isEmpty() {
return this.data && this.data.length == 0
return this.entries && this.entries.length == 0
}
}
}
resources/js/components/FilesView/FileBrowser.vue
+5 -5
View File
@@ -35,7 +35,7 @@
@drop.stop.native.prevent="dragFinish(item, $event)"
@contextmenu.native.prevent="contextMenu($event, item)"
:item="item"
v-for="item in data"
v-for="item in entries"
:key="item.id"
class="file-item"
:class="draggedItems.includes(item) ? 'dragged' : '' "
@@ -56,7 +56,7 @@
@drop.native.prevent="dragFinish(item, $event)"
@contextmenu.native.prevent="contextMenu($event, item)"
:item="item"
v-for="item in data"
v-for="item in entries"
:key="item.id"
class="file-item"
:class="draggedItems.includes(item) ? 'dragged' : '' "
@@ -123,11 +123,11 @@
'filesInQueueTotal',
'fileInfoVisible',
'FilePreviewType',
'clipboard',
'currentFolder',
'isSearching',
'clipboard',
'isLoading',
'data'
'entries'
]),
isGrid() {
return this.FilePreviewType === 'grid'
@@ -136,7 +136,7 @@
return this.FilePreviewType === 'list'
},
isEmpty() {
return this.data.length == 0
return this.entries.length == 0
},
draggedItems() {
//Set opacity for dragged items
resources/js/components/FilesView/FileItemGrid.vue
+5 -5
View File
@@ -84,7 +84,7 @@ export default {
},
computed: {
...mapGetters([
'FilePreviewType', 'sharedDetail', 'clipboard', 'data'
'FilePreviewType', 'sharedDetail', 'clipboard', 'entries'
]),
folderEmojiOrColor() {
@@ -188,8 +188,8 @@ export default {
}
} else if (e.shiftKey) {
// Click + Shift
let lastItem = this.data.indexOf(this.clipboard[this.clipboard.length - 1])
let clickedItem = this.data.indexOf(this.item)
let lastItem = this.entries.indexOf(this.clipboard[this.clipboard.length - 1])
let clickedItem = this.entries.indexOf(this.item)
// If Click + Shift + Ctrl dont remove already selected items
if (!e.ctrlKey && !e.metaKey) {
@@ -199,12 +199,12 @@ export default {
//Shift selecting from top to bottom
if (lastItem < clickedItem) {
for (let i = lastItem; i <= clickedItem; i++) {
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.data[i])
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.entries[i])
}
//Shift selecting from bottom to top
} else {
for (let i = lastItem; i >= clickedItem; i--) {
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.data[i])
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.entries[i])
}
}
} else {
resources/js/components/FilesView/FileItemList.vue
+25 -21
View File
@@ -13,7 +13,7 @@
<transition name="slide-from-left">
<div class="check-select" v-if="mobileMultiSelect">
<div class="select-box" :class="{'select-box-active' : isClicked } ">
<CheckIcon v-if="isClicked" class="icon" size="17"/>
<CheckIcon v-if="isClicked" class="icon" size="17" />
</div>
</div>
</transition>
@@ -26,12 +26,12 @@
</span>
<!--Folder thumbnail-->
<FontAwesomeIcon v-if="isFile || (isImage && !item.thumbnail)" class="file-icon" icon="file"/>
<FontAwesomeIcon v-if="isFile || (isImage && !item.thumbnail)" class="file-icon" icon="file" />
<!--Image thumbnail-->
<img loading="lazy" v-if="isImage && item.thumbnail" class="image" :src="item.thumbnail" :alt="item.name"/>
<img loading="lazy" v-if="isImage && item.thumbnail" class="image" :src="item.thumbnail" :alt="item.name" />
<!--Else show only folder icon-->
<!--Else show only folder icon-->
<FolderIcon v-if="isFolder" :item="item" location="file-item-list" class="folder svg-color-theme" />
</div>
@@ -73,11 +73,11 @@
</template>
<script>
import { LinkIcon, UserPlusIcon, CheckIcon, MoreVerticalIcon } from 'vue-feather-icons'
import {LinkIcon, UserPlusIcon, CheckIcon, MoreVerticalIcon} from 'vue-feather-icons'
import FolderIcon from '@/components/FilesView/FolderIcon'
import { debounce } from 'lodash'
import { mapGetters } from 'vuex'
import { events } from '@/bus'
import {debounce} from 'lodash'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
export default {
name: 'FileItemList',
@@ -90,7 +90,11 @@ export default {
CheckIcon,
},
computed: {
...mapGetters(['FilePreviewType', 'clipboard', 'data']),
...mapGetters([
'FilePreviewType',
'clipboard',
'entries'
]),
isClicked() {
return this.clipboard.some(element => element.id === this.item.id)
},
@@ -120,7 +124,7 @@ export default {
return !this.isDeleted && this.$checkPermission(['master', 'editor'])
},
timeStamp() {
return this.item.deleted_at ? this.$t('item_thumbnail.deleted_at', { time: this.item.deleted_at }) : this.item.created_at
return this.item.deleted_at ? this.$t('item_thumbnail.deleted_at', {time: this.item.deleted_at}) : this.item.created_at
},
folderItems() {
return this.item.deleted_at ? this.item.trashed_items : this.item.items
@@ -183,8 +187,8 @@ export default {
}
} else if (e.shiftKey) {
// Click + Shift
let lastItem = this.data.indexOf(this.clipboard[this.clipboard.length - 1])
let clickedItem = this.data.indexOf(this.item)
let lastItem = this.entries.indexOf(this.clipboard[this.clipboard.length - 1])
let clickedItem = this.entries.indexOf(this.item)
// If Click + Shift + Ctrl dont remove already selected items
if (!e.ctrlKey && !e.metaKey) {
@@ -194,12 +198,12 @@ export default {
//Shift selecting from top to bottom
if (lastItem < clickedItem) {
for (let i = lastItem; i <= clickedItem; i++) {
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.data[i])
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.entries[i])
}
//Shift selecting from bottom to top
} else {
for (let i = lastItem; i >= clickedItem; i--) {
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.data[i])
this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.entries[i])
}
}
} else {
@@ -214,9 +218,9 @@ export default {
if (this.isFolder) {
if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [{ folder: this.item, back: false, init: false }])
this.$store.dispatch('browseShared', [{folder: this.item, back: false, init: false}])
} else {
this.$store.dispatch('getFolder', [{ folder: this.item, back: false, init: false }])
this.$store.dispatch('getFolder', [{folder: this.item, back: false, init: false}])
}
} else {
@@ -251,13 +255,13 @@ export default {
this.$store.commit('CLIPBOARD_CLEAR')
if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [{ folder: this.item, back: false, init: false }])
this.$store.dispatch('browseShared', [{folder: this.item, back: false, init: false}])
} else {
this.$store.dispatch('getFolder', [{ folder: this.item, back: false, init: false }])
this.$store.dispatch('getFolder', [{folder: this.item, back: false, init: false}])
}
}
},
renameItem: debounce(function(e) {
renameItem: debounce(function (e) {
// Prevent submit empty string
if (e.target.innerText.trim() === '') return
@@ -274,7 +278,7 @@ export default {
events.$on('newFolder:focus', (id) => {
if(this.item.id === id && !this.$isMobile()) {
if (this.item.id === id && !this.$isMobile()) {
this.$refs[id].focus()
document.execCommand('selectAll')
}
@@ -455,7 +459,7 @@ export default {
flex: 0 0 50px;
line-height: 0;
margin-right: 20px;
.folder {
width: 52px;
height: 52px;
resources/js/components/FilesView/FilePreviewMedia.vue
+2 -2
View File
@@ -80,7 +80,7 @@ export default {
computed: {
...mapGetters([
'clipboard',
'data',
'entries',
]),
currentFile() {
return this.files[Math.abs(this.currentIndex) % this.files.length]
@@ -174,7 +174,7 @@ export default {
getFilesForView() {
let requestedFile = this.clipboard[0]
this.data.map(element => {
this.entries.map(element => {
if (requestedFile.mimetype === 'pdf') {
resources/js/components/FilesView/FilePreviewToolbar.vue
+2 -2
View File
@@ -45,7 +45,7 @@
computed: {
...mapGetters([
'clipboard',
'data'
'entries'
]),
isImage() {
return this.clipboard[0].type === 'image'
@@ -56,7 +56,7 @@
files() {
let files = []
this.data.map(element => {
this.entries.map(element => {
if (this.clipboard[0].mimetype === 'pdf') {
resources/js/components/Others/Tables/DatatableWrapper.vue
-1
View File
@@ -121,7 +121,6 @@
<script>
import {ChevronUpIcon, ChevronLeftIcon, ChevronRightIcon} from 'vue-feather-icons'
import DatatableCell from '@/components/Others/Tables/DatatableCell'
import {chunk, sortBy} from 'lodash'
import axios from "axios";
export default {
resources/js/store/modules/fileBrowser.js
Vendored
+12 -12
View File
@@ -13,7 +13,7 @@ const defaultState = {
browseHistory: [],
clipboard: [],
data: [],
entries: [],
}
const actions = {
@@ -207,7 +207,7 @@ const actions = {
const mutations = {
LOADING_STATE(state, payload) {
state.clipboard = []
state.data = payload.data
state.entries = payload.data
state.isLoading = payload.loading
},
UPDATE_FOLDER_TREE(state, tree) {
@@ -217,7 +217,7 @@ const mutations = {
state.browseHistory = []
},
FLUSH_SHARED(state, id) {
state.data.find(item => {
state.entries.find(item => {
if (item.id === id) item.shared = undefined
})
},
@@ -235,7 +235,7 @@ const mutations = {
}
// Rename item name in data view
state.data.find(item => {
state.entries.find(item => {
if (item.id === updatedFile.id) {
item.name = updatedFile.name
item.color = updatedFile.color ? updatedFile.color : null
@@ -247,21 +247,21 @@ const mutations = {
state.isSearching = searchState
},
UPDATE_SHARED_ITEM(state, data) {
state.data.find(item => {
state.entries.find(item => {
if (item.id === data.item_id) item.shared = data
})
},
ADD_NEW_FOLDER(state, folder) {
state.data.unshift(folder)
state.entries.unshift(folder)
},
ADD_NEW_ITEMS(state, items) {
state.data = state.data.concat(items)
state.entries = state.entries.concat(items)
},
REMOVE_ITEM(state, id) {
state.data = state.data.filter(el => el.id !== id)
state.entries = state.entries.filter(el => el.id !== id)
},
INCREASE_FOLDER_ITEM(state, id) {
state.data.map(el => {
state.entries.map(el => {
if (el.id && el.id === id) el.items++
})
},
@@ -272,10 +272,10 @@ const mutations = {
state.clipboard = state.clipboard.filter(element => element.id !== item.id)
},
ADD_ALL_ITEMS_TO_CLIPBOARD(state) {
state.clipboard = state.data
state.clipboard = state.entries
},
ADD_ITEM_TO_CLIPBOARD(state, item) {
let selectedItem = state.data.find(el => el.id === item.id)
let selectedItem = state.entries.find(el => el.id === item.id)
if (state.clipboard.includes(selectedItem)) return
@@ -293,7 +293,7 @@ const getters = {
isSearching: state => state.isSearching,
navigation: state => state.navigation,
isLoading: state => state.isLoading,
data: state => state.data,
entries: state => state.entries,
}
export default {
resources/js/views/FilePages/Files.vue
+1 -1
View File
@@ -43,7 +43,7 @@
<span class="empty-note navigator" v-if="tree.length == 0">
{{ $t('sidebar.folders_empty') }}
</span>
<TreeMenuNavigator class="folder-tree" :depth="0" :nodes="items" v-for="items in tree" :key="items.id"/>
<TreeMenuNavigator class="folder-tree" :depth="0" :nodes="folder" v-for="folder in tree" :key="folder.id"/>
</ContentGroup>
<!--Favourites-->
resources/js/views/Shared/SharedFileBrowser.vue
+1 -1
View File
@@ -18,7 +18,7 @@
<!--Navigator-->
<ContentGroup :title="$t('sidebar.navigator_title')" class="navigator">
<TreeMenuNavigator class="folder-tree" :depth="0" :nodes="items" v-for="items in navigationTree" :key="items.id" />
<TreeMenuNavigator class="folder-tree" :depth="0" :nodes="folder" v-for="folder in navigationTree" :key="folder.id" />
</ContentGroup>
</ContentSidebar>