v3.3.1

star7th · Dec 7, 2024 · 8c83776 · 8c83776
1 parent 4de5899
commit 8c83776
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "Api"
     ],
     "homepage": "https://github.com/star7th/showdoc",
-    "version": "v3.3.0",
+    "version": "v3.3.1",
     "license": "Apache-2.0",
     "authors": [
         {

diff --git a/web/index.html b/web/index.html
@@ -9,4 +9,4 @@
           '../server/index.php?s=',
         // "lang" :'en'
         lang: 'zh-cn'
-      }</script><link href="./static/css/app.c97d2f978a5aead08b152cd194a5ebf3.css" rel="stylesheet"></head><body class="grey-bg"><div id="app"></div><script type="text/javascript" src="./static/js/manifest.3ad1d5771e9b13dbdad2.js"></script><script type="text/javascript" src="./static/js/vendor.6958fbe8e7ac7908b110.js"></script><script type="text/javascript" src="./static/js/app.c46b0539d010154bdc26.js"></script></body></html>
+      }</script><link href="./static/css/app.93c3930f38a83da31023043fc45ea15f.css" rel="stylesheet"></head><body class="grey-bg"><div id="app"></div><script type="text/javascript" src="./static/js/manifest.3ad1d5771e9b13dbdad2.js"></script><script type="text/javascript" src="./static/js/vendor.6958fbe8e7ac7908b110.js"></script><script type="text/javascript" src="./static/js/app.650d2e7c0435d06afada.js"></script></body></html>
diff --git a/.../app.c97d2f978a5aead08b152cd194a5ebf3.css → .../app.93c3930f38a83da31023043fc45ea15f.css b/.../app.c97d2f978a5aead08b152cd194a5ebf3.css → .../app.93c3930f38a83da31023043fc45ea15f.css
diff --git a/web/static/js/app.650d2e7c0435d06afada.js b/web/static/js/app.650d2e7c0435d06afada.js
diff --git a/web/static/js/app.c46b0539d010154bdc26.js b/web/static/js/app.c46b0539d010154bdc26.js
diff --git a/web_src/src/components/Index.vue b/web_src/src/components/Index.vue
@@ -256,8 +256,8 @@ export default {
     this.homePageSetting()
     this.link = '/user/login'
     this.link_text = this.$t('index_login_or_register')
-    getUserInfo(response => {
-      if (response.data.error_code === 0) {
+    getUserInfo(data => {
+      if (data.error_code === 0) {
         this.link = '/item/index'
         this.link_text = this.$t('my_item')
       }

diff --git a/web_src/src/components/item/Index.vue b/web_src/src/components/item/Index.vue
@@ -488,14 +488,14 @@ export default {
     // 检测邮箱绑定情况
     checkEmail() {
       var that = this
-      getUserInfo(function(response) {
-        if (response.data.error_code === 0) {
-          that.username = response.data.data.username
-          if (response.data.data.groupid == 1) {
+      getUserInfo(function(data) {
+        if (data.error_code === 0) {
+          that.username = data.data.username
+          if (data.data.groupid == 1) {
             that.isAdmin = true
           }
-          if (response.data.data.email_verify < 1) {
-            if (response.data.data.email.length > 0) {
+          if (data.data.email_verify < 1) {
+            if (data.data.email.length > 0) {
               that.$message({
                 showClose: true,
                 duration: 10000,

diff --git a/web_src/src/components/item/home/Index.vue b/web_src/src/components/item/home/Index.vue
@@ -272,10 +272,10 @@ export default {
     },
     checkAdmin() {
       var that = this
-      getUserInfo(function(response) {
-        if (response.data.error_code === 0) {
-          that.username = response.data.data.username
-          if (response.data.data.groupid == 1) {
+      getUserInfo(function(data) {
+        if (data.error_code === 0) {
+          that.username = data.data.username
+          if (data.data.groupid == 1) {
             that.isAdmin = true
           }
         }

diff --git a/web_src/src/components/item/show/Index.vue b/web_src/src/components/item/show/Index.vue
@@ -159,9 +159,9 @@ export default {
         }
       } else {
         // 网络请求获取用户信息
-        getUserInfo(response => {
-          if (response.data.error_code === 0) {
-            let user_info = response.data.data
+        getUserInfo(data => {
+          if (data.error_code === 0) {
+            let user_info = data.data
             this.$store.dispatch('changeUserInfo', user_info).then(() => {
               this.renderWatermark()
             })

diff --git a/web_src/src/components/item/show/show_regular_item/HeaderRight.vue b/web_src/src/components/item/show/show_regular_item/HeaderRight.vue
@@ -204,6 +204,11 @@
           this.showHistoryVersiong = false
         }
       "
+      :cancel="
+        data => {
+          this.showHistoryVersiong = false
+        }
+      "
     ></HistoryVersion>
 
     <!-- 回收站的弹窗 -->

diff --git a/web_src/src/components/item/show/show_regular_item/LeftMenu.vue b/web_src/src/components/item/show/show_regular_item/LeftMenu.vue
@@ -41,7 +41,7 @@
             class="custom-tree-node node-folder"
             :id="'node-' + node.data.id"
           >
-          <i
+            <i
               v-if="openeds.includes(node.data.id) && node.data.children.length"
               class="mr-2 far fa-folder-open"
             ></i>
@@ -105,6 +105,11 @@
             this.showHistoryVersiong = false
           }
         "
+        :cancel="
+          data => {
+            this.showHistoryVersiong = false
+          }
+        "
       ></HistoryVersion>
 
       <CopyCatalog
@@ -335,7 +340,7 @@ export default {
     handleDragEnd() {
       const treeData = this.menu
       // 将拖动的顺序和层级信息保存到后台
-      
+
       // 如果是搜索结果，则不保存目录层级关系到后台
       if (this.keyword) {
         return false

diff --git a/web_src/src/components/item/show/show_table_item/Index.vue b/web_src/src/components/item/show/show_table_item/Index.vue
@@ -96,11 +96,11 @@ export default {
       }
       this.request('/api/page/info', {
         page_id: page_id
-      }).then(response => {
-        if (response.data.page_content) {
+      }).then(data => {
+        if (data.data.page_content) {
           let objData
           try {
-            objData = JSON.parse(unescapeHTML(response.data.page_content))
+            objData = JSON.parse(unescapeHTML(data.data.page_content))
           } catch (error) {
             objData = {}
           }

diff --git a/web_src/src/components/user/Login.vue b/web_src/src/components/user/Login.vue
@@ -175,10 +175,10 @@ export default {
       this.request('/api/ScriptCron/run', {}, 'get',false)
     },
     getOauth() {
-      this.request('/api/user/oauthInfo', {}, 'get',false).then(response => {
-        if (response.data.error_code === 0) {
-          if (response.data.data.oauth2_open > 0) {
-            this.oauth2_entrance_tips = response.data.data.oauth2_entrance_tips
+      this.request('/api/user/oauthInfo', {}, 'get',false).then(data => {
+        if (data.error_code === 0) {
+          if (data.data.oauth2_open > 0) {
+            this.oauth2_entrance_tips = data.data.oauth2_entrance_tips
           }
         }
       })
@@ -204,8 +204,8 @@ export default {
       const element = eles[index]
       element.remove()
     }
-    getUserInfo(function(response) {
-      if (response.data.error_code === 0) {
+    getUserInfo(function(data) {
+      if (data.error_code === 0) {
         let redirect = decodeURIComponent(
           that.$route.query.redirect || '/item/index'
         )

diff --git a/web_src/src/models/user.js b/web_src/src/models/user.js
@@ -1,16 +1,9 @@
 import request from '@/request.js'
 
 const getUserInfo = (callback = () => {}) => {
-  request(
-    '/api/user/info',
-    {
-      redirect_login: false
-    },
-    'post',
-    false
-  ).then(data => {
+  return request('/api/user/info', {}, 'post', false).then(data => {
     if (callback) {
-      callback({ data })
+      callback(data)
     }
   })
 }