From 7132aeab0cb7e1a80eebc9b64e8aab678d9a2fa0 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sun, 26 Mar 2023 00:48:05 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20installVue3Components()=20=ED=98=B8?=
 =?UTF-8?q?=EC=B6=9C=EB=B6=80=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scss/processing.scss    |  4 ++--
 hwe/ts/PageBattleCenter.vue | 13 ++++++-------
 hwe/ts/v_battleCenter.ts    |  6 ++++--
 hwe/ts/v_board.ts           |  1 -
 hwe/ts/v_processing.ts      |  7 +++----
 hwe/v_battleCenter.php      |  2 +-
 hwe/v_processing.php        |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/hwe/scss/processing.scss b/hwe/scss/processing.scss
index f7b30cc0..4af22d97 100644
--- a/hwe/scss/processing.scss
+++ b/hwe/scss/processing.scss
@@ -17,7 +17,7 @@
 
 
 @include media-1000px{
-    #container {
+    #app {
         width: 1000px;
         margin: 0 auto;
     }
@@ -28,7 +28,7 @@
         overflow-x: hidden;
     }
 
-    #container {
+    #app {
         width: 500px;
         margin: 0 auto;
     }
diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue
index 37039a31..6c272637 100644
--- a/hwe/ts/PageBattleCenter.vue
+++ b/hwe/ts/PageBattleCenter.vue
@@ -72,14 +72,9 @@
   </BContainer>
 </template>
 
-<script lang="ts">
-declare const queryValues: {
-  generalID: number | null;
-};
-</script>
 <script lang="ts" setup>
 import { BContainer, useToast, BFormSelect, BFormSelectOption, BButton } from "bootstrap-vue-next";
-import { onMounted, provide, ref, watch } from "vue";
+import { onMounted, provide, ref, toRef, watch } from "vue";
 import { getGameConstStore, type GameConstStore } from "./GameConstStore";
 import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
@@ -98,6 +93,10 @@ import { parseTime } from "./util/parseTime";
 
 const toasts = unwrap(useToast());
 
+const props = defineProps<{
+  generalID?: number;
+}>();
+
 const generalList = ref(new Map<number, GeneralListItemP1>());
 const textMap = {
   recent_war: [
@@ -118,7 +117,7 @@ const orderedInvGeneralKeyIndex = ref(new Map<number, number>());
 
 const orderBy = ref<keyof typeof textMap>("turntime");
 const targetGeneral = ref<GeneralListItemP1>();
-const targetGeneralID = ref(queryValues.generalID ?? undefined);
+const targetGeneralID = toRef(props, "generalID");
 
 type GeneralLogs = {
   [key in GeneralLogType]: Map<number, string>;
diff --git a/hwe/ts/v_battleCenter.ts b/hwe/ts/v_battleCenter.ts
index 6205428c..71d98c6b 100644
--- a/hwe/ts/v_battleCenter.ts
+++ b/hwe/ts/v_battleCenter.ts
@@ -10,11 +10,13 @@ import { insertCustomCSS } from "./util/customCSS";
 import { installVue3Components } from "./util/installVue3Components";
 
 
-
+declare const query:{
+  generalID?: number;
+};
 
 auto500px();
 
 htmlReady(() => {
   insertCustomCSS();
 });
-installVue3Components(createApp(PageBattleCenter)).mount('#app');
\ No newline at end of file
+installVue3Components(createApp(PageBattleCenter, query)).mount('#app');
\ No newline at end of file
diff --git a/hwe/ts/v_board.ts b/hwe/ts/v_board.ts
index 03f8d051..1aa7768d 100644
--- a/hwe/ts/v_board.ts
+++ b/hwe/ts/v_board.ts
@@ -1,7 +1,6 @@
 import "@scss/board.scss";
 import { createApp } from 'vue'
 import PageBoard from '@/PageBoard.vue';
-import BootstrapVueNext from 'bootstrap-vue-next'
 import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
 import { auto500px } from "./util/auto500px";
 import { insertCustomCSS } from "./util/customCSS";
diff --git a/hwe/ts/v_processing.ts b/hwe/ts/v_processing.ts
index 1e61aa13..0cdf649c 100644
--- a/hwe/ts/v_processing.ts
+++ b/hwe/ts/v_processing.ts
@@ -1,8 +1,6 @@
 import '@scss/processing.scss';
 
 import { unwrap } from "@util/unwrap";
-import BootstrapVueNext from 'bootstrap-vue-next'
-import Multiselect from 'vue-multiselect';
 import { commandMap as GeneralActions } from "@/processing/General";
 import { commandMap as NationActions } from '@/processing/Nation';
 import { type App, createApp } from 'vue';
@@ -14,6 +12,7 @@ import { StoredActionsHelper } from './util/StoredActionsHelper';
 import type { ReserveCommandResponse } from './defs/API/Command';
 import { htmlReady } from './util/htmlReady';
 import { insertCustomCSS } from './util/customCSS';
+import { installVue3Components } from './util/installVue3Components';
 
 declare const staticValues: {
     serverNick: string,
@@ -100,13 +99,13 @@ if (app === undefined) {
     console.error(`모듈이 지정되지 않음`, entryInfo);
 }
 else {
-    const div = unwrap(document.querySelector('#container'));
+    const div = unwrap(document.querySelector('#app'));
     div.addEventListener('customSubmit', (e: Event) => {
         const { detail } = e as unknown as CustomEvent<Args>;
         void submitCommand(entryInfo[0] == 'Nation', turnList, entryInfo[1], detail);
     }, true);
 
-    app.use(BootstrapVueNext).component('v-multiselect', Multiselect).mount('#container');
+    installVue3Components(app).mount('#app');
 }
 
 
diff --git a/hwe/v_battleCenter.php b/hwe/v_battleCenter.php
index 6065844b..df2feb34 100644
--- a/hwe/v_battleCenter.php
+++ b/hwe/v_battleCenter.php
@@ -27,7 +27,7 @@ $gen = Util::getReq('gen', 'int');
             'mapName' => GameConst::$mapName,
             'unitSet' => GameConst::$unitSet,
         ],
-        'queryValues' => [
+        'query' => [
             'generalID' => $gen,
         ]
     ], false) ?>
diff --git a/hwe/v_processing.php b/hwe/v_processing.php
index d55a2f77..15914ac4 100644
--- a/hwe/v_processing.php
+++ b/hwe/v_processing.php
@@ -101,7 +101,7 @@ if (!$commandObj->hasPermissionToReserve()) {
 </head>
 
 <body class="img_back">
-    <div id="container"></div>
+    <div id="app"></div>
 </body>
 
 </html>
\ No newline at end of file