From 3fc1183be66d0bd0661d764570a48f522dc6dd9f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 23 Dec 2021 01:34:45 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20processing=20=EC=B2=B4=EA=B3=84?=
 =?UTF-8?q?=EB=A5=BC=20=EC=9D=BC=EA=B4=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Command/General/che_출병.php        |  3 +-
 hwe/ts/PartialReservedCommand.vue             |  1 -
 hwe/ts/processing/CrewTypeItem.vue            |  5 +-
 hwe/ts/processing/General/che_건국.vue        | 11 ++--
 hwe/ts/processing/General/che_군량매매.vue    |  4 +-
 hwe/ts/processing/General/che_선양.vue        |  4 +-
 .../processing/General/che_장수대상임관.vue   | 62 ++++++++++++++++---
 hwe/ts/processing/General/che_징병.vue        | 56 +++++++++--------
 hwe/ts/processing/General/che_헌납.vue        |  4 +-
 hwe/ts/processing/Nation/che_국호변경.vue     |  2 +-
 hwe/ts/processing/Nation/che_불가침제의.vue   | 21 ++++---
 hwe/ts/processing/Nation/che_피장파장.vue     |  4 +-
 hwe/ts/processing/ProcessGeneralAmount.vue    |  4 +-
 hwe/ts/processing/SelectAmount.vue            |  2 +-
 hwe/ts/processing/args.ts                     |  4 ++
 hwe/ts/util/mb_strwidth.ts                    |  1 -
 16 files changed, 122 insertions(+), 66 deletions(-)

diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php
index 2c7ca7ea..eef6119d 100644
--- a/hwe/sammo/Command/General/che_출병.php
+++ b/hwe/sammo/Command/General/che_출병.php
@@ -247,7 +247,8 @@ class che_출병 extends Command\GeneralCommand
             'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
-                'distanceList' => new \StdClass(),
+                'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1),
+
             ],
         ];
     }
diff --git a/hwe/ts/PartialReservedCommand.vue b/hwe/ts/PartialReservedCommand.vue
index 54161ed4..07884e22 100644
--- a/hwe/ts/PartialReservedCommand.vue
+++ b/hwe/ts/PartialReservedCommand.vue
@@ -227,7 +227,6 @@ declare const commandList: {
   values: commandItem[];
 }[];
 declare const serverNow: string;
