fix: ui 요소 안정화

- 사령부
- 커맨드 되돌아가기
This commit is contained in:
2021-12-25 23:08:53 +09:00
parent 356250ba8c
commit dad01b45e4
3 changed files with 29 additions and 29 deletions
+26 -27
View File
@@ -2,35 +2,38 @@
<div :class="['subRows', 'c-bg2', 'chiefCommand']" :style="style"> <div :class="['subRows', 'c-bg2', 'chiefCommand']" :style="style">
<div class="bg1 center row gx-0" style="font-size: 1.2em"> <div class="bg1 center row gx-0" style="font-size: 1.2em">
<div class="col-5 align-self-center text-end"> <div class="col-5 align-self-center text-end">
{{ officer?`${officer.officerLevelText} : `:'' }} {{ officer ? `${officer.officerLevelText} : ` : "" }}
</div> </div>
<div <div
class="col-7 align-self-center" class="col-7 align-self-center"
:style="{ :style="{
color: getNpcColor((officer?.npcType) ?? 0), color: getNpcColor(officer?.npcType ?? 0),
}" }"
> >
{{ officer?.name }} {{ officer?.name }}
</div> </div>
</div> </div>
<template v-if="officer"> <div class="row gx-0" v-for="vidx in maxTurn" :key="vidx">
<div class="row gx-0" v-for="(turn, idx) in officer.turn" :key="idx"> <div class="col-2 time_pad f_tnum">
<div class="col-2 time_pad f_tnum"> {{ turnTimes[vidx - 1] ?? "" }}
{{ turnTimes[idx] }}
</div>
<div
class="tableCell align-self-center col-10 center turn_pad"
:style="{
fontSize:
mb_strwidth(turn.brief) > 28
? `${28 / mb_strwidth(turn.brief)}em`
: undefined,
}"
>
{{ turn.brief }}
</div>
</div> </div>
</template> <div
class="center turn_pad"
v-if="!officer || (!officer.turn) || !(vidx - 1 in officer.turn)"
></div>
<div
v-else
class="tableCell align-self-center col-10 center turn_pad"
:style="{
fontSize:
mb_strwidth(officer.turn[vidx - 1].brief) > 28
? `${28 / mb_strwidth(officer.turn[vidx - 1].brief)}em`
: undefined,
}"
>
{{ officer.turn[vidx - 1].brief }}
</div>
</div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
@@ -49,9 +52,9 @@ export default defineComponent({
style: VueTypes.object.isRequired, style: VueTypes.object.isRequired,
officer: { officer: {
type: Object as PropType<ChiefResponse["chiefList"][0]>, type: Object as PropType<ChiefResponse["chiefList"][0]>,
required: true,
}, },
turnTerm: VueTypes.integer.isRequired, turnTerm: VueTypes.integer.isRequired,
maxTurn: VueTypes.integer.isRequired,
}, },
methods: { methods: {
getNpcColor, getNpcColor,
@@ -60,14 +63,10 @@ export default defineComponent({
data() { data() {
const turnTimes: string[] = []; const turnTimes: string[] = [];
if (!this.officer) { if (!this.officer || !this.officer.turnTime) {
return {};
}
if (!this.officer.turnTime) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
for (const _ of range(this.officer.turn.length)) { for (const _ of range(this.maxTurn)) {
turnTimes.push("-"); turnTimes.push("");
} }
} else { } else {
const baseTurnTime = parseTime(this.officer.turnTime); const baseTurnTime = parseTime(this.officer.turnTime);
+2 -1
View File
@@ -38,6 +38,7 @@
v-if="officerLevel != chiefLevel" v-if="officerLevel != chiefLevel"
:style="mainTableGridRows" :style="mainTableGridRows"
:officer="officer" :officer="officer"
:maxTurn="maxChiefTurn"
:turnTerm="turnTerm" :turnTerm="turnTerm"
/> />
<div class="commandBox" v-else> <div class="commandBox" v-else>
@@ -352,7 +353,7 @@ export default defineComponent({
setup(props) { setup(props) {
const viewTarget = ref<number | undefined>(); const viewTarget = ref<number | undefined>();
const turnList = ref(new Set<number>([2])); const turnList = ref(new Set<number>());
const targetIsMe = ref<boolean>(false); const targetIsMe = ref<boolean>(false);
watch(viewTarget, (val) => { watch(viewTarget, (val) => {
+1 -1
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="bg0"> <div class="bg0" style="padding-top:20px;">
<button type="button" class="btn btn-sammo-base2 back_btn" @click="back"> <button type="button" class="btn btn-sammo-base2 back_btn" @click="back">
돌아가기 돌아가기
</button> </button>