From f49b82ca69a88f6cd84aaf94e5dcbb9134da23b8 Mon Sep 17 00:00:00 2001
From: Helloworld <1326521+LYZhelloworld@users.noreply.github.com>
Date: Sun, 21 Aug 2022 16:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=89=8D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ActionList.vue             |  4 ++--
 .../src/components/GroupComponent.vue         |  2 +-
 .../src/components/OperatorComponent.vue      | 19 ++++++++++++-------
 .../src/controls/ActionTypeSelector.vue       | 14 ++++++++------
 .../src/controls/DirectionSelector.vue        | 10 +++++-----
 .../src/controls/OperatorName.vue             |  2 +-
 .../tests/unit/components/ActionList.spec.ts  |  2 +-
 .../unit/components/OperatorComponent.spec.ts |  2 +-
 8 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/tools/CopilotDesinger/copilot-designer/src/components/ActionList.vue b/tools/CopilotDesinger/copilot-designer/src/components/ActionList.vue
index d353828eb7..9108526a50 100644
--- a/tools/CopilotDesinger/copilot-designer/src/components/ActionList.vue
+++ b/tools/CopilotDesinger/copilot-designer/src/components/ActionList.vue
@@ -22,7 +22,7 @@
         <td>
           <ActionTypeSelector
             :value="action.type"
-            @update="(value) => changeActionType(value, id)"
+            @update="(value: ActionType) => changeActionType(value, id)"
           />
         </td>
         <td>
@@ -68,7 +68,7 @@
         <td>
           <DirectionSelector
             :value="action.direction"
-            @update="(value) => changeDirection(value, id)"
+            @update="(value: Direction) => changeDirection(value, id)"
           />
         </td>
         <td>
diff --git a/tools/CopilotDesinger/copilot-designer/src/components/GroupComponent.vue b/tools/CopilotDesinger/copilot-designer/src/components/GroupComponent.vue
index d6ee33826e..75f4417e3e 100644
--- a/tools/CopilotDesinger/copilot-designer/src/components/GroupComponent.vue
+++ b/tools/CopilotDesinger/copilot-designer/src/components/GroupComponent.vue
@@ -11,7 +11,7 @@
         />
         <OperatorComponent
           :operators="group.opers"
-          @update="(newOperators) => updateOperators(newOperators, id)"
+          @update="(newOperators: Operator[]) => updateOperators(newOperators, id)"
         />
       </div>
       <div class="col-2">
diff --git a/tools/CopilotDesinger/copilot-designer/src/components/OperatorComponent.vue b/tools/CopilotDesinger/copilot-designer/src/components/OperatorComponent.vue
index bab2c710d4..e3895a855d 100644
--- a/tools/CopilotDesinger/copilot-designer/src/components/OperatorComponent.vue
+++ b/tools/CopilotDesinger/copilot-designer/src/components/OperatorComponent.vue
@@ -14,14 +14,14 @@
         <td>
           <OperatorName
             :value="operator.name"
-            @input="(e) => changeOperatorName(e.target.value, id)"
+            @input="(value: string) => changeOperatorName(value, id)"
           />
         </td>
         <td>
           <input
             type="number"
             class="form-control"
-            :value="String(operator.skill ?? 0)"
+            :value="String(operator.skill ?? 1)"
             @input="(e) => changeOperatorSkill((e.target as HTMLInputElement).value, id)"
           />
         </td>
@@ -45,9 +45,9 @@
 </template>
 
 <script lang="ts">
-import { Operator, Skill } from "@/interfaces/CopilotData";
+import { Operator, Skill, SkillUsage } from "@/interfaces/CopilotData";
 import { defineComponent, PropType } from "vue";
-import OperatorName from "../controls/OperatorName.vue";
+import OperatorName from "@/controls/OperatorName.vue";
 import MoveUpButton from "@/controls/MoveUpButton.vue";
 import MoveDownButton from "@/controls/MoveDownButton.vue";
 import DeleteButton from "@/controls/DeleteButton.vue";
