From 650569b550790eedf806c5b86a440ba61c6aecee Mon Sep 17 00:00:00 2001
From: simple321vip <simple321@vip.qq.com>
Date: Sun, 30 Oct 2022 18:18:53 +0800
Subject: [PATCH] write page modify

---
 package.json                 |  5 ++-
 src/const/config.ts          | 12 +++++-
 src/main.ts                  | 16 +++----
 src/store/tenant.ts          | 27 ++++--------
 src/utils/copyutil.ts        |  8 ++++
 src/utils/request.ts         | 22 +++++++---
 src/view/blog/createBlog.vue | 83 +++++++++++++++++++-----------------
 src/view/blog/index.vue      | 17 +++++++-
 8 files changed, 114 insertions(+), 76 deletions(-)
 create mode 100644 src/utils/copyutil.ts

diff --git a/package.json b/package.json
index 5c73140..3530426 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "violin-home-home",
   "private": true,
-  "version": "0.0.5",
+  "version": "1.0.0",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
     "development": "vite build --mode development",
+    "test": "vite --mode test",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -42,4 +43,4 @@
     "vite-plugin-mock": "^2.9.6",
     "vue-tsc": "^0.29.8"
   }
-}
+}
\ No newline at end of file
diff --git a/src/const/config.ts b/src/const/config.ts
index fa7388d..dff62e4 100644
--- a/src/const/config.ts
+++ b/src/const/config.ts
@@ -23,7 +23,17 @@ const configObj: any = {
     DEVICE_ID: '&device_id=27103657',
     QR_CODE: '&qrcode=' + '1',
     DISPLAY: '&display=popup'
-  }
+  },
+  test: {
+    BAIDU_CLOUD_URL: 'http://openapi.baidu.com/oauth/2.0/authorize',
+    RESPONSE_TYPE: '?response_type=' + 'code',
+    CLIENT_ID: '&client_id=' + 'BIukdHDXeNPmIXe96GA6OOXGgnP5GEhM',
+    REDIRECT_URI: '&redirect_uri=' + 'http://localhost:8080/auth/api/v1/authorize/baidu',
+    SCOPE: '&scope=basic,netdisk',
+    DEVICE_ID: '&device_id=27103657',
+    QR_CODE: '&qrcode=' + '1',
+    DISPLAY: '&display=popup'
+  },
 };
 
 export default { ...configObj[env] };
diff --git a/src/main.ts b/src/main.ts
index 562d29d..5261aa0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -60,13 +60,14 @@ async function checktoken(url: string) {
       account: query_data.account
     }
     const tenant_store = tenantStore()
