From 6e9a510d3cf07528d32308bd80f870e6de4c377d Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Sun, 14 Mar 2021 23:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B9=A6=E7=AD=BE=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B9=A6=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/BookmarkList/index.vue     | 29 ++++++++++++++-----
 ruoyi-ui/src/router/index.js                  | 20 +++++++++----
 .../src/views/bookmark/bookmark/index.vue     |  6 ++--
 .../src/views/bookmark/common/ImportHtml.vue  | 12 ++++----
 .../common/{NqEdit.vue => nqEdit.vue}         |  0
 ruoyi-ui/src/views/bookmark/common/tool.vue   | 19 ++++++++++++
 .../common/{UserTagAll.vue => userTagAll.vue} |  0
 ruoyi-ui/src/views/bookmark/index/index.vue   | 18 +++++++-----
 8 files changed, 75 insertions(+), 29 deletions(-)
 rename ruoyi-ui/src/views/bookmark/common/{NqEdit.vue => nqEdit.vue} (100%)
 create mode 100644 ruoyi-ui/src/views/bookmark/common/tool.vue
 rename ruoyi-ui/src/views/bookmark/common/{UserTagAll.vue => userTagAll.vue} (100%)

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 @@
 
       <!--编辑  -->
       <div class="editAllBookMark"  v-show="seen&&bm.bookmarkId==current">
-          <el-button type="info" plain size="mini" icon="el-icon-edit"></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-delete"></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>
+
           <div style="width: 10px"></div>
       </div>
     </div>
@@ -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;
       },
 
+
+      /**编辑**/
+
+
     }
   }
 </script>
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 @@
         <div class="bookmarklist" :style="datalist"  infinite-scroll-distance="10" v-loading="loading" v-if="showbookmark"
              v-infinite-scroll="load"
              infinite-scroll-disabled="disabled" style="overflow:auto;" infinite-scroll-immediate="false">
-    <BookmarkOne @on-windowurl="windowurl" :key="property" :property="property" :highlighted="highlighted" :sousuo="sousuo"  :listloading="listloading" :loading="loading" :bookmarkList="bookmarkList"></BookmarkOne>
+    <BookmarkOne @on-windowurl="windowurl" @on-handleUpdate="handleUpdate" @on-handleDelete="handleDelete" :key="property" :property="property"  :highlighted="highlighted" :sousuo="sousuo"  :listloading="listloading" :loading="loading" :bookmarkList="bookmarkList"></BookmarkOne>
 
           <p v-if="listloading" class="listhint"><i class="el-icon-loading"></i>加载中...</p>
           <p v-if="listnoMore&&!showimg" class="listhint">没有更多了</p>
@@ -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 @@
 
     </div>
 
-    <div class="structure">
-      <el-radio v-model="structure" label="0">按原目录导入</el-radio>
-      <el-radio v-model="structure" label="1" disabled>全部导入到一个新目录</el-radio>
-    </div>
-    <el-button type="primary" size="small" @click="submitUpload" plain><i
-    class="el-icon-upload el-icon--right">开始导入书签</i></el-button>
+<!--    <div class="structure">-->
+<!--      <el-radio v-model="structure" label="0">按原目录导入</el-radio>-->
+<!--      <el-radio v-model="structure" label="1" disabled>全部导入到一个新目录</el-radio>-->
+<!--    </div>-->
+<!--    <el-button type="primary" size="small" @click="submitUpload" plain><i-->
+<!--    class="el-icon-upload el-icon&#45;&#45;right">开始导入书签</i></el-button>-->
 
 
 
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 @@
+<template>
+    <div>
+        {{msg}}
+    </div>
+</template>
+<script>
+    export default {
+        name: 'areaTree',
+        components: {},
+
+        data: function () {
+            return {}
+        },
+        methods: {}
+    }
+</script>
+<style>
+
+</style>
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 @@
             <div class="areaTree">
               <ul id="treeDemo" class="ztree"></ul>
             </div>
-            <div class="reminder">工具箱</div>
+            <div class="reminder" >工具箱</div>
             <div class="aside-title"><i class="el-icon-s-flag" style="color: #569cd5"></i><span>RSS订阅</span></div>
             <div class="aside-title" @click="goUserTagAll"><i class="el-icon-s-management"></i><span>标签管理</span></div>
             <div class="aside-title" @click="gorecycle"><i class="el-icon-delete-solid" style="color: red"></i><span>垃圾桶</span></div>
@@ -34,7 +34,7 @@
             <div class="aside-title"><i class="el-icon-s-comment"></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="NqEdit"><i class="el-icon-s-comment"></i><span>NqQuillEdit编辑器</span></div>-->
-            <div class="aside-title " style="margin-bottom: 100px"><i class="el-icon-s-grid"></i><span>工具箱</span></div>
+            <div class="aside-title " style="margin-bottom: 100px" @click="gotool"><i class="el-icon-s-grid"></i><span>工具箱</span></div>
 
           </div>
 
@@ -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",
         })
       },