Преглед изворни кода

修改连续阅读题小题错乱问题

dusenyao пре 1 година
родитељ
комит
cdb47063b2

+ 40 - 36
package-lock.json

@@ -11,8 +11,8 @@
       "dependencies": {
         "@tinymce/tinymce-vue": "^3.2.8",
         "axios": "^1.6.8",
-        "core-js": "^3.36.1",
-        "dompurify": "^3.1.0",
+        "core-js": "^3.37.0",
+        "dompurify": "^3.1.1",
         "element-ui": "^2.15.14",
         "hanzi-writer": "^3.6.1",
         "js-audio-recorder": "^1.0.7",
@@ -40,12 +40,12 @@
         "compression-webpack-plugin": "^6.1.2",
         "eslint": "^8.57.0",
         "eslint-plugin-prettier": "^5.1.3",
-        "eslint-plugin-vue": "^9.24.1",
+        "eslint-plugin-vue": "^9.25.0",
         "patch-package": "^8.0.0",
         "postcss-html": "^1.6.0",
         "prettier": "^3.2.5",
-        "sass": "^1.74.1",
-        "sass-loader": "^14.1.1",
+        "sass": "^1.75.0",
+        "sass-loader": "^14.2.1",
         "stylelint": "^15.11.0",
         "stylelint-config-recess-order": "^4.6.0",
         "stylelint-config-recommended-scss": "^14.0.0",
@@ -5088,10 +5088,14 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.36.1",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.36.1.tgz",
-      "integrity": "sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA==",
-      "hasInstallScript": true
+      "version": "3.37.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.0.tgz",
+      "integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
     },
     "node_modules/core-js-compat": {
       "version": "3.33.0",
@@ -5867,9 +5871,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.1.0.tgz",
-      "integrity": "sha512-yoU4rhgPKCo+p5UrWWWNKiIq+ToGqmVVhk0PmMYBK4kRsR3/qhemNFL8f6CFmBd4gMwm3F4T7HBoydP5uY07fA=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.1.1.tgz",
+      "integrity": "sha512-tVP8C/GJwnABOn/7cx/ymx/hXpmBfWIPihC1aOEvS8GbMqy3pgeYtJk1HXN3CO7tu+8bpY18f6isjR5Cymj0TQ=="
     },
     "node_modules/domready": {
       "version": "1.0.8",
@@ -6148,9 +6152,9 @@
       }
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "9.24.1",
-      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.24.1.tgz",
-      "integrity": "sha512-wk3SuwmS1pZdcuJlokGYEi/buDOwD6KltvhIZyOnpJ/378dcQ4zchu9PAMbbLAaydCz1iYc5AozszcOOgZIIOg==",
+      "version": "9.25.0",
+      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.25.0.tgz",
+      "integrity": "sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
@@ -11989,9 +11993,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.74.1",
-      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.74.1.tgz",
-      "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
+      "version": "1.75.0",
+      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.75.0.tgz",
+      "integrity": "sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -12006,9 +12010,9 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-14.1.1.tgz",
-      "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
+      "version": "14.2.1",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-14.2.1.tgz",
+      "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==",
       "dev": true,
       "dependencies": {
         "neo-async": "^2.6.2"
@@ -19391,9 +19395,9 @@
       }
     },
     "core-js": {
-      "version": "3.36.1",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.36.1.tgz",
-      "integrity": "sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA=="
+      "version": "3.37.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.0.tgz",
+      "integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug=="
     },
     "core-js-compat": {
       "version": "3.33.0",
@@ -19982,9 +19986,9 @@
       }
     },
     "dompurify": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.1.0.tgz",
-      "integrity": "sha512-yoU4rhgPKCo+p5UrWWWNKiIq+ToGqmVVhk0PmMYBK4kRsR3/qhemNFL8f6CFmBd4gMwm3F4T7HBoydP5uY07fA=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.1.1.tgz",
+      "integrity": "sha512-tVP8C/GJwnABOn/7cx/ymx/hXpmBfWIPihC1aOEvS8GbMqy3pgeYtJk1HXN3CO7tu+8bpY18f6isjR5Cymj0TQ=="
     },
     "domready": {
       "version": "1.0.8",
@@ -20375,9 +20379,9 @@
       }
     },
     "eslint-plugin-vue": {
-      "version": "9.24.1",
-      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.24.1.tgz",
-      "integrity": "sha512-wk3SuwmS1pZdcuJlokGYEi/buDOwD6KltvhIZyOnpJ/378dcQ4zchu9PAMbbLAaydCz1iYc5AozszcOOgZIIOg==",
+      "version": "9.25.0",
+      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.25.0.tgz",
+      "integrity": "sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.4.0",
@@ -24801,9 +24805,9 @@
       "dev": true
     },
     "sass": {
-      "version": "1.74.1",
-      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.74.1.tgz",
-      "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
+      "version": "1.75.0",
+      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.75.0.tgz",
+      "integrity": "sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -24812,9 +24816,9 @@
       }
     },
     "sass-loader": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-14.1.1.tgz",
-      "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
+      "version": "14.2.1",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-14.2.1.tgz",
+      "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.2"

+ 5 - 5
package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^1.6.8",
-    "core-js": "^3.36.1",
-    "dompurify": "^3.1.0",
+    "core-js": "^3.37.0",
+    "dompurify": "^3.1.1",
     "element-ui": "^2.15.14",
     "hanzi-writer": "^3.6.1",
     "js-audio-recorder": "^1.0.7",
@@ -40,12 +40,12 @@
     "compression-webpack-plugin": "^6.1.2",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.24.1",
+    "eslint-plugin-vue": "^9.25.0",
     "patch-package": "^8.0.0",
     "postcss-html": "^1.6.0",
     "prettier": "^3.2.5",
-    "sass": "^1.74.1",
-    "sass-loader": "^14.1.1",
+    "sass": "^1.75.0",
+    "sass-loader": "^14.2.1",
     "stylelint": "^15.11.0",
     "stylelint-config-recess-order": "^4.6.0",
     "stylelint-config-recommended-scss": "^14.0.0",

+ 2 - 2
src/views/exercise_questions/answer/index.vue

@@ -360,9 +360,9 @@ export default {
   },
   watch: {
     curQuestionIndex(val) {
+      this.curQuestionPage = '';
+      this.currentQuestion = {};
       if (val === -1) {
-        this.curQuestionPage = '';
-        this.currentQuestion = {};
         return;
       }
       if (this.isShow) {

+ 3 - 2
src/views/exercise_questions/create/components/exercises/FillQuestion.vue

@@ -166,9 +166,10 @@ export default {
     identifyText() {
       this.data.model_essay = [];
       this.data.answer.answer_list = [];
+
       this.data.article
-        .split(/<p.*?>(.*?)<\/p>/gi)
-        .filter((item) => item)
+        .split(/<(p|div)[^>]*>(.*?)<\/(p|div)>/g)
+        .filter((s) => s && !s.match(/^(p|div)$/))
         .forEach((item) => {
           if (item.charCodeAt() === 10) return;
           let str = item

+ 2 - 2
src/views/exercise_questions/create/components/exercises/ListenFillQuestion.vue

@@ -211,8 +211,8 @@ export default {
       this.data.model_essay = [];
       this.data.answer.answer_list = [];
       this.data.article
-        .split(/<p.*?>(.*?)<\/p>/gi)
-        .filter((item) => item)
+        .split(/<(p|div)[^>]*>(.*?)<\/(p|div)>/g)
+        .filter((s) => s && !s.match(/^(p|div)$/))
         .forEach((item) => {
           if (item.charCodeAt() === 10) return;
           let str = item