feat(wip): 세력장수/암행부 컬럼 모두 등록 완료

hwe/ts/PageNationGeneral.vue

@@ -1,7 +1,8 @@
 <template>
   <BContainer id="container" :toast="{ root: true }" class="pageNationGeneral bg0">
     <TopBackBar :title="title" />
-    <GeneralList v-if="asyncReady" :list="generalList" :env="envVal" :height="'fill'" />
+    <!-- eslint-disable-next-line vue/max-attributes-per-line -->
+    <GeneralList v-if="asyncReady" :list="generalList" :troops="troopList" :env="envVal" :height="'fill'" />
     <BottomBar />
   </BContainer>
 </template>
@@ -25,46 +26,57 @@ import GeneralList from "./components/GeneralList.vue";
 import { type GameConstStore, getGameConstStore } from "./GameConstStore";
 
 const generalList = ref<GeneralListItem[]>([]);
-const envVal = ref<GeneralListResponse['env']>({
+const troopList = ref<Record<number, string>>({});
+const envVal = ref<GeneralListResponse["env"]>({
   year: 1,
   month: 1,
   turnterm: 1,
-  turntime: '2022-02-22 22:22:22.22222'
+  turntime: "2022-02-22 22:22:22.22222",
 });
 
 const gameConstStore = ref<GameConstStore>();
-provide('gameConstStore', gameConstStore);
+provide("gameConstStore", gameConstStore);
 
 const asyncReady = ref(false);
 
 const title = "세력 장수";
 
-const storeP = getGameConstStore().then((store)=>{
+const storeP = getGameConstStore().then((store) => {
   gameConstStore.value = store;
 });
 
-void Promise.all([storeP]).then(()=>{
+void Promise.all([storeP]).then(() => {
   asyncReady.value = true;
 });
 
 onMounted(async () => {
   try {
-    const { column, list, permission, env } = await SammoAPI.Nation.GeneralList();
+    const { column, list, permission, troops, env } = await SammoAPI.Nation.GeneralList();
+    troopList.value = {};
     //XXX: 로직상 똑같은데....
     if (permission == 0) {
       const rawGeneralList = merge2DArrToObjectArr(column, list);
-      generalList.value = rawGeneralList.map((v) => {return { permission, ...v }});
+      generalList.value = rawGeneralList.map((v) => {
+        return { permission, ...v };
+      });
     } else if (permission == 1) {
       const rawGeneralList = merge2DArrToObjectArr(column, list);
-      generalList.value = rawGeneralList.map((v) => {return { permission, ...v }});
+      generalList.value = rawGeneralList.map((v) => {
+        return { permission, ...v };
+      });
     } else if ([2, 3, 4].includes(permission)) {
       const rawGeneralList = merge2DArrToObjectArr(column, list);
-      generalList.value = rawGeneralList.map((v) => {return { permission, ...v }});
+      generalList.value = rawGeneralList.map((v) => {
+        return { permission, ...v };
+      });
+
+      for(const [troopLeader, troopName] of troops){
+        troopList.value[troopLeader] = troopName;
+      }
     } else {
       throw `?? ${permission}`;
     }
     envVal.value = env;
-
   } catch (e) {
     console.error(e);
     throw e;
@@ -73,13 +85,15 @@ onMounted(async () => {
 </script>
 
 <style lang="scss">
-html, body, #app {
+html,
+body,
+#app {
   height: 100%;
 }
 
-.pageNationGeneral{
+.pageNationGeneral {
   display: grid;
   grid-template-rows: auto 1fr auto;
   height: 100%;
 }
-</style>
+</style>