-declare const serverID: string;
 type TurnObj = {
   action: string;
   brief: string;
diff --git a/hwe/ts/processing/CrewTypeItem.vue b/hwe/ts/processing/CrewTypeItem.vue
index 0fb3f989..53f94bbe 100644
--- a/hwe/ts/processing/CrewTypeItem.vue
+++ b/hwe/ts/processing/CrewTypeItem.vue
@@ -27,9 +27,9 @@
     <div>{{ crewType.attack }}</div>
     <div>{{ crewType.defence }}</div>
     <div>{{ crewType.speed }}</div>
+    <div>{{ crewType.avoid }}</div>
     <div>{{ crewType.baseCost.toFixed(1) }}</div>
     <div>{{ crewType.baseRice.toFixed(1) }}</div>
-    <div>{{ crewType.avoid }}</div>
     <div class="crewTypePanel">
       <b-button-group
         ><b-button class="py-1" variant="dark" @click="beHalf">절반</b-button
@@ -59,7 +59,7 @@
                 background-color: #ddd;
               "
               ><div style="margin-left: auto">
-                {{ Math.ceil(amount * crewType.baseCost).toLocaleString() }}금
+                {{ Math.ceil(amount * crewType.baseCost * goldCoeff).toLocaleString() }}금
               </div></span
             >
           </div>
@@ -86,6 +86,7 @@ export default defineComponent({
     commandName: VueTypes.string.isRequired,
     currentCrewType: VueTypes.number.def(-1),
     crew: VueTypes.number.def(0),
+    goldCoeff: VueTypes.number.isRequired,
   },
   emits: ["submitOutput", "update:amount"],
   watch: {
diff --git a/hwe/ts/processing/General/che_건국.vue b/hwe/ts/processing/General/che_건국.vue
index 970b2fc7..c9876386 100644
--- a/hwe/ts/processing/General/che_건국.vue
+++ b/hwe/ts/processing/General/che_건국.vue
@@ -16,20 +16,21 @@
       </li>
     </ul>
     <div class="row">
-      <div class="col-12 col-md-4">
-        국명 : <b-form-input v-model="destNationName" />
+      <div class="col-4 col-md-2">
+        국명 : <b-form-input maxlength="18" v-model="destNationName" />
       </div>
-      <div class="col-6 col-md-2">
+      <div class="col-3 col-md-2">
         색상 : <ColorSelect :colors="colors" v-model="selectedColorID" />
       </div>
-      <div class="col-6 col-md-2">
+      <div class="col-3 col-md-2">
         <label>성향 :</label>
         <b-form-select
           :options="nationTypesOption"
           v-model="selectedNationType"
         />
       </div>
-      <div class="col-12 col-md-2 d-grid">
+
+      <div class="col-2 col-md-2 d-grid">
         <b-button @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
diff --git a/hwe/ts/processing/General/che_군량매매.vue b/hwe/ts/processing/General/che_군량매매.vue
index 34ee9825..5a1a56be 100644
--- a/hwe/ts/processing/General/che_군량매매.vue
+++ b/hwe/ts/processing/General/che_군량매매.vue
@@ -12,7 +12,7 @@
           <b-button :pressed="!buyRice" @click="buyRice=false">팜</b-button>
         </b-button-group>
       </div>
-      <div class="col-6 col-md-4">
+      <div class="col-7 col-md-4">
         금액 :
         <SelectAmount
           :amountGuide="amountGuide"
@@ -21,7 +21,7 @@
           :minAmount="minAmount"
         />
       </div>
-      <div class="col-4 col-md-2 d-grid">
+      <div class="col-3 col-md-2 d-grid">
         <b-button variant="primary" @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
diff --git a/hwe/ts/processing/General/che_선양.vue b/hwe/ts/processing/General/che_선양.vue
index eeafe81a..2cdd5d4b 100644
--- a/hwe/ts/processing/General/che_선양.vue
+++ b/hwe/ts/processing/General/che_선양.vue
@@ -11,7 +11,7 @@
       장수를 선택하세요.<br />
     </div>
     <div class="row">
-      <div class="col-12 col-md-6">
+      <div class="col-9 col-md-4">
         장수 :
         <SelectGeneral
           :generals="generalList"
@@ -19,7 +19,7 @@
           v-model="selectedGeneralID"
         />
       </div>
-      <div class="col-4 col-md-2 d-grid">
+      <div class="col-3 col-md-2 d-grid">
         <b-button variant="primary" @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
diff --git a/hwe/ts/processing/General/che_장수대상임관.vue b/hwe/ts/processing/General/che_장수대상임관.vue
index 89ee3768..c19096d6 100644
--- a/hwe/ts/processing/General/che_장수대상임관.vue
+++ b/hwe/ts/processing/General/che_장수대상임관.vue
@@ -8,7 +8,7 @@
       임관할 국가를 목록에서 선택하세요.<br />
     </div>
     <div class="row">
-      <div class="col-12 col-md-6">
+      <div class="col-8 col-md-4">
         장수 :
         <SelectGeneral
           :generals="generalList"
@@ -25,11 +25,20 @@
       <div class="nation-header nation-row bg1 center">
         <div>국가명</div>
         <div>임관권유문</div>
+        <div class="zoom-toggle d-grid">
+          <b-button
+            :pressed="toggleZoom"
+            :variant="toggleZoom ? 'info' : 'secondary'"
+            v-model="toggleZoom"
+            @click="toggleZoom = !toggleZoom"
+            >{{ toggleZoom ? "작게 보기" : "크게 보기" }}</b-button
+          >
+        </div>
       </div>
       <div
         v-for="[, nation] in nationList"
         :key="nation.id"
-        class="nation-row s-border-b"
+        :class="['nation-row', 's-border-b', toggleZoom ? 'on-zoom' : 'on-fit']"
       >
         <div
           :style="{
@@ -87,6 +96,7 @@ export default defineComponent({
       procRes.generals
     );
 
+    const toggleZoom = ref(true);
     const selectedGeneralID = ref(generalList[0].no);
 
     function textHelpGeneral(gen: procGeneralItem): string {
@@ -116,6 +126,7 @@ export default defineComponent({
       selectedGeneralID,
       generalList,
       commandName,
+      toggleZoom,
       isBrightColor,
       textHelpGeneral,
       submit,
@@ -132,24 +143,57 @@ export default defineComponent({
     display: grid;
     grid-template-columns: 130px 870px;
   }
+
+  .zoom-toggle {
+    display: none;
+  }
+
+  .zoom-toggle > * {
+    display: none;
+  }
 }
 
 @include media-500px {
+  .nation-list .nation-row.nation-header {
+    display: grid;
+    grid-template-columns: 3fr 1fr;
+    grid-template-rows: 1fr 1fr;
+
+    .zoom-toggle {
+      grid-column: 2/3;
+      grid-row: 1/3;
+    }
+  }
+
   .nation-list .nation-row {
     display: grid;
     grid-template-columns: 1fr;
     grid-template-rows: 1fr minmax(1fr, calc(200px * 500 / 870));
   }
 
-  .nation-scout-plate {
-    max-height: calc(200px * 500 / 870);
-    overflow: hidden;
+  .on-fit {
+    .nation-scout-plate {
+      max-height: calc(200px * 500 / 870);
+      overflow: hidden;
+    }
+
+    .nation-scout-msg {
+      width: 870px;
+      transform-origin: 0px 0px;
+      transform: scale(calc(500 / 870));
+    }
   }
 
-  .nation-scout-msg {
-    width: 870px;
-    transform-origin: 0px 0px;
-    transform: scale(calc(500 / 870));
+  .on-zoom {
+    .nation-scout-plate {
+      max-height: 200px;
+      overflow-y: hidden;
+      overflow-x: auto;
+    }
+
+    .nation-scout-msg {
+      max-width: 870px;
+    }
   }
 }
 </style>
\ No newline at end of file
diff --git a/hwe/ts/processing/General/che_징병.vue b/hwe/ts/processing/General/che_징병.vue
index 1f7b840e..bede7c27 100644
--- a/hwe/ts/processing/General/che_징병.vue
+++ b/hwe/ts/processing/General/che_징병.vue
@@ -61,11 +61,12 @@
           ></div>
           <div
             :style="{
-              backgroundColor: (destCrewType.notAvailable
-                ? 'red'
-                : destCrewType.reqTech == 0
-                ? 'green'
-                : 'limegreen')+' !important',
+              backgroundColor:
+                (destCrewType.notAvailable
+                  ? 'red'
+                  : destCrewType.reqTech == 0
+                  ? 'green'
+                  : 'limegreen') + ' !important',
               height: '100%',
             }"
             class="d-grid"
@@ -74,7 +75,7 @@
               {{ destCrewType.name }}
             </div>
           </div>
-          <div>{{ destCrewType.baseCost.toFixed(1) }}</div>
+          <div></div>
           <div class="crewTypePanel">
             <b-button-group
               ><b-button class="py-1" variant="dark" @click="beHalf"
@@ -107,7 +108,7 @@
                     ><div style="margin-left: auto">
                       {{
                         Math.ceil(
-                          amount * destCrewType.baseCost
+                          amount * destCrewType.baseCost * goldCoeff
                         ).toLocaleString()
                       }}금
                     </div></span
@@ -116,6 +117,7 @@
               </div>
             </div>
           </div>
+          <div></div>
           <b-button variant="primary" @click="submit">{{
             commandName
           }}</b-button>
@@ -126,9 +128,9 @@
           <div>공격</div>
           <div>방어</div>
           <div>기동</div>
+          <div>회피</div>
           <div>가격</div>
           <div>군량</div>
-          <div>회피</div>
           <div class="crewTypePanel">병사 수</div>
           <div class="crewTypeBtn">행동</div>
           <div class="crewTypeInfo">특징</div>
@@ -140,10 +142,17 @@
           :key="armCrewType.armType"
         >
           <div class="s-border-b row gx-0">
-            <div class="col-7 col-md-10 align-self-center px-3" style="font-size:1.3em;">{{ armCrewType.armName }} 계열</div>
+            <div
+              class="col-7 col-md-10 align-self-center px-3"
+              style="font-size: 1.3em"
+            >
+              {{ armCrewType.armName }} 계열
+            </div>
             <div class="col-5 col-md-2 d-grid">
               <b-button
-                :variant="showNotAvailable.get(armCrewType.armType) ? 'warning' : 'dark'"
+                :variant="
+                  showNotAvailable.get(armCrewType.armType) ? 'warning' : 'dark'
+                "
                 :pressed="showNotAvailable.get(armCrewType.armType)"
                 class="btn-sm"
                 @click="toggleShowNotAvailable(armCrewType.armType)"
@@ -166,6 +175,7 @@
               :commandName="commandName"
               :currentCrewType="currentCrewType"
               :crew="crew"
+              :goldCoeff="goldCoeff"
               @submitOutput="trySubmit"
               @click="
                 destCrewType = crewTypeMap.get(crewType.id);
@@ -262,26 +272,18 @@ export default defineComponent({
       void submit(e);
     }
 
-    function toggleShowNotAvailable(armType: number){
-        showNotAvailable.value.set(armType, !(showNotAvailable.value.get(armType)??0));
+    function toggleShowNotAvailable(armType: number) {
+      showNotAvailable.value.set(
+        armType,
+        !(showNotAvailable.value.get(armType) ?? 0)
+      );
     }
 
     return {
       destCrewType,
       amount,
       showNotAvailable,
-      relYear: procRes.relYear,
-      year: procRes.year,
-      tech: procRes.tech,
-      techLevel: procRes.techLevel,
-      startYear: procRes.startYear,
-      goldCoeff: procRes.goldCoeff,
-      leadership: procRes.leadership,
-      fullLeadership: procRes.fullLeadership,
-      armCrewTypes: procRes.armCrewTypes,
-      currentCrewType: procRes.currentCrewType,
-      crew: procRes.crew,
-      gold: procRes.gold,
+      ...procRes,
       crewTypeMap,
       commandName,
       beHalf,
@@ -320,8 +322,8 @@ export default defineComponent({
     display: none;
   }
 
-  .only500pxMode{
-      display: none;
+  .only500pxMode {
+    display: none;
   }
 }
 
@@ -367,7 +369,7 @@ export default defineComponent({
 
   .miniCrewPanel {
     display: grid;
-    grid-template-columns: 64px 1.5fr 1fr 270px 2fr;
+    grid-template-columns: 64px 1.5fr 0.5fr 270px 0.5fr 2fr;
     grid-template-rows: 64px;
     align-items: center;
   }
diff --git a/hwe/ts/processing/General/che_헌납.vue b/hwe/ts/processing/General/che_헌납.vue
index 59bfb3ff..6191c61f 100644
--- a/hwe/ts/processing/General/che_헌납.vue
+++ b/hwe/ts/processing/General/che_헌납.vue
@@ -12,7 +12,7 @@
           <b-button :pressed="!isGold" @click="isGold = false">쌀</b-button>
         </b-button-group>
       </div>
-      <div class="col-6 col-md-4">
+      <div class="col-7 col-md-4">
         금액 :
         <SelectAmount
           :amountGuide="amountGuide"
@@ -21,7 +21,7 @@
           :minAmount="minAmount"
         />
       </div>
-      <div class="col-4 col-md-2 d-grid">
+      <div class="col-3 col-md-2 d-grid">
         <b-button variant="primary" @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
diff --git a/hwe/ts/processing/Nation/che_국호변경.vue b/hwe/ts/processing/Nation/che_국호변경.vue
index f7368d2b..bdb8b2e2 100644
--- a/hwe/ts/processing/Nation/che_국호변경.vue
+++ b/hwe/ts/processing/Nation/che_국호변경.vue
@@ -7,7 +7,7 @@
     <div class="row">
       <div class="col-6 col-md-3">
         국명 :
-        <b-form-input v-model="destNationName"/>
+        <b-form-input maxlength="18" v-model="destNationName"/>
       </div>
       <div class="col-4 col-md-2 d-grid">
         <b-button @click="submit">{{ commandName }}</b-button>
diff --git a/hwe/ts/processing/Nation/che_불가침제의.vue b/hwe/ts/processing/Nation/che_불가침제의.vue
index 065f5343..82cf7c6c 100644
--- a/hwe/ts/processing/Nation/che_불가침제의.vue
+++ b/hwe/ts/processing/Nation/che_불가침제의.vue
@@ -18,15 +18,14 @@
       <span style="color: red">붉은색</span>으로 표시됩니다.<br />
     </div>
     <div class="row">
-      <div class="col-6 col-md-3">
+      <div class="col-4 col-md-3">
         국가 :
         <SelectNation :nations="nationList" v-model="selectedNationID" />
       </div>
-      <div class="col-6 col-md-3">
+      <div class="col-5 col-md-3">
         기간 :
-        <div class="input-group"></div>
         <div class="input-group">
-          <b-form-select v-model="selectedYear"
+          <b-form-select class="text-end selectedYear" v-model="selectedYear"
             ><b-form-select-option
               v-for="yearP in maxYear - minYear + 1"
               :key="yearP"
@@ -34,16 +33,16 @@
               >{{ yearP + minYear - 1 }}</b-form-select-option
             >
           </b-form-select>
-          <span class="input-group-text">년</span>
-          <b-form-select v-model="selectedMonth"
+          <span class="input-group-text px-2">년</span>
+          <b-form-select class="text-center" v-model="selectedMonth"
             ><b-form-select-option v-for="month in 12" :key="month" :value="month">{{
               month
             }}</b-form-select-option>
           </b-form-select>
-          <span class="input-group-text">월</span>
+          <span class="input-group-text px-2">월</span>
         </div>
       </div>
-      <div class="col-4 col-md-2 d-grid">
+      <div class="col-3 col-md-2 d-grid">
         <b-button @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
@@ -130,3 +129,9 @@ export default defineComponent({
   },
 });
 </script>
+
+<style lang="scss" scoped>
+.selectedYear{
+  width:32%;
+}
+</style>
\ No newline at end of file
diff --git a/hwe/ts/processing/Nation/che_피장파장.vue b/hwe/ts/processing/Nation/che_피장파장.vue
index 1c695645..1deae778 100644
--- a/hwe/ts/processing/Nation/che_피장파장.vue
+++ b/hwe/ts/processing/Nation/che_피장파장.vue
@@ -24,14 +24,14 @@
         국가 :
         <SelectNation :nations="nationList" v-model="selectedNationID" />
       </div>
-      <div class="col-4 col-md-2">
+      <div class="col-3 col-md-2">
         <label>전략 :</label>
         <b-form-select
           :options="commandTypesOption"
           v-model="selectedCommandID"
         />
       </div>
-      <div class="col-4 col-md-2 d-grid">
+      <div class="col-3 col-md-2 d-grid">
         <b-button @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
diff --git a/hwe/ts/processing/ProcessGeneralAmount.vue b/hwe/ts/processing/ProcessGeneralAmount.vue
index 000e9c16..8f299150 100644
--- a/hwe/ts/processing/ProcessGeneralAmount.vue
+++ b/hwe/ts/processing/ProcessGeneralAmount.vue
@@ -28,7 +28,7 @@
           <b-button :pressed="!isGold" @click="isGold=false">쌀</b-button>
         </b-button-group>
       </div>
-      <div class="col-6 col-md-4">
+      <div class="col-7 col-md-4">
         금액 :
         <SelectAmount
           :amountGuide="amountGuide"
@@ -37,7 +37,7 @@
           :minAmount="minAmount"
         />
       </div>
-      <div class="col-4 col-md-2 d-grid">
+      <div class="col-3 col-md-2 d-grid">
         <b-button variant="primary" @click="submit">{{ commandName }}</b-button>
       </div>
     </div>
diff --git a/hwe/ts/processing/SelectAmount.vue b/hwe/ts/processing/SelectAmount.vue
index c16a474c..64c59e78 100644
--- a/hwe/ts/processing/SelectAmount.vue
+++ b/hwe/ts/processing/SelectAmount.vue
@@ -20,7 +20,7 @@
     >
     <input
       type="number"
-      class="form-control"
+      class="form-control text-end"
       :max="maxAmount"
       :min="minAmount"
       :step="step"
diff --git a/hwe/ts/processing/args.ts b/hwe/ts/processing/args.ts
index 782e29bc..c7f152dd 100644
--- a/hwe/ts/processing/args.ts
+++ b/hwe/ts/processing/args.ts
@@ -1,3 +1,4 @@
+import { mb_strwidth } from "@/util/mb_strwidth";
 import { isArray, isBoolean, isInteger, isString } from "lodash";
 
 
@@ -55,6 +56,9 @@ export function testSubmitArgs(args: Args): true | ['int' | 'string' | 'boolean'
         if (!isString(testVal)) {
             return ['string', stringKey, testVal];
         }
+        if(stringKey == 'nationName' && mb_strwidth(testVal) > 18){
+            throw `길이가 반각 18자 분량을 넘었습니다.`;
+        }
     }
     for (const booleanKey of booleanArgs) {
         const testVal = args[booleanKey];
diff --git a/hwe/ts/util/mb_strwidth.ts b/hwe/ts/util/mb_strwidth.ts
index c1013c18..37ef5b8b 100644
--- a/hwe/ts/util/mb_strwidth.ts
+++ b/hwe/ts/util/mb_strwidth.ts
@@ -1,4 +1,3 @@
-//TODO: X-Requested-With 믿지 말자.
 //https://gist.github.com/demouth/3217440
 /**
  * mb_strwidth