diff --git a/ruoyi-ui/src/components/BookmarkList/index.vue b/ruoyi-ui/src/components/BookmarkList/index.vue index fa58c800d..d7fddb6e6 100644 --- a/ruoyi-ui/src/components/BookmarkList/index.vue +++ b/ruoyi-ui/src/components/BookmarkList/index.vue @@ -42,9 +42,10 @@
- - - + + + +
@@ -60,7 +61,7 @@ bookmarkList: Array, property: null, highlighted: null,//搜索是否高亮 - sousuo:null + sousuo:null, }, data: function () { return { @@ -69,7 +70,7 @@ isBookmarkIcon:false, Ueditor:undefined, seen:false, - current:0 + current:0, } }, mounted(){ @@ -94,11 +95,19 @@ }, methods: { + /**打开书签**/ winurl:function(noteId,tiymceueditor,bookmarkId,url) { - this.$emit('on-windowurl', noteId, tiymceueditor,bookmarkId,url); - } - , + }, + /**编辑书签**/ + handleUpdate:function(bookmarkId) { + this.$emit('on-handleUpdate', bookmarkId); + }, + /**删除书签**/ + handleDelete:function(bookmarkId) { + this.$emit('on-handleDelete', bookmarkId); + }, + /**渲染模式**/ showView(e) { var that=this; switch (e) { @@ -182,6 +191,10 @@ this.current = null; }, + + /**编辑**/ + + } } diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 5ba983d6e..a6413308e 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -163,9 +163,9 @@ export const constantRoutes = [ }, children: [ { - path: '/NqEdit', - name: 'NqEdit', - component: resolve => require(['../views/bookmark/common/NqEdit.vue'], resolve), + path: '/nqEdit', + name: 'nqEdit', + component: resolve => require(['../views/bookmark/common/nqEdit.vue'], resolve), meta:{ title: 'Quill编辑器',icon:'user', requireAuth: true,//加该字段,表示进入这个路由是需要登录的true @@ -173,9 +173,9 @@ export const constantRoutes = [ } ] },{ - path: '/UserTagAll', - name: 'UserTagAll', - component: resolve => require(['../views/bookmark/common/UserTagAll.vue'], resolve), + path: '/userTagAll', + name: 'userTagAll', + component: resolve => require(['../views/bookmark/common/userTagAll.vue'], resolve), meta:{ title: '用户标签',icon:'user', requireAuth: true,//加该字段,表示进入这个路由是需要登录的true @@ -196,6 +196,14 @@ export const constantRoutes = [ title: '测试页面',icon:'user', requireAuth: true,//加该字段,表示进入这个路由是需要登录的true }, + },{ + path: '/tool', + name: 'tool', + component: resolve => require(['../views/bookmark/common/tool.vue'], resolve), + meta:{ + title: '工具箱',icon:'user', + requireAuth: true,//加该字段,表示进入这个路由是需要登录的true + }, } ], diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue index efda3e8ae..66c862f4b 100644 --- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -199,7 +199,7 @@
- +

加载中...

没有更多了

@@ -312,7 +312,7 @@ import {listMenuByUserId} from "@/api/bookmark/menu"; import Treeselect from "@riophae/vue-treeselect"; import BookmarkOne from "../../../components/BookmarkList"; - import TinyMceEdit from "../../../views/bookmark/common/NqEdit"; + import TinyMceEdit from "../common/nqEdit"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import { selectBymenuIdUserID, @@ -471,6 +471,7 @@ var routedata = that.$route.query.menuId; var sousuo = that.$route.query.sousuo; var property = that.$route.query.property; + var bookmarkId = that.$route.query.bookmarkId; if (routedata == undefined) { // that.queryParams.menuId = 1; } else { @@ -648,6 +649,7 @@ /** 修改按钮操作 */ handleUpdate(bookmarkId) { + console.log("handleUpdate:"+bookmarkId); this.reset(); const ibookmarkId = bookmarkId || this.ids getBookmark(ibookmarkId).then(response => { diff --git a/ruoyi-ui/src/views/bookmark/common/ImportHtml.vue b/ruoyi-ui/src/views/bookmark/common/ImportHtml.vue index 639c21bc3..fa6613cee 100644 --- a/ruoyi-ui/src/views/bookmark/common/ImportHtml.vue +++ b/ruoyi-ui/src/views/bookmark/common/ImportHtml.vue @@ -29,12 +29,12 @@
-
- 按原目录导入 - 全部导入到一个新目录 -
- 开始导入书签 + + + + + + diff --git a/ruoyi-ui/src/views/bookmark/common/NqEdit.vue b/ruoyi-ui/src/views/bookmark/common/nqEdit.vue similarity index 100% rename from ruoyi-ui/src/views/bookmark/common/NqEdit.vue rename to ruoyi-ui/src/views/bookmark/common/nqEdit.vue diff --git a/ruoyi-ui/src/views/bookmark/common/tool.vue b/ruoyi-ui/src/views/bookmark/common/tool.vue new file mode 100644 index 000000000..98aa7ea35 --- /dev/null +++ b/ruoyi-ui/src/views/bookmark/common/tool.vue @@ -0,0 +1,19 @@ + + + diff --git a/ruoyi-ui/src/views/bookmark/common/UserTagAll.vue b/ruoyi-ui/src/views/bookmark/common/userTagAll.vue similarity index 100% rename from ruoyi-ui/src/views/bookmark/common/UserTagAll.vue rename to ruoyi-ui/src/views/bookmark/common/userTagAll.vue diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index fc91b69c9..40d0bc92d 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -26,7 +26,7 @@
-
工具箱
+
工具箱
RSS订阅
标签管理
垃圾桶
@@ -34,7 +34,7 @@
意见反馈
测试页面
-
工具箱
+
工具箱
@@ -894,12 +894,16 @@ /**跳转NqQuillEdit测试页面**/ NqEdit: function () { this.$router.push({ - path: "/NqEdit", + path: "/nqEdit", + }) + }, + /** 工具箱**/ + gotool() { + var that = this; + that.$router.push({ + path: "/tool", }) - }, - - editBookmark: function (e) { this.reset(); this.getTreeselect(); @@ -976,7 +980,7 @@ goUserTagAll() { var that = this; that.$router.push({ - path: "/UserTagAll", + path: "/userTagAll", }) },