Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #1746: reuse contextual menu for all files #237

Merged
merged 1 commit into from
Aug 5, 2024
Merged

fix #1746: reuse contextual menu for all files #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 6 additions & 143 deletions main/src/components/filebrowser/components/ActionButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,152 +17,15 @@
* @FilePath: /CasaOS-UI/src/components/filebrowser/components/ActionButton.vue
-->
<template>
<div class="action-btn" @click.stop>
<b-dropdown :id="'dr-'+index" ref="dropDown" :close-on-click="false"
:position="'is-'+verticalPos+'-'+horizontalPos" animation="fade1"
append-to-body aria-role="list" class="file-dropdown"
@active-change="dorpActiveChange($event,'dr-'+index)">
<template #trigger>
<p role="button">
<b-icon id="das" custom-size="mdi-18px" icon="dots-horizontal">
</b-icon>
</p>
</template>
<b-dropdown-item aria-role="menuitem" @click="download">
{{ $t('Download') }}
</b-dropdown-item>
<b-dropdown-item aria-role="menuitem" @click="copyPath">
{{ $t('Copy Path') }}
</b-dropdown-item>
<hr class="dropdown-divider">
<b-dropdown-item aria-role="menuitem" @click="rename">
{{ $t('Rename') }}
</b-dropdown-item>
<b-dropdown-item aria-role="menuitem" @click="operate('move',item)">
{{ $t('Cut') }}
</b-dropdown-item>
<b-dropdown-item aria-role="menuitem" @click="operate('copy',item)">
{{ $t('Copy') }}
</b-dropdown-item>
<b-dropdown-item v-if="isWallpaperType" aria-role="menuitem" @click="setAsWallpaper(item)">
{{ $t('Set as wallpaper') }}
</b-dropdown-item>
<template v-if="item.is_dir">
<hr class="dropdown-divider">
<b-dropdown-item v-if="!isShared" aria-role="menuitem" @click="shareFoler">
{{ $t('Share') }}
</b-dropdown-item>
<b-dropdown-item v-else aria-role="menuitem" class="has-text-danger" @click="unShare">
{{ $t('UnShare') }}
</b-dropdown-item>
</template>

<hr class="dropdown-divider">
<b-dropdown-item v-if="!isConfirmed" aria-role="menuitem" class="has-text-danger"
@click="isConfirmed = true">
{{ $t('Delete') }}
</b-dropdown-item>
<b-dropdown-item v-else aria-role="menuitem" class="has-text-danger" @click="deleteItem(item)">
{{ $t('Are you sure?') }}
</b-dropdown-item>
</b-dropdown>
<div class="action-btn" @click.stop="$emit('click', $event)">
<p role="button">
<b-icon custom-size="mdi-18px" icon="dots-horizontal" />
</p>
</div>
</template>

<script>
import {mixin, wallpaperType} from '@/mixins/mixin';
import has from 'lodash/has'

export default {
mixins: [mixin],
inject: ['filePanel'],
props: {
cols: Number,
index: Number,
item: Object
},
data() {
return {
verticalPos: "bottom",
isConfirmed: false,
shareId: ""
}
},
computed: {
horizontalPos() {
return (this.index + 1) % this.cols == 0 ? "left" : "right"
},
isWallpaperType() {
return this.item.is_dir ? false : wallpaperType.includes(this.getFileExt(this.item))
},
isShared() {
const extensions = this.item.extensions
if (extensions === null) {
return false
} else {
if (has(extensions, 'share')) {
return extensions.share.shared === "true"
} else {
return false
}
}
}
},
mounted() {
document.addEventListener('contextmenu', this.hideContextMenu);

},
destroyed() {
document.removeEventListener('contextmenu', this.hideContextMenu)
},

methods: {
dorpActiveChange($event, el) {
if ($event) {
this.isConfirmed = false
}
const trigger = document.getElementById(el);
const bottomOffset = window.innerHeight - trigger.getBoundingClientRect().y - 216
this.verticalPos = bottomOffset > 0 ? "bottom" : "top"
},
hideContextMenu() {
this.$refs.dropDown.isActive = false
},
rename() {
this.$refs.dropDown.toggle()
this.filePanel.showRenameModal(this.item)
},

async shareFoler() {
this.$refs.dropDown.toggle()
const data = [{
path: this.item.path,
anonymous: true
}]
try {
await this.$api.samba.createShare(data)
this.filePanel.getShareLink(this.item)
this.filePanel.reloadShare()
} catch (error) {
this.isSaving = false
this.$buefy.toast.open({
message: error.response.data.message,
type: 'is-danger'
})
}
},

unShare() {
this.$refs.dropDown.toggle()
const data = {
id: this.item.extensions.share.id,
}
this.filePanel.handleUnShare(data)
}

},
emits: ['click']
}
</script>

<style>
</style>
</script>
11 changes: 1 addition & 10 deletions main/src/components/filebrowser/components/GirdView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,7 @@
</b-field>
<!-- CheckBox End -->

<!-- Action Button Start -->
<action-button
:class="{ show: isMobile }"
:cols="cols"
:index="index"
:item="item"
@reload="$emit('reload')"
@showDetailModal="$emit('showDetailModal', item)"
></action-button>
<!-- Action Button End -->
<action-button :class="{ show: isMobile }" @click.stop="openContextMenu($event, item)" />
</div>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions main/src/components/filebrowser/components/ListView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@
dateFmt }}</span>
</div>
<div class="action-wrapper is-flex-shrink-0">
<!-- Action Button Start -->
<action-button :class="{ show: isMobile }" :cols="cols" :index="index" :item="item"
@reload="$emit('reload')"></action-button>
<!-- Action Button End -->
<action-button :class="{ show: isMobile }" @click.stop="openContextMenu($event, item)" />
</div>
</div>
<div v-if="!isMobile" class="td">
Expand Down
55 changes: 0 additions & 55 deletions main/src/mixins/mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@ export const mixin = {
this.$refs.dropDown?.toggle()
this.downloadFile(this.item)
},
playVideo(item, player) {
let url = player + this.getFileUrl(item)
window.open(url, '_self');
},

// Get File Download URL
getFileUrl(items) {
Expand Down Expand Up @@ -227,22 +223,6 @@ export const mixin = {
type: 'is-success'
})
},
/**
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed filters and methods that are not used in the code

* @description: Download File
* @param {Object,Object} event item
* @return {void}
*/
clickItem(event, item) {
let bounced = event.target.getAttribute('class').includes('mdi-dots')
if (bounced) {
return false
}
if (item.is_dir) {
this.$emit('gotoFolder', item.path)
} else {
this.$emit('showDetailModal', item)
}
},
/**
* @description: Open Context Menu
* @param {Object,Object} event item
Expand Down Expand Up @@ -399,36 +379,12 @@ export const mixin = {


filters: {
/**
* @description: Format size output
* @param {int} value size value
* @return {String}
*/
renderBps(value) {
if (null == value || value == '' || value == 0) {
return "0 bps";
}
const unitArr = ["bps", "Kbps", "Mbps", "Gbps", "TB", "PB", "EB", "ZB", "YB"];
let index = 0,
srcsize = parseFloat(value);
index = Math.floor(Math.log(srcsize) / Math.log(1024));
let size = srcsize / Math.pow(1024, index);
size = size.toFixed(2);
return size + unitArr[index];
},

renderSize,

toFahrenheit: function (value) {
return (32 + value * 1.8).toFixed(1);
},


formatNum(number) {
return new Intl.NumberFormat().format(number)
},


getProgressType(per) {
if (per >= 0 && per < 80) {
return "is-primary"
Expand All @@ -439,17 +395,6 @@ export const mixin = {
}
},


getTextType(per) {
if (per >= 0 && per < 80) {
return "has-text-success"
} else if (per >= 80 && per < 90) {
return "has-text-warning"
} else {
return "has-text-danger"
}
},

dateFmt: function (value) {
if (dayjs().isSame(value, 'year')) {
return dayjs(value).format('DD/MM hh:mm')
Expand Down
Loading