update

package-lock.json

@@ -11,10 +11,10 @@
         "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
         "awe-dnd": "^0.3.4",
         "axios": "^0.26.1",
-        "book-ui": "file:../book-ui-0.2.35.tgz",
-        "core-js": "^3.21.1",
-        "dayjs": "^1.11.0",
-        "element-ui": "^2.15.6",
+        "book-ui": "file:../book-ui-0.2.38.tgz",
+        "core-js": "^3.22.0",
+        "dayjs": "^1.11.1",
+        "element-ui": "^2.15.8",
         "gcls-book-question-ui": "file:../gcls-book-question-ui-0.1.0.tgz",
         "jquery": "^3.6.0",
         "js-base64": "^3.7.2",
@@ -34,7 +34,7 @@
         "@babel/core": "^7.17.9",
         "@babel/eslint-parser": "^7.17.0",
         "@babel/preset-env": "^7.16.11",
-        "@rushstack/eslint-patch": "^1.1.2",
+        "@rushstack/eslint-patch": "^1.1.3",
         "@vue/cli-plugin-babel": "~4.5.17",
         "@vue/cli-plugin-eslint": "~4.5.17",
         "@vue/cli-plugin-router": "~4.5.17",
@@ -52,12 +52,12 @@
         "eslint-plugin-vue": "^8.6.0",
         "html-webpack-plugin": "^5.3.1",
         "postcss": "^8.4.12",
-        "postcss-html": "^1.3.0",
+        "postcss-html": "^1.4.1",
         "prettier": "2.6.2",
         "sass": "^1.50.0",
         "sass-loader": "^10.2.1",
         "script-ext-html-webpack-plugin": "^2.1.5",
-        "stylelint": "14.6.1",
+        "stylelint": "14.7.1",
         "stylelint-config-prettier": "^9.0.3",
         "stylelint-config-recess-order": "^3.0.0",
         "stylelint-config-recommended-vue": "^1.4.0",
@@ -2763,9 +2763,9 @@
       }
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.2.tgz",
-      "integrity": "sha512-oe5WJEDaVsW8fBlGT7udrSCgOwWfoYHQOmSpnh8X+0GXpqqcRCP8k4y+Dxb0taWJDPpB+rdDUtumIiBwkY9qGA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
+      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
       "dev": true
     },
     "node_modules/@soda/friendly-errors-webpack-plugin": {
@@ -6222,9 +6222,9 @@
       "dev": true
     },
     "node_modules/book-ui": {
-      "version": "0.2.35",
-      "resolved": "file:../book-ui-0.2.35.tgz",
-      "integrity": "sha512-7uSnf8bH9OArvOCwMpK7Jo/nDRLdL9AVnQ67IPonUJMajq5zm2LAZbb8g24+ZSpVvBHQ2GgjCoxE6NkCefAK4Q==",
+      "version": "0.2.38",
+      "resolved": "file:../book-ui-0.2.38.tgz",
+      "integrity": "sha512-UUd6wyJnE0Y91rO+21Lh32zkcUrUZIHLyaLFWDF6F2SAn5Gfs8ol2WvSe7MnKw2UaEJUioi0T0tQKRLfLlEb/g==",
       "dependencies": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -8076,9 +8076,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
+      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -8784,9 +8784,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.0.tgz",
-      "integrity": "sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug=="
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.1.tgz",
+      "integrity": "sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA=="
     },
     "node_modules/de-indent": {
       "version": "1.0.2",
@@ -9583,9 +9583,9 @@
       "dev": true
     },
     "node_modules/element-ui": {
-      "version": "2.15.6",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.6.tgz",
-      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
+      "version": "2.15.8",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz",
+      "integrity": "sha512-N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A==",
       "dependencies": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -12345,12 +12345,15 @@
       "dev": true
     },
     "node_modules/html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
       "dev": true,
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/html-webpack-plugin": {
@@ -18218,9 +18221,9 @@
       }
     },
     "node_modules/postcss-html": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/postcss-html/-/postcss-html-1.3.0.tgz",
