Skip to content

P
pptist
Commit af929ab8 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 1323bdaf
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 38 deletions
src/components/CloudDisk/index.vue
View file @ af929ab8
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<div class="CloudDisk-L-Center fz14"> <div class="CloudDisk-L-Center fz14">
<div class="CloudDisk-L-Title row flex-between cusor-pointer" <div class="CloudDisk-L-Title row flex-between cusor-pointer"
v-for="(item,index) in GroupList" :key="index" @click="Search(item)" v-for="(item,index) in GroupList" :key="index" @click="Search(item)"
:class="[GroupId==item.Id?'active':'']"> :class="[queryObj.CloudGroupId==item.Id?'active':'']">
<span class="black">{{item.GName}}</span> <span class="block">{{item.GName}}</span>
<div class="row"> <div class="row">
<template v-if="item.Id"> <template v-if="item.Id">
<el-dropdown class="q-pl-lg" trigger="click"> <el-dropdown class="q-pl-lg" trigger="click">
...@@ -56,9 +56,12 @@ ...@@ -56,9 +56,12 @@
</FileInput> </FileInput>
<template v-for="(item,index) in dataList"> <template v-for="(item,index) in dataList">
<div class="CloudDisk-R-Box"> <div class="CloudDisk-R-Box"
:class="[ImgId==item.DetailsId?'active':'']" @click="setImg(item)">
<div class="CloudDisk-R-Img"> <div class="CloudDisk-R-Img">
<el-image <el-image :src="item.FilePath" style="width: 80px; height: 80px"
fit="cover"/>
<!-- <el-image
style="width: 80px; height: 80px" style="width: 80px; height: 80px"
:src="item.FilePath" :src="item.FilePath"
:zoom-rate="1.2" :zoom-rate="1.2"
...@@ -67,9 +70,9 @@ ...@@ -67,9 +70,9 @@
:preview-src-list="[item.FilePath]" :preview-src-list="[item.FilePath]"
:initial-index="4" :initial-index="4"
fit="cover" fit="cover"
/> /> -->
</div> </div>
<span>{{item.FileName}}</span> <span class="title block">{{item.FileName}}</span>
</div> </div>
</template> </template>
</div> </div>
...@@ -118,6 +121,7 @@ const queryObj = reactive({ ...@@ -118,6 +121,7 @@ const queryObj = reactive({
CloudGroupId: '', CloudGroupId: '',
FileName: '', FileName: '',
}) })
const ImgId= ref('')
const GName= ref('') const GName= ref('')
const addEditMsg = reactive({ const addEditMsg = reactive({
Id: '', Id: '',
...@@ -133,7 +137,18 @@ const GroupList = ref([] as any) ...@@ -133,7 +137,18 @@ const GroupList = ref([] as any)
const setLoading = ref(false) const setLoading = ref(false)
const deleteLoading = ref<any>(null) const deleteLoading = ref<any>(null)
const emit = defineEmits<{
(event: 'setImg'): void
}>()
const setImg = (item:any) => {
ImgId.value = item.DetailsId
console.log(item.FilePath,'----')
emit('getImg',item.FilePath)
}
const insertImageElement = async (files: FileList) => { const insertImageElement = async (files: FileList) => {
let parms = { let parms = {
isppt: '1', isppt: '1',
uid: token.value, uid: token.value,
...@@ -231,7 +246,7 @@ const querySearchGroup = async () =>{ ...@@ -231,7 +246,7 @@ const querySearchGroup = async () =>{
} }
const Search = (item:any) =>{ const Search = (item:any) =>{
if(item) GroupId.value = item.Id if(item) queryObj.CloudGroupId = item.Id
queryObj.pageIndex = 1 queryObj.pageIndex = 1
querySearchHandler() querySearchHandler()
} }
...@@ -272,7 +287,7 @@ const scrollingHandler = () =>{ ...@@ -272,7 +287,7 @@ const scrollingHandler = () =>{
} }
querySearchGroup() querySearchGroup()
querySearchHandler()
onMounted(()=>{ onMounted(()=>{
imgRef.value.addEventListener("scroll", scrollingHandler); imgRef.value.addEventListener("scroll", scrollingHandler);
}) })
...@@ -361,13 +376,6 @@ onMounted(()=>{ ...@@ -361,13 +376,6 @@ onMounted(()=>{
} }
.CloudDisk-R-Box{ .CloudDisk-R-Box{
width: 80px; width: 80px;
font-family: PingFang SC;
font-weight: 400;
font-size: 14px;
color: #000000;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 26px; margin-left: 26px;
margin-bottom: 24px; margin-bottom: 24px;
} }
...@@ -375,11 +383,32 @@ onMounted(()=>{ ...@@ -375,11 +383,32 @@ onMounted(()=>{
width: 80px; width: 80px;
height: 80px; height: 80px;
margin-bottom: 9px; margin-bottom: 9px;
border-radius: 8px;
overflow: hidden;
} }
.CloudDisk-R-Img .el-image{ .CloudDisk-R-Img .el-image{
border-radius: 8px; width: 76px;
}
.title{
width: 80px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-family: PingFang SC;
font-weight: 400;
font-size: 14px;
color: #000000;
} }
.CloudDisk-L-Center,.CloudDisk-R-Center{ .CloudDisk-L-Center,.CloudDisk-R-Center{
max-height: 400px; max-height: 400px;
} }
.CloudDisk-R-Box.active .CloudDisk-R-Img{
width: 80px;
height: 80px;
background: #8790F3;
box-shadow: 0px 0px 13px 0px #0D3EBC;
border-radius: 8px;
border: 2px solid #3556F9;
}
</style> </style>
\ No newline at end of file
src/views/Editor/Toolbar/ElementTemplateData.vue
View file @ af929ab8
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/> />
</el-select> </el-select>
</div> </div>
<template v-if="searchData.TemplateType!=2"> <template v-if="searchData.TemplateType!=2&&userInfo.isp">
<p class="q-mt-md"><span class="Required q-mr-md">*</span>页面类型：</p> <p class="q-mt-md"><span class="Required q-mr-md">*</span>页面类型：</p>
<div class="row wrap q-mt-md"> <div class="row wrap q-mt-md">
<el-select v-model="datas.DataSource.pageType" class="m-2" <el-select v-model="datas.DataSource.pageType" class="m-2"
......
src/views/TemplateCenter/colour.vue
View file @ af929ab8
...@@ -51,25 +51,22 @@ ...@@ -51,25 +51,22 @@
:selectable="selectable" :reserve-selection="true"/> :selectable="selectable" :reserve-selection="true"/>
<el-table-column label="颜色分类"> <el-table-column label="颜色分类">
<template #default="scope"> <template #default="scope">
<span v-html="queryObj.Name!=''&&scope.row.ColorName?(scope.row.ColorName.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.ColorName"></span> <span v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></span>
<!-- {{scope.row.ColorName?scope.row.ColorName:''}} -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="datas.type==1?'颜色名称':'名称'"> <el-table-column label="颜色名称">
<template #default="scope"> <template #default="scope">
<div v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></div> <div v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></div>
<!-- {{scope.row.Name}} -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="色值"> <el-table-column label="色值">
<template #default="scope"> <template #default="scope">
<el-tag <el-tag
:color="scope.row.ColorValue" :color="scope.row.Content"
effect="dark" class="q-mr-md"> effect="dark" class="q-mr-md">
&nbsp; &nbsp;
</el-tag> </el-tag>
<span v-html="queryObj.Name!=''&&scope.row.ColorValue?(scope.row.ColorValue.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.ColorValue"></span> <span v-html="queryObj.Name!=''&&scope.row.Content?(scope.row.Content.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Content"></span>
<!-- {{scope.row.ColorValue}} -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="130"> <el-table-column label="操作" width="130">
...@@ -79,6 +76,36 @@ ...@@ -79,6 +76,36 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <el-table v-loading="loading" ref="dataTableRef" highlight-current-row
v-load-more="tableScrollHandler" :data="dataList" class="tableHBEbeef5 col" height="82vh">
<el-table-column label="分类">
<template #default="scope">
-
</template>
</el-table-column>
<el-table-column label="颜色名称">
<template #default="scope">
<div v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></div>
</template>
</el-table-column>
<el-table-column label="色值">
<template #default="scope">
<el-tag
:color="scope.row.Content"
effect="dark" class="q-mr-md">
&nbsp;
</el-tag>
{{scope.row.Content}}
</template>
</el-table-column>
<el-table-column label="操作" width="130">
<template #default="scope">
<el-button type="default" link :icon="Edit" size="small" @click.stop="editDelete(scope.row)">编辑</el-button>
<el-button type="default" link :icon="Edit" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table> -->
<!-- 编辑颜色 --> <!-- 编辑颜色 -->
<el-dialog v-model="datas.addEditVisible" :align-center="true" <el-dialog v-model="datas.addEditVisible" :align-center="true"
:show-close="true" :close-on-press-escape="false" :show-close="true" :close-on-press-escape="false"
...@@ -380,9 +407,9 @@ ...@@ -380,9 +407,9 @@
}else{ }else{
datas.params = JSON.parse(JSON.stringify(item)) datas.params = JSON.parse(JSON.stringify(item))
datas.params.Code = item.Code?Number(item.Code):'' datas.params.Code = item.Code?Number(item.Code):''
datas.params.Content = item.ColorValue datas.params.Content = item.Content
datas.type = item.ChildList&&item.ChildList.length>0?2:1 datas.type = item.ChildList&&item.ChildList.length>0?2:1
if(datas.type==2||(datas.type==1&&!datas.params.Name))datas.params.Name = item.ColorName if(datas.type==2||(datas.type==1&&!datas.params.Name))datas.params.Name = item.Name
datas.addEditVisible = true datas.addEditVisible = true
} }
} }
...@@ -441,25 +468,35 @@ ...@@ -441,25 +468,35 @@
} }
const querySearchHandler = async () => { const querySearchHandler = async () => {
if(!queryObj.Name||queryObj.Name=='') datas.defaultExpandAll = false
if(queryObj.Name) datas.defaultExpandAll = true
loading.value = true loading.value = true
try { try {
let response = await ConfigService.GetTemplateQueryAsync(queryObj) let pageRes = await LineService.GetManagerTemplateConfigData(queryObj);
if (response.data.resultCode == 1) { if (pageRes.data.resultCode == 1) {
let arrList = function(list){ dataList.value = pageRes.data.data
list.forEach(x=>{
x.Content = ''
})
}
arrList(response.data.data.ColorList)
DataListAll.value = response.data.data.ColorList
dataList.value = response.data.data.ColorList
} }
loading.value = false loading.value = false
} catch (error) { } catch (error) {
loading.value = false loading.value = false
} }
// if(!queryObj.Name||queryObj.Name=='') datas.defaultExpandAll = false
// if(queryObj.Name) datas.defaultExpandAll = true
// loading.value = true
// try {
// let response = await ConfigService.GetTemplateQueryAsync(queryObj)
// if (response.data.resultCode == 1) {
// let arrList = function(list){
// list.forEach(x=>{
// x.Content = ''
// })
// }
// arrList(response.data.data.ColorList)
// DataListAll.value = response.data.data.ColorList
// dataList.value = response.data.data.ColorList
// }
// loading.value = false
// } catch (error) {
// loading.value = false
// }
} }
const getColor = async () => { const getColor = async () => {
let response = await LineService.GetParentColor(queryColor.value) let response = await LineService.GetParentColor(queryColor.value)
......
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