Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加分类显示回收站 稍后看

Browse Source
This commit is contained in:
WangHao
2021-04-26 22:27:52 +08:00
parent 4131d8bdca
commit 900076723f
24 changed files with 941 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-ui/src/api/bookmark/bookmark.js
View File

@ -36,6 +36,14 @@ export function selectByUseridList(query) {
params: query
})
}
//用户 最新书签 星标 稍后读
export function listByUserAndPolymerization(query) {
return request({
url: '/bookmark/bookmark/listByUserAndPolymerization',
method: 'get',
params: query
})
}
@ -90,3 +98,10 @@ export function exportBookmark(query) {
params: query
})
}
// 导出用户个人的书签HTML
export function exportBookmarkHTML() {
return request({
url: '/IO/export',
method: 'post',
})
}

49
ruoyi-ui/src/components/BookmarkList/index.vue
View File

@ -12,40 +12,38 @@
<div class="bookmark-description" v-if="isdescription" >
<span v-if="highlighted" v-html="highLight(bm.description,sousuo)"></span>
<span v-if="!highlighted">{{bm.description}}</span>
</div>
<div class="info-wrap" v-if="isBookmarkIcon">
<div class="info">
<div class="bookmark-icon">
<div class="info" >
<div class="bookmark-icon bookmark-list-tag-top">
<img :ng-src="'https://favicon.lucq.fun/?url=http://'+bm.urls"
:src="'https://favicon.lucq.fun/?url=http://'+bm.urls"
onerror="this.src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAAmVJREFUSMftlG1IU2EUx8+5jRHzg+5OiD64WTBBjSY5ZybUJMaMiIUICUKFIGmoIIogYWKFBmtDxN1tBKIWvlS6SR+iLFDBXqSMgmzbvQ7fkAjcINmQ5u7pQwyCiOvWx/p/fPj9/5znnPM8AP+VolRTjjHhTlmZipzEk9GYao4sVaMYxXp62NgIdpLBCuLP05mZZHOYZA3p5KgMjBcUwCmw4PfVVYiBGmbW1zMzOU4QCgtTvdAeRESEyNZyJbx+dDTjVv/9YFSjSScnfabsbPYMF+AbxsYS3F5TfwPZAacpMNfUBEAljK24mMJwlLIUClTAdfwok9FXWBTtc3Phzqv7c/RWa8KnrHZM8VltbRjC92AxGkEPRpSJInjJQPpIBJoZC6nn50M19dM5J/v6/lhRxgXXDX9Qp1POcmHh2sTEQbfbvVmrUCTbr4RPaeMe8Q0eTyI36VkrW50mftjrPWCyDn9oSUuTdj4Y/1Qpl7NdzkNC98iIqsIxHdQVFaU8eWW1U1guLy1lr3Acr3O7pXi227EhDLpcCZ8UL/kK8LIYjxtDIRhEP8xGIlI8bcAKvY3FGB/zYvf81pYUL/0PvGTKoTUvjzbgCx5ZWlJq3a5lQa1Ge3yTWnp64ASYqVcUoXn3Jtja2/EpRtHj89FF8Tb25ufDOwCo8/lSL0BF/eDPzcVXeA7WDAa6J9rES1VVdJqx41JHBwCE8BgA3JU9B+3AACziMwjv7MAaPQb/wgIAnP2rDpCWtpkncjm+Ro34bWgo3FkX0O6bnARARCT6hSR6YzazXa7DfLyigo7TNtObxNb/s/oB7V8JFvW/8IQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjAtMDItMDJUMTg6MTE6NTgrMDg6MDCoc6tpAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIwLTAyLTAyVDE4OjExOjU4KzA4OjAw2S4T1QAAAGd0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fNWhyOG55Nmo1bWMvamluZ2RpYW5hbmxpX2tvbmd3dWppYW94aW5nX3Nob3VjYW5nLnN2Z4/vilwAAAAASUVORK5CYII='"
alt="" ng-show="bm.urls">
</div>
<div class="bookmark-official">{{bm.urls}}&nbsp;·&nbsp;</div>
<div class="bookmark-time">{{bm.createTime|changeTime}}</div>
<div class="bookmark-time">{{bm.bookmarkStar}}</div>
<div class="bookmark-time" v-for="t in bm.sqTags" v-if="false">
<!-- <el-tag class="bookmark-list-tag" data-bookmarkId="t.bookmarkId" data-tagId="t.tagId"-->
<!-- size="mini">-->
<!-- {{t.name}}-->
<!-- </el-tag>-->
<div class="bookmark-official bookmark-list-tag-top">{{bm.urls}}&nbsp;·&nbsp;</div>
<div class="bookmark-time bookmark-list-tag-top">{{bm.createTime|changeTime}}</div>
<div class="bookmark-time bookmark-list-tag-top">{{bm.bookmarkStar}}</div>
<div class="bookmark-time" v-if="bm.tagNameAll!=null&&bm.tagNameAll!=''" >
<el-tag v-for="item in JSON.parse(bm.tagNameAll)" class="bookmark-list-tag bookmark-list-tag-top" style="float: left" type="info" data-tagid="item.tagId" size="mini">
{{item.name}}
</el-tag>
</div>
</div>
</div>
<!--编辑 -->
<div class="editAllBookMark" v-show="seen&&bm.bookmarkId==current">
<el-button slot="reference" @click.stop="updateStarById(bm.bookmarkId,bm.bookmarkStar)" type="info" v-bind:class="{ activeClass: bm.bookmarkStar ==1 }" plain size="mini" icon="el-icon-star-off"></el-button>
<el-button type="info" plain size="mini" icon="el-icon-share" ></el-button>
<el-button type="info" plain size="mini" icon="el-icon-edit" @click.stop="handleUpdate(bm.bookmarkId)"></el-button>
<el-button type="danger" plain size="mini" icon="el-icon-delete" @click.stop="handleDelete(bm.bookmarkId)"></el-button>
<el-button slot="reference" @click.stop="updateStarById(bm.bookmarkId,bm.bookmarkStar)" v-bind:class="{ activeClass: bm.bookmarkStar ==1 }" plain size="mini" icon="el-icon-star-off"></el-button>
<el-button plain size="mini" icon="el-icon-share" ></el-button>
<el-button plain size="mini" icon="el-icon-edit" @click.stop="handleUpdate(bm.bookmarkId)"></el-button>
<el-button plain size="mini" icon="el-icon-delete" @click.stop="handleDelete(bm.bookmarkId)"></el-button>
<div style="width: 10px"></div>
</div>
</div>
@ -208,7 +206,10 @@
},
/**编辑**/
/**最新 星标 稍后看**/
selectByUseridList(){
},
}
@ -219,6 +220,14 @@
color: red;
}
.bookmark-list-tag-top{
margin-top: 4px;
}
.bookmark-list-tag{
margin-right: 10px;
}
.bookmark-item {
display: flex;
height: 24px;
@ -234,7 +243,7 @@
}
.bookmark:hover {
background-color: #E8E8E8;
background-color: #E6E6E6;
}
@ -280,6 +289,8 @@
font-size: 0.95rem;
display: flex;
align-items: center;
flex-wrap:wrap;
}
.bookmark-icon {
@ -297,7 +308,7 @@
width: 200px;
height: inherit;
position: absolute;
right: 0px;
right: 15px;
top: 10px;
bottom: 10px;
display:inline-flex;

15
ruoyi-ui/src/utils/exportFile.js Normal file
View File

@ -0,0 +1,15 @@
//导出文件流的文件 blob
export function exportFileHTML(response,fileName) {
const blob = new Blob([res], { type: 'text/html' }) // 构造一个blob对象来处理数据
const elink = document.createElement('a') // 创建a标签
elink.download = fileName // a标签添加属性
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click() // 执行下载
URL.revokeObjectURL(elink.href) // 释放URL 对象
document.body.removeChild(elink) // 释放标签
}

4
ruoyi-ui/src/views/bookmark/bkuser/index.vue
View File

@ -19,12 +19,14 @@
<div class="mdui-btn-group head-tag-button">
<!-- <div :class="['classification',property=='0'?' classification-click':'']" @click="showopen(0)"><span>网页</span></div>-->
<button @click="goRouter(1)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='1'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">个人中心</button>
<button @click="goRouter(7)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='7'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">外观设置</button>
<button @click="goRouter(2)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='2'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">系统设置</button>
<button @click="goRouter(3)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='3'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">导入书签</button>
<button @click="goRouter(4)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='4'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">备份导出</button>
<button @click="goRouter(5)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='5'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">更新日志</button>
<button @click="goRouter(6)" :class="['mdui-btn mdui-color-theme-accent mdui-ripple ',property=='6'?' mdui-btn-active mdui-color-blue-50 mdui-text-color-blue-600':'']">关于我们</button>
</div>
</div>
@ -145,7 +147,7 @@
.head-tag-button {
display: flex;
justify-content: space-between;
width: 40%;
width: 45%;
align-items: center;
margin: 0 auto;
}

106
ruoyi-ui/src/views/bookmark/bkuser/tool/exportHtml.vue
View File

@ -4,12 +4,43 @@
<el-col :xs="24" :sm="{span: 16, push: 4}" :md="{span: 14, push: 5}" :xl="{span: 10, push: 7}" >
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>备份导出</span>
<span>备份/导出</span>
</div>
<div>
<ul class="list-group list-group-striped">
<div class="exportList">
<div class="exportList-main">
<div class="exportList-main-text">
<span class="listText"> 书签导出</span>
</div>
<div class="listText-button">
<el-button plain @click="handleExport" size="mini">书签导出</el-button>
</div>
</div>
<div class="exportList-main">
<div class="exportList-main-text">
<span class="listText"> 自动备份</span>
</div>
<div class="listText-button" >
<el-switch style="float: right" v-model="bookMarkBackup" ></el-switch>
</div>
</div>
<div class="exportList-main">
<div class="exportList-main-text">
<span class="listText"> 备份方式</span>
</div>
<div class="listText-button">
<el-button plain @click="handleExport" size="mini" style="width: 80px"> 添 加 </el-button>
</div>
</div>
</ul>
</div>
</el-card>
</el-col>
@ -18,16 +49,79 @@
</div>
</template>
<script>
import { exportBookmarkHTML } from "@/api/bookmark/bookmark";
export default {
name: 'areaTree',
components: {},
data: function () {
return {}
return {
bookMarkBackup:true
}
},
methods: {}
methods: {
/** 导出按钮操作 */
handleExport() {
this.$confirm('是否确认导出所有书签数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportBookmarkHTML();
}).then(res => {
var oDate = new Date(); //实例一个时间对象；
oDate.getFullYear(); //获取系统的年；
oDate.getMonth()+1; //获取系统月份，由于月份是从0开始计算，所以要加1
oDate.getDate(); // 获取系统日，
oDate.getHours(); //获取系统时，
oDate.getMinutes(); //分
oDate.getSeconds(); //秒
var time = oDate.getFullYear()+"年"+oDate.getMonth()+1+"月"+oDate.getDate() +"日 " +oDate.getHours()+"时"+oDate.getMinutes()+"分"+oDate.getSeconds()+"秒";
var name = "cqy_"+time;
const blob = new Blob([res], { type: 'text/html' }) // 构造一个blob对象来处理数据
const fileName = name + '.html' // 导出文件名
const elink = document.createElement('a') // 创建a标签
elink.download = fileName // a标签添加属性
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click() // 执行下载
URL.revokeObjectURL(elink.href) // 释放URL 对象
document.body.removeChild(elink) // 释放标签
}).then(res =>{
this.$message({
showClose: true,
message: '导出成功',
type: 'success'
});
}).catch(function() {
this.$message({
showClose: true,
message: '导出失败，系统错误!',
type: 'error'
});
});
}
}
}
</script>
<style>
.exportList{
display:flex;flex-direction:column;
}
.exportList-main{
display:flex;height: 50px;width: 100%;
}
.exportList-main-text{
width: 90%;display:flex;align-items:center;
}
.listText{
color: black;font-weight: 400
}
.listText-button{
width: 10%;display:flex;align-items:center;
flex-direction:column-reverse;
}
</style>

