From e875c917ba905fe3fbf0062ca7e2d108a302baa3 Mon Sep 17 00:00:00 2001
From: simple321vip <simple321@vip.qq.com>
Date: Fri, 3 Mar 2023 22:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20appstatus=EF=BC=8Cmessageb?=
 =?UTF-8?q?ox=E5=BC=8F=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/blog.ts                      |  8 ++++
 mock/blogType.ts                  | 14 +++++++
 src/components/layout/NavBar.vue  | 66 +++++++++++++++++++++++++++++++
 src/components/layout/SideBar.vue |  1 -
 src/view/blog/createBlog.vue      | 47 ++++++++++++----------
 src/view/bookmark/Typedialog.vue  |  3 +-
 src/view/bookmark/index.vue       |  1 +
 7 files changed, 116 insertions(+), 24 deletions(-)

diff --git a/mock/blog.ts b/mock/blog.ts
index aa8a488..e648fed 100644
--- a/mock/blog.ts
+++ b/mock/blog.ts
@@ -83,4 +83,12 @@ export default [
       }
     },
   },
+  {
+    url: '/wiki/api/v1/author/blogs/001',
+    method: 'POST',
+    response: () => {
+      return {
+      }
+    },
+  },
 ] as MockMethod[]
diff --git a/mock/blogType.ts b/mock/blogType.ts
index 31407ef..cfa03b2 100644
--- a/mock/blogType.ts
+++ b/mock/blogType.ts
@@ -24,6 +24,20 @@ export default [
               btId: "001",
               order: 1,
             },
+            {
+              bid: "0003",
+              title: "three",
+              content: "xxxxxxxxx",
+              btId: "001",
+              order: 2,
+            },
+            {
+              bid: "0004",
+              title: "four",
+              content: "xxyyyyxxxxxxx",
+              btId: "001",
+              order: 3,
+            },
           ],
           order: 0
         },
diff --git a/src/components/layout/NavBar.vue b/src/components/layout/NavBar.vue
index f67bb90..6c874e8 100644
--- a/src/components/layout/NavBar.vue
+++ b/src/components/layout/NavBar.vue
@@ -17,6 +17,40 @@
     </el-col>
     <el-col :xs="12" :lg="9" :md="9" :sm="14" :xl="9">
       <div class="right-box">
+        <el-dropdown class="item">
+          <div class="dp-flex justify-content-center align-items height-full width-full">
+            <el-button v-show="!useSettingsStore.isMobile" type="success" round>appStatus</el-button>
+          </div>
+          <template #dropdown>
+            <el-dropdown-menu class="dropdown-group">
+              <el-dropdown-item v-for="status in appStatus">
+                <el-icon v-if="status.status" color="green">
+                  <CircleCheck />
+                </el-icon>
+                <el-icon v-if="!status.status" color="red">
+                  <Warning />
+                </el-icon>
+                {{ status.appName }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+
+        <el-badge :value="messageCount" class="item">
+          <el-button round @click="drawer = true">
+            <template #icon>
+              <el-icon>
+                <Message />
+              </el-icon>
+              <el-drawer v-model="drawer" title="I am the title" :with-header="false">
+                <span>站内信呢</span>
+                <div v-for="msg in messageList">
+
+                </div>
+              </el-drawer>
+            </template>
+          </el-button>
+        </el-badge>
         <el-dropdown>
           <div class="dp-flex justify-content-center align-items height-full width-full">
             <span class="header-avatar" style="cursor: pointer">
@@ -57,19 +91,46 @@
 import CustomPic from "@/components/customPic/index.vue";
 import { tenantStore } from '@/store/modules/tenant'
 import { settingsStore } from '@/store/modules/settings'
+import { Message } from "@element-plus/icons-vue"
+import { reactive, ref } from "vue";
 
 // -- IMPORT --
 const useTenantStore = tenantStore()
 const useSettingsStore = settingsStore()
 
 // -- REACTIVE OBJECT --
+const appStatus = reactive([
+  {
+    appName: "wiki",
+    status: true,
+  },
+  {
+    appName: "bookmark",
+    status: true,
+  },
+  {
+    appName: "calendar",
+    status: false,
+  },
+])
 
 // -- REF OBJECT --
+const messageCount = ref()
+const drawer = ref(false)
+const messageList = reactive<any[]>([
+  {
+    title: "过期通知",
+    type: "",
+    message: "尊敬的用户，你的账号余额已不足，请充值",
+    Unread: true,
+  }
+])
 
 // -- EVENT DEFINITION
 const toPerson = () => {
 }
 
+
 useTenantStore.reflush()
 
 </script>
@@ -88,6 +149,11 @@ useTenantStore.reflush()
   }
 }
 
