fix urls

src/features/student/importInspect/ImportInspect.vue

@@ -2,7 +2,7 @@
   <div class="my-container">
     <mark-header />
     <div class="tw-flex tw-gap-1">
-      <mark-body @error="renderError" />
+      <mark-body @error="renderError" usingImage="sheetUrls" />
       <MarkBoardInspect
         :tagged="isCurrentTagged"
         :isFirst="isFirst"

src/features/student/inspect/MarkBody.vue

@@ -46,6 +46,14 @@ interface SliceImage {
   originalImageHeight: number;
 }
 
+const { usingImage } = withDefaults(
+  defineProps<{
+    usingImage: "sheetUrls" | "sliceUrls";
+  }>(),
+  {
+    usingImage: "sliceUrls",
+  }
+);
 const emit = defineEmits(["error"]);
 
 const { dragContainer } = dragImage();
@@ -59,13 +67,14 @@ async function processImage() {
   if (!store.currentTask) return;
 
   const images = [];
-  for (const url of store.currentTask.sliceUrls) {
+  const urls = store.currentTask[usingImage] || [];
+  for (const url of urls) {
     const image = await loadImage(url);
     images.push(image);
   }
 
-  for (const url of store.currentTask.sliceUrls) {
-    const indexInSliceUrls = store.currentTask.sliceUrls.indexOf(url) + 1;
+  for (const url of urls) {
+    const indexInSliceUrls = urls.indexOf(url) + 1;
     const image = images[indexInSliceUrls - 1];
 
     const trackLists = (store.currentTask.questionList || [])

yarn.lock

@@ -119,11 +119,11 @@
     picomatch "^2.2.2"
 
 "@simonwep/pickr@~1.8.0":
-  version "1.8.1"
-  resolved "https://registry.nlark.com/@simonwep/pickr/download/@simonwep/pickr-1.8.1.tgz?cache=0&sync_timestamp=1620897298440&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40simonwep%2Fpickr%2Fdownload%2F%40simonwep%2Fpickr-1.8.1.tgz#e136cbd9c345ddbb7d71eb14af544c798165d495"
-  integrity sha1-4TbL2cNF3bt9cesUr1RMeYFl1JU=
+  version "1.8.2"
+  resolved "https://registry.nlark.com/@simonwep/pickr/download/@simonwep/pickr-1.8.2.tgz#96dc86675940d7cad63d69c22083dd1cbb9797cb"
+  integrity sha1-ltyGZ1lA18rWPWnCIIPdHLuXl8s=
   dependencies:
-    core-js "^3.12.1"
+    core-js "^3.15.1"
     nanopop "^2.1.0"
 
 "@types/estree@^0.0.48":
@@ -139,14 +139,14 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.165":
-  version "4.14.172"
-  resolved "https://registry.nlark.com/@types/lodash/download/@types/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
-  integrity sha1-qtd0wo57/Xpn3iVAjgPuWow9Aoo=
+  version "4.14.173"
+  resolved "https://registry.nlark.com/@types/lodash/download/@types/lodash-4.14.173.tgz#9d3b674c67a26cf673756f6aca7b429f237f91ed"
+  integrity sha1-nTtnTGeibPZzdW9qyntCnyN/ke0=
 
 "@types/node@^16.7.11":
-  version "16.9.1"
-  resolved "https://registry.nlark.com/@types/node/download/@types/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
-  integrity sha1-BhGzfbQkbJN/7vUp3cwBjPjjVwg=
+  version "16.9.2"
+  resolved "https://registry.nlark.com/@types/node/download/@types/node-16.9.2.tgz?cache=0&sync_timestamp=1631828244883&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9"
+  integrity sha1-gfWgOdbtGUH4zFdQbHTnwrj8ZLk=
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -627,7 +627,7 @@ constantinople@^4.0.1:
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.1"
 
-core-js@^3.12.1:
+core-js@^3.15.1:
   version "3.17.3"
   resolved "https://registry.nlark.com/core-js/download/core-js-3.17.3.tgz?cache=0&sync_timestamp=1631176914291&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
   integrity sha1-jovSDpHfmVHpA8q+kfmvSgiVvB4=
@@ -745,9 +745,9 @@ domutils@^2.5.2:
     domhandler "^4.2.0"
 
 electron-to-chromium@^1.3.830:
-  version "1.3.837"
-  resolved "https://registry.nlark.com/electron-to-chromium/download/electron-to-chromium-1.3.837.tgz?cache=0&sync_timestamp=1631570594761&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.837.tgz#3a807540df47b85fb819481539b8ed9083b0a3b5"
-  integrity sha1-OoB1QN9HuF+4GUgVObjtkIOwo7U=
+  version "1.3.842"
+  resolved "https://registry.nlark.com/electron-to-chromium/download/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f"
+  integrity sha1-ZB5BQBLd7Sd0aIksAVbLAZhPT28=
 
 emmet@^2.3.0:
   version "2.3.4"
@@ -775,9 +775,9 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 esbuild@^0.12.17:
-  version "0.12.27"
-  resolved "https://registry.nlark.com/esbuild/download/esbuild-0.12.27.tgz?cache=0&sync_timestamp=1631497049767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fesbuild%2Fdownload%2Fesbuild-0.12.27.tgz#9bcfb837111c5e89b189188dde339515b213a724"
-  integrity sha1-m8+4NxEcXomxiRiN3jOVFbITpyQ=
+  version "0.12.28"
+  resolved "https://registry.nlark.com/esbuild/download/esbuild-0.12.28.tgz#84da0d2a0d0dee181281545271e0d65cf6fab1ef"
+  integrity sha1-hNoNKg0N7hgSgVRSceDWXPb6se8=
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -806,9 +806,9 @@ fast-glob@^3.2.7:
     micromatch "^4.0.4"
 
 fastq@^1.6.0:
-  version "1.12.0"
-  resolved "https://registry.nlark.com/fastq/download/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794"
-  integrity sha1-7XtqtdYjk/ssxZHIU2UqXDGL95Q=
+  version "1.13.0"
+  resolved "https://registry.nlark.com/fastq/download/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha1-YWdg+Ip1Jr38WWt8q4wYk4w2uYw=
   dependencies:
     reusify "^1.0.4"
 
@@ -820,9 +820,9 @@ fill-range@^7.0.1:
     to-regex-range "^5.0.1"
 
 follow-redirects@^1.14.0:
-  version "1.14.3"
-  resolved "https://registry.nlark.com/follow-redirects/download/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
-  integrity sha1-atp4EY2NJMruWVWVrM3ArGq9Ai4=
+  version "1.14.4"
+  resolved "https://registry.nlark.com/follow-redirects/download/follow-redirects-1.14.4.tgz?cache=0&sync_timestamp=1631622129411&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+  integrity sha1-g4/fSKi73XnlLuUfsclOPtmLk3k=
 
 fraction.js@^4.1.1:
   version "4.1.1"
@@ -1736,7 +1736,7 @@ supports-color@^7.1.0:
 
 tailwindcss@^2.2.10:
   version "2.2.15"
-  resolved "https://registry.nlark.com/tailwindcss/download/tailwindcss-2.2.15.tgz?cache=0&sync_timestamp=1631548571905&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftailwindcss%2Fdownload%2Ftailwindcss-2.2.15.tgz#8bee3ebe68b988c050508ce20633f35b040dd9fe"
+  resolved "https://registry.nlark.com/tailwindcss/download/tailwindcss-2.2.15.tgz?cache=0&sync_timestamp=1631796824386&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftailwindcss%2Fdownload%2Ftailwindcss-2.2.15.tgz#8bee3ebe68b988c050508ce20633f35b040dd9fe"
   integrity sha1-i+4+vmi5iMBQUIziBjPzWwQN2f4=
   dependencies:
     arg "^5.0.1"
@@ -1798,7 +1798,7 @@ token-stream@1.0.0:
 
 typescript@^4.3.5:
   version "4.4.3"
-  resolved "https://registry.nlark.com/typescript/download/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
+  resolved "https://registry.nlark.com/typescript/download/typescript-4.4.3.tgz?cache=0&sync_timestamp=1631690110768&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
   integrity sha1-vcVAfKorEJ79T4L+EwZW+XeikyQ=
 
 ua-parser-js@^0.7.28:
@@ -1812,9 +1812,9 @@ universalify@^2.0.0:
   integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=
 
 unplugin-vue-components@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.nlark.com/unplugin-vue-components/download/unplugin-vue-components-0.15.0.tgz#5f124d70f166f8ace05ad9ce9230a84e8b306ac5"
-  integrity sha1-XxJNcPFm+KzgWtnOkjCoToswasU=
+  version "0.15.1"
+  resolved "https://registry.nlark.com/unplugin-vue-components/download/unplugin-vue-components-0.15.1.tgz#60833df9f54e5eedde7d916c2ba66e9a263798a7"
+  integrity sha1-YIM9+fVOXu3efZFsK6ZumiY3mKc=
   dependencies:
     "@rollup/pluginutils" "^4.1.1"
     chokidar "^3.5.2"
@@ -1827,9 +1827,9 @@ unplugin-vue-components@^0.15.0:
     unplugin "^0.2.7"
 
 unplugin@^0.2.7:
-  version "0.2.9"
-  resolved "https://registry.nlark.com/unplugin/download/unplugin-0.2.9.tgz#8846121113a90df8ea4ef78b171cd739e36b0143"
-  integrity sha1-iEYSEROpDfjqTveLFxzXOeNrAUM=
+  version "0.2.11"
+  resolved "https://registry.nlark.com/unplugin/download/unplugin-0.2.11.tgz#f9f3f8b2b5a7c1b16325dbdea9568ee3652f6e49"
+  integrity sha1-+fP4srWnwbFjJdveqVaO42Uvbkk=
   dependencies:
     upath "^2.0.1"
     webpack-virtual-modules "^0.4.3"
@@ -1850,9 +1850,9 @@ viewerjs@^1.10.1:
   integrity sha1-B0me0EPQop4wArkPVcWyKL0adCw=
 
 vite@^2.5.4:
-  version "2.5.7"
-  resolved "https://registry.nlark.com/vite/download/vite-2.5.7.tgz?cache=0&sync_timestamp=1631535051330&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvite%2Fdownload%2Fvite-2.5.7.tgz#e495be9d8bcbf9d30c7141efdccacde746ee0125"
-  integrity sha1-5JW+nYvL+dMMcUHv3MrN50buASU=
+  version "2.5.8"
+  resolved "https://registry.nlark.com/vite/download/vite-2.5.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvite%2Fdownload%2Fvite-2.5.8.tgz#e2da21540411e91cb1c4a62e133c652a787cf116"
+  integrity sha1-4tohVAQR6RyxxKYuEzxlKnh88RY=
   dependencies:
     esbuild "^0.12.17"
     postcss "^8.3.6"
@@ -1937,10 +1937,10 @@ vscode-nls@^5.0.0:
   resolved "https://registry.npm.taobao.org/vscode-nls/download/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
   integrity sha1-mfDaC9nqfNpE5WWnTFSx8rwleEA=
 
-vscode-pug-languageservice@^0.27.14:
-  version "0.27.14"
-  resolved "https://registry.nlark.com/vscode-pug-languageservice/download/vscode-pug-languageservice-0.27.14.tgz#3426f05a178264f22191d5fdd9fea80889ead464"
-  integrity sha1-NCbwWheCZPIhkdX92f6oCInq1GQ=
+vscode-pug-languageservice@^0.27.21:
+  version "0.27.21"
+  resolved "https://registry.nlark.com/vscode-pug-languageservice/download/vscode-pug-languageservice-0.27.21.tgz#b5ebdfb3e67fd37bb9ec4801e22161d469722300"
+  integrity sha1-tevfs+Z/03u57EgB4iFh1GlyIwA=
   dependencies:
     "@volar/code-gen" "^0.27.14"
     "@volar/shared" "^0.27.14"
@@ -1950,10 +1950,10 @@ vscode-pug-languageservice@^0.27.14:
     pug-parser "^6.0.0"
     vscode-languageserver "^8.0.0-next.2"
 
-vscode-typescript-languageservice@^0.27.18:
-  version "0.27.18"
-  resolved "https://registry.nlark.com/vscode-typescript-languageservice/download/vscode-typescript-languageservice-0.27.18.tgz#a4a1b63a41706ae7ece1300f3402a4732ba7c588"
-  integrity sha1-pKG2OkFwaufs4TAPNAKkcyunxYg=
+vscode-typescript-languageservice@^0.27.20:
+  version "0.27.20"
+  resolved "https://registry.nlark.com/vscode-typescript-languageservice/download/vscode-typescript-languageservice-0.27.20.tgz#491838da6394e57d54bc254e1fb77cf7b3e0818f"
+  integrity sha1-SRg42mOU5X1UvCVOH7d897PggY8=
   dependencies:
     "@volar/shared" "^0.27.14"
     semver "^7.3.5"
@@ -1972,9 +1972,9 @@ vscode-uri@^3.0.2:
   integrity sha1-7P0dBmy470w6II3s26uajCPQVdA=
 
 vscode-vue-languageservice@^0.27.0:
-  version "0.27.19"
-  resolved "https://registry.nlark.com/vscode-vue-languageservice/download/vscode-vue-languageservice-0.27.19.tgz?cache=0&sync_timestamp=1631498872390&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvscode-vue-languageservice%2Fdownload%2Fvscode-vue-languageservice-0.27.19.tgz#bb3cd089ffd840412341ff1c8ff30a16ebfc9d49"
-  integrity sha1-uzzQif/YQEEjQf8cj/MKFuv8nUk=
+  version "0.27.21"
+  resolved "https://registry.nlark.com/vscode-vue-languageservice/download/vscode-vue-languageservice-0.27.21.tgz?cache=0&sync_timestamp=1631782329014&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvscode-vue-languageservice%2Fdownload%2Fvscode-vue-languageservice-0.27.21.tgz#d72c3e730c5c7f363a6eb6241bdbdf1db55eae1e"
+  integrity sha1-1yw+cwxcfzY6brYkG9vfHbVerh4=
   dependencies:
     "@volar/code-gen" "^0.27.14"
     "@volar/html2pug" "^0.27.13"
@@ -1992,8 +1992,8 @@ vscode-vue-languageservice@^0.27.0:
     vscode-json-languageservice "^4.1.7"
     vscode-languageserver "^8.0.0-next.2"
     vscode-languageserver-textdocument "^1.0.1"
-    vscode-pug-languageservice "^0.27.14"
-    vscode-typescript-languageservice "^0.27.18"
+    vscode-pug-languageservice "^0.27.21"
+    vscode-typescript-languageservice "^0.27.20"
 
 vue-router@4.0.10:
   version "4.0.10"