From 5695a61fd28c611e6d670c24b0cb1fde9b4a46d4 Mon Sep 17 00:00:00 2001 From: GalvinGao Date: Sun, 19 Feb 2023 17:05:01 -0500 Subject: [PATCH] feat: add sourcecategory to advancedquery --- src/components/advancedQuery/QueryBuilder.vue | 5 +- src/components/advancedQuery/QueryMain.vue | 3 +- .../selectors/QuerySelectorCategory.vue | 66 +++++++++++++++++++ src/locales/en_US.json | 29 ++++---- src/locales/ja_JP.json | 29 ++++---- src/locales/ko_KR.json | 29 ++++---- src/locales/zh_CN.json | 29 ++++---- src/utils/marshaller.js | 1 + 8 files changed, 133 insertions(+), 58 deletions(-) create mode 100644 src/components/advancedQuery/selectors/QuerySelectorCategory.vue diff --git a/src/components/advancedQuery/QueryBuilder.vue b/src/components/advancedQuery/QueryBuilder.vue index 7911d16c..f6f8e704 100644 --- a/src/components/advancedQuery/QueryBuilder.vue +++ b/src/components/advancedQuery/QueryBuilder.vue @@ -67,6 +67,7 @@ :server="query.server" /> + - 取消查询 + {{ $t('query.cancel') }} @@ -158,10 +159,12 @@ import query from "@/apis/query"; import marshaller from "@/utils/marshaller"; import QuerySelectorInterval from "@/components/advancedQuery/selectors/QuerySelectorInterval"; import snackbar from "@/utils/snackbar"; +import QuerySelectorCategory from "@/components/advancedQuery/selectors/QuerySelectorCategory.vue"; export default { name: "QueryBuilder", components: { + QuerySelectorCategory, QuerySelectorInterval, QuerySelectorSource, QuerySelectorItem, diff --git a/src/components/advancedQuery/QueryMain.vue b/src/components/advancedQuery/QueryMain.vue index ffb158cd..0b810d55 100644 --- a/src/components/advancedQuery/QueryMain.vue +++ b/src/components/advancedQuery/QueryMain.vue @@ -85,7 +85,8 @@ export default { item: [], timeRange: [], server: this.$store.getters['dataSource/server'], - source: 'global', + source: this.$store.getters['dataSource/source'], + category: this.$store.getters['dataSource/category'], interval: null } ], diff --git a/src/components/advancedQuery/selectors/QuerySelectorCategory.vue b/src/components/advancedQuery/selectors/QuerySelectorCategory.vue new file mode 100644 index 00000000..c622142a --- /dev/null +++ b/src/components/advancedQuery/selectors/QuerySelectorCategory.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/locales/en_US.json b/src/locales/en_US.json index 823a7d49..ff6edf55 100644 --- a/src/locales/en_US.json +++ b/src/locales/en_US.json @@ -604,6 +604,7 @@ "disclaimer": "All data produced by the \"Advanced Query\" feature is protected by our site's \"License.\" Penguin Statistics does not make any commitments or endorsements regarding the data produced by the Advanced Query feature." } }, + "cancel": "Cancel", "type": { "matrix": "Statistics", "trend": "Trends" @@ -770,6 +771,20 @@ "separator": ", ", "isAre": "is | are" }, + "matrixCategory": { + "automated": { + "tooltip": "Auto: Such Matrix Category contains data from third-party tools that automatically reports drop data.", + "label": "Auto" + }, + "all": { + "label": "All" + }, + "manual": { + "tooltip": "Manual: Such Matrix Category contains data only from the \"Report Drops by Stage\" and \"Report Drops by Recognition\" features from the Penguin Statistics site.", + "label": "Manual" + }, + "switch": "Matrix Category" + }, "members": { "responsibilities": { "v1frontend": "v1.0 Frontend", @@ -978,20 +993,6 @@ "network": { "error": "Network error, please check your internet connection and try again." }, - "matrixCategory": { - "auto": { - "label": "Auto", - "tooltip": "Auto: Such Matrix Category contains data from third-party tools that automatically reports drop data." - }, - "all": { - "label": "All" - }, - "manual": { - "tooltip": "Manual: Such Matrix Category contains data only from the \"Report Drops by Stage\" and \"Report Drops by Recognition\" features from the Penguin Statistics site.", - "label": "Manual" - }, - "switch": "Matrix Category" - }, "search": { "hint": "Type in Name for Stage, Zone or Item", "placeholder": "Search..." diff --git a/src/locales/ja_JP.json b/src/locales/ja_JP.json index 70376061..c09fded0 100644 --- a/src/locales/ja_JP.json +++ b/src/locales/ja_JP.json @@ -604,6 +604,7 @@ "disclaimer": "" } }, + "cancel": "", "type": { "matrix": "", "trend": "" @@ -770,6 +771,20 @@ "separator": "、", "isAre": "" }, + "matrixCategory": { + "automated": { + "tooltip": "", + "label": "自動" + }, + "all": { + "label": "全体" + }, + "manual": { + "tooltip": "", + "label": "手動" + }, + "switch": "集計範囲" + }, "members": { "responsibilities": { "v1frontend": "", @@ -978,20 +993,6 @@ "network": { "error": "ネットワークエラー。インターネット接続をご確認の上もう一度お試しください" }, - "matrixCategory": { - "auto": { - "label": "自動", - "tooltip": "" - }, - "all": { - "label": "全体" - }, - "manual": { - "tooltip": "", - "label": "手動" - }, - "switch": "集計範囲" - }, "search": { "hint": "素材名・作战名・ステージコード・章タイトル・イベント名（漢字・ふりがな・カタカナ・ローマ字）で検索", "placeholder": "検索..." diff --git a/src/locales/ko_KR.json b/src/locales/ko_KR.json index 52ef9495..8ec57750 100644 --- a/src/locales/ko_KR.json +++ b/src/locales/ko_KR.json @@ -604,6 +604,7 @@ "disclaimer": "“고급 쿼리” 기능으로 생성된 모든 데이터는 이 사이트의 “데이터 라이센스 협약”으로 보호됩니다. 펭귄 통계는 “고급 쿼리” 기능으로 생성된 데이터에 대하여 어떠한 형태의 약속이나 보증도 하지 않습니다." } }, + "cancel": "", "type": { "matrix": "통계", "trend": "추세" @@ -770,6 +771,20 @@ "separator": ", ", "isAre": "" }, + "matrixCategory": { + "automated": { + "tooltip": "", + "label": "" + }, + "all": { + "label": "" + }, + "manual": { + "tooltip": "", + "label": "" + }, + "switch": "" + }, "members": { "responsibilities": { "v1frontend": "v1.0 프론트엔드", @@ -978,20 +993,6 @@ "network": { "error": "네트워크 오류. 인터넷 연결을 확인한 후 다시 시도하세요." }, - "matrixCategory": { - "auto": { - "label": "", - "tooltip": "" - }, - "all": { - "label": "" - }, - "manual": { - "tooltip": "", - "label": "" - }, - "switch": "" - }, "search": { "hint": "스테이지, 구역 또는 아이템 이름 입력", "placeholder": "검색..." diff --git a/src/locales/zh_CN.json b/src/locales/zh_CN.json index c2aa840b..5dd1b92d 100644 --- a/src/locales/zh_CN.json +++ b/src/locales/zh_CN.json @@ -604,6 +604,7 @@ "disclaimer": "「高级查询」功能所产出的所有数据信息均受本站「数据许可协议」保护；本站不对「高级查询」功能所产出的所有数据信息做任何形式的承诺或背书。" } }, + "cancel": "取消查询", "type": { "matrix": "统计数据", "trend": "历史趋势" @@ -770,6 +771,20 @@ "separator": "、", "isAre": "" }, + "matrixCategory": { + "automated": { + "tooltip": "自动数据来源：指由第三方工具所自动汇报的掉落数据", + "label": "自动" + }, + "all": { + "label": "全部" + }, + "manual": { + "tooltip": "手动数据来源：指由用户使用企鹅物流数据统计的「网页或 App 端」中的「掉落汇报」或「截图识别」汇报的掉落数据", + "label": "手动" + }, + "switch": "数据来源" + }, "members": { "responsibilities": { "v1frontend": "v1.0 前端", @@ -978,20 +993,6 @@ "network": { "error": "网络请求失败，请检查网络后重试" }, - "matrixCategory": { - "auto": { - "label": "自动", - "tooltip": "自动数据来源：指由第三方工具所自动汇报的掉落数据" - }, - "all": { - "label": "全部" - }, - "manual": { - "tooltip": "手动数据来源：指由用户使用企鹅物流数据统计的「网页或 App 端」中的「掉落汇报」或「截图识别」汇报的掉落数据", - "label": "手动" - }, - "switch": "数据来源" - }, "search": { "hint": "键入 物品全拼 拼音首字母 作战名 章节名 关卡编号 或 部分关卡/物品昵称", "placeholder": "搜索..." diff --git a/src/utils/marshaller.js b/src/utils/marshaller.js index aba883b9..6937c8df 100644 --- a/src/utils/marshaller.js +++ b/src/utils/marshaller.js @@ -60,6 +60,7 @@ export default { itemIds: query.item, server: query.server, isPersonal: query.source === 'personal', + sourceCategory: query.category, start, end }