From fe06776b301d08193248e297384ac9ac7601cd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A5=E7=94=9F?= <529524114@qq.com>
Date: Sun, 21 Aug 2022 22:55:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(*):=20=E6=96=B0=E5=A2=9E=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=89=AF=E8=AF=8D=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ArtifactsPage/ArtifactsPage.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/pages/ArtifactsPage/ArtifactsPage.vue b/src/pages/ArtifactsPage/ArtifactsPage.vue
index 81943fae..307c40e2 100644
--- a/src/pages/ArtifactsPage/ArtifactsPage.vue
+++ b/src/pages/ArtifactsPage/ArtifactsPage.vue
@@ -161,6 +161,14 @@
                     :placeholder="t('misc.mainStat')"
                 ></select-artifact-main-stat>
             </div>
+            <div class="filter-item">
+                <select-artifact-main-stat
+                    v-model="filterSubStat"
+                    :include-any="false"
+                    :multiple="true"
+                    :placeholder="t('misc.subStat')"
+                ></select-artifact-main-stat>
+            </div>
 
             <el-checkbox v-model="filterGe16" class="show-only-16">{{ t("artPage.show16") }}</el-checkbox>
         </div>
@@ -283,6 +291,7 @@ function deleteArtifact(id: number) {
 // artifacts filters and display
 const filterSet: Ref<ArtifactSetName[]> = ref([])
 const filterMainStat: Ref<ArtifactStatName[]> = ref([])
+const filterSubStat: Ref<Array<ArtifactStatName>> = ref([])
 const filterGe16 = ref(true)
 
 const artifactsCurrentSlot = computed(() => {
@@ -291,12 +300,11 @@ const artifactsCurrentSlot = computed(() => {
 
 const filteredArtifacts = computed(() => {
     let results = [];
-
     for (let artifact of artifactsCurrentSlot.value) {
         const setName = artifact.setName;
         const mainStatName = artifact.mainTag.name;
         const level = artifact.level;
-
+        const subStatName = [...artifact.normalTags.flatMap(item => item.name), mainStatName]
         if (filterSet.value.length > 0 && filterSet.value.indexOf(setName) === -1) {
             continue;
         }
@@ -306,6 +314,9 @@ const filteredArtifacts = computed(() => {
         if (filterGe16.value && level < 16) {
             continue;
         }
+        if (filterSubStat.value.length > 0 && !filterSubStat.value.every(item => subStatName.includes(item))) {
+            continue
+        }
 
         results.push(artifact);
     }
@@ -639,4 +650,7 @@ function handleOutputCommand(command: string) {
 .tool-bar .tool-right {
     float: right;
 }
+.el-select{
+    margin-right: 10px
+}
 </style>

From df067d5a908f384be79ad9c8db1c74efaf249a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A5=E7=94=9F?= <529524114@qq.com>
Date: Sun, 21 Aug 2022 23:01:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(*):=20=E6=8E=A7=E5=88=B6=E5=89=AF?=
 =?UTF-8?q?=E8=AF=8D=E6=9D=A1=E5=8B=BE=E9=80=89=E4=B8=8A=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/select/SelectArtifactMainStat.vue | 7 ++++---
 src/pages/ArtifactsPage/ArtifactsPage.vue        | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/select/SelectArtifactMainStat.vue b/src/components/select/SelectArtifactMainStat.vue
index 4fef08b4..eda7865b 100644
--- a/src/components/select/SelectArtifactMainStat.vue
+++ b/src/components/select/SelectArtifactMainStat.vue
@@ -4,6 +4,7 @@
         @update:modelValue="emits('update:modelValue', $event)"
         :multiple="props.multiple"
         :placeholder="props.placeholder"
+        :multiple-limit="props.limitNum"
     >
         <el-option
             v-if="props.includeAny"
@@ -24,11 +25,9 @@ import { computed } from "vue"
 import { artifactTags, mainStatMap } from "@const/artifact"
 import type {ArtifactMainStatName, ArtifactPosition} from "@/types/artifact"
 import {useI18n} from "@/i18n/i18n";
-
 interface Emits {
     (e: "update:modelValue", v: ModelValue): void
 }
-
 const emits = defineEmits<Emits>()
 
 type ModelValue = "any" | ArtifactMainStatName | ArtifactMainStatName[] | null
@@ -39,6 +38,7 @@ interface Props {
     multiple?: boolean,
     position?: ArtifactPosition | null,
     placeholder?: string
+    limitNum: number
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -46,7 +46,8 @@ const props = withDefaults(defineProps<Props>(), {
     includeAny: true,
     multiple: false,
     position: null,
-    placeholder: "Select"
+    placeholder: "Select",
+    limitNum: 1000
 })
 
 const tagList = computed(() => {
diff --git a/src/pages/ArtifactsPage/ArtifactsPage.vue b/src/pages/ArtifactsPage/ArtifactsPage.vue
index 307c40e2..3edbb872 100644
--- a/src/pages/ArtifactsPage/ArtifactsPage.vue
+++ b/src/pages/ArtifactsPage/ArtifactsPage.vue
@@ -167,6 +167,7 @@
                     :include-any="false"
                     :multiple="true"
                     :placeholder="t('misc.subStat')"
+                    :limitNum="4"
                 ></select-artifact-main-stat>
             </div>
 

From 0f24a9c6e025446180a03f7cd3db433edb2dce8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A5=E7=94=9F?= <529524114@qq.com>
Date: Tue, 23 Aug 2022 23:58:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(limitNum)=EF=BC=9A=E5=B0=86limitnum=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/select/SelectArtifactMainStat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/select/SelectArtifactMainStat.vue b/src/components/select/SelectArtifactMainStat.vue
index eda7865b..17bbfb9b 100644
--- a/src/components/select/SelectArtifactMainStat.vue
+++ b/src/components/select/SelectArtifactMainStat.vue
@@ -38,7 +38,7 @@ interface Props {
     multiple?: boolean,
     position?: ArtifactPosition | null,
     placeholder?: string
-    limitNum: number
+    limitNum?: number
 }
 
 const props = withDefaults(defineProps<Props>(), {