+.item {
+  margin-top: 5px;
+  margin-right: 30px;
+}
+
 .header-avatar {
   display: flex;
   justify-content: center;
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 5e6dda3..eb7ba32 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -2,7 +2,6 @@
   <div>
     <el-menu router class="el-menu-vertical" :style="{ height: sideHeight }" :background-color="theme.background"
       :active-text-color="theme?.background">
-
       <el-menu-item v-for="(route, index) in current_routes" :key="index" :index="route.path" :title="route.meta?.name"
         @click="onclick()">
         <template #title>
diff --git a/src/view/blog/createBlog.vue b/src/view/blog/createBlog.vue
index 400f536..abdfee5 100644
--- a/src/view/blog/createBlog.vue
+++ b/src/view/blog/createBlog.vue
@@ -43,8 +43,8 @@
       </div>
       <draggable :list="blogTypes[checkedBlogIndex].blogs" ghost-class="ghost" handle=".move" animation="300"
         :force-fallback="true" itemKey="" filter=".forbid" chosen-class="chosenClass" :fallback-class="true"
-        :fallback-on-body="true" :touch-start-threshold="50" :fallback-tolerance="50" @start="onStartBlog"
-        @end="sortBlog" group="group2" :move="onMove">
+        :fallback-on-body="true" :touch-start-threshold="50" :fallback-tolerance="50" @start="onStartBlog" @end="sortBlog"
+        group="group2" :move="onMove">
         <template #item="{ element }">
           <div class="item">
             <label class="move"></label>
@@ -247,6 +247,9 @@ const onclickTypeTab = (order: number) => {
 
 const onclickBlogTab = (blog: Blog) => {
   deleteBtName.value = ""
+  if (blog.order == checkedIndex.value) {
+    return
+  }
   getContent(blog.bid).then(response => {
     checkedIndex.value = blog.order
     blogTypes[checkedBlogIndex.value].blogs[checkedIndex.value].content = response.data.content
@@ -466,16 +469,19 @@ const sortBlogType = () => {
 
   const sortData: BlogType[] = []
   blogTypes.forEach((blogType: BlogType, index) => {
-    blogType.order = index
+
     if (blogType.btId == id.value) {
       checkedBlogIndex.value = index
     }
-    sortData.push({
-      btId: blogType.btId,
-      btName: blogType.btName,
-      blogs: [],
-      order: blogType.order
-    })
+    if (blogType.order != index) {
+      sortData.push({
+        btId: blogType.btId,
+        btName: blogType.btName,
+        blogs: [],
+        order: index
+      })
+      blogType.order = index
+    }
   })
 
   sortBlogTypes(sortData).then(() => {
@@ -489,19 +495,24 @@ const sortBlogType = () => {
   })
 }
 
+/**
+ * @desc wikiソート機能
+ * 
+ */
 const sortBlog = () => {
-
   const sortData: any[] = []
 
   blogTypes[checkedBlogIndex.value].blogs.forEach((blog: Blog, index) => {
-    blog.order = index
     if (blog.bid == id.value) {
       checkedIndex.value = index
     }
-    sortData.push({
-      bid: blog.bid,
-      order: blog.order
-    })
+    if (index != blog.order) {
+      sortData.push({
+        bid: blog.bid,
+        order: index
+      })
+      blog.order = index
+    }
   })
 
   sortBlogs(sortData, blogTypes[checkedBlogIndex.value].btId).then(() => {
@@ -553,13 +564,7 @@ const onStartBlogType = () => {
 };
 
 const onStartBlog = () => {
-  console.log("开始拖拽");
   id.value = blogTypes[checkedBlogIndex.value].blogs[checkedIndex.value].bid
-};
-
-//拖拽结束的事件
-const onEnd = () => {
-
 }
 
 const onMove = (e: any) => {
diff --git a/src/view/bookmark/Typedialog.vue b/src/view/bookmark/Typedialog.vue
index 00198c3..8aa6521 100644
--- a/src/view/bookmark/Typedialog.vue
+++ b/src/view/bookmark/Typedialog.vue
@@ -23,8 +23,7 @@
     <el-form :model="dialog_form">
       <el-form-item label="分类" :label-width="formLabelWidth">
         <el-select v-model="dialog_form.bk_type_id" placeholder>
-          <el-option v-for="(item) in types" :key="item.bk_type_id" :value="item.bk_type_id"
-            :label="item.bk_type_name" />
+          <el-option v-for="(item) in types" :key="item.bk_type_id" :value="item.bk_type_id" :label="item.bk_type_name" />
         </el-select>
         <el-form-item label="备注" :label-width="formLabelWidth">
           <el-input v-model="dialog_form.comment" autocomplete="off" />
diff --git a/src/view/bookmark/index.vue b/src/view/bookmark/index.vue
index 29a1214..95d1f5b 100644
--- a/src/view/bookmark/index.vue
+++ b/src/view/bookmark/index.vue
@@ -208,6 +208,7 @@ const handleTags = (tag: any) => {
   } else {
     tag.clicked = true
     search_form.bk_type_ids.push(tag.bk_type_id)
+    doSearch()
   }
 
 }