From 94ab0406934595c005777e847efea126c7218a54 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 18 Dec 2021 05:08:53 +0900
Subject: [PATCH] =?UTF-8?q?feat(WIP):=20processing=20=EC=B6=9C=EB=B3=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Command/General/che_이동.php | 21 ------
 hwe/sammo/Command/General/che_출병.php | 22 +-----
 hwe/ts/map.ts                          |  3 +-
 hwe/ts/processing/General/che_출병.vue | 95 ++++++++++++++++++++++++++
 hwe/ts/processing/General/index.ts     |  3 +-
 5 files changed, 102 insertions(+), 42 deletions(-)
 create mode 100644 hwe/ts/processing/General/che_출병.vue

diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php
index 4af17d41..92a60d5f 100644
--- a/hwe/sammo/Command/General/che_이동.php
+++ b/hwe/sammo/Command/General/che_이동.php
@@ -186,25 +186,4 @@ class che_이동 extends Command\GeneralCommand
             'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1),
         ];
     }
-
-    public function getForm(): string
-    {
-        $currentCityID = $this->generalObj->getCityID();
-        $currentCityName = CityConst::byID($currentCityID)->name;
-
-        ob_start();
-?>
-        <?= \sammo\getMapHtml() ?><br>
-        선택된 도시로 이동합니다.<br>
-        인접 도시로만 이동이 가능합니다.<br>
-        목록을 선택하거나 도시를 클릭하세요.<br>
-        <?= $currentCityName ?> => <select class='formInput' name="destCityID" id="destCityID" size='1' style='color:white;background-color:black;'><br>
-            <?= \sammo\optionsForCities() ?><br>
-        </select> <input type=button id="commonSubmit" value="<?= $this->getName() ?>"><br>
-        <br>
-        <br>
-        <?= printCitiesBasedOnDistance($currentCityID, 1) ?>
-<?php
-        return ob_get_clean();
-    }
 }
diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php
index 22dc9a3a..70e5c633 100644
--- a/hwe/sammo/Command/General/che_출병.php
+++ b/hwe/sammo/Command/General/che_출병.php
@@ -240,27 +240,11 @@ class che_출병 extends Command\GeneralCommand
         return true;
     }
 
-    public function getJSPlugins(): array
+    public function exportJSVars(): array
     {
         return [
-            'defaultSelectCityByMap'
+            'cities' => \sammo\JSOptionsForCities(),
+            'mapTheme' => \sammo\getMapTheme(),
         ];
     }
-
-    public function getForm(): string
-    {
-        $srcCityName = \sammo\CityConst::byID($this->generalObj->getCityID())->name;
-        ob_start();
-?>
-        <?= \sammo\getMapHtml() ?><br>
-        선택된 도시를 향해 침공을 합니다.<br>
-        침공 경로에 적군의 도시가 있다면 전투를 벌입니다.<br>
-        목록을 선택하거나 도시를 클릭하세요.<br>
-        <?= $srcCityName ?> =><select class='formInput' name="destCityID" id="destCityID" size='1' style='color:white;background-color:black;'>
-            <?= \sammo\optionsForCities() ?><br>
-        </select> <input type=button id="commonSubmit" value="<?= $this->getName() ?>"><br>
-        <br>
-<?php
-        return ob_get_clean();
-    }
 }
diff --git a/hwe/ts/map.ts b/hwe/ts/map.ts
index 4a0e5a6f..8069145b 100644
--- a/hwe/ts/map.ts
+++ b/hwe/ts/map.ts
@@ -660,7 +660,8 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
             }
 
             if (selectCallback) {
-                $cityLink.on('click', function () {
+                $cityLink.on('click', function (e) {
+                    e.preventDefault();
                     return selectCallback(city);
                 });
             }
diff --git a/hwe/ts/processing/General/che_출병.vue b/hwe/ts/processing/General/che_출병.vue
new file mode 100644
index 00000000..2a111a5c
--- /dev/null
+++ b/hwe/ts/processing/General/che_출병.vue
@@ -0,0 +1,95 @@
+<template>
+  <TopBackBar :title="commandName" />
+  <div class="bg0">
+    <MapLegacyTemplate
+      :isDetailMap="false"
+      :clickableAll="true"
+      :neutralView="true"
+      :useCachedMap="true"
+      :mapTheme="mapTheme"
+      v-model="selectedCityObj"
+    />
+
+    <div>
+      선택된 도시를 향해 침공을 합니다.<br />
+      침공 경로에 적군의 도시가 있다면 전투를 벌입니다.<br />
+      목록을 선택하거나 도시를 클릭하세요.<br />
+    </div>
+    <div class="row">
+      <div class="col">
+        <CitySelect :cities="citiesMap" :modelValue="selectedCityID" />
+      </div>
+      <div class="col">
+        <b-button @click="submit">{{ commandName }}</b-button>
+      </div>
+    </div>
+  </div>
+  <BottomBar :title="commandName" />
+</template>
+
+<script lang="ts">
+import MapLegacyTemplate, {
+  MapCityParsed,
+} from "@/components/MapLegacyTemplate.vue";
+import CitySelect from "@/processing/CitySelect.vue";
+import { defineComponent, ref } from "vue";
+import { unwrap } from "@/util/unwrap";
+import { Args } from "@/processing/args";
+import TopBackBar from "@/components/TopBackBar.vue";
+import BottomBar from "@/components/BottomBar.vue";
+declare const mapTheme: string;
+declare const cities: [number, string][];
+declare const currentCity: number;
+declare const commandName: string;
+export default defineComponent({
+  components: {
+    MapLegacyTemplate,
+    CitySelect,
+    TopBackBar,
+    BottomBar,
+  },
+  watch: {
+    selectedCityObj(city: MapCityParsed) {
+      this.selectedCityID = city.id;
+    },
+  },
+  setup() {
+    const citiesMap = new Map<
+      number,
+      {
+        name: string;
+        info?: string;
+      }
+    >();
+    for (const [id, name] of cities) {
+      citiesMap.set(id, { name });
+    }
+    console.log(citiesMap);
+
+    const selectedCityID = ref(currentCity);
+
+    function selected(cityID: number) {
+      selectedCityID.value = cityID;
+    }
+
+    async function submit(e: Event) {
+      const event = new CustomEvent<Args>("customSubmit", {
+        detail: {
+          destCityID: selectedCityID.value,
+        },
+      });
+      unwrap(e.target).dispatchEvent(event);
+    }
+
+    return {
+      mapTheme: ref(mapTheme),
+      citiesMap: ref(citiesMap),
+      selectedCityID,
+      selectedCityObj: ref(undefined as MapCityParsed | undefined),
+      commandName,
+      selected,
+      submit,
+    };
+  },
+});
+</script>
diff --git a/hwe/ts/processing/General/index.ts b/hwe/ts/processing/General/index.ts
index 8d1d5e1c..c7514e1b 100644
--- a/hwe/ts/processing/General/index.ts
+++ b/hwe/ts/processing/General/index.ts
@@ -1,2 +1,3 @@
 export { default as che_강행 } from "./che_강행.vue";
-export { default as che_이동 } from "./che_이동.vue";
\ No newline at end of file
+export { default as che_이동 } from "./che_이동.vue";
+export { default as che_출병 } from "./che_출병.vue";
\ No newline at end of file