From d6bcfc5492774a87011d573610260eaa97519c92 Mon Sep 17 00:00:00 2001 From: sswiki Date: Mon, 9 Dec 2024 22:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=8Cma?= =?UTF-8?q?rkdown=E6=B8=B2=E6=9F=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mapper/WikiPageMapper.java | 2 +- zyplayer-doc-ui/wiki-ui/src/App.vue | 2 +- .../wiki-ui/src/assets/api/common.js | 4 +- .../wiki-ui/src/assets/api/page.js | 4 +- .../wiki-ui/src/assets/api/request.js | 38 +-- .../wiki-ui/src/assets/api/system.js | 4 +- .../wiki-ui/src/assets/api/user.js | 4 +- .../wiki-ui/src/assets/lib/HtmlUtil.js | 18 +- .../wiki-ui/src/assets/lib/UnitUtil.js | 10 +- .../wiki-ui/src/assets/lib/wangEditor.css | 46 --- .../wiki-ui/src/assets/scss/base.scss | 18 -- .../wiki-ui/src/assets/scss/highlight.scss | 66 ++++ .../wiki-ui/src/assets/scss/markdown.scss | 269 ++++++++++++++++ .../wiki-ui/src/assets/scss/pageView.scss | 294 ++++++++++++++++++ .../src/components/base/ImageViewer.vue | 2 +- .../src/components/layouts/LeftSidebar.vue | 128 ++++---- .../src/components/layouts/ShareLayout.vue | 40 +-- .../components/layouts/ShareMobileLayout.vue | 32 +- .../components/layouts/UserMessagePopover.vue | 34 +- .../src/components/leftSideBar/AddMenu.vue | 22 +- .../components/leftSideBar/LeftSidebarCli.vue | 62 ++-- .../src/components/space/CreateSpace.vue | 34 +- .../components/template/TemplateManage.vue | 138 ++++---- .../wiki-ui/src/composable/windowsScroll.js | 4 +- zyplayer-doc-ui/wiki-ui/src/main.js | 32 +- zyplayer-doc-ui/wiki-ui/src/routes.js | 30 +- zyplayer-doc-ui/wiki-ui/src/store/pageData.js | 2 +- .../wiki-ui/src/store/spaceData.js | 2 +- zyplayer-doc-ui/wiki-ui/src/store/userData.js | 4 +- .../wiki-ui/src/store/wikiDisplay.js | 4 +- .../wiki-ui/src/views/common/AboutDialog.vue | 2 +- .../wiki-ui/src/views/common/NoAuth.vue | 2 +- .../wiki-ui/src/views/home/Home.vue | 28 +- .../wiki-ui/src/views/page/Edit.vue | 160 +++++----- .../wiki-ui/src/views/page/PageLayout.vue | 8 +- .../wiki-ui/src/views/page/Search.vue | 28 +- .../wiki-ui/src/views/page/View.vue | 90 +++--- .../wiki-ui/src/views/page/aside/AddMenu.vue | 16 +- .../src/views/page/aside/LeftAside.vue | 70 ++--- .../src/views/page/aside/RightHeader.vue | 24 +- .../src/views/page/components/Navigation.vue | 18 +- .../src/views/page/editor/WangEditor.vue | 10 +- .../src/views/page/share/mobile/View.vue | 60 ++-- .../wiki-ui/src/views/page/share/pc/Home.vue | 24 +- .../wiki-ui/src/views/page/share/pc/View.vue | 44 +-- .../wiki-ui/src/views/page/show/Annex.vue | 10 +- .../wiki-ui/src/views/page/show/Comment.vue | 62 ++-- .../views/page/show/MobileQrScanDialog.vue | 10 +- .../src/views/page/show/Navigation.vue | 7 +- .../src/views/page/show/PageAuthDialog.vue | 8 +- .../src/views/page/show/PageHistory.vue | 22 +- .../wiki-ui/src/views/page/show/PageZan.vue | 22 +- .../wiki-ui/src/views/space/Manage.vue | 122 ++++---- .../wiki-ui/src/views/user/MyInfo.vue | 10 +- .../wiki-ui/src/views/view/PageLayout.vue | 73 +---- .../wiki-ui/src/views/view/View.vue | 118 +++---- .../wiki-ui/src/views/view/aside/AddMenu.vue | 8 +- .../src/views/view/aside/LeftAside.vue | 20 +- .../src/views/view/aside/RightHeader.vue | 36 +-- .../wiki-ui/src/views/view/show/Annex.vue | 80 ----- .../wiki-ui/src/views/view/show/Comment.vue | 64 ++-- .../wiki-ui/src/views/view/show/Files.vue | 196 ++++++++++++ .../views/view/show/MobileQrScanDialog.vue | 28 +- .../src/views/view/show/Navigation.vue | 85 ++++- .../src/views/view/show/PageAuthDialog.vue | 8 +- .../src/views/view/show/PageHistory.vue | 46 ++- .../wiki-ui/src/views/view/show/PageZan.vue | 116 ++++--- .../controller/WikiPageHistoryController.java | 4 +- 68 files changed, 1885 insertions(+), 1203 deletions(-) delete mode 100644 zyplayer-doc-ui/wiki-ui/src/assets/lib/wangEditor.css create mode 100644 zyplayer-doc-ui/wiki-ui/src/assets/scss/highlight.scss create mode 100644 zyplayer-doc-ui/wiki-ui/src/assets/scss/markdown.scss create mode 100644 zyplayer-doc-ui/wiki-ui/src/assets/scss/pageView.scss delete mode 100644 zyplayer-doc-ui/wiki-ui/src/views/view/show/Annex.vue create mode 100644 zyplayer-doc-ui/wiki-ui/src/views/view/show/Files.vue diff --git a/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java index 4a441eb8..18b7de8f 100644 --- a/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface WikiPageMapper extends BaseMapper { - @Update("update wiki_page set zan_num=zan_num + #{numAdd} where id=#{id}") + @Update("update wiki_page set zan_num=if(zan_num is null or zan_num < 0,0,zan_num) + #{numAdd} where id=#{id}") void updateZanNum(@Param("id") Long id, @Param("numAdd") Integer numAdd); @Update("update wiki_page set seq_no=seq_no + 1 where space_id = #{spaceId} and parent_id=#{parentId} and seq_no >= #{afterSeq} and del_flag=0") diff --git a/zyplayer-doc-ui/wiki-ui/src/App.vue b/zyplayer-doc-ui/wiki-ui/src/App.vue index e6cd8621..d9f6b55c 100644 --- a/zyplayer-doc-ui/wiki-ui/src/App.vue +++ b/zyplayer-doc-ui/wiki-ui/src/App.vue @@ -5,7 +5,7 @@ - diff --git a/zyplayer-doc-ui/wiki-ui/src/views/view/View.vue b/zyplayer-doc-ui/wiki-ui/src/views/view/View.vue index e7b944e4..c508b045 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/view/View.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/view/View.vue @@ -1,12 +1,12 @@