From 13be25828397354e6426192fe29e948a24d45a66 Mon Sep 17 00:00:00 2001 From: Lazy <2211717435@qq.com> Date: Wed, 8 Nov 2023 22:10:30 +0800 Subject: [PATCH] Fix: find item --- frontend/components.d.ts | 16 ---------------- frontend/src/components/SelectInstances.vue | 4 ++-- frontend/src/widgets/InstanceList.vue | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 2eddf1bf..ad4777a7 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -7,7 +7,6 @@ export {} declare module 'vue' { export interface GlobalComponents { - AAvatar: typeof import('ant-design-vue/es')['Avatar'] ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] ABreadcrumbItem: typeof import('ant-design-vue/es')['BreadcrumbItem'] AButton: typeof import('ant-design-vue/es')['Button'] @@ -57,24 +56,13 @@ declare module 'vue' { ATypographyText: typeof import('ant-design-vue/es')['TypographyText'] ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle'] AUpload: typeof import('ant-design-vue/es')['Upload'] -<<<<<<< Updated upstream BetweenMenus: typeof import('./src/components/BetweenMenus.vue')['default'] -======= - 'Bds_server.properties': typeof import('./src/components/mc_process_config/bds_server.properties.vue')['default'] - BetweenMenus: typeof import('./src/components/BetweenMenus.vue')['default'] - 'Bukkit.yml': typeof import('./src/components/mc_process_config/bukkit.yml.vue')['default'] - 'Bungeecord.config.yml': typeof import('./src/components/mc_process_config/bungeecord.config.yml.vue')['default'] ->>>>>>> Stashed changes CardError: typeof import('./src/components/CardError.vue')['default'] CardOperator: typeof import('./src/components/CardOperator.vue')['default'] CardPanel: typeof import('./src/components/CardPanel.vue')['default'] CopyButton: typeof import('./src/components/CopyButton.vue')['default'] DataStatistic: typeof import('./src/components/DataStatistic.vue')['default'] Editor: typeof import('./src/components/Editor.vue')['default'] -<<<<<<< Updated upstream -======= - 'Eula.txt': typeof import('./src/components/mc_process_config/eula.txt.vue')['default'] ->>>>>>> Stashed changes FadeUpAnimation: typeof import('./src/components/FadeUpAnimation.vue')['default'] IconBtn: typeof import('./src/components/IconBtn.vue')['default'] InnerCard: typeof import('./src/components/InnerCard.vue')['default'] @@ -93,9 +81,5 @@ declare module 'vue' { RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] SelectInstances: typeof import('./src/components/SelectInstances.vue')['default'] -<<<<<<< Updated upstream -======= - 'Server.properties': typeof import('./src/components/mc_process_config/server.properties.vue')['default'] ->>>>>>> Stashed changes } } diff --git a/frontend/src/components/SelectInstances.vue b/frontend/src/components/SelectInstances.vue index 4bd7e1b1..7e51187f 100644 --- a/frontend/src/components/SelectInstances.vue +++ b/frontend/src/components/SelectInstances.vue @@ -102,11 +102,11 @@ const selectItem = (item: UserInstance) => { }; const findItem = (item: UserInstance) => { - return selectedItems.value.some((i) => JSON.stringify(i) === JSON.stringify(item)); + return selectedItems.value.find((i) => i.instanceUuid === item.instanceUuid); }; const removeItem = (item: UserInstance) => { - selectedItems.value.splice(selectedItems.value.indexOf(item), 1); + selectedItems.value = selectedItems.value.filter((i) => i.instanceUuid !== item.instanceUuid); }; const submit = async () => { diff --git a/frontend/src/widgets/InstanceList.vue b/frontend/src/widgets/InstanceList.vue index 54c229cc..b112bcc2 100644 --- a/frontend/src/widgets/InstanceList.vue +++ b/frontend/src/widgets/InstanceList.vue @@ -123,7 +123,7 @@ const multipleMode = ref(false); const selectedInstance = ref([]); const findInstance = (item: InstanceMoreDetail) => { - return selectedInstance.value.some((i) => JSON.stringify(i) === JSON.stringify(item)); + return selectedInstance.value.find((i) => i.instanceUuid === item.instanceUuid); }; const selectInstance = (item: InstanceMoreDetail) => {