From 5755ac1e570c4ab35ce1846f72987571d99c8fdc Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Fri, 29 Oct 2021 23:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE=E5=89=8D?=
=?UTF-8?q?=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/bookmark/index/index.vue | 2 +-
ruoyi-ui/src/views/bookmark/tag/usertag.vue | 73 ++++++++++++++++++---
2 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index 455aafefe..219674c24 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -766,7 +766,7 @@
//if (treeNode.parentNode && treeNode.parentNode.id!=1) return;
var switchObjspan = $("#" + treeNode.tId + "_span");
// onmouseout='removeHoverDoms(this)' //选中删除切换
- var editStr = "<span class=" + treeNode.tId + "_sz data-parentId=" + treeNode.parentId + " data-menuId=" + treeNode.menuId + " data-treetId="+ treeNode.tId +" data-bookmarkCount="+treeNode.bookmarkCount+" onclick='editBookmark(this)' style='color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:0.8rem' onfocus='this.blur();'><i class='el-icon-edit'></i></span>";
+ var editStr = "<span class=" + treeNode.tId + "_sz data-parentId=" + treeNode.parentId + " data-menuId=" + treeNode.menuId + " data-treetId="+ treeNode.tId +" data-bookmarkCount="+treeNode.bookmarkCount+" onclick='editBookmark(this)' style='color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:0.8rem' onfocus='this.blur();'><i style='margin-top: 9px;font-size: 16px' class='el-icon-edit'></i></span>";
switchObjspan.after(editStr);
},
diff --git a/ruoyi-ui/src/views/bookmark/tag/usertag.vue b/ruoyi-ui/src/views/bookmark/tag/usertag.vue
index a1252e41a..e4bc6e736 100644
--- a/ruoyi-ui/src/views/bookmark/tag/usertag.vue
+++ b/ruoyi-ui/src/views/bookmark/tag/usertag.vue
@@ -44,9 +44,17 @@
<el-collapse-transition>
<div v-if=" tagListShow">
<!-- TAG标签 -->
- <div v-if=" !(tagList == undefined ||tagList == null || tagList.length <= 0)" v-for="item in tagList" >
- <div class="aside-title name transition-box" id="item.id">
+ <div v-if=" !(tagList == undefined ||tagList == null || tagList.length <= 0)" v-for="item in tagList" @mouseover="enter(item.id)" @mouseleave="leave()" >
+ <div class="aside-title name transition-box" id="item.id" >
+
<i class="el-icon-collection-tag" style="font-size: 15px"/> {{item.name}}
+
+
+
+ <i v-show="seen&&item.id == current" class="el-icon-delete tag_coomon" @click="updateTagOpen(item.id)"></i>
+ <i v-show="seen&&item.id == current" class="el-icon-edit tag_coomon_eidt" @click="updateTagOpen(item.id)"></i>
+
+
<!-- <el-tag type="info" size="mini">{{item.name}}</el-tag>-->
</div>
</div>
@@ -65,7 +73,17 @@
-
+ <el-dialog
+ title="编辑"
+ :visible.sync="dialogVisible"
+ width="30%"
+ :before-close="handleClose">
+ <el-input v-model="newName" placeholder="请输入新的标签名称"></el-input>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+ </span>
+ </el-dialog>
</div>
@@ -79,6 +97,7 @@
data: function () {
return {
+ dialogVisible: false,
msg:'暂无标签',
tagList:[],
total:0,
@@ -87,13 +106,15 @@
pageSize: 8,
name:undefined
},
-
+ newName:'',//标签名称
addBkTAG:true,//添加书TAG
searchBkTAG:true,//搜索TAG
tagListShow:false,//TAGlist
eidtTAGText:false,//我的TAG
tagName:undefined,//新增书签 - 搜索的输入框
- tagNameCopy:''//用于提示
+ tagNameCopy:'',//用于提示
+ seen:false,//用于展示触碰显示操作按钮
+ current:0,//用于展示触碰显示操作按钮
}
},
created(){
@@ -101,6 +122,18 @@
that.listByUsers();
},
methods: {
+ updateTagOpen(id){
+ this.dialogVisible = true;
+ console.log(id)
+ },
+ handleClose(done) {
+ this.$confirm('确认关闭？')
+ .then(_ => {
+ done();
+ })
+ .catch(_ => {});
+ },
+
// 统一的表单重置
reset() {
this.form = {
@@ -126,8 +159,9 @@
this.tagList = null;
this.total = 0;
listByUserLike(this.tagParams).then(response => {
- if (response.code === 200) {
- this.tagList=response.rows;
+ if (response.code === 200) {1
+
+ this.tagList=response.rows;
this.total = response.total;
if (this.total == 0){
this.tagNameCopy = this.tagName;
@@ -203,14 +237,23 @@
this.addBkTAG = true;
this.searchBkTAG = true;
},
-
+ enter(index){
+ this.seen = true;
+ this.current = index;
+ },
+ leave(){
+ this.seen = false;
+ this.current = null;
+ },
}
}
</script>
<style scoped>
.title-name{
- font-size: 19px;margin-left: 5px;margin-top: 7px
+ font-size: 16px;
+ margin-left: 5px;
+ margin-top: 9px
}
.name{
padding-left: 50px;
@@ -245,5 +288,17 @@
.aside-titleB span{
font-size: 14px;
}
+ .tag_coomon{
+ float: right;
+ margin-right: 15px;
+ margin-top: 9px;
+ font-size: 16px;
+ }
+ .tag_coomon_eidt{
+ float: right;
+ margin-right: 5px;
+ margin-top: 9px;
+ font-size: 16px;
+ }
</style>