Merge pull request #980 from pxgo/master

修复，优化
kccd · Aug 27, 2024 · 99a90b0 · 99a90b0
2 parents 60755b7 + 71cb4e6
commit 99a90b0
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 29 deletions.
diff --git a/pages/community/communityTab.pug b/pages/community/communityTab.pug
@@ -1,23 +1,24 @@
 if !isIncluded('community/communityTab')
   mixin renderCommunityTab(isApp,activeTab,communityTab,user)
-    .btn-group.btn-group-justified.m-b-05
-      .btn-group(role="group")
+    if !isApp
+      .btn-group.btn-group-justified.m-b-05
+        .btn-group(role="group")
+            a.btn.btn-default(
+              class=activeTab === communityTab.home ? 'btn-primary': ''
+              href=`/c`
+            ) 专业列表
+        .btn-group(role="group")
           a.btn.btn-default(
-            class=activeTab === communityTab.home ? 'btn-primary': ''
-            href=`/c`
-          ) 专业列表
-      .btn-group(role="group")
-        a.btn.btn-default(
-          class=activeTab === communityTab.new ? 'btn-primary': ''
-          href=`/c/new`
-        ) 最新
-      .btn-group(role="group")
-        if user
-          a.btn.btn-default(
-            class=activeTab === communityTab.subscribe ? 'btn-primary': ''
-            href=`/c/sub`
-          ) 我的订阅
-        else
-          button.btn.btn-default(
-          onclick="RootApp.openLoginPanel('login')"
-          ) 我的订阅
+            class=activeTab === communityTab.new ? 'btn-primary': ''
+            href=`/c/new`
+          ) 最新
+        .btn-group(role="group")
+          if user
+            a.btn.btn-default(
+              class=activeTab === communityTab.subscribe ? 'btn-primary': ''
+              href=`/c/sub`
+            ) 我的订阅
+          else
+            button.btn.btn-default(
+            onclick="RootApp.openLoginPanel('login')"
+            ) 我的订阅
diff --git a/pages/forum/forum.js b/pages/forum/forum.js
@@ -5,7 +5,7 @@ import { shareTypes } from '../lib/js/shareTypes';
 const socket = getSocket();
 const { isApp } = getState();
 const forumInfo = NKC.methods.getDataById('forumInfo');
-const { fid, page, digest, sort } = forumInfo;
+const { fid, page, digest, sort, sizeLimit } = forumInfo;
 
 $(function () {
   RNSetSharePanelStatus(true, shareTypes.forum, fid);
@@ -24,6 +24,7 @@ $(function () {
       uploadResourcesId: NKC.configs.uploadResourcesId
         ? NKC.configs.uploadResourcesId.split('-')
         : [],
+      sizeLimit,
     });
   }
   const threadUrlSwitch = $('#threadUrlSwitch');

diff --git a/pages/forum/forum.pug b/pages/forum/forum.pug
@@ -35,7 +35,7 @@ block content
       .forum-user-panel-body
         for targetUser in users
           include ../publicModules/user_panel/user_panel
-  .hidden#forumInfo=objToStr({fid: data.forum.fid, page: data.paging?data.paging.page:{}, digest: !!data.d, sort: data.s === 'toc'? 'toc': 'tlm'})
+  .hidden#forumInfo=objToStr({fid: data.forum.fid, page: data.paging?data.paging.page:{}, digest: !!data.d, sort: data.s === 'toc'? 'toc': 'tlm', sizeLimit: data.sizeLimit})
   .container-fluid.max-width
     .row
       .col-xs-12.col-md-1.min-md-p-r-0.hidden-xs.hidden-sm

diff --git a/pages/lib/vue/zone/views/Home.vue b/pages/lib/vue/zone/views/Home.vue
@@ -3,7 +3,7 @@
     .row
       .col-md-offset-2.col-xs-12.col-md-8.min-md-p-r-0
         .box-shadow
-          .btn-group.btn-group-justified.m-b-1
+          .btn-group.btn-group-justified.m-b-1(v-if='!isApp')
             .btn-group(role="group")
               button.btn.btn-default(:class="{'btn-primary': tab === zoneTab.all }" @click="getList(type,'a')") 全部
             .btn-group(role="group")

diff --git a/pages/publicModules/library/library.js b/pages/publicModules/library/library.js
@@ -2,7 +2,7 @@ import {getFileMD5} from "../../lib/js/file";
 
 NKC.modules.Library = class {
   constructor(options) {
-    const {lid, folderId, tLid, uploadResourcesId} = options;
+    const {lid, folderId, tLid, uploadResourcesId, sizeLimit} = options;
     const self = this;
     self.app = new Vue({
       el: "#moduleLibrary",
@@ -51,6 +51,7 @@ NKC.modules.Library = class {
           }
         ],
         protocol: true, // 是否同意协议
+        sizeLimit: sizeLimit,
       },
       watch:{
         listCategories() {
@@ -321,14 +322,34 @@ NKC.modules.Library = class {
               file.ext = "mediaAttachment";
             }
           }
+          if (this.sizeLimit) {
+            // 添加附件上传的尺寸限制大小
+            let settingSize;
+            const ext = (file.data.name || '').split('.').at(-1);
+            const itemIndex = this.sizeLimit.others.findIndex(
+              (item) => item.ext === ext,
+            );
+            if (itemIndex === -1) {
+              settingSize = this.sizeLimit.default;
+            } else {
+              settingSize = this.sizeLimit.others[itemIndex].size;
+            }
+            if (size > settingSize * 1024) {
+              file.error = `${ext}文件大小不能超过${this.getSize(
+                settingSize * 1024,
+              )}`;
+              file.disabled = true;
+            }
+          }
 
           if(file.ext === "mediaPicture") {
             file.error = "暂不允许上传图片到文库";
             file.disabled = true;
-          } else if(file.size > 200 * 1024 * 1024) {
-            file.error = "文件大小不能超过200MB";
-            file.disabled = true;
-          }
+          } 
+          // else if(file.size > 200 * 1024 * 1024) {
+          //   file.error = "文件大小不能超过200MB";
+          //   file.disabled = true;
+          // }
 
           return file;
         },

diff --git a/routes/app/check/index.js b/routes/app/check/index.js
@@ -31,7 +31,18 @@ checkRouter.get('/', async (ctx, next) => {
         '?t=' +
         Date.now();
       if (version && version !== newVersion.appVersion) {
-        data.newVersion = newVersion;
+        const parts1 = newVersion.appVersion.split('.').map(Number);
+        const parts2 = version.split('.').map(Number);
+        let isNewVersion = false;
+        for (let i = 0; i < 3; i++) {
+          if (parts1[i] > parts2[i]) {
+            isNewVersion = true;
+            break;
+          } else if (parts1[i] < parts2[i]) {
+            break;
+          }
+        }
+        data.newVersion = isNewVersion ? newVersion : null;
       }
       data.latestVer = newVersion; // 兼容旧版APP的下载链接 2020-1-18，APP更新多个版本后可移除
     }

diff --git a/routes/forum/library.js b/routes/forum/library.js
@@ -29,6 +29,9 @@ router
         data.libraryClosed = true;
       }
     }
+    const uploadSettings = await db.SettingModel.getSettings('upload');
+    const { sizeLimit } = uploadSettings;
+    data.sizeLimit = sizeLimit;
     await next();
   })
   .post('/', async (ctx, next) => {