@@ -69,8 +69,8 @@ export default defineComponent({
     changeOperatorSkill(value: string, id: number) {
       let numValue = value !== "" ? Number(value) : undefined;
       if (numValue !== undefined) {
-        if (numValue < 0) {
-          numValue = 0;
+        if (numValue < 1) {
+          numValue = 1;
         } else if (numValue > 3) {
           numValue = 3;
         }
@@ -82,8 +82,13 @@ export default defineComponent({
     },
     changeOperatorSkillUsage(value: string, id: number) {
       const numValue = value !== "" ? Number(value) : undefined;
+      if (numValue !== undefined) {
+        if (numValue < 0 || numValue > 3) {
+          return;
+        }
+      }
       const newOperators = [...this.operators];
-      newOperators[id].skill_usage = numValue;
+      newOperators[id].skill_usage = numValue as SkillUsage | undefined;
       this.$emit("update", newOperators);
     },
     moveUp(id: number) {
diff --git a/tools/CopilotDesinger/copilot-designer/src/controls/ActionTypeSelector.vue b/tools/CopilotDesinger/copilot-designer/src/controls/ActionTypeSelector.vue
index 3f7947812b..7f7491ae97 100644
--- a/tools/CopilotDesinger/copilot-designer/src/controls/ActionTypeSelector.vue
+++ b/tools/CopilotDesinger/copilot-designer/src/controls/ActionTypeSelector.vue
@@ -1,11 +1,13 @@
 <template>
   <select class="form-control" style="width: auto" v-model="modelValue">
-    <option value="二倍速">二倍速</option>
-    <option value="部署">部署</option>
-    <option value="技能">技能</option>
-    <option value="撤退">撤退</option>
-    <option value="子弹时间">子弹时间</option>
-    <option value="技能用法">技能用法</option>
+    <option value="Deploy">部署</option>
+    <option value="Skill">技能</option>
+    <option value="Retreat">撤退</option>
+    <option value="SpeedUp">二倍速</option>
+    <option value="BulletTime">子弹时间</option>
+    <option value="SkillUsage">技能用法</option>
+    <option value="Output">打印</option>
+    <option value="SkillDaemon">摆完挂机</option>
   </select>
 </template>
 
diff --git a/tools/CopilotDesinger/copilot-designer/src/controls/DirectionSelector.vue b/tools/CopilotDesinger/copilot-designer/src/controls/DirectionSelector.vue
index eeac16efe0..e61ab83dbf 100644
--- a/tools/CopilotDesinger/copilot-designer/src/controls/DirectionSelector.vue
+++ b/tools/CopilotDesinger/copilot-designer/src/controls/DirectionSelector.vue
@@ -1,10 +1,10 @@
 <template>
   <select class="form-control" style="width: auto" v-model="modelValue">
-    <option value="无"></option>
-    <option value="上">上</option>
-    <option value="下">下</option>
-    <option value="左">左</option>
-    <option value="右">右</option>
+    <option value="None">无</option>
+    <option value="Up">上</option>
+    <option value="Down">下</option>
+    <option value="Left">左</option>
+    <option value="Right">右</option>
   </select>
 </template>
 
diff --git a/tools/CopilotDesinger/copilot-designer/src/controls/OperatorName.vue b/tools/CopilotDesinger/copilot-designer/src/controls/OperatorName.vue
index f1d5943cb8..8b07682cec 100644
--- a/tools/CopilotDesinger/copilot-designer/src/controls/OperatorName.vue
+++ b/tools/CopilotDesinger/copilot-designer/src/controls/OperatorName.vue
@@ -21,7 +21,7 @@ export default defineComponent({
   },
   methods: {
     input(e: Event) {
-      this.$emit("input", e);
+      this.$emit("input", (e.target as HTMLInputElement).value);
     },
   },
   emits: ["input"],
diff --git a/tools/CopilotDesinger/copilot-designer/tests/unit/components/ActionList.spec.ts b/tools/CopilotDesinger/copilot-designer/tests/unit/components/ActionList.spec.ts
index cc3cde87b7..14825ad907 100644
--- a/tools/CopilotDesinger/copilot-designer/tests/unit/components/ActionList.spec.ts
+++ b/tools/CopilotDesinger/copilot-designer/tests/unit/components/ActionList.spec.ts
@@ -16,7 +16,7 @@ describe("ActionList.vue", () => {
       name: "Lancet-2",
       location: [2, 3],
       direction: "Left",
-      skill_usage: 4,
+      skill_usage: 3,
       pre_delay: 5,
       rear_delay: 6,
       doc: "doc",
diff --git a/tools/CopilotDesinger/copilot-designer/tests/unit/components/OperatorComponent.spec.ts b/tools/CopilotDesinger/copilot-designer/tests/unit/components/OperatorComponent.spec.ts
index cf59a903e7..92b3d476f3 100644
--- a/tools/CopilotDesinger/copilot-designer/tests/unit/components/OperatorComponent.spec.ts
+++ b/tools/CopilotDesinger/copilot-designer/tests/unit/components/OperatorComponent.spec.ts
@@ -10,7 +10,7 @@ describe("OperatorComponent.vue", () => {
   const testData: Operator[] = [
     {
       name: "Lancet-2",
-      skill: 0,
+      skill: 1,
       skill_usage: 1,
     },
     {