devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: 차이점 채움

Browse Source
This commit is contained in:
Hide_D
2022-07-16 15:43:27 +09:00
parent 4e339c3592
commit 71ce878569
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/API/Nation/GetGeneralLog.php
+2 -2
View File
@@ -9,11 +9,11 @@ use sammo\Validator;
use function sammo\checkLimit;
use function sammo\checkSecretPermission;
use function sammo\getBattleDetailLogMore;
use function sammo\getBattleDetailLogRecent;
use function sammo\getBattleResultMore;
use function sammo\getBattleResultRecent;
use function sammo\getGeneralActionLogMore;
use function sammo\getGeneralActionLogRecent;
use function sammo\getGeneralHistoryLogAll;
use function sammo\getGeneralHistoryLogWithLogID;
class GetGeneralLog extends \sammo\BaseAPI
@@ -157,7 +157,7 @@ class GetGeneralLog extends \sammo\BaseAPI
'reqType' => $reqType,
'generalID' => $targetGeneralID,
'log' => $reqTo === null
? getBattleResultRecent($targetGeneralID, 30)
? getBattleDetailLogRecent($targetGeneralID, 30)
: getBattleDetailLogMore($targetGeneralID, $reqTo, 30)
];
}
hwe/ts/PageBattleCenter.vue
+20 -9
View File
@@ -5,7 +5,11 @@
<div class="row gx-0">
<div class="col-4">
<BFormSelect v-model="orderBy">
<BFormSelectOption v-for="[orderKey, [orderName, ]] of Object.entries(textMap)" :key="orderKey" :value="orderKey">
<BFormSelectOption
v-for="[orderKey, [orderName]] of Object.entries(textMap)"
:key="orderKey"
:value="orderKey"
>
{{ orderName }}
</BFormSelectOption>
</BFormSelect>
@@ -17,7 +21,9 @@
:style="{
color: getNpcColor(general.npc),
}"
>{{ general.name }}({{ general.turntime.slice(-5) }}){{ textMap[orderBy][3](general) }}</span
>{{ general.officerLevel > 5 ? `*${general.name}*` : general.name }}({{ general.turntime.slice(-5) }}){{
textMap[orderBy][3](general)
}}</span
>
</BFormSelectOption>
</BFormSelect>
@@ -82,10 +88,15 @@ const toasts = unwrap(useToast());
const generalList = ref(new Map<number, GeneralListItemP1>());
const textMap = {
recent_war: ["최근 전투", (gen: GeneralListItemP1) => gen.recent_war, false, (gen: GeneralListItemP1) => `[${gen.recent_war.slice(-5)}]`],
recent_war: [
"최근 전투",
(gen: GeneralListItemP1) => gen.recent_war,
false,
(gen: GeneralListItemP1) => `[${gen.recent_war.slice(-5)}]`,
],
warnum: ["전투 횟수", (gen: GeneralListItemP1) => gen.warnum, false, (gen: GeneralListItemP1) => `[${gen.warnum}회]`],
turntime: ["최근 턴", (gen: GeneralListItemP1) => gen.turntime, false, (gen: GeneralListItemP1) => ''],
name: ["이름", (gen: GeneralListItemP1) => `${gen.npc} ${gen.name}`, false, (gen: GeneralListItemP1) => ''],
turntime: ["최근 턴", (gen: GeneralListItemP1) => gen.turntime, false, (gen: GeneralListItemP1) => ""],
name: ["이름", (gen: GeneralListItemP1) => `${gen.npc} ${gen.name}`, false, (gen: GeneralListItemP1) => ""],
} as const;
const orderedGeneralList = ref<GeneralListItemP1[]>([]);
@@ -102,10 +113,10 @@ const targetGeneralLogs = ref<GeneralLogs>();
const nationInfo = ref<NationStaticItem>();
watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) => {
if (targetGeneralID === undefined){
if (targetGeneralID === undefined) {
targetGeneral.value = undefined;
return;
};
}
targetGeneral.value = generalList.get(targetGeneralID);
const logs: GeneralLogs = {
@@ -149,13 +160,13 @@ watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) =>
watch([generalList, orderBy], ([generalList, orderBy], [, oldOrderBy]) => {
console.log(generalList);
const list = Array.from(generalList.values());
if(orderBy != oldOrderBy){
if (orderBy != oldOrderBy) {
targetGeneralID.value = undefined;
}
const idSet = new Set<number>(list.map((gen) => gen.no));
list.sort((a, b) => {
const [, getter, isAsc, ] = textMap[orderBy];
const [, getter, isAsc] = textMap[orderBy];
const aVal = getter(a);
const bVal = getter(b);
if (aVal === bVal) return 0;