-      "integrity": "sha512-ewbwd7OGW4dLsErtvZH9HpVMEcXnlhYSzKsr7MepGlOT8imHTIZ/+pdfEruLS+hTYapLTQAWDnoQcJpsYU4uRw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.4.1.tgz",
+      "integrity": "sha512-OKihuWxPuBQrQeLNsavP7ytJ9IYNj/ViAXB2v7Qjh56LnfESKrkahKA9si4VfPN8xtz6oqUE6KdL0bTPrHJr6g==",
       "dev": true,
       "dependencies": {
         "htmlparser2": "^7.1.2",
@@ -22356,9 +22359,9 @@
       }
     },
     "node_modules/stylelint": {
-      "version": "14.6.1",
-      "resolved": "https://registry.npmmirror.com/stylelint/-/stylelint-14.6.1.tgz",
-      "integrity": "sha512-FfNdvZUZdzh9KDQxDnO7Opp+prKh8OQVuSW8S13cBtxrooCbm6J6royhUeb++53WPMt04VB+ZbOz/QmzAijs6Q==",
+      "version": "14.7.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
+      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
       "dev": true,
       "dependencies": {
         "balanced-match": "^2.0.0",
@@ -22374,7 +22377,7 @@
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
-        "html-tags": "^3.1.0",
+        "html-tags": "^3.2.0",
         "ignore": "^5.2.0",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
@@ -22382,7 +22385,7 @@
         "known-css-properties": "^0.24.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
-        "micromatch": "^4.0.4",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "normalize-selector": "^0.2.0",
         "picocolors": "^1.0.0",
@@ -22390,7 +22393,7 @@
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^6.0.10",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "specificity": "^0.4.1",
@@ -28776,9 +28779,9 @@
       }
     },
     "@rushstack/eslint-patch": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.2.tgz",
-      "integrity": "sha512-oe5WJEDaVsW8fBlGT7udrSCgOwWfoYHQOmSpnh8X+0GXpqqcRCP8k4y+Dxb0taWJDPpB+rdDUtumIiBwkY9qGA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
+      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
       "dev": true
     },
     "@soda/friendly-errors-webpack-plugin": {
@@ -31606,8 +31609,8 @@
       }
     },
     "book-ui": {
-      "version": "file:..\\book-ui-0.2.35.tgz",
-      "integrity": "sha512-7uSnf8bH9OArvOCwMpK7Jo/nDRLdL9AVnQ67IPonUJMajq5zm2LAZbb8g24+ZSpVvBHQ2GgjCoxE6NkCefAK4Q==",
+      "version": "file:..\\book-ui-0.2.38.tgz",
+      "integrity": "sha512-UUd6wyJnE0Y91rO+21Lh32zkcUrUZIHLyaLFWDF6F2SAn5Gfs8ol2WvSe7MnKw2UaEJUioi0T0tQKRLfLlEb/g==",
       "requires": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -33092,9 +33095,9 @@
       }
     },
     "core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
+      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ=="
     },
     "core-js-compat": {
       "version": "3.21.1",
@@ -33664,9 +33667,9 @@
       }
     },
     "dayjs": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.0.tgz",
-      "integrity": "sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug=="
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.1.tgz",
+      "integrity": "sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA=="
     },
     "de-indent": {
       "version": "1.0.2",
@@ -34316,9 +34319,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.15.6",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.6.tgz",
-      "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==",
+      "version": "2.15.8",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz",
+      "integrity": "sha512-N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -36469,9 +36472,9 @@
       }
     },
     "html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
       "dev": true
     },
     "html-webpack-plugin": {
@@ -41106,9 +41109,9 @@
       }
     },
     "postcss-html": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/postcss-html/-/postcss-html-1.3.0.tgz",
