Bläddra i källkod

up vue@3.1.5 & remove defineEmit & defineProps

Michael Wang 3 år sedan
förälder
incheckning
c859fef0aa

+ 2 - 2
package.json

@@ -21,7 +21,7 @@
     "tailwindcss": "^2.2.4",
     "ua-parser-js": "^0.7.28",
     "viewerjs": "^1.10.0",
-    "vue": "^3.1.4",
+    "vue": "^3.1.5",
     "vue-router": "4.0.10"
   },
   "devDependencies": {
@@ -29,7 +29,7 @@
     "@types/node": "^16.3.2",
     "@types/ua-parser-js": "^0.7.36",
     "@vitejs/plugin-vue": "^1.2.5",
-    "@vue/compiler-sfc": "^3.1.4",
+    "@vue/compiler-sfc": "^3.1.5",
     "autoprefixer": "^10.3.1",
     "postcss": "^8.3.5",
     "typescript": "^4.3.5",

+ 1 - 1
src/components/ZoomPaper.vue

@@ -31,7 +31,7 @@ import {
   ZoomOutOutlined,
   FullscreenOutlined,
 } from "@ant-design/icons-vue";
-import { defineProps, computed } from "vue";
+import { computed } from "vue";
 
 const props = defineProps<{ store: UnionStore }>();
 const { store } = props;

+ 1 - 2
src/features/arbitrate/MarkBody.vue

@@ -12,9 +12,8 @@
 <script setup lang="ts">
 import CommonMarkBody from "@/features/mark/CommonMarkBody.vue";
 import { store } from "@/features/mark/store";
-import { defineEmit } from "vue";
 
-defineEmit(["error"]);
+defineEmits(["error"]);
 </script>
 
 <style scoped></style>

+ 2 - 2
src/features/arbitrate/MarkHistory.vue

@@ -100,7 +100,7 @@
 
 <script setup lang="ts">
 import type { MarkHistoryOrderBy, MarkHistorySortField, Task } from "@/types";
-import { defineEmit, defineProps, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { store } from "@/features/mark/store";
 import {
@@ -114,7 +114,7 @@ import { getArbitrateHistory } from "@/api/arbitratePage";
 
 const props = defineProps<{ shouldReload: number }>();
 
-const emit = defineEmit(["reload"]);
+const emit = defineEmits(["reload"]);
 
 const route = useRoute();
 const { subjectCode, groupNumber } = route.query as {

+ 2 - 2
src/features/library/inspect/MarkBoardInspect.vue

@@ -93,10 +93,10 @@
 <script setup lang="ts">
 import type { Question } from "@/types";
 import { message } from "ant-design-vue";
-import { computed, defineEmit, reactive, watch } from "vue";
+import { computed, reactive, watch } from "vue";
 import { store } from "@/features/mark/store";
 
-const emit = defineEmit(["inspect", "reject"]);
+const emit = defineEmits(["inspect", "reject"]);
 let checkedQuestions = reactive([] as Array<Question>);
 
 watch(

+ 2 - 2
src/features/library/inspect/MarkBody.vue

@@ -11,10 +11,10 @@
 
 <script setup lang="ts">
 import CommonMarkBody from "@/features/mark/CommonMarkBody.vue";
-import { defineEmit } from "vue";
+
 import { store } from "@/features/mark/store";
 
-defineEmit(["error"]);
+defineEmits(["error"]);
 </script>
 
 <style scoped></style>

+ 2 - 2
src/features/library/inspect/MarkHistory.vue

@@ -53,7 +53,7 @@
 <script setup lang="ts">
 import { getInspectedHistory } from "@/api/inspectPage";
 import type { Task } from "@/types";
-import { defineEmit, defineProps, ref, watch, watchEffect } from "vue";
+import { ref, watch, watchEffect } from "vue";
 import { useRoute } from "vue-router";
 import { store } from "@/features/mark/store";
 import { CloseOutlined } from "@ant-design/icons-vue";
@@ -61,7 +61,7 @@ import { cloneDeep } from "lodash";
 
 const props = defineProps<{ shouldReload: number }>();
 
-const emit = defineEmit(["reload"]);
+const emit = defineEmits(["reload"]);
 
 const route = useRoute();
 const { subjectCode } = route.query as {

+ 1 - 2
src/features/library/libraryTrack/MarkBody.vue

@@ -11,10 +11,9 @@
 
 <script setup lang="ts">
 import CommonMarkBody from "@/features/mark/CommonMarkBody.vue";
-import { defineEmit } from "vue";
 import { store } from "@/features/mark/store";
 
-defineEmit(["error"]);
+defineEmits(["error"]);
 </script>
 
 <style scoped></style>

+ 2 - 2
src/features/library/quality/MarkBody.vue

@@ -11,10 +11,10 @@
 
 <script setup lang="ts">
 import CommonMarkBody from "@/features/mark/CommonMarkBody.vue";
-import { defineEmit } from "vue";
+
 import { store } from "@/features/mark/store";
 
-defineEmit(["error"]);
+defineEmits(["error"]);
 </script>
 
 <style scoped></style>

+ 2 - 2
src/features/library/quality/MarkHistory.vue

@@ -44,13 +44,13 @@
 
 <script setup lang="ts">
 import type { Task } from "@/types";
-import { defineEmit, ref, watchEffect } from "vue";
+import { ref, watchEffect } from "vue";
 import { useRoute } from "vue-router";
 import { store } from "@/features/mark/store";
 import { cloneDeep } from "lodash";
 import { getQualityHistory } from "@/api/qualityPage";
 
-const emit = defineEmit(["reload"]);
+const emit = defineEmits(["reload"]);
 const route = useRoute();
 const { markerId, markerScore } = route.query as {
   markerId: string;

+ 1 - 3
src/features/mark/CommonMarkBody.vue

@@ -55,8 +55,6 @@
 <script setup lang="ts">
 import {
   computed,
-  defineEmit,
-  defineProps,
   onMounted,
   onUnmounted,
   reactive,
@@ -91,7 +89,7 @@ const props = defineProps<{
   uniquePropName: string; // TODO: 这个字段不需要了,是以前的rendering字段附带要求的
 }>();
 
-const emit = defineEmit(["error"]);
+const emit = defineEmits(["error"]);
 
 const {
   useMarkResult = false,

+ 2 - 2
src/features/mark/MarkBoardKeyBoard.vue

@@ -109,14 +109,14 @@
 <script setup lang="ts">
 import type { Question } from "@/types";
 import { isNumber } from "lodash";
-import { computed, defineEmit, onMounted, onUnmounted, ref, watch } from "vue";
+import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { store } from "./store";
 import { keyMouse } from "./use/keyboardAndMouse";
 import { autoChooseFirstQuestion } from "./use/autoChooseFirstQuestion";
 import { message } from "ant-design-vue";
 import { DownOutlined } from "@ant-design/icons-vue";
 
-const emit = defineEmit(["submit", "allZeroSubmit"]);
+const emit = defineEmits(["submit", "allZeroSubmit"]);
 
 const { toggleKeyMouse } = keyMouse();
 const { chooseQuestion } = autoChooseFirstQuestion();

+ 2 - 2
src/features/mark/MarkBoardMouse.vue

@@ -103,13 +103,13 @@
 <script setup lang="ts">
 import type { Question } from "@/types";
 import { isNumber } from "lodash";
-import { defineEmit } from "vue";
+
 import { store } from "./store";
 import { keyMouse } from "./use/keyboardAndMouse";
 import { message } from "ant-design-vue";
 import { DownOutlined } from "@ant-design/icons-vue";
 
-const emit = defineEmit(["submit", "allZeroSubmit"]);
+const emit = defineEmits(["submit", "allZeroSubmit"]);
 const { toggleKeyMouse } = keyMouse();
 
 function chooseScore(question: Question, score: number) {

+ 2 - 2
src/features/mark/MarkBoardTrack.vue

@@ -157,13 +157,13 @@
 <script setup lang="ts">
 import type { Question } from "@/types";
 import { isNumber } from "lodash";
-import { computed, defineEmit, onMounted, onUnmounted, watch } from "vue";
+import { computed, onMounted, onUnmounted, watch } from "vue";
 import { store } from "./store";
 import { autoChooseFirstQuestion } from "./use/autoChooseFirstQuestion";
 import { message } from "ant-design-vue";
 import { dragSplitPane } from "./use/splitPane";
 
-const emit = defineEmit(["submit", "allZeroSubmit"]);
+const emit = defineEmits(["submit", "allZeroSubmit"]);
 const { dragSpliter, topPercent } = dragSplitPane();
 
 const { chooseQuestion } = autoChooseFirstQuestion();

+ 2 - 2
src/features/mark/MarkBody.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineEmit, onMounted, onUnmounted, watch, watchEffect } from "vue";
+import { onMounted, onUnmounted, watch, watchEffect } from "vue";
 import { store } from "./store";
 import { ModeEnum } from "@/types";
 import type { SliceImage, SpecialTag, Track } from "@/types";
@@ -25,7 +25,7 @@ import { isNumber } from "lodash";
 import CustomCursor from "custom-cursor.js";
 import CommonMarkBody from "./CommonMarkBody.vue";
 
-defineEmit(["error", "allZeroSubmit"]);
+defineEmits(["error", "allZeroSubmit"]);
 
 const makeScoreTrack = (
   event: MouseEvent,

+ 1 - 1
src/features/mark/MarkDrawTrack.vue

@@ -26,7 +26,7 @@
 <script setup lang="ts">
 import { ModeEnum } from "@/types";
 import type { SpecialTag, Track } from "@/types";
-import { computed, defineProps, toRefs, watch } from "vue";
+import { computed, toRefs, watch } from "vue";
 import { store } from "./store";
 
 const props = defineProps<{

+ 2 - 2
src/features/mark/MarkHeader.vue

@@ -256,7 +256,7 @@
 
 <script setup lang="ts">
 import { doLogout } from "@/api/markPage";
-import { computed, defineEmit, ref, watchEffect } from "vue";
+import { computed, ref, watchEffect } from "vue";
 import { store, isScanImage } from "./store";
 import {
   SnippetsOutlined,
@@ -274,7 +274,7 @@ import { isNumber } from "lodash";
 import { Modal } from "ant-design-vue";
 import ZoomPaper from "@/components/ZoomPaper.vue";
 
-defineEmit(["should-reload-history"]);
+defineEmits(["should-reload-history"]);
 
 const modeName = computed(() =>
   store.setting.mode === ModeEnum.TRACK ? "轨迹模式" : "普通模式"

+ 1 - 1
src/features/mark/MarkHistory.vue

@@ -104,7 +104,7 @@
 <script setup lang="ts">
 import { getHistoryTask } from "@/api/markPage";
 import type { MarkHistoryOrderBy, MarkHistorySortField, Task } from "@/types";
-import { defineProps, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import { store } from "./store";
 import {
   CloseOutlined,

+ 2 - 2
src/features/student/inspect/MarkBoardInspect.vue

@@ -93,10 +93,10 @@
 <script setup lang="ts">
 import type { Question } from "@/types";
 import { message } from "ant-design-vue";
-import { computed, defineEmit, reactive, watch } from "vue";
+import { computed, reactive, watch } from "vue";
 import { store } from "../store";
 
-const emit = defineEmit(["inspect", "reject"]);
+const emit = defineEmits(["inspect", "reject"]);
 let checkedQuestions = reactive([] as Array<Question>);
 
 watch(

+ 2 - 2
src/features/student/inspect/MarkBody.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineEmit, reactive, ref, watch } from "vue";
+import { computed, reactive, ref, watch } from "vue";
 import { store } from "../store";
 import MarkDrawTrack from "./MarkDrawTrack.vue";
 import type { SpecialTag, Track } from "@/types";
@@ -45,7 +45,7 @@ interface SliceImage {
   originalImage: HTMLImageElement;
 }
 
-const emit = defineEmit(["error"]);
+const emit = defineEmits(["error"]);
 
 const { dragContainer } = dragImage();
 

+ 1 - 1
src/features/student/inspect/MarkDrawTrack.vue

@@ -25,7 +25,7 @@
 <script setup lang="ts">
 import type { SpecialTag, Track } from "@/types";
 import { store } from "../store";
-import { defineProps, toRefs, watch } from "vue";
+import { toRefs, watch } from "vue";
 
 const props = defineProps<{
   trackList: Array<Track>;

+ 2 - 2
src/features/student/inspect/MarkHistory.vue

@@ -53,7 +53,7 @@
 <script setup lang="ts">
 import { getInspectedHistory } from "@/api/inspectPage";
 import type { Task } from "@/types";
-import { defineEmit, defineProps, ref, watch, watchEffect } from "vue";
+import { ref, watch, watchEffect } from "vue";
 import { useRoute } from "vue-router";
 import { store } from "../store";
 import { CloseOutlined } from "@ant-design/icons-vue";
@@ -61,7 +61,7 @@ import { cloneDeep } from "lodash";
 
 const props = defineProps<{ shouldReload: number }>();
 
-const emit = defineEmit(["reload"]);
+const emit = defineEmits(["reload"]);
 const route = useRoute();
 const { subjectCode } = route.query as {
   subjectCode: string;

+ 53 - 53
yarn.lock

@@ -148,37 +148,37 @@
   resolved "https://registry.nlark.com/@vitejs/plugin-vue/download/@vitejs/plugin-vue-1.2.5.tgz?cache=0&sync_timestamp=1626092720558&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vitejs%2Fplugin-vue%2Fdownload%2F%40vitejs%2Fplugin-vue-1.2.5.tgz#ef7dc4a92e53fe866b54bcc1266788513262ac09"
   integrity sha1-733EqS5T/oZrVLzBJmeIUTJirAk=
 
-"@vue/compiler-core@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.1.4.tgz#a3a74cf52e8f01af386d364ac8a099cbeb260424"
-  integrity sha1-o6dM9S6PAa84bTZKyKCZy+smBCQ=
+"@vue/compiler-core@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.1.5.tgz#298f905b6065d6d81ff63756f98c60876b393c87"
+  integrity sha1-KY+QW2Bl1tgf9jdW+Yxgh2s5PIc=
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/shared" "3.1.4"
+    "@vue/shared" "3.1.5"
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.1.4.tgz#bf3795e1449f32c965d38c4ea6d808ca05fdfc97"
-  integrity sha1-vzeV4USfMsll04xOptgIygX9/Jc=
+"@vue/compiler-dom@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.1.5.tgz#cbb97020c62a5faa3fbc2a97916bd98041ac9856"
+  integrity sha1-y7lwIMYqX6o/vCqXkWvZgEGsmFY=
   dependencies:
-    "@vue/compiler-core" "3.1.4"
-    "@vue/shared" "3.1.4"
+    "@vue/compiler-core" "3.1.5"
+    "@vue/shared" "3.1.5"
 
-"@vue/compiler-sfc@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/compiler-sfc/download/@vue/compiler-sfc-3.1.4.tgz#93e87db950e0711339c18baa7bb7d28d3522d7bc"
-  integrity sha1-k+h9uVDgcRM5wYuqe7fSjTUi17w=
+"@vue/compiler-sfc@^3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/compiler-sfc/download/@vue/compiler-sfc-3.1.5.tgz#e61e54f3a963b0f4a8e523fbb8632390dc52b0d6"
+  integrity sha1-5h5U86ljsPSo5SP7uGMjkNxSsNY=
   dependencies:
     "@babel/parser" "^7.13.9"
     "@babel/types" "^7.13.0"
     "@types/estree" "^0.0.48"
-    "@vue/compiler-core" "3.1.4"
-    "@vue/compiler-dom" "3.1.4"
-    "@vue/compiler-ssr" "3.1.4"
-    "@vue/shared" "3.1.4"
+    "@vue/compiler-core" "3.1.5"
+    "@vue/compiler-dom" "3.1.5"
+    "@vue/compiler-ssr" "3.1.5"
+    "@vue/shared" "3.1.5"
     consolidate "^0.16.0"
     estree-walker "^2.0.1"
     hash-sum "^2.0.0"
@@ -190,47 +190,47 @@
     postcss-selector-parser "^6.0.4"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/compiler-ssr/download/@vue/compiler-ssr-3.1.4.tgz#7f6eaac5b1851fc15c82c083e8179eb1216b303c"
-  integrity sha1-f26qxbGFH8FcgsCD6BeesSFrMDw=
+"@vue/compiler-ssr@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/compiler-ssr/download/@vue/compiler-ssr-3.1.5.tgz#f068652774293256a1e53084bed48a67682df9d2"
+  integrity sha1-8GhlJ3QpMlah5TCEvtSKZ2gt+dI=
   dependencies:
-    "@vue/compiler-dom" "3.1.4"
-    "@vue/shared" "3.1.4"
+    "@vue/compiler-dom" "3.1.5"
+    "@vue/shared" "3.1.5"
 
 "@vue/devtools-api@^6.0.0-beta.14":
   version "6.0.0-beta.15"
   resolved "https://registry.nlark.com/@vue/devtools-api/download/@vue/devtools-api-6.0.0-beta.15.tgz?cache=0&sync_timestamp=1624900514906&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fdevtools-api%2Fdownload%2F%40vue%2Fdevtools-api-6.0.0-beta.15.tgz#ad7cb384e062f165bcf9c83732125bffbc2ad83d"
   integrity sha1-rXyzhOBi8WW8+cg3MhJb/7wq2D0=
 
-"@vue/reactivity@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/reactivity/download/@vue/reactivity-3.1.4.tgz#d926ed46fb0d48582ccf8665b062d37b5d35ba99"
-  integrity sha1-2SbtRvsNSFgsz4ZlsGLTe101upk=
+"@vue/reactivity@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/reactivity/download/@vue/reactivity-3.1.5.tgz#dbec4d9557f7c8f25c2635db1e23a78a729eb991"
+  integrity sha1-2+xNlVf3yPJcJjXbHiOninKeuZE=
   dependencies:
-    "@vue/shared" "3.1.4"
+    "@vue/shared" "3.1.5"
 
-"@vue/runtime-core@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/runtime-core/download/@vue/runtime-core-3.1.4.tgz#3e30ae6ecbfff06df5adc9414491143191a375ba"
-  integrity sha1-PjCubsv/8G31rclBRJEUMZGjdbo=
+"@vue/runtime-core@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/runtime-core/download/@vue/runtime-core-3.1.5.tgz#a545b7f146092929cb5e833e85439150f17ac87b"
+  integrity sha1-pUW38UYJKSnLXoM+hUORUPF6yHs=
   dependencies:
-    "@vue/reactivity" "3.1.4"
-    "@vue/shared" "3.1.4"
+    "@vue/reactivity" "3.1.5"
+    "@vue/shared" "3.1.5"
 
-"@vue/runtime-dom@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/runtime-dom/download/@vue/runtime-dom-3.1.4.tgz#acfeee200d5c45fc2cbdf7058cda1498f9b45849"
-  integrity sha1-rP7uIA1cRfwsvfcFjNoUmPm0WEk=
+"@vue/runtime-dom@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/runtime-dom/download/@vue/runtime-dom-3.1.5.tgz#4fa28947d408aa368fa17ea0edc1beb9af1472a1"
+  integrity sha1-T6KJR9QIqjaPoX6g7cG+ua8UcqE=
   dependencies:
-    "@vue/runtime-core" "3.1.4"
-    "@vue/shared" "3.1.4"
+    "@vue/runtime-core" "3.1.5"
+    "@vue/shared" "3.1.5"
     csstype "^2.6.8"
 
-"@vue/shared@3.1.4":
-  version "3.1.4"
-  resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.1.4.tgz?cache=0&sync_timestamp=1625229523024&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fshared%2Fdownload%2F%40vue%2Fshared-3.1.4.tgz#c14c461ec42ea2c1556e86f60b0354341d91adc3"
-  integrity sha1-wUxGHsQuosFVbob2CwNUNB2RrcM=
+"@vue/shared@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.1.5.tgz#74ee3aad995d0a3996a6bb9533d4d280514ede03"
+  integrity sha1-dO46rZldCjmWpruVM9TSgFFO3gM=
 
 acorn-node@^1.6.1:
   version "1.8.2"
@@ -1585,14 +1585,14 @@ vue-types@^3.0.0:
   dependencies:
     is-plain-object "3.0.1"
 
-vue@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.nlark.com/vue/download/vue-3.1.4.tgz#120d6818c51eaa35d0879e5bc1cff60135bc69fd"
-  integrity sha1-Eg1oGMUeqjXQh55bwc/2ATW8af0=
+vue@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.nlark.com/vue/download/vue-3.1.5.tgz#12879b11d0685ee4478c8869551799630a52f9fe"
+  integrity sha1-EoebEdBoXuRHjIhpVReZYwpS+f4=
   dependencies:
-    "@vue/compiler-dom" "3.1.4"
-    "@vue/runtime-dom" "3.1.4"
-    "@vue/shared" "3.1.4"
+    "@vue/compiler-dom" "3.1.5"
+    "@vue/runtime-dom" "3.1.5"
+    "@vue/shared" "3.1.5"
 
 warning@^4.0.0:
   version "4.0.3"