-
부대명 추방
-
+
+
부대명 추방
+
@@ -98,16 +94,17 @@
-
+
@@ -302,11 +299,11 @@ async function refresh() {
troopList.value = new Map();
- const sortedTroops= troops.sort((lhs, rhs) => {
- if(lhs.turntime < rhs.turntime) {
+ const sortedTroops = troops.sort((lhs, rhs) => {
+ if (lhs.turntime < rhs.turntime) {
return -1;
}
- if(lhs.turntime > rhs.turntime) {
+ if (lhs.turntime > rhs.turntime) {
return 1;
}
return lhs.id - rhs.id;
@@ -441,11 +438,11 @@ async function exitTroop() {
await refresh();
}
-function openChangeTroopNameDialog(troop: TroopInfo){
+function openChangeTroopNameDialog(troop: TroopInfo) {
tryTroopActionTarget.value = {
- type: 'changeName',
- targetTroop: troop.troopID
- }
+ type: "changeName",
+ targetTroop: troop.troopID,
+ };
newTroopName.value = troop.troopName;
}
@@ -479,14 +476,13 @@ async function changeTroopName(troop: TroopInfo) {
await refresh();
}
-
-function openKickTroopMemberDialog(troop: TroopInfo){
+function openKickTroopMemberDialog(troop: TroopInfo) {
tryTroopActionTarget.value = {
- type: 'kickMember',
- targetTroop: troop.troopID
- }
- for(const member of troop.members){
- if(member.no == troop.troopID){
+ type: "kickMember",
+ targetTroop: troop.troopID,
+ };
+ for (const member of troop.members) {
+ if (member.no == troop.troopID) {
continue;
}
kickTroopMemberID.value = member.no;
@@ -496,7 +492,7 @@ function openKickTroopMemberDialog(troop: TroopInfo){
async function kickTroopMember(troop: TroopInfo) {
const kickMember = generalList.value.get(kickTroopMemberID.value);
- if(kickMember === undefined){
+ if (kickMember === undefined) {
toasts.danger({
title: "오류",
body: "잘못된 접근입니다.",
@@ -555,7 +551,7 @@ async function kickTroopMember(troop: TroopInfo) {
border: solid 1px gray;
}
-.troopDiffCityMemeber{
+.troopDiffCityMemeber {
color: red;
}
@@ -569,7 +565,7 @@ async function kickTroopMember(troop: TroopInfo) {
}
.troopInfo {
- grid-column: 1/2;
+ grid-column: 1/3;
grid-row: 1/2;
display: grid;
align-content: center;
@@ -577,7 +573,7 @@ async function kickTroopMember(troop: TroopInfo) {
}
.troopTurn {
- grid-column: 1/2;
+ grid-column: 1/3;
grid-row: 2/3;
display: grid;
align-content: center;
@@ -585,7 +581,7 @@ async function kickTroopMember(troop: TroopInfo) {
}
.troopLeaderIcon {
- grid-column: 2/3;
+ grid-column: 3/4;
grid-row: 1/2;
display: grid;
align-content: center;
@@ -593,7 +589,7 @@ async function kickTroopMember(troop: TroopInfo) {
}
.troopLeaderName {
- grid-column: 2/3;
+ grid-column: 3/4;
grid-row: 2/3;
display: grid;
align-items: center;
@@ -608,7 +604,7 @@ async function kickTroopMember(troop: TroopInfo) {
}
.troopAction {
- grid-column: 5/6;
+ grid-column: 6/7;
grid-row: 1/3;
.btn {
@@ -635,17 +631,42 @@ async function kickTroopMember(troop: TroopInfo) {
}
.troopItem {
- grid-template-rows: 65px 28px;
- grid-template-columns: 130px 130px 1fr 100px 140px;
+ grid-template-rows: 65px 28px 34.5px;
+ grid-template-columns: 65px 65px 130px 100px 1fr;
.troopMembers {
- grid-column: 3/4;
+ grid-column: 5/6;
grid-row: 1/3;
}
&:last-of-type {
border-bottom: solid 1px gray;
}
+
+ .filler {
+ grid-column: 1/2;
+ grid-row: 3/4;
+ }
+
+ .troopAction {
+ grid-column: 2/7;
+ grid-row: 3/4;
+ .actionButtons {
+ display: grid;
+ grid-template-columns: 110px 110px 110px;
+ grid-template-rows: 33.5px;
+ }
+ }
+ }
+
+ .subDialog {
+ display: grid;
+ grid-template-columns: 90px 140px 50px 50px;
+
+ .subTitle {
+ display: grid;
+ align-content: center;
+ }
}
}
@@ -662,19 +683,42 @@ async function kickTroopMember(troop: TroopInfo) {
.troopItem {
grid-template-rows: 65px 28px auto;
- grid-template-columns: 130px 130px 0px 100px 140px;
+ grid-template-columns: 65px 65px 130px 100px 0px 140px;
.troopMembers {
- grid-column: 2/6;
+ grid-column: 3/7;
grid-row: 3/4;
}
&:last-of-type {
- .troopMembers,
- .troopTurn {
+ .troopMembers {
border-bottom: solid 1px gray;
}
}
+
+ .filler {
+ border-top: solid 1px gray;
+ grid-column: 1/3;
+ grid-row: 3/4;
+ }
+ }
+
+ .actionButtons {
+ display: grid;
+ }
+
+ .subDialog {
+ display: grid;
+ height: 100%;
+ grid-template-columns: 1fr 1fr;
+ grid-template-rows: 1fr 1fr 1fr;
+
+ .subTitle,
+ .subForm {
+ display: grid;
+ align-content: center;
+ grid-column: 1/3;
+ }
}
}