-      "integrity": "sha512-ewbwd7OGW4dLsErtvZH9HpVMEcXnlhYSzKsr7MepGlOT8imHTIZ/+pdfEruLS+hTYapLTQAWDnoQcJpsYU4uRw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.4.1.tgz",
+      "integrity": "sha512-OKihuWxPuBQrQeLNsavP7ytJ9IYNj/ViAXB2v7Qjh56LnfESKrkahKA9si4VfPN8xtz6oqUE6KdL0bTPrHJr6g==",
       "dev": true,
       "requires": {
         "htmlparser2": "^7.1.2",
@@ -44368,9 +44371,9 @@
       }
     },
     "stylelint": {
-      "version": "14.6.1",
-      "resolved": "https://registry.npmmirror.com/stylelint/-/stylelint-14.6.1.tgz",
-      "integrity": "sha512-FfNdvZUZdzh9KDQxDnO7Opp+prKh8OQVuSW8S13cBtxrooCbm6J6royhUeb++53WPMt04VB+ZbOz/QmzAijs6Q==",
+      "version": "14.7.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
+      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
       "dev": true,
       "requires": {
         "balanced-match": "^2.0.0",
@@ -44386,7 +44389,7 @@
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
-        "html-tags": "^3.1.0",
+        "html-tags": "^3.2.0",
         "ignore": "^5.2.0",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
@@ -44394,7 +44397,7 @@
         "known-css-properties": "^0.24.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
-        "micromatch": "^4.0.4",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "normalize-selector": "^0.2.0",
         "picocolors": "^1.0.0",
@@ -44402,7 +44405,7 @@
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^6.0.10",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "specificity": "^0.4.1",

package.json

@@ -16,10 +16,10 @@
     "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
     "awe-dnd": "^0.3.4",
     "axios": "^0.26.1",
-    "book-ui": "file:../book-ui-0.2.35.tgz",
-    "core-js": "^3.21.1",
-    "dayjs": "^1.11.0",
-    "element-ui": "^2.15.6",
+    "book-ui": "file:../book-ui-0.2.38.tgz",
+    "core-js": "^3.22.0",
+    "dayjs": "^1.11.1",
+    "element-ui": "^2.15.8",
     "gcls-book-question-ui": "file:../gcls-book-question-ui-0.1.0.tgz",
     "jquery": "^3.6.0",
     "js-base64": "^3.7.2",
@@ -39,7 +39,7 @@
     "@babel/core": "^7.17.9",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
-    "@rushstack/eslint-patch": "^1.1.2",
+    "@rushstack/eslint-patch": "^1.1.3",
     "@vue/cli-plugin-babel": "~4.5.17",
     "@vue/cli-plugin-eslint": "~4.5.17",
     "@vue/cli-plugin-router": "~4.5.17",
@@ -57,12 +57,12 @@
     "eslint-plugin-vue": "^8.6.0",
     "html-webpack-plugin": "^5.3.1",
     "postcss": "^8.4.12",
-    "postcss-html": "^1.3.0",
+    "postcss-html": "^1.4.1",
     "prettier": "2.6.2",
     "sass": "^1.50.0",
     "sass-loader": "^10.2.1",
     "script-ext-html-webpack-plugin": "^2.1.5",
-    "stylelint": "14.6.1",
+    "stylelint": "14.7.1",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recess-order": "^3.0.0",
     "stylelint-config-recommended-vue": "^1.4.0",

src/components/course/CompletionView.vue

@@ -44,6 +44,8 @@
         task-model="ANSWER"
         :is-show-title="true"
         :is-show-save="false"
+        :preview-type="previewType"
+        :preview-group-id="previewGroupId"
         :book-answer-content="bookAnswerContent"
       />
     </template>
@@ -89,7 +91,9 @@ export default {
       bookAnswerContent: '',
       category: '',
       dialogWidth: '820px',
-      themeColor: ''
+      themeColor: '',
+      previewType: 'previewCheckShow',
+      previewGroupId: '[]'
     };
   },
   watch: {

src/components/select/SelectCourse.vue

@@ -28,17 +28,27 @@
         </template>
 
         <template v-else-if="category === 'NPC'">
-          <booknpc v-if="context" :context="context" task-model="" :is-show-save="false" :theme-color="themeColor" />
+          <booknpc
+            v-if="context"
+            ref="book"
+            :context="context"
+            task-model=""
+            :is-show-save="false"
+            :theme-color="themeColor"
+          />
         </template>
 
         <template v-if="category == 'NNPE'">
           <booknnpe
             v-if="context"
+            ref="book"
             :context="context"
             :theme-color="themeColor"
             task-model=""
             :is-show-save="false"
             :is-show-title="true"
+            :preview-type="previewType"
+            :preview-group-id="previewGroupId"
           />
         </template>
       </div>
@@ -82,7 +92,9 @@ export default {
       context: null,
       ui_type: '',
       category: '',
-      themeColor: ''
+      themeColor: '',
+      previewType: 'previewCheck',
+      previewGroupId: '[]'
     };
   },
   watch: {
@@ -103,10 +115,12 @@ export default {
     dialogClose() {
       this.$emit('dialogClose');
     },
+
     confirm() {
-      this.$emit('selectCourse', this.currentCourse);
+      this.$emit('selectCourse', this.currentCourse, this.$refs.book.submitPreviewGroupId());
       this.currentCourse = '';
     },
+
     getCourseBookListByCSItemID() {
       GetCourseBookListByCSItemID({ cs_item_id: this.id }).then(({ book_list }) => {
         this.book_list = book_list;
@@ -115,18 +129,22 @@ export default {
         }
       });
     },
+
     curCourse(val, is_courseware) {
       this.currentCourse = val;
       if (is_courseware) this.getCoursewareContent_View();
     },
+
     GetBookChapterStruct() {
       GetBookChapterStruct({ book_id: this.curBook.book_id }).then(({ nodes }) => {
         this.nodes = nodes;
       });
     },
+
     selectBook(book) {
       this.curBook = book;
     },
+
     getCoursewareContent_View() {
       GetCoursewareContent_View({ id: this.currentCourse }).then(({ content, category, book_theme_color }) => {
         if (!content) {

src/views/teacher/create_course/step_table/NewTask.vue

@@ -458,11 +458,12 @@ export default {
       this.dialogVisible = false;
     },
 
-    selectCourse(course_id) {
+    selectCourse(course_id, previewGroupId) {
       if (course_id.length === 0) {
         this.$message.warning(this.$t('Key385'));
         return;
       }
+      console.log(previewGroupId);
       const type = this.form.teaching_type;
       if (type === 10) {
         this.getTreeNodeInfo_BookChapterStruct(course_id, 'live');