Skip to content

P
pptist
Commit 69713159 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

parents a15fc2a0 45830ecc
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 206 deletions
src/views/SellTemplate/BrowsingHistory.vue
View file @ 69713159
<template>
<div class="q-px-md q-pt-lg column full-height">
<div class="q-px-md q-pt-lg column full-height" ref="currentRootDom">
<div class="q-pl-lg row q-mb-lg">
<div class="col row items-center q-pl-md">
<h5 class="row items-center">
......@@ -47,7 +47,7 @@
</el-dropdown> -->
</div>
</div>
<div ref="SellTemplateRef" class="col full-width q-ml-md">
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList
:current-menu="currentMenu"
......@@ -93,6 +93,7 @@
const deleteLoading = ref<any>(null);
const removeShareLoading = ref<any>(null);
const RefreshLoading = ref(false)
const currentRootDom = ref()
const datas = reactive({
selectedDatas: [] as Array,
selectAll: false as any,
......@@ -199,12 +200,13 @@
}
};
const refreshHandler = (obj:any) => {
currentRootDom.value.click()
if(obj){
if(obj.FileId) {
queryObj.FileId = obj.FileId
}
if(obj.OrderByType) queryObj.OrderByType = obj.OrderByType
if(obj.FileName) queryObj.FileName = obj.FileName
if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName
}
RefreshLoading.value = true;
queryObj.pageIndex = 1;
......@@ -229,27 +231,12 @@
</script>
<style lang="scss" scoped>
@import url("@/assets/styles/common.css");
.SelectAllBox {
position: relative;
top: 3px;
}
.journeyAds-container th {
background: #fff;
position: sticky;
top: 0px;
z-index: 2;
}
.journeyAds-container th {
border-bottom: 1px solid #f6f6f6;
}
.journeyAds-container th:first-child {
border: 0;
}
.active {
color: $themeColor;
.journeyAdsScrollbar {
::v-deep(.el-table__inner-wrapper::before){
width: 0px;
height: 0px;
}
}
</style>
\ No newline at end of file
src/views/SellTemplate/RecycleBin.vue
View file @ 69713159
<template>
<div class="q-px-md q-pt-lg column full-height">
<div class="q-px-md q-pt-lg column full-height" ref="currentRootDom">
<div class="q-pl-lg row q-mb-lg">
<div class="col row items-center q-pl-md">
<h5 class="row items-center">
......@@ -83,6 +83,7 @@
const searchData = ref({} as any);
searchData.value = inject(injectKeyTemplate);
const RefreshLoading = ref(false)
const currentRootDom = ref()
const datas = reactive({
selectedDatas: [] as Array,
selectAll: false as any,
......@@ -188,13 +189,14 @@
}
};
const refreshHandler = (obj:any) => {
currentRootDom.value.click()
if(obj){
if(obj.FileId) {
queryObj.FileId = obj.FileId
datas.selectedDatas = []
}
if(obj.OrderByType) queryObj.OrderByType = obj.OrderByType
if(obj.FileName) queryObj.FileName = obj.FileName
if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName
if(obj.Navigations) Navigations.value = obj.Navigations
}
RefreshLoading.value = true;
......@@ -251,95 +253,11 @@
</script>
<style lang="scss" scoped>
@import url("@/assets/styles/common.css");
.SelectAllBox {
position: relative;
top: 3px;
}
.journeyAdsScrollbar {
::v-deep(.el-table__inner-wrapper::before){
width: 0px !important;
height: 0px !important;
left: initial !important;
bottom: initial !important;
}
}
.journeyAds-title {
}
.journeyAds-TitleCenter {
width: 100%;
height: 18px;
margin-bottom: 3px;
overflow: hidden; /* 隐藏超出部分 */
text-overflow: ellipsis; /* 显示省略号 */
white-space: wrap; /* 不换行 */
position: relative;
padding-right: 20px;
}
.journeyAds-TitleCenter span {
position: absolute;
right: 16px;
top: 0px;
}
.journeyAds-Input {
padding-right: 20px;
position: relative;
margin-bottom: 2px;
::v-deep(.el-textarea__inner) {
padding: 5px;
background: #f5f5f5;
}
}
.journeyAds-container {
position: relative;
overflow: auto;
}
.journeyAds-container th {
background: #fff;
position: sticky;
top: 0px;
z-index: 2;
}
.journeyAdsple-table td > div {
display: flex;
}
.journeyAdsple-table td,
.journeyAds-container th {
border-bottom: 1px solid #f6f6f6;
}
.journeyAdsple-table td:first-child,
.journeyAdsple-table td:nth-child(2),
.journeyAds-container th:first-child {
border: 0;
}
.journeyAdsple-table td {
padding-bottom: 6px;
}
.journeyAdsple-table td:nth-child(2) {
padding-bottom: 0;
}
.hoverShow {
opacity: 0;
}
.journeyAdsple-table:hover .hoverShow {
opacity: 1;
}
.share-icon-box{
position: relative;
}
.share-icon-box::after{
display: block;
position: absolute;
bottom: -4px;
right: 6px;
content: " ";
background: url('@/assets/img/share.png');
width: 14px;
height: 14px;
z-index: 2;
}
.active {
color: $themeColor;
::v-deep(.el-table__inner-wrapper::before){
width: 0px;
height: 0px;
}
}
</style>
\ No newline at end of file
src/views/SellTemplate/StarTarget.vue
View file @ 69713159
<template>
<div class="q-px-md q-pt-lg column full-height">
<div class="q-px-md q-pt-lg column full-height" ref="currentRootDom">
<div class="q-pl-lg row q-mb-lg">
<div class="col row items-center q-pl-md">
<h5 class="row items-center">
......@@ -52,7 +52,7 @@
</el-dropdown> -->
</div>
</div>
<div ref="SellTemplateRef" class="col full-width q-ml-md">
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList
:current-menu="currentMenu"
......@@ -128,6 +128,7 @@
const searchData = ref({} as any);
searchData.value = inject(injectKeyTemplate);
const RefreshLoading = ref(false)
const currentRootDom = ref()
const datas = reactive({
selectedDatas: [] as Array,
selectAll: false as any,
......@@ -260,13 +261,14 @@
}
};
const refreshHandler = (obj:any) => {
currentRootDom.value.click()
if(obj){
if(obj.FileId) {
queryObj.FileId = obj.FileId
datas.selectedDatas = []
}
if(obj.OrderByType) queryObj.OrderByType = obj.OrderByType
if(obj.FileName) queryObj.FileName = obj.FileName
if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName
if(obj.Navigations) Navigations.value = obj.Navigations
}
RefreshLoading.value = true;
......@@ -323,87 +325,11 @@
</script>
<style lang="scss" scoped>
@import url("@/assets/styles/common.css");
.SelectAllBox {
position: relative;
top: 3px;
}
.journeyAds-title {
}
.journeyAds-TitleCenter {
width: 100%;
height: 18px;
margin-bottom: 3px;
overflow: hidden; /* 隐藏超出部分 */
text-overflow: ellipsis; /* 显示省略号 */
white-space: wrap; /* 不换行 */
position: relative;
padding-right: 20px;
}
.journeyAds-TitleCenter span {
position: absolute;
right: 16px;
top: 0px;
}
.journeyAds-Input {
padding-right: 20px;
position: relative;
margin-bottom: 2px;
::v-deep(.el-textarea__inner) {
padding: 5px;
background: #f5f5f5;
}
}
.journeyAds-container {
position: relative;
overflow: auto;
}
.journeyAds-container th {
background: #fff;
position: sticky;
top: 0px;
z-index: 2;
}
.journeyAdsple-table td > div {
display: flex;
}
.journeyAdsple-table td,
.journeyAds-container th {
border-bottom: 1px solid #f6f6f6;
}
.journeyAdsple-table td:first-child,
.journeyAdsple-table td:nth-child(2),
.journeyAds-container th:first-child {
border: 0;
}
.journeyAdsple-table td {
padding-bottom: 6px;
}
.journeyAdsple-table td:nth-child(2) {
padding-bottom: 0;
}
.hoverShow {
opacity: 0;
}
.journeyAdsple-table:hover .hoverShow {
opacity: 1;
}
.share-icon-box{
position: relative;
}
.share-icon-box::after{
display: block;
position: absolute;
bottom: -4px;
right: 6px;
content: " ";
background: url('@/assets/img/share.png');
width: 14px;
height: 14px;
z-index: 2;
}
.active {
color: $themeColor;
.journeyAdsScrollbar {
::v-deep(.el-table__inner-wrapper::before){
width: 0px;
height: 0px;
}
}
</style>
\ No newline at end of file
src/views/SellTemplate/components/journeyAdsList.vue
View file @ 69713159
<template>
<el-table ref="currentRootDom" class="sample-table" :data="dataList" style="width: 100%" height="100%"
<el-table class="sample-table" :data="dataList" style="width: 100%"
@sort-change="sortHandler" :default-sort="{ prop: 'CreateTime', order: 'descending' }"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="20" v-if="currentMenu==3||currentMenu==4"/>
......@@ -250,7 +250,6 @@ import CopyFile from "./CopyFile.vue";
const removeShareLoading = ref<any>(null);
const editObj = reactive({});
const filterFileNameStatus = ref(false)
const currentRootDom = ref()
const showItemId = ref(0)
if(props.currentMenu==0){
datas.Title = '最近浏览'
......@@ -287,10 +286,9 @@ import CopyFile from "./CopyFile.vue";
}
const setFilterNameHandler = (t:0|1)=>{
filterFileNameStatus.value = false
if(!t) queryObj.FileName=''
currentRootDom.value.click()
if(!t) queryObj.value.FileName=''
let obj = {
FileName: queryObj.FileName
FileName: queryObj.value.FileName
}
emit('refreshHandler',obj)
}
......@@ -620,7 +618,8 @@ import CopyFile from "./CopyFile.vue";
})
</script>
<style>
<style lang="scss">
.journeyAds-Input {
padding-right: 20px;
position: relative;
......
src/views/SellTemplate/journeyAds.vue
View file @ 69713159
<template>
<div class="q-px-md q-pt-lg column full-height">
<div class="q-px-md q-pt-lg column full-height" ref="currentRootDom">
<div class="q-pl-lg row q-mb-lg">
<div class="col row items-center q-pl-md">
<h5 class="row items-center">
......@@ -70,7 +70,7 @@
<el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;">
</el-scrollbar>
</div> -->
<div ref="SellTemplateRef" class="col full-width q-ml-md">
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList
:current-menu="currentMenu"
......@@ -147,6 +147,7 @@ const NewDataList = ref([] as Array<any>);
const searchData = ref({} as any);
searchData.value = inject(injectKeyTemplate);
const RefreshLoading = ref(false)
const currentRootDom = ref()
const datas = reactive({
selectedDatas: [] as Array,
selectAll: false as any,
......@@ -278,6 +279,7 @@ const scrollingHandler = () => {
}
};
const refreshHandler = (obj:any) => {
currentRootDom.value.click()
if(obj){
if(obj.FileId) {
queryObj.FileId = obj.FileId
......@@ -341,5 +343,10 @@ querySearchHandler();
</script>
<style lang="scss" scoped>
.journeyAdsScrollbar {
::v-deep(.el-table__inner-wrapper::before){
width: 0px;
height: 0px;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment