zhuhao_dev #33

Merged
zhuhao merged 8 commits from zhuhao_dev into main 2024-07-17 21:25:06 +08:00
6 changed files with 451 additions and 249 deletions
Showing only changes of commit fb46f3e04c - Show all commits

View File

@ -16,6 +16,13 @@ export function deleteSmarttalk(id) {
})
}
export function deleteSmarttalkBatch(ids) {
return request({
url: '/smarttalk/file/' + ids,
method: 'delete'
})
}
export const updateSmarttalk = (params) => {
return request({
url: '/smarttalk/file/updateSmarttalk',

View File

@ -1,5 +1,5 @@
<template>
<el-popover placement="left-end" width="300px" title="文件上传" trigger="click">
<el-popover placement="left-end" width="300px" title="文件上传" trigger="hover">
<template #default>
<el-upload
ref="talk_uploader_core"
@ -38,8 +38,6 @@
<div class="prepare-item-info-title">{{ item.raw.name }}</div>
<div class="prepare-item-info-message">
<div>{{ formatFileSize(item.raw.size) }}</div>
<!-- &nbsp;&nbsp;|&nbsp;&nbsp;-->
<!-- <div>古诗词诵读 > 静女</div>-->
</div>
</div>
<div class="prepare-body-main-item-tool" @click="removeUploadFile(item.uid)">
@ -50,12 +48,7 @@
</div>
</template>
<template #reference>
<div
v-show="uploaderStore.uploadList && uploaderStore.uploadList.length > 0"
class="talk-uploader-wrap"
draggable="true"
style="margin: auto"
>
<div class="talk-uploader-wrap" draggable="true" style="margin: auto">
<svg class="icon" aria-hidden="true" font-size="50px">
<use xlink:href="#icon-yunwenjian-"></use>
</svg>

View File

@ -6,7 +6,7 @@
<el-main>
<AppMain />
</el-main>
<Uploader/>
<Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />
</el-container>
</template>
@ -14,6 +14,9 @@
import Header from './components/Header.vue'
import AppMain from './components/AppMain.vue'
import Uploader from './components/Uploader.vue'
import uploaderState from '@/store/modules/uploader'
import { ref } from 'vue'
let uploaderStore = ref(uploaderState())
</script>
<style lang="scss" scoped>

View File

@ -0,0 +1,260 @@
<template>
<div class="prepare-body-main-item">
<div class="prepare-body-main-item-icon">
<slot name="default"></slot>
<FileImage :size="50" :file-name="item.fileShowName" @click="openFileWin(item)" />
</div>
<div class="prepare-body-main-item-info">
<div class="prepare-item-info-title" :title="item.fileShowName">
{{ item.fileShowName }}
</div>
<div class="prepare-item-info-message" @click="openFileWin(item)">
<div style="width: 60px">
<el-icon
v-loading="item.async === 'on'"
style="background-color: green; border-radius: 20px; color: white; top: 2px"
>
<Check v-if="item.async === true" />
<UploadFilled v-if="!item.async" />
</el-icon>
{{ item.async === true ? '已同步' : '' }}
{{ !item.async ? '待同步' : '' }}
{{ item.async === 'on' ? '同步中' : '' }}
</div>
|
<div style="width: 70px">{{ formatFileSize(item.fileSize) }}</div>
|
<div style="width: 70px">{{ toTimeText(item.uploadTime, true) }}</div>
|&nbsp;
<div
style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
flex: 1;
text-align: left;
"
:title="
item.levelFirstName +
(item.levelSecondName ? ' > ' + item.levelSecondName : '') +
(item.levelThirdNmae ? ' > ' + item.levelThirdNmae : '')
"
>
{{
item.levelFirstName +
(item.levelSecondName ? ' > ' + item.levelSecondName : '') +
(item.levelThirdNmae ? ' > ' + item.levelThirdNmae : '')
}}
</div>
</div>
</div>
<div class="prepare-body-main-item-tool">
<el-popover
:ref="'popover_' + index"
placement="left-start"
:hide-after="100"
popper-class="prepare-popper"
trigger="click"
>
<template #default>
<div style="width: 100%">
<div class="item-popover" @click="closePopver(index)">
<div class="item-popover-item">
<el-button text @click="editTalk(item, index)">
<i class="iconfont icon-bianji"></i>
<span>重命名</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="deleteTalk(item)">
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="downloadFile(item)">
<i class="iconfont icon-xiazai"></i>
<span>下载</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="moveSmarttalkFun(item)">
<el-icon>
<Switch />
</el-icon>
<span>移动</span>
</el-button>
</div>
</div>
</div>
</template>
<template #reference>
<span class="iconfont icon-shenglvehao" style="cursor: pointer" @click.stop></span>
</template>
</el-popover>
</div>
</div>
</template>
<script setup>
import { Check, UploadFilled, Switch } from '@element-plus/icons-vue'
</script>
<script>
import FileImage from '@/components/file-image/index.vue'
import { isHaveLocalFile } from '@/utils/talkFile'
import { toTimeText } from '@/utils/date'
import { ElMessage, ElMessageBox } from 'element-plus'
import { deleteSmarttalk, updateSmarttalk } from '@/api/file'
const { ipcRenderer } = window.electron || {}
export default {
name: 'FileListItem',
components: { FileImage },
props: {
item: {
type: Object,
default: function() {
return {}
}
},
index: {
type: Number,
default: function() {
return 0
}
}
},
emits: { 'on-move': null, 'on-delete': null },
methods: {
editTalk(item) {
ElMessageBox.prompt('请输入新的名称', '重命名', {
confirmButtonText: '确认',
cancelButtonText: '取消',
inputValue: item.fileShowName.substring(0, item.fileShowName.lastIndexOf('.'))
})
.then(({ value }) => {
item.fileShowName = value + '.' + item.fileSuffix
updateSmarttalk({ id: item.id, fileShowName: item.fileShowName }).then((res) => {
if (res.data === true) {
ElMessage({
type: 'success',
message: `修改成功!`
})
}
})
})
.catch(() => {
})
},
downloadFile(item) {
ipcRenderer.send('save-as', item.fileFullPath, item.fileShowName)
},
deleteTalk(item) {
deleteSmarttalk(item.id).then((res) => {
if (res.data === true) {
this.$emit('on-delete', item)
}
})
},
closePopver(index) {
console.log(this.$refs['popover_' + index])
this.$refs['popover_' + index].hide()
},
moveSmarttalkFun(item) {
this.$emit('on-move', item)
},
formatFileSize(fileSize) {
if (fileSize < 1024) {
return fileSize + 'B'
} else if (fileSize < 1024 * 1024) {
let temp = fileSize / 1024
temp = temp.toFixed(2)
return temp + 'KB'
} else if (fileSize < 1024 * 1024 * 1024) {
let temp = fileSize / (1024 * 1024)
temp = temp.toFixed(2)
return temp + 'MB'
} else {
let temp = fileSize / (1024 * 1024 * 1024)
temp = temp.toFixed(2)
return temp + 'GB'
}
},
openFileWin(item) {
isHaveLocalFile(item.fileNewName).then((res) => {
if (res === true) {
ipcRenderer.send('open-path-app', item.fileNewName)
} else {
item.async = 'on'
ipcRenderer.once('download-file-default' + item.fileNewName, (e, isSuccess) => {
item.async = isSuccess
})
ipcRenderer.send('download-file-default', {
url: item.fileFullPath,
fileName: item.fileNewName
})
}
})
}
}
}
</script>
<style>
.prepare-item-info-message {
.circular {
width: 100% !important;
}
}
</style>
<style scoped lang="scss">
.prepare-body-main-item {
display: flex;
align-items: center;
border-bottom: 1px solid rgba(131, 131, 127, 0.17);
padding: 10px 0;
&:hover {
background-color: rgba(144, 147, 153, 0.2);
cursor: pointer;
}
.prepare-body-main-item-icon {
width: 80px;
display: flex;
justify-content: center;
align-items: center;
}
.prepare-body-main-item-tool {
font-size: 18px !important;
font-weight: bold;
width: 40px;
text-align: center;
}
.prepare-body-main-item-info {
display: flex;
flex-direction: column;
min-width: 0;
flex: 1;
.prepare-item-info-title {
text-align: left;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.prepare-item-info-message {
font-size: 12px;
line-height: 23px;
color: #909399;
display: flex;
.circular {
width: 100% !important;
}
}
}
}
</style>

View File

@ -0,0 +1,81 @@
<template>
<div class="file-oper-batch-wrap">
<div style="margin: 0 20px; line-height: 40px">
<el-checkbox
v-model="isCheckAll"
:indeterminate="indeterminate"
@change="handleCheckAllChange"
/>&nbsp;{{ choose.length }}
</div>
<el-button>导出</el-button>
<el-button @click="moveFile">移动</el-button>
<el-button @click="deleteFile">删除</el-button>&nbsp;&nbsp;|
<el-button @click="cancel">取消</el-button>
</div>
</template>
<script>
import { deleteSmarttalkBatch } from '@/api/file'
export default {
name: 'FileOperBatch',
props: {
indeterminate: {
type: Boolean,
default: function () {
return false
}
},
checkAll: {
type: Boolean,
default: function () {
return false
}
},
choose: {
type: Array,
default: function () {
return []
}
}
},
emits: { 'click-choose': null, cancel: null, 'click-delete': null, 'click-move': null },
computed: {
isCheckAll: {
get() {
return this.checkAll
},
set() {}
}
},
methods: {
handleCheckAllChange(value) {
this.$emit('click-choose', value)
},
cancel() {
this.$emit('cancel')
},
deleteFile() {
let ids = this.choose.map((item) => item.id)
deleteSmarttalkBatch(ids).then((res) => {
this.$emit('click-delete', res, ids)
})
},
moveFile() {
this.$emit('click-move')
}
}
}
</script>
<style scoped lang="scss">
.file-oper-batch-wrap {
width: 100%;
height: 40px;
background-color: white;
position: absolute;
bottom: 0;
z-index: 9;
box-shadow: 0 -2px 10px #aaa;
display: flex;
align-items: center;
}
</style>

View File

@ -1,10 +1,10 @@
<template>
<div v-loading="isLoading" class="page-resource flex">
<ChooseTextbook @change-book="changeBook" @node-click="nodeClick" />
<ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" />
<div class="page-right">
<div class="prepare-body-header">
<div>
<label style="font-size: 15px">52个文件</label>&nbsp;
<label style="font-size: 15px">{{ currentFileList.length }}个文件</label>&nbsp;
<el-popover placement="top-start" :width="250" trigger="hover">
<template #default>
<div>
@ -33,123 +33,61 @@
<el-button type="primary" style="margin-left: 10px">新建课件</el-button>
</div>
</div>
<div class="prepare-body-main">
<div v-for="(item, index) in currentFileList" :key="index" class="prepare-body-main-item">
<div class="prepare-body-main-item-icon" @click="openFileWin(item)">
<FileImage :size="50" :file-name="item.fileShowName" />
</div>
<div class="prepare-body-main-item-info" @click="openFileWin(item)">
<div class="prepare-item-info-title" :title="item.fileShowName">
{{ item.fileShowName }}
</div>
<div class="prepare-item-info-message">
<div style="width: 80px">
<el-icon
v-loading="item.async === 'on'"
style="background-color: green; border-radius: 20px; color: white; top: 2px"
<el-checkbox-group
v-model="checkFileList"
class="prepare-body-main"
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
>
<Check v-if="item.async === true" />
<UploadFilled v-if="!item.async" />
</el-icon>
{{ item.async === true ? '已同步' : '' }}
{{ !item.async ? '待同步' : '' }}
{{ item.async === 'on' ? '同步中' : '' }}
</div>
|
<div style="width: 80px">{{ formatFileSize(item.fileSize) }}</div>
|
<div style="width: 100px">{{ toTimeText(item.uploadTime, true) }}</div>
|
<div
style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
:title="
item.levelFirstName +
(item.levelSecondName ? ' > ' + item.levelSecondName : '') +
(item.levelThirdNmae ? ' > ' + item.levelThirdNmae : '')
"
<file-list-item
v-for="(item, index) in currentFileList"
:key="index"
:item="item"
:index="index"
@on-move="onMoveSingleFile"
@on-delete="deleteTalk"
>
{{
item.levelFirstName +
(item.levelSecondName ? ' > ' + item.levelSecondName : '') +
(item.levelThirdNmae ? ' > ' + item.levelThirdNmae : '')
}}
</div>
</div>
</div>
<div class="prepare-body-main-item-tool">
<el-popover
:ref="'popover_' + index"
placement="left-start"
:hide-after="100"
popper-class="prepare-popper"
trigger="click"
>
<template #default>
<div style="width: 100%">
<div class="item-popover" @click="closePopver(index)">
<div class="item-popover-item">
<el-button text @click="editTalk(item, index)">
<i class="iconfont icon-bianji"></i>
<span>重命名</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="deleteTalk(item)">
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="downloadFile(item)">
<i class="iconfont icon-xiazai"></i>
<span>下载</span>
</el-button>
</div>
<div class="item-popover-item">
<el-button text @click="isMoveDialogOpen = true">
<el-icon>
<Switch />
</el-icon>
<span>移动</span>
</el-button>
</div>
</div>
</div>
</template>
<template #reference>
<span class="iconfont icon-shenglvehao" style="cursor: pointer" @click.stop></span>
</template>
</el-popover>
</div>
</div>
</div>
<el-checkbox label="" :value="item" />
</file-list-item>
</el-checkbox-group>
<file-oper-batch
v-show="checkFileList.length > 0"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
:choose="checkFileList"
:check-all="isCheckAll"
@click-delete="clickDelete"
@click-move="clickMove"
@cancel="checkFileList = []"
@click-choose="clickChoose"
></file-oper-batch>
</div>
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
</div>
</template>
<script setup>
import { Check, UploadFilled, Switch } from '@element-plus/icons-vue'
import { Check } from '@element-plus/icons-vue'
</script>
<script>
import ChooseTextbook from '@/components/choose-textbook/index.vue'
import uploadDialog from '@/components/upload-dialog/index.vue'
import { Refresh } from '@element-plus/icons-vue'
import uploaderState from '@/store/modules/uploader'
import FileImage from '@/components/file-image/index.vue'
import MoveFile from '@/components/move-file/index.vue'
import { deleteSmarttalk, getSmarttalkPage, updateSmarttalk, moveSmarttalk } from '@/api/file'
import FileListItem from '@/views/prepare/container/file-list-item.vue'
import { getSmarttalkPage, moveSmarttalk } from '@/api/file'
import { toTimeText } from '@/utils/date'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ElMessage } from 'element-plus'
import { isHaveLocalFile } from '@/utils/talkFile'
import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
const { ipcRenderer } = window.electron || {}
export default {
name: 'Prepare',
components: { ChooseTextbook, Refresh, uploadDialog, FileImage, MoveFile },
components: { ChooseTextbook, Refresh, uploadDialog, FileListItem, FileOperBatch, MoveFile },
data() {
return {
moveFile: [],
isMoveDialogOpen: false,
checkFileList: [],
asyncAllFileVisiable: false,
isLoading: false,
isDialogOpen: false,
@ -167,6 +105,13 @@ export default {
}
}
},
computed: {
isCheckAll() {
return (
this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
)
}
},
created() {
ipcRenderer.removeAllListeners('copy-file-default-reply')
ipcRenderer.on('copy-file-default-reply', (e, param) => {
@ -186,13 +131,34 @@ export default {
// let filePath = window.rootTalkFilePath + item.fileNewName
},
methods: {
onMoveSingleFile(item) {
this.moveFile = [item]
this.isMoveDialogOpen = true
},
clickMove() {
this.moveFile = this.checkFileList
this.isMoveDialogOpen = true
},
clickDelete(res, ids) {
if (res.data === true) {
ids.filter((id) => {
let index = this.currentFileList.findIndex(item=>{
return item.id === id
})
this.currentFileList.splice(index, 1)
})
this.checkFileList = []
}
},
clickChoose(value) {
this.checkFileList = value ? this.currentFileList : []
},
async asyncAllFile() {
this.lastAsyncAllTime = new Date()
localStorage.setItem('lastAsyncAllTime', this.lastAsyncAllTime)
let arr = []
this.asyncAllFileVisiable = true
const test = (item) => {
return new Promise((resolve, reject) => {
return new Promise((resolve) => {
isHaveLocalFile(item.fileNewName).then((res) => {
item.async = res
if (res === false) {
@ -216,90 +182,39 @@ export default {
}
this.asyncAllFileVisiable = false
},
openFileWin(item) {
isHaveLocalFile(item.fileNewName).then((res) => {
if (res === true) {
ipcRenderer.send('open-path-app', item.fileNewName)
} else {
item.async = 'on'
ipcRenderer.once('download-file-default' + item.fileNewName, (e, isSuccess) => {
item.async = isSuccess
})
ipcRenderer.send('download-file-default', {
url: item.fileFullPath,
fileName: item.fileNewName
})
}
})
},
formatFileSize(fileSize) {
if (fileSize < 1024) {
return fileSize + 'B'
} else if (fileSize < 1024 * 1024) {
let temp = fileSize / 1024
temp = temp.toFixed(2)
return temp + 'KB'
} else if (fileSize < 1024 * 1024 * 1024) {
let temp = fileSize / (1024 * 1024)
temp = temp.toFixed(2)
return temp + 'MB'
} else {
let temp = fileSize / (1024 * 1024 * 1024)
temp = temp.toFixed(2)
return temp + 'GB'
}
},
editTalk(item) {
ElMessageBox.prompt('请输入新的名称', '重命名', {
confirmButtonText: '确认',
cancelButtonText: '取消',
inputValue: item.fileShowName.substring(0, item.fileShowName.lastIndexOf('.'))
})
.then(({ value }) => {
item.fileShowName = value + '.' + item.fileSuffix
updateSmarttalk({ id: item.id, fileShowName: item.fileShowName }).then((res) => {
if (res.data === true) {
ElMessage({
type: 'success',
message: `修改成功!`
})
}
})
})
.catch(() => {})
},
downloadFile(item) {
ipcRenderer.send('save-as', item.fileFullPath, item.fileShowName)
},
deleteTalk(item) {
deleteSmarttalk(item.id).then((res) => {
if (res.data === true) {
let index = this.currentFileList.indexOf(item)
this.currentFileList.splice(index, 1)
}
})
},
closePopver(index) {
this.$refs['popover_' + index][0].hide()
},
chooseMoveCata(cataData, item) {
chooseMoveCata(cataData) {
let ids = this.moveFile.map((item) => item.id)
let params = {
id: item.id,
textBookId: cata.textBook.curBookId,
id: ids.join(),
textbookId: cataData.textBook.curBookId
}
let cata = this.parseCataByNode(cataData.node)
if (cata.length > 0) {
params.levelFirstId = cata[0];
}
if (cata.length > 1) {
params.levelSecondId = cata[1];
}
if (cata.length > 2) {
params.levelThirdId = cata[2];
if (
this.uploadData.levelFirstId == cata[0] &&
this.uploadData.levelSecondId == cata[1] &&
this.uploadData.levelThirdId == cata[2]
) {
ElMessage({
type: 'info',
message: `不能移动到现在的章节!`
})
return
}
params.levelFirstId = cata[0]
params.levelSecondId = cata[1]
params.levelThirdId = cata[2]
moveSmarttalk(params).then((res) => {
if (res.data === true) {
this.isMoveDialogOpen = false
ids.filter((id) => {
let index = this.currentFileList.findIndex((item)=>{
return item.id === id
})
this.currentFileList.splice(index, 1)
})
}
})
},
@ -332,16 +247,14 @@ export default {
}
console.log('File copied to:', filePath)
},
changeBook(data) {
this.nodeClick(data)
},
nodeClick(data) {
if (this.currentNode.id === data.node.id) return
this.checkFileList = []
let cata = this.parseCataByNode(data.node)
this.currentNode = data.node
this.uploadData.levelFirstId = cata.length > 0 ? cata[0] : ''
this.uploadData.levelSecondId = cata.length > 1 ? cata[1] : ''
this.uploadData.levelThirdId = cata.length > 2 ? cata[2] : ''
this.uploadData.levelFirstId = cata[0]
this.uploadData.levelSecondId = cata[1]
this.uploadData.levelThirdId = cata[2]
this.uploadData.textbookId = data.textBook.curBookId
this.isLoading = true
getSmarttalkPage({
@ -397,12 +310,6 @@ export default {
}
}
.prepare-item-info-message {
.circular {
width: 100% !important;
}
}
.prepare-body-header {
.circular {
width: 100% !important;
@ -416,6 +323,7 @@ export default {
height: 100%;
.page-right {
position: relative;
min-width: 0;
flex: 1;
margin-left: 20px;
@ -441,57 +349,7 @@ export default {
width: 100%;
overflow: auto;
padding: 0 30px;
.prepare-body-main-item {
&:hover {
background-color: rgba(144, 147, 153, 0.2);
cursor: pointer;
}
display: flex;
align-items: center;
border-bottom: 1px solid rgba(131, 131, 127, 0.17);
padding: 10px 0;
.prepare-body-main-item-icon {
width: 80px;
display: flex;
justify-content: center;
}
.prepare-body-main-item-tool {
font-size: 18px !important;
font-weight: bold;
width: 40px;
text-align: center;
}
.prepare-body-main-item-info {
display: flex;
flex-direction: column;
min-width: 0;
flex: 1;
.prepare-item-info-title {
text-align: left;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.prepare-item-info-message {
font-size: 12px;
line-height: 23px;
color: #909399;
display: flex;
.circular {
width: 100% !important;
}
}
}
}
line-height: normal;
}
}
}