-    await tenant_store.login(tenant, query_data.token)
-
-    const { href } = router.resolve({
-      path: '/'
-    });
-    window.open(href, '_self');
-    return
+    await tenant_store.login(tenant, query_data.token).then(() => {
+      const { href } = router.resolve({
+        path: '/'
+      });
+      window.open(href, '_self');
+    }).catch((error) => {
+      console.log(error)
+    })
   }
   if (url.search("sorryPage") != -1) {
     router.push({
@@ -90,7 +91,6 @@ router.beforeEach((to, from, next) => {
 
   const token = getToken()
 
-
   if (typeof token === 'string') {
     switch (to.path) {
       case '/login':
diff --git a/src/store/tenant.ts b/src/store/tenant.ts
index bca4259..3e017e5 100644
--- a/src/store/tenant.ts
+++ b/src/store/tenant.ts
@@ -42,29 +42,20 @@ export const tenantStore = defineStore({
      * @param {string} user_password
      */
     async login(tenant: any, token: string) {
-      const userData = await authorize({
-        tenant_id: tenant.tenant_id, token: token
-      })
-      if (userData.data.token) {
-        this.$patch({
-          account: tenant.tenant_id,
 
-          ...userData.data,
-          id: 'true'
+      try {
+        await authorize({
+          tenant_id: tenant.tenant_id, token: token
         })
-        setToken(userData.data.token)
-        setTenant(userData)
-        console.log('authorize success!')
+        setToken(token)
+        setTenant(tenant)
+      } catch {
+        Promise.resolve("authorize error")
       }
 
-      return new Promise((resolve, reject) => {
-        if (userData.data.message) {
-          reject(userData.data.message)
-        } else {
-          resolve(userData.data)
-        }
-      })
     },
+
+
     async reflush() {
       if (getToken()) {
         const tenant = <Tenant>(JSON.parse(getTenant() as string))
diff --git a/src/utils/copyutil.ts b/src/utils/copyutil.ts
new file mode 100644
index 0000000..1c32803
--- /dev/null
+++ b/src/utils/copyutil.ts
@@ -0,0 +1,8 @@
+const copy = (small_object: any, big_object: any) => {
+  Object.keys(small_object).forEach((key) => {
+    small_object[key] = big_object[key]
+  })
+  return small_object
+}
+
+export { copy }
\ No newline at end of file
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 16921c5..c883bff 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -20,18 +20,30 @@ const trader_service = axios.create(
 service.interceptors.request.use(
   config => {
     if (typeof getToken() === 'string') {
-      (config as any).headers['Authorization'] = 'Bearer' + getToken()
+      (config as any).headers['Authorization'] = 'Bearer:' + getToken()
     }
     const tenant = getTenant()
     if (typeof tenant === 'string') {
-      (config as any).headers['id'] = JSON.parse(tenant).id
+      (config as any).headers['tenantId'] = JSON.parse(tenant).tenant_id
     }
 
     return config
   },
-  error => {
-    console.log(error)
-    return Promise.reject(error)
+  async error => {
+    console.log("-----------------")
+    const err = {} as any
+    if (error.code === "ECONNABORTED") {
+      err.message = "time out"
+      return Promise.reject(error)
+    }
+    if (!error.response) {
+      err.message = "server error"
+      return Promise.reject(error)
+    }
+    if (error.response) {
+      return Promise.reject(error.response.data)
+    }
+    return Promise.reject(error.response.data)
   }
 )
 
diff --git a/src/view/blog/createBlog.vue b/src/view/blog/createBlog.vue
index 6044554..05a1a0d 100644
--- a/src/view/blog/createBlog.vue
+++ b/src/view/blog/createBlog.vue
@@ -64,14 +64,14 @@
         <el-input v-model="blogTypes[checkedBlogIndex].blogs[checkedIndex].title" @keyup.enter.native="saveTitle"
           @blur="saveTitle">
         </el-input>
+
         <div style="width: 60px;">
           <span v-if="!updated">已保存</span>
           <span v-if="updated">更新中</span>
         </div>
       </div>
       <div :style="cWholeStyle">
-        <md-editor theme="light" v-model="blogTypes[checkedBlogIndex].blogs[checkedIndex].content" @save="saveContent"
-          :style="{ height: innerHeight }" />
+        <md-editor theme="light" v-model="current_blog.content" @save="saveContent" :style="{ height: innerHeight }" />
       </div>
     </div>
 
@@ -118,10 +118,10 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, watch } from 'vue'
+import { reactive, ref, watch } from 'vue'
 import $moment from "moment"
 import MdEditor from 'md-editor-v3'
-import { Edit, CaretRight, CaretLeft, Setting, Delete } from "@element-plus/icons-vue"
+import { CaretRight, CaretLeft, Setting, Delete } from "@element-plus/icons-vue"
 import 'md-editor-v3/lib/style.css'
 import { h } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -137,12 +137,12 @@ import {
   sortBlogTypes,
   sortBlogs
 } from '../../api/blog'
+import { copy } from '../../utils/copyutil'
 import draggable from "vuedraggable"
 
 type Blog = {
   bid: string,
   btId: string,
-  btName: string,
   title: string,
   blog_prex: string,
   autosave_control: string,
@@ -170,6 +170,10 @@ let startTime = reactive($moment());
 // tmp btName for create, edit, delete
 let btName = ref("")
 let deleteBtName = ref("")
+let current_blog = reactive({
+  bid: "",
+  content: "",
+})
 
 /*
 draggable 对CSS样式没有什么要求万物皆可拖拽
@@ -204,7 +208,6 @@ const getTestData = async () => {
         const blog: Blog = {
           bid: item.bid,
           btId: item.btId,
-          btName: item.btName,
           title: item.title,
           blog_prex: item.blog_prex,
           autosave_control: item.autosave_control,
@@ -215,10 +218,13 @@ const getTestData = async () => {
       })
       blogTypes.push(blog_type)
     })
+    isReady.value = true
+    checkedBlogIndex.value = blogTypes[0].order
+    checkedIndex.value = 0
+    console.log(blogTypes[0].blogs[0])
+    copy(current_blog, blogTypes[0].blogs[0])
   })
-  isReady.value = true
-  checkedBlogIndex.value = blogTypes[0].order
-  checkedIndex.value = 0
+
   // TODO 需要优化部分
   /**
    * 延迟执行一秒
@@ -226,7 +232,8 @@ const getTestData = async () => {
    * 获取上一次修改时间，startTime
    * 
    */
-  watch(blogTypes[checkedBlogIndex.value].blogs[checkedIndex.value], (newVal, oldVal) => {
+  watch(current_blog, (newVal, oldVal) => {
+
     let current = $moment() // 获取当前时间，current 09:00:00 09:00:00.500
     const tmp = startTime // 获取开始时间，将值赋给tmp 8:30:00 09:00:00
     startTime = current // 更新开始时间为当前 09:00:00 09:00:00.500
@@ -235,7 +242,7 @@ const getTestData = async () => {
         saveContent()
       }
     }, 1000)
-
+    updated.value = false
   })
 }
 
@@ -244,20 +251,24 @@ const getTestData = async () => {
  * @param order
  */
 const onclickTypeTab = (order: number) => {
-  checkedBlogIndex.value = order
   const bid = blogTypes[order].blogs[0].bid
+  deleteBtName.value = ""
   getContent(bid).then(response => {
     blogTypes[order].blogs[0].content = response.data.content
     checkedBlogIndex.value = order
     checkedIndex.value = 0
+    copy(current_blog, blogTypes[checkedBlogIndex.value].blogs[0])
+    updated.value = true
   })
 }
 
 const onclickBlogTab = (blog: Blog) => {
-  checkedIndex.value = blog.order
+  deleteBtName.value = ""
   getContent(blog.bid).then(response => {
     blogTypes[checkedBlogIndex.value].blogs[checkedIndex.value].content = response.data.content
     checkedIndex.value = blog.order
+    copy(current_blog, blog)
+    updated.value = true
   }).catch(() => {
     checkedIndex.value = blog.order
   })
@@ -272,14 +283,14 @@ const saveContent = () => {
   }
   updated.value = true
   const query = {
-    bid: checkedIndex.value,
-    content: blogTypes[checkedBlogIndex.value].blogs[checkedIndex.value].content
+    bid: current_blog.bid,
+    content: current_blog.content
   }
   updateContent(query).then(response => {
     if (response.status == 200) {
       updated.value = false
     }
-  }).then(() => {
+  }).catch(() => {
     ElMessage({
       message: h('p', null, [
         h('i', { style: 'color: teal' }, "文章保存失败"),
@@ -289,21 +300,21 @@ const saveContent = () => {
 }
 
 
-
 /**
  * Blogタイトル修正
  */
 const saveTitle = () => {
-  if (updated.value) {
-    return
-  }
-  updated.value = true
   const query = {
-    bid: checkedIndex.value,
+    bid: current_blog.bid,
     title: blogTypes[checkedBlogIndex.value].blogs[checkedIndex.value].title
   }
   updateContent(query).then(() => {
-    updated.value = false
+  }).catch(() => {
+    ElMessage({
+      message: h('p', null, [
+        h('i', { style: 'color: teal' }, "文章标题保存失败"),
+      ]),
+    })
   })
 }
 
@@ -313,7 +324,7 @@ const saveTitle = () => {
 const insertBlog = () => {
   isclicked.value = true
   const data = {
-    btId: checkedBlogIndex.value,
+    btId: blogTypes[checkedBlogIndex.value].btId,
     title: $moment().format("YYYY-MM-DD"),
     order: blogTypes[checkedBlogIndex.value].blogs.length
   }
@@ -322,7 +333,6 @@ const insertBlog = () => {
     const blog = {
       bid: bid,
       btId: btid,
-      btName: "",
       title: title,
       blog_prex: "",
       content: content,
@@ -333,6 +343,7 @@ const insertBlog = () => {
     blogTypes[checkedBlogIndex.value].blogs.push(blog)
     checkedIndex.value = order
     isclicked.value = false
+    copy(current_blog, blog)
   })
 }
 
@@ -350,7 +361,6 @@ const deleteBlog = () => {
         const blog: Blog = {
           bid: item.bid,
           btId: item.btId,
-          btName: item.btName,
           title: item.title,
           blog_prex: item.blog_prex,
           autosave_control: item.autosave_control,
@@ -359,6 +369,8 @@ const deleteBlog = () => {
         }
         blogTypes[checkedBlogIndex.value].blogs.push(blog)
       })
+      checkedIndex.value = 0
+      copy(current_blog, blogTypes[checkedBlogIndex.value].blogs[0])
       deleteDialogVisible.value = false
       btName.value = ""
     }).catch(() => {
@@ -371,6 +383,7 @@ const deleteBlog = () => {
 const handleCreateBlogType = () => {
   btName.value = blogTypes[checkedBlogIndex.value].btName
   blogTypeEditDialogVisible.value = true
+  deleteBtName.value = ""
 }
 
 /**
@@ -396,7 +409,6 @@ const insertBlogType = () => {
       const blog: Blog = {
         bid: item.bid,
         btId: item.btId,
-        btName: item.btName,
         title: item.title,
         blog_prex: item.blog_prex,
         autosave_control: item.autosave_control,
@@ -408,6 +420,7 @@ const insertBlogType = () => {
     blogTypes.push(blog_type)
     checkedBlogIndex.value = response.data.order
     checkedIndex.value = blog_type.blogs[0].order
+    copy(current_blog, blogTypes[checkedBlogIndex.value].blogs[0])
     blogTypeCreateDialogVisible.value = false
     btName.value = ""
   })
@@ -426,7 +439,6 @@ const saveBlogType = () => {
     btName: btName.value,
   }
   updateBtName(query).then(() => {
-    console.log(blogTypes)
     blogTypes[checkedBlogIndex.value].btName = btName.value
     blogTypeEditDialogVisible.value = false
     btName.value = ""
@@ -439,11 +451,10 @@ const saveBlogType = () => {
 const deleteBlogType = () => {
   if (deleteBtName.value == blogTypes[checkedBlogIndex.value].btName) {
     const data = {
-      btId: checkedBlogIndex.value
+      btId: blogTypes[checkedBlogIndex.value].btId
     }
     removeBlogType(data).then((response) => {
       blogTypes.length = 0
-      response.data.sort((x: any, y: any) => { x.order - y.order })
       response.data.forEach((element: any) => {
         const blog_type: BlogType = {
           btId: element.btId,
@@ -455,7 +466,6 @@ const deleteBlogType = () => {
           const blog: Blog = {
             bid: item.bid,
             btId: item.btId,
-            btName: item.btName,
             title: item.title,
             blog_prex: item.blog_prex,
             autosave_control: item.autosave_control,
@@ -468,12 +478,12 @@ const deleteBlogType = () => {
       })
       checkedBlogIndex.value = 0
       checkedIndex.value = 0
+      copy(current_blog, blogTypes[0].blogs[0])
       blogTypeEditDialogVisible.value = false
     })
   } else {
     blogTypeEditDialogVisible.value = false
   }
-  deleteBtName.value = ""
 }
 
 const sortBlogType = () => {
@@ -513,7 +523,7 @@ const sortBlog = () => {
       checkedIndex.value = index
     }
     sortData.push({
-      bid: blog.btId,
+      bid: blog.bid,
       order: blog.order
     })
   })
@@ -564,13 +574,6 @@ const cWholeStyle = reactive<WholeStyle>({} as WholeStyle)
 const collapsible = reactive([0, 0])
 const whole_width = reactive([0.15, 0.15])
 let innerHeight = ref("")
-const selected_style = {
-  "background-color": "#EBEBEB"
-}
-
-const unselected_style = {
-  "background-color": "#FFFFFF"
-}
 
 const setup_size = () => {
   btWholeStyle.width = whole_width[0] * window.innerWidth + 'px'
diff --git a/src/view/blog/index.vue b/src/view/blog/index.vue
index fa37591..6a07053 100644
--- a/src/view/blog/index.vue
+++ b/src/view/blog/index.vue
@@ -41,7 +41,10 @@
     </div>
     <!-- <span style="font-size: 12px;">{{ item.blog_prex }}</span> -->
   </div>
-
+  <div class="page_style">
+    <!-- <el-pagination small layout="prev, pager, next" :total="50" /> -->
+    <el-pagination small background layout="prev, pager, next" :total="50" class="mt-4" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -67,7 +70,10 @@ const form = reactive({
   key_word: '',
   btId: '',
   start_day: '',
-  end_day: ''
+  end_day: '',
+  page_number: 1,
+  page_size: 20,
+  total: 1
 })
 const data_list = reactive<Blog[]>([])
 const btNameList = reactive<Blog_Type[]>([])
@@ -141,4 +147,11 @@ init()
   padding-top: 10px;
   padding-bottom: 10px;
 }
+
+.page_style {
+  margin-top: 25px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
 </style>
\ No newline at end of file