From 23bcae567fb60cd9bd5192ea0ee21b0caa56b3c5 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 5 Dec 2021 16:41:13 +0900
Subject: [PATCH] =?UTF-8?q?feat(WIP):=20ReservedCommand=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=EC=B0=BD=EC=9D=84=20vue-multiselect=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20vue-select=EB=8A=94=20=EC=B7=A8?=
 =?UTF-8?q?=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php               |  3 ++-
 hwe/ts/ReservedCommand.vue | 48 ++++++++------------------------------
 package.json               |  1 -
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index c734626e..f64c9891 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -475,7 +475,8 @@ function getCommandTable(General $general){
             if (!$commandObj->canDisplay()) {
                 continue;
             }
-            $subList[Util::getClassNameFromObj($commandObj)] = [
+            $subList[] = [
+                'value'=>Util::getClassNameFromObj($commandObj),
                 'compansation'=>$commandObj->getCompensationStyle(),
                 'possible'=>$commandObj->hasMinConditionMet(),
                 'title'=>$commandObj->getCommandDetailTitle(),
diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/ReservedCommand.vue
index db797120..5ff81e69 100644
--- a/hwe/ts/ReservedCommand.vue
+++ b/hwe/ts/ReservedCommand.vue
@@ -132,12 +132,13 @@
         <v-multiselect
           v-model="selectedCommand"
           :allow-empty="false"
-          :options="compiledCommandList"
+          :options="commandList"
           :group-select="true"
           group-values="values"
           group-label="category"
           label="title"
           track-by="value"
+          open-direction="top"
         >
         </v-multiselect>
         <!--<b-form-select v-model="selectedCommand"
@@ -173,9 +174,9 @@ import { joinYearMonth } from "./util/joinYearMonth";
 import { parseTime } from "./util/parseTime";
 import { parseYearMonth } from "./util/parseYearMonth";
 import { sammoAPI } from "./util/sammoAPI";
-import { unwrap_any } from "./util/unwrap_any";
 
 type commandItem = {
+  value: string;
   title: string;
   compensation: number;
   possible: boolean;
@@ -186,7 +187,7 @@ declare const maxTurn: number;
 declare const maxPushTurn: number;
 declare const commandList: {
   category: string;
-  values: Record<string, commandItem>;
+  values: commandItem[];
 }[];
 declare const serverNow: string;
 
@@ -395,11 +396,13 @@ export default defineComponent({
         turnList.push(turnIdx);
       }
 
-      if (listReqArgCommand.has(this.selectedCommand)) {
+      const commandName = this.selectedCommand.value;
+
+      if (listReqArgCommand.has(commandName)) {
         document.location.href = stringifyUrl({
           url: "b_processing.php",
           query: {
-            command: unwrap_any<string>(this.selectedCommand),
+            command: commandName,
             turnList: turnList.join("_"),
           },
         });
@@ -409,7 +412,7 @@ export default defineComponent({
       try {
         await sammoAPI("Command/ReserveCommand", {
           turnList,
-          action: this.selectedCommand,
+          action: commandName,
         });
       } catch (e) {
         console.error(e);
@@ -431,7 +434,7 @@ export default defineComponent({
     const pressed = Array.from<boolean>({ length: maxTurn }).fill(false);
     pressed[0] = true;
 
-    const selectedCommand = "휴식";//FIXME: 새 구성에 따르면 Object임.
+    const selectedCommand =  commandList[0].values[0];
 
     const emptyTurn: TurnObjWithTime[] = Array.from<TurnObjWithTime>({
       length: maxTurn,
@@ -444,43 +447,12 @@ export default defineComponent({
       time: "",
     });
 
-    const compiledCommandList: {
-      category: string;
-      values: {
-        title: string;
-        value: null | string;
-        reqArg: boolean,
-        possible?: boolean;
-        compensation?: number;
-      }[];
-    }[] = [];
-    for (const category of commandList) {
-
-      const categoryList: (typeof compiledCommandList)[0]['values'] = [];
-      for (const [commandValue, commandInfo] of Object.entries(
-        category.values
-      )) {
-        categoryList.push({
-          reqArg: commandInfo.reqArg,
-          title: commandInfo.title,
-          value: commandValue,
-          possible: commandInfo.possible,
-          compensation: commandInfo.compensation,
-        });
-      }
-      compiledCommandList.push({
-        category: category.category,
-        values: categoryList,
-      });
-    }
-
     return {
       maxTurn,
       flippedMaxTurn: 16,
       viewMaxTurn: 16,
       maxPushTurn,
       commandList,
-      compiledCommandList,
       serverNow: formatTime(serverNowObj, "HH:mm:ss"),
       timeDiff,
       pressed,
diff --git a/package.json b/package.json
index ea1488e5..29d4ba0b 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
     "summernote": "^0.8.18",
     "vue": "^3.2.2",
     "vue-multiselect": "^3.0.0-alpha.2",
-    "vue-select": "^4.0.0-beta.1",
     "vue-types": "^4.1.0",
     "vuedraggable": "^4.1.0"
   },