From 3b887598da80e691c88265dbd3f3e4663cc69529 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 8 Apr 2022 01:11:45 +0900
Subject: [PATCH] =?UTF-8?q?feat(wip):=20=EA=B6=8C=ED=95=9C=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=BC=20=EC=88=98=20=EC=97=86=EB=8A=94=20?=
 =?UTF-8?q?=ED=95=AD=EB=AA=A9=EC=9D=84=20=EB=AA=85=ED=99=95=ED=9E=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/components/GeneralList.vue             | 32 +++++++++++++++----
 hwe/ts/gridCellRenderer/GridTooltipCell.vue   |  2 +-
 hwe/ts/gridCellRenderer/SimpleTooltipCell.vue |  2 +-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/hwe/ts/components/GeneralList.vue b/hwe/ts/components/GeneralList.vue
index c89ebc14..abcedd29 100644
--- a/hwe/ts/components/GeneralList.vue
+++ b/hwe/ts/components/GeneralList.vue
@@ -37,7 +37,13 @@
                 :checked="col.isVisible()"
                 @change.stop="toggleColumn(colID, col)"
               />
-              <label class="form-check-label" :for="`column-type-${colID}`">
+              <label
+                class="form-check-label"
+                :for="`column-type-${colID}`"
+                :style="{
+                  textDecoration: validColumns.has(colID) ? undefined : 'line-through',
+                }"
+              >
                 {{ col.getColDef().headerName }}
               </label>
             </div></BDropdownItem
@@ -132,9 +138,18 @@ const props = defineProps({
 const suppressColumnMoveAnimation = ref(true);
 const gameConstStore = unwrap(inject<Ref<GameConstStore>>("gameConstStore"));
 
+const validColumns = ref(new Set<string>());
+
 watch(
   () => props.list,
-  () => {
+  (newValue) => {
+    const newValidColumns = new Set<string>(['icon']);
+    if (newValue.length > 0) {
+      for (const key of Object.keys(newValue[0])) {
+        newValidColumns.add(key);
+      }
+      validColumns.value = newValidColumns;
+    }
     setTimeout(() => {
       gridApi.value?.redrawRows();
     }, 0);
@@ -384,7 +399,7 @@ function numberFormatter(unit?: string) {
   if (unit) {
     return (value: GenValueParams): string => {
       if (value.value == null) {
-        return "-";
+        return "?";
       }
       const valueText = (value.value as number).toLocaleString();
       return `${valueText} ${unit}`;
@@ -647,7 +662,7 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
     field: "city",
     valueGetter: ({ data }) => {
       if (!data.st2) {
-        return "-";
+        return "?";
       }
       return gameConstStore.value.cityConst[data.city].name;
     },
@@ -656,7 +671,7 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
     width: 60,
     filterValueGetter: ({ data }) => {
       if (!data.st2) {
-        return "-";
+        return "";
       }
       return convertSearch초성(gameConstStore.value.cityConst[data.city].name);
     },
@@ -666,6 +681,9 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
     headerName: "부대",
     field: "troop",
     valueGetter: ({ data }: GenValueGetterParams) => {
+      if(!data.st2){
+        return '?';
+      }
       const troopInfo = extractTroopInfo(data);
       if (troopInfo === undefined) {
         return "-";
@@ -740,7 +758,7 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
         filter: true,
         filterValueGetter: ({ data }) => {
           if (!data.st2) {
-            return "-";
+            return "?";
           }
           const name = gameConstStore.value.iActionInfo.crewtype[data.crewtype].name;
           return convertSearch초성(name);
@@ -933,7 +951,7 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
     width: 60,
     valueFormatter: ({ value, data }) => {
       if (!data.st2) {
-        return "-";
+        return "?";
       }
       const turntime = value as string;
       return turntime.substring(14, 19);
diff --git a/hwe/ts/gridCellRenderer/GridTooltipCell.vue b/hwe/ts/gridCellRenderer/GridTooltipCell.vue
index c56bb0fd..b31ea920 100644
--- a/hwe/ts/gridCellRenderer/GridTooltipCell.vue
+++ b/hwe/ts/gridCellRenderer/GridTooltipCell.vue
@@ -2,7 +2,7 @@
   <div>
     <div v-for="(rowValue, rowIdx) in props.params.cells" :key="rowIdx" class="row gx-1 m-0 cell-sp">
       <template v-for="colValue of rowValue" :key="colValue.target">
-        <div v-if="params.data[colValue.target] == null">-</div>
+        <div v-if="params.data[colValue.target] == null">?</div>
         <div
           v-else-if="colValue.iActionMap"
           v-b-tooltip.hover
diff --git a/hwe/ts/gridCellRenderer/SimpleTooltipCell.vue b/hwe/ts/gridCellRenderer/SimpleTooltipCell.vue
index da3daf06..c3e6d4d0 100644
--- a/hwe/ts/gridCellRenderer/SimpleTooltipCell.vue
+++ b/hwe/ts/gridCellRenderer/SimpleTooltipCell.vue
@@ -1,5 +1,5 @@
 <template>
-  <span v-if="props.params.value == null">-</span>
+  <span v-if="props.params.value == null">?</span>
   <span v-else-if="params.iActionMap" v-b-tooltip.hover :title="params.iActionMap[props.params.value].info ?? ''">{{
     params.iActionMap[props.params.value].name
   }}</span>