68
ruoyi-ui/src/views/bookmark/bookmark/index.vue
View File

@ -239,7 +239,8 @@
delBookmark,
addBookmark,
updateBookmark,
exportBookmark
exportBookmark,
listByUserAndPolymerization
} from "@/api/bookmark/bookmark";
import {
selectBymenuNote,
@ -286,6 +287,8 @@
sqTags: [],
sort: 0,
sousuo: '',
type:'',
bkOrderBy:'',
},
inputVisible: false, //标签
inputValue: '', //标签
@ -407,14 +410,17 @@
this.sousuo=sousuo
}
console.log("routedata："+routedata)
if (routedata == 'newest'||routedata == 'asterisk'||routedata == 'seeYouLater'||routedata == 'recycle') {
that.queryParams.menuId=null;
if (routedata == 'BOOKMARK') {
this.listByUserAndPolymerization(routedata);
//全部书签
this.getBookmarkList();
} else if (routedata == 'RECYCLE') {
//回收站
this.getrecycleList();
// this.getBookmarkList();
//
// } else if (routedata == 'RECYCLE') {
// //回收站
// this.getrecycleList();
} else {
//根据menuId查询
@ -426,7 +432,7 @@
this.getHeight()
//获取当前的用户信息
this.getUser();
// this.getUser();
},
mounted() {
@ -539,8 +545,9 @@
if (index > -1) {
if (this.form.sqTags[index].tagId < 0) {
this.form.sqTags.splice(index, 1);
}else{
this.form.sqTags[index].name = "TAGDELETE";
}
this.form.sqTags[index].name = "TAGDELETE";
}
console.log(this.form.sqTags);
},
@ -552,12 +559,13 @@
},
handleInputConfirm() {
let inputValue = this.inputValue;
if (inputValue) {
this.tagcount = this.tagcount - 1;
//添加
var updatetag = {name: inputValue, bookmarkId: this.form.bookmarkId, tagId: this.tagcount};
console.log("updatetag")
this.form.sqTags.push(updatetag);
}
this.inputVisible = false;
@ -581,6 +589,9 @@
const ibookmarkId = bookmarkId || this.ids
getBookmark(ibookmarkId).then(response => {
this.form = response.data;
if(this.form.sqTags==null){
this.form.sqTags=[];
}
this.open = true;
this.title = "书签编辑管理";
});
@ -629,7 +640,7 @@
this.open = false;
this.reset();
},
// 表单重置
// 统一的表单重置
reset() {
this.form = {
bookmarkId: undefined,
@ -712,6 +723,27 @@
}
});
},
/** 最新 星标 回收站 稍后看**/
listByUserAndPolymerization(str) {
console.log(" 最新 星标 回收站 稍后看");
this.loading = true;
this.queryParams.type=str;
this.queryParams.bkOrderBy="";
listByUserAndPolymerization(this.queryParams).then(response => {
if (response.code == 200) {
this.bookmarkList = this.bookmarkList.concat(response.rows);
this.total = response.total;
this.listloading = false
this.loading = false;
console.log("请求完毕" + this.queryParams.pageNum)
} else {
//出错了加载完毕了 禁止滚动
this.noMore = true;
this.listloading = false
this.loading = false;
}
});
},
/**根据条件查询*/
getBypropertyList(e){
switch(e) {
@ -775,12 +807,14 @@
getListConcat(){
var that=this;
this.loading = true;
if(this.queryParams.menuId=='BOOKMARK'){
//全部书签
this.getBookmarkList();
}else if (this.queryParams.menuId == 'RECYCLE') {
//回收站书签
this.getrecycleList();
var routedata = this.queryParams.menuId;
if(routedata == 'newest'||routedata == 'asterisk'||routedata == 'seeYouLater'||routedata == 'recycle'){
this.listByUserAndPolymerization(routedata);
// //全部书签
// this.getBookmarkList();
// }else if (this.queryParams.menuId == 'RECYCLE') {
// //回收站书签
// this.getrecycleList();
}else{
//查看目录下的书签
this.getlistByMenuId();

296
ruoyi-ui/src/views/bookmark/index/index.vue
View File

@ -20,46 +20,99 @@
<div class="main-right">
<!-- <svg-icon icon-class="tool" class="svgicon"/>-->
<!-- <div class="aside-title"><i class="el-icon-s-management"></i><span>发现</span></div>-->
<div class="aside-title" @click="goRouter(8)"><i class="el-icon-folder"></i><span>最新</span></div>
<div class="aside-title"><i class="el-icon-star-off"></i><span>星标</span></div>
<div class="aside-title"><i class="el-icon-reading"></i><span>稍后看</span></div>
<div class="aside-title" @click="goRouter(9)"><i class="el-icon-star-off"></i><span>星标</span></div>
<div class="aside-title" @click="goRouter(10)"><i class="el-icon-reading"></i><span>稍后看</span></div>
<div class="aside-title"><i class="el-icon-view"></i><span>发现</span></div>
<!-- <div class="aside-title"><i class="el-icon-s-platform"></i><span>任意门</span></div>-->
<!-- <div class="aside-title"><i class="el-icon-message-solid"></i><span>收件箱</span></div>-->
<div class="reminder">我的收藏 <svg-icon icon-class="sx" style="margin-left:5px" @click="refreshNode"/></div>
<div class="areaTree">
<div class="aside-title"><i class="el-icon-message"></i><span>收件箱</span></div>
<div class="aside-titleB" @mouseenter="eidtMenuText=!eidtMenuText" @mouseleave="eidtMenuText=!eidtMenuText">
<i @click="menuListShowCk" :class="menuListShow ? 'el-icon-caret-bottom aside-titleB_childi_one':'el-icon-caret-right aside-titleB_childi_one'" ></i>
<i class="el-icon-folder-opened aside-titleB_childi_two"></i>
<span >我的收藏</span>
<div style="margin-left: 40%" v-show="eidtMenuText">
<i class="el-icon-search" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="searchBkMenuCk"></i>
<i class="el-icon-folder-add" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="addBkMenuCk"></i>
</div>
</div>
<!-- <div class="reminder" style="display: flex;">-->
<!-- <span @click="menuListShowCk">我的收藏</span>-->
<!-- <div style="margin-left: 55%">-->
<!--&lt;!&ndash; <i class="el-icon-refresh" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="refreshNode"></i>&ndash;&gt;-->
<!-- <i class="el-icon-search" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="searchBkMenuCk"></i>-->
<!-- <i class="el-icon-folder-add" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="addBkMenuCk"></i>-->
<!-- </div>-->
<!-- </div>-->
<div style="display: flex;justify-items: center;align-items: center">
<el-input
v-if="!addBkMenu"
placeholder="输入收藏夹名字"
v-model="input4"
size="mini"
style="width: 80%;margin-left: 5%"
>
<i slot="prefix" class="el-input__icon el-icon-circle-plus-outline"></i>
</el-input>
<i v-if="!addBkMenu" @click="addBkMenuCk" class="el-icon-close" style="font-size: 25px;margin-left: 5px;margin-bottom: 2px"></i>
</div>
<div style="display: flex;justify-items: center;align-items: center">
<el-input
v-if="!searchBkMenu"
placeholder="搜索目录"
v-model="input4"
size="mini"
style="width: 80%;margin-left: 5%"
>
<i slot="prefix" class="el-icon-search" style="margin-left: 5px"></i>
</el-input>
<i v-if="!searchBkMenu" @click="searchBkMenuCk" class="el-icon-close" style="font-size: 25px;margin-left: 5px;margin-bottom: 2px"></i>
</div>
<!-- <transition name="el-zoom-in-top">-->
<!-- 目录-->
<div class="areaTree" v-show="menuListShow">
<ul id="treeDemo" class="ztree"></ul>
</div>
<div class="reminder" >工具箱</div>
<!-- </transition>-->
<!-- <div class="reminder" STYLE="">工具箱</div>-->
<div class="aside-titleB" @mouseenter="eidtTAGText=!eidtTAGText" @mouseleave="eidtTAGText=!eidtTAGText">
<i @click="tagListShowCk" :class="tagListShow ? 'el-icon-caret-bottom aside-titleB_childi_one':'el-icon-caret-right aside-titleB_childi_one'" ></i>
<i class="el-icon-price-tag aside-titleB_childi_two"></i>
<span >工具箱</span>
<div style="margin-left: 40%" v-show="eidtTAGText">
<i class="el-icon-search" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="searchBkTagCk"></i>
<i class="el-icon-folder-add" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="addBkTagCk"></i>
</div>
</div>
<!-- <div class="aside-title"><i class="el-icon-s-flag" style="color: #569cd5"></i><span>RSS订阅</span></div>-->
<div class="aside-title" @click="goRouter(7)"><i class="el-icon-collection"></i><span>标签管理</span></div>
<div class="aside-title" @click="goRouter(6)"><i class="el-icon-delete" ></i><span>垃圾桶</span></div>
<!-- <div class="aside-title" @click="goRouter(5)"><i class="el-icon-s-platform"></i><span>导入书签</span></div>-->
<div class="aside-title"><i class="el-icon-chat-dot-square"></i><span>意见反馈</span></div>
<!-- <div class="aside-title" @click="ceshi"><i class="el-icon-s-comment"></i><span>测试页面</span></div>-->
<div class="aside-title" @click="goRouter(2)"><i class="el-icon-suitcase"></i><span>小工具</span></div>
<div class="aside-title " style="margin-bottom: 100px" @click="goRouter(9)"><i class="el-icon-setting"></i><span>更多设置</span></div>
<div class="aside-title " style="margin-bottom: 100px" @click="goRouter(11)"><i class="el-icon-setting"></i><span>更多设置</span></div>
</div>
<div class="block">
<span class="demonstration">默认 Hover 指示器触发</span>
<el-carousel height="150px">
<el-carousel-item v-for="item in 4" :key="item">
<h3 class="small">{{ item }}</h3>
</el-carousel-item>
</el-carousel>
</div>
</el-aside>
</transition>
<div class="isresize" style="cursor:w-resize">
</div>
<!-- 拖拽 -->
<!-- <div class="isresize" style="cursor:w-resize">-->
<!-- </div>-->
@ -90,97 +143,17 @@
<div class="labelname">上级菜单</div>
<treeselect class="menutreeselect" v-model="form.parentId" :options="menuOptions" :normalizer="normalizer"/>
</el-form-item>
<!-- <el-form-item prop="menuOrder">-->
<!-- <div class="labelname">排序(小到大)</div>-->
<!-- <br/>-->
<!-- <el-input-number v-model="form.menuOrder" placeholder="计数器"></el-input-number>-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="danger" style="background-color: #ff6c70" @click="deleteMmenu(form.menuId)">删除</el-button>
<el-button type="primary" style="background-color: #09b1b9" @click="submitForm">确定</el-button>
<el-button type="danger" @click="deleteMmenu(form.menuId)">删除</el-button>
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancel">取消</el-button>
</div>
</el-dialog>
<!-- &lt;!&ndash; 添加链接&ndash;&gt;-->
<!-- &lt;!&ndash; 添加或修改书签管理对话框 &ndash;&gt;-->
<!-- <el-dialog title="添加连接" :visible.sync="addopen" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="书签地址" prop="url">-->
<!-- <el-input v-model="form.url" placeholder="请输入书签地址"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="书签标题" prop="title">-->
<!-- <el-input v-model="form.title" placeholder="请输入书签标题"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="书签描述" prop="description">-->
<!-- <el-input v-model="form.description" type="textarea" placeholder="请输入书签描述"-->
<!-- :autosize="{minRows: 3, maxRows:4}" :style="{width: '100%'}"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="parentId">-->
<!-- <div class="labelname">分类菜单</div>-->
<!-- <treeselect class="menutreeselect" v-model="form.menuId" :options="menuOptions" :normalizer="normalizer"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="书签标签" prop="label">-->
<!-- <el-tag-->
<!-- class="bookmarktag"-->
<!-- v-for="tag in sqTags"-->
<!-- :key="tag.tagId"-->
<!-- closable-->
<!-- type="success"-->
<!-- :disable-transitions="false"-->
<!-- @close="taghandleClose(tag.tagId)"-->
<!-- v-if="tag.name!='TAGDELETE'"-->
<!-- >-->
<!-- {{tag.name}}-->
<!-- </el-tag>-->
<!-- <el-input-->
<!-- class="input-new-tag"-->
<!-- v-if="inputVisible"-->
<!-- v-model="inputValue"-->
<!-- ref="saveTagInput"-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleInputConfirm"-->
<!-- @blur="handleInputConfirm"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-button v-else class="button-new-tag" size="small" @click="showInput">+ 新增标签</el-button>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; <el-form-item label="所属目录" prop="menuId">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="form.menuId" placeholder="请选择上级目录" />&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; 0公开显示 1隐藏显示 2好友显示&ndash;&gt;-->
<!-- <el-form-item label="选择状态" prop="start">-->
<!-- <el-radio-group v-model="form.start" size="medium">-->
<!-- <el-radio v-for="(item, index) in bookmarkstatus" :key="index" :label="item.value"-->
<!-- :disabled="item.disabled">{{item.name}}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 1.未读稍后再看 2 已读 2.續看&ndash;&gt;-->
<!-- <el-form-item label="选择类型" prop="type">-->
<!-- <el-radio-group v-model="form.type" size="medium">-->
<!-- <el-radio v-for="(item, index) in bookmarktype" :key="index" :label="item.value"-->
<!-- :disabled="item.disabled">{{item.name}}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="addbookmark">确 定</el-button>-->
<!-- <el-button @click="bookmarkcancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<!--背景特效-->
<canvas id="evanyou"></canvas>
</div>
@ -209,6 +182,17 @@
data: function () {
return {
addBkMenu:true,//添加书签目录
searchBkMenu:true,//搜索目录
menuListShow:true,//目录list
eidtMenuText:false,//我的收藏
addBkTAG:true,//添加书TAG
searchBkTAG:true,//搜索TAG
tagListShow:false,//TAGlist
eidtTAGText:false,//我的TAG
queryParams: {
userId: undefined,
menuName: undefined,
@ -366,6 +350,45 @@
},
methods: {
/**添加书签目录**/
addBkMenuCk(){
this.addBkMenu = this.addBkMenu?false:true;
this.searchBkMenu = true;
this.menuListShow = true;
},
/**搜索书签目录**/
searchBkMenuCk(){
this.searchBkMenu = this.searchBkMenu?false:true;
this.addBkMenu = true;
this.menuListShow = true;
},
/**搜索书签目录**/
menuListShowCk(){
this.menuListShow = this.menuListShow?false:true;
this.addBkMenu = true;
this.searchBkMenu = true;
},
/**添加书签目录**/
addBkTagCk(){
this.addBkTAG = this.addBkTAG?false:true;
this.searchBkTAG = true;
this.tagListShow = true;
},
/**搜索书签目录**/
searchBkTagCk(){
this.searchBkMenu = this.searchBkTAG?false:true;
this.addBkTAG = true;
this.tagListShow = true;
},
/**搜索书签目录**/
tagListShowCk(){
this.tagListShow = this.tagListShow?false:true;
this.addBkTAG = true;
this.searchBkTAG = true;
},
/**图片失败显示**/
errorHandler() {
return true
@ -863,7 +886,7 @@
that.$router.push({
path: "/content",
query: {
menuId: 'RECYCLE'
menuId: 'recycle'
}
})
break;
@ -874,16 +897,37 @@
})
break;
case 8:
//全部书签
//全部最新书签
that.$router.push({
path: "/content",
query: {
menuId: 'BOOKMARK'
menuId: 'newest',
t:Date.now(),
}
})
break;
case 9:
//个人中心
//星标
that.$router.push({
path: "/content",
query: {
menuId: 'asterisk',
t:Date.now(),
}
})
break;
case 10:
//稍后看
that.$router.push({
path: "/content",
query: {
menuId: 'seeYouLater',
t:Date.now(),
}
})
break;
case 11:
//用户中心
that.$router.push({
path: "/bkindex",
})
@ -892,7 +936,8 @@
that.$router.push({
path: "/content",
query: {
menuId: 'BOOKMARK'
menuId: 'newest',
t:Date.now(),
}
})
}
@ -1033,13 +1078,40 @@
/*.isaside{*/
/* cursor:w-resize*/
/*}*/
.aside-titleB{
display: flex;
height: 32px;
align-items: center;
justify-items: center;
}
.aside-titleB:hover {
background-color: #e8e8e8;
}
/**第一个元素**/
.aside-titleB_childi_one{
margin-left: 5px;
font-size: 15px;
margin-right: 11px;
vertical-align: middle;
}
/**第二个元素**/
.aside-titleB_childi_two{
margin-left: -4px;
font-size: 20px;
margin-right: 11px;
vertical-align: middle;
}
.aside-titleB span{
font-size: 14px;
}
.aside-title {
height: 32px;
}
.aside-title:hover {
background-color: #c5c5c5;
background-color: #e8e8e8;
}
.aside-title i {
@ -1097,7 +1169,7 @@
opacity: 0.7;
font-size: 14px !important;
font-weight: 500 !important;
margin-left: 27px !important;
margin-left: 27px ;
}

2
ruoyi-ui/src/views/bookmark/ztree/jquery.ztree.core.js
View File

@ -1310,7 +1310,7 @@
},
// style='margin-top:-2px'
makeDOMNodeLine: function (html, setting, node) {
html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' style='margin-left: 20px' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
},
makeDOMNodeMainAfter: function (html, setting, node) {
html.push("</li>");

2
ruoyi-ui/src/views/login.vue
View File

@ -271,7 +271,7 @@ export default {
this.h3 = this.loginFlag?"藏趣云":"用户注册";
this.loginButton = this.loginFlag?"登 录":"注册";
this.loginButtonMeg = this.loginFlag?"登 录 中...":"注 册 中...";
this.switchLoginText = this.loginFlag?"前往注册":"返回登陆";
this.switchLoginText = this.loginFlag?"账号注册":"账号登陆";
this.$message({
message: this.loginFlag?"返回登陆":"前往注册",