Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pptist
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
pptist
Commits
b9fb7b10
Commit
b9fb7b10
authored
Feb 27, 2024
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 移动 复制bug
parent
149072dc
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
27 deletions
+29
-27
RecycleBin.vue
src/views/SellTemplate/RecycleBin.vue
+3
-0
Share.vue
src/views/SellTemplate/Share.vue
+7
-4
CopyFile.vue
src/views/SellTemplate/components/CopyFile.vue
+5
-2
TreeFile.vue
src/views/SellTemplate/components/TreeFile.vue
+3
-1
TreeFileRecover.vue
src/views/SellTemplate/components/TreeFileRecover.vue
+4
-7
journeyAdsList.vue
src/views/SellTemplate/components/journeyAdsList.vue
+7
-13
No files found.
src/views/SellTemplate/RecycleBin.vue
View file @
b9fb7b10
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
<span
class=
"pointer"
@
click=
"queryObj.FileId=0,refreshHandler()"
>
<span
class=
"pointer"
@
click=
"queryObj.FileId=0,refreshHandler()"
>
回收站
回收站
</span>
</span>
<breadPeeling
v-if=
"queryObj.FileId"
:navigations=
"Navigations"
@
Inquire=
"breadPeelingInquire"
></breadPeeling>
</span>
</span>
</h5>
</h5>
<div
class=
"select-btn q-pl-lg pointer q-mt-sm"
>
<div
class=
"select-btn q-pl-lg pointer q-mt-sm"
>
...
@@ -60,6 +62,7 @@
...
@@ -60,6 +62,7 @@
import
{
useSellTemplateStore
,
useScreenStore
,
useSlidesStore
}
from
"@/store"
;
import
{
useSellTemplateStore
,
useScreenStore
,
useSlidesStore
}
from
"@/store"
;
import
{
ApiResult
}
from
"@/configs/axios"
;
import
{
ApiResult
}
from
"@/configs/axios"
;
import
journeyAdsList
from
"./components/journeyAdsList.vue"
;
import
journeyAdsList
from
"./components/journeyAdsList.vue"
;
import
breadPeeling
from
"./components/breadPeeling.vue"
;
const
SalesEditorStore
=
useSellTemplateStore
();
const
SalesEditorStore
=
useSellTemplateStore
();
const
marketStore
=
useScreenStore
();
const
marketStore
=
useScreenStore
();
...
...
src/views/SellTemplate/Share.vue
View file @
b9fb7b10
...
@@ -61,7 +61,8 @@
...
@@ -61,7 +61,8 @@
<img
src=
"@/assets/img/file.png"
height=
"25"
v-else
/>
<img
src=
"@/assets/img/file.png"
height=
"25"
v-else
/>
<div
class=
"temp-tr col q-ml-md file-name"
:class=
"
{'cusor-pointer':scope.row.FileType==0}" @click="changeFolderHandler(scope.row)">
<div
class=
"temp-tr col q-ml-md file-name"
:class=
"
{'cusor-pointer':scope.row.FileType==0}" @click="changeFolderHandler(scope.row)">
<el-tooltip
effect=
"dark"
:content=
"scope.row.FileName"
>
<el-tooltip
effect=
"dark"
:content=
"scope.row.FileName"
>
{{
scope
.
row
.
FileName
}}
<div
truncated
v-html=
"scope.row.FileName.replaceAll(lastKeyword,`
<span
class=
'text-waring'
>
${lastKeyword}
</span>
`)">
</div>
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
</div>
...
@@ -77,13 +78,13 @@
...
@@ -77,13 +78,13 @@
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<div
class=
"row items-center"
:class=
"
{'hover':showItemId!=scope.row.FileId}">
<div
class=
"row items-center"
:class=
"
{'hover':showItemId!=scope.row.FileId}">
<el-button
type=
"primary"
icon=
"View"
size=
"small"
@
click
.
stop=
"openFileDocument(scope.row)"
v-if=
"scope.row.FileType!=0"
>
查看
</el-button>
<el-button
type=
"primary"
icon=
"View"
size=
"small"
@
click
.
stop=
"openFileDocument(scope.row)"
v-if=
"scope.row.FileType!=0"
>
查看
</el-button>
<el-dropdown
class=
"q-pl-md cusor-pointer"
trigger=
"click"
@
visible-change=
"(val:boolean)=>dropdownChange(val,scope.row.FileId)"
>
<el-dropdown
v-if=
"scope.row.FileType"
class=
"q-pl-md cusor-pointer"
trigger=
"click"
@
visible-change=
"(val:boolean)=>dropdownChange(val,scope.row.FileId)"
>
<el-icon
size=
"16"
color=
"#b1b7cf"
><MoreFilled
/></el-icon>
<el-icon
size=
"16"
color=
"#b1b7cf"
><MoreFilled
/></el-icon>
<template
#
dropdown
>
<template
#
dropdown
>
<el-dropdown-menu
class=
"q-pa-md"
>
<el-dropdown-menu
class=
"q-pa-md"
>
<el-dropdown-item
v-if=
"scope.row.IsEdit && scope.row.FileType!=0"
icon=
"EditPen"
@
click=
"editorFileHandler(scope.row)"
>
编辑
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.IsEdit && scope.row.FileType!=0"
icon=
"EditPen"
@
click=
"editorFileHandler(scope.row)"
>
编辑
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.IsDownload && scope.row.FileType!=0"
icon=
"Download"
@
click=
"exportDocument(scope.row)"
>
导出
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.IsDownload && scope.row.FileType!=0"
icon=
"Download"
@
click=
"exportDocument(scope.row)"
>
导出
</el-dropdown-item>
<el-dropdown-item
icon=
"Copy
"
v-if=
"scope.row.IsView
"
@
click=
"openCopyHandler(scope.row)"
>
复制到
</el-dropdown-item>
<el-dropdown-item
icon=
"Copy
Document"
v-if=
"scope.row.IsView&&scope.row.FileType
"
@
click=
"openCopyHandler(scope.row)"
>
复制到
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown-menu>
</
template
>
</
template
>
</el-dropdown>
</el-dropdown>
...
@@ -148,6 +149,7 @@ const tempFilterName = ref('')
...
@@ -148,6 +149,7 @@ const tempFilterName = ref('')
const
currentRootDom
=
ref
()
const
currentRootDom
=
ref
()
const
hgihlightId
=
ref
(
0
)
const
hgihlightId
=
ref
(
0
)
const
dataTableRef
=
ref
()
const
dataTableRef
=
ref
()
const
lastKeyword
=
ref
(
''
)
const
backInquireHandler
=
()
=>
{
const
backInquireHandler
=
()
=>
{
let
Navigation
=
navigations
.
value
[
navigations
.
value
.
length
-
2
];
let
Navigation
=
navigations
.
value
[
navigations
.
value
.
length
-
2
];
...
@@ -182,6 +184,7 @@ const editorFileHandler = (item:any)=>{
...
@@ -182,6 +184,7 @@ const editorFileHandler = (item:any)=>{
marketStore
.
setMarket
(
false
);
marketStore
.
setMarket
(
false
);
}
}
const
getDocumentData
=
async
()
=>
{
const
getDocumentData
=
async
()
=>
{
lastKeyword
.
value
=
queryObj
.
FileName
if
(
loading
.
value
)
return
if
(
loading
.
value
)
return
loading
.
value
=
true
loading
.
value
=
true
try
{
try
{
...
@@ -318,7 +321,7 @@ watch(() => props.position,(n,o)=>{
...
@@ -318,7 +321,7 @@ watch(() => props.position,(n,o)=>{
checkPositionHandler
(
props
.
position
)
checkPositionHandler
(
props
.
position
)
getDocumentData
()
getDocumentData
()
</
script
>
</
script
>
<
style
>
<
style
lang=
"scss"
>
.el-table
.el-table__cell
{
.el-table
.el-table__cell
{
padding
:
0
;
padding
:
0
;
}
}
...
...
src/views/SellTemplate/components/CopyFile.vue
View file @
b9fb7b10
...
@@ -228,9 +228,12 @@ const CopyId = async () => {
...
@@ -228,9 +228,12 @@ const CopyId = async () => {
deleteLoading
.
value
=
null
;
deleteLoading
.
value
=
null
;
};
};
const
getFile
=
async
()
=>
{
const
getFile
=
async
()
=>
{
console
.
log
(
props
.
details
)
let
FileType
if
(
props
.
details
.
FileType
>
0
)
FileType
=
props
.
details
.
FileType
else
FileType
=
props
.
details
.
FolderType
console
.
log
(
FileType
,
'-----'
)
let
querys
=
{
let
querys
=
{
FileType
:
props
.
details
.
Folder
Type
,
FileType
:
File
Type
,
};
};
let
pageRes
=
await
FolderService
.
GetMyFolderTree
(
querys
);
let
pageRes
=
await
FolderService
.
GetMyFolderTree
(
querys
);
if
(
pageRes
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
if
(
pageRes
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
...
...
src/views/SellTemplate/components/TreeFile.vue
View file @
b9fb7b10
...
@@ -208,8 +208,10 @@ import FolderService from "@/services/FolderService";
...
@@ -208,8 +208,10 @@ import FolderService from "@/services/FolderService";
}
}
const
getFile
=
async
()
=>
{
const
getFile
=
async
()
=>
{
let
FileType
=
props
.
details
.
FileType
>
0
?
props
.
details
.
FileType
:
props
.
details
.
FolderType
if
(
props
.
setFileList
&&
props
.
setFileList
.
length
>
0
)
FileType
=
props
.
fileType
let
querys
=
{
let
querys
=
{
FileType
:
props
.
f
ileType
FileType
:
F
ileType
}
}
let
pageRes
=
await
FolderService
.
GetMyFolderTree
(
querys
);
let
pageRes
=
await
FolderService
.
GetMyFolderTree
(
querys
);
if
(
pageRes
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
if
(
pageRes
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
...
...
src/views/SellTemplate/components/TreeFileRecover.vue
View file @
b9fb7b10
...
@@ -138,11 +138,7 @@ import FolderService from "@/services/FolderService";
...
@@ -138,11 +138,7 @@ import FolderService from "@/services/FolderService";
return
data
.
FileName
.
includes
(
value
)
return
data
.
FileName
.
includes
(
value
)
}
}
const
save
=
()
=>
{
const
save
=
()
=>
{
let
title
=
''
let
title
=
props
.
details
.
FileName
let
Ids
=
''
title
=
props
.
details
.
FileName
Ids
=
props
.
details
.
FileId
ElMessageBox
.
confirm
(
`此操作将
${
title
}
恢复到
${
datas
.
FolderObj
.
FileName
}
,是否确定?`
,
"提示"
,
{
ElMessageBox
.
confirm
(
`此操作将
${
title
}
恢复到
${
datas
.
FolderObj
.
FileName
}
,是否确定?`
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
...
@@ -151,8 +147,9 @@ import FolderService from "@/services/FolderService";
...
@@ -151,8 +147,9 @@ import FolderService from "@/services/FolderService";
.
then
(
async
()
=>
{
.
then
(
async
()
=>
{
try
{
try
{
let
queryMsg
=
{
let
queryMsg
=
{
Id
s
:
Ids
,
Id
:
props
.
details
.
FileId
,
Folderld
:
datas
.
FolderId
,
Folderld
:
datas
.
FolderId
,
FileType
:
props
.
details
.
FileType
};
};
deleteLoading
.
value
=
ElLoading
.
service
({
deleteLoading
.
value
=
ElLoading
.
service
({
lock
:
true
,
lock
:
true
,
...
@@ -183,7 +180,7 @@ import FolderService from "@/services/FolderService";
...
@@ -183,7 +180,7 @@ import FolderService from "@/services/FolderService";
const
getFile
=
async
()
=>
{
const
getFile
=
async
()
=>
{
let
querys
=
{
let
querys
=
{
FileType
:
props
.
details
.
FileType
FileType
:
props
.
details
.
FileType
>
0
?
props
.
details
.
FileType
:
props
.
details
.
FolderType
}
}
let
pageRes
=
await
FolderService
.
GetMyFolderTree
(
querys
);
let
pageRes
=
await
FolderService
.
GetMyFolderTree
(
querys
);
if
(
pageRes
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
if
(
pageRes
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
...
...
src/views/SellTemplate/components/journeyAdsList.vue
View file @
b9fb7b10
...
@@ -84,6 +84,7 @@
...
@@ -84,6 +84,7 @@
<span>
{{
scope
.
row
.
IsCollect
?
'取消收藏'
:
'收藏'
}}
</span>
<span>
{{
scope
.
row
.
IsCollect
?
'取消收藏'
:
'收藏'
}}
</span>
</span>
</span>
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.FileType!=0&¤tMenu!=-1"
icon=
"Download"
@
click=
"exportDocument(scope.row)"
>
导出
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.FileType"
icon=
"CopyDocument"
@
click
.
stop=
"CopyTo(scope.row)"
>
复制到
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.FileType"
icon=
"CopyDocument"
@
click
.
stop=
"CopyTo(scope.row)"
>
复制到
</el-dropdown-item>
<el-dropdown-item
icon=
"Delete"
@
click=
"editDelete(scope.row,1)"
>
删除
</el-dropdown-item>
<el-dropdown-item
icon=
"Delete"
@
click=
"editDelete(scope.row,1)"
>
删除
</el-dropdown-item>
</
template
>
</
template
>
...
@@ -91,18 +92,6 @@
...
@@ -91,18 +92,6 @@
</el-dropdown-menu>
</el-dropdown-menu>
</template>
</template>
</el-dropdown>
</el-dropdown>
<!--
<el-button type="primary" icon="View" size="small" @click.stop="openFileDocument(scope.row)" v-if="scope.row.FileType!=0">查看</el-button>
<el-dropdown class="q-pl-md cusor-pointer" trigger="click" @visible-change="(val:boolean)=>dropdownChange(val,scope.row.FileId)">
<el-icon size="16" color="#b1b7cf"><MoreFilled /></el-icon>
<template #dropdown>
<el-dropdown-menu class="q-pa-md">
<el-dropdown-item v-if="scope.row.IsEdit && scope.row.FileType!=0" icon="EditPen" @click="editorFileHandler(scope.row)">编辑</el-dropdown-item>
<el-dropdown-item v-if="scope.row.IsDownload && scope.row.FileType!=0" icon="Download" @click="exportDocument(scope.row)">导出</el-dropdown-item>
<el-dropdown-item icon="Copy" v-if="scope.row.IsView" @click="openCopyHandler(scope.row)">复制到</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown> -->
</div>
</div>
</template>
</template>
</el-table-column>
</el-table-column>
...
@@ -150,7 +139,7 @@
...
@@ -150,7 +139,7 @@
<TreeFileRecover
v-if=
"isTreeFileRecover"
<TreeFileRecover
v-if=
"isTreeFileRecover"
:details=
"journeyAdsDetails"
:details=
"journeyAdsDetails"
:file-type=
"
journeyAdsDetails
.FileType"
:file-type=
"
queryObj
.FileType"
@
close=
"() => {journeyAdsDetails = '';isTreeFileRecover=false}"
@
close=
"() => {journeyAdsDetails = '';isTreeFileRecover=false}"
@
success=
"() => {
@
success=
"() => {
journeyAdsDetails = '';
journeyAdsDetails = '';
...
@@ -274,6 +263,11 @@ import CopyFile from "./CopyFile.vue";
...
@@ -274,6 +263,11 @@ import CopyFile from "./CopyFile.vue";
datas
.
emptyTitle
=
'没有删除文档'
datas
.
emptyTitle
=
'没有删除文档'
}
}
const
exportDocument
=
(
item
:
any
)
=>
{
let
url
=
`http://fileservice.oytour.com/api/img/
${
item
.
FileId
}
/1/png/1`
if
(
item
.
FileType
==
1
)
url
=
`http://fileservice.oytour.com/api/pdf/
${
item
.
FileId
}
`
window
.
open
(
url
);
}
const
viewTemplate
=
(
row
:
any
)
=>
{
const
viewTemplate
=
(
row
:
any
)
=>
{
let
param
=
query
()
let
param
=
query
()
const
url
=
`
${
process
.
env
.
VUE_APP_SHARE_URL
}
/?uid=
${
param
.
uid
}
&sellId=
${
row
.
FileId
}
&LogId=0&ViewSlideshow=1`
const
url
=
`
${
process
.
env
.
VUE_APP_SHARE_URL
}
/?uid=
${
param
.
uid
}
&sellId=
${
row
.
FileId
}
&LogId=0&ViewSlideshow=1`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment