Merge pull request #918 from pxgo/master

修复
kccd · Sep 8, 2023 · 4ce790b · 4ce790b
2 parents 130832a + b70c00f
commit 4ce790b
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 5 deletions.
diff --git a/dataModels/ThreadModel.js b/dataModels/ThreadModel.js
@@ -1987,7 +1987,14 @@ threadSchema.statics.getNewAcademicThread = async (fid) => {
   const XsfsRecordModel = mongoose.model('xsfsRecords');
   const ThreadModel = mongoose.model('threads');
   const PostModel = mongoose.model('posts');
-  const academicPost = await XsfsRecordModel.find({}, { pid: 1 })
+  const academicPost = await XsfsRecordModel.find(
+    {
+      num: {
+        $gte: 1,
+      },
+    },
+    { pid: 1 },
+  )
     .limit(100)
     .sort({ toc: -1 })
     .lean();

diff --git a/nkcModules/xssFilters/filterPasteHtml.js b/nkcModules/xssFilters/filterPasteHtml.js
@@ -3,11 +3,23 @@ module.exports = (html = '') => {
   html = xss(html, {
     whiteList: {
       a: ['href', 'title', 'target'],
-      img: ['src', 'alt'],
+      img: [
+        'src',
+        '_src',
+        'alt',
+        'data-tag',
+        'data-type',
+        'data-uploading-order',
+      ],
       br: [],
       p: [],
     },
-    onIgnoreTag: function (tag, html, options) {
+    onTagAttr(tag, name, value) {
+      if (tag === 'img' && name === 'src') {
+        return `${name}="${xss.escapeAttrValue(value)}"`;
+      }
+    },
+    onIgnoreTag: function () {
       return '';
     },
   });

diff --git a/pages/lib/js/logger.js b/pages/lib/js/logger.js
@@ -0,0 +1,22 @@
+import { getState } from './state';
+import { detailedTime } from './time';
+const { isProduction } = getState();
+class Logger {
+  print(type, ...any) {
+    console.log(`[${detailedTime()}]`, `[${type}]`, ...any);
+  }
+  debug(...any) {
+    if (isProduction) {
+      return;
+    }
+    this.print('DEBUG', ...any);
+  }
+  info(...any) {
+    this.print('INFO', ...any);
+  }
+  warning(...any) {
+    this.print('WARN', ...any);
+  }
+}
+
+export const logger = new Logger();
diff --git a/pages/lib/vue/PublicPaper.vue b/pages/lib/vue/PublicPaper.vue
@@ -27,7 +27,7 @@
           form(v-if='question.type === "ans"')
             .answer-form-group
               span 答案：
-              textarea(:disabled = "isCorrect"  v-model='fill' )
+              textarea(:disabled = "isCorrect"  v-model.trim='fill' )
               span(v-if="answerDesc.desc") {{answerDesc.desc}}
           form(v-else)
             label.options(v-if="question.isMultiple" v-for='(q, index) in question.answer' :class="bgc(index,q)")
@@ -337,11 +337,14 @@ export default Vue.extend({
   },
   beforeDestroy() {
     window.removeEventListener('popstate', this.updateUrl);
-    window.removeEventListener('beforeunload', this.handleBeforeUnload);
+    this.removeBeforeunloadEventListener();
   },
   methods: {
     getUrl,
     detailedTime,
+    removeBeforeunloadEventListener() {
+      window.removeEventListener('beforeunload', this.handleBeforeUnload);
+    },
     //获取考题
     getInit(type='default',index = 0) {
       nkcAPI(`/api/v1/exam/public/paper/${this.pid}?index=${index}&&type=${type}`, 'GET')
@@ -552,6 +555,7 @@ export default Vue.extend({
             this.redirectUrl = redirectUrl
             this.isFinished = true;
             this.from = from;
+            this.removeBeforeunloadEventListener();
           }
         });
       }

diff --git a/pages/publicModules/state.pug b/pages/publicModules/state.pug
@@ -33,4 +33,5 @@ if remoteState.isApp
 -windowData.websiteCode = remoteState.serverSettings.websiteCode;
 -windowData.websiteName = remoteState.serverSettings.websiteName;
 -windowData.websiteBrief = remoteState.serverSettings.brief;
+-windowData.isProduction = remoteState.isProduction;
 meta(name='window-data' content=objToStr(windowData))