From d6692f242b46bdbf49cee8679720f86960b54c74 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Thu, 8 Oct 2020 14:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E5=86=85?= =?UTF-8?q?=E5=B5=8C=E5=A5=97=E6=89=93=E5=BC=80=E7=BD=91=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbookmark/BrowserController.java | 7 +- .../yunbookmark/SqBookmarkController.java | 2 +- .../yunbookmark/SqMenuController.java | 8 +- .../test/controller/BaseSpringBootTest.java | 2 +- .../{BookmarkHtml => bookmarkhtml}/Const.java | 2 +- .../ImportHtml.java | 3 +- ruoyi-ui/src/assets/styles/base.css | 6 +- .../src/components/BookmarkList/index.vue | 100 +++ .../src/views/bookmark/bookmark/index.vue | 766 +++++++++++++----- ruoyi-ui/src/views/bookmark/common/NqEdit.vue | 19 +- ruoyi-ui/src/views/bookmark/index/index.vue | 473 +++-------- .../com/ruoyi/bookmark/domain/SqMenu.java | 4 +- 12 files changed, 786 insertions(+), 606 deletions(-) rename ruoyi-common/src/main/java/com/ruoyi/common/utils/{BookmarkHtml => bookmarkhtml}/Const.java (95%) rename ruoyi-common/src/main/java/com/ruoyi/common/utils/{BookmarkHtml => bookmarkhtml}/ImportHtml.java (99%) create mode 100644 ruoyi-ui/src/components/BookmarkList/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java index 9761ea7dc..545e14fbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java @@ -9,7 +9,7 @@ import com.ruoyi.bookmark.service.ISqMenuService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.BookmarkHtml.ImportHtml; +import com.ruoyi.common.utils.bookmarkhtml.ImportHtml; import com.ruoyi.common.utils.StringUtils; import org.jsoup.HttpStatusException; import org.slf4j.Logger; @@ -22,17 +22,14 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.net.ssl.SSLHandshakeException; -import java.net.MalformedURLException; import java.net.URL; -import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; import java.util.Map; import java.util.Map.Entry; /** - * @Auther: Wang + * @auther: Wang * @Date: * 功能描述: 导入书签 导出书签 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java index fca6436df..3bcb5b224 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java @@ -8,7 +8,7 @@ import java.util.List; import com.ruoyi.bookmark.domain.SqBookmark; import com.ruoyi.bookmark.service.ISqBookmarkService; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.BookmarkHtml.ImportHtml; +import com.ruoyi.common.utils.bookmarkhtml.ImportHtml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java index ba329c49d..5061b76d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java @@ -186,10 +186,10 @@ public class SqMenuController extends BaseController } } -// /** -// * 批量更新书签的数量 -// */ -// + /** + * 批量更新书签的数量 + */ + @RequestMapping("/bookmarkcount/{menuId}") public AjaxResult bookmarkcount(@PathVariable Long menuId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/BaseSpringBootTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/BaseSpringBootTest.java index 849c5e520..0241cab39 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/BaseSpringBootTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/BaseSpringBootTest.java @@ -13,7 +13,7 @@ import org.springframework.test.context.web.WebAppConfiguration; /** - * @Auther: Wang + * @auther: Wang * @Date: 2020/08/08 19:10 * 功能描述: */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bookmarkhtml/Const.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/bookmarkhtml/Const.java index 0bdb77298..2d823a663 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/Const.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bookmarkhtml/Const.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.BookmarkHtml; +package com.ruoyi.common.utils.bookmarkhtml; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bookmarkhtml/ImportHtml.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/bookmarkhtml/ImportHtml.java index b81bd05ca..cf95d1e37 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BookmarkHtml/ImportHtml.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/bookmarkhtml/ImportHtml.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.BookmarkHtml; +package com.ruoyi.common.utils.bookmarkhtml; import com.ruoyi.common.utils.StringUtils; @@ -10,7 +10,6 @@ import org.jsoup.select.Elements; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css index dc41c8a11..e40348238 100644 --- a/ruoyi-ui/src/assets/styles/base.css +++ b/ruoyi-ui/src/assets/styles/base.css @@ -2,7 +2,7 @@ @media screen and (max-width: 2920px) { /*@media screen and (max-width: 1920px) {*/ .sousouleft-switch{ - display: none; + display: none!important; } .dropdownList{ font-size: 22px!important; @@ -50,10 +50,10 @@ display: none; } .sousouleft-switch{ - display: block; + display: block!important; } .sousou-leftico{ - display: none; + display: none!important; } .sousouright-icon{ diff --git a/ruoyi-ui/src/components/BookmarkList/index.vue b/ruoyi-ui/src/components/BookmarkList/index.vue new file mode 100644 index 000000000..ea1a40f71 --- /dev/null +++ b/ruoyi-ui/src/components/BookmarkList/index.vue @@ -0,0 +1,100 @@ + + + diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue index d794aa7d7..2651c3bc9 100644 --- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -1,217 +1,313 @@