feat: 사령부 턴 선택기 추가, 턴 해제 옵션 추가

hwe/ts/PageChiefCenter.vue

@@ -88,6 +88,9 @@
                   </div>
 
                   <b-dropdown class="col-md-4" left text="턴 선택">
+                    <b-dropdown-item @click="selectNone()"
+                      >해제</b-dropdown-item
+                    >
                     <b-dropdown-item @click="selectAll(true)"
                       >모든턴</b-dropdown-item
                     >
@@ -293,6 +296,9 @@ export default defineComponent({
       this.turnList.clear();
       this.turnList.add(turnIdx);
     },
+    selectNone() {
+      this.turnList.clear();
+    },
     selectAll(e: Event | true) {
       //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
       if (e !== true && isDropdownChildren(e)) {
@@ -411,13 +417,11 @@ export default defineComponent({
         timeDiff.value = serverNowObj.getTime() - clientNowObj.getTime();
 
         if (viewTarget.value === undefined) {
-          if(!tableObj.officerLevel){
+          if (!tableObj.officerLevel) {
             viewTarget.value = 12;
-          }
+          } else {
-          else{
             viewTarget.value = tableObj.officerLevel;
           }
-
         }
       } catch (e) {
         if (isString(e)) {

hwe/ts/PartialReservedCommand.vue

@@ -7,6 +7,7 @@
     <div class="row gx-1">
       <div class="col d-grid">
         <b-dropdown left text="턴 선택">
+          <b-dropdown-item @click="selectTurn()">해제</b-dropdown-item>
           <b-dropdown-item @click="selectAll(true)">모든턴</b-dropdown-item>
           <b-dropdown-item @click="selectStep(0, 2)">홀수턴</b-dropdown-item>
           <b-dropdown-item @click="selectStep(1, 2)">짝수턴</b-dropdown-item>
@@ -602,17 +603,13 @@ export default defineComponent({
     const viewMaxTurn = ref(flippedMaxTurn);
     const rowGridStyle = ref({
       display: "grid",
-      gridTemplateRows: `repeat(${viewMaxTurn.value}, 30px)`,
+      gridTemplateRows: `repeat(${viewMaxTurn.value}, 29.4px)`,
     });
 
     watch(viewMaxTurn, (val) => {
       rowGridStyle.value.gridTemplateRows = `repeat(${val}, 29.4px)`;
     });
 
-    function debugSel(val: unknown) {
-      console.log(val);
-    }
-
     const isDragSingle = ref(false);
     const isDragToggle = ref(false);
 
@@ -622,7 +619,6 @@ export default defineComponent({
       flippedMaxTurn,
       viewMaxTurn,
       rowGridStyle,
-      debugSel,
     };
   },
   mounted() {

hwe/ts/components/ChiefReservedCommand.vue

@@ -1,22 +1,54 @@
 <template>
   <div class="commandPad chiefReservedCommand">
     <div class="commandTable">
-      <template
+      <DragSelect
-        v-for="(turnObj, turnIdx) in reservedCommandList"
+        :style="rowGridStyle"
-        :key="turnIdx"
+        attribute="turnIdx"
+        @dragStart="isDragSingle = true"
+        @dragDone="
+          isDragSingle = false;
+          selectTurn(...$event);
+        "
+        v-slot="{ selected }"
       >
         <div
-          @click="selectTurn(turnIdx)"
+          v-for="(turnObj, turnIdx) in reservedCommandList"
+          :key="turnIdx"
+          :turnIdx="turnIdx"
           class="time_pad center f_tnum"
-          style="background-color: black; white-space: nowrap; overflow: hidden"
+          :style="{
+            backgroundColor: 'black',
+            whiteSpace: 'nowrap',
+            overflow: 'hidden',
+            color:
+              isDragSingle && selected.has(`${turnIdx}`) ? 'cyan' : undefined,
+          }"
         >
           {{ turnObj.time }}
         </div>
-        <div class="idx_pad center d-grid" @click="toggleTurn(turnIdx)">
+      </DragSelect>
+      <DragSelect
+        :style="rowGridStyle"
+        attribute="turnIdx"
+        @dragStart="isDragToggle = true"
+        @dragDone="
+          isDragToggle = false;
+          toggleTurn(...$event);
+        "
+        v-slot="{ selected }"
+      >
+        <div
+          v-for="(turnObj, turnIdx) in reservedCommandList"
+          :key="turnIdx"
+          :turnIdx="turnIdx"
+          class="idx_pad center d-grid"
+        >
           <b-button
             size="sm"
             :variant="
-              turnList.has(turnIdx)
+              isDragToggle && selected.has(`${turnIdx}`)
+                ? 'light'
+                : turnList.has(turnIdx)
                 ? 'info'
                 : turnList.size == 0 && prevTurnList.has(turnIdx)
                 ? 'success'
@@ -25,7 +57,13 @@
             >{{ turnIdx + 1 }}</b-button
           >
         </div>
-        <div class="turn_pad center">
+      </DragSelect>
+      <div :style="rowGridStyle">
+        <div
+          v-for="(turnObj, turnIdx) in reservedCommandList"
+          :key="turnIdx"
+          class="turn_pad center"
+        >
           <span
             class="turn_text"
             :style="turnObj.style"
@@ -34,7 +72,7 @@
             v-html="turnObj.brief"
           ></span>
         </div>
-      </template>
+      </div>
     </div>
     <div class="row gx-0">
       <div class="col-2 d-grid">
@@ -115,6 +153,9 @@ import { parseYearMonth } from "@util/parseYearMonth";
 import { sammoAPI } from "@util/sammoAPI";
 import { convertSearch초성 } from "@util/convertSearch초성";
 import VueTypes from "vue-types";
+import DragSelect from "@/components/DragSelect.vue";
+import { isString } from "lodash";
+
 type commandItem = {
   value: string;
   title: string;
@@ -147,6 +188,9 @@ const searchModeKey = `sammo_searchModeOn`;
 
 export default defineComponent({
   name: "NationReservedCommand",
+  components: {
+    DragSelect
+  },
   props: {
     maxTurn: VueTypes.integer.isRequired,
     maxPushTurn: VueTypes.integer.isRequired,
@@ -218,17 +262,28 @@ export default defineComponent({
         this.updateCommandList();
       }, 1);
     },
-    toggleTurn(val: number) {
+    toggleTurn(...turnList: number[] | string[]) {
-      if (this.turnList.has(val)) {
+      for (let turnIdx of turnList) {
-        this.turnList.delete(val);
+        if (isString(turnIdx)) {
-      } else {
+          turnIdx = parseInt(turnIdx);
-        this.turnList.add(val);
+        }
+        if (this.turnList.has(turnIdx)) {
+          this.turnList.delete(turnIdx);
+        } else {
+          this.turnList.add(turnIdx);
+        }
       }
       this.$emit("update:selectedTurn", this.turnList);
     },
-    selectTurn(val: number) {
+    selectTurn(...turnList: number[] | string[]) {
       this.turnList.clear();
-      this.turnList.add(val);
+      for (const turnIdx of turnList) {
+        if (isString(turnIdx)) {
+          this.turnList.add(parseInt(turnIdx));
+        } else {
+          this.turnList.add(turnIdx);
+        }
+      }
       this.$emit("update:selectedTurn", this.turnList);
     },
     updateCommandList() {
@@ -387,6 +442,11 @@ export default defineComponent({
 
     const prevTurnList = new Set([0]);
 
+    const rowGridStyle = {
+      display: "grid",
+      gridTemplateRows: `repeat(${this.maxTurn}, 30px)`,
+    };
+
     return {
       updated: false,
       listReqArgCommand,
@@ -398,6 +458,9 @@ export default defineComponent({
       reservedCommandList: emptyTurn,
       autorun_limit: null as null | number,
       searchModeOn,
+      rowGridStyle,
+      isDragSingle: false,
+      isDragToggle: false,
     };
   },
   mounted() {